aboutsummaryrefslogtreecommitdiff
path: root/sub
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2018-03-29 08:06:54 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2018-03-29 08:06:54 +0000
commita03cdfa2feeedd0824fb23680ae8c75d9c2bae76 (patch)
tree22313f834ae90e5a77c29d7e8e2bc4eb54d98308 /sub
parentd034140299dd7fbe13e7ce9633ab18bd818c1c1b (diff)
downloadlh-bootstrap-a03cdfa2feeedd0824fb23680ae8c75d9c2bae76.tar.xz
Attempt to force the non-building of wall
because util-linux is a FUCKING BROKEN PIECE OF SHIT
Diffstat (limited to 'sub')
-rw-r--r--sub/util-linux/Makefile3
-rw-r--r--sub/util-linux/nowall.patch15
2 files changed, 17 insertions, 1 deletions
diff --git a/sub/util-linux/Makefile b/sub/util-linux/Makefile
index d9542a4..3d66d7d 100644
--- a/sub/util-linux/Makefile
+++ b/sub/util-linux/Makefile
@@ -108,12 +108,13 @@ $(OUTPUT)/sources/$(UTLX_NAME)-$(UTLX_VERSION).$(UTLX_TAREXT): | $(OUTPUT)/tmp/.
$(OUTPUT)/sources/.lh_$(UTLX_NAME)_dled: $(OUTPUT)/sources/$(UTLX_NAME)-$(UTLX_VERSION).$(UTLX_TAREXT)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-build/.lh_$(UTLX_NAME)_copied: $(OUTPUT)/sources/.lh_$(UTLX_NAME)_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-build/.lh_$(UTLX_NAME)_copied: $(OUTPUT)/sources/.lh_$(UTLX_NAME)_dled sub/util-linux/nowall.patch | $(OUTPUT)/build-build/.lh_skarnet_installed
exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src
exec setuidgid $(NORMALUSER) s6-mkdir -p $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)
exec setuidgid $(NORMALUSER) makenamelink $(OUTPUT)/build-build/opt $(UTLX_NAME) $(UTLX_NAME)-$(UTLX_VERSION) $(OUTPUT)/tmp
exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION) tar $(UTLX_TARLETTER)xpvf $(OUTPUT)/sources/$(UTLX_NAME)-$(UTLX_VERSION).$(UTLX_TAREXT)
exec setuidgid $(NORMALUSER) s6-rename $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/$(UTLX_NAME)-$(UTLX_VERSION) $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION) redirfd -r 0 $(WD)/sub/util-linux/nowall.patch patch -p1
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-build/.lh_$(UTLX_NAME)_configured: $(OUTPUT)/build-build/.lh_$(UTLX_NAME)_copied $(OUTPUT)/build-build/.lh_kernel_headers_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
diff --git a/sub/util-linux/nowall.patch b/sub/util-linux/nowall.patch
new file mode 100644
index 0000000..ec878a4
--- /dev/null
+++ b/sub/util-linux/nowall.patch
@@ -0,0 +1,15 @@
+--- util-linux-2.32.old/src/Makefile
++++ util-linux-2.32/src/Makefile
+@@ -372,9 +372,9 @@
+ am__append_125 = $(NCURSES_CFLAGS)
+ am__append_126 = mesg
+ am__append_127 = term-utils/mesg.1
+-am__append_128 = wall
+-am__append_129 = term-utils/wall.1
+-am__append_130 = install-exec-hook-wall
++#am__append_128 = wall
++#am__append_129 = term-utils/wall.1
++#am__append_130 = install-exec-hook-wall
+ #am__append_131 = write
+ #am__append_132 = term-utils/write.1
+ #am__append_133 = install-exec-hook-write