aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Ambardar <itugrok@yahoo.com>2020-07-12 21:18:43 -0700
committerDaniel Golle <daniel@makrotopia.org>2020-08-31 12:23:59 +0100
commit735947229c0e89fd714b3cded1e76ea9093827ed (patch)
tree14dca17fa899a0fe60f65bf498a7f75de8f0795f
parentc1875d1ebbd4c4bad45d7c93cf012317f8ce1810 (diff)
downloadupstream-735947229c0e89fd714b3cded1e76ea9093827ed.tar.gz
upstream-735947229c0e89fd714b3cded1e76ea9093827ed.tar.bz2
upstream-735947229c0e89fd714b3cded1e76ea9093827ed.zip
musl: add common glibc extention for nftw
Add FTW_ACTIONRETVAL mode and update nftw library for walking file trees. Update needed to build bpftool userspace utility from Linux kernel source. Also increment PKG_RELEASE. Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
-rw-r--r--toolchain/musl/common.mk2
-rw-r--r--toolchain/musl/patches/600-nftw-support-common-gnu-extension.patch102
2 files changed, 103 insertions, 1 deletions
diff --git a/toolchain/musl/common.mk b/toolchain/musl/common.mk
index 6a59577108..8c8eddc855 100644
--- a/toolchain/musl/common.mk
+++ b/toolchain/musl/common.mk
@@ -9,7 +9,7 @@ include $(INCLUDE_DIR)/target.mk
PKG_NAME:=musl
PKG_VERSION:=1.1.24
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://musl.libc.org/releases/
diff --git a/toolchain/musl/patches/600-nftw-support-common-gnu-extension.patch b/toolchain/musl/patches/600-nftw-support-common-gnu-extension.patch
new file mode 100644
index 0000000000..13914efcba
--- /dev/null
+++ b/toolchain/musl/patches/600-nftw-support-common-gnu-extension.patch
@@ -0,0 +1,102 @@
+From 6f1143425a3afc4eb5086e9c90e7efb3affd7cb7 Mon Sep 17 00:00:00 2001
+From: Tony Ambardar <Tony.Ambardar@gmail.com>
+Date: Sat, 11 Jul 2020 06:35:46 -0700
+Subject: [PATCH 2/2] nftw: support common gnu extension
+
+Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com>
+---
+ include/ftw.h | 8 ++++++++
+ src/misc/nftw.c | 35 ++++++++++++++++++++++++++++++-----
+ 2 files changed, 38 insertions(+), 5 deletions(-)
+
+diff --git a/include/ftw.h b/include/ftw.h
+index b15c062a..ce85deac 100644
+--- a/include/ftw.h
++++ b/include/ftw.h
+@@ -21,6 +21,14 @@ extern "C" {
+ #define FTW_CHDIR 4
+ #define FTW_DEPTH 8
+
++#ifdef _GNU_SOURCE
++#define FTW_ACTIONRETVAL 16
++#define FTW_CONTINUE 0
++#define FTW_STOP 1
++#define FTW_SKIP_SUBTREE 2
++#define FTW_SKIP_SIBLINGS 3
++#endif
++
+ struct FTW {
+ int base;
+ int level;
+diff --git a/src/misc/nftw.c b/src/misc/nftw.c
+index 8dcff7fe..0bb7b601 100644
+--- a/src/misc/nftw.c
++++ b/src/misc/nftw.c
+@@ -1,3 +1,4 @@
++#define _GNU_SOURCE
+ #include <ftw.h>
+ #include <dirent.h>
+ #include <fcntl.h>
+@@ -72,8 +73,20 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int,
+ if (!fd_limit) close(dfd);
+ }
+
+- if (!(flags & FTW_DEPTH) && (r=fn(path, &st, type, &lev)))
+- return r;
++ if (!(flags & FTW_DEPTH) && (r=fn(path, &st, type, &lev))) {
++ if (flags & FTW_ACTIONRETVAL)
++ switch (r) {
++ case FTW_SKIP_SUBTREE:
++ h = NULL;
++ case FTW_CONTINUE:
++ break;
++ case FTW_SKIP_SIBLINGS:
++ case FTW_STOP:
++ return r;
++ }
++ else
++ return r;
++ }
+
+ for (; h; h = h->chain)
+ if (h->dev == st.st_dev && h->ino == st.st_ino)
+@@ -101,7 +114,10 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int,
+ strcpy(path+j+1, de->d_name);
+ if ((r=do_nftw(path, fn, fd_limit-1, flags, &new))) {
+ closedir(d);
+- return r;
++ if ((flags & FTW_ACTIONRETVAL) && r == FTW_SKIP_SIBLINGS)
++ break;
++ else
++ return r;
+ }
+ }
+ closedir(d);
+@@ -112,8 +128,16 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int,
+ }
+
+ path[l] = 0;
+- if ((flags & FTW_DEPTH) && (r=fn(path, &st, type, &lev)))
+- return r;
++ if ((flags & FTW_DEPTH) && (r=fn(path, &st, type, &lev))) {
++ if (flags & FTW_ACTIONRETVAL)
++ switch (r) {
++ case FTW_SKIP_SIBLINGS:
++ case FTW_STOP:
++ return r;
++ }
++ else
++ return r;
++ }
+
+ return 0;
+ }
+@@ -139,4 +163,5 @@ int nftw(const char *path, int (*fn)(const char *, const struct stat *, int, str
+ return r;
+ }
+
++#undef nftw64
+ weak_alias(nftw, nftw64);
+--
+2.17.1
+