[Buildroot] [git commit branch/2021.02.x] package/makedevs: define extract step to allow patching

Peter Korsgaard peter at korsgaard.com
Sat May 1 12:16:51 UTC 2021


commit: https://git.buildroot.net/buildroot/commit/?id=51311acb60baf1332dc01522481b9da35c70f2f0
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x

As recently discussed on the list:
http://lists.busybox.net/pipermail/buildroot/2021-April/308373.html

Packages like makedevs where the source code is included in the Buildroot
tree, currently doesn't use an extract step (which also skips the patch
step), so they cannot be patched by a patch in BR2_GLOBAL_PATCH_DIR (or the
pkgdir), which is a bit confusing.

As a fix, add a simple extract step that copies the source file to the build
directory, so the patch step gets run as well.

Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
(cherry picked from commit c3355e31d2c70b19386ae9ed535a4bca68e669f6)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 package/makedevs/makedevs.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/makedevs/makedevs.mk b/package/makedevs/makedevs.mk
index 36837a191e..9b0f44610c 100644
--- a/package/makedevs/makedevs.mk
+++ b/package/makedevs/makedevs.mk
@@ -15,8 +15,12 @@ HOST_MAKEDEVS_CFLAGS += -DEXTENDED_ATTRIBUTES
 HOST_MAKEDEVS_LDFLAGS += -lcap
 endif
 
+define HOST_MAKEDEVS_EXTRACT_CMDS
+	cp $(HOST_MAKEDEVS_PKGDIR)/makedevs.c $(@D)
+endef
+
 define HOST_MAKEDEVS_BUILD_CMDS
-	$(HOSTCC) $(HOST_MAKEDEVS_CFLAGS) package/makedevs/makedevs.c \
+	$(HOSTCC) $(HOST_MAKEDEVS_CFLAGS) $(@D)/makedevs.c \
 		-o $(@D)/makedevs $(HOST_MAKEDEVS_LDFLAGS)
 endef
 



More information about the buildroot mailing list