From dcceafc9797423d9d51767932f7cee9cd8ab0bb3 Mon Sep 17 00:00:00 2001 From: r00t Date: Mon, 28 Nov 2016 13:35:24 -0500 Subject: [PATCH] removed ipxe submodule- we handle this with a checkout from within python --- .gitmodules | 5 ----- bdisk/ipxe.py | 6 +++++- docs/TODO | 2 ++ src/ipxe | 1 - 4 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 .gitmodules delete mode 160000 src/ipxe diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index c38a874..0000000 --- a/.gitmodules +++ /dev/null @@ -1,5 +0,0 @@ -[submodule "ipxe"] - branch = master -[submodule "src/ipxe"] - path = src/ipxe - url = git://git.ipxe.org/ipxe.git diff --git a/bdisk/ipxe.py b/bdisk/ipxe.py index 3bb2a30..4e9808c 100755 --- a/bdisk/ipxe.py +++ b/bdisk/ipxe.py @@ -9,5 +9,9 @@ def buildIPXE(conf): bdisk = conf['bdisk'] ipxe = conf['ipxe'] templates_dir = build['basedir'] + '/extra/templates' - patches_dir = build['basedir'] + + ipxe_tpl = templates_dir + '/iPXE' + patches_dir = ipxe_tpl + '/patches' + srcdir = build['srcdir'] + ipxe_src = srcdir + '/ipxe' + ipxe_git_uri = pass diff --git a/docs/TODO b/docs/TODO index 1d2ab74..f0b8772 100644 --- a/docs/TODO +++ b/docs/TODO @@ -2,6 +2,8 @@ -i_am_a_racecar optimizations -see also: grep -HnR bdisk/*.py -TFTP, HTTP, RSYNC, git +-UPDATE THE README! +-sizes of build iso files ## General ## diff --git a/src/ipxe b/src/ipxe deleted file mode 160000 index 0a4805b..0000000 --- a/src/ipxe +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0a4805bf943be5b573b0560ecfcc88ff9999fd95