From: masneyb on gitlab.com
This merge request contains two patches from the RHEL kernel:
- One to fix the 'make scripts' functionality in the kernel-devel package. Once the patch https://src.fedoraproject.org/rpms/kernel/c/a443 bcbf915cc5797ae3d950ee6c26b71e57e92e?branch=master is merged into the ARK kernel, then 'make scripts' will work properly.
- A minor patch to fix the help text for rh-cross-<arch>-rpms in 'make rh-full-help'
I didn't make these separate merge requests to avoid conflicts between the two patches since both touch the spec file.
Signed-off-by: Brian Masney bmasney@redhat.com
From: Brian Masney bmasney@redhat.com
Upstream status: RHEL only
Running 'make scripts' in /usr/src/kernels/$VERSION triggers the following error:
scripts/selinux/genheaders/genheaders.c:19:10: fatal error: classmap.h: No such file or directory
Let's fix that by including the necessary two files from the directory security/selinux/include/ in the kernel-devel package. Once those files are added, another error is triggered:
scripts/sortextable.c:31:10: fatal error: tools/be_byteshift.h: No such file or directory
Let's correct that error by adding two more files from tools/include/ to the kernel-devel package as well. This will get 'make scripts' working.
This change adds 20K (before compression) to the kernel-devel package.
Signed-off-by: Brian Masney bmasney@redhat.com --- redhat/kernel.spec.template | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index 836fe8cb6af9..1c8c99e2fbac 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -1601,6 +1601,15 @@ BuildKernel() { cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/tracing rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/spdxcheck.py + + # Files for 'make scripts' to succeed with kernel-devel. + mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/security/selinux/include + cp -a --parents security/selinux/include/classmap.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + cp -a --parents security/selinux/include/initial_sid_to_string.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools/include/tools + cp -a --parents tools/include/tools/be_byteshift.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + cp -a --parents tools/include/tools/le_byteshift.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + if [ -f tools/objtool/objtool ]; then cp -a tools/objtool/objtool $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools/objtool/ || : fi
From: Brian Masney bmasney@redhat.com
Upstream Status: RHEL only
The rh-full-help target shows the target rh-cross-<arch>-rpm, however it's really rh-cross-<arch>-rpms. Let's go ahead and correct the help text.
Signed-off-by: Brian Masney bmasney@redhat.com --- redhat/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/redhat/Makefile b/redhat/Makefile index 0118e5b9e2e9..ddf1a0f1b9d8 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -422,7 +422,7 @@ rh-full-help: $$(sed -n 's/.*--target ([^ ]*).*/\1/p' Makefile.cross | sort -u) @echo ' rh-cross-all-rpms - [x86_64 only] execute rpm builds for all supported' @echo ' archs using RHEL cross compiler.' - @echo ' rh-cross-<arch>-rpm - [x86_64 only] execute rpm builds for specified' + @echo ' rh-cross-<arch>-rpms - [x86_64 only] execute rpm builds for specified' @echo ' <arch> using RHEL cross compiler.' @echo ' See rh-cross-<arch>-build for the supported archs.'
On Tue, May 19, 2020 at 06:35:37PM -0000, GitLab Bridge on behalf of masneyb wrote:
From: Brian Masney bmasney@redhat.com
Upstream Status: RHEL only
The rh-full-help target shows the target rh-cross-<arch>-rpm, however it's really rh-cross-<arch>-rpms. Let's go ahead and correct the help text.
Justin just merged Prarit's patch which changes all 'rh-' stuff to 'dist-'. Can you fetch and rebase on top of that?
Cheers, Don
Signed-off-by: Brian Masney bmasney@redhat.com
redhat/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/redhat/Makefile b/redhat/Makefile index 0118e5b9e2e9..ddf1a0f1b9d8 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -422,7 +422,7 @@ rh-full-help: $$(sed -n 's/.*--target ([^ ]*).*/\1/p' Makefile.cross | sort -u) @echo ' rh-cross-all-rpms - [x86_64 only] execute rpm builds for all supported' @echo ' archs using RHEL cross compiler.'
- @echo ' rh-cross-<arch>-rpm - [x86_64 only] execute rpm builds for specified'
- @echo ' rh-cross-<arch>-rpms - [x86_64 only] execute rpm builds for specified' @echo ' <arch> using RHEL cross compiler.' @echo ' See rh-cross-<arch>-build for the supported archs.'
-- 2.26.2 _______________________________________________ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-leave@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
From: masneyb on gitlab.com
This merge request contains two patches from the RHEL kernel:
- One to fix the 'make scripts' functionality in the kernel-devel package. Once the patch https://src.fedoraproject.org/rpms/kernel/c/a443 bcbf915cc5797ae3d950ee6c26b71e57e92e?branch=master is merged into the ARK kernel, then 'make scripts' will work properly.
- A minor patch to fix the help text for rh-cross-<arch>-rpms in 'make rh-full-help'
I didn't make these separate merge requests to avoid conflicts between the two patches since both touch the spec file.
Signed-off-by: Brian Masney bmasney@redhat.com
From: Brian Masney bmasney@redhat.com
Upstream Status: RHEL only
The dist-full-help target shows the target dist-cross-<arch>-rpm, however it's really dist-cross-<arch>-rpms. Let's go ahead and correct the help text.
Signed-off-by: Brian Masney bmasney@redhat.com --- redhat/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/redhat/Makefile b/redhat/Makefile index 1465469cab95..1324ae7f2d7e 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -431,7 +431,7 @@ dist-full-help: $$(sed -n 's/.*--target ([^ ]*).*/\1/p' Makefile.cross | sort -u) @echo ' dist-cross-all-rpms - [x86_64 only] execute rpm builds for all supported' @echo ' archs using RHEL cross compiler.' - @echo ' dist-cross-<arch>-rpm - [x86_64 only] execute rpm builds for specified' + @echo ' dist-cross-<arch>-rpms - [x86_64 only] execute rpm builds for specified' @echo ' <arch> using RHEL cross compiler.' @echo ' See dist-cross-<arch>-build for the supported archs.'
From: Brian Masney bmasney@redhat.com
Upstream status: RHEL only
Running 'make scripts' in /usr/src/kernels/$VERSION triggers the following error:
scripts/selinux/genheaders/genheaders.c:19:10: fatal error: classmap.h: No such file or directory
Let's fix that by including the necessary two files from the directory security/selinux/include/ in the kernel-devel package. Once those files are added, another error is triggered:
scripts/sortextable.c:31:10: fatal error: tools/be_byteshift.h: No such file or directory
Let's correct that error by adding two more files from tools/include/ to the kernel-devel package as well. This will get 'make scripts' working.
This change adds 20K (before compression) to the kernel-devel package.
Signed-off-by: Brian Masney bmasney@redhat.com --- redhat/kernel.spec.template | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index 836fe8cb6af9..1c8c99e2fbac 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -1601,6 +1601,15 @@ BuildKernel() { cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/tracing rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/spdxcheck.py + + # Files for 'make scripts' to succeed with kernel-devel. + mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/security/selinux/include + cp -a --parents security/selinux/include/classmap.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + cp -a --parents security/selinux/include/initial_sid_to_string.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools/include/tools + cp -a --parents tools/include/tools/be_byteshift.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + cp -a --parents tools/include/tools/le_byteshift.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + if [ -f tools/objtool/objtool ]; then cp -a tools/objtool/objtool $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools/objtool/ || : fi
----- Original Message -----
From: masneyb on gitlab.com
This merge request contains two patches from the RHEL kernel:
- One to fix the 'make scripts' functionality in the kernel-devel
package. Once the patch https://src.fedoraproject.org/rpms/kernel/c/a443 bcbf915cc5797ae3d950ee6c26b71e57e92e?branch=master is merged into the ARK kernel, then 'make scripts' will work properly.
- A minor patch to fix the help text for rh-cross-<arch>-rpms in 'make
rh-full-help'
I didn't make these separate merge requests to avoid conflicts between the two patches since both touch the spec file.
Signed-off-by: Brian Masney bmasney@redhat.com
Acked-by: Jan Stancek jstancek@redhat.com
This should fix: https://bugzilla.redhat.com/show_bug.cgi?id=1758710 https://bugzilla.redhat.com/show_bug.cgi?id=1821365 https://bugzilla.redhat.com/show_bug.cgi?id=1821946
On Tue, May 19, 2020 at 07:35:30PM -0000, GitLab Bridge on behalf of masneyb wrote:
From: masneyb on gitlab.com
This merge request contains two patches from the RHEL kernel:
- One to fix the 'make scripts' functionality in the kernel-devel
package. Once the patch https://src.fedoraproject.org/rpms/kernel/c/a443 bcbf915cc5797ae3d950ee6c26b71e57e92e?branch=master is merged into the ARK kernel, then 'make scripts' will work properly.
- A minor patch to fix the help text for rh-cross-<arch>-rpms in 'make
rh-full-help'
I didn't make these separate merge requests to avoid conflicts between the two patches since both touch the spec file.
Acked-by: Don Zickus dzickus@redhat.com
Signed-off-by: Brian Masney bmasney@redhat.com _______________________________________________ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-leave@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
On Tue, May 19, 2020 at 07:35:30PM -0000, GitLab Bridge on behalf of masneyb wrote:
From: masneyb on gitlab.com
This merge request contains two patches from the RHEL kernel:
- One to fix the 'make scripts' functionality in the kernel-devel
package. Once the patch https://src.fedoraproject.org/rpms/kernel/c/a443 bcbf915cc5797ae3d950ee6c26b71e57e92e?branch=master is merged into the ARK kernel, then 'make scripts' will work properly.
- A minor patch to fix the help text for rh-cross-<arch>-rpms in 'make
rh-full-help'
I didn't make these separate merge requests to avoid conflicts between the two patches since both touch the spec file.
Signed-off-by: Brian Masney bmasney@redhat.com _______________________________________________ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-leave@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Acked-by: Herton R. Krzesinski herton@redhat.com
kernel@lists.fedoraproject.org
-
Don Zickus -
GitLab Bridge on behalf of masneyb -
Herton R. Krzesinski -
Jan Stancek