diff options
| author | Boris Samorodov <bsam@FreeBSD.org> | 2007-04-11 11:42:34 +0000 |
|---|---|---|
| committer | Boris Samorodov <bsam@FreeBSD.org> | 2007-04-11 11:42:34 +0000 |
| commit | 34cba55d3c40cd5777bf5ab970e7e82df9c29ed2 (patch) | |
| tree | 82ead0face3973dcaf428c2e58e3939076787245 /emulators/linux_base-f9 | |
| parent | d77e9a5980e82f3b4e52174782257f9dc18cbd0a (diff) | |
| download | ports-34cba55d3c40cd5777bf5ab970e7e82df9c29ed2.tar.gz ports-34cba55d3c40cd5777bf5ab970e7e82df9c29ed2.zip | |
Notes
Diffstat (limited to 'emulators/linux_base-f9')
| -rw-r--r-- | emulators/linux_base-f9/Makefile | 8 | ||||
| -rw-r--r-- | emulators/linux_base-f9/linux_base-f8/Makefile | 8 | ||||
| -rw-r--r-- | emulators/linux_base-f9/linux_base-f8/pkg-install | 8 | ||||
| -rw-r--r-- | emulators/linux_base-f9/pkg-install | 8 |
4 files changed, 26 insertions, 6 deletions
diff --git a/emulators/linux_base-f9/Makefile b/emulators/linux_base-f9/Makefile index 9fb92628100f..e7748416afcb 100644 --- a/emulators/linux_base-f9/Makefile +++ b/emulators/linux_base-f9/Makefile @@ -8,7 +8,7 @@ PORTNAME= fc6 PORTVERSION= 6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators linux MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX} MASTER_SITE_SUBDIR= ${PORTVERSION}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \ @@ -123,8 +123,10 @@ PLIST= pkg-plist LINUX_OSRELEASE!= ${ECHO} `${SYSCTL} -n compat.linux.osrelease 2>/dev/null` -.if ${LINUX_OSRELEASE} == "2.4.2" -IGNORE= compat.linux.osrelease: 2.4.2 is not supported +.if ${LINUX_OSRELEASE}x == "x" +IGNORE= linuxulator is not (kld)loaded +.elif ${LINUX_OSRELEASE} == "2.4.2" +IGNORE= compat.linux.osrelease: 2.4.2 is not supported .endif REMOVE_DIRS= boot dev home initrd root tmp var/log var/run var/tmp \ diff --git a/emulators/linux_base-f9/linux_base-f8/Makefile b/emulators/linux_base-f9/linux_base-f8/Makefile index 9fb92628100f..e7748416afcb 100644 --- a/emulators/linux_base-f9/linux_base-f8/Makefile +++ b/emulators/linux_base-f9/linux_base-f8/Makefile @@ -8,7 +8,7 @@ PORTNAME= fc6 PORTVERSION= 6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators linux MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX} MASTER_SITE_SUBDIR= ${PORTVERSION}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \ @@ -123,8 +123,10 @@ PLIST= pkg-plist LINUX_OSRELEASE!= ${ECHO} `${SYSCTL} -n compat.linux.osrelease 2>/dev/null` -.if ${LINUX_OSRELEASE} == "2.4.2" -IGNORE= compat.linux.osrelease: 2.4.2 is not supported +.if ${LINUX_OSRELEASE}x == "x" +IGNORE= linuxulator is not (kld)loaded +.elif ${LINUX_OSRELEASE} == "2.4.2" +IGNORE= compat.linux.osrelease: 2.4.2 is not supported .endif REMOVE_DIRS= boot dev home initrd root tmp var/log var/run var/tmp \ diff --git a/emulators/linux_base-f9/linux_base-f8/pkg-install b/emulators/linux_base-f9/linux_base-f8/pkg-install index 6e90d86fbfdd..7494267b3d2b 100644 --- a/emulators/linux_base-f9/linux_base-f8/pkg-install +++ b/emulators/linux_base-f9/linux_base-f8/pkg-install @@ -3,6 +3,14 @@ case "$2" in PRE-INSTALL) + if [ "`/sbin/sysctl -n compat.linux.osrelease`"x = "x" ]; then + echo 'linuxulator is not (kld)loaded, exiting' + exit 1 + fi + if [ "`/sbin/sysctl -n compat.linux.osrelease`" = "2.4.2" ]; then + echo 'compat.linux.osrelease: 2.4.2 is not supported, exiting' + exit 1 + fi if [ -z "`kldstat -v | grep -E 'linux(aout|elf)'`" ]; then echo 'Linux mode is not enabled.' echo 'Loading linux kernel module now...' diff --git a/emulators/linux_base-f9/pkg-install b/emulators/linux_base-f9/pkg-install index 6e90d86fbfdd..7494267b3d2b 100644 --- a/emulators/linux_base-f9/pkg-install +++ b/emulators/linux_base-f9/pkg-install @@ -3,6 +3,14 @@ case "$2" in PRE-INSTALL) + if [ "`/sbin/sysctl -n compat.linux.osrelease`"x = "x" ]; then + echo 'linuxulator is not (kld)loaded, exiting' + exit 1 + fi + if [ "`/sbin/sysctl -n compat.linux.osrelease`" = "2.4.2" ]; then + echo 'compat.linux.osrelease: 2.4.2 is not supported, exiting' + exit 1 + fi if [ -z "`kldstat -v | grep -E 'linux(aout|elf)'`" ]; then echo 'Linux mode is not enabled.' echo 'Loading linux kernel module now...' |