December 2023 - kernel - Fedora Mailing-Lists

[OS-BUILD PATCHv2] Fix binutils breakage

by Don Zickus (via Email Bridge)

From: Don Zickus <dzickus(a)redhat.com> Fix binutils breakage The binutils package in Rawhide has stricter checks about PIE/PIC code and will start reporting errors if it detects mixing and matching no-PIE with PIE binaries (especially around bpf binaries). Example errors look like: /usr/bin/ld: /tmp/ccL7dkfR.o: relocation R_X86_64_32S against `.rodata' can not be used when making a PIE object; recompile with -fPIE /usr/bin/ld: failed to set dynamic section sizes: bad value collect2: error: ld returned 1 exit status Fix this by adding more CFLAGS to force PIE/PIC generated binaries to bpf releated selftests, tools and samples. This patch was provided by Carlos O'Donell and understands how it works. I am just the middle man. All -fPIE errors are resolved except for one about libbpf.a. The static version of the library doesn't take CFLAGS so it can't be forced to build with PIE/PIC. This error is ignored by the spec file, so it is ignored by this patch too. Signed-off-by: Don Zickus <dzickus(a)redhat.com> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -2769,7 +2769,7 @@ if [ ! -f include/generated/autoconf.h ]; then %{make} %{?_smp_mflags} modules_prepare fi -%{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/ VMLINUX_H="${RPM_VMLINUX_H}" || true +%{make} %{?_smp_mflags} TPROGS_USER_CFLAGS="%{?build_hostcflags}" TPROGS_USER_LDFLAGS="%{?build_hostldflags}" EXTRA_CFLAGS="%{?build_hostcflags}" EXTRA_LDFLAGS="%{?build_hostldflags}" ARCH=$Arch V=1 M=samples/bpf/ VMLINUX_H="${RPM_VMLINUX_H}" || true # Prevent bpf selftests to build bpftool repeatedly: export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool @@ -2783,7 +2783,7 @@ pushd tools/testing/selftests force_targets="" %endif -%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf mm livepatch net net/forwarding net/mptcp netfilter tc-testing memfd drivers/net/bonding" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install +%{make} %{?_smp_mflags} USERCFLAGS="%{?build_hostcflags}" USERLDFLAGS="%{?build_hostldflags}" ARCH=$Arch V=1 TARGETS="bpf mm livepatch net net/forwarding net/mptcp netfilter tc-testing memfd drivers/net/bonding" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install # 'make install' for bpf is broken and upstream refuses to fix it. # Install the needed files manually. -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2749

2 months, 1 week

3
4
0 / 0

[OS-BUILD PATCH 0/3] configs: netfilter: update settings

by Florian Westphal (via Email Bridge)

From: Florian Westphal on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2823 Disable DCCP conntrack and the old iptables-32-bit-compat interface in all configurations. Set CONFIG_NETFILTER_NETLINK_HOOK=m in all configurations (only enabled in rhel so far) and disable CONFIG_NF_CT_PROTO_DCCP and CONFIG_NETFILTER_XTABLES_COMPAT in all configurations. Signed-off-by: Florian Westphal <fwestpha(a)redhat.com> --- redhat/configs/rhel/generic/CONFIG_NETFILTER_NETLINK_HOOK => redhat/configs/common/generic/CONFIG_NETFILTER_NETLINK_HOOK | 0 redhat/configs/rhel/generic/CONFIG_NETFILTER_XTABLES_COMPAT => redhat/configs/common/generic/CONFIG_NETFILTER_XTABLES_COMPAT | 0 redhat/configs/common/generic/CONFIG_NF_CT_PROTO_DCCP | 2 +- redhat/configs/fedora/generic/CONFIG_NETFILTER_NETLINK_HOOK | 1 - redhat/configs/fedora/generic/CONFIG_NETFILTER_XTABLES_COMPAT | 1 - 5 files changed, 1 insertions(+), 3 deletions(-)

3 months

2
4
0 / 0

[OS-BUILD PATCHv3 0/0] all: cleanup a bunch of configs

by pbrobinson (via Email Bridge)

From: pbrobinson on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2840 NOTE: Truncated patchset due to missing public @redhat.com email address on your GitLab profile at https://gitlab.com/-/profile. Once that is fixed, close and reopen the merge request to retrigger sending the emails. This cleans up a bunch of removed configs as well as configs that are now appropriately gated behind other options. There is no functional change from this. Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com> --- redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_MA35 => redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_MA35 | 0 redhat/configs/common/generic/CONFIG_PHY_MIXEL_LVDS_PHY => redhat/configs/common/generic/arm/aarch64/CONFIG_PHY_MIXEL_LVDS_PHY | 0 redhat/configs/common/generic/CONFIG_PHY_MIXEL_MIPI_DPHY => redhat/configs/common/generic/arm/aarch64/CONFIG_PHY_MIXEL_MIPI_DPHY | 0 redhat/configs/rhel/generic/arm/aarch64/CONFIG_PINCTRL_TEGRA234 => redhat/configs/common/generic/arm/aarch64/CONFIG_PINCTRL_TEGRA234 | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_QORIQ_THERMAL => redhat/configs/common/generic/arm/aarch64/CONFIG_QORIQ_THERMAL | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ASYMMETRIC_KEY_TYPE => redhat/configs/common/generic/CONFIG_ASYMMETRIC_KEY_TYPE | 0 redhat/configs/common/generic/CONFIG_BRCMSTB_GISB_ARB | 1 - redhat/configs/common/generic/CONFIG_COPS | 4 ---- redhat/configs/common/generic/CONFIG_EEPROM_LEGACY | 1 - redhat/configs/common/generic/CONFIG_PHY_FSL_IMX8MQ_USB | 1 - redhat/configs/common/generic/CONFIG_PHY_FSL_IMX8M_PCIE | 1 - redhat/configs/common/generic/CONFIG_POWER_RESET_BRCMSTB | 1 - redhat/configs/common/generic/CONFIG_SLOB_DEPRECATED | 1 - redhat/configs/fedora/generic/arm/aarch64/CONFIG_ATALK | 1 - redhat/configs/fedora/generic/powerpc/CONFIG_ASYMMETRIC_KEY_TYPE | 1 - redhat/configs/fedora/generic/s390x/CONFIG_ASYMMETRIC_KEY_TYPE | 1 - redhat/configs/fedora/generic/CONFIG_DEV_APPLETALK | 1 - redhat/configs/fedora/generic/CONFIG_IMA_TRUSTED_KEYRING | 1 - redhat/configs/fedora/generic/CONFIG_IPDDP | 1 - redhat/configs/fedora/generic/CONFIG_IPDDP_ENCAP | 1 - redhat/configs/fedora/generic/CONFIG_NET_CLS_RSVP | 1 - redhat/configs/fedora/generic/CONFIG_NET_CLS_RSVP6 | 1 - redhat/configs/fedora/generic/CONFIG_NET_CLS_TCINDEX | 1 - redhat/configs/fedora/generic/CONFIG_NET_SCH_ATM | 1 - redhat/configs/fedora/generic/CONFIG_NET_SCH_CBQ | 1 - redhat/configs/fedora/generic/CONFIG_NET_SCH_DSMARK | 1 - redhat/configs/rhel/generic/s390x/CONFIG_EEPROM_LEGACY | 1 - redhat/configs/rhel/generic/CONFIG_ARCH_MA35 | 1 - redhat/configs/rhel/generic/CONFIG_IMA_TRUSTED_KEYRING | 1 - redhat/configs/rhel/generic/CONFIG_NET_CLS_RSVP | 1 - redhat/configs/rhel/generic/CONFIG_NET_CLS_RSVP6 | 1 - redhat/configs/rhel/generic/CONFIG_NET_CLS_TCINDEX | 1 - redhat/configs/rhel/generic/CONFIG_NET_SCH_ATM | 1 - redhat/configs/rhel/generic/CONFIG_NET_SCH_CBQ | 1 - redhat/configs/rhel/generic/CONFIG_NET_SCH_DSMARK | 1 - redhat/configs/rhel/generic/CONFIG_QORIQ_THERMAL | 1 - redhat/configs/rhel/generic/CONFIG_SOC_BRCMSTB | 1 - redhat/configs/rhel/rt/generic/CONFIG_SLOB | 1 - 38 files changed, 0 insertions(+), 35 deletions(-)

3 months, 3 weeks

1
0
0 / 0

[OS-BUILD PATCHv2 0/0] all: cleanup a bunch of configs

by pbrobinson (via Email Bridge)

From: pbrobinson on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2840 NOTE: Truncated patchset due to missing public @redhat.com email address on your GitLab profile at https://gitlab.com/-/profile. Once that is fixed, close and reopen the merge request to retrigger sending the emails. This cleans up a bunch of removed configs as well as configs that are now appropriately gated behind other options. There is no functional change from this. Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com> --- redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_MA35 => redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_MA35 | 0 redhat/configs/common/generic/CONFIG_PHY_MIXEL_LVDS_PHY => redhat/configs/common/generic/arm/aarch64/CONFIG_PHY_MIXEL_LVDS_PHY | 0 redhat/configs/common/generic/CONFIG_PHY_MIXEL_MIPI_DPHY => redhat/configs/common/generic/arm/aarch64/CONFIG_PHY_MIXEL_MIPI_DPHY | 0 redhat/configs/rhel/generic/arm/aarch64/CONFIG_PINCTRL_TEGRA234 => redhat/configs/common/generic/arm/aarch64/CONFIG_PINCTRL_TEGRA234 | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_QORIQ_THERMAL => redhat/configs/common/generic/arm/aarch64/CONFIG_QORIQ_THERMAL | 0 redhat/configs/common/generic/CONFIG_BRCMSTB_GISB_ARB | 1 - redhat/configs/common/generic/CONFIG_COPS | 4 ---- redhat/configs/common/generic/CONFIG_EEPROM_LEGACY | 1 - redhat/configs/common/generic/CONFIG_PHY_FSL_IMX8MQ_USB | 1 - redhat/configs/common/generic/CONFIG_PHY_FSL_IMX8M_PCIE | 1 - redhat/configs/common/generic/CONFIG_POWER_RESET_BRCMSTB | 1 - redhat/configs/common/generic/CONFIG_SLOB_DEPRECATED | 1 - redhat/configs/fedora/generic/arm/aarch64/CONFIG_ATALK | 1 - redhat/configs/fedora/generic/CONFIG_DEV_APPLETALK | 1 - redhat/configs/fedora/generic/CONFIG_IMA_TRUSTED_KEYRING | 1 - redhat/configs/fedora/generic/CONFIG_IPDDP | 1 - redhat/configs/fedora/generic/CONFIG_IPDDP_ENCAP | 1 - redhat/configs/fedora/generic/CONFIG_NET_CLS_RSVP | 1 - redhat/configs/fedora/generic/CONFIG_NET_CLS_RSVP6 | 1 - redhat/configs/fedora/generic/CONFIG_NET_CLS_TCINDEX | 1 - redhat/configs/fedora/generic/CONFIG_NET_SCH_ATM | 1 - redhat/configs/fedora/generic/CONFIG_NET_SCH_CBQ | 1 - redhat/configs/fedora/generic/CONFIG_NET_SCH_DSMARK | 1 - redhat/configs/rhel/generic/s390x/CONFIG_EEPROM_LEGACY | 1 - redhat/configs/rhel/generic/CONFIG_ARCH_MA35 | 1 - redhat/configs/rhel/generic/CONFIG_IMA_TRUSTED_KEYRING | 1 - redhat/configs/rhel/generic/CONFIG_NET_CLS_RSVP | 1 - redhat/configs/rhel/generic/CONFIG_NET_CLS_RSVP6 | 1 - redhat/configs/rhel/generic/CONFIG_NET_CLS_TCINDEX | 1 - redhat/configs/rhel/generic/CONFIG_NET_SCH_ATM | 1 - redhat/configs/rhel/generic/CONFIG_NET_SCH_CBQ | 1 - redhat/configs/rhel/generic/CONFIG_NET_SCH_DSMARK | 1 - redhat/configs/rhel/generic/CONFIG_QORIQ_THERMAL | 1 - redhat/configs/rhel/generic/CONFIG_SOC_BRCMSTB | 1 - redhat/configs/rhel/rt/generic/CONFIG_SLOB | 1 - 35 files changed, 0 insertions(+), 33 deletions(-)

3 months, 3 weeks

1
0
0 / 0

[OS-BUILD PATCH 0/0] Enable sound for a line of Huawei laptops

by Tommaso Zanotti (via Email Bridge)

From: Tommaso Zanotti on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2842 NOTE: Truncated patchset due to missing public @redhat.com email address on your GitLab profile at https://gitlab.com/-/profile. Once that is fixed, close and reopen the merge request to retrigger sending the emails. Some Huawei laptops featuring AMD CPUs are equipped with the ES8336 CODEC from Everest Semi, connected to the ACP3x module. This commit introduces necessary configuration options to enable proper functionality for these laptops. Tested on my Huawei Matebook 14 2021 AMD Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2254698 Signed-off-by: Tommaso Zanotti <git(a)tomzanna.com> --- redhat/configs/fedora/generic/x86/CONFIG_SND_AMD_ASOC_ACP63 | 1 + redhat/configs/fedora/generic/x86/CONFIG_SND_AMD_ASOC_REMBRANDT | 1 + redhat/configs/fedora/generic/x86/CONFIG_SND_AMD_ASOC_RENOIR | 1 + redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_AMD_ACP_COMMON | 1 + redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_AMD_ACP_PCI | 1 + redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_AMD_LEGACY_MACH | 1 + redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_AMD_MACH_COMMON | 1 + redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_AMD_SOF_MACH | 1 + 8 files changed, 8 insertions(+), 0 deletions(-)

4 months

1
0
0 / 0

[OS-BUILD PATCHv4] redhat: do not compress the full kernel changelog in the src.rpm

by Herton R. Krzesinski (via Email Bridge)

From: Herton R. Krzesinski <herton(a)redhat.com> redhat: do not compress the full kernel changelog in the src.rpm Bugzilla: INTERNAL Upstream Status: RHEL only By default redhat/scripts/expand_srpm.sh adds a .gitignore entry excluding any *.xz file in dist-git, since those are usually tarballs which can get very large. The problem is that kernel.changelog.xz file recently added gets excluded and can't be commited to dist-git due that. To avoid it, since src.rpm and git can compress contents and the updates are incremental, just use the uncompressed contents when adding it to the src.rpm, and only compress the file when providing it to the kernel-doc package. This fixes commit "redhat: ship all the changelog from source git into kernel-doc" recently merged into kernel-ark. Reported-by: Justin Forbes <jforbes(a)redhat.com> Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -700,7 +700,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check dracut-virt.conf \ $(SOURCES)/ @cat $$(ls -1 $(SPECPACKAGE_NAME).changelog-* | sort -t '.' -k 3 -n -r) \ - | xz > $(SOURCES)/kernel.changelog.xz + > $(SOURCES)/kernel.changelog @if [ "$(RELEASED_KERNEL)" -ne 0 ]; then \ cp keys/redhatsecureboot{301,501,ca5,ca1}.cer $(SOURCES)/; \ cp keys/secureboot_{ppc,s390}.cer $(SOURCES)/; \ diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -799,7 +799,7 @@ BuildRequires: tpm2-tools Source0: linux-%{tarfile_release}.tar.xz Source1: Makefile.rhelver -Source2: kernel.changelog.xz +Source2: kernel.changelog # Name of the packaged file containing signing key %ifarch ppc64le @@ -2918,7 +2918,8 @@ docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease} # copy the source over mkdir -p $docdir tar -h -f - --exclude=man --exclude='.*' -c Documentation | tar xf - -C $docdir -install -m644 %{SOURCE2} $docdir/ +cat %{SOURCE2} | xz > $docdir/kernel.changelog.xz +chmod 0644 $docdir/kernel.changelog.xz # with_doc %endif -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2841

4 months, 1 week

1
0
0 / 0

[OS-BUILD PATCHv3] redhat: do not compress the full kernel changelog in the src.rpm

by Herton R. Krzesinski (via Email Bridge)

From: Herton R. Krzesinski <herton(a)redhat.com> redhat: do not compress the full kernel changelog in the src.rpm Bugzilla: INTERNAL Upstream Status: RHEL only By default redhat/scripts/expand_srpm.sh adds a .gitignore entry excluding any *.xz file in dist-git, since those are usually tarballs which can get very large. The problem is that kernel.changelog.xz file recently added gets excluded and can't be commited to dist-git due that. To avoid it, since src.rpm and git can compress contents and the updates are incremental, just use the uncompressed contents when adding it to the src.rpm, and only compress the file when providing it to the kernel-doc package. This fixes commit "redhat: ship all the changelog from source git into kernel-doc" recently merged into kernel-ark. Reported-by: Justin Forbes <jforbes(a)redhat.com> Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -700,7 +700,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check dracut-virt.conf \ $(SOURCES)/ @cat $$(ls -1 $(SPECPACKAGE_NAME).changelog-* | sort -t '.' -k 3 -n -r) \ - | xz > $(SOURCES)/kernel.changelog.xz + > $(SOURCES)/kernel.changelog @if [ "$(RELEASED_KERNEL)" -ne 0 ]; then \ cp keys/redhatsecureboot{301,501,ca5,ca1}.cer $(SOURCES)/; \ cp keys/secureboot_{ppc,s390}.cer $(SOURCES)/; \ diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -799,7 +799,7 @@ BuildRequires: tpm2-tools Source0: linux-%{tarfile_release}.tar.xz Source1: Makefile.rhelver -Source2: kernel.changelog.xz +Source2: kernel.changelog # Name of the packaged file containing signing key %ifarch ppc64le @@ -2918,7 +2918,8 @@ docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease} # copy the source over mkdir -p $docdir tar -h -f - --exclude=man --exclude='.*' -c Documentation | tar xf - -C $docdir -install -m644 %{SOURCE2} $docdir/ +cat %{SOURCE2} | xz > $docdir/%{SOURCE2}.xz +chmod 0644 $docdir/%{SOURCE2}.xz # with_doc %endif -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2841

4 months, 1 week

1
0
0 / 0

[OS-BUILD PATCHv2] redhat: fix dist-git/upload for the kernel.changelog.xz file

by Herton R. Krzesinski (via Email Bridge)

From: Herton R. Krzesinski <herton(a)redhat.com> redhat: fix dist-git/upload for the kernel.changelog.xz file Bugzilla: INTERNAL Upstream Status: RHEL only By default redhat/scripts/expand_srpm.sh adds a .gitignore entry excluding any *.xz file in dist-git, since those are usually tarballs which can get very large. The problem is that kernel.changelog.xz file recently added gets excluded and can't be commited to dist-git due that. However, since this changelog file can get large, lets treat it as it was a tarball as well and upload it instead of directly commiting to dist-git. This fixes commit "redhat: ship all the changelog from source git into kernel-doc" recently merged into kernel-ark. Reported-by: Justin Forbes <jforbes(a)redhat.com> Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -328,6 +328,8 @@ else RHPKG_BIN:=rhpkg endif +CLOGFILE:=$(SOURCES)/kernel.changelog.xz + TARFILE:=linux-$(SPECTARFILE_RELEASE).tar.xz TARBALL:=$(REDHAT)/$(TARFILE) @@ -700,7 +702,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check dracut-virt.conf \ $(SOURCES)/ @cat $$(ls -1 $(SPECPACKAGE_NAME).changelog-* | sort -t '.' -k 3 -n -r) \ - | xz > $(SOURCES)/kernel.changelog.xz + | xz > $(CLOGFILE) @if [ "$(RELEASED_KERNEL)" -ne 0 ]; then \ cp keys/redhatsecureboot{301,501,ca5,ca1}.cer $(SOURCES)/; \ cp keys/secureboot_{ppc,s390}.cer $(SOURCES)/; \ diff --git a/redhat/scripts/rh-dist-git.sh b/redhat/scripts/rh-dist-git.sh index blahblah..blahblah 100755 --- a/redhat/scripts/rh-dist-git.sh +++ b/redhat/scripts/rh-dist-git.sh @@ -43,7 +43,7 @@ echo "Unpacking from SRPM" sed -i "/linux-.*.tar.xz/d" "$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore}; sed -i "/kernel-abi-stablelists.*.tar.xz/d" "$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore}; sed -i "/kernel-kabi-dw-.*.tar.xz/d" "$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore}; -upload_list="$TARBALL $KABI_TARBALL $KABIDW_TARBALL" +upload_list="$CLOGFILE $TARBALL $KABI_TARBALL $KABIDW_TARBALL" echo "Uploading new tarballs: $upload_list" # We depend on word splitting here: diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -12,6 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -12,6 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -12,6 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -12,6 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -12,6 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25 b/redhat/self-test/data/centos-df0cc57e057f.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.fc25 +++ b/redhat/self-test/data/centos-df0cc57e057f.fc25 @@ -12,6 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7 b/redhat/self-test/data/centos-fce15c45d3fb.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-fce15c45d3fb.el7 +++ b/redhat/self-test/data/centos-fce15c45d3fb.el7 @@ -12,6 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25 b/redhat/self-test/data/centos-fce15c45d3fb.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-fce15c45d3fb.fc25 +++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25 @@ -12,6 +12,7 @@ BUILD_TARGET=c9s-candidate BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7 b/redhat/self-test/data/fedora-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-2585cf9dfaad.el7 +++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7 @@ -12,6 +12,7 @@ BUILD_TARGET=rawhide BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25 b/redhat/self-test/data/fedora-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25 @@ -12,6 +12,7 @@ BUILD_TARGET=rawhide BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7 b/redhat/self-test/data/fedora-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-78e36f3b0dae.el7 +++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7 @@ -12,6 +12,7 @@ BUILD_TARGET=rawhide BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25 b/redhat/self-test/data/fedora-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25 @@ -12,6 +12,7 @@ BUILD_TARGET=rawhide BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7 b/redhat/self-test/data/fedora-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-df0cc57e057f.el7 +++ b/redhat/self-test/data/fedora-df0cc57e057f.el7 @@ -12,6 +12,7 @@ BUILD_TARGET=rawhide BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25 b/redhat/self-test/data/fedora-df0cc57e057f.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-df0cc57e057f.fc25 +++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25 @@ -12,6 +12,7 @@ BUILD_TARGET=rawhide BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7 b/redhat/self-test/data/fedora-fce15c45d3fb.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-fce15c45d3fb.el7 +++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7 @@ -12,6 +12,7 @@ BUILD_TARGET=rawhide BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25 b/redhat/self-test/data/fedora-fce15c45d3fb.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25 +++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25 @@ -12,6 +12,7 @@ BUILD_TARGET=rawhide BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7 b/redhat/self-test/data/rhel-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/rhel-2585cf9dfaad.el7 +++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7 @@ -12,6 +12,7 @@ BUILD_TARGET=rhel-9-newest-test-pesign BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .el7" diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25 b/redhat/self-test/data/rhel-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/rhel-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25 @@ -12,6 +12,7 @@ BUILD_TARGET=rhel-9-newest-test-pesign BUILD_TARGET_USERDEF= BUMP_RELEASE=yes CHANGELOG_EXT=changelog-9.99 +CLOGFILE=../redhat/rpm/SOURCES/kernel.changelog.xz CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-ppc64le-linux-gnu gcc-ppc64le-linux-gnu binutils-s390x-linux-gnu gcc-s390x-linux-gnu CROSS_RPMFLAGS=rpmbuild --define "_sourcedir ../redhat/rpm/SOURCES" --define "_builddir ../redhat/rpm/BUILD" --define "_srcrpmdir ../redhat/rpm/SRPMS" --define "_rpmdir ../redhat/rpm/RPMS" --define "_specdir ../redhat/rpm/SPECS" --define "dist .fc25" -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2841

4 months, 1 week

2
2
0 / 0

[OS-BUILD PATCH] redhat: fix dist-git/upload for the kernel.changelog.xz file

by Herton R. Krzesinski (via Email Bridge)

From: Herton R. Krzesinski <herton(a)redhat.com> redhat: fix dist-git/upload for the kernel.changelog.xz file Bugzilla: INTERNAL Upstream Status: RHEL only By default redhat/scripts/expand_srpm.sh adds a .gitignore entry excluding any *.xz file in dist-git, since those are usually tarballs which can get very large. The problem is that kernel.changelog.xz file recently added gets excluded and can't be commited to dist-git due that. However, since this changelog file can get large, lets treat it as it was a tarball as well and upload it instead of directly commiting to dist-git. This fixes commit "redhat: ship all the changelog from source git into kernel-doc" recently merged into kernel-ark. Reported-by: Justin Forbes <jforbes(a)redhat.com> Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -328,6 +328,8 @@ else RHPKG_BIN:=rhpkg endif +CLOGFILE:=$(SOURCES)/kernel.changelog.xz + TARFILE:=linux-$(SPECTARFILE_RELEASE).tar.xz TARBALL:=$(REDHAT)/$(TARFILE) @@ -700,7 +702,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check dracut-virt.conf \ $(SOURCES)/ @cat $$(ls -1 $(SPECPACKAGE_NAME).changelog-* | sort -t '.' -k 3 -n -r) \ - | xz > $(SOURCES)/kernel.changelog.xz + | xz > $(CLOGFILE) @if [ "$(RELEASED_KERNEL)" -ne 0 ]; then \ cp keys/redhatsecureboot{301,501,ca5,ca1}.cer $(SOURCES)/; \ cp keys/secureboot_{ppc,s390}.cer $(SOURCES)/; \ diff --git a/redhat/scripts/rh-dist-git.sh b/redhat/scripts/rh-dist-git.sh index blahblah..blahblah 100755 --- a/redhat/scripts/rh-dist-git.sh +++ b/redhat/scripts/rh-dist-git.sh @@ -43,7 +43,7 @@ echo "Unpacking from SRPM" sed -i "/linux-.*.tar.xz/d" "$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore}; sed -i "/kernel-abi-stablelists.*.tar.xz/d" "$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore}; sed -i "/kernel-kabi-dw-.*.tar.xz/d" "$tmpdir/$SPECPACKAGE_NAME"/{sources,.gitignore}; -upload_list="$TARBALL $KABI_TARBALL $KABIDW_TARBALL" +upload_list="$CLOGFILE $TARBALL $KABI_TARBALL $KABIDW_TARBALL" echo "Uploading new tarballs: $upload_list" # We depend on word splitting here: -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2841

4 months, 1 week

2
1
0 / 0

[OS-BUILD PATCHv3 0/2] redhat: create an empty changelog file when changing its name

by Herton R. Krzesinski (via Email Bridge)

From: Herton R. Krzesinski on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2838 Bugzilla: INTERNAL Upstream Status: RHEL only Up until now, if we rename the spec package name or bump the rhel major or minor versions, we used to copy the previous changelog file if it exists into the new one. However, this makes the changelog grow indefinitely since a stream start, and it starts to get very big. We do not need to keep the entire history at each new changelog file, because eg. in a stream life, we always keep the older changelog files in the git tree. Thus, instead of copying the old changelog, just create a new empty file. This also makes sure we trim the rpm changelog at each new minor release, since it's used as the source of the rpm package changelog content. And that's another intention with this change: to avoid having the rpm changelog contents to grow too big, as reported by Brian Masney. There was also a case where if we are starting a stream or changing the package name, and there is no old changelog file available, we copied a kernel.changelog* if it existed. But looks like this case we should also do the same and trim it to start fresh, the old changelog file can be kept if wanted in the tree for reference and we don't necessarily need to copy all entries from the old changelog. With this there is some simplification as well and we can remove the CHANGELOG_PREV_EXT variable. Reported-by: Brian Masney <bmasney(a)redhat.com> Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com> --- redhat/self-test/data/centos-2585cf9dfaad.el7 | 1 - redhat/self-test/data/centos-2585cf9dfaad.fc25 | 1 - redhat/self-test/data/centos-78e36f3b0dae.el7 | 1 - redhat/self-test/data/centos-78e36f3b0dae.fc25 | 1 - redhat/self-test/data/centos-df0cc57e057f.el7 | 1 - redhat/self-test/data/centos-df0cc57e057f.fc25 | 1 - redhat/self-test/data/centos-fce15c45d3fb.el7 | 1 - redhat/self-test/data/centos-fce15c45d3fb.fc25 | 1 - redhat/self-test/data/fedora-2585cf9dfaad.el7 | 1 - redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 1 - redhat/self-test/data/fedora-78e36f3b0dae.el7 | 1 - redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 1 - redhat/self-test/data/fedora-df0cc57e057f.el7 | 1 - redhat/self-test/data/fedora-df0cc57e057f.fc25 | 1 - redhat/self-test/data/fedora-fce15c45d3fb.el7 | 1 - redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 1 - redhat/self-test/data/rhel-2585cf9dfaad.el7 | 1 - redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 1 - redhat/self-test/data/rhel-78e36f3b0dae.el7 | 1 - redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 1 - redhat/self-test/data/rhel-df0cc57e057f.el7 | 1 - redhat/self-test/data/rhel-df0cc57e057f.fc25 | 1 - redhat/self-test/data/rhel-fce15c45d3fb.el7 | 1 - redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 1 - redhat/Makefile | 12 ++++-------- redhat/kernel.spec.template | 4 +++- 26 files changed, 7 insertions(+), 33 deletions(-)

4 months, 1 week

3
8
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel December 2023