From 8756cfcc8674783b9cdb378828ca08ca98b88dc8 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:41 -0800 Subject: [PATCH 01/47] config/functions: use unified /usr --- config/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/functions b/config/functions index 5405a9e6d8..81cdf5956d 100644 --- a/config/functions +++ b/config/functions @@ -117,7 +117,7 @@ kernel_version() { # get kernel module dir get_module_dir() { - basename $(ls -d $(get_build_dir linux)/.install_pkg/lib/modules/*) + basename $(ls -d $(get_build_dir linux)/.install_pkg/usr/lib/modules/*) } # get package's build dir From e8bfc4a34597898e0bddb722af8b01004acc00d4 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:41 -0800 Subject: [PATCH 02/47] scripts/build: use unified /usr --- scripts/build | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build b/scripts/build index 476f821260..5569b48dc7 100755 --- a/scripts/build +++ b/scripts/build @@ -121,6 +121,7 @@ if [ ! -f $STAMP ]; then --bindir=/usr/bin \ --sbindir=/usr/sbin \ --sysconfdir=/etc \ + --libdir=/usr/lib \ --libexecdir=/usr/lib \ --localstatedir=/var \ --disable-static \ From 2f9e111b3c65579f1670c163a2da4db3e7298c40 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:41 -0800 Subject: [PATCH 03/47] scripts/image: use unified /usr --- scripts/image | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/scripts/image b/scripts/image index 3d01eed380..a75a5d970e 100755 --- a/scripts/image +++ b/scripts/image @@ -106,10 +106,7 @@ rm -rf $STAMPS_INSTALL mkdir -p $INSTALL # create baselayout -mkdir -p $INSTALL/bin mkdir -p $INSTALL/etc -mkdir -p $INSTALL/lib -mkdir -p $INSTALL/sbin mkdir -p $INSTALL/dev mkdir -p $INSTALL/proc mkdir -p $INSTALL/run @@ -120,10 +117,12 @@ mkdir -p $INSTALL/var mkdir -p $INSTALL/flash mkdir -p $INSTALL/storage ln -sf /var/media $INSTALL/media +ln -sf /usr/lib $INSTALL/lib +ln -sf /usr/bin $INSTALL/bin +ln -sf /usr/sbin $INSTALL/sbin if [ "$TARGET_ARCH" = "x86_64" -o "$TARGET_ARCH" = "powerpc64" ]; then - ln -s /lib $INSTALL/lib64 - ln -s lib $INSTALL/usr/lib64 + ln -s /usr/lib $INSTALL/lib64 fi echo "$TARGET_VERSION" > $INSTALL/etc/release @@ -225,13 +224,13 @@ if [ -n "$DEVICE" -a -d "$PROJECT_DIR/$PROJECT/devices/$DEVICE/filesystem" ]; th fi # run depmod -MODVER=$(basename $(ls -d $INSTALL/lib/modules/*)) -find $INSTALL/lib/modules/$MODVER/ -name *.ko | \ - sed -e "s,$INSTALL/lib/modules/$MODVER/,," > $INSTALL/lib/modules/$MODVER/modules.order -$ROOT/$TOOLCHAIN/bin/depmod -b $INSTALL $MODVER 2> /dev/null +MODVER=$(basename $(ls -d $INSTALL/usr/lib/modules/*)) +find $INSTALL/usr/lib/modules/$MODVER/ -name *.ko | \ + sed -e "s,$INSTALL/usr/lib/modules/$MODVER/,," > $INSTALL/usr/lib/modules/$MODVER/modules.order +$ROOT/$TOOLCHAIN/bin/depmod -b $INSTALL/usr $MODVER 2> /dev/null # strip kernel modules -for MOD in `find $INSTALL/lib/modules/ -type f -name *.ko`; do +for MOD in `find $INSTALL/usr/lib/modules/ -type f -name *.ko`; do $STRIP --strip-debug $MOD done From fb12c9fcf5a809893cc04434f299156865051a82 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:41 -0800 Subject: [PATCH 04/47] scripts/install: use unified /usr --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index cb08da8188..4ef8eb17a2 100755 --- a/scripts/install +++ b/scripts/install @@ -123,8 +123,8 @@ if [ "$TARGET" = target ] ; then fi if [ -d $PKG_DIR/modprobe.d ]; then - mkdir -p $INSTALL/lib/modprobe.d - cp $PKG_DIR/modprobe.d/*.conf $INSTALL/lib/modprobe.d + mkdir -p $INSTALL/usr/lib/modprobe.d + cp $PKG_DIR/modprobe.d/*.conf $INSTALL/usr/lib/modprobe.d fi fi From ca468b48ffa84e414f573476b16189c1b4b8f5ee Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:41 -0800 Subject: [PATCH 05/47] glibc: use unified /usr --- packages/devel/glibc/package.mk | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk index 5788962809..fe673523da 100644 --- a/packages/devel/glibc/package.mk +++ b/packages/devel/glibc/package.mk @@ -109,18 +109,18 @@ libc_cv_forced_unwind=yes libc_cv_c_cleanup=yes libc_cv_ssp=no libc_cv_ssp_strong=no -libc_cv_slibdir=/lib +libc_cv_slibdir=/usr/lib EOF echo "libdir=/usr/lib" >> configparms -echo "slibdir=/lib" >> configparms +echo "slibdir=/usr/lib" >> configparms echo "sbindir=/usr/bin" >> configparms echo "rootsbindir=/usr/bin" >> configparms } post_makeinstall_target() { # we are linking against ld.so, so symlink - ln -sf $(basename $INSTALL/lib/ld-*.so) $INSTALL/lib/ld.so + ln -sf $(basename $INSTALL/usr/lib/ld-*.so) $INSTALL/usr/lib/ld.so # cleanup for i in $GLIBC_EXCLUDE_BIN; do @@ -157,7 +157,7 @@ post_makeinstall_target() { cp $PKG_DIR/config/gai.conf $INSTALL/etc if [ "$TARGET_ARCH" = "arm" -a "$TARGET_FLOAT" = "hard" ]; then - ln -sf ld.so $INSTALL/lib/ld-linux.so.3 + ln -sf ld.so $INSTALL/usr/lib/ld-linux.so.3 fi } @@ -171,14 +171,14 @@ make_init() { } makeinstall_init() { - mkdir -p $INSTALL/lib - cp -PR $ROOT/$PKG_BUILD/.$TARGET_NAME/elf/ld*.so* $INSTALL/lib - cp $ROOT/$PKG_BUILD/.$TARGET_NAME/libc.so.6 $INSTALL/lib - cp $ROOT/$PKG_BUILD/.$TARGET_NAME/math/libm.so* $INSTALL/lib - cp $ROOT/$PKG_BUILD/.$TARGET_NAME/nptl/libpthread.so.0 $INSTALL/lib - cp -PR $ROOT/$PKG_BUILD/.$TARGET_NAME/rt/librt.so* $INSTALL/lib + mkdir -p $INSTALL/usr/lib + cp -PR $ROOT/$PKG_BUILD/.$TARGET_NAME/elf/ld*.so* $INSTALL/usr/lib + cp $ROOT/$PKG_BUILD/.$TARGET_NAME/libc.so.6 $INSTALL/usr/lib + cp $ROOT/$PKG_BUILD/.$TARGET_NAME/math/libm.so* $INSTALL/usr/lib + cp $ROOT/$PKG_BUILD/.$TARGET_NAME/nptl/libpthread.so.0 $INSTALL/usr/lib + cp -PR $ROOT/$PKG_BUILD/.$TARGET_NAME/rt/librt.so* $INSTALL/usr/lib if [ "$TARGET_ARCH" = "arm" -a "$TARGET_FLOAT" = "hard" ]; then - ln -sf ld.so $INSTALL/lib/ld-linux.so.3 + ln -sf ld.so $INSTALL/usr/lib/ld-linux.so.3 fi } From 5444e62c664e8dbf10ce0566a625e682bba37124 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:41 -0800 Subject: [PATCH 06/47] RTL8188EU: use unified /usr --- packages/linux-drivers/RTL8188EU/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-drivers/RTL8188EU/package.mk b/packages/linux-drivers/RTL8188EU/package.mk index e9fc827963..f0660af653 100644 --- a/packages/linux-drivers/RTL8188EU/package.mk +++ b/packages/linux-drivers/RTL8188EU/package.mk @@ -47,6 +47,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME - cp *.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME + mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME + cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME } From 36c856d519d19eebca5bcc9d0918453be77a4810 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:42 -0800 Subject: [PATCH 07/47] RTL8192CU: use unified /usr --- packages/linux-drivers/RTL8192CU/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-drivers/RTL8192CU/package.mk b/packages/linux-drivers/RTL8192CU/package.mk index 2880135ab4..68c052cc24 100644 --- a/packages/linux-drivers/RTL8192CU/package.mk +++ b/packages/linux-drivers/RTL8192CU/package.mk @@ -45,6 +45,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME - cp *.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME + mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME + cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME } From d25123f7c66747d167757d18b9f18331f9409f87 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:42 -0800 Subject: [PATCH 08/47] RTL8192DU: use unified /usr --- packages/linux-drivers/RTL8192DU/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-drivers/RTL8192DU/package.mk b/packages/linux-drivers/RTL8192DU/package.mk index c62e47f772..13553ba96d 100644 --- a/packages/linux-drivers/RTL8192DU/package.mk +++ b/packages/linux-drivers/RTL8192DU/package.mk @@ -46,6 +46,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME - cp *.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME + mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME + cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME } From ffeeaec36bc752b89a9f0ac696c81d92719af466 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:42 -0800 Subject: [PATCH 09/47] RTL8192EU: use unified /usr --- packages/linux-drivers/RTL8192EU/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-drivers/RTL8192EU/package.mk b/packages/linux-drivers/RTL8192EU/package.mk index 92ea465634..0b74265a63 100644 --- a/packages/linux-drivers/RTL8192EU/package.mk +++ b/packages/linux-drivers/RTL8192EU/package.mk @@ -47,6 +47,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME - cp *.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME + mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME + cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME } From 80f393f05a8e89584320d1c44ccece31a19bdcad Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:42 -0800 Subject: [PATCH 10/47] RTL8812AU: use unified /usr --- packages/linux-drivers/RTL8812AU/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-drivers/RTL8812AU/package.mk b/packages/linux-drivers/RTL8812AU/package.mk index 1f13709800..fd40ed905f 100644 --- a/packages/linux-drivers/RTL8812AU/package.mk +++ b/packages/linux-drivers/RTL8812AU/package.mk @@ -45,6 +45,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME - cp *.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME + mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME + cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME } From 663686cd1abf452f1dd54140f5fe9fda0e456385 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:42 -0800 Subject: [PATCH 11/47] bcm_sta: use unified /usr --- packages/linux-drivers/bcm_sta/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-drivers/bcm_sta/package.mk b/packages/linux-drivers/bcm_sta/package.mk index 8453155639..7ae9a67302 100644 --- a/packages/linux-drivers/bcm_sta/package.mk +++ b/packages/linux-drivers/bcm_sta/package.mk @@ -41,6 +41,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/lib/modules/$(get_module_dir)/bcm_sta - cp *.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME + mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/bcm_sta + cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME } From 9364925d4bf40b1befd0a2f3ef3c89d0cd760c55 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:42 -0800 Subject: [PATCH 12/47] brcmap6xxx-aml: use unified /usr --- packages/linux-drivers/brcmap6xxx-aml/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-drivers/brcmap6xxx-aml/package.mk b/packages/linux-drivers/brcmap6xxx-aml/package.mk index cdd968e340..8b15d3d381 100644 --- a/packages/linux-drivers/brcmap6xxx-aml/package.mk +++ b/packages/linux-drivers/brcmap6xxx-aml/package.mk @@ -41,8 +41,8 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/lib/modules/$(get_module_dir)/bcmdhd - cp *.ko $INSTALL/lib/modules/$(get_module_dir)/bcmdhd + mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/bcmdhd + cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/bcmdhd mkdir -p $INSTALL/lib/firmware/brcm cp $PKG_DIR/config/config.txt $INSTALL/lib/firmware/brcm From d3b2a1ca68fd205128a5bc710ebd33c2d7f97b86 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:42 -0800 Subject: [PATCH 13/47] dvbhdhomerun: use unified /usr --- packages/linux-drivers/dvbhdhomerun/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-drivers/dvbhdhomerun/package.mk b/packages/linux-drivers/dvbhdhomerun/package.mk index 9d2f9b5b47..2ea7e6ca05 100644 --- a/packages/linux-drivers/dvbhdhomerun/package.mk +++ b/packages/linux-drivers/dvbhdhomerun/package.mk @@ -57,8 +57,8 @@ pre_configure_target() { makeinstall_target() { cd $ROOT/$PKG_BUILD - mkdir -p $INSTALL/lib/modules/$(get_module_dir)/hdhomerun - cp kernel/*.ko $INSTALL/lib/modules/$(get_module_dir)/hdhomerun/ + mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/hdhomerun + cp kernel/*.ko $INSTALL/usr/lib/modules/$(get_module_dir)/hdhomerun/ mkdir -p $INSTALL/usr/bin cp -PR .$TARGET_NAME/userhdhomerun $INSTALL/usr/bin From 4ecc230be4382b6fc725ea16764c43b92066a4f5 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:42 -0800 Subject: [PATCH 14/47] tbs-linux-drivers: use unified /usr --- packages/linux-drivers/tbs-linux-drivers/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-drivers/tbs-linux-drivers/package.mk b/packages/linux-drivers/tbs-linux-drivers/package.mk index a5ef202231..a0318560c1 100644 --- a/packages/linux-drivers/tbs-linux-drivers/package.mk +++ b/packages/linux-drivers/tbs-linux-drivers/package.mk @@ -45,8 +45,8 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/lib/modules/$(get_module_dir)/updates/tbs - find $ROOT/$PKG_BUILD/linux-tbs-drivers/ -name \*.ko -exec cp {} $INSTALL/lib/modules/$(get_module_dir)/updates/tbs \; + mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/updates/tbs + find $ROOT/$PKG_BUILD/linux-tbs-drivers/ -name \*.ko -exec cp {} $INSTALL/usr/lib/modules/$(get_module_dir)/updates/tbs \; mkdir -p $INSTALL/lib/firmware/ cp $ROOT/$PKG_BUILD/*.fw $INSTALL/lib/firmware/ } From bf3e1f7835d2a24e5d1ca9d288e5fe8b58b721b0 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:42 -0800 Subject: [PATCH 15/47] vboxguest: use unified /usr --- packages/linux-drivers/vboxguest/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-drivers/vboxguest/package.mk b/packages/linux-drivers/vboxguest/package.mk index d881249a87..35cbc24a6c 100644 --- a/packages/linux-drivers/vboxguest/package.mk +++ b/packages/linux-drivers/vboxguest/package.mk @@ -52,7 +52,7 @@ make_target() { makeinstall_target() { for module in vboxguest vboxsf vboxvideo; do - mkdir -p $INSTALL/lib/modules/$(get_module_dir)/$module - cp -P $ROOT/$PKG_BUILD/vbox-kmod/$module.ko $INSTALL/lib/modules/$(get_module_dir)/$module + mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$module + cp -P $ROOT/$PKG_BUILD/vbox-kmod/$module.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$module done } From 331560bd33bb6f941170aaa1cba3a2571d8bc70d Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:43 -0800 Subject: [PATCH 16/47] wetekdvb: use unified /usr --- packages/linux-drivers/wetekdvb/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/linux-drivers/wetekdvb/package.mk b/packages/linux-drivers/wetekdvb/package.mk index e494c7b439..63d4d9d9c1 100644 --- a/packages/linux-drivers/wetekdvb/package.mk +++ b/packages/linux-drivers/wetekdvb/package.mk @@ -37,11 +37,11 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME + mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME if [ $PROJECT = "WeTek_Play_2" ]; then - cp driver/wetekdvb_play2.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME/wetekdvb.ko + cp driver/wetekdvb_play2.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME/wetekdvb.ko else - cp driver/wetekdvb.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME + cp driver/wetekdvb.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME fi mkdir -p $INSTALL/lib/firmware From d9923faf4618ca74a887f41b8398f8ccd1ab7280 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:43 -0800 Subject: [PATCH 17/47] brcmfmac_sdio-firmware-rpi: use unified /usr --- packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk index 85ab3c32d0..3a42e617ec 100644 --- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk +++ b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk @@ -36,7 +36,7 @@ make_target() { } makeinstall_target() { - DESTDIR=$INSTALL ./install + DESTDIR=$INSTALL/usr ./install } post_install() { From 362f0f2c88767a19303d8b1ff08c65f409e7da66 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:43 -0800 Subject: [PATCH 18/47] dvb-firmware: use unified /usr --- packages/linux-firmware/dvb-firmware/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux-firmware/dvb-firmware/package.mk b/packages/linux-firmware/dvb-firmware/package.mk index df094ca339..1ce5c1fc89 100644 --- a/packages/linux-firmware/dvb-firmware/package.mk +++ b/packages/linux-firmware/dvb-firmware/package.mk @@ -36,5 +36,5 @@ make_target() { } makeinstall_target() { - DESTDIR=$INSTALL ./install + DESTDIR=$INSTALL/usr ./install } From 4feee8c7099bf253860dc3cb7ea0b81341d33a65 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:43 -0800 Subject: [PATCH 19/47] firmware-imx: use unified /usr --- packages/linux-firmware/firmware-imx/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/linux-firmware/firmware-imx/package.mk b/packages/linux-firmware/firmware-imx/package.mk index e4b3f794fb..d684316df7 100644 --- a/packages/linux-firmware/firmware-imx/package.mk +++ b/packages/linux-firmware/firmware-imx/package.mk @@ -36,7 +36,7 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/lib/firmware/vpu - cp -P firmware/vpu/vpu_fw_imx6d.bin $INSTALL/lib/firmware/vpu - cp -P firmware/vpu/vpu_fw_imx6q.bin $INSTALL/lib/firmware/vpu + mkdir -p $INSTALL/usr/lib/firmware/vpu + cp -P firmware/vpu/vpu_fw_imx6d.bin $INSTALL/usr/lib/firmware/vpu + cp -P firmware/vpu/vpu_fw_imx6q.bin $INSTALL/usr/lib/firmware/vpu } From 2efee46a590be2abdd3d9e9051f508f9e19cb10d Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:43 -0800 Subject: [PATCH 20/47] iwlwifi-firmware: use unified /usr --- packages/linux-firmware/iwlwifi-firmware/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux-firmware/iwlwifi-firmware/package.mk b/packages/linux-firmware/iwlwifi-firmware/package.mk index 5c3628f9b4..f5e8b97a1d 100644 --- a/packages/linux-firmware/iwlwifi-firmware/package.mk +++ b/packages/linux-firmware/iwlwifi-firmware/package.mk @@ -36,5 +36,5 @@ make_target() { } makeinstall_target() { - DESTDIR=$INSTALL ./install + DESTDIR=$INSTALL/usr ./install } From 8585fc4a385d45c1744032947236bbedf71120f7 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:44 -0800 Subject: [PATCH 21/47] misc-firmware: use unified /usr --- packages/linux-firmware/misc-firmware/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux-firmware/misc-firmware/package.mk b/packages/linux-firmware/misc-firmware/package.mk index 176021bee2..ef19d5ce15 100644 --- a/packages/linux-firmware/misc-firmware/package.mk +++ b/packages/linux-firmware/misc-firmware/package.mk @@ -36,5 +36,5 @@ make_target() { } makeinstall_target() { - DESTDIR=$INSTALL ./install + DESTDIR=$INSTALL/usr ./install } From 2a0e3db397cfd12e4ce2bc432950596a282cb471 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:44 -0800 Subject: [PATCH 22/47] wlan-firmware-aml: use unified /usr --- .../linux-firmware/wlan-firmware-aml/package.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/linux-firmware/wlan-firmware-aml/package.mk b/packages/linux-firmware/wlan-firmware-aml/package.mk index 54137fc3f5..25f0b81e21 100644 --- a/packages/linux-firmware/wlan-firmware-aml/package.mk +++ b/packages/linux-firmware/wlan-firmware-aml/package.mk @@ -36,13 +36,13 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/lib/firmware/brcm + mkdir -p $INSTALL/usr/lib/firmware/brcm - cp -PR bcm_ampak/config/AP6330/Wi-Fi/fw_bcm40183b2*.bin $INSTALL/lib/firmware/brcm - cp -P bcm_ampak/config/AP6330/Wi-Fi/nvram_ap6330.txt $INSTALL/lib/firmware/brcm - cp -P bcm_ampak/config/AP6330/BT/bcm40183b2.hcd $INSTALL/lib/firmware/brcm + cp -PR bcm_ampak/config/AP6330/Wi-Fi/fw_bcm40183b2*.bin $INSTALL/usr/lib/firmware/brcm + cp -P bcm_ampak/config/AP6330/Wi-Fi/nvram_ap6330.txt $INSTALL/usr/lib/firmware/brcm + cp -P bcm_ampak/config/AP6330/BT/bcm40183b2.hcd $INSTALL/usr/lib/firmware/brcm - cp -PR bcm_ampak/config/6335/fw_bcm4339a0_*.bin $INSTALL/lib/firmware/brcm - cp -P bcm_ampak/config/6335/nvram.txt $INSTALL/lib/firmware/brcm/nvram_ap6335.txt - cp -P bcm_ampak/config/6335/BT/bcm4335c0.hcd $INSTALL/lib/firmware/brcm + cp -PR bcm_ampak/config/6335/fw_bcm4339a0_*.bin $INSTALL/usr/lib/firmware/brcm + cp -P bcm_ampak/config/6335/nvram.txt $INSTALL/usr/lib/firmware/brcm/nvram_ap6335.txt + cp -P bcm_ampak/config/6335/BT/bcm4335c0.hcd $INSTALL/usr/lib/firmware/brcm } From 36229de2aed9cb1ae282eacd8e8b13f4f9ffeeca Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:44 -0800 Subject: [PATCH 23/47] wlan-firmware: use unified /usr --- packages/linux-firmware/wlan-firmware/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux-firmware/wlan-firmware/package.mk b/packages/linux-firmware/wlan-firmware/package.mk index e6011de10b..6cdbcd6c0e 100644 --- a/packages/linux-firmware/wlan-firmware/package.mk +++ b/packages/linux-firmware/wlan-firmware/package.mk @@ -36,5 +36,5 @@ make_target() { } makeinstall_target() { - DESTDIR=$INSTALL ./install + DESTDIR=$INSTALL/usr ./install } From 169d9e2bd4f69006d2c631109993652571bdb312 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:44 -0800 Subject: [PATCH 24/47] linux: use unified /usr --- packages/linux/package.mk | 24 +++++++++---------- packages/linux/udev.d/30-disable-wakeup.rules | 2 +- packages/linux/udev.d/40-modeswitch.rules | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 2ce6e7938a..1f96bf83d5 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -170,9 +170,9 @@ pre_make_target() { make_target() { LDFLAGS="" make modules - LDFLAGS="" make INSTALL_MOD_PATH=$INSTALL DEPMOD="$ROOT/$TOOLCHAIN/bin/depmod" modules_install - rm -f $INSTALL/lib/modules/*/build - rm -f $INSTALL/lib/modules/*/source + LDFLAGS="" make INSTALL_MOD_PATH=$INSTALL/usr DEPMOD="$ROOT/$TOOLCHAIN/bin/depmod" modules_install + rm -f $INSTALL/usr/lib/modules/*/build + rm -f $INSTALL/usr/lib/modules/*/source ( cd $ROOT rm -rf $ROOT/$BUILD/initramfs @@ -220,28 +220,28 @@ make_init() { makeinstall_init() { if [ -n "$INITRAMFS_MODULES" ]; then mkdir -p $INSTALL/etc - mkdir -p $INSTALL/lib/modules + mkdir -p $INSTALL/usr/lib/modules for i in $INITRAMFS_MODULES; do - module=`find .install_pkg/lib/modules/$(get_module_dir)/kernel -name $i.ko` + module=`find .install_pkg/usr/lib/modules/$(get_module_dir)/kernel -name $i.ko` if [ -n "$module" ]; then echo $i >> $INSTALL/etc/modules - cp $module $INSTALL/lib/modules/`basename $module` + cp $module $INSTALL/usr/lib/modules/`basename $module` fi done fi if [ "$UVESAFB_SUPPORT" = yes ]; then - mkdir -p $INSTALL/lib/modules - uvesafb=`find .install_pkg/lib/modules/$(get_module_dir)/kernel -name uvesafb.ko` - cp $uvesafb $INSTALL/lib/modules/`basename $uvesafb` + mkdir -p $INSTALL/usr/lib/modules + uvesafb=`find .install_pkg/usr/lib/modules/$(get_module_dir)/kernel -name uvesafb.ko` + cp $uvesafb $INSTALL/usr/lib/modules/`basename $uvesafb` fi } post_install() { - mkdir -p $INSTALL/lib/firmware/ - ln -sf /storage/.config/firmware/ $INSTALL/lib/firmware/updates + mkdir -p $INSTALL/usr/lib/firmware/ + ln -sf /storage/.config/firmware/ $INSTALL/usr/lib/firmware/updates # bluez looks in /etc/firmware/ - ln -sf /lib/firmware/ $INSTALL/etc/firmware + ln -sf /usr/lib/firmware/ $INSTALL/etc/firmware } diff --git a/packages/linux/udev.d/30-disable-wakeup.rules b/packages/linux/udev.d/30-disable-wakeup.rules index 0211cc36ee..7abbac3baf 100644 --- a/packages/linux/udev.d/30-disable-wakeup.rules +++ b/packages/linux/udev.d/30-disable-wakeup.rules @@ -18,6 +18,6 @@ ACTION!="add|change", GOTO="end" -DRIVER=="ehci-pci|xhci_hcd", RUN+="/bin/sh -c 'echo disabled > /sys/$devpath/power/wakeup'" +DRIVER=="ehci-pci|xhci_hcd", RUN+="/usr/bin/sh -c 'echo disabled > /sys/$devpath/power/wakeup'" LABEL="end" diff --git a/packages/linux/udev.d/40-modeswitch.rules b/packages/linux/udev.d/40-modeswitch.rules index d81af2f5dd..583bc91c9b 100644 --- a/packages/linux/udev.d/40-modeswitch.rules +++ b/packages/linux/udev.d/40-modeswitch.rules @@ -21,6 +21,6 @@ KERNEL!="sr[0-9]*", GOTO="end_modeswitch" SUBSYSTEM!="block", GOTO="end_modeswitch" # Atheros Wireless / Netgear WNDA3200 -ATTRS{idVendor}=="0cf3", ATTRS{idProduct}=="20ff", RUN+="/bin/eject '/dev/%k'" +ATTRS{idVendor}=="0cf3", ATTRS{idProduct}=="20ff", RUN+="/usr/bin/eject '/dev/%k'" LABEL="end_modeswitch" From 725ea4f977ef5b9e411133df83d32403dc9c6318 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:45 -0800 Subject: [PATCH 25/47] busybox: use unified /usr --- .../sysutils/busybox/config/busybox-init.conf | 6 +- .../busybox/config/busybox-target.conf | 4 +- packages/sysutils/busybox/package.mk | 15 ++--- .../busybox/profile.d/98-busybox.conf | 4 +- packages/sysutils/busybox/scripts/init | 56 +++++++++---------- 5 files changed, 40 insertions(+), 45 deletions(-) diff --git a/packages/sysutils/busybox/config/busybox-init.conf b/packages/sysutils/busybox/config/busybox-init.conf index edaf87fc06..23e0e73aad 100644 --- a/packages/sysutils/busybox/config/busybox-init.conf +++ b/packages/sysutils/busybox/config/busybox-init.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.25.0 -# Wed Jul 20 11:53:10 2016 +# Busybox version: 1.25.1 +# Thu Nov 24 23:29:54 2016 # CONFIG_HAVE_DOT_CONFIG=y @@ -25,7 +25,7 @@ CONFIG_FEATURE_VERBOSE_USAGE=y # CONFIG_FEATURE_COMPRESS_USAGE is not set CONFIG_BUSYBOX=y # CONFIG_FEATURE_INSTALLER is not set -# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_NO_USR=y # CONFIG_LOCALE_SUPPORT is not set CONFIG_UNICODE_SUPPORT=y # CONFIG_UNICODE_USING_LOCALE is not set diff --git a/packages/sysutils/busybox/config/busybox-target.conf b/packages/sysutils/busybox/config/busybox-target.conf index a276c33e23..c40df53186 100644 --- a/packages/sysutils/busybox/config/busybox-target.conf +++ b/packages/sysutils/busybox/config/busybox-target.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.25.0 -# Wed Jul 20 11:54:40 2016 +# Busybox version: 1.25.1 +# Thu Nov 24 23:26:05 2016 # CONFIG_HAVE_DOT_CONFIG=y diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk index 4a76478274..d246d75afc 100644 --- a/packages/sysutils/busybox/package.mk +++ b/packages/sysutils/busybox/package.mk @@ -97,7 +97,7 @@ configure_target() { cp $BUSYBOX_CFG_FILE_TARGET .config # set install dir - sed -i -e "s|^CONFIG_PREFIX=.*$|CONFIG_PREFIX=\"$INSTALL\"|" .config + sed -i -e "s|^CONFIG_PREFIX=.*$|CONFIG_PREFIX=\"$INSTALL/usr\"|" .config if [ ! "$DEVTOOLS" = yes ]; then sed -i -e "s|^CONFIG_DEVMEM=.*$|# CONFIG_DEVMEM is not set|" .config @@ -134,7 +134,7 @@ configure_init() { cp $BUSYBOX_CFG_FILE_INIT .config # set install dir - sed -i -e "s|^CONFIG_PREFIX=.*$|CONFIG_PREFIX=\"$INSTALL\"|" .config + sed -i -e "s|^CONFIG_PREFIX=.*$|CONFIG_PREFIX=\"$INSTALL/usr\"|" .config # optimize for size CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-Os|"` @@ -160,7 +160,6 @@ makeinstall_target() { cp $PKG_DIR/scripts/apt-get $INSTALL/usr/bin/ cp $PKG_DIR/scripts/passwd $INSTALL/usr/bin/ cp $PKG_DIR/scripts/sudo $INSTALL/usr/bin/ - ln -sf /bin/busybox $INSTALL/usr/bin/env #/usr/bin/env is needed for most python scripts cp $PKG_DIR/scripts/pastebinit $INSTALL/usr/bin/ ln -sf pastebinit $INSTALL/usr/bin/paste @@ -191,10 +190,6 @@ makeinstall_target() { # create /etc/hostname ln -sf /proc/sys/kernel/hostname $INSTALL/etc/hostname - # systemd wants /usr/bin/mkdir - mkdir -p $INSTALL/usr/bin - ln -sf /bin/busybox $INSTALL/usr/bin/mkdir - # add webroot mkdir -p $INSTALL/usr/www echo "It works" > $INSTALL/usr/www/index.html @@ -206,7 +201,7 @@ makeinstall_target() { post_install() { ROOT_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $ROOT_PASSWORD`" - echo "chmod 4755 $INSTALL/bin/busybox" >> $FAKEROOT_SCRIPT + echo "chmod 4755 $INSTALL/usr/bin/busybox" >> $FAKEROOT_SCRIPT echo "chmod 000 $INSTALL/etc/shadow" >> $FAKEROOT_SCRIPT add_user root "$ROOT_PWD" 0 0 "Root User" "/storage" "/bin/sh" @@ -237,8 +232,8 @@ post_install() { makeinstall_init() { mkdir -p $INSTALL/bin - ln -sf busybox $INSTALL/bin/sh - chmod 4755 $INSTALL/bin/busybox + ln -sf busybox $INSTALL/usr/bin/sh + chmod 4755 $INSTALL/usr/bin/busybox mkdir -p $INSTALL/etc touch $INSTALL/etc/fstab diff --git a/packages/sysutils/busybox/profile.d/98-busybox.conf b/packages/sysutils/busybox/profile.d/98-busybox.conf index a5cc8ce02d..c9b9cc5ae4 100644 --- a/packages/sysutils/busybox/profile.d/98-busybox.conf +++ b/packages/sysutils/busybox/profile.d/98-busybox.conf @@ -17,8 +17,8 @@ ################################################################################ export HOME="/storage" -export PATH="/bin:/sbin:/usr/bin:/usr/sbin" -export LD_LIBRARY_PATH="/usr/lib:/lib" +export PATH="/usr/bin:/usr/sbin" +export LD_LIBRARY_PATH="/usr/lib" export HOSTNAME=`cat /etc/hostname` export PS1="\[\e[1;32m\]\h\[\e[1;32m\]:\[\e[1;34m\]\w \[\e[0m\]\\$ " # k0p diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 1872bdbe0f..20f8651fd7 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -21,24 +21,24 @@ ################################################################################ # create directories - /bin/busybox mkdir -p /dev - /bin/busybox mkdir -p /proc - /bin/busybox mkdir -p /sys - /bin/busybox mkdir -p /tmp - /bin/busybox mkdir -p /flash - /bin/busybox mkdir -p /sysroot - /bin/busybox mkdir -p /storage + /usr/bin/busybox mkdir -p /dev + /usr/bin/busybox mkdir -p /proc + /usr/bin/busybox mkdir -p /sys + /usr/bin/busybox mkdir -p /tmp + /usr/bin/busybox mkdir -p /flash + /usr/bin/busybox mkdir -p /sysroot + /usr/bin/busybox mkdir -p /storage # mount all needed special filesystems - /bin/busybox mount -t devtmpfs devtmpfs /dev - /bin/busybox mount -t proc proc /proc - /bin/busybox mount -t sysfs sysfs /sys + /usr/bin/busybox mount -t devtmpfs devtmpfs /dev + /usr/bin/busybox mount -t proc proc /proc + /usr/bin/busybox mount -t sysfs sysfs /sys # common functions . /functions # set needed variables - MODULE_DIR=/lib/modules + MODULE_DIR=/usr/lib/modules UPDATE_ROOT=/storage/.update UPDATE_DIR="$UPDATE_ROOT" @@ -271,19 +271,19 @@ ISCSI_DEV="${1##*,}" ISCSI_OPTIONS="${1%,*}" - if [ ! -f "/sbin/iscsistart" ]; then + if [ ! -f "/usr/sbin/iscsistart" ]; then error "iscsistart" "iSCSI support not available" fi if [ "$ISCSI_OPTIONS" = "auto" ]; then progress "Network configuration based on iBFT" - /sbin/iscsistart -N >&$SILENT_OUT 2>&1 || \ + /usr/sbin/iscsistart -N >&$SILENT_OUT 2>&1 || \ error "iscsistart" "Unable to configure network" progress "iSCSI auto connect based on iBFT" - /sbin/iscsistart -b >&$SILENT_OUT 2>&1 || \ + /usr/sbin/iscsistart -b >&$SILENT_OUT 2>&1 || \ error "iscsistart" "Unable to auto connect" else - /sbin/iscsistart $(get_iscsistart_options "$ISCSI_OPTIONS") >&$SILENT_OUT 2>&1 || \ + /usr/sbin/iscsistart $(get_iscsistart_options "$ISCSI_OPTIONS") >&$SILENT_OUT 2>&1 || \ error "iscsistart" "Unable to connect to ISCSI target" fi @@ -554,16 +554,16 @@ sync # unmount filesystems - if /bin/busybox mountpoint -q /flash ; then - /bin/busybox umount /flash + if /usr/bin/busybox mountpoint -q /flash ; then + /usr/bin/busybox umount /flash fi - if /bin/busybox mountpoint -q /storage ; then - /bin/busybox umount /storage + if /usr/bin/busybox mountpoint -q /storage ; then + /usr/bin/busybox umount /storage fi usleep 2000000 - /bin/busybox reboot + /usr/bin/busybox reboot } force_fsck() { @@ -577,7 +577,7 @@ if [ "$?" -ne "0" -o "$?" -gt "128" ] ; then echo "Repairing filesystem..." echo "" - /sbin/fsck -T -M -y $RUN_FSCK_DISKS + /usr/sbin/fsck -T -M -y $RUN_FSCK_DISKS FSCK_RET="$?" if [ "$(( $FSCK_RET & 8 ))" = 8 ] ; then # fubar @@ -601,7 +601,7 @@ check_disks() { if [ "$RUN_FSCK" = "yes" -a -n "$RUN_FSCK_DISKS" ]; then progress "Checking disk(s): $RUN_FSCK_DISKS" - /sbin/fsck -T -M -p -a $RUN_FSCK_DISKS > /dev/null 2>&1 + /usr/sbin/fsck -T -M -p -a $RUN_FSCK_DISKS > /dev/null 2>&1 FSCK_RET="$?" # FSCK_RET is the bit-wise OR of the exit codes for each filesystem that is checked. @@ -991,7 +991,7 @@ mount --move /flash /sysroot/flash mount --move /storage /sysroot/storage - if [ ! -d "/sysroot/lib/modules/$(uname -r)/" -a -f "/sysroot/usr/lib/systemd/systemd" ]; then + if [ ! -d "/sysroot/usr/lib/modules/$(uname -r)/" -a -f "/sysroot/usr/lib/systemd/systemd" ]; then echo "" echo "NEVER TOUCH boot= in extlinux.conf / cmdline.txt!" echo "If you don't know what you are doing," @@ -1040,10 +1040,10 @@ fi done # move some special filesystems - /bin/busybox mount --move /dev /sysroot/dev - /bin/busybox mount --move /proc /sysroot/proc - /bin/busybox mount --move /sys /sysroot/sys - /bin/busybox rm -fr /tmp + /usr/bin/busybox mount --move /dev /sysroot/dev + /usr/bin/busybox mount --move /proc /sysroot/proc + /usr/bin/busybox mount --move /sys /sysroot/sys + /usr/bin/busybox rm -fr /tmp # tell OE settings addon to disable updates if [ "$UPDATE_DISABLED" = "yes" ] ; then @@ -1068,6 +1068,6 @@ fi # switch to new sysroot and start real init - exec /bin/busybox switch_root /sysroot /usr/lib/systemd/systemd $INIT_ARGS $INIT_UNIT + exec /usr/bin/busybox switch_root /sysroot /usr/lib/systemd/systemd $INIT_ARGS $INIT_UNIT error "switch_root" "Error in initramfs. Could not switch to new root" From 5923c833dbbe69fa530a5ec01860bc4d38ed312f Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:45 -0800 Subject: [PATCH 26/47] diskdev_cmds: use unified /usr --- packages/sysutils/diskdev_cmds/package.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/sysutils/diskdev_cmds/package.mk b/packages/sysutils/diskdev_cmds/package.mk index 03acb21d61..33fbf6b4ec 100644 --- a/packages/sysutils/diskdev_cmds/package.mk +++ b/packages/sysutils/diskdev_cmds/package.mk @@ -38,10 +38,10 @@ pre_make_target() { } makeinstall_target() { - mkdir -p $INSTALL/sbin - cp fsck_hfs.tproj/fsck_hfs $INSTALL/sbin - ln -sf fsck_hfs $INSTALL/sbin/fsck.hfs - ln -sf fsck_hfs $INSTALL/sbin/fsck.hfsplus + mkdir -p $INSTALL/usr/sbin + cp fsck_hfs.tproj/fsck_hfs $INSTALL/usr/sbin + ln -sf fsck_hfs $INSTALL/usr/sbin/fsck.hfs + ln -sf fsck_hfs $INSTALL/usr/sbin/fsck.hfsplus } make_init() { From 01802edb3c3a8e50e70705b6ec30433c3b04ad27 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:45 -0800 Subject: [PATCH 27/47] e2fsprogs: use unified /usr --- packages/sysutils/e2fsprogs/package.mk | 45 ++++++++++++-------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/packages/sysutils/e2fsprogs/package.mk b/packages/sysutils/e2fsprogs/package.mk index b42983432b..15c6d12ea6 100644 --- a/packages/sysutils/e2fsprogs/package.mk +++ b/packages/sysutils/e2fsprogs/package.mk @@ -41,9 +41,6 @@ PKG_CONFIGURE_OPTS_HOST="--prefix=/usr \ --sbindir=/sbin" PKG_CONFIGURE_OPTS_TARGET="BUILD_CC=$HOST_CC \ - --prefix=/usr \ - --bindir=/bin \ - --sbindir=/sbin \ --enable-verbose-makecmds \ --enable-symlink-install \ --enable-symlink-build \ @@ -76,32 +73,32 @@ pre_make_host() { } post_makeinstall_target() { - rm -rf $INSTALL/sbin/badblocks - rm -rf $INSTALL/sbin/blkid - rm -rf $INSTALL/sbin/dumpe2fs - rm -rf $INSTALL/sbin/e2freefrag - rm -rf $INSTALL/sbin/e2undo - rm -rf $INSTALL/sbin/e4defrag - rm -rf $INSTALL/sbin/filefrag - rm -rf $INSTALL/sbin/fsck - rm -rf $INSTALL/sbin/logsave - rm -rf $INSTALL/sbin/mklost+found + rm -rf $INSTALL/usr/sbin/badblocks + rm -rf $INSTALL/usr/sbin/blkid + rm -rf $INSTALL/usr/sbin/dumpe2fs + rm -rf $INSTALL/usr/sbin/e2freefrag + rm -rf $INSTALL/usr/sbin/e2undo + rm -rf $INSTALL/usr/sbin/e4defrag + rm -rf $INSTALL/usr/sbin/filefrag + rm -rf $INSTALL/usr/sbin/fsck + rm -rf $INSTALL/usr/sbin/logsave + rm -rf $INSTALL/usr/sbin/mklost+found } makeinstall_init() { - mkdir -p $INSTALL/sbin - cp e2fsck/e2fsck $INSTALL/sbin - ln -sf e2fsck $INSTALL/sbin/fsck.ext2 - ln -sf e2fsck $INSTALL/sbin/fsck.ext3 - ln -sf e2fsck $INSTALL/sbin/fsck.ext4 - ln -sf e2fsck $INSTALL/sbin/fsck.ext4dev + mkdir -p $INSTALL/usr/sbin + cp e2fsck/e2fsck $INSTALL/usr/sbin + ln -sf e2fsck $INSTALL/usr/sbin/fsck.ext2 + ln -sf e2fsck $INSTALL/usr/sbin/fsck.ext3 + ln -sf e2fsck $INSTALL/usr/sbin/fsck.ext4 + ln -sf e2fsck $INSTALL/usr/sbin/fsck.ext4dev if [ $INITRAMFS_PARTED_SUPPORT = "yes" ]; then - cp misc/mke2fs $INSTALL/sbin - ln -sf mke2fs $INSTALL/sbin/mkfs.ext2 - ln -sf mke2fs $INSTALL/sbin/mkfs.ext3 - ln -sf mke2fs $INSTALL/sbin/mkfs.ext4 - ln -sf mke2fs $INSTALL/sbin/mkfs.ext4dev + cp misc/mke2fs $INSTALL/usr/sbin + ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext2 + ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext3 + ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext4 + ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext4dev fi } From d5ae3e5c9bd251f0c80ee86df90a4e76c5081e49 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:45 -0800 Subject: [PATCH 28/47] fuse: use unified /usr --- packages/sysutils/fuse/package.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/sysutils/fuse/package.mk b/packages/sysutils/fuse/package.mk index 5e9486bf8a..c8be87125d 100644 --- a/packages/sysutils/fuse/package.mk +++ b/packages/sysutils/fuse/package.mk @@ -31,7 +31,8 @@ PKG_LONGDESC="FUSE provides a simple interface for userspace programs to export PKG_IS_ADDON="no" PKG_AUTORECONF="no" -PKG_CONFIGURE_OPTS_TARGET="--enable-lib \ +PKG_CONFIGURE_OPTS_TARGET="MOUNT_FUSE_PATH=/usr/sbin \ + --enable-lib \ --enable-util \ --disable-example \ --enable-mtab \ From 4eb0733670ecc2959ee4687b3b79190fa868ed85 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:45 -0800 Subject: [PATCH 29/47] keyutils: use unified /usr --- packages/sysutils/keyutils/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/keyutils/package.mk b/packages/sysutils/keyutils/package.mk index 5a5d50bf63..d516664154 100644 --- a/packages/sysutils/keyutils/package.mk +++ b/packages/sysutils/keyutils/package.mk @@ -30,11 +30,11 @@ PKG_LONGDESC="Keyutils is a set of utilities for managing the key retention faci PKG_IS_ADDON="no" PKG_AUTORECONF="no" -PKG_MAKE_OPTS_TARGET="NO_ARLIB=0 NO_SOLIB=1 LIBDIR=/lib USRLIBDIR=/usr/lib" +PKG_MAKE_OPTS_TARGET="NO_ARLIB=0 NO_SOLIB=1 BINDIR=/usr/bin SBINDIR=/usr/sbin LIBDIR=/usr/lib USRLIBDIR=/usr/lib" PKG_MAKEINSTALL_OPTS_TARGET="$PKG_MAKE_OPTS_TARGET" post_makeinstall_target() { - rm -rf $INSTALL/usr + rm -rf $INSTALL/usr/share rmdir $INSTALL/etc/request-key.d ln -sf /storage/.config/request-key.d $INSTALL/etc/request-key.d } From d260d4f9059b63c053914d1b43b6d44d59fd3768 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:45 -0800 Subject: [PATCH 30/47] kmod: use unified /usr --- packages/sysutils/kmod/package.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/sysutils/kmod/package.mk b/packages/sysutils/kmod/package.mk index d653afd842..bd6797ead8 100644 --- a/packages/sysutils/kmod/package.mk +++ b/packages/sysutils/kmod/package.mk @@ -59,12 +59,12 @@ post_makeinstall_host() { post_makeinstall_target() { # make symlinks for compatibility - mkdir -p $INSTALL/sbin - ln -sf /usr/bin/kmod $INSTALL/sbin/lsmod - ln -sf /usr/bin/kmod $INSTALL/sbin/insmod - ln -sf /usr/bin/kmod $INSTALL/sbin/rmmod - ln -sf /usr/bin/kmod $INSTALL/sbin/modinfo - ln -sf /usr/bin/kmod $INSTALL/sbin/modprobe + mkdir -p $INSTALL/usr/sbin + ln -sf /usr/bin/kmod $INSTALL/usr/sbin/lsmod + ln -sf /usr/bin/kmod $INSTALL/usr/sbin/insmod + ln -sf /usr/bin/kmod $INSTALL/usr/sbin/rmmod + ln -sf /usr/bin/kmod $INSTALL/usr/sbin/modinfo + ln -sf /usr/bin/kmod $INSTALL/usr/sbin/modprobe mkdir -p $INSTALL/etc ln -sf /storage/.config/modprobe.d $INSTALL/etc/modprobe.d From 602106cfd84cd5da18ca40df4f7a16b8fb7ff660 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:46 -0800 Subject: [PATCH 31/47] ntfs-3g_ntfsprogs: use unified /usr --- .../sysutils/ntfs-3g_ntfsprogs/package.mk | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/packages/sysutils/ntfs-3g_ntfsprogs/package.mk b/packages/sysutils/ntfs-3g_ntfsprogs/package.mk index 492dea6c2d..bee0778159 100644 --- a/packages/sysutils/ntfs-3g_ntfsprogs/package.mk +++ b/packages/sysutils/ntfs-3g_ntfsprogs/package.mk @@ -31,7 +31,8 @@ PKG_LONGDESC="The NTFS-3G_ntfsprogs driver is an open source, freely available N PKG_IS_ADDON="no" PKG_AUTORECONF="yes" -PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \ +PKG_CONFIGURE_OPTS_TARGET="--exec-prefix=/usr/ \ + --disable-dependency-tracking \ --disable-library \ --enable-posix-acls \ --enable-mtab \ @@ -42,11 +43,18 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \ post_makeinstall_target() { # dont include ntfsprogs. - rm -rf $INSTALL/usr/sbin - rm -rf $INSTALL/usr/bin - rm -rf $INSTALL/bin/lowntfs-3g - rm -rf $INSTALL/sbin/mount.lowntfs-3g + for i in $INSTALL/usr/bin/*; do + if [ "$(basename $i)" != "ntfs-3g" ]; then + rm $i + fi + done - mkdir -p $INSTALL/sbin - ln -sf /bin/ntfs-3g $INSTALL/sbin/mount.ntfs + rm -rf $INSTALL/sbin + rm -rf $INSTALL/usr/sbin/ntfsclone + rm -rf $INSTALL/usr/sbin/ntfscp + rm -rf $INSTALL/usr/sbin/ntfsundelete + + mkdir -p $INSTALL/usr/sbin + ln -sf /usr/bin/ntfs-3g $INSTALL/usr/sbin/mount.ntfs + ln -sf /usr/sbin/mkntfs $INSTALL/usr/sbin/mkfs.ntfs } From d58c35574206efc82da71e200b3c76431d64b1cd Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:46 -0800 Subject: [PATCH 32/47] systemd: use unified /usr --- packages/sysutils/systemd/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk index d9b07fad1d..0643e898bc 100644 --- a/packages/sysutils/systemd/package.mk +++ b/packages/sysutils/systemd/package.mk @@ -34,8 +34,8 @@ PKG_AUTORECONF="yes" PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ ac_cv_have_decl_IFLA_BOND_AD_INFO=no \ ac_cv_have_decl_IFLA_BRPORT_UNICAST_FLOOD=no \ - ac_cv_path_MOUNT_PATH="/bin/mount" - ac_cv_path_UMOUNT_PATH="/bin/umount" + ac_cv_path_MOUNT_PATH="/usr/bin/mount" + ac_cv_path_UMOUNT_PATH="/usr/bin/umount" KMOD=/usr/bin/kmod \ --disable-nls \ --disable-dbus \ @@ -93,7 +93,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ --disable-manpages \ --disable-hibernate \ --disable-ldconfig \ - --enable-split-usr \ + --disable-split-usr \ --disable-tests \ --without-python \ --with-sysvinit-path= \ From 4ad4726911baf1b0852b2c26d8b5ba1604afcd94 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:46 -0800 Subject: [PATCH 33/47] util-linux: use unified /usr --- packages/sysutils/util-linux/package.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk index 66bae1e760..76bfa2623a 100644 --- a/packages/sysutils/util-linux/package.mk +++ b/packages/sysutils/util-linux/package.mk @@ -82,13 +82,7 @@ PKG_CONFIGURE_OPTS_HOST="--enable-static \ --enable-uuidgen \ --enable-libuuid" -PKG_CONFIGURE_OPTS_INIT="--prefix=/ \ - --bindir=/bin \ - --sbindir=/sbin \ - --sysconfdir=/etc \ - --libexecdir=/lib \ - --localstatedir=/var \ - $UTILLINUX_CONFIG_DEFAULT \ +PKG_CONFIGURE_OPTS_INIT="$UTILLINUX_CONFIG_DEFAULT \ --enable-libblkid \ --enable-libmount \ --enable-fsck" From 6e8c6bb4ac6a6bdf2cb647172f9810e864915a34 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:46 -0800 Subject: [PATCH 34/47] hdparm: use unified /usr --- packages/tools/hdparm/package.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/tools/hdparm/package.mk b/packages/tools/hdparm/package.mk index 147df637fe..7cdc8b8cb0 100644 --- a/packages/tools/hdparm/package.mk +++ b/packages/tools/hdparm/package.mk @@ -31,4 +31,7 @@ PKG_LONGDESC="Shell utility to access/tune ioctl features of the Linux IDE drive PKG_IS_ADDON="no" PKG_AUTORECONF="no" -PKG_MAKE_OPTS_TARGET="binprefix=/usr sbindir=/usr/bin" +makeinstall_target() { + mkdir -p $INSTALL/usr/sbin + cp -a $ROOT/$PKG_BUILD/hdparm $INSTALL/usr/sbin +} From db9f1c2441258b70df2ed5c03f58c9e8cb06d193 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:46 -0800 Subject: [PATCH 35/47] initramfs: use unified /usr --- packages/virtual/initramfs/package.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/virtual/initramfs/package.mk b/packages/virtual/initramfs/package.mk index 3ef9addd7e..d47a132106 100644 --- a/packages/virtual/initramfs/package.mk +++ b/packages/virtual/initramfs/package.mk @@ -44,8 +44,13 @@ fi post_install() { ( cd $ROOT/$BUILD/initramfs if [ "$TARGET_ARCH" = "x86_64" -o "$TARGET_ARCH" = "powerpc64" ]; then - ln -s /lib $ROOT/$BUILD/initramfs/lib64 + ln -sf /usr/lib $ROOT/$BUILD/initramfs/lib64 fi + + ln -sf /usr/lib $ROOT/$BUILD/initramfs/lib + ln -sf /usr/bin $ROOT/$BUILD/initramfs/bin + ln -sf /usr/sbin $ROOT/$BUILD/initramfs/sbin + mkdir -p $ROOT/$BUILD/image/ fakeroot -- sh -c \ "mkdir -p dev; mknod -m 600 dev/console c 5 1; find . | cpio -H newc -ov -R 0:0 > $ROOT/$BUILD/image/initramfs.cpio" From 0f9f1c8fd37812a0544890e4fa2022acfea16b00 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:46 -0800 Subject: [PATCH 36/47] xf86-video-nvidia-legacy: use unified /usr --- packages/x11/driver/xf86-video-nvidia-legacy/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/package.mk b/packages/x11/driver/xf86-video-nvidia-legacy/package.mk index 196f95293c..1bdd259566 100644 --- a/packages/x11/driver/xf86-video-nvidia-legacy/package.mk +++ b/packages/x11/driver/xf86-video-nvidia-legacy/package.mk @@ -67,8 +67,8 @@ makeinstall_target() { # rename to not conflicting with Mesa libGL.so cp -P libGL.so* $INSTALL/usr/lib/libGL_nvidia-legacy.so.1 - mkdir -p $INSTALL/lib/modules/$(get_module_dir)/nvidia - ln -sf /var/lib/nvidia.ko $INSTALL/lib/modules/$(get_module_dir)/nvidia/nvidia.ko + mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia + ln -sf /var/lib/nvidia.ko $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia/nvidia.ko mkdir -p $INSTALL/usr/lib/nvidia-legacy cp kernel/nvidia.ko $INSTALL/usr/lib/nvidia-legacy From 601c347a4c28e2cef4875b42679c578df2ce7fd4 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:46 -0800 Subject: [PATCH 37/47] xf86-video-nvidia: use unified /usr --- packages/x11/driver/xf86-video-nvidia/package.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk index a7af310f7b..b1a78e1118 100644 --- a/packages/x11/driver/xf86-video-nvidia/package.mk +++ b/packages/x11/driver/xf86-video-nvidia/package.mk @@ -70,10 +70,10 @@ makeinstall_target() { # rename to not conflicting with Mesa libGL.so cp -P libGL.so.$PKG_VERSION $INSTALL/usr/lib/libGL_nvidia.so.1 - mkdir -p $INSTALL/lib/modules/$(get_module_dir)/nvidia - ln -sf /var/lib/nvidia.ko $INSTALL/lib/modules/$(get_module_dir)/nvidia/nvidia.ko - cp -P kernel/nvidia-uvm.ko $INSTALL/lib/modules/$(get_module_dir)/nvidia - cp -P kernel/nvidia-modeset.ko $INSTALL/lib/modules/$(get_module_dir)/nvidia + mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia + ln -sf /var/lib/nvidia.ko $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia/nvidia.ko + cp -P kernel/nvidia-uvm.ko $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia + cp -P kernel/nvidia-modeset.ko $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia mkdir -p $INSTALL/usr/lib/nvidia cp -P kernel/nvidia.ko $INSTALL/usr/lib/nvidia From 26a14f1845a098e7d8da34c1f70dfba64dbaafce Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:46 -0800 Subject: [PATCH 38/47] gcc: use unified /usr --- packages/lang/gcc/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk index 55f4db2e75..59cac8bcf1 100644 --- a/packages/lang/gcc/package.mk +++ b/packages/lang/gcc/package.mk @@ -158,6 +158,6 @@ make_init() { } makeinstall_init() { - mkdir -p $INSTALL/lib - cp -P $ROOT/$PKG_BUILD/.$HOST_NAME/$TARGET_NAME/libgcc/libgcc_s.so* $INSTALL/lib + mkdir -p $INSTALL/usr/lib + cp -P $ROOT/$PKG_BUILD/.$HOST_NAME/$TARGET_NAME/libgcc/libgcc_s.so* $INSTALL/usr/lib } From 317f3a57d2bb6c5b838a68c1107bc0161d7a4e0f Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:47 -0800 Subject: [PATCH 39/47] open-iscsi: use unified /usr --- packages/sysutils/open-iscsi/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/open-iscsi/package.mk b/packages/sysutils/open-iscsi/package.mk index 32ffe6b0ed..57ff00be0e 100644 --- a/packages/sysutils/open-iscsi/package.mk +++ b/packages/sysutils/open-iscsi/package.mk @@ -47,6 +47,6 @@ configure_init() { } makeinstall_init() { - mkdir -p $INSTALL/sbin - cp -P $ROOT/$PKG_BUILD/usr/iscsistart $INSTALL/sbin + mkdir -p $INSTALL/usr/sbin + cp -P $ROOT/$PKG_BUILD/usr/iscsistart $INSTALL/usr/sbin } From 4000f42935c5753cdbf421bc572eee3d947879fe Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:47 -0800 Subject: [PATCH 40/47] v86d: use unified /usr --- packages/sysutils/v86d/package.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/sysutils/v86d/package.mk b/packages/sysutils/v86d/package.mk index b319f27398..24c6849b81 100644 --- a/packages/sysutils/v86d/package.mk +++ b/packages/sysutils/v86d/package.mk @@ -38,3 +38,7 @@ pre_configure_init() { cd $ROOT/$PKG_BUILD rm -rf .$TARGET_NAME-init } + +makeinstall_init() { + DESTDIR=$INSTALL/usr make install +} From cfd2fc0b3fa2f7c41836981ced134fa7189391a2 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:47 -0800 Subject: [PATCH 41/47] plymouth-lite: use unified /usr --- packages/tools/plymouth-lite/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/plymouth-lite/package.mk b/packages/tools/plymouth-lite/package.mk index 44756f879b..3dcedf6e25 100644 --- a/packages/tools/plymouth-lite/package.mk +++ b/packages/tools/plymouth-lite/package.mk @@ -42,8 +42,8 @@ pre_configure_init() { } makeinstall_init() { - mkdir -p $INSTALL/bin - cp ply-image $INSTALL/bin + mkdir -p $INSTALL/usr/bin + cp ply-image $INSTALL/usr/bin mkdir -p $INSTALL/splash if [ -f $PROJECT_DIR/$PROJECT/splash/splash.conf ]; then From 3a15ba32e643862dfffcb6327615aedee03259bc Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:47 -0800 Subject: [PATCH 42/47] udevil: use unified /usr --- packages/sysutils/udevil/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/sysutils/udevil/package.mk b/packages/sysutils/udevil/package.mk index e0c203f0b5..b44c7c5874 100644 --- a/packages/sysutils/udevil/package.mk +++ b/packages/sysutils/udevil/package.mk @@ -32,9 +32,9 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" PKG_CONFIGURE_OPTS_TARGET="--disable-systemd \ - --with-mount-prog=/bin/mount \ - --with-umount-prog=/bin/umount \ - --with-losetup-prog=/sbin/losetup \ + --with-mount-prog=/usr/bin/mount \ + --with-umount-prog=/usr/bin/umount \ + --with-losetup-prog=/usr/sbin/losetup \ --with-setfacl-prog=/usr/bin/setfacl" makeinstall_target() { From 011f81f2bf78280ab4fdf199b6bf98f2bbefd1fc Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:47 -0800 Subject: [PATCH 43/47] dosfstools: use unified /usr --- packages/sysutils/dosfstools/package.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/sysutils/dosfstools/package.mk b/packages/sysutils/dosfstools/package.mk index 82dd6e8f08..3907a14774 100644 --- a/packages/sysutils/dosfstools/package.mk +++ b/packages/sysutils/dosfstools/package.mk @@ -50,10 +50,10 @@ make_host() { } makeinstall_init() { - mkdir -p $INSTALL/sbin - cp fsck.fat $INSTALL/sbin - ln -sf fsck.fat $INSTALL/sbin/fsck.msdos - ln -sf fsck.fat $INSTALL/sbin/fsck.vfat + mkdir -p $INSTALL/usr/sbin + cp fsck.fat $INSTALL/usr/sbin + ln -sf fsck.fat $INSTALL/usr/sbin/fsck.msdos + ln -sf fsck.fat $INSTALL/usr/sbin/fsck.vfat } makeinstall_host() { From 72f680aa3fcefcec7c1d295579346d9029a3e5bd Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:47 -0800 Subject: [PATCH 44/47] arm-mem: use unified /usr --- packages/devel/arm-mem/package.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/devel/arm-mem/package.mk b/packages/devel/arm-mem/package.mk index da63f317d5..4994b3fdf4 100644 --- a/packages/devel/arm-mem/package.mk +++ b/packages/devel/arm-mem/package.mk @@ -44,18 +44,18 @@ make_init() { } makeinstall_target() { - mkdir -p $INSTALL/lib - cp -P libarmmem.so $INSTALL/lib + mkdir -p $INSTALL/usr/lib + cp -P libarmmem.so $INSTALL/usr/lib mkdir -p $INSTALL/etc - echo "/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload + echo "/usr/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload } makeinstall_init() { - mkdir -p $INSTALL/lib - cp -P libarmmem.so $INSTALL/lib + mkdir -p $INSTALL/usr/lib + cp -P libarmmem.so $INSTALL/usr/lib mkdir -p $INSTALL/etc - echo "/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload + echo "/usr/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload } From 579e8d86dc1275e984893d8e86509735465a2840 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:47 -0800 Subject: [PATCH 45/47] WeTek_Core: use unified /usr --- .../{ => usr}/lib/firmware/brcm/ap6330-nvram.txt | 0 .../{ => usr}/lib/firmware/brcm/bcm40183b2.hcd | Bin .../{ => usr}/lib/firmware/brcm/fw_bcm40183b2.bin | Bin .../lib/firmware/brcm/fw_bcm40183b2_apsta.bin | Bin .../lib/firmware/brcm/fw_bcm40183b2_p2p.bin | Bin 5 files changed, 0 insertions(+), 0 deletions(-) rename projects/WeTek_Core/filesystem/{ => usr}/lib/firmware/brcm/ap6330-nvram.txt (100%) rename projects/WeTek_Core/filesystem/{ => usr}/lib/firmware/brcm/bcm40183b2.hcd (100%) rename projects/WeTek_Core/filesystem/{ => usr}/lib/firmware/brcm/fw_bcm40183b2.bin (100%) rename projects/WeTek_Core/filesystem/{ => usr}/lib/firmware/brcm/fw_bcm40183b2_apsta.bin (100%) rename projects/WeTek_Core/filesystem/{ => usr}/lib/firmware/brcm/fw_bcm40183b2_p2p.bin (100%) diff --git a/projects/WeTek_Core/filesystem/lib/firmware/brcm/ap6330-nvram.txt b/projects/WeTek_Core/filesystem/usr/lib/firmware/brcm/ap6330-nvram.txt similarity index 100% rename from projects/WeTek_Core/filesystem/lib/firmware/brcm/ap6330-nvram.txt rename to projects/WeTek_Core/filesystem/usr/lib/firmware/brcm/ap6330-nvram.txt diff --git a/projects/WeTek_Core/filesystem/lib/firmware/brcm/bcm40183b2.hcd b/projects/WeTek_Core/filesystem/usr/lib/firmware/brcm/bcm40183b2.hcd similarity index 100% rename from projects/WeTek_Core/filesystem/lib/firmware/brcm/bcm40183b2.hcd rename to projects/WeTek_Core/filesystem/usr/lib/firmware/brcm/bcm40183b2.hcd diff --git a/projects/WeTek_Core/filesystem/lib/firmware/brcm/fw_bcm40183b2.bin b/projects/WeTek_Core/filesystem/usr/lib/firmware/brcm/fw_bcm40183b2.bin similarity index 100% rename from projects/WeTek_Core/filesystem/lib/firmware/brcm/fw_bcm40183b2.bin rename to projects/WeTek_Core/filesystem/usr/lib/firmware/brcm/fw_bcm40183b2.bin diff --git a/projects/WeTek_Core/filesystem/lib/firmware/brcm/fw_bcm40183b2_apsta.bin b/projects/WeTek_Core/filesystem/usr/lib/firmware/brcm/fw_bcm40183b2_apsta.bin similarity index 100% rename from projects/WeTek_Core/filesystem/lib/firmware/brcm/fw_bcm40183b2_apsta.bin rename to projects/WeTek_Core/filesystem/usr/lib/firmware/brcm/fw_bcm40183b2_apsta.bin diff --git a/projects/WeTek_Core/filesystem/lib/firmware/brcm/fw_bcm40183b2_p2p.bin b/projects/WeTek_Core/filesystem/usr/lib/firmware/brcm/fw_bcm40183b2_p2p.bin similarity index 100% rename from projects/WeTek_Core/filesystem/lib/firmware/brcm/fw_bcm40183b2_p2p.bin rename to projects/WeTek_Core/filesystem/usr/lib/firmware/brcm/fw_bcm40183b2_p2p.bin From 0d9b2be673831f9c5b5a898f007396f73ce5aea2 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:47 -0800 Subject: [PATCH 46/47] WeTek_Play: use unified /usr --- .../{ => usr}/lib/firmware/brcm/ap6210-nvram.txt | 0 .../{ => usr}/lib/firmware/brcm/bcm20710a1.hcd | Bin .../{ => usr}/lib/firmware/brcm/fw_bcm40181a2.bin | Bin 3 files changed, 0 insertions(+), 0 deletions(-) rename projects/WeTek_Play/filesystem/{ => usr}/lib/firmware/brcm/ap6210-nvram.txt (100%) rename projects/WeTek_Play/filesystem/{ => usr}/lib/firmware/brcm/bcm20710a1.hcd (100%) rename projects/WeTek_Play/filesystem/{ => usr}/lib/firmware/brcm/fw_bcm40181a2.bin (100%) diff --git a/projects/WeTek_Play/filesystem/lib/firmware/brcm/ap6210-nvram.txt b/projects/WeTek_Play/filesystem/usr/lib/firmware/brcm/ap6210-nvram.txt similarity index 100% rename from projects/WeTek_Play/filesystem/lib/firmware/brcm/ap6210-nvram.txt rename to projects/WeTek_Play/filesystem/usr/lib/firmware/brcm/ap6210-nvram.txt diff --git a/projects/WeTek_Play/filesystem/lib/firmware/brcm/bcm20710a1.hcd b/projects/WeTek_Play/filesystem/usr/lib/firmware/brcm/bcm20710a1.hcd similarity index 100% rename from projects/WeTek_Play/filesystem/lib/firmware/brcm/bcm20710a1.hcd rename to projects/WeTek_Play/filesystem/usr/lib/firmware/brcm/bcm20710a1.hcd diff --git a/projects/WeTek_Play/filesystem/lib/firmware/brcm/fw_bcm40181a2.bin b/projects/WeTek_Play/filesystem/usr/lib/firmware/brcm/fw_bcm40181a2.bin similarity index 100% rename from projects/WeTek_Play/filesystem/lib/firmware/brcm/fw_bcm40181a2.bin rename to projects/WeTek_Play/filesystem/usr/lib/firmware/brcm/fw_bcm40181a2.bin From 75cb527ec2bcc559796b6f86b14fa75ce7a8fad4 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 4 Dec 2016 13:23:48 -0800 Subject: [PATCH 47/47] gpu-aml: use unified /usr --- packages/linux-drivers/gpu-aml/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux-drivers/gpu-aml/package.mk b/packages/linux-drivers/gpu-aml/package.mk index 0fe753de99..60c613d530 100644 --- a/packages/linux-drivers/gpu-aml/package.mk +++ b/packages/linux-drivers/gpu-aml/package.mk @@ -39,6 +39,6 @@ make_target() { makeinstall_target() { LDFLAGS="" make -C $(kernel_path) M=$ROOT/$PKG_BUILD/mali \ - INSTALL_MOD_PATH=$INSTALL INSTALL_MOD_STRIP=1 DEPMOD=: \ + INSTALL_MOD_PATH=$INSTALL/usr INSTALL_MOD_STRIP=1 DEPMOD=: \ modules_install }