diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-01-22 01:39:09 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-01-22 01:39:09 +0000 |
| commit | 68342fefe14a5989615b104b317db547651eaf1f (patch) | |
| tree | 02be9811ee15f218e99905d0b3499bd202ffc180 /emulators/linux_base | |
| parent | Remove mozilla-headers and mozilla-headers-devel (diff) | |
Remove the two checksums for redhat-release-7.1-1.noarch.rpm from each
distinfo file, and instead fetch this one from from the i386 directory for
both Alpha and i386 architectures. Based on the previous commit that
duplicated these entries in the plist, these files should be more or
less identical. Note: ftp-master will be updated soon with the correct
distfile. [1]
Also, remove redundant slashes from the jail message. [2]
PR: 61660 [1]
61697 [2]
Submitted by: Linh Pham <question@closedsrc.org> [2]
Notes
Notes:
svn path=/head/; revision=98747
Diffstat (limited to 'emulators/linux_base')
| -rw-r--r-- | emulators/linux_base/Makefile | 14 | ||||
| -rw-r--r-- | emulators/linux_base/distinfo.alpha | 1 | ||||
| -rw-r--r-- | emulators/linux_base/distinfo.i386 | 1 |
3 files changed, 8 insertions, 8 deletions
diff --git a/emulators/linux_base/Makefile b/emulators/linux_base/Makefile index 112c0af2ff9f..0046a3f10abc 100644 --- a/emulators/linux_base/Makefile +++ b/emulators/linux_base/Makefile @@ -9,9 +9,11 @@ PORTNAME= linux_base PORTVERSION= 7.1 PORTREVISION= 5 CATEGORIES= emulators linux -MASTER_SITES= ${MASTER_SITE_REDHAT_LINUX} -MASTER_SITE_SUBDIR= ${PORTVERSION}/${LANG}/os/${MACHINE_ARCH}/RedHat/RPMS -DISTFILES= redhat-release-7.1-1.noarch.rpm \ +MASTER_SITES= ${MASTER_SITE_REDHAT_LINUX} \ + ${MASTER_SITE_REDHAT_LINUX:S/$/:i386/} +MASTER_SITE_SUBDIR= ${PORTVERSION}/${LANG}/os/${MACHINE_ARCH}/RedHat/RPMS \ + ${PORTVERSION}/${LANG}/os/i386/RedHat/RPMS/:i386 +DISTFILES= redhat-release-7.1-1.noarch.rpm:i386 \ ${RPM_SETUP} \ filesystem-2.0.7-1.noarch.rpm \ basesystem-7.0-2.noarch.rpm \ @@ -143,9 +145,9 @@ do-install: @${ECHO_MSG} "outside the jail, then press enter:" @${ECHO_MSG} "" @${ECHO_MSG} "mkdir -m 0755 -p <Jail root dir>/dev" - @${ECHO_MSG} "rm -f <Jail root dir>/${LINUXBASE}/dev/null" - @${ECHO_MSG} "mknod <Jail root dir>/${LINUXBASE}/dev/null c 2 2" - @${ECHO_MSG} "chmod 666 <Jail root dir>/${LINUXBASE}/dev/null" + @${ECHO_MSG} "rm -f <Jail root dir>${LINUXBASE}/dev/null" + @${ECHO_MSG} "mknod <Jail root dir>${LINUXBASE}/dev/null c 2 2" + @${ECHO_MSG} "chmod 666 <Jail root dir>${LINUXBASE}/dev/null" @${ECHO_MSG} "" @${SH} -c "read line" .endif diff --git a/emulators/linux_base/distinfo.alpha b/emulators/linux_base/distinfo.alpha index 04812d5543ab..e284afab76e8 100644 --- a/emulators/linux_base/distinfo.alpha +++ b/emulators/linux_base/distinfo.alpha @@ -1,4 +1,3 @@ -MD5 (rpm/redhat-release-7.1-1.noarch.rpm) = db4e20d62c96ae3cd7fb3d9da89f0ec0 MD5 (rpm/redhat-release-7.1-1.noarch.rpm) = 50c7e24be0727971a1253bb75d30a1ed MD5 (rpm/setup-2.4.7-2.noarch.rpm) = ce6ded4c40f0475353291c0207db96d4 MD5 (rpm/filesystem-2.0.7-1.noarch.rpm) = c82cd42bdf4e8becfef3701f0f246270 diff --git a/emulators/linux_base/distinfo.i386 b/emulators/linux_base/distinfo.i386 index a3d7a7b08bbe..f4ea019195d0 100644 --- a/emulators/linux_base/distinfo.i386 +++ b/emulators/linux_base/distinfo.i386 @@ -1,5 +1,4 @@ MD5 (rpm/redhat-release-7.1-1.noarch.rpm) = 50c7e24be0727971a1253bb75d30a1ed -MD5 (rpm/redhat-release-7.1-1.noarch.rpm) = db4e20d62c96ae3cd7fb3d9da89f0ec0 MD5 (rpm/setup-2.4.7-1.noarch.rpm) = 4a4819c1e86d61a9ca67a5b4feb375b7 MD5 (rpm/filesystem-2.0.7-1.noarch.rpm) = c82cd42bdf4e8becfef3701f0f246270 MD5 (rpm/basesystem-7.0-2.noarch.rpm) = 9d4e753ef487d62e1672f52ef190447a |