cleanup scripts: scripts/

This commit is contained in:
CvH 2024-07-06 11:17:12 +02:00
parent 7f543e3c98
commit 58ebc091cf
15 changed files with 231 additions and 184 deletions

View File

@ -60,10 +60,18 @@ ${SCRIPTS}/unpack "${PKG_NAME}" "${PARENT_PKG}"
# build dependencies, only when PKG_DEPENDS_? is filled
unset _pkg_depends
case "${TARGET}" in
"target") _pkg_depends="${PKG_DEPENDS_TARGET}";;
"host") _pkg_depends="${PKG_DEPENDS_HOST}";;
"init") _pkg_depends="${PKG_DEPENDS_INIT}";;
"bootstrap") _pkg_depends="${PKG_DEPENDS_BOOTSTRAP}";;
"target")
_pkg_depends="${PKG_DEPENDS_TARGET}"
;;
"host")
_pkg_depends="${PKG_DEPENDS_HOST}"
;;
"init")
_pkg_depends="${PKG_DEPENDS_INIT}"
;;
"bootstrap")
_pkg_depends="${PKG_DEPENDS_BOOTSTRAP}"
;;
esac
if is_sequential_build; then
@ -171,7 +179,6 @@ if [ "${BUILD_WITH_DEBUG}" != "yes" ] && flag_enabled "strip" "yes"; then
TARGET_MESON_OPTS+=" -Dstrip=true"
fi
# configure HOST build defaults
HOST_CONFIGURE_OPTS="--host=${HOST_NAME} \
--build=${HOST_NAME} \
@ -227,9 +234,15 @@ cd "${PKG_BUILD}"
if [ -f "${PKG_CONFIGURE_SCRIPT}" -o -f "${PKG_CMAKE_SCRIPT}" -o -f "${PKG_MESON_SCRIPT}" ]; then
case "${TARGET}" in
"target") PKG_REAL_BUILD="${PKG_BUILD}/.${TARGET_NAME}" ;;
"host") PKG_REAL_BUILD="${PKG_BUILD}/.${HOST_NAME}" ;;
"init") PKG_REAL_BUILD="${PKG_BUILD}/.${TARGET_NAME}-${TARGET}" ;;
"target")
PKG_REAL_BUILD="${PKG_BUILD}/.${TARGET_NAME}"
;;
"host")
PKG_REAL_BUILD="${PKG_BUILD}/.${HOST_NAME}"
;;
"init")
PKG_REAL_BUILD="${PKG_BUILD}/.${TARGET_NAME}-${TARGET}"
;;
"bootstrap") PKG_REAL_BUILD="${PKG_BUILD}/.${HOST_NAME}-${TARGET}" ;;
esac
mkdir -p "${PKG_REAL_BUILD}"
@ -433,7 +446,7 @@ else
case "${PKG_TOOLCHAIN}:${TARGET}" in
# ninja based builds
"meson:target" | "cmake:target")
[ "${INSTALL_TO_SYSROOT}" = "yes" ] && \
[ "${INSTALL_TO_SYSROOT}" = "yes" ] &&
DESTDIR=${SYSROOT_PREFIX} ninja install ${PKG_MAKEINSTALL_OPTS_TARGET}
DESTDIR=${INSTALL} ninja install ${PKG_MAKEINSTALL_OPTS_TARGET}
;;
@ -449,7 +462,7 @@ else
# make based builds
"configure:target" | "cmake-make:target" | "autotools:target" | "make:target")
[ "${INSTALL_TO_SYSROOT}" = "yes" ] && \
[ "${INSTALL_TO_SYSROOT}" = "yes" ] &&
make install DESTDIR=${SYSROOT_PREFIX} -j1 ${PKG_MAKEINSTALL_OPTS_TARGET}
make install DESTDIR=${INSTALL} ${PKG_MAKEINSTALL_OPTS_TARGET}
;;

View File

@ -49,4 +49,3 @@ if [ "${1}" = "--all" -a -n "${2}" ]; then
elif [ -n "${1}" ]; then
clean_package "${1}"
fi

View File

