From 4b17bcd56378f2ed5dfde17c33709187b2290539 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Tue, 6 Feb 2018 21:41:08 +0100 Subject: adapted to linux config naming changes rebuild world small fixes --- BUGS | 4 + TODOS | 1 - build_stage1_package.sh | 8 +- create_cdrom.sh | 8 +- i486-stage1/linux/DESCR | 5 - i486-stage1/linux/config | 2452 +++++++++++++++++++++++++++++++++++++++++ i486-stage1/linux/config.i486 | 2452 ----------------------------------------- i486-stage1/pacman/DESCR | 10 +- 8 files changed, 2473 insertions(+), 2467 deletions(-) create mode 100644 BUGS create mode 100644 i486-stage1/linux/config delete mode 100644 i486-stage1/linux/config.i486 diff --git a/BUGS b/BUGS new file mode 100644 index 0000000..5d17d2d --- /dev/null +++ b/BUGS @@ -0,0 +1,4 @@ +bsdtar: /home/cross/i486-root/packages/i486/linux-docs-4.15.1-2-i486.pkg.tar.xz: Not found in archive +bsdtar: /home/cross/i486-root/packages/i486/linux-headers-4.15.1-2-i486.pkg.tar.xz: Not found in archive +bsdtar: Error exit delayed from previous errors. +Built package linux. diff --git a/TODOS b/TODOS index dea9adb..b3d436f 100644 --- a/TODOS +++ b/TODOS @@ -5,4 +5,3 @@ - makepkg with an 'alternate root' option (which doens't collide with pacman's options), avoids patching -r and --config into makepkg for stage1 - diff --git a/build_stage1_package.sh b/build_stage1_package.sh index 585f2db..a73cb17 100755 --- a/build_stage1_package.sh +++ b/build_stage1_package.sh @@ -70,7 +70,7 @@ if test $(pacman --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" - # copy all other files from Archlinux32, if they exist # (we assume, we only take core packages during stage1) if test -f "$DIFF_PKGBUILD"; then - find $ARCHLINUX32_PACKAGES/core/pacman-mirrorlist/* ! -name PKGBUILD \ + find $ARCHLINUX32_PACKAGES/core/$PACKAGE/* ! -name PKGBUILD \ -exec cp {} . \; fi @@ -82,8 +82,10 @@ if test $(pacman --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" - fi # copy all files into the build area (but the package DESCR file) - cp $PACKAGE_DIR/* . - rm -f DESCR + if test -d $PACKAGE_DIR; then + find $PACKAGE_DIR/* ! -name DESCR \ + -exec cp {} . \; + fi # disable or enable parallel builds diff --git a/create_cdrom.sh b/create_cdrom.sh index b0dab38..e53bbf5 100755 --- a/create_cdrom.sh +++ b/create_cdrom.sh @@ -6,12 +6,15 @@ # no ramdisk, no modules, no fancy startup, just a shell script sudo rm -rf $STAGE1_ISOLINUX + +# copy chroot to ISOlinux dir mkdir $STAGE1_ISOLINUX sudo cp -a $STAGE1_CHROOT/* $STAGE1_ISOLINUX/. sudo chown -R cross:cross $STAGE1_ISOLINUX/. cd $STAGE1_ISOLINUX + +# simple ISOlinux menu, with options for fast choosing a root device mkdir boot/isolinux -sudo chown cross:cross boot/isolinux/isolinux.cfg cat >boot/isolinux/isolinux.cfg <etc/init/boot <