Fix issue with source directory for kernel build

Patch util-linux Makefile.in to prevent installation of unwanted programs

kernel/Makefile

@@ -67,11 +67,11 @@ $(objdir)/.installed: $(objdir)/.modules_installed $(objdir)/.docs_installed
 	touch $@
 
 $(objdir):
-	install -d ${objdir}
+	install -d $(objdir)
 
 $(srcdir)/.dirstamp:
 	$(info $(grn)=== Extracting $(distlocal) ===$(reset))
-	tar -xf $(distlocal) -C $(basedir)/build/src-world
+	tar -xf $(distlocal) -C $(basedir)/build/src-world-$(arch)
 	touch $@
 
 .PHONY: buildkernel installkernel

world/util-linux/Makefile

@@ -3,6 +3,7 @@
 #
 distname     = util-linux
 #patches     += util-linux-musl.patch
+patches     += util-linux-makefile.patch
 include world.mk
 uldocdir     = $(install_prefix)/share/doc/util-linux/$(util-linux_version)
 

world/util-linux/config_opts.mk

@@ -1,94 +1,38 @@
 config_opts += --host=$(tgt)
 config_opts += --with-sysroot=$(DESTDIR)
 config_opts += --docdir=${uldocdir}
+config_opts += --disable-mount
+config_opts += --disable-mountpoint
+config_opts += --disable-fallocate
+config_opts += --disable-unshare
+config_opts += --disable-setpriv
+config_opts += --disable-hardlink
+config_opts += --disable-eject
+config_opts += --disable-agetty
+config_opts += --disable-plymouth_support
+config_opts += --disable-hwclock
+config_opts += --disable-cal
+config_opts += --disable-logger
+config_opts += --disable-switch_root
+config_opts += --disable-pivot_root
+config_opts += --disable-irqtop
+config_opts += --disable-lsirq
+config_opts += --disable-tunelp
+config_opts += --disable-kill
+config_opts += --disable-last
+config_opts += --disable-mesg
+config_opts += --disable-vipw
+config_opts += --disable-chfn-chsh
+config_opts += --disable-login
+config_opts += --disable-nologin
+config_opts += --disable-su
+config_opts += --disable-setpriv
+config_opts += --disable-runuser
+config_opts += --disable-ul
 config_opts += --disable-pylibmount
 config_opts += --disable-static
-config_opts += --disable-all-programs
-config_opts += --enable-libmount
-config_opts += --enable-libblkid
-config_opts += --enable-libsmartcols
-config_opts += --enable-libuuid
-config_opts += --disable-makeinstall-chown
-config_opts += --disable-makeinstall-setuid
-config_opts += --enable-addpart
-config_opts += --enable-agetty
-config_opts += --enable-blkid
-config_opts += --enable-blkzone
-config_opts += --enable-blockdev
-config_opts += --enable-cfdisk
-config_opts += --enable-chcpu
-config_opts += --enable-chmem
-config_opts += --enable-choom
-config_opts += --enable-chrt
-config_opts += --enable-colcrt
-config_opts += --enable-delpart
-config_opts += --enable-fdformat
-config_opts += --enable-fdisk
-config_opts += --enable-fincore
-config_opts += --enable-findfs
-config_opts += --enable-findmnt
-config_opts += --enable-flock
-config_opts += --enable-fsck
-config_opts += --enable-fsck.cramfs
-config_opts += --enable-fsck.minix
-config_opts += --enable-fstrim
-config_opts += --enable-hexdump
-config_opts += --enable-i386
-config_opts += --enable-ionice
-config_opts += --enable-ipcmk
-config_opts += --enable-ipcrm
-config_opts += --enable-ipcs
-config_opts += --enable-isosize
-config_opts += --enable-kill
-config_opts += --enable-lastb
-config_opts += --enable-ldattach
-config_opts += --enable-linux32
-config_opts += --enable-linux64
-config_opts += --enable-losetup
-config_opts += --enable-lsblk
-config_opts += --enable-lscpu
-config_opts += --enable-lsipc
-config_opts += --enable-lslocks
-config_opts += --enable-lslogins
-config_opts += --enable-lsmem
-config_opts += --enable-lsns
-config_opts += --enable-mcookie
-config_opts += --enable-mkfs
-config_opts += --enable-mkfs.bfs
-config_opts += --enable-mkfs.cramfs
-config_opts += --enable-mkfs.minix
-config_opts += --enable-more
-config_opts += --enable-namei
-config_opts += --enable-nsenter
-config_opts += --enable-partx
-config_opts += --enable-prlimit
-config_opts += --enable-raw
-config_opts += --enable-readprofile
-config_opts += --enable-rename
-config_opts += --enable-resizepart
-config_opts += --enable-rkfill
-config_opts += --enable-rtcwake
-config_opts += --enable-script
-config_opts += --enable-scriptreplay
-config_opts += --enable-setarch
-config_opts += --enable-setsid
-config_opts += --enable-setterm
-config_opts += --enable-sfdisk
-config_opts += --enable-sulogin
-config_opts += --enable-tailf
-config_opts += --enable-taskset
-config_opts += --enable-uname26
-config_opts += --enable-utmpdump
-config_opts += --enable-uuidd
-config_opts += --enable-uuidgen
-config_opts += --enable-uuidparse
-config_opts += --enable-wall
-config_opts += --enable-wdctl
-config_opts += --enable-whereis
-config_opts += --enable-wipefs
-config_opts += --enable-x86_64
-config_opts += --enable-zramctl
 config_opts += --without-python
 config_opts += --without-systemd
 config_opts += --without-systemdsystemunitdir
 config_opts += ADJTIME_PATH=/var/lib/hwclock/adjtime
+config_opts += runstatedir=/run