From 68159864b57d035d1a5c3f5927e8ea80cd7cd4bc Mon Sep 17 00:00:00 2001 From: Xie XiuQi Date: Mon, 2 Nov 2020 14:24:11 +0800 Subject: [PATCH 1/4] kernel.spec: provide /boot/symvers-kernelver.gz even no kabichk Signed-off-by: Xie XiuQi --- kernel.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/kernel.spec b/kernel.spec index 60d9d9a..e311150 100644 --- a/kernel.spec +++ b/kernel.spec @@ -403,9 +403,7 @@ popd install -m 644 .config $RPM_BUILD_ROOT/boot/config-%{KernelVer} install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-%{KernelVer} -%if 0%{?with_kabichk} - gzip -c9 < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-%{KernelVer}.gz -%endif +gzip -c9 < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-%{KernelVer}.gz mkdir -p $RPM_BUILD_ROOT%{_sbindir} install -m 755 %{SOURCE200} $RPM_BUILD_ROOT%{_sbindir}/mkgrub-menu-%{devel_release}.sh @@ -721,9 +719,7 @@ fi %ifarch aarch64 /boot/dtb-* %endif -%if 0%{?with_kabichk} /boot/symvers-* -%endif /boot/System.map-* /boot/vmlinuz-* %ghost /boot/initramfs-%{KernelVer}.img From fce01de2d82ada68eb288f9353bbde46e2cd951b Mon Sep 17 00:00:00 2001 From: Xie XiuQi Date: Mon, 2 Nov 2020 17:36:17 +0800 Subject: [PATCH 2/4] report kernel source error Signed-off-by: Xie XiuQi --- kernel.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel.spec b/kernel.spec index e311150..61b4fe2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -220,8 +220,12 @@ fi cp -rl vanilla-%{TarballVer} linux-%{KernelVer} %else %setup -q -n kernel-%{version} -c -mv kernel linux-%{version} -cp -rl linux-%{version} linux-%{KernelVer} +if [ -d "kernel" ]; then + mv kernel linux-%{version} + cp -rl linux-%{version} linux-%{KernelVer} +else + echo "**** ERROR: no kernel source directory ****" +fi %endif cd linux-%{KernelVer} From 365978b2026df95c2373140c423d599b9b54bb8f Mon Sep 17 00:00:00 2001 From: Xie XiuQi Date: Fri, 6 Nov 2020 13:58:07 +0800 Subject: [PATCH 3/4] kernel.spec: remove /lib/modules/%{KernelVer} if empty when uninstall When uninstall kernel package, we meet this error message: "ls: cannot access '/lib/modules/5.10.0-xxx": No such file or directory" check directory before list directory contents. Signed-off-by: Xie XiuQi --- kernel.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index 61b4fe2..b3500bf 100644 --- a/kernel.spec +++ b/kernel.spec @@ -674,7 +674,9 @@ if [ -x %{_sbindir}/weak-modules ] then %{_sbindir}/weak-modules --remove-kernel %{KernelVer} || exit $? fi -if [ "`ls -A /lib/modules/%{KernelVer}`" = "" ]; then + +# remove empty directory +if [ -d /lib/modules/%{KernelVer} ] && [ "`ls -A /lib/modules/%{KernelVer}`" = "" ]; then rm -rf /lib/modules/%{KernelVer} fi From 5b8383e63d5b7543fffc930c8624c42d8f06c4ff Mon Sep 17 00:00:00 2001 From: Xie XiuQi Date: Mon, 2 Nov 2020 10:03:48 +0800 Subject: [PATCH 4/4] kernel.spec: release 5.10.0-2.0.0.3 rebase on top of v5.10-rc2. Signed-off-by: Xie XiuQi --- SOURCE | 2 +- kernel.spec | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/SOURCE b/SOURCE index 691b5da..3847bd6 100644 --- a/SOURCE +++ b/SOURCE @@ -1 +1 @@ -v5.10-rc1 +v5.10-rc2 diff --git a/kernel.spec b/kernel.spec index b3500bf..cbf7571 100644 --- a/kernel.spec +++ b/kernel.spec @@ -10,9 +10,9 @@ %global upstream_version 5.10 %global upstream_sublevel 0 -%global devel_release 1 +%global devel_release 2 %global maintenance_release .0.0 -%global pkg_release .2 +%global pkg_release .3 %define with_debuginfo 1 %define with_source 1 @@ -829,6 +829,11 @@ fi %endif %changelog +* Mon Nov 02 2020 Xie XiuQi - 5.10.0-2.0.0.3 +- rebase on top of v5.10-rc2 +- provide /boot/symvers-kernelver.gz even no kabichk +- fix warning on uninstall kernel rpm + * Sat Oct 31 2020 Xie XiuQi - 5.10.0-1.0.0.2 - enable access to .config through /proc/config.gz