unionfs-fuse: Fix build with musl
PATCH 1/6 unionfs-fuse: Fix build with musl
Signed-off-by Khem Raj <[email protected]>
--- ...1-unionfs-Define-IOCPARM_LEN-if-undefined.patch | 62 ++++++++++++++++++++++ .../unionfs-fuse/unionfs-fuse_2.0.bb | 3 +- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-unionfs-Define-IOCPARM_LEN-if-undefined.patch
meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-unionfs-Define-IOCPARM_LEN-if-undefined.patch new file +62 -0
@@ -0,0 +1,62 @@ +From 10411fa8658621822ae394160daffaced4a4cd7f Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 13 Jul 2017 23:07:29 -0700 +Subject: [PATCH] unionfs: Define IOCPARM_LEN if undefined + +musl does not have sysctl.h which defines this +for glibc + +Signed-off-by: Khem Raj <[email protected]> +--- + src/unionfs.c | 8 -------- + src/unionfs.h | 15 +++++++++++++++ + 2 files changed, 15 insertions(+), 8 deletions(-) + +diff --git a/src/unionfs.c b/src/unionfs.c +index a34d34e..51684a7 100644 +--- a/src/unionfs.c ++++ b/src/unionfs.c +@@ -21,14 +21,6 @@ + #include "opts.h" + #include "usyslog.h" + +-#ifndef _IOC_SIZE +-#ifdef IOCPARM_LEN +-#define _IOC_SIZE(x) IOCPARM_LEN(x) +-#else +-#error "No mechanism for determining ioctl length found." +-#endif +-#endif +- + static struct fuse_opt unionfs_opts[] = { + FUSE_OPT_KEY("chroot=%s,", KEY_CHROOT), + FUSE_OPT_KEY("cow", KEY_COW), +diff --git a/src/unionfs.h b/src/unionfs.h +index 8f5e0bf..b02de5a 100644 +--- a/src/unionfs.h ++++ b/src/unionfs.h +@@ -17,6 +17,21 @@ + #define FUSE_META_FILE ".fuse_hidden" + #define FUSE_META_LENGTH 12 + ++#ifndef IOCPARM_MASK ++#define IOCPARM_MASK 0x1FFF ++#endif ++#ifndef IOCPARM_LEN ++#define IOCPARM_LEN(a) (((a) >> 16) & IOCPARM_MASK) ++#endif ++ ++#ifndef _IOC_SIZE ++#ifdef IOCPARM_LEN ++#define _IOC_SIZE(x) IOCPARM_LEN(x) ++#else ++#error "No mechanism for determining ioctl length found." ++#endif ++#endif ++ + // file access protection mask + #define S_PROT_MASK (S_ISUID| S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO) + +-- +2.13.2 +
meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.0.bb +2 -1
@@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://src/unionfs.c;beginline=3;endline=8;md5=30fa8de70fd8a SRC_URI = "git://github.com/rpodgorny/${BPN}.git;branch=master \ file://0001-support-cross-compiling.patch \ -" + file://0001-unionfs-Define-IOCPARM_LEN-if-undefined.patch \ + " SRCREV = "c8d23a9a75f1a62988593671839e8a168a79f3e5" DEPENDS = "fuse"
Signature · 1 line
2.13.3
PATCH 2/6 xfsdump: Fix build with musl
Signed-off-by Khem Raj <[email protected]>
--- .../files/0001-Include-fcntl.h-for-O_EXCL.patch | 28 +++++ .../0002-Replace-__uint32_t-with-uint32_t.patch | 122 +++++++++++++++++++++ .../0003-replace-use-of-SIGCLD-with-SIGCHLD.patch | 40 +++++++ .../files/0004-include-limit.h-for-PATH_MAX.patch | 29 +++++ ...-types.h-for-u_int32_t-in-attr-attributes.patch | 27 +++++ .../recipes-utils/xfsdump/xfsdump_3.1.6.bb | 9 +- 6 files changed, 253 insertions(+), 2 deletions(-) create mode 100644 meta-filesystems/recipes-utils/xfsdump/files/0001-Include-fcntl.h-for-O_EXCL.patch create mode 100644 meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch create mode 100644 meta-filesystems/recipes-utils/xfsdump/files/0003-replace-use-of-SIGCLD-with-SIGCHLD.patch create mode 100644 meta-filesystems/recipes-utils/xfsdump/files/0004-include-limit.h-for-PATH_MAX.patch create mode 100644 meta-filesystems/recipes-utils/xfsdump/files/0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch
meta-filesystems/recipes-utils/xfsdump/files/0001-Include-fcntl.h-for-O_EXCL.patch new file +28 -0
@@ -0,0 +1,28 @@ +From 8cf48da5f645dd7bbb1ccbeab5bb0964f40f17f7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 13 Jul 2017 23:18:47 -0700 +Subject: [PATCH 1/5] Include fcntl.h for O_EXCL + +Fix +error: 'O_CREAT' undeclared (first use in this function) + +Signed-off-by: Khem Raj <[email protected]> +--- + invutil/invidx.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/invutil/invidx.c b/invutil/invidx.c +index 67efdf7..325a9a1 100644 +--- a/invutil/invidx.c ++++ b/invutil/invidx.c +@@ -27,6 +27,7 @@ + #include <sys/stat.h> + #include <string.h> + #include <uuid/uuid.h> ++#include <fcntl.h> + + #include "types.h" + #include "mlog.h" +-- +2.13.2 +
meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch new file +122 -0
122 lines not on this page · raw message
meta-filesystems/recipes-utils/xfsdump/files/0003-replace-use-of-SIGCLD-with-SIGCHLD.patch new file +40 -0
@@ -0,0 +1,40 @@ +From fcc0cf15a309947103a0695b8a1f4865b820eb5c Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 13 Jul 2017 23:26:03 -0700 +Subject: [PATCH 3/5] replace use of SIGCLD with SIGCHLD + +Signed-off-by: Khem Raj <[email protected]> +--- + common/main.c | 2 +- + doc/xfsdump.html | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/common/main.c b/common/main.c +index 3848499..faa66ee 100644 +--- a/common/main.c ++++ b/common/main.c +@@ -2225,7 +2225,7 @@ static sig_printmap_t sig_printmap[ ] = { + {SIGTERM, "SIGTERM"}, + {SIGUSR1, "SIGUSR1"}, + {SIGUSR2, "SIGUSR2"}, +- {SIGCLD, "SIGCLD"}, ++ {SIGCHLD, "SIGCHLD"}, + {SIGPWR, "SIGPWR"}, + {SIGURG, "SIGURG"}, + {SIGPOLL, "SIGPOLL"}, +diff --git a/doc/xfsdump.html b/doc/xfsdump.html +index f85128f..d96f037 100644 +--- a/doc/xfsdump.html ++++ b/doc/xfsdump.html +@@ -334,7 +334,7 @@ the ring buffer. It ignores signals and does not terminate until it + receives a RING_OP_DIE message. It then exits 0. + <p> + The main process sleeps waiting for any of its children to die +-(ie. waiting for a SIGCLD). All children that it cares about (stream ++(ie. waiting for a SIGCHLD). All children that it cares about (stream + managers and ring buffer slaves) are registered through the child + manager abstraction. When a child dies wait status and other info is + stored with its entry in the child manager. main() ignores the deaths +-- +2.13.2 +
meta-filesystems/recipes-utils/xfsdump/files/0004-include-limit.h-for-PATH_MAX.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 98c7d96f0f2c6eddf60aa4a1a08d7d4467645930 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 13 Jul 2017 23:28:10 -0700 +Subject: [PATCH 4/5] include limit.h for PATH_MAX + +fixed +var.c:42:12: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'RAND_MAX'? + char path[PATH_MAX];` + +Signed-off-by: Khem Raj <[email protected]> +--- + dump/var.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dump/var.c b/dump/var.c +index 645caab..8156d37 100644 +--- a/dump/var.c ++++ b/dump/var.c +@@ -16,6 +16,7 @@ + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#include <limits.h> + #include <unistd.h> + #include <stdlib.h> + #include <sys/stat.h> +-- +2.13.2 +
meta-filesystems/recipes-utils/xfsdump/files/0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch new file +27 -0
@@ -0,0 +1,27 @@ +From d95f494de1aa8123c74170ffebaed8ea89649da2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 13 Jul 2017 23:33:44 -0700 +Subject: [PATCH 5/5] include sys/types.h for u_int32_t in attr/attributes.h + +error: unknown type name 'u_int32_t' + +Signed-off-by: Khem Raj <[email protected]> +--- + restore/content.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/restore/content.c b/restore/content.c +index 7c4a81f..1d5de1b 100644 +--- a/restore/content.c ++++ b/restore/content.c +@@ -24,6 +24,7 @@ + #include <sys/param.h> + #include <sys/stat.h> + #include <sys/ioctl.h> ++#include <sys/types.h> + #include <attr/attributes.h> + #include <xfs/handle.h> + #include <time.h> +-- +2.13.2 +
meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.6.bb +7 -2
@@ -11,8 +11,13 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=15c832894d10ddd00dfcf57bee490ecc" DEPENDS = "xfsprogs attr" SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${BPN}-${PV}.tar.gz \ - file://remove-install-as-user.patch \ -" + file://remove-install-as-user.patch \ + file://0001-Include-fcntl.h-for-O_EXCL.patch \ + file://0002-Replace-__uint32_t-with-uint32_t.patch \ + file://0003-replace-use-of-SIGCLD-with-SIGCHLD.patch \ + file://0004-include-limit.h-for-PATH_MAX.patch \ + file://0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch \ + " SRC_URI[md5sum] = "50353cd4f4b435685955363e6044f4d1" SRC_URI[sha256sum] = "7f78c11ca527477d90e5e62b0778f3ad96f2b71c19173044e9aca9515fff42d0"
Signature · 1 line
2.13.3
PATCH 3/6 nmon: Upgrade to 16g
In reply to Khem RajFix build with musl while here.
Signed-off-by Khem Raj <[email protected]>
---
.../0001-lmon16g.c-Adjust-system-headers.patch | 46 ++++++++++++++++++++++
.../nmon/{nmon_13g.bb => nmon_16g.bb} | 14 ++++---
2 files changed, 54 insertions(+), 6 deletions(-)
create mode 100644 meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch
rename meta-oe/recipes-support/nmon/{nmon_13g.bb => nmon_16g.bb} (62%)meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch new file +46 -0
@@ -0,0 +1,46 @@ +From d977b5170027926eb97ab9742ddc51d2a5555a34 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 14 Jul 2017 10:06:49 -0700 +Subject: [PATCH] lmon16g.c: Adjust system headers + +fstab.h is unused +errno.h is in /usr/include +defines from sys/cdefs.h is used + +Signed-off-by: Khem Raj <[email protected]> +--- + lmon16g.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lmon16g.c b/lmon16g.c +index cb27e09..d2a11c5 100644 +--- a/lmon16g.c ++++ b/lmon16g.c +@@ -63,7 +63,7 @@ static char *SccsId = "nmon " VERSION; + #include <fcntl.h> + #include <math.h> + #include <time.h> +-#include <sys/errno.h> ++#include <errno.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/ioctl.h> +@@ -71,6 +71,7 @@ static char *SccsId = "nmon " VERSION; + #include <sys/time.h> + #include <sys/socket.h> + #include <sys/wait.h> ++#include <sys/cdefs.h> + + /* Windows moved here so they can be cleared when the screen mode changes */ + WINDOW *padwelcome = NULL; +@@ -576,7 +577,6 @@ struct procsinfo { + int isroot = 0; + + #include <mntent.h> +-#include <fstab.h> + #include <sys/stat.h> + #include <sys/statfs.h> + #include <net/if.h> +-- +2.13.3 +
meta-oe/recipes-support/nmon/nmon_16g.bb renamed from meta-oe/recipes-support/nmon/nmon_13g.bb +8 -6
@@ -4,14 +4,14 @@ SECTION = "console/utils" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://${WORKDIR}/Documentation.txt;md5=dbb13658cf55d687c4f2ff771a696d4a" DEPENDS = "ncurses" -PR = "r2" +DEPENDS_append_libc-musl = " bsd-headers" -SRC_URI = "${SOURCEFORGE_MIRROR}/nmon/lmon13g.c;name=lmon \ +SRC_URI = "${SOURCEFORGE_MIRROR}/nmon/lmon${PV}.c;name=lmon \ ${SOURCEFORGE_MIRROR}/nmon/Documentation.txt;name=doc \ + file://0001-lmon16g.c-Adjust-system-headers.patch \ " - -SRC_URI[lmon.md5sum] = "b1b8e6c0123ad232394991f2d4f40494" -SRC_URI[lmon.sha256sum] = "456ab2a342b31d1a352d0d940af5962fa65a12ae8757ff73e6e73210832ae8b5" +SRC_URI[lmon.md5sum] = "246ccfc74d5af55d992601fc4d3d4a72" +SRC_URI[lmon.sha256sum] = "da82dd693b503b062854dfe7dbb5d36b347872ab44a4aa05b97e9d577747f688" SRC_URI[doc.md5sum] = "dbb13658cf55d687c4f2ff771a696d4a" SRC_URI[doc.sha256sum] = "1f7f83afe62a7210be5e83cd24157adb854c14599efe0b377a7ecca933869278"
@@ -19,8 +19,10 @@ CFLAGS += "-D JFS -D GETUSER -Wall -D LARGEMEM" LDFLAGS += "-ltinfo -lncursesw" ASNEEDED_pn-nmon = "" +S = "${WORKDIR}" + do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} ${WORKDIR}/lmon13g.c -o nmon + ${CC} ${CFLAGS} ${LDFLAGS} lmon${PV}.c -o nmon } do_install() {
Signature · 1 line
2.13.3
PATCH 4/6 metacity: Fix build with musl
In reply to Khem RajSigned-off-by Khem Raj <[email protected]>
--- ...1-ui-Replace-__USE_XOPEN-with-_GNU_SOURCE.patch | 31 ++++++++++++++++++++++ .../recipes-gnome/metacity/metacity_2.34.13.bb | 5 +++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Replace-__USE_XOPEN-with-_GNU_SOURCE.patch
meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Replace-__USE_XOPEN-with-_GNU_SOURCE.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 57493928f16c6bfd054c063c511201e295128539 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 14 Jul 2017 10:26:31 -0700 +Subject: [PATCH] ui: Replace __USE_XOPEN with _GNU_SOURCE + +Defining _GNU_SOURCE defines _XOPEN_SOURCE too which inturn defined __USE_XOPEN +which is internal define for glibc + +additionally it becomes portable across musl and glibc + +Signed-off-by: Khem Raj <[email protected]> +--- + src/ui/theme.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ui/theme.c b/src/ui/theme.c +index 84b57a0..6209b51 100644 +--- a/src/ui/theme.c ++++ b/src/ui/theme.c +@@ -60,7 +60,7 @@ + #include <gtk/gtk.h> + #include <string.h> + #include <stdlib.h> +-#define __USE_XOPEN ++#define _GNU_SOURCE + #include <math.h> + + #define GDK_COLOR_RGBA(color) \ +-- +2.13.3 +
meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb +4 -1
@@ -13,7 +13,10 @@ REQUIRED_DISTRO_FEATURES = "x11" GNOME_COMPRESS_TYPE = "xz" -SRC_URI += "file://remove-yelp-help-rules-var.patch" +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ + file://remove-yelp-help-rules-var.patch \ + file://0001-ui-Replace-__USE_XOPEN-with-_GNU_SOURCE.patch \ + " SRC_URI[archive.md5sum] = "6d89b71672d4fa49fc87f83d610d0ef6" SRC_URI[archive.sha256sum] = "8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075"
Signature · 1 line
2.13.3
PATCH 5/6 monkey: Link in libexecinfo on musl
In reply to Khem RajNeeded for backtrace() APIs
Signed-off-by Khem Raj <[email protected]>
--- meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb | 8 ++++++++ 1 file changed, 8 insertions(+)
meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb +8 -0
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" SECTION = "net" +DEPENDS_append_libc-musl = " libexecinfo" + SRC_URI = "http://monkey-project.com/releases/1.5/monkey-${PV}.tar.gz \ file://monkey.service \ file://monkey.init"
@@ -24,7 +26,13 @@ EXTRA_OECONF = "--plugdir=${libdir}/monkey/ \ --disable-plugins=mbedtls \ --debug \ --malloc-libc" + +EXTRA_OEMAKE += "LIBS='${LIBS}'" + DISABLE_STATIC = "" +CLEANBROKEN = "1" + +LIBS_append_libc-musl = " -lexecinfo" inherit autotools-brokensep pkgconfig update-rc.d systemd
Signature · 1 line
2.13.3
PATCH 6/6 aufs-util: Upgrade to 4.4 release
In reply to Khem Raj- Download aufs_type.h instead of housing a local copy
- Build uses paste utility from coreutils-native
- Replace hardcoded strip command with STRIP env varible helps in cross compiling
Signed-off-by Khem Raj <[email protected]>
--- .../recipes-utils/aufs-util/aufs-util/aufs_type.h | 419 --------------------- .../recipes-utils/aufs-util/aufs-util_git.bb | 17 +- 2 files changed, 10 insertions(+), 426 deletions(-) delete mode 100644 meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs_type.h
meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs_type.h deleted +0 -419
@@ -1,419 +0,0 @@ -/* -* Copyright (C) 2005-2015 Junjiro R. Okajima -* -* This program, aufs is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef __AUFS_TYPE_H__ -#define __AUFS_TYPE_H__ - -#define AUFS_NAME "aufs" - -#ifdef __KERNEL__ -/* -* define it before including all other headers. -* sched.h may use pr_* macros before defining "current", so define the -* no-current version first, and re-define later. -*/ -#define pr_fmt (fmt) AUFS_NAME " %s:%d: " fmt, __func__, __LINE__ -#include <linux/sched.h> -#undef pr_fmt -#define pr_fmt (fmt) \ - AUFS_NAME " %s:%d:%.*s[%d]: " fmt, __func__, __LINE__, \ - (int)sizeof(current->comm), current->comm, current->pid -#else -#include <stdint.h> -#include <sys/types.h> -#endif /* __KERNEL__ */ - -#include <linux/limits.h> - -#define AUFS_VERSION "3.18-20150406" - -/* todo? move this to linux-2.6.19/include/magic.h */ -#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') - -/* ---------------------------------------------------------------------- */ - -#ifdef CONFIG_AUFS_BRANCH_MAX_127 -typedef int8_t aufs_bindex_t ; -#define AUFS_BRANCH_MAX 127 -#else -typedef int16_t aufs_bindex_t ; -#ifdef CONFIG_AUFS_BRANCH_MAX_511 -#define AUFS_BRANCH_MAX 511 -#elif defined(CONFIG_AUFS_BRANCH_MAX_1023 ) -#define AUFS_BRANCH_MAX 1023 -#elif defined(CONFIG_AUFS_BRANCH_MAX_32767 ) -#define AUFS_BRANCH_MAX 32767 -#endif -#endif - -#ifdef __KERNEL__ -#ifndef AUFS_BRANCH_MAX -#error unknown CONFIG_AUFS_BRANCH_MAX value -#endif -#endif /* __KERNEL__ */ - -/* ---------------------------------------------------------------------- */ - -#define AUFS_FSTYPE AUFS_NAME - -#define AUFS_ROOT_INO 2 -#define AUFS_FIRST_INO 11 - -#define AUFS_WH_PFX ".wh." -#define AUFS_WH_PFX_LEN ((int)sizeof(AUFS_WH_PFX) - 1) -#define AUFS_WH_TMP_LEN 4 -/* a limit for rmdir/rename a dir and copyup */ -#define AUFS_MAX_NAMELEN (NAME_MAX \ - - AUFS_WH_PFX_LEN * 2/* doubly whiteouted */ \ - - 1 /* dot */\ - - AUFS_WH_TMP_LEN) /* hex */ -#define AUFS_XINO_FNAME "." AUFS_NAME ".xino" -#define AUFS_XINO_DEFPATH "/tmp/" AUFS_XINO_FNAME -#define AUFS_XINO_DEF_SEC 30/* seconds */ -#define AUFS_XINO_DEF_TRUNC 45/* percentage */ -#define AUFS_DIRWH_DEF 3 -#define AUFS_RDCACHE_DEF 10/* seconds */ -#define AUFS_RDCACHE_MAX 3600/* seconds */ -#define AUFS_RDBLK_DEF 512/* bytes */ -#define AUFS_RDHASH_DEF 32 -#define AUFS_WKQ_NAME AUFS_NAME "d" -#define AUFS_MFS_DEF_SEC 30/* seconds */ -#define AUFS_MFS_MAX_SEC 3600/* seconds */ -#define AUFS_FHSM_CACHE_DEF_SEC 30/* seconds */ -#define AUFS_PLINK_WARN 50/* number of plinks in a single bucket */ - -/* pseudo-link maintenace under /proc */ -#define AUFS_PLINK_MAINT_NAME "plink_maint" -#define AUFS_PLINK_MAINT_DIR "fs/" AUFS_NAME -#define AUFS_PLINK_MAINT_PATH AUFS_PLINK_MAINT_DIR "/" AUFS_PLINK_MAINT_NAME - -#define AUFS_DIROPQ_NAME AUFS_WH_PFX ".opq"/* whiteouted doubly */ -#define AUFS_WH_DIROPQ AUFS_WH_PFX AUFS_DIROPQ_NAME - -#define AUFS_BASE_NAME AUFS_WH_PFX AUFS_NAME -#define AUFS_PLINKDIR_NAME AUFS_WH_PFX "plnk" -#define AUFS_ORPHDIR_NAME AUFS_WH_PFX "orph" - -/* doubly whiteouted */ -#define AUFS_WH_BASE AUFS_WH_PFX AUFS_BASE_NAME -#define AUFS_WH_PLINKDIR AUFS_WH_PFX AUFS_PLINKDIR_NAME -#define AUFS_WH_ORPHDIR AUFS_WH_PFX AUFS_ORPHDIR_NAME - -/* branch permissions and attributes */ -#define AUFS_BRPERM_RW "rw" -#define AUFS_BRPERM_RO "ro" -#define AUFS_BRPERM_RR "rr" -#define AUFS_BRATTR_COO_REG "coo_reg" -#define AUFS_BRATTR_COO_ALL "coo_all" -#define AUFS_BRATTR_FHSM "fhsm" -#define AUFS_BRATTR_UNPIN "unpin" -#define AUFS_BRATTR_ICEX "icex" -#define AUFS_BRATTR_ICEX_SEC "icexsec" -#define AUFS_BRATTR_ICEX_SYS "icexsys" -#define AUFS_BRATTR_ICEX_TR "icextr" -#define AUFS_BRATTR_ICEX_USR "icexusr" -#define AUFS_BRATTR_ICEX_OTH "icexoth" -#define AUFS_BRRATTR_WH "wh" -#define AUFS_BRWATTR_NLWH "nolwh" -#define AUFS_BRWATTR_MOO "moo" - -#define AuBrPerm_RW 1/* writable, hardlinkable wh */ -#define AuBrPerm_RO (1 << 1)/* readonly */ -#define AuBrPerm_RR (1 << 2)/* natively readonly */ -#define AuBrPerm_Mask (AuBrPerm_RW | AuBrPerm_RO | AuBrPerm_RR) - -#define AuBrAttr_COO_REG (1 << 3)/* copy-up on open */ -#define AuBrAttr_COO_ALL (1 << 4) -#define AuBrAttr_COO_Mask (AuBrAttr_COO_REG | AuBrAttr_COO_ALL) - -#define AuBrAttr_FHSM (1 << 5)/* file-based hsm */ -#define AuBrAttr_UNPIN (1 << 6)/* rename-able top dir of -branch. meaningless since -linux-3.18-rc1 */ - -/* ignore error in copying XATTR */ -#define AuBrAttr_ICEX_SEC (1 << 7) -#define AuBrAttr_ICEX_SYS (1 << 8) -#define AuBrAttr_ICEX_TR (1 << 9) -#define AuBrAttr_ICEX_USR (1 << 10) -#define AuBrAttr_ICEX_OTH (1 << 11) -#define AuBrAttr_ICEX (AuBrAttr_ICEX_SEC \ - | AuBrAttr_ICEX_SYS \ - | AuBrAttr_ICEX_TR \ - | AuBrAttr_ICEX_USR \ - | AuBrAttr_ICEX_OTH) - -#define AuBrRAttr_WH (1 << 12)/* whiteout-able */ -#define AuBrRAttr_Mask AuBrRAttr_WH - -#define AuBrWAttr_NoLinkWH (1 << 13)/* un-hardlinkable whiteouts */ -#define AuBrWAttr_MOO (1 << 14)/* move-up on open */ -#define AuBrWAttr_Mask (AuBrWAttr_NoLinkWH | AuBrWAttr_MOO) - -#define AuBrAttr_CMOO_Mask (AuBrAttr_COO_Mask | AuBrWAttr_MOO) - -/* #warning test userspace */ -#ifdef __KERNEL__ -#ifndef CONFIG_AUFS_FHSM -#undef AuBrAttr_FHSM -#define AuBrAttr_FHSM 0 -#endif -#ifndef CONFIG_AUFS_XATTR -#undef AuBrAttr_ICEX -#define AuBrAttr_ICEX 0 -#undef AuBrAttr_ICEX_SEC -#define AuBrAttr_ICEX_SEC 0 -#undef AuBrAttr_ICEX_SYS -#define AuBrAttr_ICEX_SYS 0 -#undef AuBrAttr_ICEX_TR -#define AuBrAttr_ICEX_TR 0 -#undef AuBrAttr_ICEX_USR -#define AuBrAttr_ICEX_USR 0 -#undef AuBrAttr_ICEX_OTH -#define AuBrAttr_ICEX_OTH 0 -#endif -#endif - -/* the longest combination */ -/* AUFS_BRATTR_ICEX and AUFS_BRATTR_ICEX_TR don't affect here */ -#define AuBrPermStrSz sizeof(AUFS_BRPERM_RW \ - "+" AUFS_BRATTR_COO_REG \ - "+" AUFS_BRATTR_FHSM \ - "+" AUFS_BRATTR_UNPIN \ - "+" AUFS_BRATTR_ICEX_SEC \ - "+" AUFS_BRATTR_ICEX_SYS \ - "+" AUFS_BRATTR_ICEX_USR \ - "+" AUFS_BRATTR_ICEX_OTH \ - "+" AUFS_BRWATTR_NLWH) - -typedef struct { -char a[AuBrPermStrSz]; -}au_br_perm_str_t ; - -static inline int au_br_writable (int brperm) -{ -return brperm & AuBrPerm_RW; -} - -static inline int au_br_whable (int brperm) -{ -return brperm & (AuBrPerm_RW | AuBrRAttr_WH); -} - -static inline int au_br_wh_linkable (int brperm) -{ -return !(brperm & AuBrWAttr_NoLinkWH); -} - -static inline int au_br_cmoo (int brperm) -{ -return brperm & AuBrAttr_CMOO_Mask; -} - -static inline int au_br_fhsm (int brperm) -{ -return brperm & AuBrAttr_FHSM; -} - -/* ---------------------------------------------------------------------- */ - -/* ioctl */ -enum { -/* readdir in userspace */ - AuCtl_RDU, - AuCtl_RDU_INO, - - AuCtl_WBR_FD,/* pathconf wrapper */ - AuCtl_IBUSY,/* busy inode */ - AuCtl_MVDOWN,/* move-down */ - AuCtl_BR,/* info about branches */ - AuCtl_FHSM_FD/* connection for fhsm */ -}; - -/* borrowed from linux/include/linux/kernel.h */ -#ifndef ALIGN -#define ALIGN (x, a) __ALIGN_MASK(x, (typeof(x))(a)-1) -#define __ALIGN_MASK (x, mask) (((x)+(mask))&~(mask)) -#endif - -/* borrowed from linux/include/linux/compiler-gcc3.h */ -#ifndef __aligned -#define __aligned (x) __attribute__((aligned(x))) -#endif - -#ifdef __KERNEL__ -#ifndef __packed -#define __packed __attribute__((packed)) -#endif -#endif - -struct au_rdu_cookie { -uint64_t h_pos; -int16_t bindex; -uint8_t flags; -uint8_t pad; -uint32_t generation; -}__aligned(8) ; - -struct au_rdu_ent { -uint64_t ino; -int16_t bindex; -uint8_t type; -uint8_t nlen; -uint8_t wh; -char name[0 ]; -}__aligned(8) ; - -static inline int au_rdu_len (int nlen) -{ -/* include the terminating NULL */ -return ALIGN (sizeof (struct au_rdu_ent ) + nlen +1 , -sizeof (uint64_t )); -} - -union au_rdu_ent_ul { -struct au_rdu_ent *e; -uint64_t ul; -}; - -enum { - AufsCtlRduV_SZ, - AufsCtlRduV_End -}; - -struct aufs_rdu { -/* input */ -union { -uint64_t sz;/* AuCtl_RDU */ -uint64_t nent;/* AuCtl_RDU_INO */ - }; -union au_rdu_ent_ul ent; -uint16_t verify[AufsCtlRduV_End]; - -/* input/output */ -uint32_t blk; - -/* output */ -union au_rdu_ent_ul tail; -/* number of entries which were added in a single call */ -uint64_t rent; -uint8_t full; -uint8_t shwh; - -struct au_rdu_cookie cookie; -}__aligned(8) ; - -/* ---------------------------------------------------------------------- */ - -struct aufs_wbr_fd { -uint32_t oflags; -int16_t brid; -}__aligned(8) ; - -/* ---------------------------------------------------------------------- */ - -struct aufs_ibusy { -uint64_t ino, h_ino; -int16_t bindex; -}__aligned(8) ; - -/* ---------------------------------------------------------------------- */ - -/* error code for move-down */ -/* the actual message strings are implemented in aufs-util.git */ -enum { -EAU_MVDOWN_OPAQUE =1 , -EAU_MVDOWN_WHITEOUT , -EAU_MVDOWN_UPPER , -EAU_MVDOWN_BOTTOM , -EAU_MVDOWN_NOUPPER , -EAU_MVDOWN_NOLOWERBR , - EAU_Last -}; - -/* flags for move-down */ -#define AUFS_MVDOWN_DMSG 1 -#define AUFS_MVDOWN_OWLOWER (1 << 1)/* overwrite lower */ -#define AUFS_MVDOWN_KUPPER (1 << 2)/* keep upper */ -#define AUFS_MVDOWN_ROLOWER (1 << 3)/* do even if lower is RO */ -#define AUFS_MVDOWN_ROLOWER_R (1 << 4)/* did on lower RO */ -#define AUFS_MVDOWN_ROUPPER (1 << 5)/* do even if upper is RO */ -#define AUFS_MVDOWN_ROUPPER_R (1 << 6)/* did on upper RO */ -#define AUFS_MVDOWN_BRID_UPPER (1 << 7)/* upper brid */ -#define AUFS_MVDOWN_BRID_LOWER (1 << 8)/* lower brid */ -#define AUFS_MVDOWN_FHSM_LOWER (1 << 9)/* find fhsm attr for lower */ -#define AUFS_MVDOWN_STFS (1 << 10)/* req. stfs */ -#define AUFS_MVDOWN_STFS_FAILED (1 << 11)/* output: stfs is unusable */ -#define AUFS_MVDOWN_BOTTOM (1 << 12)/* output: no more lowers */ - -/* index for move-down */ -enum { -AUFS_MVDOWN_UPPER , -AUFS_MVDOWN_LOWER , -AUFS_MVDOWN_NARRAY -}; - -/* -* additional info of move-down -* number of free blocks and inodes. -* subset of struct kstatfs, but smaller and always 64bit. -*/ -struct aufs_stfs { -uint64_t f_blocks; -uint64_t f_bavail; -uint64_t f_files; -uint64_t f_ffree; -}; - -struct aufs_stbr { -int16_t brid;/* optional input */ -int16_t bindex;/* output */ -struct aufs_stfs stfs;/* output when AUFS_MVDOWN_STFS set */ -}__aligned(8) ; - -struct aufs_mvdown { -uint32_t flags;/* input/output */ -struct aufs_stbr stbr[AUFS_MVDOWN_NARRAY ];/* input/output */ -int8_t au_errno;/* output */ -}__aligned(8) ; - -/* ---------------------------------------------------------------------- */ - -union aufs_brinfo { -/* PATH_MAX may differ between kernel-space and user-space */ -char _spacer[4096 ]; -struct { -int16_t id; -int perm; -char path[0 ]; - }; -}__aligned(8) ; - -/* ---------------------------------------------------------------------- */ - -#define AuCtlType 'A' -#define AUFS_CTL_RDU _IOWR(AuCtlType, AuCtl_RDU, struct aufs_rdu) -#define AUFS_CTL_RDU_INO _IOWR(AuCtlType, AuCtl_RDU_INO, struct aufs_rdu) -#define AUFS_CTL_WBR_FD _IOW(AuCtlType, AuCtl_WBR_FD, \ - struct aufs_wbr_fd) -#define AUFS_CTL_IBUSY _IOWR(AuCtlType, AuCtl_IBUSY, struct aufs_ibusy) -#define AUFS_CTL_MVDOWN _IOWR(AuCtlType, AuCtl_MVDOWN, \ - struct aufs_mvdown) -#define AUFS_CTL_BRINFO _IOW(AuCtlType, AuCtl_BR, union aufs_brinfo) -#define AUFS_CTL_FHSM_FD _IOW(AuCtlType, AuCtl_FHSM_FD, int) - -#endif /* __AUFS_TYPE_H__ */
meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb +10 -7
@@ -4,37 +4,40 @@ HOMEPAGE = "http://aufs.sourceforge.net/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" -DEPENDS = "aufs-util-native" +DEPENDS = "coreutils-native aufs-util-native" DEPENDS_class-native = "" -SRCREV = "bdfcc0dcfc6113146e928f85145dbd2cf9b0e080" -SRC_URI = "git://git.code.sf.net/p/aufs/aufs-util;protocol=git;branch=aufs3.18 \ +SRCREV = "89afb1806c3d2eed8db2666ae254b77518ae3ceb" +SRC_URI = "git://git.code.sf.net/p/aufs/aufs-util;protocol=git;branch=aufs4.4 \ + https://raw.githubusercontent.com/sfjro/aufs4-linux/aufs4.4/include/uapi/linux/aufs_type.h;name=aufs_type \ file://aufs-util-don-t-strip-executables.patch \ file://aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch \ - file://aufs_type.h \ " +SRC_URI[aufs_type.md5sum] = "f7b4a255dcb55fe7b0967f5f59b44f19" +SRC_URI[aufs_type.sha256sum] = "85bc8e4c1a94a7d526c382e4b047b4256cab8c4a65fc0396291707ad9a327a18" -PV = "3.14+git${SRCPV}" +PV = "4.4+git${SRCPV}" S = "${WORKDIR}/git" export HOSTCC = "${BUILD_CC}" - do_configure_prepend() { # Replace sbin,bin paths with bitbake environment sed -i -e 's;install_sbin: Tgt = ${DESTDIR}/sbin;install_sbin: Tgt = ${DESTDIR}/${base_sbindir};' \ -e 's;install_ubin: Tgt = ${DESTDIR}/usr/sbin;install_sbin: Tgt = ${DESTDIR}/${bindir};' \ ${S}/Makefile + sed -i -e 's;strip -R;${STRIP} -R;' ${S}/libau/Makefile } do_configure_append () { install -d ${S}/include/linux/ cp ${WORKDIR}/aufs_type.h ${S}/include/linux/ + sed -i -e 's;__user;;' ${S}/include/linux/aufs_type.h } do_configure_append_class-target () { for i in ver c2sh c2tmac; do - cp ${STAGING_BINDIR_NATIVE}/aufs-util-*/$i ${B} + cp ${STAGING_BINDIR_NATIVE}/aufs-util-${PV}/$i ${B} done }
Signature · 1 line
2.13.3