From 050ba25fb6c4e381516db3ee4e70c1b6780f79f8 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 7 Sep 2021 05:37:19 +0000 Subject: [PATCH 1/8] packages-cleaner: remove trailing whitespace during automated pass Signed-off-by: Ian Leonard --- tools/packages-checker | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/packages-checker b/tools/packages-checker index 63b56a71f2..063e1e9fb7 100755 --- a/tools/packages-checker +++ b/tools/packages-checker @@ -10,6 +10,7 @@ for directory in $(find packages/ -mindepth 1 -maxdepth 1 -type d | sort); do for file in $(find "${directory}" -type f -name "package.mk" | sort); do tools/fixlecode.py -qw -f "${file}" + sed -i 's/[[:blank:]]*$//g' "${file}" done git commit -qs -m "${directory##*/}: automated code cleanup" "${directory}" done From 156a917d3014b8467bfbf3631d5ee4715156fc33 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Wed, 8 Sep 2021 08:04:34 +0000 Subject: [PATCH 2/8] packages-checker: detail more of what it is doing Signed-off-by: Ian Leonard --- tools/packages-checker | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/packages-checker b/tools/packages-checker index 063e1e9fb7..d7de4c41de 100755 --- a/tools/packages-checker +++ b/tools/packages-checker @@ -7,6 +7,13 @@ # follow certain coding standards used in the project. Corrections are grouped # by the subdirectory within the packages feed, and then commited. +# Corrections made: +# PKG_VAR="$PKG_VAR stuff" -> PKG_VAR+=" stuff" +# $PKG_VAR -> ${PKG_VAR} +# result=`subcommand` -> result=$(subcommand) +# [ test ] ; then -> [ test ]; then +# trailing whitespace at end of line + for directory in $(find packages/ -mindepth 1 -maxdepth 1 -type d | sort); do for file in $(find "${directory}" -type f -name "package.mk" | sort); do tools/fixlecode.py -qw -f "${file}" From 842dcecfa16ca9c6d69be30f47ab0361faee4b70 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Fri, 1 Oct 2021 19:19:35 +0000 Subject: [PATCH 3/8] addons: automated code cleanup Signed-off-by: Ian Leonard --- .../addons/addon-depends/system-tools-depends/mtpfs/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk b/packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk index 3f974bd866..06597de3f4 100644 --- a/packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk @@ -14,7 +14,7 @@ PKG_BUILD_FLAGS="-sysroot" PKG_CONFIGURE_OPTS_TARGET="--disable-mad" -# TODO: mtpfs runs host utils while building, fix and set +# TODO: mtpfs runs host utils while building, fix and set pre_configure_target() { export LIBS="-lusb-1.0 -ludev" } From cbeda2bc884d32513a12bb4be9896b975766bfe9 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Fri, 1 Oct 2021 19:19:47 +0000 Subject: [PATCH 4/8] emulation: automated code cleanup Signed-off-by: Ian Leonard --- packages/emulation/libretro-pcsx-rearmed/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/emulation/libretro-pcsx-rearmed/package.mk b/packages/emulation/libretro-pcsx-rearmed/package.mk index 6f627326a4..a6615c66a6 100644 --- a/packages/emulation/libretro-pcsx-rearmed/package.mk +++ b/packages/emulation/libretro-pcsx-rearmed/package.mk @@ -18,7 +18,7 @@ PKG_LIBVAR="PCSX-REARMED_LIB" make_target() { cd ${PKG_BUILD} - + if target_has_feature neon; then export HAVE_NEON=1 export BUILTIN_GPU=neon @@ -28,7 +28,7 @@ make_target() { # check if this flag is still needed when this package is updated export CFLAGS="${CFLAGS} -fcommon" - + case ${TARGET_ARCH} in aarch64) make -f Makefile.libretro DYNAREC=lightrec platform=aarch64 GIT_VERSION=${PKG_VERSION} From 7714a1e42f16f53c59dcd7d511cbe5ef1a44da44 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Fri, 1 Oct 2021 19:19:49 +0000 Subject: [PATCH 5/8] linux: automated code cleanup Signed-off-by: Ian Leonard --- packages/linux/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index f4adfcd112..4c53886b5e 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -179,7 +179,7 @@ pre_make_target() { continue fi - if [ "$($PKG_BUILD/scripts/config --state ${OPTION%%=*})" != "${OPTION##*=}" ]; then + if [ "$(${PKG_BUILD}/scripts/config --state ${OPTION%%=*})" != "${OPTION##*=}" ]; then MISSING_KERNEL_OPTIONS+="\t${OPTION}\n" fi done < ${DISTRO_DIR}/${DISTRO}/kernel_options From 5e4599be53ae4ae93d54e3f07220a0cef60dc9ec Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Fri, 1 Oct 2021 19:19:49 +0000 Subject: [PATCH 6/8] linux-driver-addons: automated code cleanup Signed-off-by: Ian Leonard --- packages/linux-driver-addons/dvb/depends/media_tree/package.mk | 2 +- .../linux-driver-addons/dvb/depends/media_tree_cc/package.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-driver-addons/dvb/depends/media_tree/package.mk b/packages/linux-driver-addons/dvb/depends/media_tree/package.mk index b5b11ce2ae..033f3665a4 100644 --- a/packages/linux-driver-addons/dvb/depends/media_tree/package.mk +++ b/packages/linux-driver-addons/dvb/depends/media_tree/package.mk @@ -19,7 +19,7 @@ unpack() { post_unpack() { # hack/workaround for borked upstream kernel/media_build - # without removing atomisp there a lot additional includes that + # without removing atomisp there a lot additional includes that # slowdown build process after modpost from 3min to 6min # even if atomisp is disabled via kernel.conf rm -rf ${PKG_BUILD}/drivers/staging/media/atomisp diff --git a/packages/linux-driver-addons/dvb/depends/media_tree_cc/package.mk b/packages/linux-driver-addons/dvb/depends/media_tree_cc/package.mk index ac8a0d456c..800b594e21 100644 --- a/packages/linux-driver-addons/dvb/depends/media_tree_cc/package.mk +++ b/packages/linux-driver-addons/dvb/depends/media_tree_cc/package.mk @@ -19,7 +19,7 @@ unpack() { post_unpack() { # hack/workaround for borked upstream kernel/media_build - # without removing atomisp there a lot additional includes that + # without removing atomisp there a lot additional includes that # slowdown build process after modpost from 3min to 6min # even if atomisp is disabled via kernel.conf rm -rf ${PKG_BUILD}/drivers/staging/media/atomisp From 54b7cccd9c0d0069bef45cbb19add6bca6b9c460 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Fri, 1 Oct 2021 19:20:12 +0000 Subject: [PATCH 7/8] wayland: automated code cleanup Signed-off-by: Ian Leonard --- packages/wayland/weston/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/wayland/weston/package.mk b/packages/wayland/weston/package.mk index ad98dc6af3..e79186bc4f 100644 --- a/packages/wayland/weston/package.mk +++ b/packages/wayland/weston/package.mk @@ -39,7 +39,7 @@ post_makeinstall_target() { cp ${PKG_DIR}/config/weston.ini ${INSTALL}/usr/share/weston safe_remove ${INSTALL}/usr/share/wayland-sessions - safe_remove ${INSTALL}/usr/bin/weston-calibrator + safe_remove ${INSTALL}/usr/bin/weston-calibrator safe_remove ${INSTALL}/usr/bin/weston-simple-* safe_remove ${INSTALL}/usr/bin/weston-touch-calibrator } From 341a5728a56257b7726a1e08a665ba0341fcb00d Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Fri, 1 Oct 2021 19:20:15 +0000 Subject: [PATCH 8/8] x11: automated code cleanup Signed-off-by: Ian Leonard --- packages/x11/driver/xf86-video-nvidia/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk index 0e20b919db..86753df76c 100644 --- a/packages/x11/driver/xf86-video-nvidia/package.mk +++ b/packages/x11/driver/xf86-video-nvidia/package.mk @@ -39,7 +39,7 @@ makeinstall_target() { ln -sf /var/lib/nvidia_drv.so ${INSTALL}/${XORG_PATH_MODULES}/drivers/nvidia_drv.so mkdir -p ${INSTALL}/${XORG_PATH_MODULES}/extensions - # rename to avoid conflicts with X.Org-Server module libglx.so + # rename to avoid conflicts with X.Org-Server module libglx.so cp -P libglxserver_nvidia.so.${PKG_VERSION} ${INSTALL}/${XORG_PATH_MODULES}/extensions/libglx_nvidia.so mkdir -p ${INSTALL}/etc/X11