diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-12-16 15:00:48 +0100 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-12-17 11:15:48 +0100 |
| commit | b727fce66b3601bddf4f37d64a620caba5e8a786 (patch) | |
| tree | 54e238223ddaa73b9ae2b08bdfffaeba0d02ad62 /src | |
| parent | 2e5e11a05c18b6cec59eaddb312869bef4805702 (diff) | |
| download | bootstrappable-toolchain-b727fce66b3601bddf4f37d64a620caba5e8a786.tar.gz | |
busybox: remove CBQ functionality
See https://bugs.busybox.net/show_bug.cgi?id=15931 for details of the
fix not yet upstreamed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/stage-0-busybox.TARGETS | 17 | ||||
| -rw-r--r-- | src/tools/busybox-1.36.TARGETS | 15 |
2 files changed, 29 insertions, 3 deletions
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})/.." |