r00t2/bdisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

make mini opt-in

Browse Source
This commit is contained in:
brent s. 2015-07-01 04:00:34 -04:00
parent a20104dcb4
commit f3d08daab8
2 changed files with 62 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extra/build.conf.sample
View File

@ -57,6 +57,10 @@ TFTPGRP="root"
# (and thus doesn't fit on a normal CD. Still fits on DVDs and USBs though!) # (and thus doesn't fit on a normal CD. Still fits on DVDs and USBs though!)
MULTIARCH="yes" MULTIARCH="yes"


# If you would like to build an iPXE-enabled *mini* ISO *in addition to* the ful ISO,
# set this to "yes". Otherwise, just build the full ISO.
BUILDMINI="no"

# set to "yes" to enable pushing new changes to a git repo/committing to a local repo # set to "yes" to enable pushing new changes to a git repo/committing to a local repo
GIT="no" GIT="no"


@ -151,7 +155,6 @@ if [ -z "${MULTIARCH}" ];
then then
MULTIARCH="y" MULTIARCH="y"
fi fi

MULTIARCH=${MULTIARCH:0:1} MULTIARCH=${MULTIARCH:0:1}
MULTIARCH=$(echo ${MULTIARCH} | tr [[:upper:]] [[:lower:]]) MULTIARCH=$(echo ${MULTIARCH} | tr [[:upper:]] [[:lower:]])


@ -160,6 +163,13 @@ if [ -z "${I_AM_A_RACECAR}" ];
then then
I_AM_A_RACECAR="n" I_AM_A_RACECAR="n"
fi fi

I_AM_A_RACECAR=${I_AM_A_RACECAR:0:1} I_AM_A_RACECAR=${I_AM_A_RACECAR:0:1}
I_AM_A_RACECAR=$(echo ${I_AM_A_RACECAR} | tr [[:upper:]] [[:lower:]]) I_AM_A_RACECAR=$(echo ${I_AM_A_RACECAR} | tr [[:upper:]] [[:lower:]])

# BUILD MINI?
if [ -z "${BUILDMINI}" ];
then
BUILDMINI="n"
fi
BUILDMINI=${BUILDMINI:0:1}
BUILDMINI=$(echo ${BUILDMINI} | tr [[:upper:]] [[:lower:]])

89
lib/09-yo_dj.func.sh
View File

@ -278,49 +278,60 @@ EOF
-output "${ISODIR}/${ISOFILENAME}" "${TEMPDIR}" >> "${LOGFILE}.${FUNCNAME}" 2>&1 -output "${ISODIR}/${ISOFILENAME}" "${TEMPDIR}" >> "${LOGFILE}.${FUNCNAME}" 2>&1


## Build the mini-ISO ## ## Build the mini-ISO ##
echo "Now generating the iPXE images; please wait..." if [[ "${BUILDMINI}" == "y" ]];
cd ${BASEDIR}/src/ipxe/src then
git clean -xdf > /dev/null 2>&1 echo "Now generating the iPXE images; please wait..."
git reset --hard HEAD >> "${LOGFILE}.${FUNCNAME}" 2>&1 git submodule init >> "${LOGFILE}.${FUNCNAME}" 2>&1
git checkout master >> "${LOGFILE}.${FUNCNAME}" 2>&1 git submodule update >> "${LOGFILE}.${FUNCNAME}" 2>&1
git pull >> "${LOGFILE}.${FUNCNAME}" 2>&1 cd ${BASEDIR}/src/ipxe/src
git checkout master >> "${LOGFILE}.${FUNCNAME}" 2>&1 git clean -xdf > /dev/null 2>&1
for i in $(find ${BASEDIR}/src/ipxe_local/patches/ -type f -iname "*.patch" -printf '%P\n'); git reset --hard HEAD >> "${LOGFILE}.${FUNCNAME}" 2>&1
do git checkout master >> "${LOGFILE}.${FUNCNAME}" 2>&1
patch -Np2 < ${BASEDIR}/src/ipxe_local/patches/${i} >> "${LOGFILE}.${FUNCNAME}" 2>&1 git pull >> "${LOGFILE}.${FUNCNAME}" 2>&1
done git checkout master >> "${LOGFILE}.${FUNCNAME}" 2>&1
#make everything EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1 for i in $(find ${BASEDIR}/src/ipxe_local/patches/ -type f -iname "*.patch" -printf '%P\n' | sort);
make bin/ipxe.eiso EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1 do
make bin/ipxe.usb EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1 patch -Np2 < ${BASEDIR}/src/ipxe_local/patches/${i} >> "${LOGFILE}.${FUNCNAME}" 2>&1
# Change this to USB-only... done
#make all EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1 #make everything EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1
mv -f ${BASEDIR}/src/ipxe/src/bin/ipxe.usb ${ISODIR}/${USBFILENAME} make bin-i386-efi/ipxe.efi bin-x86_64-efi/ipxe.efi EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1
mv -f ${BASEDIR}/src/ipxe/src/bin/ipxe.eiso ${ISODIR}/${MINIFILENAME} make bin/ipxe.eiso bin/ipxe.usb EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1
make clean > /dev/null 2>&1 # Change this to USB-only...
git reset --hard > /dev/null 2>&1 #make all EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1
git clean -xdf > /dev/null 2>&1 mv -f ${BASEDIR}/src/ipxe/src/bin/ipxe.usb ${ISODIR}/${USBFILENAME}
git checkout -- HEAD > /dev/null 2>&1 mv -f ${BASEDIR}/src/ipxe/src/bin/ipxe.eiso ${ISODIR}/${MINIFILENAME}
#git reset --hard HEAD > /dev/null 2>&1 make clean > /dev/null 2>&1
echo git reset --hard > /dev/null 2>&1
git clean -xdf > /dev/null 2>&1
git checkout -- HEAD > /dev/null 2>&1
#git reset --hard HEAD > /dev/null 2>&1
echo
fi


