From 533ccd9c85149d206ea16e31c20d8e01ffbd5e87 Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 10 Mar 2025 23:58:11 -0500 Subject: [PATCH] fix(xpadneo, xone, xpad-noone): Update scripts (#3824) (#3846) * Trying just about everything to fix this oh my GOD * Another updbranch * Fix typo * That file was saved?? * Merge * Doing this just because it makes conflict fixes easier --------- Signed-off-by: Gilver (cherry picked from commit 5b1f57030a1f8b57c4a9b524b1cdc120d7a47fc3) # Conflicts: # anda/system/xone/akmod/xone-kmod.spec # anda/system/xone/dkms/dkms-xone.spec # anda/system/xpad-noone/akmod/xpad-noone-kmod.spec # anda/system/xpad-noone/dkms/dkms-xpad-noone.spec # anda/system/xpadneo/akmod/xpadneo-kmod.spec # anda/system/xpadneo/dkms/dkms-xpadneo.spec --- anda/system/xone/akmod/anda.hcl | 1 + anda/system/xone/akmod/update.rhai | 4 ++-- anda/system/xone/akmod/xone-kmod.spec | 4 ++-- anda/system/xone/dkms/anda.hcl | 1 + anda/system/xone/dkms/dkms-xone.spec | 4 ++-- anda/system/xone/kmod-common/update.rhai | 2 +- anda/system/xone/kmod-common/xone.spec | 4 ++-- anda/system/xpad-noone/akmod/anda.hcl | 1 + anda/system/xpad-noone/akmod/update.rhai | 6 +++--- anda/system/xpad-noone/akmod/xpad-noone-kmod.spec | 6 +++--- anda/system/xpad-noone/dkms/anda.hcl | 1 + anda/system/xpad-noone/dkms/dkms-xpad-noone.spec | 6 +++--- anda/system/xpad-noone/dkms/update.rhai | 6 +++--- anda/system/xpad-noone/kmod-common/update.rhai | 2 +- anda/system/xpad-noone/kmod-common/xpad-noone.spec | 4 ++-- anda/system/xpadneo/akmod/anda.hcl | 1 + anda/system/xpadneo/akmod/update.rhai | 4 ++-- anda/system/xpadneo/akmod/xpadneo-kmod.spec | 6 +++--- anda/system/xpadneo/dkms/anda.hcl | 1 + anda/system/xpadneo/dkms/dkms-xpadneo.spec | 4 ++-- anda/system/xpadneo/dkms/update.rhai | 4 ++-- anda/system/xpadneo/kmod-common/update.rhai | 2 +- anda/system/xpadneo/kmod-common/xpadneo.spec | 4 ++-- 23 files changed, 42 insertions(+), 36 deletions(-) diff --git a/anda/system/xone/akmod/anda.hcl b/anda/system/xone/akmod/anda.hcl index a6a830915e..3f2d068de2 100644 --- a/anda/system/xone/akmod/anda.hcl +++ b/anda/system/xone/akmod/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { mock = 1 + updbranch = 1 } } diff --git a/anda/system/xone/akmod/update.rhai b/anda/system/xone/akmod/update.rhai index 0ac5d9b6bb..95295c3ac6 100644 --- a/anda/system/xone/akmod/update.rhai +++ b/anda/system/xone/akmod/update.rhai @@ -3,9 +3,9 @@ c.pop(); rpm.global("commit", c); if rpm.changed() { rpm.release(); - let d = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; + let d = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; d.pop(); - rpm.global("commit_date", d); + rpm.global("commitdate", d); let v = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; v.pop(); rpm.global("ver", v); diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 8986860ac8..710e47fcdf 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -1,13 +1,13 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 -%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20241223 %global ver 0.3 %define buildforkernels akmod %global debug_package %{nil} %global modulename xone Name: %{modulename}-kmod -Version: %{ver}^%{commit_date}git.%{shortcommit} +Version: %{ver}^%{commitdate}git.%{shortcommit} Release: 1%?dist Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories License: GPL-2.0-or-later diff --git a/anda/system/xone/dkms/anda.hcl b/anda/system/xone/dkms/anda.hcl index e0b7e51d64..86f43ddf89 100644 --- a/anda/system/xone/dkms/anda.hcl +++ b/anda/system/xone/dkms/anda.hcl @@ -5,5 +5,6 @@ project pkg { } labels { mock = 1 + updbranch = 1 } } diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index 3a3c39ea5a..5ee46c5baa 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -1,12 +1,12 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 -%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20241223 %global ver 0.3 %global debug_package %{nil} %global modulename xone Name: dkms-%{modulename} -Version: %{ver}^%{commit_date}git.%{shortcommit} +Version: %{ver}^%{commitdate}git.%{shortcommit} Release: 1%?dist Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories License: GPL-2.0-or-later diff --git a/anda/system/xone/kmod-common/update.rhai b/anda/system/xone/kmod-common/update.rhai index 956d802fe6..805632e47a 100644 --- a/anda/system/xone/kmod-common/update.rhai +++ b/anda/system/xone/kmod-common/update.rhai @@ -1,7 +1,7 @@ rpm.global("commit", gh_commit("dlundqvist/xone")); if rpm.changed() { rpm.release(); - rpm.global("commit_date", date()); + rpm.global("commitdate", date()); let ver = gh_tag("dlundqvist/xone"); ver.crop(1); rpm.global("ver", ver); diff --git a/anda/system/xone/kmod-common/xone.spec b/anda/system/xone/kmod-common/xone.spec index abea73da92..f9fa79fc78 100644 --- a/anda/system/xone/kmod-common/xone.spec +++ b/anda/system/xone/kmod-common/xone.spec @@ -1,12 +1,12 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 -%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20241223 %global ver 0.3 %global _dracutconfdir %{_prefix}/lib/dracut/dracut.conf.d %global firmware_hash 48084d9fa53b9bb04358f3bb127b7495dc8f7bb0b3ca1437bd24ef2b6eabdf66 Name: xone -Version: %{ver}^%{commit_date}git.%{shortcommit} +Version: %{ver}^%{commitdate}git.%{shortcommit} Release: 2%{?dist} Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories common files License: GPL-2.0-or-later diff --git a/anda/system/xpad-noone/akmod/anda.hcl b/anda/system/xpad-noone/akmod/anda.hcl index c4b205f12c..eeaf7f0c82 100644 --- a/anda/system/xpad-noone/akmod/anda.hcl +++ b/anda/system/xpad-noone/akmod/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { mock = 1 + updbranch = 1 } } diff --git a/anda/system/xpad-noone/akmod/update.rhai b/anda/system/xpad-noone/akmod/update.rhai index 0678161b52..05ee92a730 100644 --- a/anda/system/xpad-noone/akmod/update.rhai +++ b/anda/system/xpad-noone/akmod/update.rhai @@ -3,10 +3,10 @@ c.pop(); rpm.global("commit", c); if rpm.changed() { rpm.release(); - let d = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; + let d = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; d.pop(); - rpm.global("commit_date", d); - let v = sh("cat anda/system/xpad-noone/kmod-common/xpadneo-noone.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; + rpm.global("commitdate", d); + let v = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; v.pop(); rpm.global("ver", v); } diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec index 64e15a9fd3..7ae74e4dcd 100644 --- a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec +++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec @@ -1,6 +1,6 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240109 +%global commitdate 20240109 %global ver 1.0 %global modulename xpad-noone %global debug_package %{nil} @@ -9,8 +9,8 @@ This is the original upstream xpad driver from the Linux kernel with support for XBox One controllers removed. If you are running the xone driver you may have to replace the xpad kernel module with this one to retain the functionality of XBox and XBox 360 controllers.} Name: %{modulename}-kmod -Version: %{ver}^%{commit_date}git.%{shortcommit} -Release: 1%{?dist} +Version: %{ver}^%{commitdate}git.%{shortcommit} +Release: 1%?dist License: GPL-2.0-or-later Summary: xpad driver with support for XBox One controllers removed URL: https://github.com/medusalix/xpad-noone diff --git a/anda/system/xpad-noone/dkms/anda.hcl b/anda/system/xpad-noone/dkms/anda.hcl index fe3344b493..8d386a715f 100644 --- a/anda/system/xpad-noone/dkms/anda.hcl +++ b/anda/system/xpad-noone/dkms/anda.hcl @@ -5,5 +5,6 @@ project pkg { } labels { mock = 1 + updbranch = 1 } } diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec index 1a1a9e4234..f7831a347e 100644 --- a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec +++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec @@ -1,14 +1,14 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240109 +%global commitdate 20240109 %global ver 1.0 %global modulename xpad-noone %global _description %{expand: This is the original upstream xpad driver from the Linux kernel with support for XBox One controllers removed. If you are running the xone driver you may have to replace the xpad kernel module with this one to retain the functionality of XBox and XBox 360 controllers.} Name: dkms-%{modulename} -Version: %{ver}^%{commit_date}git.%{shortcommit} -Release: 1%{?dist} +Version: %{ver}^%{commitdate}git.%{shortcommit} +Release: 1%?dist License: GPL-2.0-or-later Summary: xpad driver with support for XBox One controllers removed URL: https://github.com/medusalix/xpad-noone diff --git a/anda/system/xpad-noone/dkms/update.rhai b/anda/system/xpad-noone/dkms/update.rhai index 0678161b52..05ee92a730 100644 --- a/anda/system/xpad-noone/dkms/update.rhai +++ b/anda/system/xpad-noone/dkms/update.rhai @@ -3,10 +3,10 @@ c.pop(); rpm.global("commit", c); if rpm.changed() { rpm.release(); - let d = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; + let d = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; d.pop(); - rpm.global("commit_date", d); - let v = sh("cat anda/system/xpad-noone/kmod-common/xpadneo-noone.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; + rpm.global("commitdate", d); + let v = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; v.pop(); rpm.global("ver", v); } diff --git a/anda/system/xpad-noone/kmod-common/update.rhai b/anda/system/xpad-noone/kmod-common/update.rhai index 699ca77a39..0c4d57f83f 100644 --- a/anda/system/xpad-noone/kmod-common/update.rhai +++ b/anda/system/xpad-noone/kmod-common/update.rhai @@ -1,7 +1,7 @@ rpm.global("commit", gh_commit("medusalix/xpad-noone")); if rpm.changed() { rpm.release(); - rpm.global("commit_date", date()); + rpm.global("commitdate", date()); let html = get(`https://raw.githubusercontent.com/medusalix/xpad-noone/refs/heads/master/dkms.conf`); let v = find("PACKAGE_VERSION=\"([\\d.]+)\"", html, 1); rpm.global("ver", v); diff --git a/anda/system/xpad-noone/kmod-common/xpad-noone.spec b/anda/system/xpad-noone/kmod-common/xpad-noone.spec index 36e0fe2c1d..767764d890 100644 --- a/anda/system/xpad-noone/kmod-common/xpad-noone.spec +++ b/anda/system/xpad-noone/kmod-common/xpad-noone.spec @@ -1,12 +1,12 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240109 +%global commitdate 20240109 %global ver 1.0 %global _description %{expand: This is the original upstream xpad driver from the Linux kernel with support for XBox One controllers removed. If you are running the xone driver you may have to replace the xpad kernel module with this one to retain the functionality of XBox and XBox 360 controllers.} Name: xpad-noone -Version: %{ver}^%{commit_date}git.%{shortcommit} +Version: %{ver}^%{commitdate}git.%{shortcommit} Release: 1%{?dist} License: GPL-2.0-or-later Summary: xpad driver with support for XBox One controllers removed diff --git a/anda/system/xpadneo/akmod/anda.hcl b/anda/system/xpadneo/akmod/anda.hcl index 8527b571e3..23ac0b839c 100644 --- a/anda/system/xpadneo/akmod/anda.hcl +++ b/anda/system/xpadneo/akmod/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { mock = 1 + updbranch = 1 } } diff --git a/anda/system/xpadneo/akmod/update.rhai b/anda/system/xpadneo/akmod/update.rhai index d20f937dc0..2a64921582 100644 --- a/anda/system/xpadneo/akmod/update.rhai +++ b/anda/system/xpadneo/akmod/update.rhai @@ -3,9 +3,9 @@ c.pop(); rpm.global("commit", c); if rpm.changed() { rpm.release(); - let d = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; + let d = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; d.pop(); - rpm.global("commit_date", d); + rpm.global("commitdate", d); let v = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; v.pop(); rpm.global("ver", v); diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index a2987c2c0a..ddf279cb16 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -1,14 +1,14 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 -%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20241224 %global ver 0.9.7 %define buildforkernels akmod %global debug_package %{nil} %global modulename xpadneo Name: %{modulename}-kmod -Version: %{ver}^%{commit_date}git.%{shortcommit} -Release: 2%?dist +Version: %{ver}^%{commitdate}git.%{shortcommit} +Release: 1%?dist Summary: Advanced Linux Driver for Xbox One Wireless Gamepad License: GPL-3.0 URL: https://atar-axis.github.io/xpadneo diff --git a/anda/system/xpadneo/dkms/anda.hcl b/anda/system/xpadneo/dkms/anda.hcl index cade80863c..99098cb318 100644 --- a/anda/system/xpadneo/dkms/anda.hcl +++ b/anda/system/xpadneo/dkms/anda.hcl @@ -5,5 +5,6 @@ project pkg { } labels { mock = 1 + updbranch = 1 } } diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 80a647a07f..5fe28ad089 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -1,12 +1,12 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 -%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20241224 %global ver 0.9.7 %global debug_package %{nil} %global modulename xpadneo Name: dkms-%{modulename} -Version: %{ver}^%{commit_date}git.%{shortcommit} +Version: %{ver}^%{commitdate}git.%{shortcommit} Release: 1%?dist Summary: Advanced Linux Driver for Xbox One Wireless Gamepad License: GPL-3.0 diff --git a/anda/system/xpadneo/dkms/update.rhai b/anda/system/xpadneo/dkms/update.rhai index d20f937dc0..2a64921582 100644 --- a/anda/system/xpadneo/dkms/update.rhai +++ b/anda/system/xpadneo/dkms/update.rhai @@ -3,9 +3,9 @@ c.pop(); rpm.global("commit", c); if rpm.changed() { rpm.release(); - let d = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; + let d = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; d.pop(); - rpm.global("commit_date", d); + rpm.global("commitdate", d); let v = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; v.pop(); rpm.global("ver", v); diff --git a/anda/system/xpadneo/kmod-common/update.rhai b/anda/system/xpadneo/kmod-common/update.rhai index 19b1642b6c..82cafc1ad1 100644 --- a/anda/system/xpadneo/kmod-common/update.rhai +++ b/anda/system/xpadneo/kmod-common/update.rhai @@ -1,7 +1,7 @@ rpm.global("commit", gh_commit("atar-axis/xpadneo")); if rpm.changed() { rpm.release(); - rpm.global("commit_date", date()); + rpm.global("commitdate", date()); let ver = gh("atar-axis/xpadneo"); ver.crop(1); rpm.global("ver", ver); diff --git a/anda/system/xpadneo/kmod-common/xpadneo.spec b/anda/system/xpadneo/kmod-common/xpadneo.spec index b437e551e8..f682dd3e75 100644 --- a/anda/system/xpadneo/kmod-common/xpadneo.spec +++ b/anda/system/xpadneo/kmod-common/xpadneo.spec @@ -1,10 +1,10 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 -%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20241224 %global ver 0.9.7 Name: xpadneo -Version: %{ver}^%{commit_date}git.%{shortcommit} +Version: %{ver}^%{commitdate}git.%{shortcommit} Release: 4%{?dist} Summary: Advanced Linux Driver for Xbox One Wireless Gamepad common files License: GPL-3.0