FreeBSD Bugzilla – Attachment 172739 Details for
Bug 210926
[NEW PORT] emulators/linux_base-c7: base port for future linux-c7 metaport
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Mk patch
Mk.patch (text/plain), 6.73 KB, created by
Piotr Kubaj
on 2016-07-20 00:11:15 UTC
(
hide
)
Description:
Mk patch
Filename:
MIME Type:
Creator:
Piotr Kubaj
Created:
2016-07-20 00:11:15 UTC
Size:
6.73 KB
patch
obsolete
>Index: bsd.linux-apps.mk >=================================================================== >--- bsd.linux-apps.mk (revision 418638) >+++ bsd.linux-apps.mk (working copy) >@@ -41,11 +41,11 @@ > > #new > . if defined(OVERRIDE_LINUX_NONBASE_PORTS) >-. if ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10" || ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6" || ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6_64" >+. if ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10" || ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6" || ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6_64" || ${OVERRIDE_LINUX_NONBASE_PORTS} == "c7" || ${OVERRIDE_LINUX_NONBASE_PORTS} == "c7_64" > LINUX_DIST_SUFFIX= -${OVERRIDE_LINUX_NONBASE_PORTS} > LINUX_BASEPORT_NAME= -${OVERRIDE_LINUX_NONBASE_PORTS:S/_64//} > . else >-IGNORE= valid values for OVERRIDE_LINUX_NONBASE_PORTS are: \"f10\", \"c6\", and \"c6_64\" >+IGNORE= valid values for OVERRIDE_LINUX_NONBASE_PORTS are: \"c7\", \"c7_64", \"f10\", \"c6\", and \"c6_64\" > . endif > . elif defined(USE_LINUX) > LINUX_DIST_SUFFIX= -${USE_LINUX} >Index: bsd.linux-rpm.mk >=================================================================== >--- bsd.linux-rpm.mk (revision 418638) >+++ bsd.linux-rpm.mk (working copy) >@@ -12,6 +12,8 @@ > # e.g. 10 for fedora 10 > # Valid values for "centos": all version numbers > # e.g. 6.8 for centos 6.8 >+# Valid values for "centos7": all version numbers >+# e.g. 7.2.1511 for centos 7.2.1511 > # This is used to set MASTER_SITE_{,SRC_}SUBDIR > # if it isn't already set. > # MASTER_SITE_SRC_SUBDIR >@@ -53,6 +55,12 @@ > > .endif > >+. if (${USE_LINUX} == "c7" || (defined(OVERRIDE_LINUX_BASE_PORT) && (${OVERRIDE_LINUX_BASE_PORT} == "c7" || \ >+ ${OVERRIDE_LINUX_BASE_PORT} == "c7_64"))) && ${OSVERSION} < 1003000 >+IGNORE= Only for FreeBSD 10.3+ >+. endif >+ >+ > .if defined(_POSTMKINCLUDED) && !defined(Linux_RPM_Post_Include) > > Linux_RPM_Post_Include= bsd.linux-rpm.mk >@@ -61,6 +69,9 @@ > USE_LINUX?= "f10" > LINUX_DIST= fedora > LINUX_DIST_VER= 10 >+.elif ${USE_LINUX} == "c7" || ${USE_LINUX} == "c7_64" >+LINUX_DIST= centos >+LINUX_DIST_VER= 7.2.1511 > .else # default to CentOS > LINUX_DIST= centos > LINUX_DIST_VER= 6.8 >@@ -88,8 +99,12 @@ > . endif > . elif ${LINUX_DIST} == "centos" > MASTER_SITES?= ${MASTER_SITE_CENTOS_LINUX} ${MASTER_SITE_CENTOS_LINUX_UPDATES} >-MASTER_SITE_SUBDIR?= centos/${LINUX_DIST_VER}/os/${LINUX_REPO_ARCH}/Packages/ \ >- centos/${LINUX_DIST_VER}/updates/${LINUX_REPO_ARCH}/Packages/ >+MASTER_SITE_SUBDIR?= centos/${LINUX_DIST_VER}/os/${LINUX_REPO_ARCH}/Packages \ >+ centos/${LINUX_DIST_VER}/updates/${LINUX_REPO_ARCH}/Packages >+. if ${LINUX_DIST_VER} == "7.2.1511" >+MASTER_SITE_SUBDIR+= altarch/${LINUX_DIST_VER}/os/${LINUX_REPO_ARCH}/Packages \ >+ altarch/${LINUX_DIST_VER}/updates/${LINUX_REPO_ARCH}/Packages >+. endif > . if ${LINUX_DIST_VER} == "5" #needed for Qt... > LINUX_RPM_ARCH= i386 > MASTER_SITE_SUBDIR= centos/5/os/i386/Packages/ >@@ -97,7 +112,7 @@ > . if defined(PACKAGE_BUILDING) > _SRC_GROUP=:SOURCE > MASTER_SITES+= http://vault.centos.org/%SUBDIR%/:SOURCE >-MASTER_SITE_SUBDIR+= ${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE >+MASTER_SITE_SUBDIR+= ${LINUX_DIST_VER}/os/Source/SPackages:SOURCE > . endif > . endif > .endif >@@ -118,7 +133,7 @@ > WRKSRC:= ${WRKSRC:S/-${RPMVERSION}$//} > > # Define files to install. >-# Ports can want to install 32bit things only (if OVERRIDE_LINUX_NONBASE_PORTS) is off, >+# Ports can want to install 32bit things only (if OVERRIDE_LINUX_NONBASE_PORTS is off), > # they can want to install both 32bit and 64bit things of only one package, > # or they can want to install a 64bit only binary and e.g. 32/64bit libraries. > >@@ -125,7 +140,8 @@ > # The following glue is supposed to handle this. > # FIXME: Sensibly refactor this part, it looks like spaghetti. > >-. if defined(OVERRIDE_LINUX_NONBASE_PORTS) && ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6_64" >+. if defined(OVERRIDE_LINUX_NONBASE_PORTS) && ( ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6_64" || \ >+${OVERRIDE_LINUX_NONBASE_PORTS} == "c7_64" ) > _32BIT_LINUX_RPM_ARCH= i686 > . if ${DISTFILES} == ${DISTNAME}${EXTRACT_SUFX} && ${USE_LINUX_RPM} != "nolib" > _32BIT_LIB_DISTFILES:= ${DISTFILES:S/${LINUX_RPM_ARCH}/${_32BIT_LINUX_RPM_ARCH}/g} >@@ -146,7 +162,7 @@ > . endif > > .if !defined(USE_LINUX_RPM_BAD_PERMS) >-EXTRACT_CMD?= ${TAR} >+EXTRACT_CMD?= ${TAR} > EXTRACT_BEFORE_ARGS?= --no-same-permissions --no-same-owner -xf > EXTRACT_AFTER_ARGS?= > .else >@@ -187,9 +203,13 @@ > _LINUX_BASE_SUFFIX= c6 > . elif ${USE_LINUX} == "c6_64" > _LINUX_BASE_SUFFIX= c6 >+. elif ${USE_LINUX} == "c7" >+_LINUX_BASE_SUFFIX== c7 >+. elif ${USE_LINUX} == "c7_64" >+_LINUX_BASE_SUFFIX== c7_64 > . else > # other linux_base ports do not provide a pkg-plist file >-IGNORE= uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\", \"f10\", \"c6\", and \"c6_64\" >+IGNORE= uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\", \"c7\", \"c7_64\", \"f10\", \"c6\", and \"c6_64\" > . endif > > PLIST?= ${WRKDIR}/.PLIST.linux-rpm >Index: bsd.port.mk >=================================================================== >--- bsd.port.mk (revision 418638) >+++ bsd.port.mk (working copy) >@@ -1780,7 +1780,7 @@ > > # Allow the user to specify another linux_base version. > . if defined(OVERRIDE_LINUX_BASE_PORT) >-. if ${USE_LINUX:tl} == yes || (${USE_LINUX} == "c6" && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64") >+. if ${USE_LINUX:tl} == yes || (${USE_LINUX} == "c6" && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64") || (${USE_LINUX} == "c7" && ${OVERRIDE_LINUX_BASE_PORT} == "c7_64") > USE_LINUX= ${OVERRIDE_LINUX_BASE_PORT} > . endif > . endif >@@ -1796,18 +1796,20 @@ > LINUX_BASE_PORT= ${LINUXBASE}/etc/redhat-release:emulators/linux_base-c6 > . elif ${USE_LINUX} == "c6_64" > LINUX_BASE_PORT= ${LINUXBASE}/etc/redhat-release:emulators/linux_base-c6 >+. elif ${USE_LINUX} == "c7_64" >+LINUX_BASE_PORT= ${LINUXBASE}/etc/redhat-release:emulators/linux_base-c7 > . else > IGNORE= cannot be built: there is no emulators/linux_base-${USE_LINUX}, perhaps wrong use of USE_LINUX or OVERRIDE_LINUX_BASE_PORT > . endif > . endif > >-. if ${USE_LINUX} == "c6_64" || (defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64") >+. if (${USE_LINUX} == "c6_64" || ${USE_LINUX} == "c7_64") || (defined(OVERRIDE_LINUX_BASE_PORT) && (${OVERRIDE_LINUX_BASE_PORT} == "c6_64" || ${OVERRIDE_LINUX_BASE_PORT} == "c7_64")) > . if ${ARCH} != "amd64" > IGNORE= Cannot install 64 bit Linux on non-64bit platforms > . endif > LINUX_RPM_ARCH?= x86_64 > LINUX_REPO_ARCH?= x86_64 >-. elif ${USE_LINUX} == "c6" || ${USE_LINUX} == "yes" # default to CentOS >+. elif ${USE_LINUX} == "c6" || ${USE_LINUX} == "c7" || ${USE_LINUX} == "yes" # default to CentOS > LINUX_RPM_ARCH?= i686 > LINUX_REPO_ARCH?= i386 > . elif ${USE_LINUX} == "f10"
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 210926
:
172242
|
172243
|
172244
|
172328
|
172619
|
172620
|
172728
|
172729
|
172733
|
172737
|
172738
|
172739
|
172851
|
173384
|
173567