History

Control PXE tarball builds with Makefile

Michael Aldridge committed 9 years ago

Commit fc805231 parent 89e3aff4 files · +17 −6Browse files

Unified · Split

4 files
  1. Makefile +11 −1
  2. dracut/netmenu/module-setup.sh +2 −1
  3. dracut/netmenu/netmenu.sh +1 −1
  4. mknet.sh.in +3 −3
Makefile+11−1
@@ -10,15 +10,19 @@ T_ARCHS=i686 x86_64{,-musl} armv{6,7}l{,-musl} aarch64{,-musl} · 9 unmodified lines
10T_SBC_IMGS=rpi{,2,3}{,-musl} beaglebone{,-musl} cubieboard2{,-musl} odroid-c2{,-musl} usbarmory{,-musl}10T_SBC_IMGS=rpi{,2,3}{,-musl} beaglebone{,-musl} cubieboard2{,-musl} odroid-c2{,-musl} usbarmory{,-musl}
11T_CLOUD_IMGS=GCP{,-musl}11T_CLOUD_IMGS=GCP{,-musl}
12 12
13T_PXE_ARCHS=x86_64{,-musl}
14
13ARCHS=$(shell echo $(T_ARCHS))15ARCHS=$(shell echo $(T_ARCHS))
14PLATFORMS=$(shell echo $(T_PLATFORMS))16PLATFORMS=$(shell echo $(T_PLATFORMS))
15SBC_IMGS=$(shell echo $(T_SBC_IMGS))17SBC_IMGS=$(shell echo $(T_SBC_IMGS))
16CLOUD_IMGS=$(shell echo $(T_CLOUD_IMGS))18CLOUD_IMGS=$(shell echo $(T_CLOUD_IMGS))
19PXE_ARCHS=$(shell echo $(T_PXE_ARCHS))
17 20
18ALL_ROOTFS=$(foreach arch,$(ARCHS),void-$(arch)-ROOTFS-$(DATE).tar.xz)21ALL_ROOTFS=$(foreach arch,$(ARCHS),void-$(arch)-ROOTFS-$(DATE).tar.xz)
19ALL_PLATFORMFS=$(foreach platform,$(PLATFORMS),void-$(platform)-PLATFORMFS-$(DATE).tar.xz)22ALL_PLATFORMFS=$(foreach platform,$(PLATFORMS),void-$(platform)-PLATFORMFS-$(DATE).tar.xz)
20ALL_SBC_IMAGES=$(foreach platform,$(SBC_IMGS),void-$(platform)-$(DATE).img.xz)23ALL_SBC_IMAGES=$(foreach platform,$(SBC_IMGS),void-$(platform)-$(DATE).img.xz)
21ALL_CLOUD_IMAGES=$(foreach cloud,$(CLOUD_IMGS),void-$(cloud)-$(DATE).tar.gz)24ALL_CLOUD_IMAGES=$(foreach cloud,$(CLOUD_IMGS),void-$(cloud)-$(DATE).tar.gz)
25ALL_PXE_ARCHS=$(foreach arch,$(PXE_ARCHS),void-$(arch)-NETBOOT-$(DATE).tar.gz)
22 26
23SUDO := sudo27SUDO := sudo
24 28
@@ -75,6 +79,12 @@ void-GCP-$(DATE).tar.gz: · 50 unmodified lines
75void-GCP-musl-$(DATE).tar.gz:79void-GCP-musl-$(DATE).tar.gz:
76 $(SUDO) ./mkimage.sh -x $(COMPRESSOR_THREADS) void-GCP-musl-PLATFORMFS-$(DATE).tar.xz80 $(SUDO) ./mkimage.sh -x $(COMPRESSOR_THREADS) void-GCP-musl-PLATFORMFS-$(DATE).tar.xz
77 81
82pxe-all: $(ALL_PXE_ARCHS)
83
84pxe-all-print:
85 @echo $(ALL_PXE_ARCHS)
78 86
87void-%-NETBOOT-$(DATE).tar.gz: $(SCRIPTS)
88 $(SUDO) ./mknet.sh void-$*-ROOTFS-$(DATE).tar.xz
79 89
80.PHONY: clean dist rootfs-all-print platformfs-all-print90.PHONY: clean dist rootfs-all-print platformfs-all-print pxe-all-print
dracut/netmenu/module-setup.sh+2−1
@@ -7,7 +7,7 @@ check() { · 6 unmodified lines
7}7}
8 8
9depends() {9depends() {
10 return 010 echo network
11}11}
12 12
13install() {13install() {
@@ -43,6 +43,7 @@ install() { · 29 unmodified lines
43 inst /usr/bin/reboot43 inst /usr/bin/reboot
44 inst /usr/bin/rm44 inst /usr/bin/rm
45 inst /usr/bin/sed45 inst /usr/bin/sed
46 inst /usr/bin/sh
46 inst /usr/bin/sort47 inst /usr/bin/sort
47 inst /usr/bin/sync48 inst /usr/bin/sync
48 inst /usr/bin/stdbuf49 inst /usr/bin/stdbuf
dracut/netmenu/netmenu.sh+1−1
@@ -8,7 +8,7 @@ dialog --colors --keep-tite --no-shadow --no-mouse \ · 7 unmodified lines
8 "Shell" "Run dash" \8 "Shell" "Run dash" \
9 2>/tmp/netmenu.action9 2>/tmp/netmenu.action
10 10
11if ! $? ; then11if [ ! $? ] ; then
12 reboot -f12 reboot -f
13fi13fi
14 14
mknet.sh.in+3−3
@@ -211,10 +211,10 @@ sed -i -e "s|@@SPLASHIMAGE@@|$(basename "${SPLASH_IMAGE}")|" \ · 210 unmodified lines
211 "$PXELINUX_DIR/default"211 "$PXELINUX_DIR/default"
212 212
213# Default output file format213# Default output file format
214OUTPUT_FILE="void-netboot-${XBPS_TARGET_ARCH}-${KERNELVERSION}-$(date +%Y%m%d)"214OUTPUT_FILE="void-${XBPS_TARGET_ARCH}-NETBOOT-$(date +%Y%m%d).tar.gz"
215info_msg "Compressing results to $OUTPUT_FILE.tar.gz"215info_msg "Compressing results to $OUTPUT_FILE"
216cd "$BOOT_DIR" || die "Could not enter image dir"216cd "$BOOT_DIR" || die "Could not enter image dir"
217tar -zcvf "$CURDIR/$OUTPUT_FILE.tar.gz" .217tar -zcvf "$CURDIR/$OUTPUT_FILE" .
218cd "$CURDIR" || die "Could not return to working directory"218cd "$CURDIR" || die "Could not return to working directory"
219 219
220# As a final cleanup step, remove the ROOTFS and the expanded BOOT_DIR220# As a final cleanup step, remove the ROOTFS and the expanded BOOT_DIR

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t