@ -51,10 +51,19 @@ get_addons() {
local count=0 validpkg
case ${1} in
binary) paths="^${ROOT}/packages/mediacenter/kodi-binary-addons/";;
official) paths="^${ROOT}/packages/addons/";;
all) paths="^${ROOT}/packages/|^${ROOT}/projects/.*/packages/";;
*) paths="^${ROOT}/packages/|^${ROOT}/projects/.*/packages/"; filter="${1}";;
binary)
paths="^${ROOT}/packages/mediacenter/kodi-binary-addons/"
;;
official)
paths="^${ROOT}/packages/addons/"
;;
all)
paths="^${ROOT}/packages/|^${ROOT}/projects/.*/packages/"
;;
*)
paths="^${ROOT}/packages/|^${ROOT}/projects/.*/packages/"
filter="${1}"
;;
esac
exit() { exited=1; }
@ -143,11 +152,21 @@ show_only="no"
# read addons from parameter list
while [ $# -gt 0 ]; do
case ${1} in
--help) usage 0;;
--show-only) show_only="yes";;
--*) usage 1;;
-*) addons_drop+=" $(get_addons ${1:1})";;
*) addons+=" $(get_addons ${1})";;
--help)
usage 0
;;
--show-only)
show_only="yes"
;;
--*)
usage 1
;;
-*)
addons_drop+=" $(get_addons ${1:1})"
;;
*)
addons+=" $(get_addons ${1})"
;;
esac
shift
done

View File

@ -32,11 +32,14 @@ if [ -n "${PKG_URL}" -a -n "${PKG_SOURCE_NAME}" ]; then
# determine get handler based on protocol and/or filename
case "${PKG_URL}" in
git://* | *.git)
get_handler="git";;
get_handler="git"
;;
file://*)
get_handler="file";;
get_handler="file"
;;
*)
get_handler="archive";;
get_handler="archive"
;;
esac
if ! listcontains "${GET_HANDLER_SUPPORT}" "${get_handler}"; then

View File

