jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

unionfs: bump to version 2.0

Browse Source 
Drop upstream patch.
Update ioctl patch since it's still required to build for musl.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Gustavo Zacarias 2017-02-16 15:24:01 -03:00 committed by Peter Korsgaard
parent b4f54a98a3
commit 434c9777be
4 changed files with 29 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
package/unionfs/0001-Revert-to-old-pre-1.0-meta-directory.patch
View File

@ -1,36 +0,0 @@
From 93c2f9bd8b058b28016e6db2421e5b38eac0606c Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Thu, 17 Dec 2015 15:06:38 +0100
Subject: [PATCH] Revert to old pre-1.0 meta directory
Unionfs changed its meta directory from .unionfs to .unionfs-fuse with the
unionfs -> unionfs-fuse rename. The rename later got reverted everywhere
but the meta directory, so now unionfs doesn't find the whiteout files from
older releases.
Revert back to the pre-1.0 behaviour to fix this.
Committed upstream:
https://github.com/rpodgorny/unionfs-fuse/commit/93c2f9bd8b058b28016e6db2421e5b38eac0606c
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
src/unionfs.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/unionfs.h b/src/unionfs.h
index c2b5ee3..74b824f 100644
--- a/src/unionfs.h
+++ b/src/unionfs.h
@@ -10,7 +10,7 @@
#define PATHLEN_MAX 1024
#define HIDETAG "_HIDDEN~"
-#define METANAME ".unionfs-fuse"
+#define METANAME ".unionfs"
#define METADIR (METANAME "/") // string concetanation!
// fuse meta files, we might want to hide those
--
2.1.4

26
package/unionfs/0001-include-asm-ioctl.h-for-_IOC_SIZE.patch Normal file
View File

@ -0,0 +1,26 @@
From d33635fe940ff898e026d3fb77446e52f8f2bd3f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Thu, 16 Feb 2017 14:59:30 -0300
Subject: [PATCH] include asm/ioctl.h for _IOC_SIZE
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
src/unionfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/unionfs.c b/src/unionfs.c
index 5aed5ce..f6cd368 100644
--- a/src/unionfs.c
+++ b/src/unionfs.c
@@ -32,7 +32,7 @@
#include <sys/types.h>
#include <sys/time.h>
#include <inttypes.h>
-#include <sys/ioctl.h>
+#include <asm/ioctl.h>
#ifdef linux
#include <sys/vfs.h>
--
2.10.2

4
package/unionfs/unionfs.hash
View File

@ -1,3 +1,3 @@
# Locally computed # Locally computed
sha256 2ee80bd0634a61adb2159212e155d607a0a82ad659214ae6edb3530396cccc09 unionfs-1.0.tar.gz sha256 f24d7dd64c678cefacbebf2727b61e3127b8ecb6bb9176d7117dd31503455643 unionfs-2.0.tar.gz
sha256 c8526f80448f344fba0100e5510793b6de985b24a8b526d9a6803bcd713d9de2 0001-include-asm-ioctl.h-for-_IOC_SIZE.patch sha256 976ca25b7706911f1a6e981c0fd236b607f497aa0b23d407825b0aad41f7c896 0001-include-asm-ioctl.h-for-_IOC_SIZE.patch

4
package/unionfs/unionfs.mk
View File

@ -4,10 +4,8 @@
# #
################################################################################ ################################################################################
UNIONFS_VERSION = 1.0 UNIONFS_VERSION = 2.0
UNIONFS_SITE = $(call github,rpodgorny,unionfs-fuse,v$(UNIONFS_VERSION)) UNIONFS_SITE = $(call github,rpodgorny,unionfs-fuse,v$(UNIONFS_VERSION))
UNIONFS_PATCH = \
http://git.alpinelinux.org/cgit/aports/plain/main/unionfs-fuse/0001-include-asm-ioctl.h-for-_IOC_SIZE.patch
UNIONFS_DEPENDENCIES = libfuse host-pkgconf UNIONFS_DEPENDENCIES = libfuse host-pkgconf
UNIONFS_LICENSE = BSD-3c UNIONFS_LICENSE = BSD-3c
UNIONFS_LICENSE_FILES = LICENSE UNIONFS_LICENSE_FILES = LICENSE