changeset 516:014d018468fb

core: use new FHS
author David Demelier <markand@malikania.fr>
date Tue, 09 Apr 2019 20:22:00 +0200
parents 030ebf8e0a69
children ec518dff4152
files core/acl/acl.sh core/attr/attr.sh core/bash-completion/bash-completion.sh core/bc/bc.sh core/busybox/busybox.sh core/bzip2/bzip2.sh core/consolekit2/consolekit2.sh core/coreutils/coreutils.sh core/cpio/cpio.sh core/diffutils/diffutils.sh core/e2fsprogs/e2fsprogs.sh core/ed/ed.sh core/efibootmgr/efibootmgr.sh core/elfutils/elfutils.sh core/eudev/eudev.sh core/eudev/udevd core/file/file.sh core/filesystem/filesystem.sh core/findutils/findutils.sh core/gawk/gawk.sh core/gettext/gettext.sh core/grep/grep.sh core/grub/grub.sh core/gzip/gzip.sh core/kbd/kbd.sh core/kmod/kmod.sh core/lbzip2/lbzip2.sh core/less/less.sh core/libarchive/libarchive.sh core/libcap/libcap.sh core/lvm2/lvm2.sh core/lz4/lz4.sh core/lzip/lzip.sh core/mandoc/mandoc.sh core/procps/procps.sh core/rhash/rhash.sh core/sed/sed.sh core/sysklogd/sysklogd core/sysklogd/sysklogd.sh core/sysvinit/rc.init core/sysvinit/rc.shutdown core/sysvinit/sysvinit.sh core/tar/tar.sh core/texinfo/texinfo.sh core/tmux/tmux.sh core/util-linux/util-linux.sh core/which/which.sh core/xz/xz.sh core/zstd/zstd.sh
diffstat 49 files changed, 127 insertions(+), 137 deletions(-) [+]
line wrap: on
line diff
--- a/core/acl/acl.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/acl/acl.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -52,13 +52,13 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared \
 		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libacl.la
+	rm -f $DESTDIR/lib/libacl.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/core/attr/attr.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/attr/attr.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -51,14 +51,13 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared \
 		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libattr.la
+	rm -f $DESTDIR/lib/libattr.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/core/bash-completion/bash-completion.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/bash-completion/bash-completion.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -29,9 +29,9 @@
 	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
 	pushd $PKGNAME-$PKGVERSION
 
-	./configure --prefix=/usr --sysconfdir=/etc
+	./configure --prefix=/
 	make
-	make install pkgconfigdir=/usr/lib/pkgconfig DESTDIR=$DESTDIR
+	make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/core/bc/bc.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/bc/bc.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--with-readline
 	make
 	make install DESTDIR=$DESTDIR
--- a/core/busybox/busybox.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/busybox/busybox.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -30,7 +30,7 @@
 
 	cp ../config .config
 	make
-	install -D -m 0755 busybox $DESTDIR/usr/bin/busybox
+	install -D -m 0755 busybox $DESTDIR/bin/busybox
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/core/bzip2/bzip2.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/bzip2/bzip2.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -38,12 +38,12 @@
 	sed -i -e 's/$(PREFIX)/$(DESTDIR)$(PREFIX)/g' Makefile
 	patch -p1 < ../CVE-2016-3189.patch
 	make CC="$CC" CFLAGS="$CFLAGS" -f Makefile-libbz2_so all
-	make install DESTDIR=$DESTDIR PREFIX=/usr
-	install -D libbz2.so.$PKGVERSION $DESTDIR/usr/lib/libbz2.so.$PKGVERSION
-	ln -s libbz2.so.$PKGVERSION $DESTDIR/usr/lib/libbz2.so
-	ln -s libbz2.so.$PKGVERSION $DESTDIR/usr/lib/libbz2.so.${PKGVERSION%.*}
-	ln -s libbz2.so.$PKGVERSION $DESTDIR/usr/lib/libbz2.so.${PKGVERSION%%.*}
-	rm -f $DESTDIR/usr/lib/libbz2.a
+	make install DESTDIR=$DESTDIR PREFIX=/
+	install -D libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so.$PKGVERSION
+	ln -s libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so
+	ln -s libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so.${PKGVERSION%.*}
+	ln -s libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so.${PKGVERSION%%.*}
+	rm -f $DESTDIR/lib/libbz2.a
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/core/consolekit2/consolekit2.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/consolekit2/consolekit2.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -37,7 +37,7 @@
 
 if [ "$PAM" = "yes" ]; then
 	PKGDEPENDS="security/linux-pam $PKGDEPENDS"
