commit a00a1ae3a9db64a2825ecb142a14e244b14c6dc7

OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=2115
This commit is contained in:
Jiri Slaby 2024-03-11 09:46:15 +00:00 committed by Git OBS Bridge
parent 5dfc8491e2
commit 8274e2bce5
36 changed files with 282 additions and 155 deletions

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 11 10:30:02 CET 2024 - jslaby@suse.cz
- rpm/mkspec-dtb: resolve packaging conflicts better
The merge commit ad1679b2612f left both %ifs in place. Remove the one
which d26c540d7eed was removing originally.
This fixes errors like:
dtb-armv7l.spec : error: line 1442: Unclosed %if
The commit also removed SUBPKG_CASE. Reintroduce it, otherwise we see
shell garbage in the description
- commit e4b3d06
-------------------------------------------------------------------
Mon Mar 11 08:49:13 CET 2024 - jslaby@suse.cz

View File

@ -27,7 +27,7 @@
Name: dtb-aarch64
Version: 6.8.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6ae297b
Release: <RELEASE>.ga00a1ae
%else
Release: 0
%endif
@ -206,7 +206,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-allwinner -f dtb-allwinner.list
%else
@ -234,7 +233,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-altera -f dtb-altera.list
%else
@ -263,7 +261,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-amazon -f dtb-amazon.list
%else
@ -291,7 +288,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-amd -f dtb-amd.list
%else
@ -319,7 +315,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-amlogic -f dtb-amlogic.list
%else
@ -348,7 +343,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-apm -f dtb-apm.list
%else
@ -376,7 +370,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-apple -f dtb-apple.list
%else
@ -406,7 +399,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-arm -f dtb-arm.list
%else
@ -434,7 +426,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-broadcom -f dtb-broadcom.list
%else
@ -463,7 +454,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-cavium -f dtb-cavium.list
%else
@ -491,7 +481,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-exynos -f dtb-exynos.list
%else
@ -519,7 +508,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-freescale -f dtb-freescale.list
%else
@ -548,7 +536,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-hisilicon -f dtb-hisilicon.list
%else
@ -576,7 +563,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-lg -f dtb-lg.list
%else
@ -604,7 +590,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-marvell -f dtb-marvell.list
%else
@ -632,7 +617,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-mediatek -f dtb-mediatek.list
%else
@ -660,7 +644,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-nvidia -f dtb-nvidia.list
%else
@ -688,7 +671,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-qcom -f dtb-qcom.list
%else
@ -716,7 +698,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-renesas -f dtb-renesas.list
%else
@ -744,7 +725,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-rockchip -f dtb-rockchip.list
%else
@ -772,7 +752,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-socionext -f dtb-socionext.list
%else
@ -800,7 +779,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-sprd -f dtb-sprd.list
%else
@ -828,7 +806,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-xilinx -f dtb-xilinx.list
%else
@ -878,7 +855,6 @@ for dts in allwinner/*.dts altera/*.dts amazon/*.dts amd/*.dts amlogic/*.dts apm
ln -s $target.dtb %{buildroot}$baselink
%ifarch %arm
case $dts in
$SUBPKG_CASE
esac
echo $baselink >> ../$pkgname.list
%else

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 11 10:30:02 CET 2024 - jslaby@suse.cz
- rpm/mkspec-dtb: resolve packaging conflicts better
The merge commit ad1679b2612f left both %ifs in place. Remove the one
which d26c540d7eed was removing originally.
This fixes errors like:
dtb-armv7l.spec : error: line 1442: Unclosed %if
The commit also removed SUBPKG_CASE. Reintroduce it, otherwise we see
shell garbage in the description
- commit e4b3d06
-------------------------------------------------------------------
Mon Mar 11 08:49:13 CET 2024 - jslaby@suse.cz

View File

@ -27,7 +27,7 @@
Name: dtb-armv6l
Version: 6.8.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6ae297b
Release: <RELEASE>.ga00a1ae
%else
Release: 0
%endif
@ -206,7 +206,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-bcm2835 -f dtb-bcm2835.list
%else
@ -218,7 +217,6 @@ cd /boot
%dir %{dtbdir}/broadcom
%{dtbdir}/broadcom/bcm2835*.dtb
broadcom/bcm2835*.dts) pkgname=dtb-bcm2835;;
%prep
@ -257,7 +255,7 @@ for dts in broadcom/bcm2835*.dts ; do
ln -s $target.dtb %{buildroot}$baselink
%ifarch %arm
case $dts in
$SUBPKG_CASE
broadcom/bcm2835*.dts) pkgname=dtb-bcm2835;;
esac
echo $baselink >> ../$pkgname.list
%else

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 11 10:30:02 CET 2024 - jslaby@suse.cz
- rpm/mkspec-dtb: resolve packaging conflicts better
The merge commit ad1679b2612f left both %ifs in place. Remove the one
which d26c540d7eed was removing originally.
This fixes errors like:
dtb-armv7l.spec : error: line 1442: Unclosed %if
The commit also removed SUBPKG_CASE. Reintroduce it, otherwise we see
shell garbage in the description
- commit e4b3d06
-------------------------------------------------------------------
Mon Mar 11 08:49:13 CET 2024 - jslaby@suse.cz

View File

@ -27,7 +27,7 @@
Name: dtb-armv7l
Version: 6.8.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6ae297b
Release: <RELEASE>.ga00a1ae
%else
Release: 0
%endif
@ -206,7 +206,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-am335x -f dtb-am335x.list
%else
@ -219,7 +218,6 @@ cd /boot
%dir %{dtbdir}/ti/omap
%{dtbdir}/ti/omap/am335x-*.dtb
ti/omap/am335x-*.dts) pkgname=dtb-am335x;;
%package -n dtb-am3517
Summary: TI AM3517 based systems
Group: System/Boot
@ -236,7 +234,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-am3517 -f dtb-am3517.list
%else
@ -249,7 +246,6 @@ cd /boot
%dir %{dtbdir}/ti/omap
%{dtbdir}/ti/omap/am3517*.dtb
ti/omap/am3517*.dts) pkgname=dtb-am3517;;
%package -n dtb-am57xx
Summary: TI AM57xx based systems
Group: System/Boot
@ -266,7 +262,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-am57xx -f dtb-am57xx.list
%else
@ -279,7 +274,6 @@ cd /boot
%dir %{dtbdir}/ti/omap
%{dtbdir}/ti/omap/am57xx-*.dtb
ti/omap/am57xx-*.dts) pkgname=dtb-am57xx;;
%package -n dtb-armada-370
Summary: Armada 370 based systems
Group: System/Boot
@ -296,7 +290,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-armada-370 -f dtb-armada-370.list
%else
@ -308,7 +301,6 @@ cd /boot
%dir %{dtbdir}/marvell
%{dtbdir}/marvell/armada-370-*.dtb
marvell/armada-370-*.dts) pkgname=dtb-armada-370;;
%package -n dtb-armada-375
Summary: Armada 375 based systems
Group: System/Boot
@ -325,7 +317,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-armada-375 -f dtb-armada-375.list
%else
@ -337,7 +328,6 @@ cd /boot
%dir %{dtbdir}/marvell
%{dtbdir}/marvell/armada-375-*.dtb
marvell/armada-375-*.dts) pkgname=dtb-armada-375;;
%package -n dtb-armada-385
Summary: Armada 385 based systems
Group: System/Boot
@ -354,7 +344,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-armada-385 -f dtb-armada-385.list
%else
@ -366,7 +355,6 @@ cd /boot
%dir %{dtbdir}/marvell
%{dtbdir}/marvell/armada-385-*.dtb
marvell/armada-385-*.dts) pkgname=dtb-armada-385;;
%package -n dtb-armada-388
Summary: Armada 388 based systems
Group: System/Boot
@ -383,7 +371,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-armada-388 -f dtb-armada-388.list
%else
@ -395,7 +382,6 @@ cd /boot
%dir %{dtbdir}/marvell
%{dtbdir}/marvell/armada-388-*.dtb
marvell/armada-388-*.dts) pkgname=dtb-armada-388;;
%package -n dtb-armada-398
Summary: Armada 398 based systems
Group: System/Boot
@ -412,7 +398,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-armada-398 -f dtb-armada-398.list
%else
@ -424,7 +409,6 @@ cd /boot
%dir %{dtbdir}/marvell
%{dtbdir}/marvell/armada-398-*.dtb
marvell/armada-398-*.dts) pkgname=dtb-armada-398;;
%package -n dtb-armada-xp
Summary: Armada XP based systems
Group: System/Boot
@ -441,7 +425,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-armada-xp -f dtb-armada-xp.list
%else
@ -453,7 +436,6 @@ cd /boot
%dir %{dtbdir}/marvell
%{dtbdir}/marvell/armada-xp-*.dtb
marvell/armada-xp-*.dts) pkgname=dtb-armada-xp;;
%package -n dtb-bcm2836
Summary: Raspberry Pi 2 Model B
Group: System/Boot
@ -470,7 +452,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-bcm2836 -f dtb-bcm2836.list
%else
@ -482,7 +463,6 @@ cd /boot
%dir %{dtbdir}/broadcom
%{dtbdir}/broadcom/bcm2836*.dtb
broadcom/bcm2836*.dts) pkgname=dtb-bcm2836;;
%package -n dtb-dove
Summary: Marvell dove based systems
Group: System/Boot
@ -499,7 +479,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-dove -f dtb-dove.list
%else
@ -511,7 +490,6 @@ cd /boot
%dir %{dtbdir}/marvell
%{dtbdir}/marvell/dove-*.dtb
marvell/dove-*.dts) pkgname=dtb-dove;;
%package -n dtb-exynos4
Summary: Samsung Exynos 4 based systems
Group: System/Boot
@ -528,7 +506,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-exynos4 -f dtb-exynos4.list
%else
@ -540,7 +517,6 @@ cd /boot
%dir %{dtbdir}/samsung
%{dtbdir}/samsung/exynos4*.dtb
samsung/exynos4*.dts) pkgname=dtb-exynos4;;
%package -n dtb-exynos5
Summary: Samsung Exynos 5 based systems
Group: System/Boot
@ -557,7 +533,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-exynos5 -f dtb-exynos5.list
%else
@ -569,7 +544,6 @@ cd /boot
%dir %{dtbdir}/samsung
%{dtbdir}/samsung/exynos5*.dtb
samsung/exynos5*.dts) pkgname=dtb-exynos5;;
%package -n dtb-imx5
Summary: Freescale i.MX51 and i.MX53 based systems
Group: System/Boot
@ -586,7 +560,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-imx5 -f dtb-imx5.list
%else
@ -599,7 +572,6 @@ cd /boot
%dir %{dtbdir}/nxp/imx
%{dtbdir}/nxp/imx/imx5*.dtb
nxp/imx/imx5*.dts) pkgname=dtb-imx5;;
%package -n dtb-imx6
Summary: Freescale i.MX6 based systems
Group: System/Boot
@ -616,7 +588,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-imx6 -f dtb-imx6.list
%else
@ -629,7 +600,6 @@ cd /boot
%dir %{dtbdir}/nxp/imx
%{dtbdir}/nxp/imx/imx6*.dtb
nxp/imx/imx6*.dts) pkgname=dtb-imx6;;
%package -n dtb-imx7
Summary: Freescale i.MX7 based systems
Group: System/Boot
@ -646,7 +616,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-imx7 -f dtb-imx7.list
%else
@ -659,7 +628,6 @@ cd /boot
%dir %{dtbdir}/nxp/imx
%{dtbdir}/nxp/imx/imx7*.dtb
nxp/imx/imx7*.dts) pkgname=dtb-imx7;;
%package -n dtb-keystone
Summary: TI Keystone 2 based systems
Group: System/Boot
@ -678,7 +646,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-keystone -f dtb-keystone.list
%else
@ -691,7 +658,6 @@ cd /boot
%dir %{dtbdir}/ti/keystone
%{dtbdir}/ti/keystone/keystone-*.dtb
ti/keystone/keystone-*.dts) pkgname=dtb-keystone;;
%package -n dtb-meson6
Summary: Amlogic Meson 6 based systems
Group: System/Boot
@ -708,7 +674,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-meson6 -f dtb-meson6.list
%else
@ -720,7 +685,6 @@ cd /boot
%dir %{dtbdir}/amlogic
%{dtbdir}/amlogic/meson6-*.dtb
amlogic/meson6-*.dts) pkgname=dtb-meson6;;
%package -n dtb-meson8
Summary: Amlogic Meson 8 based systems
Group: System/Boot
@ -737,7 +701,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-meson8 -f dtb-meson8.list
%else
@ -749,7 +712,6 @@ cd /boot
%dir %{dtbdir}/amlogic
%{dtbdir}/amlogic/meson8-*.dtb
amlogic/meson8-*.dts) pkgname=dtb-meson8;;
%package -n dtb-meson8b
Summary: Amlogic Meson 8b based systems
Group: System/Boot
@ -766,7 +728,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-meson8b -f dtb-meson8b.list
%else
@ -778,7 +739,6 @@ cd /boot
%dir %{dtbdir}/amlogic
%{dtbdir}/amlogic/meson8b-*.dtb
amlogic/meson8b-*.dts) pkgname=dtb-meson8b;;
%package -n dtb-mt76
Summary: MediaTek mt76 based systems
Group: System/Boot
@ -795,7 +755,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-mt76 -f dtb-mt76.list
%else
@ -807,7 +766,6 @@ cd /boot
%dir %{dtbdir}/mediatek
%{dtbdir}/mediatek/mt76*.dtb
mediatek/mt76*.dts) pkgname=dtb-mt76;;
%package -n dtb-omap3
Summary: TI OMAP3 based systems
Group: System/Boot
@ -824,7 +782,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-omap3 -f dtb-omap3.list
%else
@ -837,7 +794,6 @@ cd /boot
%dir %{dtbdir}/ti/omap
%{dtbdir}/ti/omap/omap3*.dtb
ti/omap/omap3*.dts) pkgname=dtb-omap3;;
%package -n dtb-omap4
Summary: TI OMAP4 based systems
Group: System/Boot
@ -854,7 +810,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-omap4 -f dtb-omap4.list
%else
@ -867,7 +822,6 @@ cd /boot
%dir %{dtbdir}/ti/omap
%{dtbdir}/ti/omap/omap4*.dtb
ti/omap/omap4*.dts) pkgname=dtb-omap4;;
%package -n dtb-omap5
Summary: TI OMAP5 based systems
Group: System/Boot
@ -884,7 +838,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-omap5 -f dtb-omap5.list
%else
@ -897,7 +850,6 @@ cd /boot
%dir %{dtbdir}/ti/omap
%{dtbdir}/ti/omap/omap5*.dtb
ti/omap/omap5*.dts) pkgname=dtb-omap5;;
%package -n dtb-qcom
Summary: Qualcomm Snapdragon based systems
Group: System/Boot
@ -914,7 +866,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-qcom -f dtb-qcom.list
%else
@ -926,7 +877,6 @@ cd /boot
%dir %{dtbdir}/qcom
%{dtbdir}/qcom/qcom-*.dtb
qcom/qcom-*.dts) pkgname=dtb-qcom;;
%package -n dtb-rk3
Summary: Rockchip RK3xxx based systems
Group: System/Boot
@ -943,7 +893,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-rk3 -f dtb-rk3.list
%else
@ -955,7 +904,6 @@ cd /boot
%dir %{dtbdir}/rockchip
%{dtbdir}/rockchip/rk3*.dtb
rockchip/rk3*.dts) pkgname=dtb-rk3;;
%package -n dtb-socfpga
Summary: Altera SoC FPGA based systems
Group: System/Boot
@ -972,7 +920,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-socfpga -f dtb-socfpga.list
%else
@ -985,7 +932,6 @@ cd /boot
%dir %{dtbdir}/intel/socfpga
%{dtbdir}/intel/socfpga/socfpga_*.dtb
intel/socfpga/socfpga_*.dts) pkgname=dtb-socfpga;;
%package -n dtb-ste
Summary: ST Ericsson based systems
Group: System/Boot
@ -1002,7 +948,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-ste -f dtb-ste.list
%else
@ -1014,7 +959,6 @@ cd /boot
%dir %{dtbdir}/st
%{dtbdir}/st/ste-*.dtb
st/ste-*.dts) pkgname=dtb-ste;;
%package -n dtb-sun4i
Summary: Allwinner sun4i based systems
Group: System/Boot
@ -1031,7 +975,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-sun4i -f dtb-sun4i.list
%else
@ -1043,7 +986,6 @@ cd /boot
%dir %{dtbdir}/allwinner
%{dtbdir}/allwinner/sun4i-*.dtb
allwinner/sun4i-*.dts) pkgname=dtb-sun4i;;
%package -n dtb-sun5i
Summary: Allwinner sun5i based systems
Group: System/Boot
@ -1060,7 +1002,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-sun5i -f dtb-sun5i.list
%else
@ -1072,7 +1013,6 @@ cd /boot
%dir %{dtbdir}/allwinner
%{dtbdir}/allwinner/sun5i-*.dtb
allwinner/sun5i-*.dts) pkgname=dtb-sun5i;;
%package -n dtb-sun6i
Summary: Allwinner sun6i based systems
Group: System/Boot
@ -1089,7 +1029,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-sun6i -f dtb-sun6i.list
%else
@ -1101,7 +1040,6 @@ cd /boot
%dir %{dtbdir}/allwinner
%{dtbdir}/allwinner/sun6i-*.dtb
allwinner/sun6i-*.dts) pkgname=dtb-sun6i;;
%package -n dtb-sun7i
Summary: Allwinner sun7i based systems
Group: System/Boot
@ -1118,7 +1056,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-sun7i -f dtb-sun7i.list
%else
@ -1130,7 +1067,6 @@ cd /boot
%dir %{dtbdir}/allwinner
%{dtbdir}/allwinner/sun7i-*.dtb
allwinner/sun7i-*.dts) pkgname=dtb-sun7i;;
%package -n dtb-sun8i
Summary: Allwinner sun8i based systems
Group: System/Boot
@ -1147,7 +1083,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-sun8i -f dtb-sun8i.list
%else
@ -1159,7 +1094,6 @@ cd /boot
%dir %{dtbdir}/allwinner
%{dtbdir}/allwinner/sun8i-*.dtb
allwinner/sun8i-*.dts) pkgname=dtb-sun8i;;
%package -n dtb-sun9i
Summary: Allwinner sun9i based systems
Group: System/Boot
@ -1176,7 +1110,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-sun9i -f dtb-sun9i.list
%else
@ -1188,7 +1121,6 @@ cd /boot
%dir %{dtbdir}/allwinner
%{dtbdir}/allwinner/sun9i-*.dtb
allwinner/sun9i-*.dts) pkgname=dtb-sun9i;;
%package -n dtb-tegra2
Summary: NVidia Tegra2 based systems
Group: System/Boot
@ -1205,7 +1137,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-tegra2 -f dtb-tegra2.list
%else
@ -1217,7 +1148,6 @@ cd /boot
%dir %{dtbdir}/nvidia
%{dtbdir}/nvidia/tegra20-*.dtb
nvidia/tegra20-*.dts) pkgname=dtb-tegra2;;
%package -n dtb-tegra3
Summary: NVidia Tegra3 based systems
Group: System/Boot
@ -1234,7 +1164,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-tegra3 -f dtb-tegra3.list
%else
@ -1246,7 +1175,6 @@ cd /boot
%dir %{dtbdir}/nvidia
%{dtbdir}/nvidia/tegra30-*.dtb
nvidia/tegra30-*.dts) pkgname=dtb-tegra3;;
%package -n dtb-tegra114
Summary: NVidia Tegra4 based systems
Group: System/Boot
@ -1263,7 +1191,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-tegra114 -f dtb-tegra114.list
%else
@ -1275,7 +1202,6 @@ cd /boot
%dir %{dtbdir}/nvidia
%{dtbdir}/nvidia/tegra114-*.dtb
nvidia/tegra114-*.dts) pkgname=dtb-tegra114;;
%package -n dtb-tegra124
Summary: NVidia Tegra K1 based systems
Group: System/Boot
@ -1292,7 +1218,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-tegra124 -f dtb-tegra124.list
%else
@ -1304,7 +1229,6 @@ cd /boot
%dir %{dtbdir}/nvidia
%{dtbdir}/nvidia/tegra124-*.dtb
nvidia/tegra124-*.dts) pkgname=dtb-tegra124;;
%package -n dtb-vexpress
Summary: ARM Versatile Express machines
Group: System/Boot
@ -1321,7 +1245,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-vexpress -f dtb-vexpress.list
%else
@ -1333,7 +1256,6 @@ cd /boot
%dir %{dtbdir}/arm
%{dtbdir}/arm/vexpress-*.dtb
arm/vexpress-*.dts) pkgname=dtb-vexpress;;
%package -n dtb-vf500
Summary: Freescale Vybrid VF500 based systems
Group: System/Boot
@ -1350,7 +1272,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-vf500 -f dtb-vf500.list
%else
@ -1363,7 +1284,6 @@ cd /boot
%dir %{dtbdir}/nxp/vf
%{dtbdir}/nxp/vf/vf500-*.dtb
nxp/vf/vf500-*.dts) pkgname=dtb-vf500;;
%package -n dtb-vf6
Summary: Freescale Vybrid VF610 based systems
Group: System/Boot
@ -1380,7 +1300,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-vf6 -f dtb-vf6.list
%else
@ -1393,7 +1312,6 @@ cd /boot
%dir %{dtbdir}/nxp/vf
%{dtbdir}/nxp/vf/vf610-*.dtb
nxp/vf/vf610-*.dts) pkgname=dtb-vf6;;
%package -n dtb-xenvm
Summary: Xen virtual machines
Group: System/Boot
@ -1410,7 +1328,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-xenvm -f dtb-xenvm.list
%else
@ -1422,7 +1339,6 @@ cd /boot
%dir %{dtbdir}/xen
%{dtbdir}/xen/xenvm-*.dtb
xen/xenvm-*.dts) pkgname=dtb-xenvm;;
%package -n dtb-zynq
Summary: Xilinx Zynq based systems
Group: System/Boot
@ -1439,7 +1355,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-zynq -f dtb-zynq.list
%else
@ -1451,7 +1366,6 @@ cd /boot
%dir %{dtbdir}/xilinx
%{dtbdir}/xilinx/zynq-*.dtb
xilinx/zynq-*.dts) pkgname=dtb-zynq;;
%prep
@ -1490,7 +1404,49 @@ for dts in ti/omap/am335x-*.dts ti/omap/am3517*.dts ti/omap/am57xx-*.dts marvell
ln -s $target.dtb %{buildroot}$baselink
%ifarch %arm
case $dts in
$SUBPKG_CASE
ti/omap/am335x-*.dts) pkgname=dtb-am335x;;
ti/omap/am3517*.dts) pkgname=dtb-am3517;;
ti/omap/am57xx-*.dts) pkgname=dtb-am57xx;;
marvell/armada-370-*.dts) pkgname=dtb-armada-370;;
marvell/armada-375-*.dts) pkgname=dtb-armada-375;;
marvell/armada-385-*.dts) pkgname=dtb-armada-385;;
marvell/armada-388-*.dts) pkgname=dtb-armada-388;;
marvell/armada-398-*.dts) pkgname=dtb-armada-398;;
marvell/armada-xp-*.dts) pkgname=dtb-armada-xp;;
broadcom/bcm2836*.dts) pkgname=dtb-bcm2836;;
marvell/dove-*.dts) pkgname=dtb-dove;;
samsung/exynos4*.dts) pkgname=dtb-exynos4;;
samsung/exynos5*.dts) pkgname=dtb-exynos5;;
nxp/imx/imx5*.dts) pkgname=dtb-imx5;;
nxp/imx/imx6*.dts) pkgname=dtb-imx6;;
nxp/imx/imx7*.dts) pkgname=dtb-imx7;;
ti/keystone/keystone-*.dts) pkgname=dtb-keystone;;
amlogic/meson6-*.dts) pkgname=dtb-meson6;;
amlogic/meson8-*.dts) pkgname=dtb-meson8;;
amlogic/meson8b-*.dts) pkgname=dtb-meson8b;;
mediatek/mt76*.dts) pkgname=dtb-mt76;;
ti/omap/omap3*.dts) pkgname=dtb-omap3;;
ti/omap/omap4*.dts) pkgname=dtb-omap4;;
ti/omap/omap5*.dts) pkgname=dtb-omap5;;
qcom/qcom-*.dts) pkgname=dtb-qcom;;
rockchip/rk3*.dts) pkgname=dtb-rk3;;
intel/socfpga/socfpga_*.dts) pkgname=dtb-socfpga;;
st/ste-*.dts) pkgname=dtb-ste;;
allwinner/sun4i-*.dts) pkgname=dtb-sun4i;;
allwinner/sun5i-*.dts) pkgname=dtb-sun5i;;
allwinner/sun6i-*.dts) pkgname=dtb-sun6i;;
allwinner/sun7i-*.dts) pkgname=dtb-sun7i;;
allwinner/sun8i-*.dts) pkgname=dtb-sun8i;;
allwinner/sun9i-*.dts) pkgname=dtb-sun9i;;
nvidia/tegra20-*.dts) pkgname=dtb-tegra2;;
nvidia/tegra30-*.dts) pkgname=dtb-tegra3;;
nvidia/tegra114-*.dts) pkgname=dtb-tegra114;;
nvidia/tegra124-*.dts) pkgname=dtb-tegra124;;
arm/vexpress-*.dts) pkgname=dtb-vexpress;;
nxp/vf/vf500-*.dts) pkgname=dtb-vf500;;
nxp/vf/vf610-*.dts) pkgname=dtb-vf6;;
xen/xenvm-*.dts) pkgname=dtb-xenvm;;
xilinx/zynq-*.dts) pkgname=dtb-zynq;;
esac
echo $baselink >> ../$pkgname.list
%else

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 11 10:30:02 CET 2024 - jslaby@suse.cz
- rpm/mkspec-dtb: resolve packaging conflicts better
The merge commit ad1679b2612f left both %ifs in place. Remove the one
which d26c540d7eed was removing originally.
This fixes errors like:
dtb-armv7l.spec : error: line 1442: Unclosed %if
The commit also removed SUBPKG_CASE. Reintroduce it, otherwise we see
shell garbage in the description
- commit e4b3d06
-------------------------------------------------------------------
Mon Mar 11 08:49:13 CET 2024 - jslaby@suse.cz

View File

@ -27,7 +27,7 @@
Name: dtb-riscv64
Version: 6.8.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6ae297b
Release: <RELEASE>.ga00a1ae
%else
Release: 0
%endif
@ -206,7 +206,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-allwinner -f dtb-allwinner.list
%else
@ -234,7 +233,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-microchip -f dtb-microchip.list
%else
@ -262,7 +260,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-renesas -f dtb-renesas.list
%else
@ -290,7 +287,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-sifive -f dtb-sifive.list
%else
@ -318,7 +314,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-sophgo -f dtb-sophgo.list
%else
@ -346,7 +341,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-starfive -f dtb-starfive.list
%else
@ -374,7 +368,6 @@ cd /boot
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
%ifarch aarch64 riscv64
%ifarch %arm aarch64 riscv64
%files -n dtb-thead -f dtb-thead.list
%else
@ -424,7 +417,6 @@ for dts in allwinner/*.dts microchip/*.dts renesas/*.dts sifive/*.dts sophgo/*.d
ln -s $target.dtb %{buildroot}$baselink
%ifarch %arm
case $dts in
$SUBPKG_CASE
esac
echo $baselink >> ../$pkgname.list
%else

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 11 10:30:02 CET 2024 - jslaby@suse.cz
- rpm/mkspec-dtb: resolve packaging conflicts better
The merge commit ad1679b2612f left both %ifs in place. Remove the one
which d26c540d7eed was removing originally.
This fixes errors like:
dtb-armv7l.spec : error: line 1442: Unclosed %if
The commit also removed SUBPKG_CASE. Reintroduce it, otherwise we see
shell garbage in the description
- commit e4b3d06
-------------------------------------------------------------------
Mon Mar 11 08:49:13 CET 2024 - jslaby@suse.cz

View File

@ -19,7 +19,7 @@
%define srcversion 6.8
%define patchversion 6.8.0
%define git_commit 6ae297b88265f02acc59145d1c7f49529d1862d8
%define git_commit a00a1ae3a9db64a2825ecb142a14e244b14c6dc7
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@ -38,7 +38,7 @@
Name: kernel-64kb
Version: 6.8.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6ae297b
Release: <RELEASE>.ga00a1ae
%else
Release: 0
%endif

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 11 10:30:02 CET 2024 - jslaby@suse.cz
- rpm/mkspec-dtb: resolve packaging conflicts better
The merge commit ad1679b2612f left both %ifs in place. Remove the one
which d26c540d7eed was removing originally.
This fixes errors like:
dtb-armv7l.spec : error: line 1442: Unclosed %if
The commit also removed SUBPKG_CASE. Reintroduce it, otherwise we see
shell garbage in the description
- commit e4b3d06
-------------------------------------------------------------------
Mon Mar 11 08:49:13 CET 2024 - jslaby@suse.cz

View File

@ -19,7 +19,7 @@
%define srcversion 6.8
%define patchversion 6.8.0
%define git_commit 6ae297b88265f02acc59145d1c7f49529d1862d8
%define git_commit a00a1ae3a9db64a2825ecb142a14e244b14c6dc7
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@ -38,7 +38,7 @@
Name: kernel-debug
Version: 6.8.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6ae297b
Release: <RELEASE>.ga00a1ae
%else
Release: 0
%endif

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 11 10:30:02 CET 2024 - jslaby@suse.cz
- rpm/mkspec-dtb: resolve packaging conflicts better
The merge commit ad1679b2612f left both %ifs in place. Remove the one
which d26c540d7eed was removing originally.
This fixes errors like:
dtb-armv7l.spec : error: line 1442: Unclosed %if
The commit also removed SUBPKG_CASE. Reintroduce it, otherwise we see
shell garbage in the description
- commit e4b3d06
-------------------------------------------------------------------
Mon Mar 11 08:49:13 CET 2024 - jslaby@suse.cz

View File

@ -19,7 +19,7 @@
%define srcversion 6.8
%define patchversion 6.8.0
%define git_commit 6ae297b88265f02acc59145d1c7f49529d1862d8
%define git_commit a00a1ae3a9db64a2825ecb142a14e244b14c6dc7
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@ -38,7 +38,7 @@
Name: kernel-default
Version: 6.8.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6ae297b
Release: <RELEASE>.ga00a1ae
%else
Release: 0
%endif

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 11 10:30:02 CET 2024 - jslaby@suse.cz
- rpm/mkspec-dtb: resolve packaging conflicts better
The merge commit ad1679b2612f left both %ifs in place. Remove the one
which d26c540d7eed was removing originally.
This fixes errors like:
dtb-armv7l.spec : error: line 1442: Unclosed %if
The commit also removed SUBPKG_CASE. Reintroduce it, otherwise we see
shell garbage in the description
- commit e4b3d06
-------------------------------------------------------------------
Mon Mar 11 08:49:13 CET 2024 - jslaby@suse.cz

View File

@ -18,7 +18,7 @@
%define srcversion 6.8
%define patchversion 6.8.0
%define git_commit 6ae297b88265f02acc59145d1c7f49529d1862d8
%define git_commit a00a1ae3a9db64a2825ecb142a14e244b14c6dc7
%define variant %{nil}
%define build_html 1
%define build_pdf 0
@ -30,7 +30,7 @@
Name: kernel-docs
Version: 6.8.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6ae297b
Release: <RELEASE>.ga00a1ae
%else
Release: 0
%endif

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 11 10:30:02 CET 2024 - jslaby@suse.cz
- rpm/mkspec-dtb: resolve packaging conflicts better
The merge commit ad1679b2612f left both %ifs in place. Remove the one
which d26c540d7eed was removing originally.
This fixes errors like:
dtb-armv7l.spec : error: line 1442: Unclosed %if
The commit also removed SUBPKG_CASE. Reintroduce it, otherwise we see
shell garbage in the description
- commit e4b3d06
-------------------------------------------------------------------
Mon Mar 11 08:49:13 CET 2024 - jslaby@suse.cz

View File

@ -19,7 +19,7 @@
%define srcversion 6.8
%define patchversion 6.8.0
%define git_commit 6ae297b88265f02acc59145d1c7f49529d1862d8
%define git_commit a00a1ae3a9db64a2825ecb142a14e244b14c6dc7
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@ -38,7 +38,7 @@
Name: kernel-kvmsmall
Version: 6.8.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6ae297b
Release: <RELEASE>.ga00a1ae
%else
Release: 0
%endif

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 11 10:30:02 CET 2024 - jslaby@suse.cz
- rpm/mkspec-dtb: resolve packaging conflicts better
The merge commit ad1679b2612f left both %ifs in place. Remove the one
which d26c540d7eed was removing originally.
This fixes errors like:
dtb-armv7l.spec : error: line 1442: Unclosed %if
The commit also removed SUBPKG_CASE. Reintroduce it, otherwise we see
shell garbage in the description
- commit e4b3d06
-------------------------------------------------------------------
Mon Mar 11 08:49:13 CET 2024 - jslaby@suse.cz

View File

@ -19,7 +19,7 @@
%define srcversion 6.8
%define patchversion 6.8.0
%define git_commit 6ae297b88265f02acc59145d1c7f49529d1862d8
%define git_commit a00a1ae3a9db64a2825ecb142a14e244b14c6dc7
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@ -38,7 +38,7 @@
Name: kernel-lpae
Version: 6.8.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6ae297b
Release: <RELEASE>.ga00a1ae
%else
Release: 0
%endif

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 11 10:30:02 CET 2024 - jslaby@suse.cz
- rpm/mkspec-dtb: resolve packaging conflicts better
The merge commit ad1679b2612f left both %ifs in place. Remove the one
which d26c540d7eed was removing originally.
This fixes errors like:
dtb-armv7l.spec : error: line 1442: Unclosed %if
The commit also removed SUBPKG_CASE. Reintroduce it, otherwise we see
shell garbage in the description
- commit e4b3d06
-------------------------------------------------------------------
Mon Mar 11 08:49:13 CET 2024 - jslaby@suse.cz

View File

@ -38,7 +38,7 @@
%endif
%endif
%endif
%global kernel_package kernel%kernel_flavor-srchash-6ae297b88265f02acc59145d1c7f49529d1862d8
%global kernel_package kernel%kernel_flavor-srchash-a00a1ae3a9db64a2825ecb142a14e244b14c6dc7
%endif
%if 0%{?rhel_version}
%global kernel_package kernel
@ -47,7 +47,7 @@
Name: kernel-obs-build
Version: 6.8.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6ae297b
Release: <RELEASE>.ga00a1ae
%else
Release: 0
%endif

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 11 10:30:02 CET 2024 - jslaby@suse.cz
- rpm/mkspec-dtb: resolve packaging conflicts better
The merge commit ad1679b2612f left both %ifs in place. Remove the one
which d26c540d7eed was removing originally.
This fixes errors like:
dtb-armv7l.spec : error: line 1442: Unclosed %if
The commit also removed SUBPKG_CASE. Reintroduce it, otherwise we see
shell garbage in the description
- commit e4b3d06
-------------------------------------------------------------------
Mon Mar 11 08:49:13 CET 2024 - jslaby@suse.cz

View File

@ -25,7 +25,7 @@
Name: kernel-obs-qa
Version: 6.8.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6ae297b
Release: <RELEASE>.ga00a1ae
%else
Release: 0
%endif

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 11 10:30:02 CET 2024 - jslaby@suse.cz
- rpm/mkspec-dtb: resolve packaging conflicts better
The merge commit ad1679b2612f left both %ifs in place. Remove the one
which d26c540d7eed was removing originally.
This fixes errors like:
dtb-armv7l.spec : error: line 1442: Unclosed %if
The commit also removed SUBPKG_CASE. Reintroduce it, otherwise we see
shell garbage in the description
- commit e4b3d06
-------------------------------------------------------------------
Mon Mar 11 08:49:13 CET 2024 - jslaby@suse.cz

View File

@ -19,7 +19,7 @@
%define srcversion 6.8
%define patchversion 6.8.0
%define git_commit 6ae297b88265f02acc59145d1c7f49529d1862d8
%define git_commit a00a1ae3a9db64a2825ecb142a14e244b14c6dc7
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@ -38,7 +38,7 @@
Name: kernel-pae
Version: 6.8.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6ae297b
Release: <RELEASE>.ga00a1ae
%else
Release: 0
%endif

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 11 10:30:02 CET 2024 - jslaby@suse.cz
- rpm/mkspec-dtb: resolve packaging conflicts better
The merge commit ad1679b2612f left both %ifs in place. Remove the one
which d26c540d7eed was removing originally.
This fixes errors like:
dtb-armv7l.spec : error: line 1442: Unclosed %if
The commit also removed SUBPKG_CASE. Reintroduce it, otherwise we see
shell garbage in the description
- commit e4b3d06
-------------------------------------------------------------------
Mon Mar 11 08:49:13 CET 2024 - jslaby@suse.cz

View File

@ -18,7 +18,7 @@
%define srcversion 6.8
%define patchversion 6.8.0
%define git_commit 6ae297b88265f02acc59145d1c7f49529d1862d8
%define git_commit a00a1ae3a9db64a2825ecb142a14e244b14c6dc7
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@ -28,7 +28,7 @@
Name: kernel-source
Version: 6.8.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6ae297b
Release: <RELEASE>.ga00a1ae
%else
Release: 0
%endif

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 11 10:30:02 CET 2024 - jslaby@suse.cz
- rpm/mkspec-dtb: resolve packaging conflicts better
The merge commit ad1679b2612f left both %ifs in place. Remove the one
which d26c540d7eed was removing originally.
This fixes errors like:
dtb-armv7l.spec : error: line 1442: Unclosed %if
The commit also removed SUBPKG_CASE. Reintroduce it, otherwise we see
shell garbage in the description
- commit e4b3d06
-------------------------------------------------------------------
Mon Mar 11 08:49:13 CET 2024 - jslaby@suse.cz

View File

@ -16,7 +16,7 @@
#
%define git_commit 6ae297b88265f02acc59145d1c7f49529d1862d8
%define git_commit a00a1ae3a9db64a2825ecb142a14e244b14c6dc7
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@ -25,7 +25,7 @@ Name: kernel-syms
Version: 6.8.0
%if %using_buildservice
%if 0%{?is_kotd}
Release: <RELEASE>.g6ae297b
Release: <RELEASE>.ga00a1ae
%else
Release: 0
%endif

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 11 10:30:02 CET 2024 - jslaby@suse.cz
- rpm/mkspec-dtb: resolve packaging conflicts better
The merge commit ad1679b2612f left both %ifs in place. Remove the one
which d26c540d7eed was removing originally.
This fixes errors like:
dtb-armv7l.spec : error: line 1442: Unclosed %if
The commit also removed SUBPKG_CASE. Reintroduce it, otherwise we see
shell garbage in the description
- commit e4b3d06
-------------------------------------------------------------------
Mon Mar 11 08:49:13 CET 2024 - jslaby@suse.cz

View File

@ -19,7 +19,7 @@
%define srcversion 6.8
%define patchversion 6.8.0
%define git_commit 6ae297b88265f02acc59145d1c7f49529d1862d8
%define git_commit a00a1ae3a9db64a2825ecb142a14e244b14c6dc7
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@ -38,7 +38,7 @@
Name: kernel-vanilla
Version: 6.8.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6ae297b
Release: <RELEASE>.ga00a1ae
%else
Release: 0
%endif

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 11 10:30:02 CET 2024 - jslaby@suse.cz
- rpm/mkspec-dtb: resolve packaging conflicts better
The merge commit ad1679b2612f left both %ifs in place. Remove the one
which d26c540d7eed was removing originally.
This fixes errors like:
dtb-armv7l.spec : error: line 1442: Unclosed %if
The commit also removed SUBPKG_CASE. Reintroduce it, otherwise we see
shell garbage in the description
- commit e4b3d06
-------------------------------------------------------------------
Mon Mar 11 08:49:13 CET 2024 - jslaby@suse.cz

View File

@ -19,7 +19,7 @@
%define srcversion 6.8
%define patchversion 6.8.0
%define git_commit 6ae297b88265f02acc59145d1c7f49529d1862d8
%define git_commit a00a1ae3a9db64a2825ecb142a14e244b14c6dc7
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@ -38,7 +38,7 @@
Name: kernel-zfcpdump
Version: 6.8.0
%if 0%{?is_kotd}
Release: <RELEASE>.g6ae297b
Release: <RELEASE>.ga00a1ae
%else
Release: 0
%endif

View File

@ -109,6 +109,7 @@ sub generate_spec($$$)
unless ($exclusive_arch eq 'none');
my $subpkg_desc = "";
my $subpkg_case = "";
my $all_supported_dtb = "";
my $DTS_folder = "arch/arm/boot/dts";
if ($exclusive_arch =~ /aarch64/) {
@ -174,7 +175,6 @@ sub generate_spec($$$)
}
$subpkg_desc .=
"%ifarch aarch64 riscv64\n" .
"%ifarch %arm aarch64 riscv64\n" .
"%files -n $PKG_NAME -f $PKG_NAME.list\n" .
"%else\n" .
@ -189,7 +189,7 @@ sub generate_spec($$$)
if ($main_package eq 'dtb-armv6l' or $main_package eq 'dtb-armv7l') {
# Map dts file name back to subpkg name
$subpkg_desc .= " $SUPPORTED_DTB) pkgname=$PKG_NAME;;\n"
$subpkg_case .= " $SUPPORTED_DTB) pkgname=$PKG_NAME;;\n"
}
$all_supported_dtb .= "$SUPPORTED_DTB ";
}
@ -201,6 +201,7 @@ sub generate_spec($$$)
$_ =~ s/\$ARCH_RESTRICTIONS/$ARCH_RESTRICTIONS/g;
$_ =~ s/\$DTS_folder/$DTS_folder/g;
$_ =~ s/\$SUBPKG_DESC/$subpkg_desc/g;
$_ =~ s/\$SUBPKG_CASE\n?/$subpkg_case/g;
$_ =~ s/\$ALL_SUPPORTED_DTB/$all_supported_dtb/g;
print SPEC $_;
}

View File

@ -1,3 +1,3 @@
2024-03-11 08:16:52 +0000
GIT Revision: 6ae297b88265f02acc59145d1c7f49529d1862d8
2024-03-11 09:45:07 +0000
GIT Revision: a00a1ae3a9db64a2825ecb142a14e244b14c6dc7
GIT Branch: stable