From d034140299dd7fbe13e7ce9633ab18bd818c1c1b Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Thu, 29 Mar 2018 04:08:02 +0000 Subject: Change initramfs to accommodate new mdevd --- sub/initramfs/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'sub/initramfs/Makefile') diff --git a/sub/initramfs/Makefile b/sub/initramfs/Makefile index f175735..debab53 100644 --- a/sub/initramfs/Makefile +++ b/sub/initramfs/Makefile @@ -1,11 +1,17 @@ # The initramfs -INITRAMFS_SKARNET_LIST := cd execlineb export if redirfd s6-echo s6-mount mdevd-coldplug mdevd +INITRAMFS_SKARNET_LIST := background cd execlineb export fdclose fdmove forstdin if importas piperw pipeline redirfd s6-echo s6-mount mdevd-coldplug mdevd -$(OUTPUT)/tmp/.lh_initramfs_installed: $(OUTPUT)/tmp/.lh_layout_copied $(OUTPUT)/build-host/.lh_skarnet_installed +$(OUTPUT)/tmp/.lh_initramfs_installed: $(OUTPUT)/tmp/.lh_layout_copied $(OUTPUT)/build-host/.lh_skarnet_installed $(OUTPUT)/initramfs/bin/kill for i in $(INITRAMFS_SKARNET_LIST) ; do cp -f -L $(OUTPUT)/rootfs/command/$$i $(OUTPUT)/initramfs/command/$$i ; done exec setuidgid $(NORMALUSER) touch $@ +$(OUTPUT)/initramfs/bin/kill: $(OUTPUT)/tmp/kill + exec cp -f $< $@ + +$(OUTPUT)/tmp/kill: $(OUTPUT)/build-host/.lh_skarnet_installed sub/initramfs/kill.c $(OUTPUT)/build-host/bin/muslgcc + exec setuidgid $(NORMALUSER) $(OUTPUT)/build-host/bin/muslgcc -O2 -pipe -s -static -fomit-frame-pointer -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -Wa,--noexecstack -fno-stack-protector -ffunction-sections -fdata-sections -Wl,--sort-section=alignment -Wl,--sort-common -Wl,--gc-sections -o $@ -I$(OUTPUT)/rootfs/package/prog/skalibs/include -L$(OUTPUT)/rootfs/package/prog/skalibs/library sub/initramfs/kill.c -lskarnet + $(OUTPUT)/initramfs.img.gz: $(OUTPUT)/tmp/.lh_initramfs_installed cd $(OUTPUT)/initramfs && find . | cpio -o --format=newc > ../initramfs.img && cd .. && rm -f $@ && gzip -9 initramfs.img -- cgit v1.2.3