Skip to content

Commit e12a7ab

Browse files
committed
busybox: recover the 1.8/1.10..1.18 ash+hush gap band
The band between the buildable 1.2.x island and 1.18 failed on three stacked musl/toolchain breaks, all fixed in a new shvr_busybox_fix_makefile (common/busybox.sh), called from ash.sh and hush.sh after extraction and gated to 1.3 <= version <= 1.18: 1. GNU make >= 4.3 rejects the pre-kbuild "mixed implicit and normal rules" (config %config:, / %/:); drop the bare normal target from each. 2. include/platform.h hand-declares intmax_t/uintmax_t/socklen_t (musl defines no libc-identity macro), conflicting with <stdint.h>/<sys/socket.h>; force the stdint branch and neuter the socklen_t fallback typedef. 3. fdprintf undefined at link (mapped to dprintf only under __GLIBC__; musl has dprintf) -- make that guard unconditional. Same break as the old 1.17.x/1.18.x exclusion, now folded in. The gate keeps the 1.2.x island and >=1.19 trees (which have committed checksums) byte-identical -- verified 1.2.2's platform.h is left untouched. Recovered (both ash & hush build and run): 1.8, 1.10, 1.11, 1.12, 1.13, 1.14, 1.15, 1.16, 1.17, 1.18. Still excluded: 1.9 and 1.5..1.7 build but segfault at runtime under musl; 1.3..1.4 fail to build.
1 parent 8a85c42 commit e12a7ab

57 files changed

Lines changed: 305 additions & 54 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/downloads/action.yml

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,56 @@ runs:
107107
shvr_shell: ash
108108
shvr_version: "1.19.4"
109109
cache_path: "busybox/1.19.4"
110+
- uses: ./.github/actions/single-download
111+
with:
112+
shvr_shell: ash
113+
shvr_version: "1.18.5"
114+
cache_path: "busybox/1.18.5"
115+
- uses: ./.github/actions/single-download
116+
with:
117+
shvr_shell: ash
118+
shvr_version: "1.17.4"
119+
cache_path: "busybox/1.17.4"
120+
- uses: ./.github/actions/single-download
121+
with:
122+
shvr_shell: ash
123+
shvr_version: "1.16.2"
124+
cache_path: "busybox/1.16.2"
125+
- uses: ./.github/actions/single-download
126+
with:
127+
shvr_shell: ash
128+
shvr_version: "1.15.3"
129+
cache_path: "busybox/1.15.3"
130+
- uses: ./.github/actions/single-download
131+
with:
132+
shvr_shell: ash
133+
shvr_version: "1.14.4"
134+
cache_path: "busybox/1.14.4"
135+
- uses: ./.github/actions/single-download
136+
with:
137+
shvr_shell: ash
138+
shvr_version: "1.13.4"
139+
cache_path: "busybox/1.13.4"
140+
- uses: ./.github/actions/single-download
141+
with:
142+
shvr_shell: ash
143+
shvr_version: "1.12.4"
144+
cache_path: "busybox/1.12.4"
145+
- uses: ./.github/actions/single-download
146+
with:
147+
shvr_shell: ash
148+
shvr_version: "1.11.3"
149+
cache_path: "busybox/1.11.3"
150+
- uses: ./.github/actions/single-download
151+
with:
152+
shvr_shell: ash
153+
shvr_version: "1.10.4"
154+
cache_path: "busybox/1.10.4"
155+
- uses: ./.github/actions/single-download
156+
with:
157+
shvr_shell: ash
158+
shvr_version: "1.8.3"
159+
cache_path: "busybox/1.8.3"
110160
- uses: ./.github/actions/single-download
111161
with:
112162
shvr_shell: ash
@@ -382,6 +432,56 @@ runs:
382432
shvr_shell: hush
383433
shvr_version: "1.19.4"
384434
cache_path: "busybox/1.19.4"
435+
- uses: ./.github/actions/single-download
436+
with:
437+
shvr_shell: hush
438+
shvr_version: "1.18.5"
439+
cache_path: "busybox/1.18.5"
440+
- uses: ./.github/actions/single-download
441+
with:
442+
shvr_shell: hush
443+
shvr_version: "1.17.4"
444+
cache_path: "busybox/1.17.4"
445+
- uses: ./.github/actions/single-download
446+
with:
447+
shvr_shell: hush
448+
shvr_version: "1.16.2"
449+
cache_path: "busybox/1.16.2"
450+
- uses: ./.github/actions/single-download
451+
with:
452+
shvr_shell: hush
453+
shvr_version: "1.15.3"
454+
cache_path: "busybox/1.15.3"
455+
- uses: ./.github/actions/single-download
456+
with:
457+
shvr_shell: hush
458+
shvr_version: "1.14.4"
459+
cache_path: "busybox/1.14.4"
460+
- uses: ./.github/actions/single-download
461+
with:
462+
shvr_shell: hush
463+
shvr_version: "1.13.4"
464+
cache_path: "busybox/1.13.4"
465+
- uses: ./.github/actions/single-download
466+
with:
467+
shvr_shell: hush
468+
shvr_version: "1.12.4"
469+
cache_path: "busybox/1.12.4"
470+
- uses: ./.github/actions/single-download
471+
with:
472+
shvr_shell: hush
473+
shvr_version: "1.11.3"
474+
cache_path: "busybox/1.11.3"
475+
- uses: ./.github/actions/single-download
476+
with:
477+
shvr_shell: hush
478+
shvr_version: "1.10.4"
479+
cache_path: "busybox/1.10.4"
480+
- uses: ./.github/actions/single-download
481+
with:
482+
shvr_shell: hush
483+
shvr_version: "1.8.3"
484+
cache_path: "busybox/1.8.3"
385485
- uses: ./.github/actions/single-download
386486
with:
387487
shvr_shell: hush

