diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2026-06-30 15:55:43 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2026-06-30 15:55:43 +0300 |
| commit | 6d177908bad5992e17669030db41caab88041d5e (patch) | |
| tree | f63ef4b410e673db11865062558722c0d20b17b3 /scripts/package | |
| parent | c9ebe5d2f25729d6cfbbb1235d640bf67f9275df (diff) | |
| parent | dc59e4fea9d83f03bad6bddf3fa2e52491777482 (diff) | |
| download | linux-6d177908bad5992e17669030db41caab88041d5e.tar.gz linux-6d177908bad5992e17669030db41caab88041d5e.zip | |
Merge drm/drm-next into drm-intel-next
Sync with v7.2-rc1.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'scripts/package')
| -rw-r--r-- | scripts/package/PKGBUILD | 5 | ||||
| -rw-r--r-- | scripts/package/kernel.spec | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/scripts/package/PKGBUILD b/scripts/package/PKGBUILD index 452374d63c24..66e4b6a37783 100644 --- a/scripts/package/PKGBUILD +++ b/scripts/package/PKGBUILD @@ -10,7 +10,7 @@ for pkg in $_extrapackages; do pkgname+=("${pkgbase}-${pkg}") done -pkgver="${KERNELRELEASE//-/_}" +pkgver="$(echo "${KERNELRELEASE}" | sed 's/-\(rc[0-9]\+\)/\1/;s/-/_/g')" # The PKGBUILD is evaluated multiple times. # Running scripts/build-version from here would introduce inconsistencies. pkgrel="${KBUILD_REVISION}" @@ -121,6 +121,9 @@ _package-debug(){ install -Dt "${debugdir}" -m644 vmlinux mkdir -p "${builddir}" ln -sr "${debugdir}/vmlinux" "${builddir}/vmlinux" + + echo "Installing unstripped vDSO(s)..." + ${MAKE} INSTALL_MOD_PATH="${pkgdir}/usr" vdso_install } for _p in "${pkgname[@]}"; do diff --git a/scripts/package/kernel.spec b/scripts/package/kernel.spec index b3c956205af0..c732415662ef 100644 --- a/scripts/package/kernel.spec +++ b/scripts/package/kernel.spec @@ -6,7 +6,7 @@ Name: kernel Summary: The Linux Kernel Version: %(echo %{KERNELRELEASE} | sed -e 's/-/_/g') -Release: %{pkg_release} +Release: %{pkg_release}%{?dist} License: GPL Group: System Environment/Kernel Vendor: The Linux Community |