diff options
| -rw-r--r-- | etc/imports/empty.TARGETS | 1 | ||||
| -rw-r--r-- | etc/repos.json | 19 | ||||
| -rw-r--r-- | src/bootstrap/stage-0-busybox.TARGETS | 17 | ||||
| -rw-r--r-- | src/tools/busybox-1.36.TARGETS | 15 |
4 files changed, 47 insertions, 5 deletions
diff --git a/etc/imports/empty.TARGETS b/etc/imports/empty.TARGETS new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/etc/imports/empty.TARGETS @@ -0,0 +1 @@ +{} diff --git a/etc/repos.json b/etc/repos.json index aeca7b3..dcb3ef0 100644 --- a/etc/repos.json +++ b/etc/repos.json @@ -277,7 +277,11 @@ , "target_root": "bootstrap" , "target_file_name": "stage-0-busybox.TARGETS" , "bindings": - {"rules": "rules/stage-0", "gcc": "stage-0/gcc", "make": "stage-0/make"} + { "rules": "rules/stage-0" + , "gcc": "stage-0/gcc" + , "make": "stage-0/make" + , "patch-cbq": "patches/busybox-1593" + } } , "stage-0/make": { "repository": @@ -485,7 +489,7 @@ } , "target_root": "tools" , "target_file_name": "busybox-1.36.TARGETS" - , "bindings": {"rules": "rules/tools"} + , "bindings": {"rules": "rules/tools", "patch-cbq": "patches/busybox-1593"} } , "tools/make-4.4.1": { "repository": @@ -813,5 +817,16 @@ , "target_file_name": "iwyu.TARGETS" , "target_root": "imports" } + , "patches/busybox-1593": + { "repository": + { "type": "foreign file" + , "content": "5c8fd3526a514ff64fd3d31b9a849d0649e0d197" + , "fetch": "https://bugs.busybox.net/attachment.cgi?id=9751" + , "sha256": "6671a12c48dbcefb653fc8403d1f103a1e2eba4a49b1ee9a9c27da8aa2db80d4" + , "name": "remove-cbq.patch" + } + , "target_root": "imports" + , "target_file_name": "empty.TARGETS" + } } } diff --git a/src/bootstrap/stage-0-busybox.TARGETS b/src/bootstrap/stage-0-busybox.TARGETS index a7b9033..4286072 100644 --- a/src/bootstrap/stage-0-busybox.TARGETS +++ b/src/bootstrap/stage-0-busybox.TARGETS @@ -54,7 +54,8 @@ , "flexible_config": ["ARCH", "TARGET_ARCH", "TOOLCHAIN_CONFIG", "ENV"] , "target": "busybox" } -, "files": {"type": "install", "deps": [["TREE", null, "."]]} +, "original sources": + {"type": "install", "dirs": [[["TREE", null, "."], "src"]]} , "bootstrap-ash": { "type": "export" , "flexible_config": ["ARCH", "TARGET_ARCH", "TOOLCHAIN_CONFIG", "ENV"] @@ -582,9 +583,21 @@ } , "staged-gcc": {"type": "install", "dirs": [[["@", "gcc", "", "toolchain"], "gcc"]]} +, "sources": + { "type": ["@", "rules", "CC/foreign/shell", "data"] + , "project": ["original sources"] + , "localbase": ["bootstrap", ["@", "patch-cbq", "", "remove-cbq.patch"]] + , "cmds": + [ "export PATH=${LOCALBASE}/bin" + , "cp -r src/. ${DESTDIR}" + , "chmod 644 ${DESTDIR}/networking/tc.c" + , "(cd ${DESTDIR} && patch -p1 < ${LOCALBASE}/remove-cbq.patch)" + ] + , "out_dirs": ["."] + } , "busybox": { "type": ["@", "rules", "CC/foreign/shell", "data"] - , "project": ["files"] + , "project": ["sources"] , "localbase": ["bootstrap", ["@", "make", "", "bootstrap"], "staged-gcc"] , "cmds": [ "export NJOBS=$(nproc --all 2>/dev/null || echo 1)" diff --git a/src/tools/busybox-1.36.TARGETS b/src/tools/busybox-1.36.TARGETS index 31c0508..bcb0740 100644 --- a/src/tools/busybox-1.36.TARGETS +++ b/src/tools/busybox-1.36.TARGETS @@ -3,9 +3,22 @@ , "flexible_config": ["ARCH", "TARGET_ARCH", "TOOLCHAIN_CONFIG", "ENV"] , "target": "busybox" } +, "original sources": + {"type": "install", "dirs": [[["TREE", null, "."], "src"]]} +, "sources": + { "type": ["@", "rules", "CC/foreign/shell", "data"] + , "project": ["original sources"] + , "localbase": [["@", "patch-cbq", "", "remove-cbq.patch"]] + , "cmds": + [ "cp -r src/. ${DESTDIR}" + , "chmod 644 ${DESTDIR}/networking/tc.c" + , "(cd ${DESTDIR} && patch -p1 < ${LOCALBASE}/remove-cbq.patch)" + ] + , "out_dirs": ["."] + } , "busybox": { "type": ["@", "rules", "CC/foreign/shell", "data"] - , "project": [["TREE", null, "."]] + , "project": ["sources"] , "cmds": [ "NJOBS=$(nproc --all 2>/dev/null || echo 1)" , "GCC_TOOLCHAIN=$(dirname ${CC})/.." |