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

fixing patch

Browse Source 
more fixes

fixing new patches

fixing new patches
This commit is contained in:
brent s. 2015-06-29 22:07:59 -04:00
parent 114fbed031
commit 7e39792c22
2 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ function yo_dj () {
echo "Building the actual .iso image. This may take a while." echo "Building the actual .iso image. This may take a while."
im_batman im_batman
ISOFILENAME="${UXNAME}-${VERSION}.iso" ISOFILENAME="${UXNAME}-${VERSION}.iso"
MINIFILENAME="${UXNAME}-${VERSION}-mini.iso"
if [[ "${MULTIARCH}" == "y" ]]; if [[ "${MULTIARCH}" == "y" ]];
then then
ISOFILENAME="${UXNAME}-${VERSION}-any.iso" ISOFILENAME="${UXNAME}-${VERSION}-any.iso"
@ -276,7 +277,14 @@ EOF


## Build the mini-ISO ## ## Build the mini-ISO ##
cd ${BASEDIR}/src/ipxe/src cd ${BASEDIR}/src/ipxe/src
for i in $(find ${BASEDIR}/ git pull > /dev/null 2>&1
git checkout master > /dev/null 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
done
make everything EMBED="$(BASEDIR)/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1
cp -f ${BASEDIR}/src/ipxe/src


#isohybrid ${ISOFILENAME} #isohybrid ${ISOFILENAME}
cd ${ISODIR} cd ${ISODIR}

32
src/ipxe_local/patches/ipxe-0002-banner.patch
View File

@ -1,18 +1,6 @@
From 4ec31ece6757e19be455faa383886562b8793db9 Mon Sep 17 00:00:00 2001 --- a/src/usr/autoboot.c 2015-06-29 04:18:17.055394598 -0400
From: Christian Hesse <mail@eworm.de> +++ b/src/usr/autoboot.c 2015-06-29 22:04:28.692916217 -0400
Date: Thu, 12 Feb 2015 09:06:41 +0100 @@ -71,6 +71,7 @@
Subject: [PATCH] banner

Signed-off-by: Christian Hesse <mail@eworm.de>
---
src/usr/autoboot.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c
index 4bcb64d..74b5b77 100644
--- a/src/usr/autoboot.c
+++ b/src/usr/autoboot.c
@@ -67,6 +67,7 @@ static int ( * is_autoboot_device ) ( struct net_device *netdev );
#define NORMAL "\033[0m" #define NORMAL "\033[0m"
#define BOLD "\033[1m" #define BOLD "\033[1m"
#define CYAN "\033[36m" #define CYAN "\033[36m"
@ -20,20 +8,16 @@ index 4bcb64d..74b5b77 100644
/** The "scriptlet" setting */ /** The "scriptlet" setting */
const struct setting scriptlet_setting __setting ( SETTING_MISC, scriptlet ) = { const struct setting scriptlet_setting __setting ( SETTING_MISC, scriptlet ) = {
@@ -551,9 +552,13 @@ void ipxe ( struct net_device *netdev ) { @@ -560,9 +561,9 @@
* do so. * do so.
* *
*/ */
- printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME " %s" - printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME " %s"
+ printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME
- NORMAL " -- " PRODUCT_TAG_LINE " -- " - NORMAL " -- " PRODUCT_TAG_LINE " -- "
- CYAN PRODUCT_URI NORMAL "\nFeatures:", product_version ); - CYAN PRODUCT_URI NORMAL "\nFeatures:", product_version );
+ printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME
+ CYAN PRODUCT_URI NORMAL "\n" + CYAN PRODUCT_URI NORMAL "\n"
+ BOLD BLUE "http://bdisk.square-r00t.net/" NORMAL "\n" + BOLD BLUE "http://bdisk.square-r00t.net/" NORMAL "\n" )
+ "%s" for_each_table_entry ( feature, FEATURES )
- for_each_table_entry ( feature, FEATURES ) printf ( " %s", feature->name );
- printf ( " %s", feature->name );
printf ( "\n" ); printf ( "\n" );
--
2.3.0