mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-31 11:07:09 +00:00
622f8ef577
Florian Ekert reported:
"I have build a fresh master branch recently, Since your last change [1]
on grub2, I have now a new dependency on liblzma for the install package
grub2-editenv.
root@st-dev-07 /usr/lib # ldd /root/grub-editenv
/lib/ld-musl-x86_64.so.1 (0x7f684b088000)
liblzma.so.5 => /usr/lib/liblzma.so.5 (0x7f684b06d000)
libgcc_s.so.1 => /lib/libgcc_s.so.1 (0x7f684b059000)
libc.so => /lib/ld-musl-x86_64.so.1 (0x7f684b088000)
This was not the case before your update.
root@st-dev-07 /usr/sbin # ldd /usr/sbin/grub-editenv
/lib/ld-musl-x86_64.so.1 (0x7fd970176000)
libgcc_s.so.1 => /lib/libgcc_s.so.1 (0x7fd970162000)
libc.so => /lib/ld-musl-x86_64.so.1 (0x7fd970176000)
My build complains that it cannot satisfy the runtime package dependency
for grub2-editenv.
install -d -m0755 /home/feckert/workspace/openwrt/LDM-master-x86_64/build/openwrt/build_dir/target-x86_64_musl/linux-x86_64/grub-pc/grub-2.06~rc1/ipkg-x86_64/grub2-editenv/usr/sbin
install -m0755 /home/feckert/workspace/openwrt/LDM-master-x86_64/build/openwrt/build_dir/target-x86_64_musl/linux-x86_64/grub-pc/grub-2.06~rc1/grub-editenv /home/feckert/workspace/openwrt/LDM-master-x86_64/build/openwrt/build_dir/target-x86_64_musl/linux-x86_64/grub-pc/grub-2.06~rc1/ipkg-x86_64/grub2-editenv/usr/sbin/
find /home/feckert/workspace/openwrt/LDM-master-x86_64/build/openwrt/build_dir/target-x86_64_musl/linux-x86_64/grub-pc/grub-2.06~rc1/ipkg-x86_64/grub2-editenv -name 'CVS' -o -name '.svn' -o -name '.#*' -o -name '*~'| xargs -r rm -rf
Package grub2-editenv is missing dependencies for the following libraries:
liblzma.so.5
make[2]: *** [Makefile:166: /home/feckert/workspace/openwrt/LDM-master-x86_64/build/openwrt/bin/APOS/feckert/master/master-Maggie-455-ga5edc0e8e/x86_64/targets/x86/64/packages/grub2-editenv_2.06~rc1-1_x86_64.ipk] Error 1
make[2]: Leaving directory '/home/feckert/workspace/openwrt/LDM-master-x86_64/build/openwrt/package/boot/grub2'
time: package/boot/grub2/pc/compile#78.64#9.79#83.88
ERROR: package/boot/grub2 failed to build (build variant: pc).
make[1]: *** [package/Makefile:116: package/boot/grub2/compile] Error 1
make[1]: Leaving directory '/home/feckert/workspace/openwrt/LDM-master-x86_64/build/openwrt'
make: *** [/home/feckert/workspace/openwrt/LDM-master-x86_64/build/openwrt/include/toplevel.mk:230: package/boot/grub2/compile] Error 2
If I add the following changes to the package all works as expected.
<snip>
- DEPENDS:=@TARGET_x86
+ DEPENDS:=@TARGET_x86 +liblzma
VARIANT:=pc
endef
This is a hotfix but I dont´t think this is the final solution, because lzma is provided by the package xz.
And This is maintained in the package feed [not the core]"
Dirk stated & offered his patch to disable liblzma and thus resolve the
'out of core dependency' problem:
"LZMA is used in mkimage.c
disabling it prints
Without liblzma (no support for XZ-compressed mips images) (explicitly disabled)
(see configure.ac)
liblzma is autodetected so this issue was present but hidden somehow
[unsure: grep/image generation does not use grub with that option]
OpenWrt does not use that feature currently
[!] some scripts and examples use --compression=xz or -C xz and those will break
grub has an internal xzlib for different "lzma" functionality
(ext. LIBLZMA from XZ (GRUB_COMPRESSION_XZ) vs. GRUB_COMPRESSION_LZMA)"
Hopefully fixes e74d81ece2 and doesn't
break anything else.
Signed-off-by: Dirk Neukirchen <plntyk.lede@plntyk.name>
[include Florian's description of how problem 1st encountered]
[bump package release]
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
159 lines
4.6 KiB
Makefile
159 lines
4.6 KiB
Makefile
#
|
|
# Copyright (C) 2006-2015 OpenWrt.org
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
include $(INCLUDE_DIR)/kernel.mk
|
|
|
|
PKG_NAME:=grub
|
|
PKG_CPE_ID:=cpe:/a:gnu:grub2
|
|
PKG_VERSION:=2.06~rc1
|
|
PKG_RELEASE:=2
|
|
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
|
PKG_SOURCE_URL:=https://alpha.gnu.org/gnu/grub
|
|
PKG_HASH:=2c87f1f21e2ab50043e6cd9163c08f1b6c3a6171556bf23ff9ed65b074145484
|
|
|
|
HOST_BUILD_PARALLEL:=1
|
|
PKG_BUILD_DEPENDS:=grub2/host
|
|
|
|
PKG_ASLR_PIE:=0
|
|
PKG_SSP:=0
|
|
|
|
PKG_FLAGS:=nonshared
|
|
|
|
include $(INCLUDE_DIR)/host-build.mk
|
|
include $(INCLUDE_DIR)/package.mk
|
|
|
|
define Package/grub2/Default
|
|
CATEGORY:=Boot Loaders
|
|
SECTION:=boot
|
|
TITLE:=GRand Unified Bootloader ($(1))
|
|
URL:=http://www.gnu.org/software/grub/
|
|
DEPENDS:=@TARGET_x86
|
|
VARIANT:=$(1)
|
|
endef
|
|
|
|
Package/grub2=$(call Package/grub2/Default,pc)
|
|
Package/grub2-efi=$(call Package/grub2/Default,efi)
|
|
|
|
define Package/grub2-editenv
|
|
CATEGORY:=Utilities
|
|
SECTION:=utils
|
|
SUBMENU:=Boot Loaders
|
|
TITLE:=Grub2 Environment editor
|
|
URL:=http://www.gnu.org/software/grub/
|
|
DEPENDS:=@TARGET_x86
|
|
VARIANT:=pc
|
|
endef
|
|
|
|
define Package/grub2-editenv/description
|
|
Edit grub2 environment files.
|
|
endef
|
|
|
|
HOST_BUILD_PREFIX := $(STAGING_DIR_HOST)
|
|
|
|
CONFIGURE_VARS += \
|
|
grub_build_mkfont_excuse="don't want fonts"
|
|
|
|
CONFIGURE_ARGS += \
|
|
--target=$(REAL_GNU_TARGET_NAME) \
|
|
--disable-werror \
|
|
--disable-nls \
|
|
--disable-device-mapper \
|
|
--disable-libzfs \
|
|
--disable-liblzma \
|
|
--disable-grub-mkfont \
|
|
--with-platform=$(BUILD_VARIANT)
|
|
|
|
HOST_CONFIGURE_VARS += \
|
|
grub_build_mkfont_excuse="don't want fonts"
|
|
|
|
HOST_CONFIGURE_ARGS += \
|
|
--disable-grub-mkfont \
|
|
--target=$(REAL_GNU_TARGET_NAME) \
|
|
--sbindir="$(STAGING_DIR_HOST)/bin" \
|
|
--disable-werror \
|
|
--disable-libzfs \
|
|
--disable-nls \
|
|
--with-platform=none
|
|
|
|
HOST_MAKE_FLAGS += \
|
|
TARGET_RANLIB=$(TARGET_RANLIB) \
|
|
LIBLZMA=$(STAGING_DIR_HOST)/lib/liblzma.a
|
|
|
|
TARGET_CFLAGS := $(filter-out -O2 -O3 -fno-plt,$(TARGET_CFLAGS))
|
|
|
|
define Host/Configure
|
|
$(SED) 's,(RANLIB),(TARGET_RANLIB),' $(HOST_BUILD_DIR)/grub-core/Makefile.in
|
|
$(Host/Configure/Default)
|
|
endef
|
|
|
|
define Package/grub2/install
|
|
$(INSTALL_DIR) $(1)/usr/sbin
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-bios-setup $(1)/usr/sbin/
|
|
$(INSTALL_DIR) $(STAGING_DIR_IMAGE)/grub2
|
|
$(CP) $(PKG_BUILD_DIR)/grub-core/boot.img $(STAGING_DIR_IMAGE)/grub2/
|
|
$(CP) $(PKG_BUILD_DIR)/grub-core/cdboot.img $(STAGING_DIR_IMAGE)/grub2/
|
|
sed 's#msdos1#gpt1#g' ./files/grub-early.cfg >$(PKG_BUILD_DIR)/grub-early.cfg
|
|
$(STAGING_DIR_HOST)/bin/grub-mkimage \
|
|
-d $(PKG_BUILD_DIR)/grub-core \
|
|
-p /boot/grub \
|
|
-O i386-pc \
|
|
-c $(PKG_BUILD_DIR)/grub-early.cfg \
|
|
-o $(STAGING_DIR_IMAGE)/grub2/gpt-core.img \
|
|
at_keyboard biosdisk boot chain configfile fat linux ls part_gpt reboot serial vga
|
|
$(STAGING_DIR_HOST)/bin/grub-mkimage \
|
|
-d $(PKG_BUILD_DIR)/grub-core \
|
|
-p /boot/grub \
|
|
-O i386-pc \
|
|
-c ./files/grub-early.cfg \
|
|
-o $(STAGING_DIR_IMAGE)/grub2/generic-core.img \
|
|
at_keyboard biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga
|
|
$(STAGING_DIR_HOST)/bin/grub-mkimage \
|
|
-d $(PKG_BUILD_DIR)/grub-core \
|
|
-p /boot/grub \
|
|
-O i386-pc \
|
|
-c ./files/grub-early.cfg \
|
|
-o $(STAGING_DIR_IMAGE)/grub2/eltorito.img \
|
|
at_keyboard biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial test vga
|
|
$(STAGING_DIR_HOST)/bin/grub-mkimage \
|
|
-d $(PKG_BUILD_DIR)/grub-core \
|
|
-p /boot/grub \
|
|
-O i386-pc \
|
|
-c ./files/grub-early.cfg \
|
|
-o $(STAGING_DIR_IMAGE)/grub2/legacy-core.img \
|
|
biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga
|
|
endef
|
|
|
|
define Package/grub2-efi/install
|
|
sed 's#msdos1#gpt1#g' ./files/grub-early.cfg >$(PKG_BUILD_DIR)/grub-early.cfg
|
|
$(STAGING_DIR_HOST)/bin/grub-mkimage \
|
|
-d $(PKG_BUILD_DIR)/grub-core \
|
|
-p /boot/grub \
|
|
-O $(CONFIG_ARCH)-efi \
|
|
-c $(PKG_BUILD_DIR)/grub-early.cfg \
|
|
-o $(STAGING_DIR_IMAGE)/grub2/boot$(if $(CONFIG_x86_64),x64,ia32).efi \
|
|
at_keyboard boot chain configfile fat linux ls part_gpt reboot serial efi_gop efi_uga
|
|
$(STAGING_DIR_HOST)/bin/grub-mkimage \
|
|
-d $(PKG_BUILD_DIR)/grub-core \
|
|
-p /boot/grub \
|
|
-O $(CONFIG_ARCH)-efi \
|
|
-c ./files/grub-early.cfg \
|
|
-o $(STAGING_DIR_IMAGE)/grub2/iso-boot$(if $(CONFIG_x86_64),x64,ia32).efi \
|
|
at_keyboard boot chain configfile fat iso9660 linux ls part_msdos part_gpt reboot serial test efi_gop efi_uga
|
|
endef
|
|
|
|
define Package/grub2-editenv/install
|
|
$(INSTALL_DIR) $(1)/usr/sbin
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-editenv $(1)/usr/sbin/
|
|
endef
|
|
|
|
$(eval $(call HostBuild))
|
|
$(eval $(call BuildPackage,grub2))
|
|
$(eval $(call BuildPackage,grub2-efi))
|
|
$(eval $(call BuildPackage,grub2-editenv))
|