From d102419a3f33fc883cb3c38616be04a414e6796c Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Tue, 12 Sep 2023 18:36:28 +0530 Subject: [PATCH] fix /boot conflict with pkg filesystem --- kernel-collabora-tfg.spec | 2 +- kernel-lts-tfg.spec | 2 +- kernel-next-tfg.spec | 2 +- kernel-rc-tfg.spec | 2 +- kernel-stable-tfg.spec | 2 +- master.inc | 10 +++++----- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kernel-collabora-tfg.spec b/kernel-collabora-tfg.spec index 19670f7..6361905 100644 --- a/kernel-collabora-tfg.spec +++ b/kernel-collabora-tfg.spec @@ -1,6 +1,6 @@ # change version here %global fake_ver 1 -%global rel_ver 0 +%global rel_ver 1 %global commit_id b034abfca55f329be85c37a84768775c60f52885 %global short_commit_id b034abfc diff --git a/kernel-lts-tfg.spec b/kernel-lts-tfg.spec index 1489c9c..ac5d651 100644 --- a/kernel-lts-tfg.spec +++ b/kernel-lts-tfg.spec @@ -1,5 +1,5 @@ # change version here -%global rel_ver 0 +%global rel_ver 1 %global major_ver 6 %global minor_ver 1 %global patch_ver 52 diff --git a/kernel-next-tfg.spec b/kernel-next-tfg.spec index 131bddd..d94d500 100644 --- a/kernel-next-tfg.spec +++ b/kernel-next-tfg.spec @@ -1,5 +1,5 @@ # change version here -%global rel_ver 0 +%global rel_ver 1 %global next_snapshot_date 20230911 Name: kernel-next-tfg diff --git a/kernel-rc-tfg.spec b/kernel-rc-tfg.spec index 330b78f..002f65f 100644 --- a/kernel-rc-tfg.spec +++ b/kernel-rc-tfg.spec @@ -1,5 +1,5 @@ # change version here -%global rel_ver 0 +%global rel_ver 1 %global major_ver 6 %global minor_ver 6 %global rc_ver 1 diff --git a/kernel-stable-tfg.spec b/kernel-stable-tfg.spec index 542d7e4..8acc244 100644 --- a/kernel-stable-tfg.spec +++ b/kernel-stable-tfg.spec @@ -1,5 +1,5 @@ # change version here -%global rel_ver 0 +%global rel_ver 1 %global major_ver 6 %global minor_ver 5 %global patch_ver 2 diff --git a/master.inc b/master.inc index 1c2789d..1e3a9d4 100644 --- a/master.inc +++ b/master.inc @@ -172,13 +172,13 @@ if [ -x /sbin/update-bootloader ]; then /sbin/update-bootloader --remove %{KVERREL} fi -%files -%defattr (-, root, root) -/boot -/lib/modules/%{KVERREL} - %files headers /usr/include %files devel /usr/src/kernels/%{KVERREL} + +%files +%defattr (-, root, root) +/lib/modules/%{KVERREL} +/boot/*