util-linux: fix conflicts with busybox

kisslinux · Jul 20, 2019 · 941bfbb · 941bfbb
1 parent e807da7
commit 941bfbb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/core/util-linux/build b/core/util-linux/build
@@ -1,5 +1,7 @@
 #!/bin/sh -e
 
+# During ./configure, disable kill and sulogin as they are provided
+# by busybox.
 ./configure \
     --prefix=/usr \
     --localstatedir=/var \
@@ -12,12 +14,15 @@
     --enable-fsck \
     --disable-makeinstall-chown \
     --disable-rpath \
+    --disable-kill \
+    --disable-sulogin \
     --without-udev \
     --without-python \
     --without-systemd
 
 make
 make DESTDIR="$1" install
 
-# Remove 'getopt' as it is provided by 'busybox'.
+# Remove getopt as it is provided by busybox. (For some reason
+# ./configure does not support it)
 rm -f "$1/usr/bin/getopt"
diff --git a/core/util-linux/version b/core/util-linux/version
@@ -1 +1 @@
-2.34 2
+2.34 3