Android-x86
Fork
Spenden

  • R/O
  • HTTP
  • SSH
  • HTTPS

bootable-newinstaller: Commit

bootable/newinstaller


Commit MetaInfo

Revision75a8f3d4e998490fe14455ad59ca9c0e82520695 (tree)
Zeit2019-10-05 19:43:40
AutorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

Fix building issues of q-x86

Android 10 restricts the external host tools usable inside the build.
To overcome that, specify the PATH directly.

Ändern Zusammenfassung

Diff

--- a/Android.mk
+++ b/Android.mk
@@ -74,6 +74,7 @@ $(boot_dir): $(shell find $(LOCAL_PATH)/boot -type f | sort -r) $(isolinux_files
7474 $(ACP) -pr $(dir $(<D)) $@
7575 $(ACP) -pr $(dir $(<D))../install/grub2/efi $@
7676 $(ACP) $(isolinux_files) $@/isolinux
77+ PATH="/sbin:/usr/sbin:/bin:/usr/bin"; \
7778 img=$@/boot/grub/efi.img; dd if=/dev/zero of=$$img bs=1M count=4; \
7879 mkdosfs -n EFI $$img; mmd -i $$img ::boot; \
7980 mcopy -si $$img $@/efi ::; mdel -i $$img ::efi/boot/*.cfg
@@ -81,14 +82,15 @@ $(boot_dir): $(shell find $(LOCAL_PATH)/boot -type f | sort -r) $(isolinux_files
8182 BUILT_IMG := $(addprefix $(PRODUCT_OUT)/,ramdisk.img initrd.img install.img) $(systemimg)
8283 BUILT_IMG += $(if $(TARGET_PREBUILT_KERNEL),$(TARGET_PREBUILT_KERNEL),$(PRODUCT_OUT)/kernel)
8384
84-GENISOIMG := $(if $(shell which xorriso 2> /dev/null),xorriso -as mkisofs,genisoimage)
8585 ISO_IMAGE := $(PRODUCT_OUT)/$(TARGET_PRODUCT).iso
8686 $(ISO_IMAGE): $(boot_dir) $(BUILT_IMG)
8787 @echo ----- Making iso image ------
8888 $(hide) sed -i "s|\(Installation CD\)\(.*\)|\1 $(VER)|; s|CMDLINE|$(BOARD_KERNEL_CMDLINE)|" $</isolinux/isolinux.cfg
8989 $(hide) sed -i "s|VER|$(VER)|; s|CMDLINE|$(BOARD_KERNEL_CMDLINE)|" $</efi/boot/android.cfg
9090 sed -i "s|OS_TITLE|$(if $(RELEASE_OS_TITLE),$(RELEASE_OS_TITLE),Android-x86)|" $</isolinux/isolinux.cfg $</efi/boot/android.cfg
91- $(GENISOIMG) -vJURT -b isolinux/isolinux.bin -c isolinux/boot.cat \
91+ PATH="/sbin:/usr/sbin:/bin:/usr/bin"; \
92+ which xorriso > /dev/null 2>&1 && GENISOIMG="xorriso -as mkisofs" || GENISOIMG=genisoimage; \
93+ $$GENISOIMG -vJURT -b isolinux/isolinux.bin -c isolinux/boot.cat \
9294 -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot \
9395 -input-charset utf-8 -V "$(if $(RELEASE_OS_TITLE),$(RELEASE_OS_TITLE),Android-x86) LiveCD" -o $@ $^
9496 $(hide) external/syslinux/bios/utils/isohybrid.pl $@
@@ -98,6 +100,7 @@ rpm: $(wildcard $(LOCAL_PATH)/rpm/*) $(BUILT_IMG)
98100 @echo ----- Making an rpm ------
99101 OUT=$(abspath $(PRODUCT_OUT)); mkdir -p $$OUT/rpm/BUILD; rm -rf $$OUT/rpm/RPMS/*; $(ACP) $< $$OUT; \
100102 echo $(VER) | grep -vq rc; EPOCH=$$((-$$? + `echo $(VER) | cut -d. -f1`)); \
103+ PATH="/sbin:/usr/sbin:/bin:/usr/bin"; \
101104 rpmbuild -bb --target=$(if $(filter x86,$(TARGET_ARCH)),i686,x86_64) -D"cmdline $(BOARD_KERNEL_CMDLINE)" \
102105 -D"_topdir $$OUT/rpm" -D"_sourcedir $$OUT" -D"systemimg $(notdir $(systemimg))" -D"ver $(VER)" -D"epoch $$EPOCH" \
103106 $(if $(BUILD_NAME_VARIANT),-D"name $(BUILD_NAME_VARIANT)") \
Show on old repository browser