cce2db1c9f
* prepare: always patch RPM mkspec Like this we can notice earlier if it doesn't apply any longer Otherwise I only test RPM when issues get openned * RPM: fix RPM mkspecp atch, thanks @W3sG for the heads up! - Only part of the patch was applying - Fixed also the fact that packages conflict because of unneeded build-id files in /usr/lib/.build-id - Removed all the hardening flags Fedora uses by default "we do not do that here" Fixes: #669 #609 * install.sh: uninstall-help: fix Fedora query for installed TKG packages * install.sh: RPM: fix typo in variable Used the non absolute path for the work folder x)
54 lines
2.0 KiB
Diff
54 lines
2.0 KiB
Diff
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
|
|
index 70392fd2f..34f98648f 100755
|
|
--- a/scripts/package/mkspec
|
|
+++ b/scripts/package/mkspec
|
|
@@ -25,7 +25,7 @@ fi
|
|
|
|
+PROVIDES_DRM=""
|
|
if grep -q CONFIG_DRM=y .config; then
|
|
- PROVIDES=kernel-drm
|
|
+ PROVIDES_DRM="Provides: kernel-drm = %{version}"
|
|
fi
|
|
|
|
-PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
|
|
__KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
|
|
@@ -50,3 +50,6 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
|
|
$S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
- Provides: $PROVIDES
|
|
+ $PROVIDES_DRM
|
|
+ Provides: kernel = %{version}
|
|
+ Provides: kernel-uname-r = %{version}
|
|
+ Provides: installonlypkg(kernel) = %{version}
|
|
# $UTS_MACHINE as a fallback of _arch in case
|
|
@@ -63,4 +66,4 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz
|
|
Group: Development/System
|
|
- Obsoletes: kernel-headers
|
|
Provides: kernel-headers = %{version}
|
|
+ Provides: installonlypkg(kernel) = %{version}
|
|
%description headers
|
|
@@ -75,2 +78,5 @@ $S$M Summary: Development package for building kernel modules to match the $__KE
|
|
$S$M Group: System Environment/Kernel
|
|
+$S$M Provides: kernel-devel = %{version}
|
|
+$S$M Provides: kernel-devel-uname-r = %{version}
|
|
+$S$M Provides: installonlypkg(kernel) = %{version}
|
|
$S$M AutoReqProv: no
|
|
@@ -80,2 +86,18 @@ $S$M against the $__KERNELRELEASE kernel package.
|
|
$S$M
|
|
+$S # Opt out of a lot of Fedora hardening flags etc...
|
|
+$S # See https://src.fedoraproject.org/rpms/redhat-rpm-config//blob/rawhide/f/buildflags.md
|
|
+$S %undefine _package_note_file
|
|
+$S %undefine _auto_set_build_flags
|
|
+$S %undefine _include_frame_pointers
|
|
+$S %define _build_id_flags -Wl,--build-id=none
|
|
+$S %undefine _annotated_build
|
|
+$S %undefine _fortify_level
|
|
+$S %undefine _hardened_build
|
|
+$S %global _lto_cflags %{nil}
|
|
+$S %global _configure_gnuconfig_hack 0
|
|
+$S %global _configure_libtool_hardening_hack 0
|
|
+$S # Nearly had to go to the deep web to find documentation on this one... Gosh
|
|
+$S # See https://github.com/rpm-software-management/rpm/blob/master/macros.in#L471
|
|
+$S %define _build_id_links none
|
|
+$S
|
|
$S %prep
|