jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 05:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5779 from antonlacon/assorted-minors

Browse Source 
Assorted minors
This commit is contained in:
CvH 2021-10-26 11:43:35 +02:00 committed by GitHub
commit 36dcdfdc8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/show_config
View File

@ -6,7 +6,12 @@ show_config() {
dashes="===========================" dashes="==========================="
config_message="\n $dashes$dashes$dashes" config_message="\n $dashes$dashes$dashes"
config_message+="\n Configuration for $DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "community"))" config_message+="\n Configuration for $DISTRONAME "
if [ "$OFFICIAL" = "yes" ]; then
config_message+="(official)"
else
config_message+="(community)"
fi
config_message+="\n $dashes$dashes$dashes" config_message+="\n $dashes$dashes$dashes"
# Build options # Build options

2
packages/devel/glibc/package.mk
View File

@ -27,7 +27,7 @@ PKG_CONFIGURE_OPTS_TARGET="BASH_SHELL=/bin/sh \
--with-__thread \ --with-__thread \
--with-binutils=${BUILD}/toolchain/bin \ --with-binutils=${BUILD}/toolchain/bin \
--with-headers=${SYSROOT_PREFIX}/usr/include \ --with-headers=${SYSROOT_PREFIX}/usr/include \
--enable-kernel=5.4.0 \ --enable-kernel=5.10.0 \
--without-cvs \ --without-cvs \
--without-gd \ --without-gd \
--disable-build-nscd \ --disable-build-nscd \

1
packages/sysutils/busybox/package.mk
View File

@ -208,6 +208,7 @@ makeinstall_init() {
cp ${PKG_DIR}/scripts/init ${INSTALL} cp ${PKG_DIR}/scripts/init ${INSTALL}
sed -e "s/@DISTRONAME@/${DISTRONAME}/g" \ sed -e "s/@DISTRONAME@/${DISTRONAME}/g" \
-e "s/@KERNEL_NAME@/${KERNEL_NAME}/g" \ -e "s/@KERNEL_NAME@/${KERNEL_NAME}/g" \
-e "s/@SYSTEM_SIZE@/${SYSTEM_SIZE}/g" \
-i ${INSTALL}/init -i ${INSTALL}/init
chmod 755 ${INSTALL}/init chmod 755 ${INSTALL}/init
} }

2
packages/sysutils/busybox/scripts/init
View File

@ -916,7 +916,7 @@ check_update() {
echo "" echo ""
echo "You must re-install your system using the disk image of a" echo "You must re-install your system using the disk image of a"
echo "current release, or you must re-size your existing partitions" echo "current release, or you must re-size your existing partitions"
echo "so that the System (FAT) partition is at least 512MB in size." echo "so that the System (FAT) partition is at least @SYSTEM_SIZE@MB in size."
echo "" echo ""
do_cleanup do_cleanup
StartProgress countdown "Normal startup in 60s... " 60 "NOW" StartProgress countdown "Normal startup in 60s... " 60 "NOW"

6
tools/download-cleaner
View File

@ -102,7 +102,7 @@ for SOURCE_PACKAGE in $(find "${SOURCES}/" -mindepth 1 -type d); do
PACKAGES_TO_UPDATE+="${PACKAGE_NAME}" PACKAGES_TO_UPDATE+="${PACKAGE_NAME}"
if [ "${DESTRUCTIVE_RUN}" = "true" ]; then if [ "${DESTRUCTIVE_RUN}" = "true" ]; then
rm "${FILE}"* rm -f "${FILE}"*
fi fi
# current file handling # current file handling
elif [ "${BUILD_SOURCES}" = "true" ]; then elif [ "${BUILD_SOURCES}" = "true" ]; then
@ -114,13 +114,13 @@ for SOURCE_PACKAGE in $(find "${SOURCES}/" -mindepth 1 -type d); do
else else
echo "info: ${PACKAGE_NAME} no longer in tree" echo "info: ${PACKAGE_NAME} no longer in tree"
if [ "${DESTRUCTIVE_RUN}" = "true" ]; then if [ "${DESTRUCTIVE_RUN}" = "true" ]; then
rm -r "${SOURCE_PACKAGE}" rm -rf "${SOURCE_PACKAGE}"
fi fi
fi fi
done done
if [ "${BUILD_SOURCES}" = "true" -a "${REPLACE_OLD}" = "true" ]; then if [ "${BUILD_SOURCES}" = "true" -a "${REPLACE_OLD}" = "true" ]; then
rm -r "${SOURCES}" rm -rf "${SOURCES}"
mv "${NEW_SOURCES}" "${SOURCES}" mv "${NEW_SOURCES}" "${SOURCES}"
fi fi