Merge pull request #2666 from HiassofT/le9-retire-devtools

retire DEVTOOLS
This commit is contained in:
MilhouseVH 2018-04-29 12:55:04 +01:00 committed by GitHub
commit c84b1771e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 29 deletions

View File

@ -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

View File

@ -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

View File

@ -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 \

View File

@ -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
@ -152,12 +151,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

View File

@ -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

View File

@ -156,13 +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
if [ ! "$DEVTOOLS" = yes ]; then
rm -rf $INSTALL/usr/bin/cvt
rm -rf $INSTALL/usr/bin/gtf
fi
fi
}
post_install() {