Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kernel-firmware-nvidia for
openSUSE:Factory checked in at 2025-04-25 22:18:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kernel-firmware-nvidia (Old)
and /work/SRC/openSUSE:Factory/.kernel-firmware-nvidia.new.30101 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-firmware-nvidia"
Fri Apr 25 22:18:36 2025 rev:3 rq:1272734 version:20250206
Changes:
--------
---
/work/SRC/openSUSE:Factory/kernel-firmware-nvidia/kernel-firmware-nvidia.changes
2025-03-26 21:17:56.568888605 +0100
+++
/work/SRC/openSUSE:Factory/.kernel-firmware-nvidia.new.30101/kernel-firmware-nvidia.changes
2025-04-25 22:19:17.615496785 +0200
@@ -1,0 +2,9 @@
+Fri Apr 25 13:52:22 UTC 2025 - Takashi Iwai <ti...@suse.com>
+
+- Change conflicts filesystem < 84 to conflicts filesystem without
+ may-perform-usrmerge. Version 84 is specific to Tumbleweed; CODE
+ 16 uses Version 16; yet we need to ensure we get an up-to-date
+ version of filesystem. Relying on the recently introduced provides
+ instructing zypp about the usrmerge is perfect for this use case.
+
+-------------------------------------------------------------------
Old:
----
kernel-firmware-tools-20250325.tar.gz
New:
----
kernel-firmware-tools-20250425.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-firmware-nvidia.spec ++++++
--- /var/tmp/diff_new_pack.Y6c58x/_old 2025-04-25 22:19:18.543535786 +0200
+++ /var/tmp/diff_new_pack.Y6c58x/_new 2025-04-25 22:19:18.543535786 +0200
@@ -30,7 +30,7 @@
Group: System/Kernel
URL:
https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
Source0: %{name}-%{version}.tar.xz
-Source1:
https://github.com/openSUSE/kernel-firmware-tools/archive/refs/tags/20250325.tar.gz#/kernel-firmware-tools-20250325.tar.gz
+Source1:
https://github.com/openSUSE/kernel-firmware-tools/archive/refs/tags/20250425.tar.gz#/kernel-firmware-tools-20250425.tar.gz
Source2: %{name}-rpmlintrc
Source3: git_id
Source10: aliases
@@ -44,8 +44,7 @@
Conflicts: kernel-firmware-uncompressed
BuildArch: noarch
%if 0%{?suse_version} >= 1550
-# make sure we have post-usrmerge filesystem package on TW
-Conflicts: filesystem < 84
+Conflicts: (filesystem without may-perform-usrmerge)
%endif
Supplements: modalias(of:N*T*Cnvidia%2Cgk20a)
Supplements: modalias(of:N*T*Cnvidia%2Cgk20aC*)
++++++ _scmsync.obsinfo ++++++
--- /var/tmp/diff_new_pack.Y6c58x/_old 2025-04-25 22:19:18.571536963 +0200
+++ /var/tmp/diff_new_pack.Y6c58x/_new 2025-04-25 22:19:18.575537131 +0200
@@ -1,6 +1,6 @@
-mtime: 1742887351
-commit: 5e3828f52a331ab9cfc6bd32a312b5c3effac8639a6919db24710b8dc1b6c1a6
+mtime: 1745589771
+commit: 2617d09f18f16cde6c5bb90f2ce54280a6149787e8350e39fdcd404d96c8060d
url: https://src.opensuse.org/kernel-firmware/kernel-firmware-nvidia.git
-revision: 5e3828f52a331ab9cfc6bd32a312b5c3effac8639a6919db24710b8dc1b6c1a6
+revision: 2617d09f18f16cde6c5bb90f2ce54280a6149787e8350e39fdcd404d96c8060d
projectscmsync: https://src.opensuse.org/kernel-firmware/_ObsPrj.git
++++++ build.specials.obscpio ++++++
++++++ kernel-firmware-tools-20250325.tar.gz ->
kernel-firmware-tools-20250425.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kernel-firmware-tools-20250325/README-kft.md
new/kernel-firmware-tools-20250425/README-kft.md
--- old/kernel-firmware-tools-20250325/README-kft.md 2025-03-25
08:20:28.000000000 +0100
+++ new/kernel-firmware-tools-20250425/README-kft.md 2025-04-25
15:37:35.000000000 +0200
@@ -12,10 +12,6 @@
## Files
-- `.projconf`:
- An optional project configuration, read by
- `update-firmware-git.sh`.
-
- `topicdefs`:
Definitions of each flavor (topic) and description;
the description is filled into spec file
@@ -91,12 +87,19 @@
```
When the Gitea org name is different from the default one
-(`kernel-firmware`), specify via `-P` option or put in `.projfconf`
+(`kernel-firmware`), specify via `-P` option or put in `.projconf`
file like:
```
obsgitproj=some-orgname
```
+When the OBS devel project name is different from the default one
+(`Kenrel:firmware`), specify via `-p` option or put in `.projconf`
+file like:
+```
+obsproj=some:develname
+```
+
For updating the kernel firmware package, simply run the script
`scripts/update-firmware-git.sh`. Without argument, it runs git-pull
of the given linux-firmware.git repository, and updates the stuff if
@@ -124,6 +127,10 @@
kernel-firmware-ath10k/ kernel-firmware-mwifiex/
....
```
+If you want to fork / branch the Gitea repo and OBS project at updating,
+pass `-b` option to `update-firmware-git.sh`. Then `osc fork` will be
+performed beforehand to set up the forked Gitea repo and branched OBS
+project.
After preparing all materials, the script will commit the package to
OBS automatically. For keeping without commit to Gitea, pass `-n`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kernel-firmware-tools-20250325/kernel-firmware.spec.in
new/kernel-firmware-tools-20250425/kernel-firmware.spec.in
--- old/kernel-firmware-tools-20250325/kernel-firmware.spec.in 2025-03-25
08:20:28.000000000 +0100
+++ new/kernel-firmware-tools-20250425/kernel-firmware.spec.in 2025-04-25
15:37:35.000000000 +0200
@@ -44,8 +44,7 @@
Conflicts: kernel-firmware-uncompressed
BuildArch: noarch
%if 0%{?suse_version} >= 1550
-# make sure we have post-usrmerge filesystem package on TW
-Conflicts: filesystem < 84
+Conflicts: (filesystem without may-perform-usrmerge)
%endif
@@TOPICPROVS@@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kernel-firmware-tools-20250325/licenses.list
new/kernel-firmware-tools-20250425/licenses.list
--- old/kernel-firmware-tools-20250325/licenses.list 2025-03-25
08:20:28.000000000 +0100
+++ new/kernel-firmware-tools-20250425/licenses.list 2025-04-25
15:37:35.000000000 +0200
@@ -76,6 +76,7 @@
mga:
r128:
radeon: LICENSE.radeon
+as21xxx: LICENSE.aeonsemi
en8811h: LICENSE.airoha
amdgpu: LICENSE.amdgpu
amdxdna: LICENSE.amdnpu
@@ -216,6 +217,8 @@
panthor: LICENCE.mali_csffw
isp: LICENSE.amdisp
qaic: LICENSE.qcom qcom/NOTICE.txt
-ish: LICENCE.ish
+ish: LICENSE.intel
qdu100: LICENSE.qcom qcom/NOTICE.txt
intel_vpu: LICENSE.intel_vpu
+bmi260: LICENSE.bmi260
+qcs9100: LICENSE.qcom qcom/NOTICE.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kernel-firmware-tools-20250325/scripts/update-firmware-git.sh
new/kernel-firmware-tools-20250425/scripts/update-firmware-git.sh
--- old/kernel-firmware-tools-20250325/scripts/update-firmware-git.sh
2025-03-25 08:20:28.000000000 +0100
+++ new/kernel-firmware-tools-20250425/scripts/update-firmware-git.sh
2025-04-25 15:37:35.000000000 +0200
@@ -7,11 +7,13 @@
usage () {
echo "usage: update-firmware-git.sh [-options] [TOPICS...]"
echo " -C DIR: git root directory"
- echo " -c GIT_ID: git ID to look at (HEAD as default)"
- echo " -P org: gitea repo org name"
+ echo " -c GIT_ID: git ID to look at ('HEAD' as default)"
+ echo " -P org: gitea repo org name ('kernel-firmware' as default)"
+ echo " -p project: OBS devel project ('Kernel:firmware' as default)"
echo " -V: only verify the changes, not updating"
echo " -r: don't pull linux-firmware git tree"
echo " -n: don't commit for gitea repo"
+ echo " -b: fork/branch packages at updating"
echo " -f: force to build even if unchanged"
echo " -m: additional changelog text"
exit 1
@@ -20,23 +22,30 @@
gitroot=linux-firmware
head=HEAD
srcoo=src.opensuse.org
+obsproj=Kernel:firmware
obsgitproj=kernel-firmware
obsgitbranch=main
test -f .projconf && . .projconf
-while getopts C:c:P:Vrnfm: opt; do
+while getopts C:c:P:p:Vrnbfm: opt; do
case "$opt" in
C)
gitroot="$OPTARG";;
c)
head="$OPTARG";;
+ P)
+ obsgitproj="$OPTARG";;
+ p)
+ obsproj="$OPTARG";;
V)
onlyverify=1;;
r)
nopull=1;;
n)
nocommit=1;;
+ b)
+ dobranch=1;;
f)
force=1;;
m)
@@ -58,6 +67,21 @@
usage
fi
+if [ -n "$dobranch" ]; then
+ if [ -z "$obsproj" ]; then
+ echo "ERROR: Missing OBS project name"
+ usage
+ fi
+
+ oscuser=$(osc user)
+ username=${oscuser%%:*}
+
+ if [ -z "$username" ]; then
+ echo "No OBS user available"
+ exit 1
+ fi
+fi
+
if [ -n "$nopull" ]; then
newhead=$(git -C "$gitroot" rev-parse "$head")
echo "GIT hash: $newhead"
@@ -162,7 +186,11 @@
if [ ! -d "$specdir" ]; then
mkdir -p specs
- (cd specs; git clone -b $obsgitbranch "gitea@$srcoo:$obsgitproj/$name")
+ if [ -n "$dobranch" ]; then
+ (cd specs; osc fork $obsproj $name; git clone -b $obsgitbranch
"gitea@$srcoo:$username/$name")
+ else
+ (cd specs; git clone -b $obsgitbranch
"gitea@$srcoo:$obsgitproj/$name")
+ fi
fi
# add changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kernel-firmware-tools-20250325/spdx.list
new/kernel-firmware-tools-20250425/spdx.list
--- old/kernel-firmware-tools-20250325/spdx.list 2025-03-25
08:20:28.000000000 +0100
+++ new/kernel-firmware-tools-20250425/spdx.list 2025-04-25
15:37:35.000000000 +0200
@@ -76,6 +76,7 @@
mga: MIT
r128: MIT
radeon: MIT
+as21xxx:
en8811h:
amdgpu:
amdxdna:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kernel-firmware-tools-20250325/topics.list
new/kernel-firmware-tools-20250425/topics.list
--- old/kernel-firmware-tools-20250325/topics.list 2025-03-25
08:20:28.000000000 +0100
+++ new/kernel-firmware-tools-20250425/topics.list 2025-04-25
15:37:35.000000000 +0200
@@ -76,6 +76,7 @@
mga: platform
r128: platform
radeon: radeon radeon amdgpu
+as21xxx: network
en8811h: network
amdgpu: amdgpu
amdxdna: platform
@@ -228,4 +229,6 @@
ish: intel intel-ish-ipc
qdu100: qcom
intel_vpu: intel
+bmi260: platform bmi270_i2c bmi270_spi
+qcs9100: qcom
ast: platform