-	with_pam="--enable-pam-module --with-pam-module-dir=/usr/lib/security"
+	with_pam="--enable-pam-module --with-pam-module-dir=/lib/security"
 else
 	with_pam="--disable-pam-module"
 fi
@@ -75,7 +75,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--with-pid-file=/var/run/consolekit2.pid \
@@ -85,9 +85,9 @@
 		$with_udev
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/security/pam_ck_connector.la
-	rm -f $DESTDIR/usr/lib/libck-connector.la
-	rm -f $DESTDIR/usr/lib/libconsolekit.la
+	rm -f $DESTDIR/lib/security/pam_ck_connector.la
+	rm -f $DESTDIR/lib/libck-connector.la
+	rm -f $DESTDIR/lib/libconsolekit.la
 
 	popd
 	rm -rf ConsoleKit2-$PKGVERSION
--- a/core/coreutils/coreutils.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/coreutils/coreutils.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -68,7 +68,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--enable-no-install-programs=kill,uptime \
 		$with_gmp \
 		$with_nls \
--- a/core/cpio/cpio.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/cpio/cpio.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -51,7 +51,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
--- a/core/diffutils/diffutils.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/diffutils/diffutils.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -51,7 +51,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
--- a/core/e2fsprogs/e2fsprogs.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/e2fsprogs/e2fsprogs.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -53,8 +53,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
+		--prefix=/ \
 		--disable-fsck \
 		--disable-uuidd \
 		--disable-libuuid \
--- a/core/ed/ed.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/ed/ed.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -32,7 +32,7 @@
 	pushd $PKGNAME-$PKGVERSION
 
 	# custom configure script.
-	./configure --prefix=/usr CC="$CC" CFLAGS="$CFLAGS"
+	./configure --prefix=/ CC="$CC" CFLAGS="$CFLAGS"
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/core/efibootmgr/efibootmgr.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/efibootmgr/efibootmgr.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -35,7 +35,7 @@
 	patch -p0 < ../clang.patch
 	# https://git.alpinelinux.org/aports/tree/testing/efibootmgr?h=master
 	patch -p1 < ../efivar.patch
-	CC="$CC" PCDIR=/usr/lib/pkgconfig EFIDIR=/boot/efi make
+	CC="$CC" PCDIR=/lib/pkgconfig EFIDIR=/boot/efi make
 	EFIDIR=/boot/efi DESTDIR=$DESTDIR make install
 
 	popd
--- a/core/elfutils/elfutils.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/elfutils/elfutils.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -50,12 +50,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--program-prefix="eu-" \
 		--disable-nls
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/lib{asm,dw,ebl,elf}.a
+	rm -f $DESTDIR/lib/lib{asm,dw,ebl,elf}.a
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/core/eudev/eudev.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/eudev/eudev.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="enhanced userland device daemon"
 PKGDOWNLOAD="https://github.com/gentoo/eudev/archive/v$PKGVERSION.tar.gz"
-PKGDEPENDS="core/util-linux core/eudev"
+PKGDEPENDS="core/util-linux"
 PKGPROTECT="/etc/udev/udev.conf"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -45,13 +45,13 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-selinux \
 		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libudev.la
+	rm -f $DESTDIR/lib/libudev.la
 	install -Dm0755 ../udevd $DESTDIR/etc/rc.d/udevd
 
 	popd
--- a/core/eudev/udevd	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/eudev/udevd	Tue Apr 09 20:22:00 2019 +0200
@@ -6,7 +6,7 @@
 	. /etc/rc.conf
 fi
 
-: ${UDEVD_CMD:=/usr/sbin/udevd}
+: ${UDEVD_CMD:=/bin/udevd}
 : ${UDEVD_ARGS:=--daemon}
 
 udevd_start()
@@ -14,13 +14,13 @@
 	echo "Starting udevd: $UDEVD_CMD $UDEVD_ARGS"
 	$UDEVD_CMD $UDEVD_ARGS
 
