diff --git a/extra/pre-build.d/root/post-build.sh b/extra/pre-build.d/root/post-build.sh index 089ee72..6a11aef 100755 --- a/extra/pre-build.d/root/post-build.sh +++ b/extra/pre-build.d/root/post-build.sh @@ -2,21 +2,26 @@ set -e -echo -n "...Packages installing to ${i}..." apacman --noconfirm --noedit -S --needed customizepkg-scripting echo -n "Compiling kernel sources..." set +e ## Uncomment below and remove manual ABS/makepkg when https://github.com/oshazard/apacman/issues/2 is fulfulled -apacman --noconfirm --noedit -S --needed --noconfirm linux +#apacman --noconfirm --noedit -S --needed linux -ABSROOT=/tmp +export ABSROOT=/tmp abs core/linux cd /tmp/core/linux customizepkg --modify +chown -R nobody:nobody /tmp/core/linux sudo -u nobody makepkg set -e +for i in $(ls -1 linux-*.pkg.tar.xz | sort); +do + pacman --noconfirm -U ${i} +done + echo "Done." diff --git a/lib/05-jenny_craig.func.sh b/lib/05-jenny_craig.func.sh index 1e96c72..d8b4fd6 100644 --- a/lib/05-jenny_craig.func.sh +++ b/lib/05-jenny_craig.func.sh @@ -27,8 +27,8 @@ function jenny_craig () { # sync over new changes and trim out the fat rsync -a --delete ${CHROOTDIR}/. ${BUILDDIR}/. set +e - cp -af ${BUILDDIR}/usr/share/zoneinfo/EST5EDT ${BUILDDIR}/etc/localtime - cp -af ${CHROOTDIR}/usr/share/zoneinfo/EST5EDT ${CHROOTDIR}/etc/localtime + cp -af ${BUILDDIR}/usr/share/zoneinfo/EST5EDT ${BUILDDIR}/etc/localtime > /dev/null 2>&1 + cp -af ${CHROOTDIR}/usr/share/zoneinfo/EST5EDT ${CHROOTDIR}/etc/localtime > /dev/null 2>&1 set -e cp -af ${BUILDDIR}/usr/share/locale/locale.alias ${BUILDDIR}/tmp/. echo "Cleaning up unnecessary cruft in ${BUILDDIR}..."