1 2

[PATCH builds.sr.ht] images/freebsd: add 11.x and current

Details
Message ID
<BTH6qMTGYiVzVUV2RCejUDujbqU83gn8RcNYsgJRdR3Q2cvurZDU5L7HxSUFlewUloNbmEZJkWafRONt0uElgkpLPu1NBCKK-HfYYA4sG9w=@emersion.fr>
Sender timestamp
1549916607
DKIM signature
pass
Download raw message
Patch: +21 -8
From: emersion <contact@emersion.fr>

---
 images/freebsd/{12.0 => 11.x}/functions | 0
 images/freebsd/11.x/genimg              | 5 +++++
 images/freebsd/12.0/genimg              | 3 ---
 images/freebsd/12.x/functions           | 1 +
 images/freebsd/12.x/genimg              | 5 +++++
 images/freebsd/current/functions        | 1 +
 images/freebsd/current/genimg           | 5 +++++
 images/freebsd/genimg                   | 9 ++++-----
 8 files changed, 21 insertions(+), 8 deletions(-)
 rename images/freebsd/{12.0 => 11.x}/functions (100%)
 create mode 100755 images/freebsd/11.x/genimg
 delete mode 100755 images/freebsd/12.0/genimg
 create mode 120000 images/freebsd/12.x/functions
 create mode 100755 images/freebsd/12.x/genimg
 create mode 120000 images/freebsd/current/functions
 create mode 100755 images/freebsd/current/genimg

diff --git a/images/freebsd/12.0/functions b/images/freebsd/11.x/functions
similarity index 100%
rename from images/freebsd/12.0/functions
rename to images/freebsd/11.x/functions
diff --git a/images/freebsd/11.x/genimg b/images/freebsd/11.x/genimg
new file mode 100755
index 0000000..3c55a50
--- /dev/null
+++ b/images/freebsd/11.x/genimg
@@ -0,0 +1,5 @@
+#!/bin/sh
+arch="${1:-amd64}"
+export release="11.2-RELEASE"
+export ports_base="https://download.freebsd.org/ftp/snapshots/$arch/11.2-STABLE"
+exec ../genimg "$@"
diff --git a/images/freebsd/12.0/genimg b/images/freebsd/12.0/genimg
deleted file mode 100755
index 13f136c..0000000
--- a/images/freebsd/12.0/genimg
@@ -1,3 +0,0 @@
-#!/bin/sh
-export release=12.0-RELEASE
-exec ../genimg "$@"
diff --git a/images/freebsd/12.x/functions b/images/freebsd/12.x/functions
new file mode 120000
index 0000000..c0b5bcc
--- /dev/null
+++ b/images/freebsd/12.x/functions
@@ -0,0 +1 @@
+../functions
\ No newline at end of file
diff --git a/images/freebsd/12.x/genimg b/images/freebsd/12.x/genimg
new file mode 100755
index 0000000..a5e5dbf
--- /dev/null
+++ b/images/freebsd/12.x/genimg
@@ -0,0 +1,5 @@
+#!/bin/sh
+arch="${1:-amd64}"
+export release="12.0-RELEASE"
+export ports_base="https://download.freebsd.org/ftp/snapshots/$arch/12.0-STABLE"
+exec ../genimg "$@"
diff --git a/images/freebsd/current/functions b/images/freebsd/current/functions
new file mode 120000
index 0000000..c0b5bcc
--- /dev/null
+++ b/images/freebsd/current/functions
@@ -0,0 +1 @@
+../functions
\ No newline at end of file
diff --git a/images/freebsd/current/genimg b/images/freebsd/current/genimg
new file mode 100755
index 0000000..e2dc0e6
--- /dev/null
+++ b/images/freebsd/current/genimg
@@ -0,0 +1,5 @@
+#!/bin/sh
+arch="${1:-amd64}"
+export release="13.0-CURRENT"
+export ports_base="https://download.freebsd.org/ftp/snapshots/$arch/$release"
+exec ../genimg "$@"
diff --git a/images/freebsd/genimg b/images/freebsd/genimg
index b47f3ef..620ce0b 100755
--- a/images/freebsd/genimg
+++ b/images/freebsd/genimg
@@ -1,10 +1,10 @@
 #!/bin/sh -eux
 
-echo "$release" >/dev/null # fail on -u if release unset
+echo "$release" >/dev/null # fail on -u if unset
+echo "$ports_base" >/dev/null # fail on -u if unset
 arch="${1:-amd64}"
 
 dist_base="https://download.freebsd.org/ftp/releases/$arch/$release"
-snapshot_base="https://download.freebsd.org/ftp/snapshots/$arch/13.0-CURRENT"
 dist_files="kernel.txz base.txz"
 dist_dir="/usr/freebsd-dist/$arch/$release"
 
@@ -73,10 +73,9 @@ EOF
 
 env ASSUME_ALWAYS_YES=YES pkg -c /mnt bootstrap -f
 # TODO: remove bash
-# Subversion is required for ports
-env ASSUME_ALWAYS_YES=YES pkg -c /mnt install git bash sudo curl subversion
+env ASSUME_ALWAYS_YES=YES pkg -c /mnt install git bash sudo curl
 
-fetch -m -o "$dist_dir/ports.txz" "$snapshot_base/ports.txz"
+fetch -m -o "$dist_dir/ports.txz" "$ports_base/ports.txz"
 tar -C /mnt -xJf "$dist_dir/ports.txz"
 
 pw -R /mnt groupadd sudo
-- 
2.20.1
Details
Message ID
<20190211212628.GA21044@homura.localdomain>
In-Reply-To
<BTH6qMTGYiVzVUV2RCejUDujbqU83gn8RcNYsgJRdR3Q2cvurZDU5L7HxSUFlewUloNbmEZJkWafRONt0uElgkpLPu1NBCKK-HfYYA4sG9w=@emersion.fr> (view parent)
Sender timestamp
1549920388
DKIM signature
pass
Download raw message
Thanks x2!

To git.sr.ht:~sircmpwn/builds.sr.ht
   8fb420b..d6b6600  master -> master