From 9ed4a97267bddd5f3e92fbb0dba4e4fd8b1c0060 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Fri, 08 Jan 2021 00:30:38 -0500 Subject: Install libraries and executables under / not /usr BusyBox installs its versions of these executables under /, which really makes more sense, for example in case /usr is on a different and corrupted file system (/usr can't be checked if fsck is on /usr). --- diff --git a/badblocks.pkg/files b/badblocks.pkg/files index 25ae013..9522793 100644 --- a/badblocks.pkg/files +++ b/badblocks.pkg/files @@ -1 +1 @@ -/usr/sbin/badblocks +/sbin/badblocks diff --git a/build b/build index d7dc8dd..d2e1419 100755 --- a/build +++ b/build @@ -7,6 +7,10 @@ nop: build: oh-autoconfigure -- \ + --prefix=/ \ + --includedir=/usr/include \ + --datarootdir=/usr/share \ + --mandir=/usr/share/man \ --enable-symlink-install \ --enable-verbose-makecmds \ --enable-elf-shlibs \ @@ -22,11 +26,16 @@ build: install: build oh-autoinstall - rm dest/usr/lib/$(OPK_HOST_ARCH)/*.a + rm dest/lib/$(OPK_HOST_ARCH)/*.a + # Put pkgconfig under /usr where it belongs: + mkdir -p dest/usr/lib/$(OPK_HOST_ARCH)/ + mv \ + dest/lib/$(OPK_HOST_ARCH)/pkgconfig/ \ + dest/usr/lib/$(OPK_HOST_ARCH)/ # Bash scripts and their configuration: rm dest/etc/e2scrub.conf - rm dest/usr/sbin/e2scrub - rm dest/usr/sbin/e2scrub_all + rm dest/sbin/e2scrub + rm dest/sbin/e2scrub_all oh-fixperms oh-strip oh-installfiles diff --git a/e2fsprogs.pkg/files b/e2fsprogs.pkg/files index e29158e..9830fa8 100644 --- a/e2fsprogs.pkg/files +++ b/e2fsprogs.pkg/files @@ -1,29 +1,29 @@ /etc/mke2fs.conf -/usr/bin/chattr -/usr/bin/lsattr -/usr/bin/uuidgen -/usr/sbin/blkid -/usr/sbin/debugfs -/usr/sbin/dumpe2fs -/usr/sbin/e2freefrag -/usr/sbin/e2fsck -/usr/sbin/e2image -/usr/sbin/e2label -/usr/sbin/e2mmpstatus -/usr/sbin/e2undo -/usr/sbin/e4crypt -/usr/sbin/e4defrag -/usr/sbin/filefrag -/usr/sbin/findfs -/usr/sbin/fsck -/usr/sbin/fsck.ext2 -/usr/sbin/fsck.ext3 -/usr/sbin/fsck.ext4 -/usr/sbin/logsave -/usr/sbin/mke2fs -/usr/sbin/mkfs.ext2 -/usr/sbin/mkfs.ext3 -/usr/sbin/mkfs.ext4 -/usr/sbin/mklost+found -/usr/sbin/resize2fs -/usr/sbin/tune2fs +/bin/chattr +/bin/lsattr +/bin/uuidgen +/sbin/blkid +/sbin/debugfs +/sbin/dumpe2fs +/sbin/e2freefrag +/sbin/e2fsck +/sbin/e2image +/sbin/e2label +/sbin/e2mmpstatus +/sbin/e2undo +/sbin/e4crypt +/sbin/e4defrag +/sbin/filefrag +/sbin/findfs +/sbin/fsck +/sbin/fsck.ext2 +/sbin/fsck.ext3 +/sbin/fsck.ext4 +/sbin/logsave +/sbin/mke2fs +/sbin/mkfs.ext2 +/sbin/mkfs.ext3 +/sbin/mkfs.ext4 +/sbin/mklost+found +/sbin/resize2fs +/sbin/tune2fs diff --git a/libblkid.1-dev.pkg/files b/libblkid.1-dev.pkg/files index 1e39a85..c9ce84a 100644 --- a/libblkid.1-dev.pkg/files +++ b/libblkid.1-dev.pkg/files @@ -1,3 +1,3 @@ /usr/include/blkid/ -/usr/lib/*/libblkid.so +/lib/*/libblkid.so /usr/lib/*/pkgconfig/blkid.pc diff --git a/libblkid.1.pkg/files b/libblkid.1.pkg/files index 7db2d4f..17a25e9 100644 --- a/libblkid.1.pkg/files +++ b/libblkid.1.pkg/files @@ -1 +1 @@ -/usr/lib/*/libblkid.so.* +/lib/*/libblkid.so.* diff --git a/libcom-err.2-dev.pkg/files b/libcom-err.2-dev.pkg/files index 6e70ca4..83e3d30 100644 --- a/libcom-err.2-dev.pkg/files +++ b/libcom-err.2-dev.pkg/files @@ -1,6 +1,6 @@ -/usr/bin/compile_et +/bin/compile_et /usr/include/com_err.h /usr/include/et/com_err.h -/usr/lib/*/libcom_err.so +/lib/*/libcom_err.so /usr/lib/*/pkgconfig/com_err.pc /usr/share/et/ diff --git a/libcom-err.2.pkg/files b/libcom-err.2.pkg/files index 44c51d5..97d99f7 100644 --- a/libcom-err.2.pkg/files +++ b/libcom-err.2.pkg/files @@ -1 +1 @@ -/usr/lib/*/libcom_err.so.* +/lib/*/libcom_err.so.* diff --git a/libe2p.2-dev.pkg/files b/libe2p.2-dev.pkg/files index 54f7f45..0030b7c 100644 --- a/libe2p.2-dev.pkg/files +++ b/libe2p.2-dev.pkg/files @@ -1,3 +1,3 @@ /usr/include/e2p/ -/usr/lib/*/libe2p.so +/lib/*/libe2p.so /usr/lib/*/pkgconfig/e2p.pc diff --git a/libe2p.2.pkg/files b/libe2p.2.pkg/files index 7964124..5bfc3b3 100644 --- a/libe2p.2.pkg/files +++ b/libe2p.2.pkg/files @@ -1 +1 @@ -/usr/lib/*/libe2p.so.* +/lib/*/libe2p.so.* diff --git a/libext2fs.2-dev.pkg/files b/libext2fs.2-dev.pkg/files index 081a1fe..58235ee 100644 --- a/libext2fs.2-dev.pkg/files +++ b/libext2fs.2-dev.pkg/files @@ -1,3 +1,3 @@ /usr/include/ext2fs/ -/usr/lib/*/libext2fs.so +/lib/*/libext2fs.so /usr/lib/*/pkgconfig/ext2fs.pc diff --git a/libext2fs.2.pkg/files b/libext2fs.2.pkg/files index 0604d71..61e5422 100644 --- a/libext2fs.2.pkg/files +++ b/libext2fs.2.pkg/files @@ -1 +1 @@ -/usr/lib/*/libext2fs.so.* +/lib/*/libext2fs.so.* diff --git a/libss.2-dev.pkg/files b/libss.2-dev.pkg/files index f23f1e1..901adf6 100644 --- a/libss.2-dev.pkg/files +++ b/libss.2-dev.pkg/files @@ -1,5 +1,5 @@ -/usr/bin/mk_cmds +/bin/mk_cmds /usr/include/ss/ -/usr/lib/*/libss.so +/lib/*/libss.so /usr/lib/*/pkgconfig/ss.pc /usr/share/ss/ diff --git a/libss.2.pkg/files b/libss.2.pkg/files index a7fc5ba..073b370 100644 --- a/libss.2.pkg/files +++ b/libss.2.pkg/files @@ -1 +1 @@ -/usr/lib/*/libss.so.* +/lib/*/libss.so.* diff --git a/libuuid.1-dev.pkg/files b/libuuid.1-dev.pkg/files index a53e219..f0fbf4d 100644 --- a/libuuid.1-dev.pkg/files +++ b/libuuid.1-dev.pkg/files @@ -1,3 +1,3 @@ /usr/include/uuid/ -/usr/lib/*/libuuid.so +/lib/*/libuuid.so /usr/lib/*/pkgconfig/uuid.pc diff --git a/libuuid.1.pkg/files b/libuuid.1.pkg/files index 8436b2f..5bb75c7 100644 --- a/libuuid.1.pkg/files +++ b/libuuid.1.pkg/files @@ -1 +1 @@ -/usr/lib/*/libuuid.so.* +/lib/*/libuuid.so.* -- cgit v0.9.1