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

pruning submodule for ipxe

This commit is contained in:
brent s. 2015-06-30 19:55:00 -04:00
parent d96d43054c
commit edc860fe27
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -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

2
extra/pre-build.d/etc/mkinitcpio.conf
View File

@ -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

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

@ -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

2
src/ipxe

@ -1 +1 @@
Subproject commit d73982f098db9fdedb28a3826eb97a6832eac1e4
Subproject commit 211529a7fe97521acdeaf1f785e48ea3ddd26517