#isohybrid ${ISOFILENAME} #isohybrid ${ISOFILENAME}
cd ${ISODIR} cd ${ISODIR}
${RACECAR_CHK}sha256sum ${ISOFILENAME} > ${ISOFILENAME}.sha256 ${RACECAR_CHK}sha256sum ${ISOFILENAME} > ${ISOFILENAME}.sha256
${RACECAR_CHK}sha256sum ${MINIFILENAME} > ${MINIFILENAME}.sha256 if [[ "${BUILDMINI}" == "y" ]];
${RACECAR_CHK}sha256sum ${USBFILENAME} > ${USBFILENAME}.sha256 then
${RACECAR_CHK}sha256sum ${MINIFILENAME} > ${MINIFILENAME}.sha256
${RACECAR_CHK}sha256sum ${USBFILENAME} > ${USBFILENAME}.sha256
fi
cd .. cd ..
echo "=ISO=" echo "=ISO="
echo "Size: $(ls -lh ${ISODIR}/${ISOFILENAME} | awk '{print $5}')" echo "Size: $(ls -lh ${ISODIR}/${ISOFILENAME} | awk '{print $5}')"
echo "SHA256: $(awk '{print $1}' ${ISODIR}/${ISOFILENAME}.sha256)" echo "SHA256: $(awk '{print $1}' ${ISODIR}/${ISOFILENAME}.sha256)"
echo "Location: ${ISODIR}/${ISOFILENAME}" echo "Location: ${ISODIR}/${ISOFILENAME}"
echo "=Mini=" if [[ "${BUILDMINI}" == "y" ]];
echo "Size: $(ls -lh ${ISODIR}/${MINIFILENAME} | awk '{print $5}')" then
echo "SHA256: $(awk '{print $1}' ${ISODIR}/${MINIFILENAME}.sha256)" echo "=Mini="
echo "Location: ${ISODIR}/${MINIFILENAME}" echo "Size: $(ls -lh ${ISODIR}/${MINIFILENAME} | awk '{print $5}')"
echo "=Mini USB=" echo "SHA256: $(awk '{print $1}' ${ISODIR}/${MINIFILENAME}.sha256)"
echo "Size: $(ls -lh ${ISODIR}/${USBFILENAME} | awk '{print $5}')" echo "Location: ${ISODIR}/${MINIFILENAME}"
echo "SHA256: $(awk '{print $1}' ${ISODIR}/${USBFILENAME}.sha256)" echo "=Mini USB="
echo "Location: ${ISODIR}/${MINIFILENAME}" echo "Size: $(ls -lh ${ISODIR}/${USBFILENAME} | awk '{print $5}')"
echo "SHA256: $(awk '{print $1}' ${ISODIR}/${USBFILENAME}.sha256)"
echo "Location: ${ISODIR}/${MINIFILENAME}"
fi
#rm -rf ${TEMPDIR}/* #rm -rf ${TEMPDIR}/*


# are we rsyncing? # are we rsyncing?
@ -329,14 +340,14 @@ EOF
echo echo
echo "Now sending to ${RSYNC_HOST} via rsync. This may take a while..." echo "Now sending to ${RSYNC_HOST} via rsync. This may take a while..."
echo "Sending TFTP files..." echo "Sending TFTP files..."
rsync -a --info=progress2 ${TFTPDIR} ${RSYNC_HOST}:${RSYNC_DEST}/. rsync -az --info=progress2 ${TFTPDIR} ${RSYNC_HOST}:${RSYNC_DEST}/.
echo "Sending HTTP files..." echo "Sending HTTP files..."
rsync -a --info=progress2 ${HTTPDIR} ${RSYNC_HOST}:${RSYNC_DEST}/. rsync -az --info=progress2 ${HTTPDIR} ${RSYNC_HOST}:${RSYNC_DEST}/.
# rsync -a ${TEMPDIR}/boot/${UXNAME}.* ${RSYNC_HOST}:${RSYNC_DEST}/http/. # rsync -a ${TEMPDIR}/boot/${UXNAME}.* ${RSYNC_HOST}:${RSYNC_DEST}/http/.
echo "Sending the image files..." echo "Sending the image files..."
rsync -a --info=progress2 ${ISODIR} ${RSYNC_HOST}:${RSYNC_DEST}/. rsync -az --info=progress2 ${ISODIR} ${RSYNC_HOST}:${RSYNC_DEST}/.
echo "Sending extra files..." echo "Sending extra files..."
rsync -a --info=progress2 ${ROOTDIR}/extra/packages.* ${RSYNC_HOST}:${RSYNC_DEST}/. rsync -az --info=progress2 ${ROOTDIR}/extra/packages.* ${RSYNC_HOST}:${RSYNC_DEST}/.
rsync -a --info=progress2 ${ROOTDIR}/VERSION_INFO.txt ${RSYNC_HOST}:${RSYNC_DEST}/. rsync -az --info=progress2 ${ROOTDIR}/VERSION_INFO.txt ${RSYNC_HOST}:${RSYNC_DEST}/.
fi fi
} }