summaryrefslogtreecommitdiffstats
path: root/meta-filesystems
diff options
context:
space:
mode:
Diffstat (limited to 'meta-filesystems')
-rw-r--r--meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-Make-build-support-usrmerge.patch43
-rw-r--r--meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb1
2 files changed, 44 insertions, 0 deletions
diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-Make-build-support-usrmerge.patch b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-Make-build-support-usrmerge.patch
new file mode 100644
index 000000000..fce10b999
--- /dev/null
+++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-Make-build-support-usrmerge.patch
@@ -0,0 +1,43 @@
1From 33f678bf74367aab8ddc2858a9f7797455ea9b9f Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 29 Aug 2019 10:21:58 +0800
4Subject: [PATCH] Make build support usrmerge
5
6Upstream-Status: Inappropriate[oe-specific]
7
8Signed-off-by: Changqing Li <changqing.li@windriver.com>
9---
10 ntfsprogs/Makefile.am | 2 --
11 src/Makefile.am | 3 ---
12 2 files changed, 5 deletions(-)
13
14diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am
15index f4f9d1b..1f6a673 100644
16--- a/ntfsprogs/Makefile.am
17+++ b/ntfsprogs/Makefile.am
18@@ -165,8 +165,6 @@ extras: libs $(EXTRA_PROGRAMS)
19
20 if ENABLE_MOUNT_HELPER
21 install-exec-hook:
22- $(INSTALL) -d $(DESTDIR)/sbin
23- $(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/sbin/mkfs.ntfs
24
25 install-data-hook:
26 $(INSTALL) -d $(DESTDIR)$(man8dir)
27diff --git a/src/Makefile.am b/src/Makefile.am
28index 8d98408..d0a6a45 100644
29--- a/src/Makefile.am
30+++ b/src/Makefile.am
31@@ -66,9 +66,6 @@ endif
32
33 if ENABLE_MOUNT_HELPER
34 install-exec-local: install-rootbinPROGRAMS
35- $(MKDIR_P) "$(DESTDIR)/sbin"
36- $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g"
37- $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
38
39 install-data-local: install-man8
40 $(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8"
41--
422.7.4
43
diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb
index addb4d351..1559bfd3f 100644
--- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb
+++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
8 8
9SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \ 9SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \
10 file://0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch \ 10 file://0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch \
11 ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-Make-build-support-usrmerge.patch','',d)} \
11" 12"
12S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}" 13S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}"
13SRC_URI[md5sum] = "d97474ae1954f772c6d2fa386a6f462c" 14SRC_URI[md5sum] = "d97474ae1954f772c6d2fa386a6f462c"