diff --git a/bin/build.sh b/bin/build.sh index cd45f20..8095773 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -67,7 +67,7 @@ for i in ${ROOTDIR} ${CHROOTDIR32} ${CHROOTDIR64} ${BUILDDIR}32 ${BUILDDIR}64 ${ do if [ ! -d ${i} ]; then - echo "${i} does not exist - creating." + #echo "${i} does not exist - creating." mkdir -p ${i} fi done diff --git a/extra/mirrorlist b/extra/mirrorlist index 6fefe45..ac24ffe 100644 --- a/extra/mirrorlist +++ b/extra/mirrorlist @@ -1,7 +1,7 @@ -# Server list generated by rankmirrors on 2014-11-10 -Server = http://mirror.rit.edu/archlinux/$repo/os/$arch -Server = http://mirror.cc.columbia.edu/pub/linux/archlinux/$repo/os/$arch -Server = http://mirrors.acm.wpi.edu/archlinux/$repo/os/$arch -Server = http://mirror.jmu.edu/pub/archlinux/$repo/os/$arch -Server = http://mirror.cs.pitt.edu/archlinux/$repo/os/$arch -Server = http://mirror.vtti.vt.edu/archlinux/$repo/os/$arch +# Server list generated by rankmirrors on 2015-01-10 +Server = http://mirrors.advancedhosters.com/archlinux/$repo/os/$arch +Server = http://mirror.yellowfiber.net/archlinux/$repo/os/$arch +Server = http://mirror.es.its.nyu.edu/archlinux/$repo/os/$arch +Server = http://mirror.us.leaseweb.net/archlinux/$repo/os/$arch +Server = http://mirrors.rutgers.edu/archlinux/$repo/os/$arch +Server = http://mirror.umd.edu/archlinux/$repo/os/$arch diff --git a/extra/pre-build.d/root/post-build.sh b/extra/pre-build.d/root/post-build.sh new file mode 100755 index 0000000..089ee72 --- /dev/null +++ b/extra/pre-build.d/root/post-build.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +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 + +ABSROOT=/tmp +abs core/linux + +cd /tmp/core/linux +customizepkg --modify + +sudo -u nobody makepkg +set -e + +echo "Done." diff --git a/lib/mk.chroot.sh b/lib/mk.chroot.sh index 8d11220..a6ad345 100755 --- a/lib/mk.chroot.sh +++ b/lib/mk.chroot.sh @@ -182,9 +182,12 @@ EOF ## https://projects.archlinux.org/pacman.git/tree/NEWS#n54 ## https://bugs.archlinux.org/task/43302 #${CHROOTCMD} ${i}/ pacman -S --noconfirm --needed yaourt >> "${LOGFILE}.${FUNCNAME}" 2>&1 - cp ${BASEDIR}/extra/bootstrap/apacman* ${i}/tmp/. - ${CHROOTCMD} ${i} "pacman --noconfirm -U /tmp/apacman-*.tar.xz" >> "${LOGFILE}.${FUNCNAME}" 2>&1 + mkdir ${i}/var/tmp/pkg + cp ${BASEDIR}/extra/bootstrap/apacman* ${i}/var/tmp/pkg/apacman.tar.xz + #${CHROOTCMD} ${i} "pacman --noconfirm -U /var/tmp/pkg/apacman.tar.xz" >> "${LOGFILE}.${FUNCNAME}" 2>&1 + ${i}/usr/bin/pacman --noconfirm -r ${i} -U ${i}/var/tmp/pkg/apacman.tar.xz >> "${LOGFILE}.${FUNCNAME}" 2>&1 ${CHROOTCMD} ${i}/ "apacman -S --noconfirm --noedit apacman-deps expac" >> "${LOGFILE}.${FUNCNAME}" 2>&1 + #rm -rf ${i}/var/tmp/pkg #${CHROOTCMD} ${i}/ pacman -S --noconfirm --needed yaourt >> "${LOGFILE}.${FUNCNAME}" 2>&1 for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done done @@ -211,11 +214,16 @@ EOF echo "Running post-build tasks (building kernel, etc.)" ${CHROOTCMD} ${i}/ /usr/bin/bash -c "/root/post-build.sh" >> "${LOGFILE}.${FUNCNAME}" 2>&1 for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done + #set +e + #${CHROOTCMD} ${i}/ /usr/bin/bash -c "apacman --noconfirm --noedit -S --needed --noconfirm linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1 + #set -e + #for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done + # Uncomment if you wish to use the mkpasswd binary from within the chroot... #${CHROOTCMD} ${i}/ bash -c "apacman --noconfirm --noedit -S --needed --noconfirm debian-whois-mkpasswd" >> "${LOGFILE}.${FUNCNAME}" 2>&1 #for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done echo -n "Regular packages..." set +e - ${CHROOTCMD} ${i}/ bash -c "yes '' | apacman --noconfirm --noedit -S --needed --noconfirm ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1 + ${CHROOTCMD} ${i}/ bash -c "yes '' | apacman --noconfirm --noedit -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1 for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done # User creation set -e