CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

ntfs-3g-ntfsprogs: Make it support usrmerge properly

Browse Source 
An attempt to solve the problem that some files are installed to /sbin
even though the usrmerge distro feature is enabled was made in commit
97c0af59 ("ntfs-3g-ntfsprogs: support usrmerge"). However, it merely
just removed the problematic files, which meant that the package was
rendered unusable.

Solve the problem properly by moving all files that are installed in
/sbin to ${base_sbindir} instead.

Also clear up a cryptic comment.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Peter Kjellerstedt 2020-02-14 17:42:52 +01:00 committed by Khem Raj
parent 69c0e0d842
commit ba3e92238b
2 changed files with 11 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-Make-build-support-usrmerge.patch
View File

@ -1,43 +0,0 @@
From 33f678bf74367aab8ddc2858a9f7797455ea9b9f Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Thu, 29 Aug 2019 10:21:58 +0800
Subject: [PATCH] Make build support usrmerge
Upstream-Status: Inappropriate[oe-specific]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
ntfsprogs/Makefile.am | 2 --
src/Makefile.am | 3 ---
2 files changed, 5 deletions(-)
diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am
index f4f9d1b..1f6a673 100644
--- a/ntfsprogs/Makefile.am
+++ b/ntfsprogs/Makefile.am
@@ -165,8 +165,6 @@ extras: libs $(EXTRA_PROGRAMS)
if ENABLE_MOUNT_HELPER
install-exec-hook:
- $(INSTALL) -d $(DESTDIR)/sbin
- $(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/sbin/mkfs.ntfs
install-data-hook:
$(INSTALL) -d $(DESTDIR)$(man8dir)
diff --git a/src/Makefile.am b/src/Makefile.am
index 8d98408..d0a6a45 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,9 +66,6 @@ endif
if ENABLE_MOUNT_HELPER
install-exec-local: install-rootbinPROGRAMS
- $(MKDIR_P) "$(DESTDIR)/sbin"
- $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g"
- $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
install-data-local: install-man8
$(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8"
--
2.7.4

15
meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb
View File

@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \
file://0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch \
${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-Make-build-support-usrmerge.patch','',d)} \
"
S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}"
SRC_URI[md5sum] = "d97474ae1954f772c6d2fa386a6f462c"
@ -35,10 +34,18 @@ FILES_ntfsprogs = "${base_sbindir}/* ${bindir}/* ${sbindir}/*"
FILES_libntfs-3g = "${libdir}/*${SOLIBS}"
do_install_append() {
# Standard mount will execute the program /sbin/mount.TYPE
# when called. Add the symbolic to let mount could find ntfs.
ln -sf mount.ntfs-3g ${D}/${base_sbindir}/mount.ntfs
# Standard mount will execute the program /sbin/mount.TYPE when called.
# Add a symbolic link to let mount find ntfs.
ln -sf mount.ntfs-3g ${D}${base_sbindir}/mount.ntfs
rmdir ${D}${libdir}/ntfs-3g
# Handle when usrmerge is in effect. Some files are installed to /sbin
# regardless of the value of ${base_sbindir}.
if [ "${base_sbindir}" != /sbin ] && [ -d ${D}/sbin ]; then
mkdir -p ${D}${base_sbindir}
mv ${D}/sbin/* ${D}${base_sbindir}
rmdir ${D}/sbin
fi
}
# Satisfy the -dev runtime dependency