@ -68,11 +68,21 @@ if [ "${LIBREELEC_VERSION}" = "devel" ]; then
GIT_ABBREV=${GIT_HASH:0:7}
DEVEL_VERSION=${LIBREELEC_VERSION}
case "${BUILD_PERIODIC}" in
nightly) LIBREELEC_VERSION=nightly-$(date +%Y%m%d)-${GIT_ABBREV};;
daily) LIBREELEC_VERSION=daily-$(date +%Y%j)-${GIT_ABBREV};;
weekly) LIBREELEC_VERSION=weekly-$(date +%G%V)-${GIT_ABBREV};;
monthly) LIBREELEC_VERSION=monthly-$(date +%Y%m)-${GIT_ABBREV};;
*) LIBREELEC_VERSION=devel-$(date +%Y%m%d%H%M%S)-${GIT_ABBREV};;
nightly)
LIBREELEC_VERSION=nightly-$(date +%Y%m%d)-${GIT_ABBREV}
;;
daily)
LIBREELEC_VERSION=daily-$(date +%Y%j)-${GIT_ABBREV}
;;
weekly)
LIBREELEC_VERSION=weekly-$(date +%G%V)-${GIT_ABBREV}
;;
monthly)
LIBREELEC_VERSION=monthly-$(date +%Y%m)-${GIT_ABBREV}
;;
*)
LIBREELEC_VERSION=devel-$(date +%Y%m%d%H%M%S)-${GIT_ABBREV}
;;
esac
fi
@ -215,7 +225,7 @@ fi
# Run depmod for base overlay modules
MODVER=$(basename $(ls -d ${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/*))
find ${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/${MODVER}/ -name *.ko | \
find ${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/${MODVER}/ -name *.ko |
sed -e "s,${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/${MODVER}/,," \
>${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/${MODVER}/modules.order
${TOOLCHAIN}/bin/depmod -b ${INSTALL}/usr/lib/kernel-overlays/base -a -e -F "$(get_install_dir linux)/.image/System.map" ${MODVER} 2>&1
@ -304,9 +314,10 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
cp ${TARGET_IMG}/${IMAGE_NAME}.kernel ${RELEASE_DIR}/target/KERNEL
# Create md5sum's
( cd ${RELEASE_DIR};
md5sum -t target/SYSTEM > target/SYSTEM.md5;
md5sum -t target/KERNEL > target/KERNEL.md5;
(
cd ${RELEASE_DIR}
md5sum -t target/SYSTEM >target/SYSTEM.md5
md5sum -t target/KERNEL >target/KERNEL.md5
)
# Create target directory
@ -319,7 +330,8 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
tar cf ${TARGET_IMG}/${IMAGE_NAME}.tar -C target ${IMAGE_NAME}
# Create sha256 checksum of tarball
( cd ${TARGET_IMG}
(
cd ${TARGET_IMG}
sha256sum ${IMAGE_NAME}.tar >${IMAGE_NAME}.tar.sha256
)
@ -445,9 +457,10 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
done
# Create md5sum's
( cd ${RELEASE_DIR}/${NOOBS_DISTRO}/System;
md5sum -t SYSTEM > SYSTEM.md5;
md5sum -t kernel.img > kernel.img.md5;
(
cd ${RELEASE_DIR}/${NOOBS_DISTRO}/System
md5sum -t SYSTEM >SYSTEM.md5
md5sum -t kernel.img >kernel.img.md5
)
# Copy additional files
@ -476,7 +489,8 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
tar cf ${TARGET_IMG}/${IMAGE_NAME}-${1}.tar -C ${TARGET_IMG} ${IMAGE_NAME}-${1}
# Create sha256 checksum of tarball
( cd ${TARGET_IMG}
(
cd ${TARGET_IMG}
sha256sum ${IMAGE_NAME}-${1}.tar >${IMAGE_NAME}-${1}.tar.sha256
)
fi
@ -490,4 +504,3 @@ fi
if [ -n "$(ls -1 ${BUILD}/qa_checks/ 2>/dev/null)" ]; then
log_qa_check "qa_issues" "QA issues present, please fix!\n$(find ${BUILD}/qa_checks/* -type f ! -name qa_issues)\n"
fi

View File

@ -73,8 +73,7 @@ mkdir -p ${INSTALL}
if [ "${TARGET}" = "target" ]; then
for PKG_TMP_DIR in ${PKG_DIR} \
${PROJECT_DIR}/${PROJECT}/packages/${PKG_NAME} \
${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/packages/${PKG_NAME} \
; do
${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/packages/${PKG_NAME}; do
[ -d ${PKG_TMP_DIR} ] || continue

View File

@ -80,7 +80,8 @@ if [ "${ADDON_JENKINS}" = "yes" ]; then
mkdir -p "${ADDON_JENKINS_DIR}"
cd ${ADDON_INSTALL_DIR}
${TOOLCHAIN}/bin/7za a -mx0 -bsp0 -bso0 -tzip ${ADDON_JENKINS_DIR}/${ADDON_JENKINS_ADDON_NAME}.zip ${PKG_ADDON_ID}-${ADDONVER}.zip resources/
( cd ${ADDON_JENKINS_DIR}
(
cd ${ADDON_JENKINS_DIR}
sha256sum ${ADDON_JENKINS_ADDON_NAME}.zip >${ADDON_JENKINS_ADDON_NAME}.zip.sha256
)
build_msg "CLR_INFO" "*** creating ${ADDON_JENKINS_ADDON_NAME}.zip for Jenkins complete ***"

View File

@ -51,6 +51,6 @@ fi
# pipefail: return value of a pipeline is the value of the last (rightmost) command to exit with a non-zero status
set -o pipefail
cat ${_CACHE_PACKAGE_GLOBAL} ${_CACHE_PACKAGE_LOCAL} | \
cat ${_CACHE_PACKAGE_GLOBAL} ${_CACHE_PACKAGE_LOCAL} |
xargs --max-args=64 --max-procs="$(nproc)" "$0" --worker
exit $?

View File

@ -205,9 +205,9 @@ if [ -d "${SOURCES}/${PKG_NAME}" -o -d "${PKG_DIR}/sources" ] || pkg_call_exists
for config in $(find "${PKG_BUILD}" -name config.guess | sed 's/config.guess//'); do
build_msg "CLR_FIXCONFIG" "FIXCONFIG" "${config}"
[ -f "${config}/config.guess" -a -f ${TOOLCHAIN}/configtools/config.guess ] && \
[ -f "${config}/config.guess" -a -f ${TOOLCHAIN}/configtools/config.guess ] &&
cp -f ${TOOLCHAIN}/configtools/config.guess ${config}
[ -f "${config}/config.sub" -a -f ${TOOLCHAIN}/configtools/config.sub ] && \
[ -f "${config}/config.sub" -a -f ${TOOLCHAIN}/configtools/config.sub ] &&
cp -f ${TOOLCHAIN}/configtools/config.sub ${config}
done
fi