diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-22 21:24:57 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-22 21:24:57 +0100 |
| commit | eef874380c8fd39078f1fe4834a8efd886f4b5df (patch) | |
| tree | 1dcea8c0cea4df213a8c72b0b9c4728c1ecf1074 | |
| parent | 82d9ee821ed8ace6c084fdc7064effc1dd27ccb1 (diff) | |
work around static jail limitation, always peform a jail upgrade before starting the actual build...till we sort out full bootstrap, this is good enough
| -rw-r--r-- | src/backend/c_jail.sh | 1 | ||||
| -rw-r--r-- | src/backend/f_makepkg.sh | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/backend/c_jail.sh b/src/backend/c_jail.sh index acdf0db..0a486b4 100644 --- a/src/backend/c_jail.sh +++ b/src/backend/c_jail.sh @@ -5,6 +5,7 @@ export local jailsrcmodecmd="vasile --srcmode" export local jaildkmscmd="vasile --dkms" export local jailmandbcmd="mandb --create" export local jailportagecmd="emerge -kav "$jailtarget"" +export local jailupgradecmd="emerge -NuDKv --backtrack=100 --with-bdeps=y @world --exclude linux-image-lts --exclude linux-headers-lts --exclude linux-image-redcore --exclude linux-sources-redcore" export local jaildracutcmd="dracut -N -a dmsquash-live -a pollcdrom --force --kver="$kernver" /boot/"$jailramfsname"" export local jailmkchainloadercmd="grub2-mkimage -d /usr/lib64/grub/i386-pc -o core.img -O i386-pc biosdisk part_msdos fat -p /boot/grub" export local jailmkx64eficmd="grub2-mkimage -d /usr/lib64/grub/x86_64-efi -o bootx64.efi -O x86_64-efi ext2 fat udf btrfs ntfs reiserfs xfs hfsplus lvm ata part_msdos part_gpt part_apple bsd search_fs_uuid normal chain iso9660 configfile help loadenv reboot cat search memdisk tar boot linux chain -p /boot/grub" diff --git a/src/backend/f_makepkg.sh b/src/backend/f_makepkg.sh index 1c16d45..0c4d0b8 100644 --- a/src/backend/f_makepkg.sh +++ b/src/backend/f_makepkg.sh @@ -48,6 +48,10 @@ jailpkgsrcmode () { chroot "$overlaypath" su - "$jailuser" -c "$jailsrcmodecmd" } +jailpkgupgrade () { + chroot "$overlaypath" su - "$jailuser" -c "$jailupgradecmd" +} + jailpkgbuild () { chroot "$overlaypath" su - "$jailuser" -c "$jailportagecmd" } @@ -62,6 +66,7 @@ makepkg () { checkjailsum jailpkgprep jailpkgsrcmode + jailpkgupgrade jailpkgbuild jailpkgstart jailpkgdmnt |