[Buildroot] [git commit branch/next] package/sunxi-mali-utgard-driver: handle patching the Buildroot way
Arnout Vandecappelle
arnout at mind.be
Wed Jun 5 21:55:49 UTC 2024
commit: https://git.buildroot.net/buildroot/commit/?id=545704bd52165c119c6d95c268a5726ea7a88b1a
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
Cc: Giulio Benetti <giulio.benetti at benettiengineering.com>
Reviewed-by: Giulio Benetti <giulio.benetti at benettiengineering.com>
Signed-off-by: Arnout Vandecappelle <arnout at mind.be>
---
.../0001-build.sh-do-not-apply-patches.patch | 39 ++++++++++++++++++++++
.../sunxi-mali-utgard-driver.mk | 3 +-
2 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/package/sunxi-mali-utgard-driver/0001-build.sh-do-not-apply-patches.patch b/package/sunxi-mali-utgard-driver/0001-build.sh-do-not-apply-patches.patch
new file mode 100644
index 0000000000..02c6aa7884
--- /dev/null
+++ b/package/sunxi-mali-utgard-driver/0001-build.sh-do-not-apply-patches.patch
@@ -0,0 +1,39 @@
+From 079ed8aa57ba6629b992c3d0d01904d3e5170d3b Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998 at free.fr>
+Date: Wed, 5 Jun 2024 13:06:16 +0200
+Subject: [PATCH] build.sh: do not apply patches
+
+In Buildroot, we handle applying the patches in a generic way, with
+appropriate tools (e.g. with a proper tar).
+
+Upstream: not applicable
+Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
+---
+ build.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/build.sh b/build.sh
+index d1fedff..26efc53 100755
+--- a/build.sh
++++ b/build.sh
+@@ -10,6 +10,8 @@ BUILD_OPTS="USING_UMP=0
+ USING_DEVFREQ=1"
+
+ apply_patches() {
++ return 0 # Patching handled by Buildroot
++
+ pushd $2
+
+ quilt push -a
+@@ -22,6 +24,8 @@ apply_patches() {
+ }
+
+ unapply_patches() {
++ return 0 # Patching handled by Buildroot
++
+ pushd $2
+
+ quilt pop -a
+--
+2.45.1
+
diff --git a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk
index 72fade58ed..b8a12247d3 100644
--- a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk
+++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk
@@ -16,8 +16,7 @@ SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS = \
define SUNXI_MALI_UTGARD_DRIVER_USE_APPLY_PATCHES
ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches
- $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \
- $(@D)/build.sh
+ $(APPLY_PATCHES) $(@D)/$(SUNXI_MALI_UTGARD_REV) $(@D)/patches
endef
SUNXI_MALI_UTGARD_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_UTGARD_DRIVER_USE_APPLY_PATCHES
More information about the buildroot
mailing list