Merge branch 'feature/pkg-deb' into feature/pkg-fedora
This commit is contained in:
commit
dd6eba9afd
9
.github/workflows/release.yml
vendored
9
.github/workflows/release.yml
vendored
|
@ -81,7 +81,7 @@ jobs:
|
||||||
apt-get -y install build-essential fakeroot rsync git wget python3-debian dpkg-sig lz4
|
apt-get -y install build-essential fakeroot rsync git wget python3-debian dpkg-sig lz4
|
||||||
apt-get -y build-dep linux
|
apt-get -y build-dep linux
|
||||||
|
|
||||||
- name: Fetch kernel source
|
- name: Prepare kernel source
|
||||||
env:
|
env:
|
||||||
KERNEL_VERSION: 5.4.13
|
KERNEL_VERSION: 5.4.13
|
||||||
run: |
|
run: |
|
||||||
|
@ -90,13 +90,8 @@ jobs:
|
||||||
# download sources
|
# download sources
|
||||||
wget https://cdn.kernel.org/pub/linux/kernel/v${KERNEL_VERSION%%.*}.x/linux-$KERNEL_VERSION.tar.xz
|
wget https://cdn.kernel.org/pub/linux/kernel/v${KERNEL_VERSION%%.*}.x/linux-$KERNEL_VERSION.tar.xz
|
||||||
tar xf linux-$KERNEL_VERSION.tar.xz
|
tar xf linux-$KERNEL_VERSION.tar.xz
|
||||||
mv linux-$KERNEL_VERSION linux
|
|
||||||
|
|
||||||
- name: Apply patches
|
mv linux-$KERNEL_VERSION linux && cd linux
|
||||||
env:
|
|
||||||
KERNEL_VERSION: 5.4.13
|
|
||||||
run: |
|
|
||||||
cd pkg/debian/linux
|
|
||||||
|
|
||||||
# apply build patches
|
# apply build patches
|
||||||
for PATCH in ../*.patch; do patch -p1 < ${PATCH}; done
|
for PATCH in ../*.patch; do patch -p1 < ${PATCH}; done
|
||||||
|
|
|
@ -3,6 +3,14 @@ From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||||
Date: Sun, 19 Jan 2020 22:50:24 +0100
|
Date: Sun, 19 Jan 2020 22:50:24 +0100
|
||||||
Subject: [PATCH] Version changes for linux-surface debian package
|
Subject: [PATCH] Version changes for linux-surface debian package
|
||||||
|
|
||||||
|
Rename debian kernel packages so that they do not contain the full version
|
||||||
|
in the name any more as this allows automated updates via a package
|
||||||
|
repository. Instead the package name now only contains the $LOCALVERSION
|
||||||
|
string.
|
||||||
|
|
||||||
|
Also rename libc-dev to allow multiple versions to co-exist in the same
|
||||||
|
repository.
|
||||||
|
|
||||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||||
---
|
---
|
||||||
scripts/package/builddeb | 7 ++++---
|
scripts/package/builddeb | 7 ++++---
|
||||||
|
|
5
pkg/fedora/kernel-surface/fedora.config
Normal file
5
pkg/fedora/kernel-surface/fedora.config
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
#
|
||||||
|
# Forcefully disable debug symbols
|
||||||
|
#
|
||||||
|
|
||||||
|
# CONFIG_DEBUG_INFO is not set
|
|
@ -72,9 +72,10 @@ BuildConflicts: rhbuildsys(DiskFree) < 500Mb
|
||||||
|
|
||||||
Source0: %{fedora_source}/snapshot/fedora-%{kernel_tag}.tar.gz
|
Source0: %{fedora_source}/snapshot/fedora-%{kernel_tag}.tar.gz
|
||||||
Source1: %{config_source}/%{kernel_patches}/surface.config
|
Source1: %{config_source}/%{kernel_patches}/surface.config
|
||||||
|
Source2: fedora.config
|
||||||
|
|
||||||
Source2: %{sb_crt}
|
Source20: %{sb_crt}
|
||||||
Source3: %{sb_key}
|
Source21: %{sb_key}
|
||||||
|
|
||||||
Source100: mod-sign.sh
|
Source100: mod-sign.sh
|
||||||
Source101: parallel_xz.sh
|
Source101: parallel_xz.sh
|
||||||
|
@ -114,15 +115,16 @@ against the kernel-surface package.
|
||||||
|
|
||||||
scripts/kconfig/merge_config.sh \
|
scripts/kconfig/merge_config.sh \
|
||||||
fedora/configs/%{kernel_config} \
|
fedora/configs/%{kernel_config} \
|
||||||
%{SOURCE1}
|
%{SOURCE1} \
|
||||||
|
%{SOURCE2}
|
||||||
|
|
||||||
echo $((%{kernel_release} - 1)) > .version
|
echo $((%{kernel_release} - 1)) > .version
|
||||||
|
|
||||||
# Copy secureboot certificates if they are available
|
# Copy secureboot certificates if they are available
|
||||||
if [ -f "%{SOURCE2}" ] && [ -f "%{SOURCE3}" ]; then
|
if [ -f "%{SOURCE20}" ] && [ -f "%{SOURCE21}" ]; then
|
||||||
mkdir -p keys
|
mkdir -p keys
|
||||||
cp %{SOURCE2} keys/MOK.crt
|
cp %{SOURCE20} keys/MOK.crt
|
||||||
cp %{SOURCE3} keys/MOK.key
|
cp %{SOURCE21} keys/MOK.key
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# This Prevents scripts/setlocalversion from mucking with our version numbers.
|
# This Prevents scripts/setlocalversion from mucking with our version numbers.
|
||||||
|
|
Loading…
Reference in a new issue