-	/usr/sbin/udevadm trigger --type=subsystems --action=add
-	/usr/sbin/udevadm trigger --type=devices --action=add
+	/bin/udevadm trigger --type=subsystems --action=add
+	/bin/udevadm trigger --type=devices --action=add
 }
 
 udevd_status()
 {
-	pid=$(/usr/bin/pidof udevd)
+	pid=$(/bin/pidof udevd)
 
 	if [ -n "$pid" ]; then
 		echo "udevd is running with pid: $pid"
@@ -31,17 +31,17 @@
 
 udevd_stop()
 {
-	pid=$(/usr/bin/pidof udevd)
+	pid=$(/bin/pidof udevd)
 
 	if [ -n "$pid" ]; then
 		echo "Stopping udevd."
-		/usr/sbin/udevadm control --exit
+		/bin/udevadm control --exit
 	fi
 }
 
 udevd_reload()
 {
-	/usr/sbin/udevadm control --reload
+	/bin/udevadm control --reload
 }
 
 udevd_restart()
--- a/core/file/file.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/file/file.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -43,11 +43,11 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--datadir=/usr/share/file
+		--prefix=/ \
+		--datadir=/share/file
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libmagic.la
+	rm -f $DESTDIR/lib/libmagic.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/core/filesystem/filesystem.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/filesystem/filesystem.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -20,31 +20,28 @@
 PKGREVISION=1
 PKGLICENSE="ISC"
 PKGSUMMARY="base filesystem directories"
-PKGDOWNLOAD=""
 
 build()
 {
+	install -d $DESTDIR/bin
+	install -d $DESTDIR/dev
+	install -d $DESTDIR/dev/pts
 	install -d $DESTDIR/etc
-	install -d $DESTDOR/etc/rc.d
+	install -d $DESTDIR/etc/rc.d
 	install -d $DESTDIR/home
+	install -d $DESTDIR/include
+	install -d $DESTDIR/lib
 	install -d $DESTDIR/mnt
 	install -d $DESTDIR/proc
-	install -d -m 0700 $DESTDIR/root
+	install -d $DESTDIR/root
 	install -d $DESTDIR/run
+	install -d $DESTDIR/share
+	install -d $DESTDIR/share/man/man{1,2,3,4,5,6,7,8}
+	install -d $DESTDIR/src
 	install -d $DESTDIR/sys
-	install -d $DESTDIR/dev/pts
-
-	install -d $DESTDIR/usr/{bin,sbin,include,lib,share,src}
-	install -d $DESTDIR/usr/share/man/man{1,2,3,4,5,6,7,8}
-
-	install -d $DESTDIR/var/{log,empty,run,spool}
 	install -d $DESTDIR/var/lib/vpk
-
-	install -d -m 1777 $DESTDIR/tmp
-	install -d -m 1777 $DESTDIR/var/tmp
-
-	# in vanilla /bin, /sbin and /lib are symlinked to /usr
-	ln -sf usr/bin $DESTDIR/bin
-	ln -sf usr/lib $DESTDIR/lib
-	ln -sf usr/sbin $DESTDIR/sbin
+	install -d $DESTDIR/var/{log,empty,spool}
+	install -dm 1777 $DESTDIR/tmp
+	install -dm 1777 $DESTDIR/var/run
+	install -dm 1777 $DESTDIR/var/tmp
 }
--- a/core/findutils/findutils.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/findutils/findutils.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -51,7 +51,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--without-selinux \
 		$with_nls
 	make
--- a/core/gawk/gawk.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/gawk/gawk.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -50,7 +50,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
--- a/core/gettext/gettext.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/gettext/gettext.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -42,14 +42,14 @@
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
 	./configure \
-		--prefix=/usr \
+		--prefix=/ \
 		--with-included-gettext \
 		--enable-shared \
 		--disable-static \
 		--enable-nls
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/lib{gettextpo,gettextsrc,gettextlib,intl,asprintf}.la
+	rm -f $DESTDIR/lib/lib{gettextpo,gettextsrc,gettextlib,intl,asprintf}.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/core/grep/grep.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/grep/grep.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -52,7 +52,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
--- a/core/grub/grub.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/grub/grub.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -70,7 +70,7 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--target=$CTARGET \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-libzfs \
 		--disable-efiemu \
 		--disable-werror \
--- a/core/gzip/gzip.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/gzip/gzip.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -42,7 +42,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/core/kbd/kbd.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/kbd/kbd.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -53,7 +53,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared \
 		--disable-vlock \
--- a/core/kmod/kmod.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/kmod/kmod.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -66,17 +66,17 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		$with_ssl \
 		$with_xz \
 		$with_zlib
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libkmod.la
+	rm -f $DESTDIR/lib/libkmod.la
 
-	# compatibility symlinks manpages like lsmod, rmmod are installed as well.
+	# compatibility symlinks like lsmod, rmmod are installed as well.
 	for tool in {ls,ins,rm,dep}mod mod{info,probe}; do
-		ln -sf kmod $DESTDIR/usr/bin/$tool
+		ln -sf kmod $DESTDIR/bin/$tool
 	done
 
 	popd
--- a/core/lbzip2/lbzip2.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/lbzip2/lbzip2.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -42,7 +42,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/core/less/less.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/less/less.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -43,8 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
+		--prefix=/ \
 		--with-regex=pcre
 	make
 	make install DESTDIR=$DESTDIR
--- a/core/libarchive/libarchive.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/libarchive/libarchive.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -119,7 +119,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared \
 		--enable-bsdtar=shared \
@@ -138,7 +138,7 @@
 
 	make
 	make install DESTDIR=$DESTDIR
-        rm -f $DESTDIR/usr/lib/libarchive.la
+        rm -f $DESTDIR/lib/libarchive.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/core/libcap/libcap.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/libcap/libcap.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -35,7 +35,7 @@
 
 	patch -p0 < ../disable-static.patch
 	make BUILD_CC="$CC" CC="$CC" CFLAGS="$CFLAGS"
-	make install RAISE_SETFCAP=no DESTDIR=$DESTDIR prefix=/usr lib=/lib
+	make install RAISE_SETFCAP=no DESTDIR=$DESTDIR prefix=/ lib=/lib
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/core/lvm2/lvm2.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/lvm2/lvm2.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-readline \
 		--disable-nls \
 		--enable-pkgconfig \
--- a/core/lz4/lz4.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/lz4/lz4.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -31,8 +31,8 @@
 	tar xvaf v$PKGVERSION.tar.gz
 	pushd $PKGNAME-$PKGVERSION
 
-	make CC="$CC" CFLAGS="$CFLAGS" BUILD_STATIC=no PREFIX=/usr
-	make BUILD_STATIC=no DESTDIR=$DESTDIR PREFIX=/usr install
+	make CC="$CC" CFLAGS="$CFLAGS" BUILD_STATIC=no PREFIX=/
+	make BUILD_STATIC=no DESTDIR=$DESTDIR PREFIX=/ install
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/core/lzip/lzip.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/lzip/lzip.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -32,7 +32,7 @@
 	pushd $PKGNAME-$PKGVERSION
 
 	# custom configure script.
-	./configure --prefix=/usr CXX="$CXX" CXXFLAGS="$CXXFLAGS"
+	./configure --prefix=/ CXX="$CXX" CXXFLAGS="$CXXFLAGS"
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/core/mandoc/mandoc.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/mandoc/mandoc.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -36,8 +36,8 @@
 
 	sed -i -e "/^CC=/ s/CC=.*/CC=$CC/" configure
 	echo "UTF8_LOCALE=en_US.UTF-8" > configure.local
-	echo "PREFIX=/usr" >> configure.local
-	echo "MANDIR=/usr/share/man" >> configure.local
+	echo "PREFIX=/" >> configure.local
+	echo "MANDIR=/share/man" >> configure.local
 	./configure
 	make CC="$CC" CFLAGS="$CFLAGS"
 	make install DESTDIR=$DESTDIR
--- a/core/procps/procps.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/procps/procps.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -59,7 +59,7 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--target=$CTARGET \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-libselinux \
 		--disable-static \
 		--disable-kill \
@@ -67,7 +67,7 @@
 		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libprocps.la
+	rm -f $DESTDIR/lib/libprocps.la
 
 	popd
 	rm -rf $PKGNAME-v$PKGVERSION
--- a/core/rhash/rhash.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/rhash/rhash.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -53,8 +53,7 @@
 
 	./configure \
 		--target=$CTARGET \
-		--prefix=/usr \
-		--sysconfdir=/etc \
+		--prefix=/ \
 		--disable-static \
 		--extra-cflags="$CFLAGS" \
 		--extra-ldflags="$LDFLAGS" \
--- a/core/sed/sed.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/sed/sed.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -58,7 +58,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		$with_acl \
 		$with_nls
 	make
--- a/core/sysklogd/sysklogd	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/sysklogd/sysklogd	Tue Apr 09 20:22:00 2019 +0200
@@ -6,7 +6,7 @@
 	source /etc/rc.conf
 fi
 
-: ${SYSKLOGD_CMD:=/usr/sbin/syslogd}
+: ${SYSKLOGD_CMD:=/bin/syslogd}
 : ${SYSKLOGD_ARGS:=}
 : ${SYSKLOGD_PID:=/var/run/syslogd.pid}
 
--- a/core/sysklogd/sysklogd.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/sysklogd/sysklogd.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -43,7 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--without-systemd
 	make
 	make install DESTDIR=$DESTDIR
--- a/core/sysvinit/rc.init	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/sysvinit/rc.init	Tue Apr 09 20:22:00 2019 +0200
@@ -24,36 +24,36 @@
 	printf "\nWelcome to \033[34mVanilla Linux\033[0m\n\n"
 fi
 
-if [ -n "$HOSTNAME" ] && [ -x /usr/bin/hostname ]; then
+if [ -n "$HOSTNAME" ] && [ -x /bin/hostname ]; then
 	echo "Setting hostname: $HOSTNAME"
-	/usr/bin/hostname "$HOSTNAME"
+	/bin/hostname "$HOSTNAME"
 fi
 
-if [ -x /usr/sbin/sysctl ]; then
+if [ -x /bin/sysctl ]; then
 	echo "Setting kernel parameters."
-	/usr/sbin/sysctl -p >/dev/null 2>&1
+	/bin/sysctl -p >/dev/null 2>&1
 fi
 
-if [ -x /usr/bin/mountpoint ]; then
+if [ -x /bin/mountpoint ]; then
 	echo -n "Mounting filesystems: "
 
-	if ! /usr/bin/mountpoint /dev >/dev/null 2>&1; then
-		/usr/bin/mount -t devtmpfs devtmpfs /dev >/dev/null 2>&1
+	if ! /bin/mountpoint /dev >/dev/null 2>&1; then
+		/bin/mount -t devtmpfs devtmpfs /dev >/dev/null 2>&1
 		echo -n "/dev "
 	fi
 
-	if ! /usr/bin/mountpoint /proc >/dev/null 2>&1; then
-		/usr/bin/mount -t proc proc /proc >/dev/null 2>&1
+	if ! /bin/mountpoint /proc >/dev/null 2>&1; then
+		/bin/mount -t proc proc /proc >/dev/null 2>&1
 		echo -n "/proc "
 	fi
 
-	if ! /usr/bin/mountpoint /sys >/dev/null 2>&1; then
-		/usr/bin/mount -t sysfs sysfs /sys >/dev/null 2>&1
+	if ! /bin/mountpoint /sys >/dev/null 2>&1; then
+		/bin/mount -t sysfs sysfs /sys >/dev/null 2>&1
 		echo -n "/sys "
 	fi
 
-	if ! /usr/bin/mountpoint /run >/dev/null 2>&1; then
-		/usr/bin/mount -t tmpfs tmpfs /run >/dev/null 2>&1
+	if ! /bin/mountpoint /run >/dev/null 2>&1; then
+		/bin/mount -t tmpfs tmpfs /run >/dev/null 2>&1
 		echo -n "/run "
 	fi
 
@@ -64,32 +64,32 @@
 	/etc/rc.d/udevd start
 fi
 
-if [ -x /usr/sbin/fsck ]; then
+if [ -x /bin/fsck ]; then
 	# Make sure / is ro in case of initrd.
-	/usr/bin/mount -o remount,ro /
+	/bin/mount -o remount,ro /
 
 	# If /etc/forcefsck is there, force check.
 	if [ -f /etc/forcefsck ]; then
 		force="-f"
 	fi
 
-	/usr/sbin/fsck $force -A -T -C -a >/dev/null 2>&1
+	/bin/fsck $force -A -T -C -a >/dev/null 2>&1
 
 	if [ "$?" -gt 1 ]; then
 		echo "* Filesystem check failed"
-		/usr/sbin/sulogin -p
+		/bin/sulogin -p
 	fi
 fi
 
 # Remount / and enable swap as the system is ready.
-/usr/bin/mount -o remount,rw /
-/usr/sbin/swapon -a
+/bin/mount -o remount,rw /
+/bin/swapon -a
 
 if [ -n "$TIMEZONE" ]; then
 	echo -n "Setting timezone: "
 
-	if [ -f /usr/share/zoneinfo/$TIMEZONE ]; then
-		/usr/bin/ln -sf /usr/share/zoneinfo/$TIMEZONE /etc/localtime
+	if [ -f /share/zoneinfo/$TIMEZONE ]; then
+		/bin/ln -sf /share/zoneinfo/$TIMEZONE /etc/localtime
 		echo "$TIMEZONE."
 	else
 		echo "$TIMEZONE not found."
--- a/core/sysvinit/rc.shutdown	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/sysvinit/rc.shutdown	Tue Apr 09 20:22:00 2019 +0200
@@ -21,20 +21,20 @@
 fi
 
 echo "Terminating all processes."
-/usr/sbin/killall5 -15
+/bin/killall5 -15
 
 echo "Unmounting all filesystems."
-/usr/sbin/halt -w
-/usr/sbin/swapoff -a
+/bin/halt -w
+/bin/swapoff -a
 
-if [ -x /usr/bin/mount ]; then
-	/usr/bin/umount -a -d -r -t nosysfs,noproc,nodevtmpfs
-	/usr/bin/umount -a -r
-	/usr/bin/mount -o remount,ro /
+if [ -x /bin/mount ]; then
+	/bin/umount -a -d -r -t nosysfs,noproc,nodevtmpfs
+	/bin/umount -a -r
+	/bin/mount -o remount,ro /
 fi
 
 if [ "$1" = "0" ]; then
-	/usr/sbin/poweroff -d -f -i
+	/bin/poweroff -d -f -i
 else
-	/usr/sbin/reboot -d -f -i
+	/bin/reboot -d -f -i
 fi
--- a/core/sysvinit/sysvinit.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/sysvinit/sysvinit.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -38,9 +38,7 @@
 
 	patch -p0 < ../disable-components.patch
 	patch -p0 < ../message-style.patch
-	sed -i \
-		-e 's|$(ROOT)/bin|$(ROOT)/usr/bin|g' \
-		-e 's|$(ROOT)/sbin|$(ROOT)/usr/sbin|g' src/Makefile
+	sed -i -e 's|$(ROOT)/sbin|$(ROOT)/bin|g' src/Makefile
 	make CC="$CC" CFLAGS="$CFLAGS"
 	make install ROOT=$DESTDIR
 	install -Dm0644 ../inittab $DESTDIR/etc/inittab
--- a/core/tar/tar.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/tar/tar.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -58,7 +58,7 @@
 	FORCE_UNSAFE_CONFIGURE=1 ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--without-selinux \
 		$with_acl \
 		$with_nls
--- a/core/texinfo/texinfo.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/texinfo/texinfo.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -52,11 +52,11 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/texinfo/{Parsetexi,MiscXS,XSParagraph}.la
+	rm -f $DESTDIR/lib/texinfo/{Parsetexi,MiscXS,XSParagraph}.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/core/tmux/tmux.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/tmux/tmux.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -43,8 +43,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/core/util-linux/util-linux.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/util-linux/util-linux.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -91,7 +91,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--bindir=/usr/bin \
+		--bindir=/bin \
 		--disable-gtk-doc \
 		--disable-static \
 		--disable-chfn-chsh \
@@ -101,9 +101,9 @@
 		--disable-vipw \
 		--enable-shared \
 		--enable-usrdir-path \
-		--libdir=/usr/lib \
-		--prefix=/usr \
-		--sbindir=/usr/sbin \
+		--libdir=/lib \
+		--prefix=/ \
+		--sbindir=/sbin \
 		--without-systemd \
 		$with_audit \
 		$with_colors \
@@ -113,7 +113,7 @@
 		$with_selinux
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/lib{fdisk,smartcols,mount,blkid,uuid}.la
+	rm -f $DESTDIR/lib/lib{fdisk,smartcols,mount,blkid,uuid}.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/core/which/which.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/which/which.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -42,7 +42,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/core/xz/xz.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/xz/xz.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -51,13 +51,13 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared \
 		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/liblzma.la
+	rm -f $DESTDIR/lib/liblzma.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/core/zstd/zstd.sh	Tue Apr 09 20:20:00 2019 +0200
+++ b/core/zstd/zstd.sh	Tue Apr 09 20:22:00 2019 +0200
@@ -36,7 +36,7 @@
 		-e '/^install:/ s/install-static //' \
 		lib/Makefile
 	make CC="$CC" CFLAGS="$CFLAGS"
-	make PREFIX=/usr LIBDIR=/usr/lib DESTDIR=$DESTDIR install
+	make PREFIX=/ LIBDIR=/lib DESTDIR=$DESTDIR install
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION