Merge pull request #5779 from antonlacon/assorted-minors

Assorted minors

config/show_config

@@ -6,7 +6,12 @@ show_config() {
 
   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"
 
   # Build options

packages/devel/glibc/package.mk

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

packages/sysutils/busybox/package.mk

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

packages/sysutils/busybox/scripts/init

@@ -916,7 +916,7 @@ check_update() {
     echo ""
     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 "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 ""
     do_cleanup
     StartProgress countdown "Normal startup in 60s... " 60 "NOW"

tools/download-cleaner

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