fixing some buildtime issues..
This commit is contained in:
parent
904d644990
commit
f549d24977
@ -1,7 +1,7 @@
|
|||||||
# Server list generated by rankmirrors on 2015-01-10
|
# Server list generated by rankmirrors on 2015-02-01
|
||||||
Server = http://mirrors.advancedhosters.com/archlinux/$repo/os/$arch
|
Server = http://mirrors.acm.wpi.edu/archlinux/$repo/os/$arch
|
||||||
Server = http://mirror.yellowfiber.net/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://mirrors.advancedhosters.com/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
|
Server = http://mirror.umd.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
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
# run. Advanced users may wish to specify all system modules
|
# run. Advanced users may wish to specify all system modules
|
||||||
# in this array. For instance:
|
# in this array. For instance:
|
||||||
# MODULES="piix ide_disk reiserfs"
|
# MODULES="piix ide_disk reiserfs"
|
||||||
MODULES="aufs ata_generic ata_piix loop nls_cp437 ext4 raid456 vfat netconsole"
|
MODULES="overlay ata_generic ata_piix loop nls_cp437 ext4 raid456 vfat netconsole"
|
||||||
|
|
||||||
# BINARIES
|
# BINARIES
|
||||||
# This setting includes any additional binaries a given user may
|
# This setting includes any additional binaries a given user may
|
||||||
|
@ -4,7 +4,7 @@ run_cleanuphook () {
|
|||||||
msg ":: Mounting OverlayFS on / with tmpfs=rw, ${root}=ro ..."
|
msg ":: Mounting OverlayFS on / with tmpfs=rw, ${root}=ro ..."
|
||||||
modprobe overlay
|
modprobe overlay
|
||||||
|
|
||||||
echo "Now attempting aufs mount..."
|
echo "Now attempting overlay mount..."
|
||||||
|
|
||||||
mkdir /new_root.hw
|
mkdir /new_root.hw
|
||||||
mount --move /new_root /new_root.hw
|
mount --move /new_root /new_root.hw
|
||||||
|
@ -4,7 +4,6 @@ build()
|
|||||||
{
|
{
|
||||||
add_module 'squashfs'
|
add_module 'squashfs'
|
||||||
add_module 'loop'
|
add_module 'loop'
|
||||||
add_module 'aufs'
|
|
||||||
add_module 'overlay'
|
add_module 'overlay'
|
||||||
|
|
||||||
add_binary "sed"
|
add_binary "sed"
|
||||||
|
@ -40,7 +40,10 @@ function mentos {
|
|||||||
for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
|
for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
|
||||||
${CHROOTCMD} ${i}/ bash -c "${RACECAR_CHK}apacman --noconfirm --noedit --skipinteg -S --needed --ignore linux ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
${CHROOTCMD} ${i}/ bash -c "${RACECAR_CHK}apacman --noconfirm --noedit --skipinteg -S --needed --ignore linux ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
|
for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
|
||||||
|
${CHROOTCMD} ${i}/ /usr/bin/bash -c "mkinitcpio -p linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
#${CHROOTCMD} ${i}/ bash -c "apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}"
|
#${CHROOTCMD} ${i}/ bash -c "apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}"
|
||||||
|
cp -a ${i}/boot/vmlinuz-linux ${i}/boot/vmlinuz-linux-${PNAME}
|
||||||
|
cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${PNAME}.img
|
||||||
echo "Done."
|
echo "Done."
|
||||||
done
|
done
|
||||||
|
|
||||||
|
@ -74,7 +74,8 @@ function mkchroot {
|
|||||||
cd "${BASEDIR}"
|
cd "${BASEDIR}"
|
||||||
|
|
||||||
## Set some vars.
|
## Set some vars.
|
||||||
MIRROR='http://mirrors.kernel.org/archlinux'
|
#MIRROR='http://mirrors.kernel.org/archlinux'
|
||||||
|
MIRROR='http://mirror.us.leaseweb.net/archlinux'
|
||||||
RLSDIR="${MIRROR}/iso/latest"
|
RLSDIR="${MIRROR}/iso/latest"
|
||||||
|
|
||||||
CURRLS64=$(curl -s ${RLSDIR}/sha1sums.txt | grep bootstrap | awk '{print $2}' | grep 'x86_64')
|
CURRLS64=$(curl -s ${RLSDIR}/sha1sums.txt | grep bootstrap | awk '{print $2}' | grep 'x86_64')
|
||||||
@ -185,8 +186,7 @@ EOF
|
|||||||
mkdir -p ${i}/var/tmp/pkg
|
mkdir -p ${i}/var/tmp/pkg
|
||||||
cp ${BASEDIR}/extra/bootstrap/apacman* ${i}/var/tmp/pkg/apacman.tar.xz
|
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
|
#${CHROOTCMD} ${i} "pacman --noconfirm -U /var/tmp/pkg/apacman.tar.xz" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
${CHROOTCMD} ${i} bash -c "pacman --noconfirm -U /var/tmp/pkg/apacman.tar.xz" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
${CHROOTCMD} ${i} bash -c "pacman --noconfirm -U /var/tmp/pkg/apacman.tar.xz && mkdir /var/tmp/apacman && chmod 0750 /var/tmp/apacman && chown root:aurbuild /var/tmp/apacman " >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
mkdir ${i}/var/tmp/apacman ; chmod 0750 ${i}/var/tmp/apacman ; chown 0:$(egrep '^aurbuild' ${i}/etc/group | cut -f3 -d":") ${i}/var/tmp/apacman
|
|
||||||
for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
|
for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
|
||||||
${CHROOTCMD} ${i} bash -c "apacman -S --noconfirm --noedit --skipinteg -S apacman-deps expac" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
${CHROOTCMD} ${i} bash -c "apacman -S --noconfirm --noedit --skipinteg -S apacman-deps expac" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
#rm -rf ${i}/var/tmp/pkg
|
#rm -rf ${i}/var/tmp/pkg
|
||||||
@ -218,7 +218,7 @@ EOF
|
|||||||
for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
|
for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
|
||||||
set +e
|
set +e
|
||||||
${CHROOTCMD} ${i}/ /usr/bin/bash -c "apacman --noconfirm --noedit --skipinteg -S --needed linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
${CHROOTCMD} ${i}/ /usr/bin/bash -c "apacman --noconfirm --noedit --skipinteg -S --needed linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
cp -a ${i}/boot/vmlinuz-linux ${i}/boot/vmlinuz/vmlinuz-linux-${PNAME}
|
cp -a ${i}/boot/vmlinuz-linux ${i}/boot/vmlinuz-linux-${PNAME}
|
||||||
cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${PNAME}.img
|
cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${PNAME}.img
|
||||||
set -e
|
set -e
|
||||||
for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
|
for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
|
||||||
@ -265,7 +265,9 @@ EOF
|
|||||||
for i in ${CHROOTDIR32} ${CHROOTDIR64};
|
for i in ${CHROOTDIR32} ${CHROOTDIR64};
|
||||||
do
|
do
|
||||||
set +e
|
set +e
|
||||||
|
for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
|
||||||
${CHROOTCMD} ${i}/ /usr/bin/bash -c "mkinitcpio -p linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
${CHROOTCMD} ${i}/ /usr/bin/bash -c "mkinitcpio -p linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
|
cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${PNAME}.img
|
||||||
set -e
|
set -e
|
||||||
done
|
done
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user