diff options
| -rw-r--r-- | kernel.spec.template | 10 | ||||
| -rwxr-xr-x | scripts/prepare-kernel.sh | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/kernel.spec.template b/kernel.spec.template index cfd8719..4f98ac9 100644 --- a/kernel.spec.template +++ b/kernel.spec.template @@ -1,6 +1,6 @@ %global debug_package %{nil} -%define KNLVERS @knlvers@-%{release}.%{_target_cpu} +%define KNLVERS %{version}-%{release}.%{_target_cpu} %define RPMVERS %{version}-%{release} Name: kernel-@variant@ @@ -46,18 +46,18 @@ make -C build defconfig echo "CONFIG_LOCALVERSION=\"-%{release}.%{_target_cpu}\"" >> build/.config make -C build oldconfig -make -C build EXTRAVERSION="" %{?_smp_mflags} +make EXTRAVERSION="" \ + -C build %{?_smp_mflags} %install mkdir -p %{buildroot}/{boot,lib/modules} -make INSTALL_PATH=%{buildroot}/boot \ +make EXTRAVERSION="" \ + INSTALL_PATH=%{buildroot}/boot \ INSTALL_MOD_PATH=%{buildroot} \ INSTALL_HDR_PATH=%{buildroot}/usr \ - EXTRAVERSION="" \ INSTALLKERNEL=/bin/true \ -C build \ install modules_install headers_install -ls %{buildroot}/lib/modules # rename /boot files, add config mv %{buildroot}/boot/System.map \ diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh index 959764c..89c822c 100755 --- a/scripts/prepare-kernel.sh +++ b/scripts/prepare-kernel.sh @@ -3,14 +3,12 @@ tag="$(cd source; git describe)" echo "# git tag: ${tag}" version="${tag#v}" rpmvers="${version}" -knlvers="${version}" release="${BUILD_NUMBER}" case $version in 4.4.*) variant="lts404";; 4.9.*) variant="lts409";; 4.14.*) variant="lts414";; *-rc*) variant="candidate" - knlvers="${version%-*}.0" rpmvers="${version%-*}.0" release="0.${version#*-}.${release}" ;; |