diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-04-22 16:24:11 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-04-22 16:24:11 +0000 |
| commit | eb40118d02731f17bc662ee858f5a71067947987 (patch) | |
| tree | eece2d4a53b30a7503506d0dee2b7f6c53cc8b06 /emulators | |
| parent | 43ba324fd538663edba9d2cbf0a89e5ea32b3ca8 (diff) | |
| download | ports-eb40118d02731f17bc662ee858f5a71067947987.tar.gz ports-eb40118d02731f17bc662ee858f5a71067947987.zip | |
On all supported version of FreeBSD tar do support rpm as an archive format.
So directly use tar to extract linux* distfiles instead of rpm2cpio.
Notes
Notes:
svn path=/head/; revision=316247
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/linux_base-c6/Makefile | 10 | ||||
| -rw-r--r-- | emulators/linux_base-f10/Makefile | 10 |
2 files changed, 6 insertions, 14 deletions
diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile index eaf711f6e4ae..cc89731d6a64 100644 --- a/emulators/linux_base-c6/Makefile +++ b/emulators/linux_base-c6/Makefile @@ -114,14 +114,10 @@ PLIST_SUB= GLIBCVER="2.12" # - research what are the important differences between 2.6.16 and 2.6.18, and # if we need to add something to the linuxulator -RPM2CPIO?= ${LOCALBASE}/bin/rpm2cpio - -EXTRACT_DEPENDS+= ${RPM2CPIO}:${PORTSDIR}/archivers/rpm - EXTRACT_ONLY= ${BIN_DISTFILES} -EXTRACT_CMD?= ${RPM2CPIO} -EXTRACT_BEFORE_ARGS?= -EXTRACT_AFTER_ARGS?= | ${CPIO} -id --quiet +EXTRACT_CMD?= ${TAR} +EXTRACT_BEFORE_ARGS?= -xf +EXTRACT_AFTER_ARGS?= .include <bsd.port.pre.mk> diff --git a/emulators/linux_base-f10/Makefile b/emulators/linux_base-f10/Makefile index 6cc5b877967f..6f73d1e81845 100644 --- a/emulators/linux_base-f10/Makefile +++ b/emulators/linux_base-f10/Makefile @@ -110,14 +110,10 @@ NO_WRKSUBDIR= yes DISTINFO_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} PLIST_SUB= GLIBCVER="2.9" -RPM2CPIO?= ${LOCALBASE}/bin/rpm2cpio - -EXTRACT_DEPENDS+= ${RPM2CPIO}:${PORTSDIR}/archivers/rpm - EXTRACT_ONLY= ${BIN_DISTFILES} -EXTRACT_CMD?= ${RPM2CPIO} -EXTRACT_BEFORE_ARGS?= -EXTRACT_AFTER_ARGS?= | ${CPIO} -id --quiet +EXTRACT_CMD?= ${TAR} +EXTRACT_BEFORE_ARGS?= -xf +EXTRACT_AFTER_ARGS?= .include <bsd.port.pre.mk> |