adding notes
trying to fix niceness... trying to fix speed optimizations... we should probably remove .pacnew files in the ISO. every little byte helps :/
This commit is contained in:
parent
fcd40fbccc
commit
079ff52d6c
1
TODO
1
TODO
@ -1,6 +1,7 @@
|
|||||||
## General ##
|
## General ##
|
||||||
|
|
||||||
-include WinMTR, build Mac OS X MTR for dist/tools on CD
|
-include WinMTR, build Mac OS X MTR for dist/tools on CD
|
||||||
|
-include pre-compiled DoxBox for opening LUKS parts on Windows (https://github.com/t-d-k/doxbox)
|
||||||
|
|
||||||
|
|
||||||
## NETWORKING ##
|
## NETWORKING ##
|
||||||
|
@ -1,10 +1,19 @@
|
|||||||
function holla_atcha_boi {
|
function holla_atcha_boi {
|
||||||
|
|
||||||
|
if [[ "${I_AM_A_RACECAR}" == "y" ]];
|
||||||
|
then
|
||||||
|
RACECAR_CHK='nice -n -19 '
|
||||||
|
else
|
||||||
|
RACECAR_CHK=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
# Do we have an existing chroot set up yet? If not, create.
|
# Do we have an existing chroot set up yet? If not, create.
|
||||||
if [[ ! -d "root.x86_64/root" || ! -d "root.i686/root" ]];
|
if [[ ! -d "root.x86_64/root" || ! -d "root.i686/root" ]];
|
||||||
then
|
then
|
||||||
echo "No existing chroot environment found. Creating..."
|
echo "No existing chroot environment found. Creating..."
|
||||||
rm -f ${LOCKFILE}
|
rm -f ${LOCKFILE}
|
||||||
${BASEDIR}/lib/mk.chroot.sh
|
${RACECAR_CHK} ${BASEDIR}/lib/mk.chroot.sh
|
||||||
touch ${LOCKFILE}
|
touch ${LOCKFILE}
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -39,6 +39,7 @@ function jenny_craig () {
|
|||||||
rm -f ${BUILDDIR}/root/.bashrc
|
rm -f ${BUILDDIR}/root/.bashrc
|
||||||
# DISABLE when no longer building custom kernel
|
# DISABLE when no longer building custom kernel
|
||||||
find ${BUILDDIR}/usr/lib/modules/ -maxdepth 1 -iname "*-ARCH" -exec rm -rf '{}' \;
|
find ${BUILDDIR}/usr/lib/modules/ -maxdepth 1 -iname "*-ARCH" -exec rm -rf '{}' \;
|
||||||
|
find ${BUILDDIR}/ -type f -name "*.pacnew" -exec rm -rf '{}' \;
|
||||||
rm -rf ${BUILDDIR}/usr/share/locale/*
|
rm -rf ${BUILDDIR}/usr/share/locale/*
|
||||||
mv -f ${BUILDDIR}/tmp/locale.alias ${BUILDDIR}/usr/share/locale/.
|
mv -f ${BUILDDIR}/tmp/locale.alias ${BUILDDIR}/usr/share/locale/.
|
||||||
rm -rf ${BUILDDIR}/var/cache/pacman/*
|
rm -rf ${BUILDDIR}/var/cache/pacman/*
|
||||||
|
@ -71,13 +71,6 @@ function mkchroot {
|
|||||||
CHROOTCMD="${CHROOTDIR64}/bin/arch-chroot"
|
CHROOTCMD="${CHROOTDIR64}/bin/arch-chroot"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "${I_AM_A_RACECAR}" == "y" ]];
|
|
||||||
then
|
|
||||||
RACECAR_CHK='nice -n "-19" '
|
|
||||||
else
|
|
||||||
RACECAR_CHK=""
|
|
||||||
fi
|
|
||||||
|
|
||||||
cd "${BASEDIR}"
|
cd "${BASEDIR}"
|
||||||
|
|
||||||
## Set some vars.
|
## Set some vars.
|
||||||
@ -162,10 +155,10 @@ EOF
|
|||||||
do
|
do
|
||||||
echo "Prepping ${i}. This will take a while..."
|
echo "Prepping ${i}. This will take a while..."
|
||||||
echo -n "...Key initializing..."
|
echo -n "...Key initializing..."
|
||||||
${CHROOTCMD} ${i}/ ${RACECAR_CHK}pacman-key --init >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
${CHROOTCMD} ${i}/ pacman-key --init >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
echo "Done."
|
echo "Done."
|
||||||
echo -n "...Importing keys..."
|
echo -n "...Importing keys..."
|
||||||
${CHROOTCMD} ${i}/ ${RACECAR_CHK}pacman-key --populate archlinux >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
${CHROOTCMD} ${i}/ pacman-key --populate archlinux >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
echo "Done."
|
echo "Done."
|
||||||
echo -n "...Installing base packages..."
|
echo -n "...Installing base packages..."
|
||||||
#${CHROOTCMD} ${i}/ pacstrap -dGcM base
|
#${CHROOTCMD} ${i}/ pacstrap -dGcM base
|
||||||
@ -177,7 +170,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
|
||||||
echo "Done."
|
echo "Done."
|
||||||
echo -n "...Upgrading any outdated packages..."
|
echo -n "...Upgrading any outdated packages..."
|
||||||
${CHROOTCMD} ${i}/ ${RACECAR_CHK}pacman -Syyu --noconfirm >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
${CHROOTCMD} ${i}/ pacman -Syyu --noconfirm >> "${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
|
||||||
echo "Done. Finishing/cleaning up..."
|
echo "Done. Finishing/cleaning up..."
|
||||||
${CHROOTCMD} ${i}/ pacman -S --noconfirm --needed yaourt >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
${CHROOTCMD} ${i}/ pacman -S --noconfirm --needed yaourt >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
@ -201,12 +194,12 @@ 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
|
||||||
echo -n "Compiling kernel sources..."
|
echo -n "Compiling kernel sources..."
|
||||||
set +e
|
set +e
|
||||||
${CHROOTCMD} ${i}/ bash -c "${RACECAR_CHK}yaourt -S --needed --noconfirm linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
${CHROOTCMD} ${i}/ bash -c "yaourt -S --needed --noconfirm linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
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
|
||||||
echo -n "Regular packages..."
|
echo -n "Regular packages..."
|
||||||
set +e
|
set +e
|
||||||
${CHROOTCMD} ${i}/ bash -c "yes '' | ${RACECAR_CHK}yaourt -S --needed --noconfirm ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
${CHROOTCMD} ${i}/ bash -c "yes '' | yaourt -S --needed --noconfirm ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
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
|
||||||
echo -n "...Creating ${REGUSR} user..."
|
echo -n "...Creating ${REGUSR} user..."
|
||||||
@ -220,7 +213,7 @@ EOF
|
|||||||
|
|
||||||
for i in ${CHROOTDIR32} ${CHROOTDIR64};
|
for i in ${CHROOTDIR32} ${CHROOTDIR64};
|
||||||
do
|
do
|
||||||
${CHROOTCMD} ${i}/ bash -c "${RACECAR_CHK}mkinitcpio -p linux-${PNAME}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
${CHROOTCMD} ${i}/ bash -c "mkinitcpio -p linux-${PNAME}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
done
|
done
|
||||||
|
|
||||||
# 32-bit
|
# 32-bit
|
||||||
@ -228,7 +221,7 @@ EOF
|
|||||||
PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.32 | tr '\n' ' ')
|
PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.32 | tr '\n' ' ')
|
||||||
if [ -n "${PKGLIST}" ];
|
if [ -n "${PKGLIST}" ];
|
||||||
then
|
then
|
||||||
${CHROOTCMD} ${CHROOTDIR32}/ bash -c "${RACECAR_CHK}yaourt -S --needed --noconfirm ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
${CHROOTCMD} ${CHROOTDIR32}/ bash -c "yaourt -S --needed --noconfirm ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
fi
|
fi
|
||||||
for x in $(find ${CHROOTDIR32}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
|
for x in $(find ${CHROOTDIR32}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
|
||||||
echo "Done."
|
echo "Done."
|
||||||
@ -238,7 +231,7 @@ EOF
|
|||||||
PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.64 | tr '\n' ' ')
|
PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.64 | tr '\n' ' ')
|
||||||
if [ -n "${PKGLIST}" ];
|
if [ -n "${PKGLIST}" ];
|
||||||
then
|
then
|
||||||
${CHROOTCMD} ${CHROOTDIR64}/ bash -c "${RACECAR_CHK}yaourt -S --needed --noconfirm ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
${CHROOTCMD} ${CHROOTDIR64}/ bash -c "yaourt -S --needed --noconfirm ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
fi
|
fi
|
||||||
for x in $(find ${CHROOTDIR64}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
|
for x in $(find ${CHROOTDIR64}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
|
||||||
echo "Done."
|
echo "Done."
|
||||||
|
Loading…
Reference in New Issue
Block a user