From 0a64f62ac2b4e613e96b4059011f29afb1821ff5 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 25 Apr 2018 16:08:31 +0200 Subject: [PATCH 1/7] bluez: always build btmon and testfiles Signed-off-by: Matthias Reichl --- packages/network/bluez/package.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk index c39efaaaa8..337bbd8e45 100644 --- a/packages/network/bluez/package.mk +++ b/packages/network/bluez/package.mk @@ -35,11 +35,7 @@ else BLUEZ_CONFIG="--disable-debug" fi -if [ "$DEVTOOLS" = "yes" ]; then - BLUEZ_CONFIG="$BLUEZ_CONFIG --enable-monitor --enable-test" -else - BLUEZ_CONFIG="$BLUEZ_CONFIG --disable-monitor --disable-test" -fi +BLUEZ_CONFIG="$BLUEZ_CONFIG --enable-monitor --enable-test" PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \ --disable-silent-rules \ From a5d4c9926a39ba065596e5a90d7dd5a28ffc4762 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 25 Apr 2018 16:09:55 +0200 Subject: [PATCH 2/7] samba: always build smbclient, smbtree and testparm Signed-off-by: Matthias Reichl --- packages/network/samba/package.mk | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk index 01fdea9e65..8cc59f127b 100644 --- a/packages/network/samba/package.mk +++ b/packages/network/samba/package.mk @@ -97,10 +97,9 @@ PKG_CONFIGURE_OPTS="--prefix=/usr \ --with-syslog \ --nopyc --nopyo" -PKG_SAMBA_TARGET="smbclient" +PKG_SAMBA_TARGET="smbclient,client/smbclient,smbtree,testparm" [ "$SAMBA_SERVER" = "yes" ] && PKG_SAMBA_TARGET+=",smbd/smbd,nmbd,smbpasswd" -[ "$DEVTOOLS" = "yes" ] && PKG_SAMBA_TARGET+=",client/smbclient,smbtree,testparm" pre_configure_target() { # samba uses its own build directory @@ -150,12 +149,10 @@ post_makeinstall_target() { cp $INSTALL/etc/samba/smb.conf $INSTALL/usr/config/samba.conf.sample fi - if [ "$DEVTOOLS" = "yes" ]; then - mkdir -p $INSTALL/usr/bin - cp -PR bin/default/source3/client/smbclient $INSTALL/usr/bin - cp -PR bin/default/source3/utils/smbtree $INSTALL/usr/bin - cp -PR bin/default/source3/utils/testparm $INSTALL/usr/bin - fi + mkdir -p $INSTALL/usr/bin + cp -PR bin/default/source3/client/smbclient $INSTALL/usr/bin + cp -PR bin/default/source3/utils/smbtree $INSTALL/usr/bin + cp -PR bin/default/source3/utils/testparm $INSTALL/usr/bin if [ "$SAMBA_SERVER" = "yes" ]; then mkdir -p $INSTALL/usr/bin From 71b060e76e5517a46463842eec1b23471638e7e1 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 25 Apr 2018 16:11:21 +0200 Subject: [PATCH 3/7] busybox: always build devmem Signed-off-by: Matthias Reichl --- packages/sysutils/busybox/package.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk index 98a44aba40..601074ca24 100644 --- a/packages/sysutils/busybox/package.mk +++ b/packages/sysutils/busybox/package.mk @@ -87,10 +87,6 @@ configure_target() { # set install dir 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 - fi - if [ ! "$CRON_SUPPORT" = "yes" ] ; then sed -i -e "s|^CONFIG_CROND=.*$|# CONFIG_CROND is not set|" .config sed -i -e "s|^CONFIG_FEATURE_CROND_D=.*$|# CONFIG_FEATURE_CROND_D is not set|" .config From 2e2e683a62e623ba073e7ab77d32584093eda6c6 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 25 Apr 2018 16:12:32 +0200 Subject: [PATCH 4/7] linux: always build perf, unless explicitly disabled Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 2d253d569d..38d1dbc1d0 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -75,7 +75,7 @@ if [ "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then HEADERS_ARCH=$TARGET_ARCH fi -if [ "$DEVTOOLS" = "yes" -a "$PKG_BUILD_PERF" != "no" ] && grep -q ^CONFIG_PERF_EVENTS= $PKG_KERNEL_CFG_FILE ; then +if [ "$PKG_BUILD_PERF" != "no" ] && grep -q ^CONFIG_PERF_EVENTS= $PKG_KERNEL_CFG_FILE ; then PKG_BUILD_PERF="yes" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET binutils elfutils libunwind zlib openssl" fi From a24ce9c9fdbcbfd798913e2804965bfb81f59a2e Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 27 Apr 2018 08:53:40 +0200 Subject: [PATCH 5/7] xorg-server: fix xorg.conf installation from project/device dir find_file_path has to be put into an if, otherwise its return code (which is usually 1) will leak into post_makeinstall_target Signed-off-by: Matthias Reichl --- packages/x11/xserver/xorg-server/package.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/x11/xserver/xorg-server/package.mk b/packages/x11/xserver/xorg-server/package.mk index 55d60e6a1f..aa4060beac 100644 --- a/packages/x11/xserver/xorg-server/package.mk +++ b/packages/x11/xserver/xorg-server/package.mk @@ -156,8 +156,9 @@ post_makeinstall_target() { fi mkdir -p $INSTALL/etc/X11 - find_file_path config/xorg.conf && + if find_file_path config/xorg.conf ; then cp $FOUND_PATH $INSTALL/etc/X11 + fi if [ ! "$DEVTOOLS" = yes ]; then rm -rf $INSTALL/usr/bin/cvt From 687982775fc1832ab438e6e1b04e58ef6569afca Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 27 Apr 2018 08:57:31 +0200 Subject: [PATCH 6/7] xorg-server: always install cvt and gtf Signed-off-by: Matthias Reichl --- packages/x11/xserver/xorg-server/package.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/x11/xserver/xorg-server/package.mk b/packages/x11/xserver/xorg-server/package.mk index aa4060beac..17f528001f 100644 --- a/packages/x11/xserver/xorg-server/package.mk +++ b/packages/x11/xserver/xorg-server/package.mk @@ -159,11 +159,6 @@ post_makeinstall_target() { if find_file_path config/xorg.conf ; then cp $FOUND_PATH $INSTALL/etc/X11 fi - - if [ ! "$DEVTOOLS" = yes ]; then - rm -rf $INSTALL/usr/bin/cvt - rm -rf $INSTALL/usr/bin/gtf - fi } post_install() { From fcf1ea5d7888bd69782d6f7661583d7bd2b4bf36 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 27 Apr 2018 09:57:32 +0200 Subject: [PATCH 7/7] config/options: remove unused variable DEVTOOLS Signed-off-by: Matthias Reichl --- config/options | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config/options b/config/options index e432f1e560..9d66bb0d68 100644 --- a/config/options +++ b/config/options @@ -99,11 +99,6 @@ fi . $HOME/.libreelec/options fi -# install devtools on development builds - if [ -z "$DEVTOOLS" -a "$LIBREELEC_VERSION" = "devel" ]; then - DEVTOOLS=yes - fi - # overwrite OEM_SUPPORT via commandline if [ "$OEM" = yes -o "$OEM" = no ]; then OEM_SUPPORT=$OEM