From 904b3e043e531c19774a9d9b7834ef1e2d2037fc Mon Sep 17 00:00:00 2001 From: Alper Ak Date: Mon, 23 Jun 2025 13:34:54 +0300 Subject: [PATCH] Remove consecutive blank lines Some of them were introduced by mass-removal of S = WORKDIR/git assignments; rather than try to fix up (or redo) just these, I've run this sed command over the whole tree: sed -i -z -E 's/([ \t\f\v\r]*\n){3,}/\n\n/g' `find . -name *.bb -o -name *.inc` The rationale is that more than one empty line is wasting vertical screen space, and does nothing for readability. Signed-off-by: Alper Ak --- recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb | 1 - recipes-bsp/u-boot/u-boot-sunxi.bb | 1 - recipes-graphics/libgles/sunxi-mali_git.bb | 1 - recipes-graphics/libump/libump_git.bb | 2 -- recipes-graphics/xorg-xserver/libdri2_git.bb | 1 - recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb | 1 - recipes-kernel/armbian-firmware/armbian-firmware_git.bb | 2 -- recipes-kernel/linux/linux-mainline_6.6.85.bb | 1 - recipes-kernel/linux/linux-sunxi_3.4.bb | 1 - recipes-kernel/linux/linux-tools.inc | 1 - recipes-kernel/xradio-firmware/xradio-firmware.bb | 1 - recipes-kernel/xradio/xradio.bb | 1 - recipes-multimedia/gstreamer/gst-plugin-cedar_git.bb | 1 - recipes-support/sunxi-tools/sunxi-tools_git.bb | 1 - 14 files changed, 16 deletions(-) diff --git a/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb b/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb index a1f43fe..e03fa36 100644 --- a/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb +++ b/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb @@ -13,7 +13,6 @@ SRC_URI = "git://github.com/linux-sunxi/sunxi-boards.git;protocol=https;branch=m # Increase PV with SRCREV change SRCREV = "af5f938ea14a3614d35ad3d9ab51a5d392117444" - SUNXI_FEX_BIN_IMAGE = "fex-${MACHINE}-${PV}-${PR}.bin" SUNXI_FEX_BIN_IMAGE_SYMLINK = "fex-${MACHINE}.bin" SUNXI_FEX_BIN_IMAGE_SYMLINK_SIMPLE = "fex.bin" diff --git a/recipes-bsp/u-boot/u-boot-sunxi.bb b/recipes-bsp/u-boot/u-boot-sunxi.bb index c7af148..d9fbe03 100644 --- a/recipes-bsp/u-boot/u-boot-sunxi.bb +++ b/recipes-bsp/u-boot/u-boot-sunxi.bb @@ -31,7 +31,6 @@ PV = "v2014.04+git${SRCPV}" # Corresponds 2014.04 in Makefile SRCREV = "ea1ac32bf76eb60baef474c2516fc431b381d952" - PACKAGE_ARCH = "${MACHINE_ARCH}" SPL_BINARY="u-boot-sunxi-with-spl.bin" diff --git a/recipes-graphics/libgles/sunxi-mali_git.bb b/recipes-graphics/libgles/sunxi-mali_git.bb index 98cf202..9bb1620 100644 --- a/recipes-graphics/libgles/sunxi-mali_git.bb +++ b/recipes-graphics/libgles/sunxi-mali_git.bb @@ -29,7 +29,6 @@ SRC_URI = "git://github.com/linux-sunxi/sunxi-mali.git;protocol=https;branch=mas file://0001-fix-test-build.patch \ " - DEPENDS = "libdrm xorgproto libump patchelf-native" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" diff --git a/recipes-graphics/libump/libump_git.bb b/recipes-graphics/libump/libump_git.bb index 46d16eb..69403d8 100644 --- a/recipes-graphics/libump/libump_git.bb +++ b/recipes-graphics/libump/libump_git.bb @@ -10,5 +10,3 @@ SRCREV = "ec0680628744f30b8fac35e41a7bd8e23e59c39f" SRC_URI = "git://github.com/linux-sunxi/libump.git;protocol=https;branch=master" - - diff --git a/recipes-graphics/xorg-xserver/libdri2_git.bb b/recipes-graphics/xorg-xserver/libdri2_git.bb index c121d96..04713dd 100644 --- a/recipes-graphics/xorg-xserver/libdri2_git.bb +++ b/recipes-graphics/xorg-xserver/libdri2_git.bb @@ -11,6 +11,5 @@ SRC_URI = "git://github.com/robclark/libdri2.git;protocol=http;branch=master" SRCREV = "4f1eef3183df2b270c3d5cbef07343ee5127a6a4" - inherit autotools pkgconfig diff --git a/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb b/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb index a2faf93..0e29064 100644 --- a/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb +++ b/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb @@ -14,7 +14,6 @@ SRCREV = "e094e3c8f9004ca3347694bd05b99d136e8621b9" SRC_URI = "git://github.com/ssvb/xf86-video-fbturbo.git;protocol=http;branch=master \ file://20-fbturbo.conf" - CFLAGS += " -I${STAGING_INCDIR}/xorg " do_install:append() { diff --git a/recipes-kernel/armbian-firmware/armbian-firmware_git.bb b/recipes-kernel/armbian-firmware/armbian-firmware_git.bb index 3bf964b..dd0988c 100644 --- a/recipes-kernel/armbian-firmware/armbian-firmware_git.bb +++ b/recipes-kernel/armbian-firmware/armbian-firmware_git.bb @@ -6,7 +6,6 @@ PV = "1.0+git" SRC_URI = "git://github.com/armbian/firmware.git;protocol=https;branch=master" SRCREV = "4050e02da2dce2b74c97101f7964ecfb962f5aec" - inherit allarch do_compile[noexec] = "1" @@ -28,7 +27,6 @@ FILES:${PN}-ap6212 = " \ ${nonarch_base_libdir}/firmware/brcm/BCM43430A1.hcd \ " - # Make armbian-firmware depend on all of the split-out packages. python populate_packages:prepend () { firmware_pkgs = oe.utils.packages_filter_out_system(d) diff --git a/recipes-kernel/linux/linux-mainline_6.6.85.bb b/recipes-kernel/linux/linux-mainline_6.6.85.bb index 993b1ce..d8194b3 100644 --- a/recipes-kernel/linux/linux-mainline_6.6.85.bb +++ b/recipes-kernel/linux/linux-mainline_6.6.85.bb @@ -9,6 +9,5 @@ SRC_URI += "https://www.kernel.org/pub/linux/kernel/v${KRELEASE}.x/linux-${PV}.t " SRC_URI[sha256sum] = "5ebaccf4ca3428cd26817bae62171f4efd270eed866a3e3d0a1d9e970b7b7529" - KERNEL_FEATURES:append:orange-pi-3lts = " bsp/orange-pi-3lts/orange-pi-3lts-6_5.scc bsp/uwe5622/uwe5622-6_6.scc bsp/orange-pi-3lts/fix-rtc.scc" KERNEL_FEATURES:append:orange-pi-zero2 = " bsp/h61x/orangepi-zero2-6_6.scc bsp/uwe5622/uwe5622-6_6.scc" diff --git a/recipes-kernel/linux/linux-sunxi_3.4.bb b/recipes-kernel/linux/linux-sunxi_3.4.bb index 2b0a7f2..fd06ac8 100644 --- a/recipes-kernel/linux/linux-sunxi_3.4.bb +++ b/recipes-kernel/linux/linux-sunxi_3.4.bb @@ -21,7 +21,6 @@ SRC_URI += "git://github.com/linux-sunxi/linux-sunxi.git;branch=sunxi-3.4;protoc " LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" - #fix QA issue "Files/directories were installed but not shipped: /usr/src/debug" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" diff --git a/recipes-kernel/linux/linux-tools.inc b/recipes-kernel/linux/linux-tools.inc index 3b03c05..11103db 100644 --- a/recipes-kernel/linux/linux-tools.inc +++ b/recipes-kernel/linux/linux-tools.inc @@ -24,7 +24,6 @@ fakeroot do_install_perf () { fi } - # perf tasks addtask compile_perf after do_compile before do_install addtask install_perf after do_install before do_package diff --git a/recipes-kernel/xradio-firmware/xradio-firmware.bb b/recipes-kernel/xradio-firmware/xradio-firmware.bb index 65c8c45..b788e60 100644 --- a/recipes-kernel/xradio-firmware/xradio-firmware.bb +++ b/recipes-kernel/xradio-firmware/xradio-firmware.bb @@ -11,7 +11,6 @@ COMPATIBLE_MACHINE = "orange-pi-zero" SRC_URI = "git://github.com/armbian/firmware.git;protocol=https;branch=master" - do_install() { install -d ${D}${base_libdir}/firmware/xr819 install -m 0644 ${S}/xr819/boot_xr819.bin ${D}${base_libdir}/firmware/xr819/ diff --git a/recipes-kernel/xradio/xradio.bb b/recipes-kernel/xradio/xradio.bb index 6972398..a7338ad 100644 --- a/recipes-kernel/xradio/xradio.bb +++ b/recipes-kernel/xradio/xradio.bb @@ -17,7 +17,6 @@ SRC_URI = "\ git://github.com/fifteenhex/xradio.git;protocol=http;branch=master \ " - EXTRA_OEMAKE += "-C ${STAGING_KERNEL_DIR} M=${S}" KERNEL_MODULE_AUTOLOAD += "xradio_wlan" diff --git a/recipes-multimedia/gstreamer/gst-plugin-cedar_git.bb b/recipes-multimedia/gstreamer/gst-plugin-cedar_git.bb index 4b40acc..b8d2b69 100644 --- a/recipes-multimedia/gstreamer/gst-plugin-cedar_git.bb +++ b/recipes-multimedia/gstreamer/gst-plugin-cedar_git.bb @@ -15,7 +15,6 @@ SRC_URI = "git://github.com/ebutera/gst-plugin-cedar.git;protocol=https;branch=m PV = "0.10.1+git${SRCPV}" PR = "r1" - FILES:${PN} += "${libdir}/gstreamer-0.10/*.so" FILES:${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" FILES:${PN}-dev += "${libdir}/gstreamer-0.10/*.la" diff --git a/recipes-support/sunxi-tools/sunxi-tools_git.bb b/recipes-support/sunxi-tools/sunxi-tools_git.bb index 5b901a1..c4d0be5 100644 --- a/recipes-support/sunxi-tools/sunxi-tools_git.bb +++ b/recipes-support/sunxi-tools/sunxi-tools_git.bb @@ -12,7 +12,6 @@ SRCREV = "9a3d62aa0c820b3dd42ba3409b2043f4143683cd" inherit pkgconfig - BBCLASSEXTEND = "native nativesdk" FILES:${PN} = "${bindir}/*"