diff options
author | bsam <bsam@FreeBSD.org> | 2006-06-24 01:07:39 +0800 |
---|---|---|
committer | bsam <bsam@FreeBSD.org> | 2006-06-24 01:07:39 +0800 |
commit | 77b1207a208c43bb8777d906d58d8461bee6613f (patch) | |
tree | 8bead7bfddc2c765ef0a1ede6e714d34cb686447 | |
parent | 1cd979b00fbae25ab100ebe09e1c9c02e0355240 (diff) | |
download | freebsd-ports-gnome-77b1207a208c43bb8777d906d58d8461bee6613f.tar.gz freebsd-ports-gnome-77b1207a208c43bb8777d906d58d8461bee6613f.tar.zst freebsd-ports-gnome-77b1207a208c43bb8777d906d58d8461bee6613f.zip |
First do "brandelf -t Linux" at WRKSRC and then do install. This
makes impossible to shoot oneself to the foot if PREFIX is set to
/usr/local.
Reported by: consumidor <consumidor@mundinho.com.br> at emulation@ ML
Approved by: netchild (mentor)
-rw-r--r-- | emulators/linux_base-c6/Makefile | 9 | ||||
-rw-r--r-- | emulators/linux_base-f10/Makefile | 9 | ||||
-rw-r--r-- | emulators/linux_base-f7/Makefile | 9 | ||||
-rw-r--r-- | emulators/linux_base-f8/Makefile | 9 | ||||
-rw-r--r-- | emulators/linux_base-f9/Makefile | 9 | ||||
-rw-r--r-- | emulators/linux_base-f9/linux_base-f8/Makefile | 9 | ||||
-rw-r--r-- | emulators/linux_base-fc3/Makefile | 9 | ||||
-rw-r--r-- | emulators/linux_base-fc4/Makefile | 9 | ||||
-rw-r--r-- | emulators/linux_base-fc6/Makefile | 9 | ||||
-rw-r--r-- | emulators/linux_base-fc7/Makefile | 9 |
10 files changed, 50 insertions, 40 deletions
diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile index 05e228822016..dc791aeb6691 100644 --- a/emulators/linux_base-c6/Makefile +++ b/emulators/linux_base-c6/Makefile @@ -172,6 +172,11 @@ do-build: # @${MV} ${WRKSRC}/etc/nsswitch.conf ${WRKSRC}/etc/nsswitch.conf.dist + @${FIND} ${WRKSRC}/bin ${WRKSRC}/sbin/ ${WRKSRC}/usr/bin \ + ${WRKSRC}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ + | ${GREP} ELF | ${CUT} -d : -f 1 \ + | ${XARGS} ${BRANDELF} -t Linux + do-install: # # Handle the loading of the linux loadable kernel module if required. @@ -184,10 +189,6 @@ do-install: @cd ${WRKSRC} && ${FIND} * ! -type d \ | ${CPIO} -pm -R root:wheel ${PREFIX} - @${FIND} ${PREFIX}/bin ${PREFIX}/sbin/ ${PREFIX}/usr/bin \ - ${PREFIX}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ - | ${GREP} ELF | ${CUT} -d : -f 1 \ - | ${XARGS} ${BRANDELF} -t Linux @${LN} -sf /var/tmp ${PREFIX}/usr/tmp @${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail @${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail diff --git a/emulators/linux_base-f10/Makefile b/emulators/linux_base-f10/Makefile index 05e228822016..dc791aeb6691 100644 --- a/emulators/linux_base-f10/Makefile +++ b/emulators/linux_base-f10/Makefile @@ -172,6 +172,11 @@ do-build: # @${MV} ${WRKSRC}/etc/nsswitch.conf ${WRKSRC}/etc/nsswitch.conf.dist + @${FIND} ${WRKSRC}/bin ${WRKSRC}/sbin/ ${WRKSRC}/usr/bin \ + ${WRKSRC}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ + | ${GREP} ELF | ${CUT} -d : -f 1 \ + | ${XARGS} ${BRANDELF} -t Linux + do-install: # # Handle the loading of the linux loadable kernel module if required. @@ -184,10 +189,6 @@ do-install: @cd ${WRKSRC} && ${FIND} * ! -type d \ | ${CPIO} -pm -R root:wheel ${PREFIX} - @${FIND} ${PREFIX}/bin ${PREFIX}/sbin/ ${PREFIX}/usr/bin \ - ${PREFIX}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ - | ${GREP} ELF | ${CUT} -d : -f 1 \ - | ${XARGS} ${BRANDELF} -t Linux @${LN} -sf /var/tmp ${PREFIX}/usr/tmp @${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail @${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail diff --git a/emulators/linux_base-f7/Makefile b/emulators/linux_base-f7/Makefile index 05e228822016..dc791aeb6691 100644 --- a/emulators/linux_base-f7/Makefile +++ b/emulators/linux_base-f7/Makefile @@ -172,6 +172,11 @@ do-build: # @${MV} ${WRKSRC}/etc/nsswitch.conf ${WRKSRC}/etc/nsswitch.conf.dist + @${FIND} ${WRKSRC}/bin ${WRKSRC}/sbin/ ${WRKSRC}/usr/bin \ + ${WRKSRC}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ + | ${GREP} ELF | ${CUT} -d : -f 1 \ + | ${XARGS} ${BRANDELF} -t Linux + do-install: # # Handle the loading of the linux loadable kernel module if required. @@ -184,10 +189,6 @@ do-install: @cd ${WRKSRC} && ${FIND} * ! -type d \ | ${CPIO} -pm -R root:wheel ${PREFIX} - @${FIND} ${PREFIX}/bin ${PREFIX}/sbin/ ${PREFIX}/usr/bin \ - ${PREFIX}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ - | ${GREP} ELF | ${CUT} -d : -f 1 \ - | ${XARGS} ${BRANDELF} -t Linux @${LN} -sf /var/tmp ${PREFIX}/usr/tmp @${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail @${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail diff --git a/emulators/linux_base-f8/Makefile b/emulators/linux_base-f8/Makefile index 05e228822016..dc791aeb6691 100644 --- a/emulators/linux_base-f8/Makefile +++ b/emulators/linux_base-f8/Makefile @@ -172,6 +172,11 @@ do-build: # @${MV} ${WRKSRC}/etc/nsswitch.conf ${WRKSRC}/etc/nsswitch.conf.dist + @${FIND} ${WRKSRC}/bin ${WRKSRC}/sbin/ ${WRKSRC}/usr/bin \ + ${WRKSRC}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ + | ${GREP} ELF | ${CUT} -d : -f 1 \ + | ${XARGS} ${BRANDELF} -t Linux + do-install: # # Handle the loading of the linux loadable kernel module if required. @@ -184,10 +189,6 @@ do-install: @cd ${WRKSRC} && ${FIND} * ! -type d \ | ${CPIO} -pm -R root:wheel ${PREFIX} - @${FIND} ${PREFIX}/bin ${PREFIX}/sbin/ ${PREFIX}/usr/bin \ - ${PREFIX}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ - | ${GREP} ELF | ${CUT} -d : -f 1 \ - | ${XARGS} ${BRANDELF} -t Linux @${LN} -sf /var/tmp ${PREFIX}/usr/tmp @${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail @${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail diff --git a/emulators/linux_base-f9/Makefile b/emulators/linux_base-f9/Makefile index 05e228822016..dc791aeb6691 100644 --- a/emulators/linux_base-f9/Makefile +++ b/emulators/linux_base-f9/Makefile @@ -172,6 +172,11 @@ do-build: # @${MV} ${WRKSRC}/etc/nsswitch.conf ${WRKSRC}/etc/nsswitch.conf.dist + @${FIND} ${WRKSRC}/bin ${WRKSRC}/sbin/ ${WRKSRC}/usr/bin \ + ${WRKSRC}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ + | ${GREP} ELF | ${CUT} -d : -f 1 \ + | ${XARGS} ${BRANDELF} -t Linux + do-install: # # Handle the loading of the linux loadable kernel module if required. @@ -184,10 +189,6 @@ do-install: @cd ${WRKSRC} && ${FIND} * ! -type d \ | ${CPIO} -pm -R root:wheel ${PREFIX} - @${FIND} ${PREFIX}/bin ${PREFIX}/sbin/ ${PREFIX}/usr/bin \ - ${PREFIX}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ - | ${GREP} ELF | ${CUT} -d : -f 1 \ - | ${XARGS} ${BRANDELF} -t Linux @${LN} -sf /var/tmp ${PREFIX}/usr/tmp @${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail @${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail diff --git a/emulators/linux_base-f9/linux_base-f8/Makefile b/emulators/linux_base-f9/linux_base-f8/Makefile index 05e228822016..dc791aeb6691 100644 --- a/emulators/linux_base-f9/linux_base-f8/Makefile +++ b/emulators/linux_base-f9/linux_base-f8/Makefile @@ -172,6 +172,11 @@ do-build: # @${MV} ${WRKSRC}/etc/nsswitch.conf ${WRKSRC}/etc/nsswitch.conf.dist + @${FIND} ${WRKSRC}/bin ${WRKSRC}/sbin/ ${WRKSRC}/usr/bin \ + ${WRKSRC}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ + | ${GREP} ELF | ${CUT} -d : -f 1 \ + | ${XARGS} ${BRANDELF} -t Linux + do-install: # # Handle the loading of the linux loadable kernel module if required. @@ -184,10 +189,6 @@ do-install: @cd ${WRKSRC} && ${FIND} * ! -type d \ | ${CPIO} -pm -R root:wheel ${PREFIX} - @${FIND} ${PREFIX}/bin ${PREFIX}/sbin/ ${PREFIX}/usr/bin \ - ${PREFIX}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ - | ${GREP} ELF | ${CUT} -d : -f 1 \ - | ${XARGS} ${BRANDELF} -t Linux @${LN} -sf /var/tmp ${PREFIX}/usr/tmp @${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail @${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail diff --git a/emulators/linux_base-fc3/Makefile b/emulators/linux_base-fc3/Makefile index 0bae9bb7d782..7399c52d44f7 100644 --- a/emulators/linux_base-fc3/Makefile +++ b/emulators/linux_base-fc3/Makefile @@ -172,6 +172,11 @@ do-build: # @${MV} ${WRKSRC}/etc/nsswitch.conf ${WRKSRC}/etc/nsswitch.conf.dist + @${FIND} ${WRKSRC}/bin ${WRKSRC}/sbin/ ${WRKSRC}/usr/bin \ + ${WRKSRC}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ + | ${GREP} ELF | ${CUT} -d : -f 1 \ + | ${XARGS} ${BRANDELF} -t Linux + do-install: # # Handle the loading of the linux loadable kernel module if required. @@ -184,10 +189,6 @@ do-install: @cd ${WRKSRC} && ${FIND} * ! -type d \ | ${CPIO} -pm -R root:wheel ${PREFIX} - @${FIND} ${PREFIX}/bin ${PREFIX}/sbin/ ${PREFIX}/usr/bin \ - ${PREFIX}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ - | ${GREP} ELF | ${CUT} -d : -f 1 \ - | ${XARGS} ${BRANDELF} -t Linux @${LN} -sf /var/tmp ${PREFIX}/usr/tmp @${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail @${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail diff --git a/emulators/linux_base-fc4/Makefile b/emulators/linux_base-fc4/Makefile index 05e228822016..dc791aeb6691 100644 --- a/emulators/linux_base-fc4/Makefile +++ b/emulators/linux_base-fc4/Makefile @@ -172,6 +172,11 @@ do-build: # @${MV} ${WRKSRC}/etc/nsswitch.conf ${WRKSRC}/etc/nsswitch.conf.dist + @${FIND} ${WRKSRC}/bin ${WRKSRC}/sbin/ ${WRKSRC}/usr/bin \ + ${WRKSRC}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ + | ${GREP} ELF | ${CUT} -d : -f 1 \ + | ${XARGS} ${BRANDELF} -t Linux + do-install: # # Handle the loading of the linux loadable kernel module if required. @@ -184,10 +189,6 @@ do-install: @cd ${WRKSRC} && ${FIND} * ! -type d \ | ${CPIO} -pm -R root:wheel ${PREFIX} - @${FIND} ${PREFIX}/bin ${PREFIX}/sbin/ ${PREFIX}/usr/bin \ - ${PREFIX}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ - | ${GREP} ELF | ${CUT} -d : -f 1 \ - | ${XARGS} ${BRANDELF} -t Linux @${LN} -sf /var/tmp ${PREFIX}/usr/tmp @${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail @${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail diff --git a/emulators/linux_base-fc6/Makefile b/emulators/linux_base-fc6/Makefile index 05e228822016..dc791aeb6691 100644 --- a/emulators/linux_base-fc6/Makefile +++ b/emulators/linux_base-fc6/Makefile @@ -172,6 +172,11 @@ do-build: # @${MV} ${WRKSRC}/etc/nsswitch.conf ${WRKSRC}/etc/nsswitch.conf.dist + @${FIND} ${WRKSRC}/bin ${WRKSRC}/sbin/ ${WRKSRC}/usr/bin \ + ${WRKSRC}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ + | ${GREP} ELF | ${CUT} -d : -f 1 \ + | ${XARGS} ${BRANDELF} -t Linux + do-install: # # Handle the loading of the linux loadable kernel module if required. @@ -184,10 +189,6 @@ do-install: @cd ${WRKSRC} && ${FIND} * ! -type d \ | ${CPIO} -pm -R root:wheel ${PREFIX} - @${FIND} ${PREFIX}/bin ${PREFIX}/sbin/ ${PREFIX}/usr/bin \ - ${PREFIX}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ - | ${GREP} ELF | ${CUT} -d : -f 1 \ - | ${XARGS} ${BRANDELF} -t Linux @${LN} -sf /var/tmp ${PREFIX}/usr/tmp @${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail @${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail diff --git a/emulators/linux_base-fc7/Makefile b/emulators/linux_base-fc7/Makefile index 05e228822016..dc791aeb6691 100644 --- a/emulators/linux_base-fc7/Makefile +++ b/emulators/linux_base-fc7/Makefile @@ -172,6 +172,11 @@ do-build: # @${MV} ${WRKSRC}/etc/nsswitch.conf ${WRKSRC}/etc/nsswitch.conf.dist + @${FIND} ${WRKSRC}/bin ${WRKSRC}/sbin/ ${WRKSRC}/usr/bin \ + ${WRKSRC}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ + | ${GREP} ELF | ${CUT} -d : -f 1 \ + | ${XARGS} ${BRANDELF} -t Linux + do-install: # # Handle the loading of the linux loadable kernel module if required. @@ -184,10 +189,6 @@ do-install: @cd ${WRKSRC} && ${FIND} * ! -type d \ | ${CPIO} -pm -R root:wheel ${PREFIX} - @${FIND} ${PREFIX}/bin ${PREFIX}/sbin/ ${PREFIX}/usr/bin \ - ${PREFIX}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \ - | ${GREP} ELF | ${CUT} -d : -f 1 \ - | ${XARGS} ${BRANDELF} -t Linux @${LN} -sf /var/tmp ${PREFIX}/usr/tmp @${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail @${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail |