From d8d7d10289493a750931f7bdd4a7d1e95020f799 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 28 Nov 2022 15:40:37 +0000 Subject: [PATCH] kernel: Enable support for btrfs Signed-off-by: Michael Tremer --- kernel/config-generic | 2 +- kernel/kernel.nm | 159 ++++++++------------------------------- kernel/scripts/configure | 0 3 files changed, 34 insertions(+), 127 deletions(-) mode change 100755 => 100644 kernel/scripts/configure diff --git a/kernel/config-generic b/kernel/config-generic index 1e1bc8e52..fff96d76c 100644 --- a/kernel/config-generic +++ b/kernel/config-generic @@ -5796,7 +5796,7 @@ CONFIG_XFS_ONLINE_REPAIR=y # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set -# CONFIG_BTRFS_FS is not set +CONFIG_BTRFS_FS=y # CONFIG_NILFS2_FS is not set # CONFIG_F2FS_FS is not set CONFIG_FS_POSIX_ACL=y diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 4a7434d15..683982528 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -4,8 +4,8 @@ ############################################################################### name = kernel -version = 5.3.8 -release = 0.1 +version = 6.0.6 +release = 0.2 thisapp = linux-%{version} maintainer = Arne Fitzenreiter @@ -25,7 +25,7 @@ end localversion = %{release}.%{DISTRO_DISTTAG}.%{DISTRO_ARCH} fullver = %{version}-%{localversion} -source_dl = http://www.kernel.org/pub/linux/kernel/v5.x/ +source_dl = https://www.kernel.org/pub/linux/kernel/v6.x/ sources = %{thisapp}.tar.xz build @@ -60,41 +60,15 @@ build %{kernel_logo} end - # A list of kernels to build. - kernels = - kernel_arch = %{DISTRO_PLATFORM} kernel_target = bzImage kernel_image = arch/%{kernel_arch}/boot/%{kernel_target} - if "%{DISTRO_ARCH}" == "x86_64" - build_kernel_default = 1 - end - if "%{DISTRO_ARCH}" == "aarch64" - build_kernel_default = 1 - kernel_arch = arm64 kernel_target = Image.gz end - if "%{DISTRO_ARCH}" == "armv7hl" - # Build the default unified kernel. - build_kernel_default = 1 - - kernel_target = zImage - end - - # mkimage is a requirement to build uImage images. - if "%{kernel_target}" == "uImage" - requires += u-boot-tools - end - - # Build default kernel. - if "%{build_kernel_default}" == "1" - kernels += default - end - prepare_cmds # Disable the colorize plugin. # It's generally very nice but it clutters our @@ -126,15 +100,13 @@ build suffix="-${flavour}" fi - scripts/configure --kernel-dir=%{DIR_APP} \ + bash scripts/configure --kernel-dir=%{DIR_APP} \ merge %{DISTRO_ARCH} ${flavour} %{DIR_APP}/configs/config.${flavour} } # Generate configuration files for all kernels we are going to # build. - for kernel in %{kernels}; do - configure_kernel ${kernel} - done + configure_kernel "default" end build @@ -167,7 +139,7 @@ build # Compile Flattened Device Tree database case "${DISTRO_ARCH}" in - aarch64|arm*) + aarch64) make ARCH=%{kernel_arch} dtbs mkdir -pv %{BUILDROOT}/boot/dtb-${fullversion} @@ -246,9 +218,8 @@ build rm -rf %{BUILDROOT}/usr/src/kernels/*/scripts/dtc } - for kernel in %{kernels}; do - build_kernel ${kernel} - done + # Build the kernel + build_kernel "default" # cpupower chmod +x tools/power/cpupower/utils/version-gen.sh @@ -294,18 +265,24 @@ build end packages - template KERNEL - kernel_name = kernel - kernel_release = %{fullver} + package kernel-tools + summary = Assortment of tools for the Linux kernel. + description = %{summary} - summary = The Linux kernel %{kernel_release}. + filter_requires + perl>=[0-9]\:.* + end + end + + package kernel + summary = The Linux kernel %{fullver} prerequires /sbin/depmod end provides - kernel=%{kernel_release} + kernel = %{fullver} end requires @@ -316,15 +293,15 @@ packages end files - /boot/System.map-%{kernel_release} - /boot/dtb-%{kernel_release} - /boot/vmlinuz-%{kernel_release} - /boot/initramfs-%{kernel_release}.img - /usr/lib/modules/%{kernel_release} + /boot/System.map-%{fullver} + /boot/dtb-%{fullver} + /boot/vmlinuz-%{fullver} + /boot/initramfs-%{fullver}.img + /usr/lib/modules/%{fullver} end _posttrans - kernel-updater install %{kernel_release} + kernel-updater install %{fullver} end script posttransin @@ -336,19 +313,17 @@ packages end script postun - kernel-updater uninstall %{kernel_release} + kernel-updater uninstall %{fullver} end end - template KERNELDEVEL - kernel_release = %{fullver} - - summary = Development files of kernel-%{kernel_release}. + package kernel-devel + summary = Development files of kernel-%{fullver} description %{summary} Install this package in order to compile modules for - kernel release %{kernel_release}. + kernel release %{fullver}. end provides @@ -360,86 +335,18 @@ packages end files - /usr/lib/modules/%{kernel_release}/build - /usr/lib/modules/%{kernel_release}/source - /usr/src/kernels/%{kernel_release} - end - end - - if "%{build_kernel_default}" == "1" - if "%{DISTRO_ARCH}" == "armv7hl" - package kernel - template KERNEL - - kernel_name = kernel - kernel_release = %{fullver} - - # Replace the Exynos kernel. - obsoletes += kernel-exynos < %{kernel_release} - conflicts += kernel-exynos < %{kernel_release} - - # Replace the OMAP kernel. - obsoletes += kernel-omap < %{kernel_release} - conflicts += kernel-omap < %{kernel_release} - end - - package kernel-devel - template KERNELDEVEL - - kernel_name = kernel - kernel_release = %{fullver} - - # Replace the Exynos kernel. - obsoletes += kernel-exynos-devel < %{kernel_release} - conflicts += kernel-exynos-devel < %{kernel_release} - - # Replace the OMAP kernel. - obsoletes += kernel-omap-devel < %{kernel_release} - conflicts += kernel-omap-devel < %{kernel_release} - end - - else - package kernel - template KERNEL - - kernel_name = kernel - kernel_release = %{fullver} - end - - package kernel-devel - template KERNELDEVEL - - kernel_name = kernel - kernel_release = %{fullver} - end + /usr/lib/modules/%{fullver}/build + /usr/lib/modules/%{fullver}/source + /usr/src/kernels/%{fullver} end end package kernel-headers - summary = Header files of the kernel release %{fullver}. + summary = Header files of the kernel release %{fullver} desciption = %{summary} files /usr/include end end - - package kernel-tools - summary = Assortment of tools for the Linux kernel. - description = %{summary} - - filter_requires - perl>=[0-9]\:.* - end - - files - / - !/boot - !/usr/include - !/usr/lib/modules - !/usr/src - !/usr/src/debug - !/usr/lib/debug - end - end end diff --git a/kernel/scripts/configure b/kernel/scripts/configure old mode 100755 new mode 100644 -- 2.39.5