Page MenuHomeFreeBSD
Files F142510095

D1265.id2636.diff
No OneTemporary
Actions

D1265.id2636.diff
View Options

Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1402,7 +1402,7 @@
PKGDIR?= ${MASTERDIR}
.if defined(USE_LINUX_PREFIX)
-PREFIX?= ${LINUXBASE}
+PREFIX:= ${LINUXBASE}
NO_MTREE= yes
.else
PREFIX?= ${LOCALBASE}
Index: emulators/linux_base-c6/Makefile
===================================================================
--- emulators/linux_base-c6/Makefile
+++ emulators/linux_base-c6/Makefile
@@ -128,7 +128,7 @@
USE_LINUX_PREFIX= yes
NO_WRKSUBDIR= yes
DISTINFO_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
-PLIST_SUB= GLIBCVER="2.12"
+PLIST_SUB= GLIBCVER="2.12" LINUXBASE=${LINUXBASE}
USES= shebangfix
SHEBANG_FILES= bin/redhat_lsb_init sbin/mount.tmpfs
# bash scripts need to work in chroot /compat/linux, so use env instead.
Index: emulators/linux_base-c6/pkg-plist
===================================================================
--- emulators/linux_base-c6/pkg-plist
+++ emulators/linux_base-c6/pkg-plist
@@ -2324,8 +2324,7 @@
var/mail
@sample etc/krb5.conf.sample
@sample etc/yp.conf.sample
-@dir /compat/linux
-@dir /compat
+@dir %%LINUXBASE%%
@dir etc/X11/applnk
@dir etc/X11/fontpath.d
@dir etc/ld.so.conf.d
Index: emulators/linux_base-f10/Makefile
===================================================================
--- emulators/linux_base-f10/Makefile
+++ emulators/linux_base-f10/Makefile
@@ -109,7 +109,7 @@
USE_LINUX_PREFIX= yes
NO_WRKSUBDIR= yes
DISTINFO_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
-PLIST_SUB= GLIBCVER="2.9"
+PLIST_SUB= GLIBCVER="2.9" LINUXBASE=${LINUXBASE}
EXTRACT_ONLY= ${BIN_DISTFILES}
Index: emulators/linux_base-f10/pkg-plist
===================================================================
--- emulators/linux_base-f10/pkg-plist
+++ emulators/linux_base-f10/pkg-plist
@@ -1995,6 +1995,7 @@
usr/share/man/man8/tune2fs.8.gz
usr/tmp
var/mail
+@dir %%LINUXBASE%%
@rmtry var/cache/ldconfig/aux-cache
@comment empty directory listing
@dir var/yp

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 21, 12:34 PM (9 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27803881
Default Alt Text
D1265.id2636.diff (1 KB)

Event Timeline