From edc860fe272a1a9f9a33abb3768a662101029d65 Mon Sep 17 00:00:00 2001 From: r00t Date: Tue, 30 Jun 2015 19:55:00 -0400 Subject: [PATCH] pruning submodule for ipxe --- .gitmodules | 4 ++-- extra/pre-build.d/etc/mkinitcpio.conf | 2 +- lib/09-yo_dj.func.sh | 20 +++++++++++--------- src/ipxe | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8d5c384..c38a874 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ +[submodule "ipxe"] + branch = master [submodule "src/ipxe"] path = src/ipxe url = git://git.ipxe.org/ipxe.git -[submodule "ipxe"] - branch = master diff --git a/extra/pre-build.d/etc/mkinitcpio.conf b/extra/pre-build.d/etc/mkinitcpio.conf index eae845d..f151ea1 100644 --- a/extra/pre-build.d/etc/mkinitcpio.conf +++ b/extra/pre-build.d/etc/mkinitcpio.conf @@ -50,7 +50,7 @@ FILES="" # usr, fsck and shutdown hooks. #HOOKS="base udev autodetect modconf block filesystems keyboard fsck" #HOOKS="base udev memdisk archiso_shutdown archiso modconf net ssh archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard livecd" -HOOKS="base udev memdisk archiso_shutdown archiso-custom modconf net ssh archiso_loop_mnt archiso_http_custom archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard livecd" +HOOKS="base udev memdisk archiso_shutdown archiso-custom modconf net ssh archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_http_custom archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard livecd" # COMPRESSION # Use this to compress the initramfs image. By default, gzip compression diff --git a/lib/09-yo_dj.func.sh b/lib/09-yo_dj.func.sh index d69f4d3..d3e6d8e 100644 --- a/lib/09-yo_dj.func.sh +++ b/lib/09-yo_dj.func.sh @@ -251,7 +251,7 @@ EOF cd .. ${RACECAR_CHK}xorriso -as mkisofs \ --quiet \ +`#-quiet` \ `#-joliet` \ `#-rock` \ `#-omit-version-number` \ @@ -280,17 +280,19 @@ EOF ## Build the mini-ISO ## echo "Now generating the iPXE images; please wait..." cd ${BASEDIR}/src/ipxe/src - git reset --hard HEAD > /dev/null 2>&1 - git pull > /dev/null 2>&1 - git checkout master > /dev/null 2>&1 + git reset --hard HEAD >> "${LOGFILE}.${FUNCNAME}" 2>&1 + git checkout master >> "${LOGFILE}.${FUNCNAME}" 2>&1 + git pull > /dev/null >> "${LOGFILE}.${FUNCNAME}" 2>&1 + git checkout master >> "${LOGFILE}.${FUNCNAME}" 2>&1 for i in $(find ${BASEDIR}/src/ipxe_local/patches/ -type f -iname "*.patch" -printf '%P\n'); do - patch -Np2 < $(BASEDIR)/src/ipxe_local/patches/${i} >> "${LOGFILE}.${FUNCNAME}" 2>&1 + patch -Np2 < ${BASEDIR}/src/ipxe_local/patches/${i} >> "${LOGFILE}.${FUNCNAME}" 2>&1 done - #make everything EMBED="$(BASEDIR)/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1 - make bin/ipxe.eiso EMBED="$(BASEDIR)/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1 - make bin/ipxe.eiso EMBED="$(BASEDIR)/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1 - make all EMBED="$(BASEDIR)/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1 + #make everything EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1 + make bin/ipxe.eiso EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1 + #make bin/ipxe.eiso EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1 + # Change this to USB-only... + 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.eiso ${ISODIR}/${MINIFILENAME} make clean > /dev/null 2>&1 diff --git a/src/ipxe b/src/ipxe index d73982f..211529a 160000 --- a/src/ipxe +++ b/src/ipxe @@ -1 +1 @@ -Subproject commit d73982f098db9fdedb28a3826eb97a6832eac1e4 +Subproject commit 211529a7fe97521acdeaf1f785e48ea3ddd26517