From 4e37f01a4569914c2a4d13e32ad37e8f040a342e Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 30 Jul 2023 18:05:31 +0800 Subject: [PATCH] kernel-config: Do not include kernel version in every generated file This is stupid and it will cause meaningless diffs in version control (like this commit does :( ). Remove the kernel version from the generated XML files. Add kernel.version file into git to track the kernel version. --- kernel-config/.gitignore | 1 - kernel-config/kernel-config.py | 2 +- kernel-config/kernel.version | 1 + postlfs/filesystems/btrfs-progs-kernel.xml | 2 +- postlfs/filesystems/btrfs-progs-test-kernel.xml | 2 +- postlfs/filesystems/dosfstools-kernel.xml | 2 +- postlfs/filesystems/fuse-kernel.xml | 2 +- postlfs/filesystems/fuse-test-kernel.xml | 2 +- postlfs/filesystems/jfs-kernel.xml | 2 +- postlfs/filesystems/lvm2-kernel.xml | 2 +- postlfs/filesystems/mdadm-kernel.xml | 2 +- postlfs/filesystems/ntfs-3g-kernel.xml | 2 +- postlfs/filesystems/ntfs3-kernel.xml | 2 +- postlfs/filesystems/parted-test-kernel.xml | 2 +- postlfs/filesystems/reiser-kernel.xml | 2 +- postlfs/filesystems/uefi-bootloaders/grub-setup-kernel.xml | 2 +- postlfs/filesystems/xfsprogs-kernel.xml | 2 +- x/installing/libevdev-kernel.xml | 2 +- x/installing/libevdev-test-kernel.xml | 2 +- x/installing/mesa-kernel.xml | 2 +- x/installing/x7driver-wacom-kernel.xml | 2 +- x/installing/xorg-server-kernel.xml | 2 +- x/installing/xorg-server-simpledrm-kernel.xml | 2 +- 23 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 kernel-config/kernel.version diff --git a/kernel-config/.gitignore b/kernel-config/.gitignore index ba1ef6e068..e22d2c3a4f 100644 --- a/kernel-config/.gitignore +++ b/kernel-config/.gitignore @@ -1,3 +1,2 @@ __pycache__ s-kernel-version -kernel.version diff --git a/kernel-config/kernel-config.py b/kernel-config/kernel-config.py index 797029fb01..63fd9f112d 100755 --- a/kernel-config/kernel-config.py +++ b/kernel-config/kernel-config.py @@ -245,6 +245,6 @@ kver = kernel_version.kernel_version(path) print(''' ''') -print('') print('' + '\n'.join(buf) + '') diff --git a/kernel-config/kernel.version b/kernel-config/kernel.version new file mode 100644 index 0000000000..3c43d71599 --- /dev/null +++ b/kernel-config/kernel.version @@ -0,0 +1 @@ +6.4.7 diff --git a/postlfs/filesystems/btrfs-progs-kernel.xml b/postlfs/filesystems/btrfs-progs-kernel.xml index bc7ef4b83e..9f4c3be84b 100644 --- a/postlfs/filesystems/btrfs-progs-kernel.xml +++ b/postlfs/filesystems/btrfs-progs-kernel.xml @@ -1,7 +1,7 @@ - File systems ---> <*/M> Btrfs filesystem support [BTRFS_FS] diff --git a/postlfs/filesystems/btrfs-progs-test-kernel.xml b/postlfs/filesystems/btrfs-progs-test-kernel.xml index 2bb9a1f6ed..b9f034794a 100644 --- a/postlfs/filesystems/btrfs-progs-test-kernel.xml +++ b/postlfs/filesystems/btrfs-progs-test-kernel.xml @@ -1,7 +1,7 @@ - File systems ---> <*/M> Reiserfs support (deprecated) [REISERFS_FS] diff --git a/postlfs/filesystems/dosfstools-kernel.xml b/postlfs/filesystems/dosfstools-kernel.xml index 558bb1e702..bb2f4c0aea 100644 --- a/postlfs/filesystems/dosfstools-kernel.xml +++ b/postlfs/filesystems/dosfstools-kernel.xml @@ -1,7 +1,7 @@ - File systems ---> DOS/FAT/EXFAT/NT Filesystems ---> diff --git a/postlfs/filesystems/fuse-kernel.xml b/postlfs/filesystems/fuse-kernel.xml index 938ff276f8..d4a6766238 100644 --- a/postlfs/filesystems/fuse-kernel.xml +++ b/postlfs/filesystems/fuse-kernel.xml @@ -1,7 +1,7 @@ - File systems ---> <*/M> FUSE (Filesystem in Userspace) support [FUSE_FS] diff --git a/postlfs/filesystems/fuse-test-kernel.xml b/postlfs/filesystems/fuse-test-kernel.xml index 64c3269124..cdf8f8c44c 100644 --- a/postlfs/filesystems/fuse-test-kernel.xml +++ b/postlfs/filesystems/fuse-test-kernel.xml @@ -1,7 +1,7 @@ - File systems ---> <*/M> FUSE (Filesystem in Userspace) support [FUSE_FS] diff --git a/postlfs/filesystems/jfs-kernel.xml b/postlfs/filesystems/jfs-kernel.xml index a8d5fbb11c..c96822eebd 100644 --- a/postlfs/filesystems/jfs-kernel.xml +++ b/postlfs/filesystems/jfs-kernel.xml @@ -1,7 +1,7 @@ - File systems ---> <*/M> JFS filesystem support [JFS_FS] diff --git a/postlfs/filesystems/lvm2-kernel.xml b/postlfs/filesystems/lvm2-kernel.xml index 8674b2a84a..be1a815552 100644 --- a/postlfs/filesystems/lvm2-kernel.xml +++ b/postlfs/filesystems/lvm2-kernel.xml @@ -1,7 +1,7 @@ - Device Drivers ---> <*/M> RAM block device support [BLK_DEV_RAM] diff --git a/postlfs/filesystems/mdadm-kernel.xml b/postlfs/filesystems/mdadm-kernel.xml index 14c5f39b4c..5a0dc55932 100644 --- a/postlfs/filesystems/mdadm-kernel.xml +++ b/postlfs/filesystems/mdadm-kernel.xml @@ -1,7 +1,7 @@ - Device Drivers ---> [*] Multiple devices driver support (RAID and LVM) ---> [MD] diff --git a/postlfs/filesystems/ntfs-3g-kernel.xml b/postlfs/filesystems/ntfs-3g-kernel.xml index 938ff276f8..d4a6766238 100644 --- a/postlfs/filesystems/ntfs-3g-kernel.xml +++ b/postlfs/filesystems/ntfs-3g-kernel.xml @@ -1,7 +1,7 @@ - File systems ---> <*/M> FUSE (Filesystem in Userspace) support [FUSE_FS] diff --git a/postlfs/filesystems/ntfs3-kernel.xml b/postlfs/filesystems/ntfs3-kernel.xml index 2041154330..7c1ae62b33 100644 --- a/postlfs/filesystems/ntfs3-kernel.xml +++ b/postlfs/filesystems/ntfs3-kernel.xml @@ -1,7 +1,7 @@ - File systems ---> DOS/FAT/EXFAT/NT Filesystems ---> diff --git a/postlfs/filesystems/parted-test-kernel.xml b/postlfs/filesystems/parted-test-kernel.xml index eef7832a8f..c6d56b20e9 100644 --- a/postlfs/filesystems/parted-test-kernel.xml +++ b/postlfs/filesystems/parted-test-kernel.xml @@ -1,7 +1,7 @@ - Device Drivers ---> SCSI device support ---> diff --git a/postlfs/filesystems/reiser-kernel.xml b/postlfs/filesystems/reiser-kernel.xml index b353978f48..e87dcb34ba 100644 --- a/postlfs/filesystems/reiser-kernel.xml +++ b/postlfs/filesystems/reiser-kernel.xml @@ -1,7 +1,7 @@ - File systems ---> <*/M> Reiserfs support (deprecated) [REISERFS_FS] diff --git a/postlfs/filesystems/uefi-bootloaders/grub-setup-kernel.xml b/postlfs/filesystems/uefi-bootloaders/grub-setup-kernel.xml index 242651c872..6c7a1b6f2a 100644 --- a/postlfs/filesystems/uefi-bootloaders/grub-setup-kernel.xml +++ b/postlfs/filesystems/uefi-bootloaders/grub-setup-kernel.xml @@ -1,7 +1,7 @@ - Processor type and features ---> [*] EFI runtime service support [EFI] diff --git a/postlfs/filesystems/xfsprogs-kernel.xml b/postlfs/filesystems/xfsprogs-kernel.xml index 8f1333c635..bd655126c9 100644 --- a/postlfs/filesystems/xfsprogs-kernel.xml +++ b/postlfs/filesystems/xfsprogs-kernel.xml @@ -1,7 +1,7 @@ - File systems ---> <*/M> XFS filesystem support [XFS_FS] diff --git a/x/installing/libevdev-kernel.xml b/x/installing/libevdev-kernel.xml index ec9fdb9e58..5bc016c20b 100644 --- a/x/installing/libevdev-kernel.xml +++ b/x/installing/libevdev-kernel.xml @@ -1,7 +1,7 @@ - Device Drivers ---> Input device support ---> diff --git a/x/installing/libevdev-test-kernel.xml b/x/installing/libevdev-test-kernel.xml index 883624f13b..61e297aa4e 100644 --- a/x/installing/libevdev-test-kernel.xml +++ b/x/installing/libevdev-test-kernel.xml @@ -1,7 +1,7 @@ - Device Drivers ---> Input device support ---> diff --git a/x/installing/mesa-kernel.xml b/x/installing/mesa-kernel.xml index 826a368e34..fbf892e5c3 100644 --- a/x/installing/mesa-kernel.xml +++ b/x/installing/mesa-kernel.xml @@ -1,7 +1,7 @@ - Device Drivers ---> Graphics support ---> diff --git a/x/installing/x7driver-wacom-kernel.xml b/x/installing/x7driver-wacom-kernel.xml index 2cdb393316..a30d503110 100644 --- a/x/installing/x7driver-wacom-kernel.xml +++ b/x/installing/x7driver-wacom-kernel.xml @@ -1,7 +1,7 @@ - Device Drivers ---> [*] HID bus support ---> [HID_SUPPORT] diff --git a/x/installing/xorg-server-kernel.xml b/x/installing/xorg-server-kernel.xml index 050378017f..9f5360ab97 100644 --- a/x/installing/xorg-server-kernel.xml +++ b/x/installing/xorg-server-kernel.xml @@ -1,7 +1,7 @@ - Device Drivers ---> Graphics support ---> diff --git a/x/installing/xorg-server-simpledrm-kernel.xml b/x/installing/xorg-server-simpledrm-kernel.xml index 426ce5130b..d9148be444 100644 --- a/x/installing/xorg-server-simpledrm-kernel.xml +++ b/x/installing/xorg-server-simpledrm-kernel.xml @@ -1,7 +1,7 @@ - Device Drivers ---> Firmware Drivers --->