.github/workflows/docker.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,16 @@ jobs:
467467
ash_1.21.1
468468
ash_1.20.2
469469
ash_1.19.4
470+
ash_1.18.5
471+
ash_1.17.4
472+
ash_1.16.2
473+
ash_1.15.3
474+
ash_1.14.4
475+
ash_1.13.4
476+
ash_1.12.4
477+
ash_1.11.3
478+
ash_1.10.4
479+
ash_1.8.3
470480
ash_1.2.2.1
471481
ash_1.2.2
472482
bash_5.3.15
@@ -522,6 +532,16 @@ jobs:
522532
hush_1.21.1
523533
hush_1.20.2
524534
hush_1.19.4
535+
hush_1.18.5
536+
hush_1.17.4
537+
hush_1.16.2
538+
hush_1.15.3
539+
hush_1.14.4
540+
hush_1.13.4
541+
hush_1.12.4
542+
hush_1.11.3
543+
hush_1.10.4
544+
hush_1.8.3
525545
hush_1.2.2.1
526546
hush_1.2.2
527547
ksh_shvrChistory-b_2016-01-10
@@ -752,6 +772,16 @@ jobs:
752772
ash_1.21.1
753773
ash_1.20.2
754774
ash_1.19.4
775+
ash_1.18.5
776+
ash_1.17.4
777+
ash_1.16.2
778+
ash_1.15.3
779+
ash_1.14.4
780+
ash_1.13.4
781+
ash_1.12.4
782+
ash_1.11.3
783+
ash_1.10.4
784+
ash_1.8.3
755785
ash_1.2.2.1
756786
ash_1.2.2
757787
bash_5.3.15
@@ -807,6 +837,16 @@ jobs:
807837
hush_1.21.1
808838
hush_1.20.2
809839
hush_1.19.4
840+
hush_1.18.5
841+
hush_1.17.4
842+
hush_1.16.2
843+
hush_1.15.3
844+
hush_1.14.4
845+
hush_1.13.4
846+
hush_1.12.4
847+
hush_1.11.3
848+
hush_1.10.4
849+
hush_1.8.3
810850
hush_1.2.2.1
811851
hush_1.2.2
812852
ksh_shvrChistory-b_2016-01-10
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
48bb28abdc2c67f57675c281cd11a8ac8aa296402b7a825dbe378e3f8fe734d2 ash
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f20bf201db5ae96a048446e984aec6eace394d7ae3e73535b08ccd6b2f021cbc ash
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5d23513de869e40e938272cfede45b9ac0641256c8c9f772be275dec828558f0 ash
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8dfc608b02306926fe39de7256be8426e4caa5c4d72b2d3beb016b31e8963367 ash
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
87f6409efaf6fc2b39556e18d3ad74a3d77f682fc97de326fefcc498bd1b496c ash
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a27f1b387ed6f56bd0fad85b7b6cf1179181f1dc3aebad6078918aa2a59634c6 ash
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
37f67f3b764f97127d421755bb1199439ac0a0de34c04bf5173d8718df46e012 ash
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
11c32e01798340d9929c4f5b4175351d72f0e0caee287f169e478357e4229f6b ash

0 commit comments

Comments
 (0)