Did I understand correctly?
Did you mean this patches.megous/of-property-fw_devlink-Support-allwinner-sram-links.patch?
You can disable any patch by simply putting a minus sign at the beginning of a line in the series file:
diff --git a/patch/kernel/archive/sunxi-6.11/series.conf b/patch/kernel/archive/sunxi-6.11/series.conf
index 3eaf6617..3a2067e0 100644
--- a/patch/kernel/archive/sunxi-6.11/series.conf
+++ b/patch/kernel/archive/sunxi-6.11/series.conf
@@ -171,7 +171,7 @@
patches.megous/usb-gadget-Fix-dangling-pointer-in-netdev-private-data.patch
patches.megous/mmc-dw-mmc-rockchip-fix-sdmmc-after-soft-reboot.patch
patches.megous/Revert-drm-sun4i-lvds-Invert-the-LVDS-polarity.patch
- patches.megous/of-property-fw_devlink-Support-allwinner-sram-links.patch
+- patches.megous/of-property-fw_devlink-Support-allwinner-sram-links.patch
patches.megous/arm64-dts-rockchip-rk356x-Fix-PCIe-register-map-and-ranges.patch
patches.megous/Fix-intptr_t-typedef.patch
patches.megous/mmc-sunxi-mmc-Remove-runtime-PM.patch
without making any other changes to the build system.
The best solution is to make changes on top of all applied patches.
Make a git commit and extract it as a patch to the root directory with patches.
This can be done directly in the build system.
sesion (1)
cat <<- EOF > "userpatches/config-test.conf"
display_alert "Settings from" "config-test.conf file" "info"
BOARD=bigtreetech-cb1
BRANCH=edge
RELEASE=bookworm
KERNEL_GIT=shallow
# Enter your github credentials here so that we know the author and how to contact you.
declare -g MAINTAINERMAIL="48602507+The-going@users.noreply.github.com"
declare -g MAINTAINER="The-going"
declare -g SYNC_CLOCK="no"
EOF
./compile.sh test kernel-patch
# The build system will apply all patches, commit and stop.
# Don't do anything in this terminal session (1).
# The script will print the path to the directory where you want to make changes.
# You will need another session (2) in the terminal to access and act on the kernel repository.
session (2):
cd /path/to/kernel-worktree
sudo su
# Make changes to the file in any convenient editor.
For example:
nano README
# write and exit the editor
session (1)
Press <ENTER> And you'll see something like this:
───────┬───────────────────────────────────────────────────────────────────────────────────────────────────────────────
│ File: /home/leo/armbian/output/patch/kernel-rockchip-rk3588-edge.patch
───────┼───────────────────────────────────────────────────────────────────────────────────────────────────────────────
1 │ diff --git a/README b/README
2 │ index fd903645e..fa0d6844d 100644
3 │ --- a/README
4 │ +++ b/README
5 │ @@ -1,5 +1,5 @@
6 │ -Linux kernel
7 │ -============
8 │ +Linux kernel Armbian framework patching
9 │ +=======================================
10 │
11 │ There are several guides for kernel developers and users. These guides can
12 │ be rendered in a number of formats, like HTML and PDF. Please read
───────┴───────────────────────────────────────────────────────────────────────────────────────────────────────────────
[🚸] Are you happy with this patch? [ Type 'yes' to accept, 'stop' to stop patching, or anything else to keep patching ]
Enter yes
The script will make the correct patch assign it a strange name that does not match the "Subject:" field
and put it in the "output/patch/" folder.
leo@noble-vm:~/armbian$ batcat /home/leo/armbian/output/patch/kernel-rockchip-rk3588-edge.patch
───────┬─────────────────────────────────────────────────────────────────────────
│ File: /home/leo/armbian/output/patch/kernel-rockchip-rk3588-edge.patch
───────┼─────────────────────────────────────────────────────────────────────────
1 │ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 │ From: The-going <48602507+The-going@users.noreply.github.com>
3 │ Date: Mon, 4 Nov 2024 12:21:22 +0000
4 │ Subject: Patching kernel rockchip-rk3588 files README
5 │
6 │ Signed-off-by: The-going <48602507+The-going@users.noreply.github.com>
7 │ ---
8 │ README | 4 ++--
9 │ 1 file changed, 2 insertions(+), 2 deletions(-)
10 │
11 │ diff --git a/README b/README
12 │ index fd903645e..fa0d6844d 100644
13 │ --- a/README
14 │ +++ b/README
15 │ @@ -1,7 +1,7 @@
16 │ -Linux kernel
17 │ -============
18 │ +Linux kernel Armbian framework patching
19 │ +=======================================
20 │
21 │ There are several guides for kernel developers and users. These guides can
22 │ be rendered in a number of formats, like HTML and PDF. Please read
23 │ Documentation/admin-guide/README.rst first.
24 │
25 │ --
26 │ Created with Armbian build tools https://github.com/armbian/build
27 │
───────┴──────────────────────────────────────────────────────────────────────────────
This strange behavior can be circumvented.
session (2)
cd /path/to/kernel-worktree
sudo su
# Tell who you are directly to git.
git config --global user.email "48602507+The-going@users.noreply.github.com"
git config --global user.name "The-going"
# Check the git settings.
cat ~/.gitconfig
# Make the necessary changes to the file and commit.
# The main thing is to write a good explanation in the message to the commit about the changes made.
# End the superuser session
exit
# If it's a single commit then just send the patch to the destination (regular user session):
git format-patch --keep-subject --filename-max-length=75 --abbrev=12 -1 -o /home/user/path/to/armbian-build/patch/kernel/archive/sunxi-6.11/
# If the changes are significant and you need several commits,
# the best solution is to make a separate series.
# Create an empty patches.addons folder in the target directory
TDIR="/home/user/path/to/armbian-build/patch/kernel/archive/sunxi-6.11/patches.addons"
mkdir $TDIR
# If 5 commits
revision_runge="HEAD~5..HEAD"
# run script mk_format_patch.sh
/home/user/path/to/armbian-build/tools/mk_format_patch . $revision_runge $TDIR
# Add a list of new patches to the series.conf file
cat ${TDIR}/../series.addons >>${TDIR}/../series.conf
I wrote it in such detail because other users will read it.
@Sesse You have very successfully found this rotten apple.
I express my deep gratitude for the work done.
Please post a properly designed patch here and I will send it to the megous upstream project
so that it can be reviewed and the names included in v6.12.
With respect