jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

buildsystem: cleanup - PACKAGE_NAME is redundant

Browse Source
This commit is contained in:
MilhouseVH 2019-06-16 01:13:39 +01:00
parent b4a9b00c60
commit b63c7cfe41
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/build
View File

@ -29,19 +29,17 @@ if [ -n "$PKG_ARCH" ]; then
fi fi
if [ "${1//:/}" != "${1}" ]; then if [ "${1//:/}" != "${1}" ]; then
PACKAGE_NAME="${1%:*}"
TARGET="${1#*:}" TARGET="${1#*:}"
else else
PACKAGE_NAME="${1}"
TARGET= TARGET=
fi fi
TARGET="${TARGET:-target}" TARGET="${TARGET:-target}"
PARENT_PKG="${2:-${PKG_NAME}:${TARGET}}" PARENT_PKG="${2:-${PKG_NAME}:${TARGET}}"
pkg_lock "${PACKAGE_NAME}:${TARGET}" "build" "${PARENT_PKG}" pkg_lock "${PKG_NAME}:${TARGET}" "build" "${PARENT_PKG}"
mkdir -p $STAMPS/$PACKAGE_NAME mkdir -p $STAMPS/$PKG_NAME
STAMP=$STAMPS/$PACKAGE_NAME/build_$TARGET STAMP=$STAMPS/$PKG_NAME/build_$TARGET
if [ -f $STAMP ]; then if [ -f $STAMP ]; then
. $STAMP . $STAMP
PKG_DEEPHASH=$(calculate_stamp) PKG_DEEPHASH=$(calculate_stamp)
@ -61,7 +59,7 @@ if [ -n "${PKG_DEPENDS_UNPACK}" ]; then
$SCRIPTS/unpack "${p}" "${PARENT_PKG}" $SCRIPTS/unpack "${p}" "${PARENT_PKG}"
done done
fi fi
$SCRIPTS/unpack "${PACKAGE_NAME}" "${PARENT_PKG}" $SCRIPTS/unpack "${PKG_NAME}" "${PARENT_PKG}"
# build dependencies, only when PKG_DEPENDS_? is filled # build dependencies, only when PKG_DEPENDS_? is filled
unset _pkg_depends unset _pkg_depends
@ -88,9 +86,9 @@ fi
# build this package # build this package
if [ "${BUILD_WITH_DEBUG}" = "yes" ]; then if [ "${BUILD_WITH_DEBUG}" = "yes" ]; then
build_msg "CLR_BUILD" "BUILD" "${PACKAGE_NAME} $(print_color "CLR_TARGET" "(${TARGET})") [DEBUG]" "indent" build_msg "CLR_BUILD" "BUILD" "${PKG_NAME} $(print_color "CLR_TARGET" "(${TARGET})") [DEBUG]" "indent"
else else
build_msg "CLR_BUILD" "BUILD" "${PACKAGE_NAME} $(print_color "CLR_TARGET" "(${TARGET})")" "indent" build_msg "CLR_BUILD" "BUILD" "${PKG_NAME} $(print_color "CLR_TARGET" "(${TARGET})")" "indent"
fi fi
setup_toolchain $TARGET setup_toolchain $TARGET
@ -209,7 +207,7 @@ build_msg "CLR_TOOLCHAIN" "TOOLCHAIN" "${PKG_TOOLCHAIN}${_auto_toolchain}"
# make autoreconf # make autoreconf
if [ "$PKG_TOOLCHAIN" = "autotools" ]; then if [ "$PKG_TOOLCHAIN" = "autotools" ]; then
$SCRIPTS/autoreconf "${PACKAGE_NAME}" "${PARENT_PKG}" $SCRIPTS/autoreconf "${PKG_NAME}" "${PARENT_PKG}"
fi fi
pkg_lock_status "ACTIVE" "${PKG_NAME}:${TARGET}" "build" pkg_lock_status "ACTIVE" "${PKG_NAME}:${TARGET}" "build"

16
scripts/install
View File

@ -26,22 +26,20 @@ fi
# set defaults # set defaults
if [ "${1//:/}" != "${1}" ]; then if [ "${1//:/}" != "${1}" ]; then
PACKAGE_NAME="${1%:*}"
TARGET="${1#*:}" TARGET="${1#*:}"
else else
PACKAGE_NAME="${1}"
TARGET= TARGET=
fi fi
[ -z "$TARGET" ] && TARGET="target" [ -z "$TARGET" ] && TARGET="target"
PARENT_PKG="${2:-${PKG_NAME}:${TARGET}}" PARENT_PKG="${2:-${PKG_NAME}:${TARGET}}"
pkg_lock "${PACKAGE_NAME}:${TARGET}" "install" "${PARENT_PKG}" pkg_lock "${PKG_NAME}:${TARGET}" "install" "${PARENT_PKG}"
STAMP=$STAMPS_INSTALL/$PACKAGE_NAME/install_$TARGET STAMP=$STAMPS_INSTALL/$PKG_NAME/install_$TARGET
[ -f $STAMP ] && pkg_lock_status "UNLOCK" "${PACKAGE_NAME}:${TARGET}" "install" "already installed" [ -f $STAMP ] && pkg_lock_status "UNLOCK" "${PKG_NAME}:${TARGET}" "install" "already installed"
[ -f $STAMP ] && exit 0 [ -f $STAMP ] && exit 0
mkdir -p $STAMPS_INSTALL/$PACKAGE_NAME mkdir -p $STAMPS_INSTALL/$PKG_NAME
$SCRIPTS/build "${1}" "${PARENT_PKG}" $SCRIPTS/build "${1}" "${PARENT_PKG}"
@ -56,9 +54,9 @@ elif [ "$TARGET" = init ] ; then
INSTALL=$BUILD/initramfs INSTALL=$BUILD/initramfs
fi fi
pkg_lock_status "ACTIVE" "${PACKAGE_NAME}:${TARGET}" "install" pkg_lock_status "ACTIVE" "${PKG_NAME}:${TARGET}" "install"
build_msg "CLR_INSTALL" "INSTALL" "${PACKAGE_NAME} $(print_color CLR_TARGET "(${TARGET})")" "indent" build_msg "CLR_INSTALL" "INSTALL" "${PKG_NAME} $(print_color CLR_TARGET "(${TARGET})")" "indent"
mkdir -p $INSTALL mkdir -p $INSTALL
@ -144,4 +142,4 @@ fi
touch $STAMP touch $STAMP
pkg_lock_status "UNLOCK" "${PACKAGE_NAME}:${TARGET}" "install" "installed" pkg_lock_status "UNLOCK" "${PKG_NAME}:${TARGET}" "install" "installed"