mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-27 20:56:55 +00:00
buildsystem: clean up and cosmetics
This commit is contained in:
parent
315bfbe49b
commit
debacf21ae
12
config/path
12
config/path
@ -91,17 +91,7 @@ SED="sed -i"
|
|||||||
[ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
|
[ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
|
PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
XORG_PATH_DRI=/usr/lib/dri
|
XORG_PATH_DRI=/usr/lib/dri
|
||||||
XORG_PATH_XKB=/usr/share/X11/xkb
|
XORG_PATH_XKB=/usr/share/X11/xkb
|
||||||
|
@ -50,10 +50,6 @@ STAMP=$STAMPS/$PACKAGE_NAME/build_$TARGET
|
|||||||
|
|
||||||
$SCRIPTS/unpack $PACKAGE_NAME
|
$SCRIPTS/unpack $PACKAGE_NAME
|
||||||
|
|
||||||
if [ -f $STAMP -a -f $PKG_DIR/need_build ]; then
|
|
||||||
$PKG_DIR/need_build $PACKAGE_NAME
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f $PKG_DIR/package.mk ]; then
|
if [ -f $PKG_DIR/package.mk ]; then
|
||||||
if [ -f $STAMP -a $PKG_DIR/package.mk -nt $STAMP ]; then
|
if [ -f $STAMP -a $PKG_DIR/package.mk -nt $STAMP ]; then
|
||||||
rm -f $STAMP
|
rm -f $STAMP
|
||||||
@ -236,20 +232,6 @@ if [ ! -f $STAMP ]; then
|
|||||||
# virtual packages dont must be build, they only contains dependencies, so dont go further here
|
# virtual packages dont must be build, they only contains dependencies, so dont go further here
|
||||||
if [ ! "$PKG_SECTION" = "virtual" ]; then
|
if [ ! "$PKG_SECTION" = "virtual" ]; then
|
||||||
|
|
||||||
if [ -z "$PKG_BUILD" ]; then
|
|
||||||
if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# configure other variables
|
# configure other variables
|
||||||
if [ "$TARGET" = "target" ]; then
|
if [ "$TARGET" = "target" ]; then
|
||||||
INSTALL=$ROOT/$PKG_BUILD/.install_pkg
|
INSTALL=$ROOT/$PKG_BUILD/.install_pkg
|
||||||
@ -382,27 +364,29 @@ if [ ! -f $STAMP ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$TARGET" = "target" -o "$TARGET" = "init" ]; then
|
if [ "$TARGET" = "target" -o "$TARGET" = "init" ]; then
|
||||||
rm -rf $INSTALL/usr/include
|
if [ -d $INSTALL ] ; then
|
||||||
rm -rf $INSTALL/usr/lib/pkgconfig
|
rm -rf $INSTALL/usr/include
|
||||||
rm -rf $INSTALL/usr/share/aclocal
|
rm -rf $INSTALL/usr/lib/pkgconfig
|
||||||
rm -rf $INSTALL/usr/share/bash-completion
|
rm -rf $INSTALL/usr/share/aclocal
|
||||||
rm -rf $INSTALL/usr/share/doc
|
rm -rf $INSTALL/usr/share/bash-completion
|
||||||
rm -rf $INSTALL/usr/share/gtk-doc
|
rm -rf $INSTALL/usr/share/doc
|
||||||
rm -rf $INSTALL/usr/share/info
|
rm -rf $INSTALL/usr/share/gtk-doc
|
||||||
rm -rf $INSTALL/usr/share/locale
|
rm -rf $INSTALL/usr/share/info
|
||||||
rm -rf $INSTALL/usr/share/man
|
rm -rf $INSTALL/usr/share/locale
|
||||||
rm -rf $INSTALL/usr/share/pkgconfig
|
rm -rf $INSTALL/usr/share/man
|
||||||
find $INSTALL/lib -name "*.la" -exec rm -rf "{}" ";" 2>/dev/null || true
|
rm -rf $INSTALL/usr/share/pkgconfig
|
||||||
find $INSTALL/usr/lib -name "*.la" -exec rm -rf "{}" ";" 2>/dev/null || true
|
find $INSTALL/lib -name "*.la" -exec rm -rf "{}" ";" 2>/dev/null || true
|
||||||
find $INSTALL/lib -name "*.a" -exec rm -rf "{}" ";" 2>/dev/null || true
|
find $INSTALL/usr/lib -name "*.la" -exec rm -rf "{}" ";" 2>/dev/null || true
|
||||||
find $INSTALL/usr/lib -name "*.a" -exec rm -rf "{}" ";" 2>/dev/null || true
|
find $INSTALL/lib -name "*.a" -exec rm -rf "{}" ";" 2>/dev/null || true
|
||||||
find $INSTALL/lib -name "*.so*T" -exec rm -rf "{}" ";" 2>/dev/null || true
|
find $INSTALL/usr/lib -name "*.a" -exec rm -rf "{}" ";" 2>/dev/null || true
|
||||||
find $INSTALL/usr/lib -name "*.so*T" -exec rm -rf "{}" ";" 2>/dev/null || true
|
find $INSTALL/lib -name "*.so*T" -exec rm -rf "{}" ";" 2>/dev/null || true
|
||||||
find $INSTALL -type d -exec rmdir -p "{}" ";" 2>/dev/null || true
|
find $INSTALL/usr/lib -name "*.so*T" -exec rm -rf "{}" ";" 2>/dev/null || true
|
||||||
|
find $INSTALL -type d -exec rmdir -p "{}" ";" 2>/dev/null || true
|
||||||
|
|
||||||
if [ ! "$DEBUG" = yes ]; then
|
if [ ! "$DEBUG" = yes ]; then
|
||||||
$STRIP `find $INSTALL -name "*.so"` 2>/dev/null || echo "Information: no *.so libs found"
|
$STRIP `find $INSTALL -name "*.so"` 2>/dev/null || echo "Information: no *.so libs found"
|
||||||
$STRIP `find $INSTALL -name "*.so.[0-9]*"` 2>/dev/null || echo "Information: no *.so.[0-9]* libs found"
|
$STRIP `find $INSTALL -name "*.so.[0-9]*"` 2>/dev/null || echo "Information: no *.so.[0-9]* libs found"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -420,18 +404,6 @@ if [ ! -f $STAMP ]; then
|
|||||||
$SCRIPTS/autoreconf $PACKAGE_NAME
|
$SCRIPTS/autoreconf $PACKAGE_NAME
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f $PKG_DIR/build ]; then
|
if [ -f $PKG_DIR/build ]; then
|
||||||
$PKG_DIR/build $@ >&$VERBOSE_OUT
|
$PKG_DIR/build $@ >&$VERBOSE_OUT
|
||||||
|
|
||||||
|
@ -114,21 +114,6 @@ if [ -f $PKG_DIR/package.mk ]; then
|
|||||||
# include buildfile
|
# include buildfile
|
||||||
. $PKG_DIR/package.mk
|
. $PKG_DIR/package.mk
|
||||||
|
|
||||||
# set PKG_BUILD variable
|
|
||||||
if [ -z "$PKG_BUILD" ]; then
|
|
||||||
if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# install
|
# install
|
||||||
if [ "$(type -t pre_install)" = "function" ]; then
|
if [ "$(type -t pre_install)" = "function" ]; then
|
||||||
pre_install
|
pre_install
|
||||||
@ -141,17 +126,6 @@ if [ -f $PKG_DIR/package.mk ]; then
|
|||||||
post_install
|
post_install
|
||||||
fi
|
fi
|
||||||
elif [ -f $PKG_DIR/install ]; then
|
elif [ -f $PKG_DIR/install ]; then
|
||||||
if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
|
|
||||||
elif [ -d "$BUILD/${PKG_NAME}" ]; then
|
|
||||||
PKG_BUILD="$BUILD/${PKG_NAME}"
|
|
||||||
fi
|
|
||||||
$PKG_DIR/install $@ >&$VERBOSE_OUT
|
$PKG_DIR/install $@ >&$VERBOSE_OUT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -29,7 +29,6 @@ fi
|
|||||||
|
|
||||||
$SCRIPTS/get $1
|
$SCRIPTS/get $1
|
||||||
|
|
||||||
PKG_BUILD="$BUILD/$PKG_NAME-$PKG_VERSION"
|
|
||||||
STAMP=$PKG_BUILD/.openelec-unpack
|
STAMP=$PKG_BUILD/.openelec-unpack
|
||||||
|
|
||||||
mkdir -p $BUILD
|
mkdir -p $BUILD
|
||||||
|
Loading…
x
Reference in New Issue
Block a user