Sync changes to SLFO-1.2 branch

cleanup_patch.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# clean up the patch via quilt again; run on linux-glibc-devel-6.4
+
+patchfile="$1"
+p="${patchfile##*/}"
+
+mkdir .pc
+echo "2" > .pc/.version
+mkdir patches
+quilt import -p1 "$patchfile"
+quilt push
+quilt refresh -p ab --no-index --no-timestamps --sort
+cp "patches/$p" "$patchfile"
+exit 0

install_all.sh

@@ -27,7 +27,7 @@ fi
 git clone --single-branch -b "$2" "$1" "$kernel_dir"
 date=$(git -C "$kernel_dir" cat-file -p "$2" | awk '/^tagger/ { print $(NF-1) }')
 date -d "@$date" || exit 1
-remove="arc csky hexagon microblaze nios2 openrisc sh xtensa um"
+remove="arc csky h8300 hexagon microblaze nds32 nios2 openrisc sh xtensa um"
 archs=$(cd "$kernel_dir/arch" &&
 	  for arch in *; do
 	    test -d $arch || continue

linux-glibc-devel-6.16.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:28a4a76691cd7eda3ced187e560f39a9b4ecc8d54ff59e6297e69655c612aacd
-size 1944768

linux-glibc-devel.changes

@@ -1,72 +1,41 @@
 -------------------------------------------------------------------
-Mon Jul 28 17:36:24 UTC 2025 - Andreas Schwab <schwab@suse.de>
+Sun Jun  8 07:52:23 UTC 2025 - Takashi Iwai <tiwai@suse.com>
 
-- Update to kernel headers 6.16
+- Update to SL-16.0 git branch based on 6.12 kernel (bsc#1244066)
 
 -------------------------------------------------------------------
-Wed Jun  4 11:55:43 UTC 2025 - Andreas Schwab <schwab@suse.de>
+Fri Mar 28 06:57:18 UTC 2025 - Bernhard Wiedemann <bwiedemann@suse.com>
 
-- Rewrite preinstall scriptlet in lua
+- Use %patch -P N instead of deprecated %patchN. (bsc#1240154)
 
 -------------------------------------------------------------------
-Mon May 26 07:37:31 UTC 2025 - Andreas Schwab <schwab@suse.de>
+Mon Feb  5 16:21:33 UTC 2024 - Takashi Iwai <tiwai@suse.com>
 
-- Update to kernel headers 6.15
+- Sync with the latest SLE15-SP6 kernel, as of commit 3a5699ce2499
-
+  (bsc#1217465): linux-glibc-devel-current.patch
--------------------------------------------------------------------
+  * EFI update (fate#316350)
-Tue Mar 25 11:36:47 UTC 2025 - Andreas Schwab <schwab@suse.de>
+  * amd/amdkfd updates (jsc#PED-3527 jsc#PED-5475 jsc#PED-6068 jsc#PED-6070 jsc#PED-6116 jsc#PED-6120 jsc#PED-5065 jsc#PED-5477 jsc#PED-5511 jsc#PED-6041 jsc#PED-6069 jsc#PED-6071)
-
+  * Sound updates (jsc#PED-6045 jsc#PED-6036 jsc#PED-6104 jsc#PED-6114 jsc#PED-6067 jsc#PED-6123)
-- Update to kernel headers 6.14
+  * UAPI fixes (bsc#1217382)
-
+  * IB updates (jsc#PED-6864)
--------------------------------------------------------------------
+  * KVM s390 updates (jsc#PED-5441)
-Tue Jan 21 08:31:24 UTC 2025 - Andreas Schwab <schwab@suse.de>
+  * RDMA updates (jsc#PED-7574 jsc#PED-6864)
-
+  * Block updates (bsc#1012628 jsc#PED-3545 bsc#1216436 bsc#1216435 bsc#1218003)
-- Update to kernel headers 6.13
+  * BPF updates (jsc#PED-6811)
-
+  * virtual/devlink updates (jsc#PED-3311 jsc#PED-7785 jsc#PED-5853 jsc#PED-5505)
--------------------------------------------------------------------
+  * DPLL updates (jsc#PED-6079)
-Mon Nov 18 18:20:00 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+  * FUSE fix (bsc#1012628)
-
+  * io_uring updates (bsc#1215211)
-- Add loongarch64 as new target
+  * MD fix (bnc#763402)
-
+  * Media fixes (bsc#1012628)
--------------------------------------------------------------------
+  * Net updates (jsc#PED-4876 jsc#PED-4860 jsc#PED-6079 jsc#PED-7574)
-Mon Nov 18 15:57:13 UTC 2024 - Andreas Schwab <schwab@suse.de>
+  * perf updates (jsc#PED-6012 jsc#PED-6121)
-
+  * Arm64 updates (jsc#PED-5458)
-- Update to kernel headers 6.12
+  * PowerPC updates (jsc#PED-4486 jsc#PED-5452)
-
+  * S390 updates (jsc#PED-6371 jsc#PED-3289 jsc#PED-5417 bsc#1218992)
--------------------------------------------------------------------
+  * X86 updates (jsc#PED-6018 bsc#1216611)
-Sun Sep 15 18:03:24 UTC 2024 - Andreas Schwab <schwab@suse.de>
+  * WiFi updates (jsc#PED-6081 jsc#PED-6130)
-
+- Add scripts to create a patch from kernel-source git tree
-- Update to kernel headers 6.11
-
--------------------------------------------------------------------
-Fri Jul 26 10:11:43 UTC 2024 - Andreas Schwab <schwab@suse.de>
-
-- Update to kernel headers 6.10
-
--------------------------------------------------------------------
-Mon May 13 08:16:15 UTC 2024 - Andreas Schwab <schwab@suse.de>
-
-- Update to kernel headers 6.9
-
--------------------------------------------------------------------
-Mon Mar 11 18:52:23 UTC 2024 - Andreas Schwab <schwab@suse.de>
-
-- Update to kernel headers 6.8
-
--------------------------------------------------------------------
-Thu Jan 11 19:11:15 UTC 2024 - Andreas Schwab <schwab@suse.de>
-
-- Update to kernel headers 6.7
-
--------------------------------------------------------------------
-Mon Oct 30 09:42:22 UTC 2023 - Andreas Schwab <schwab@suse.de>
-
-- Update to kernel headers 6.6
-
--------------------------------------------------------------------
-Wed Aug 30 12:38:32 UTC 2023 - Andreas Schwab <schwab@suse.de>
-
-- Update to kernel headers 6.5
 
 -------------------------------------------------------------------
 Mon Jun 26 08:03:11 UTC 2023 - Andreas Schwab <schwab@suse.de>

linux-glibc-devel.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package linux-glibc-devel
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           linux-glibc-devel
-Version:        6.16
+Version:        6.12
 Release:        0
 Summary:        Linux headers for userspace development
 License:        GPL-2.0-only
@@ -25,6 +25,9 @@ Group:          Development/Libraries/C and C++
 URL:            http://www.kernel.org/
 Source:         %{name}-%{version}.tar.xz
 Source1:        install_all.sh
+Source2:        make_diff.sh
+Source3:        cleanup_patch.sh
+Patch1:         %{name}-current.patch
 BuildRequires:  xz
 # rpm-build requires gettext-tools; ignore this, in order to shorten cycles (we have no translations)
 #!BuildIgnore:  gettext-tools
@@ -37,7 +40,7 @@ Obsoletes:      linux-kernel-headers < %{version}
 
 %{lua:
 function cross_archs()
-  return "aarch64", "arm", "hppa", "i386", "loongarch64", "m68k", "mips", "ppc64", "ppc64le", "riscv64", "s390x", "sparc", "sparc64", "x86_64"
+  return "aarch64", "arm", "hppa", "i386", "m68k", "mips", "ppc64", "ppc64le", "riscv64", "s390x", "sparc", "sparc64", "x86_64"
 end
 
 function kernel_arch(arch)
@@ -49,7 +52,6 @@ function kernel_arch(arch)
      ["i386"] = "x86",
      ["i586"] = "x86",
      ["i686"] = "x86",
-     ["loongarch64"] = "loongarch",
      ["ppc"] = "powerpc",
      ["ppc64"] = "powerpc",
      ["ppc64le"] = "powerpc",
@@ -83,19 +85,20 @@ packages, instead.
   for i,arch in ipairs({cross_archs()}) do
     print(rpm.expand([[
 
-%package -n cross-]]..arch..[[-%{name}
+%package -n cross-]]..arch..[[-linux-glibc-devel
 Summary:        Linux headers for ]]..arch..[[ userspace cross development
 Group:          Development/Libraries/C and C++
 BuildArch:      noarch
 
-%description -n cross-]]..arch..[[-%{name}
+%description -n cross-]]..arch..[[-linux-glibc-devel
 This package provides Linux kernel headers for ]]..arch..[[, the kernel API description
 required for compilation of almost all programs.
 ]]))
   end}
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n linux-glibc-devel-%{version}
+%patch -P 1 -p1
 
 %build
 for karch in *; do
@@ -162,9 +165,10 @@ cd ..
 ]]))
   end}
 
-%pre -p <lua>
+%pre
-link = "%{_includedir}/asm"
+if test -L %{_includedir}/asm; then
-if posix.readlink(link) then os.remove(link) end
+  rm -f %{_includedir}/asm
+fi
 
 %files
 %{_includedir}/*
@@ -173,7 +177,7 @@ if posix.readlink(link) then os.remove(link) end
   for i,arch in ipairs({cross_archs()}) do
     print(rpm.expand([[
 
-%files -n cross-]]..arch..[[-%{name}
+%files -n cross-]]..arch..[[-linux-glibc-devel
 %{_prefix}/]]..gcc_target(arch).."\n"))
   end}
 

make_diff.sh

@@ -0,0 +1,97 @@
+#!/bin/bash
+#
+# Create a patch file between the base version and the current kernel-source
+# Run on kernel-source.git repository:
+# % make_diff.sh /somewhere/linux-glibc-devel-6.4.tar.xz
+#
+
+set -e
+
+if [ -z "$1" ]; then
+    echo "usage: make_diff.sh base-tarball [patchfile]"
+    exit 1
+fi
+
+base="$1"
+case "$base" in
+  */linux-glibc-devel-*.tar.*)
+    ;;
+  *)
+    echo "Invalid base tarball $1"
+    exit 1;;
+esac
+if [ ! -f "$base" ]; then
+  echo "Invalid base tarball $base"
+  exit 1
+fi
+basever=${base##*/}
+basever=${basever%.tar.*}
+
+test -z "$SCRATCH_AREA" && export SCRATCH_AREA=/dev/shm/scratch
+mkdir -p $SCRATCH_AREA
+destdir="$SCRATCH_AREA/linux-glibc-devel"
+
+patchfile="$2"
+test -z "$patchfile" && patchfile=linux-glibc-devel-current.patch
+case "$patchfile" in
+  /*)
+    ;;
+  *)
+    patchfile="$PWD/$patchfile";;
+esac
+
+susecommit=$(git rev-parse HEAD)
+scripts/sequence-patch.sh --rapid --patch-dir "$destdir" || exit 1
+
+cd "$destdir" || exit 1
+kernel_dir="$PWD"
+header_dir="$PWD/linux-glibc-devel-current"
+mkdir -p "$header_dir"
+remove="arc csky h8300 hexagon microblaze nds32 nios2 openrisc sh xtensa um"
+archs=$(cd "$kernel_dir/arch" &&
+	  for arch in *; do
+	    test -d $arch || continue
+	    case " $remove " in *" $arch "*) continue;; esac
+	    echo $arch
+	  done)
+pushd "$kernel_dir"
+for arch in $archs; do
+  mkdir "$header_dir/$arch"
+  cp Makefile "$header_dir/$arch"
+  make O="$header_dir/$arch" headers_install ARCH=$arch
+done
+popd
+pushd "$header_dir"
+find -type f \( -name ".*.cmd" -o -name Makefile \) -exec rm -f {} +
+for arch in $archs; do
+  cd $arch
+  #-------------------------------------------------------------------
+  #Fri Sep  5 10:43:49 CEST 2008 - matz@suse.de
+
+  #- Remove the kernel version of drm headers, they conflict
+  #  with the libdrm ones, and those are slightly newer.
+  #
+  rm -rf usr/include/drm/
+  # Remove confusing empty uapi directory
+  test ! -d usr/include/uapi || rmdir usr/include/uapi
+  for dir in *; do
+    case "$dir" in
+      usr) ;;
+      *) 
+	if test -d "$dir"; then
+	  rm -rf "$dir"
+	fi
+	;;
+    esac
+  done
+  cd ..
+done
+popd
+
+tar xf "$base"
+echo "kernel-source.git: $susecommit" > "$patchfile"
+echo >> "$patchfile"
+
+diff -ruN "$basever" linux-glibc-devel-current >> "$patchfile"
+
+exit 0