summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Tomasz Napierala <trasz@FreeBSD.org>2020-10-14 14:55:10 +0000
committerEdward Tomasz Napierala <trasz@FreeBSD.org>2020-10-14 14:55:10 +0000
commit27fde5e7edcc493662b2ec72d947114aeb3e554a (patch)
tree51c010f436797ce0de627f221bfe326916302f5c
parentTake over maintainership of sysutils/debootstrap. I have some (diff)
Default to Linux instead of kFreeBSD, since that's the more common
choice, and drop the no longer relevant ONLY_FOR_ARCHS. Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=552340
-rw-r--r--sysutils/debootstrap/Makefile6
-rw-r--r--sysutils/debootstrap/files/patch-debootstrap2
-rw-r--r--sysutils/debootstrap/pkg-descr11
-rw-r--r--sysutils/debootstrap/pkg-message2
4 files changed, 9 insertions, 12 deletions
diff --git a/sysutils/debootstrap/Makefile b/sysutils/debootstrap/Makefile
index 757e5785abc2..b650cec9b268 100644
--- a/sysutils/debootstrap/Makefile
+++ b/sysutils/debootstrap/Makefile
@@ -3,12 +3,13 @@
PORTNAME= debootstrap
PORTVERSION= 1.0.123
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= DEBIAN/pool/main/d/${PORTNAME}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= trasz@FreeBSD.org
-COMMENT= Install Debian base system into a directory
+COMMENT= Install Debian or Ubuntu base system into a directory
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/debian/copyright
@@ -22,9 +23,6 @@ NO_ARCH= yes
USES= gmake perl5
USE_PERL5= run
-ONLY_FOR_ARCHS= i386 amd64
-ONLY_FOR_ARCHS_REASON= Debian GNU/kFreeBSD available only for i386 and amd64
-
post-patch:
@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
${WRKSRC}/Makefile \
diff --git a/sysutils/debootstrap/files/patch-debootstrap b/sysutils/debootstrap/files/patch-debootstrap
index 07ed132d0c6a..60428c53281f 100644
--- a/sysutils/debootstrap/files/patch-debootstrap
+++ b/sysutils/debootstrap/files/patch-debootstrap
@@ -37,7 +37,7 @@
+fi
+
+if [ "$HOST_OS" = "freebsd" -a -z "$HOST_ARCH" ]; then
-+ HOST_ARCH=kfreebsd-`/sbin/sysctl -n hw.machine_arch`
++ HOST_ARCH=`/sbin/sysctl -n hw.machine_arch`
+ EXTRACTOR_OVERRIDE=ar
fi
diff --git a/sysutils/debootstrap/pkg-descr b/sysutils/debootstrap/pkg-descr
index 2f5b8ed6556d..eb591eb1fd2d 100644
--- a/sysutils/debootstrap/pkg-descr
+++ b/sysutils/debootstrap/pkg-descr
@@ -1,10 +1,9 @@
debootstrap is a tool which will install a Debian base system into
-a subdirectory of another, already installed system. It doesn't require an
-installation CD, just access to a Debian repository.
+a subdirectory of another, already installed system. It doesn't require
+an installation CD, just access to a Debian repository.
-In FreeBSD, you can use debootstrap to install Debian into
-a subdirectory of your existing FreeBSD installation (i386 or amd64)
-and then run Debian GNU/kFreeBSD (i386 or amd64) or Debian Linux (i386)
-in a jail or chroot.
+In FreeBSD, you can use debootstrap to install Debian into a subdirectory
+of your existing FreeBSD installation and then run Debian Linux in a jail
+or chroot.
WWW: https://wiki.debian.org/Debootstrap
diff --git a/sysutils/debootstrap/pkg-message b/sysutils/debootstrap/pkg-message
index 3bc006c5700f..7d32bcbd2bce 100644
--- a/sysutils/debootstrap/pkg-message
+++ b/sysutils/debootstrap/pkg-message
@@ -1,7 +1,7 @@
[
{ type: install
message: <<EOM
-To successfully create an installation of Debian GNU/kFreeBSD
+To successfully create an installation of Debian or Ubuntu
debootstrap requires the following kernel modules loaded:
fdescfs linprocfs linsysfs tmpfs