finally. v1.20 builds.
This commit is contained in:
parent
f3d08daab8
commit
951333ae10
2
TODO
2
TODO
@ -31,7 +31,7 @@
|
|||||||
-does gummiboot? loader? wtfever it's called support splash backgrounds? can i implement that differently somehow?
|
-does gummiboot? loader? wtfever it's called support splash backgrounds? can i implement that differently somehow?
|
||||||
-Host-specific chroot customizations (i.e. -J in <chroot>/etc/makepkg.conf
|
-Host-specific chroot customizations (i.e. -J in <chroot>/etc/makepkg.conf
|
||||||
-strip out/remove unnecessary and orphan packages (e.g. gcc, make, automake, etc.)
|
-strip out/remove unnecessary and orphan packages (e.g. gcc, make, automake, etc.)
|
||||||
-incorporate iPXE image building for "mini-iso's/mini-img's"
|
-incorporate iPXE image building for "mini-iso's/mini-img's" - this is mostly done, i just need to implement the below tweaks.
|
||||||
--http://ipxe.org/crypto
|
--http://ipxe.org/crypto
|
||||||
--http://ipxe.org/cmd/imgtrust
|
--http://ipxe.org/cmd/imgtrust
|
||||||
--http://ipxe.org/cmd/imgverify
|
--http://ipxe.org/cmd/imgverify
|
||||||
|
@ -18,12 +18,14 @@ _curl_get() {
|
|||||||
local _url="${1}"
|
local _url="${1}"
|
||||||
local _dst="${2}"
|
local _dst="${2}"
|
||||||
|
|
||||||
msg ":: Downloading '${_url}'"
|
msg ":: Downloading image"
|
||||||
if ! curl -L -fs -o "/run/archiso/httpspace/${archisobasedir}${_dst}/${_url##*/}" --create-dirs "${_url}"; then
|
if ! curl -L -f -o "/run/archiso/httpspace/${archisobasedir}${_dst}/${_url##*/}" --create-dirs "${_url}"; then
|
||||||
echo "ERROR: Downloading failed."
|
echo "ERROR: Downloading failed."
|
||||||
#echo " Falling back to interactive prompt"
|
#echo " Falling back to interactive prompt"
|
||||||
#echo " You can try to fix the problem manually, log out when you are finished"
|
#echo " You can try to fix the problem manually, log out when you are finished"
|
||||||
#launch_interactive_shell
|
#launch_interactive_shell
|
||||||
|
sleep 4
|
||||||
|
reboot -f
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,11 +43,11 @@ function will_it_blend () {
|
|||||||
local BUILDDIR="${BUILDDIR}${ARCHSUFFIX}"
|
local BUILDDIR="${BUILDDIR}${ARCHSUFFIX}"
|
||||||
|
|
||||||
# now let's build the squashed image... and generate some checksums as well to verify download integrity.
|
# now let's build the squashed image... and generate some checksums as well to verify download integrity.
|
||||||
# are we building split-arch ISOs?
|
# are we building split-arch ISOs? do we need the below?
|
||||||
if [[ "${MULTIARCH}" == "n" ]];
|
#if [[ "${MULTIARCH}" == "n" ]];
|
||||||
then
|
#then
|
||||||
rm -rf ${ARCHBOOT}
|
# rm -rf ${ARCHBOOT}
|
||||||
fi
|
#fi
|
||||||
mkdir -p ${ARCHBOOT}/${AIROOT}
|
mkdir -p ${ARCHBOOT}/${AIROOT}
|
||||||
|
|
||||||
if [ ! -f "${ARCHBOOT}/${AIROOT}/airootfs.sfs" ] || [ "${CHROOTDIR}/root/.bash_history" -nt "${ARCHBOOT}/${AIROOT}/airootfs.sfs" ];
|
if [ ! -f "${ARCHBOOT}/${AIROOT}/airootfs.sfs" ] || [ "${CHROOTDIR}/root/.bash_history" -nt "${ARCHBOOT}/${AIROOT}/airootfs.sfs" ];
|
||||||
|
@ -300,10 +300,10 @@ EOF
|
|||||||
#make all EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
#make all EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
mv -f ${BASEDIR}/src/ipxe/src/bin/ipxe.usb ${ISODIR}/${USBFILENAME}
|
mv -f ${BASEDIR}/src/ipxe/src/bin/ipxe.usb ${ISODIR}/${USBFILENAME}
|
||||||
mv -f ${BASEDIR}/src/ipxe/src/bin/ipxe.eiso ${ISODIR}/${MINIFILENAME}
|
mv -f ${BASEDIR}/src/ipxe/src/bin/ipxe.eiso ${ISODIR}/${MINIFILENAME}
|
||||||
make clean > /dev/null 2>&1
|
make clean >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
git reset --hard > /dev/null 2>&1
|
git reset --hard >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
git clean -xdf > /dev/null 2>&1
|
git clean -xdf > /dev/null 2>&1
|
||||||
git checkout -- HEAD > /dev/null 2>&1
|
git checkout master > /dev/null 2>&1
|
||||||
#git reset --hard HEAD > /dev/null 2>&1
|
#git reset --hard HEAD > /dev/null 2>&1
|
||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
@ -330,7 +330,7 @@ EOF
|
|||||||
echo "=Mini USB="
|
echo "=Mini USB="
|
||||||
echo "Size: $(ls -lh ${ISODIR}/${USBFILENAME} | awk '{print $5}')"
|
echo "Size: $(ls -lh ${ISODIR}/${USBFILENAME} | awk '{print $5}')"
|
||||||
echo "SHA256: $(awk '{print $1}' ${ISODIR}/${USBFILENAME}.sha256)"
|
echo "SHA256: $(awk '{print $1}' ${ISODIR}/${USBFILENAME}.sha256)"
|
||||||
echo "Location: ${ISODIR}/${MINIFILENAME}"
|
echo "Location: ${ISODIR}/${USBFILENAME}"
|
||||||
fi
|
fi
|
||||||
#rm -rf ${TEMPDIR}/*
|
#rm -rf ${TEMPDIR}/*
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user