rework fedora repos

15 files changed, 96 insertions, 114 deletions

diff --git a/Fedora-efi-armv7.sh b/Fedora-efi-armv7.sh
index c54bf85..49af88b 100755
--- a/Fedora-efi-armv7.sh
+++ b/Fedora-efi-armv7.sh
@@ -2,7 +2,7 @@
 
 vers="${1-25}"
 name="fedora-${vers}-efi"
-repo="repos/fedora-${vers}-armv7.repo"
+repo="repos/fedora-${vers}-$(sh basearch.sh).repo"
 rpms="grub2-efi -dracut-config-rescue dracut-config-generic"
 
 arch="$(uname -m)"
diff --git a/Fedora-efi-grub2.sh b/Fedora-efi-grub2.sh
index 3e12249..dce2bc5 100755
--- a/Fedora-efi-grub2.sh
+++ b/Fedora-efi-grub2.sh
@@ -2,7 +2,7 @@
 
 vers="${1-25}"
 name="fedora-${vers}-efi-grub2"
-repo="repos/fedora-${vers}.repo"
+repo="repos/fedora-${vers}-$(sh basearch.sh).repo"
 rpms="grub2-efi shim efibootmgr -dracut-config-rescue dracut-config-generic"
 
 arch="$(uname -m)"
diff --git a/Fedora-efi-systemd.sh b/Fedora-efi-systemd.sh
index c48375c..828eba8 100755
--- a/Fedora-efi-systemd.sh
+++ b/Fedora-efi-systemd.sh
@@ -2,7 +2,7 @@
 
 vers="${1-25}"
 name="fedora-${vers}-efi-systemd"
-repo="repos/fedora-${vers}.repo"
+repo="repos/fedora-${vers}-$(sh basearch.sh).repo"
 rpms="efibootmgr -grubby -dracut-config-rescue dracut-config-generic"
 
 arch="$(uname -m)"
diff --git a/Fedora-rpi32.sh b/Fedora-rpi32.sh
index a4ac3b3..95dba8f 100755
--- a/Fedora-rpi32.sh
+++ b/Fedora-rpi32.sh
@@ -2,7 +2,7 @@
 
 vers="${1-25}"
 name="fedora-${vers}-rpi2"
-repo="repos/fedora-${vers}.repo"
+repo="repos/fedora-${vers}-$(sh basearch.sh).repo"
 rpms="bcm283x-firmware uboot-images-armv7 extlinux-bootloader dracut-config-generic"
 krnl="kernel kernel-modules"
 
diff --git a/Fedora-rpi64-fedora.sh b/Fedora-rpi64-fedora.sh
index e499903..c5632ad 100755
--- a/Fedora-rpi64-fedora.sh
+++ b/Fedora-rpi64-fedora.sh
@@ -2,7 +2,7 @@
 
 vers="${1-25}"
 name="fedora-${vers}-rpi3-fedora"
-repo="repos/fedora-${vers}-aarch64.repo"
+repo="repos/fedora-${vers}-$(sh basearch.sh).repo"
 rpms="bcm283x-firmware uboot-images-armv8 extlinux-bootloader dracut-config-generic"
 krnl="kernel kernel-modules"
 
diff --git a/Fedora-rpi64-kraxel.sh b/Fedora-rpi64-kraxel.sh
index 0ab5e24..fe24986 100755
--- a/Fedora-rpi64-kraxel.sh
+++ b/Fedora-rpi64-kraxel.sh
@@ -2,7 +2,7 @@
 
 vers="${1-25}"
 name="fedora-${vers}-rpi3-kraxel"
-repo="repos/fedora-${vers}-aarch64.repo"
+repo="repos/fedora-${vers}-$(sh basearch.sh).repo"
 rpms="bcm283x-firmware uboot-images-armv8 extlinux-bootloader dracut-config-generic"
 krnl="kernel-main"
 
diff --git a/basearch.sh b/basearch.sh
new file mode 100755
index 0000000..6fbaf2a
--- /dev/null
+++ b/basearch.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+uname -m | sed				\
+	-e 's/i?86/i386/'		\
+	-e 's/armv7l.*/armv7hl/'
diff --git a/repos/.gitignore b/repos/.gitignore
new file mode 100644
index 0000000..9a7595f
--- /dev/null
+++ b/repos/.gitignore
@@ -0,0 +1 @@
+fedora-*.repo
diff --git a/repos/Make-fedora-repo.sh b/repos/Make-fedora-repo.sh
new file mode 100755
index 0000000..1495e76
--- /dev/null
+++ b/repos/Make-fedora-repo.sh
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# config
+mirror="http://spunk.home.kraxel.org/mirror/fedora/rsync"
+armv7="http://spunk.home.kraxel.org/mockify/repos/rpi2/"
+armv8="http://spunk.home.kraxel.org/mockify/repos/qcom/"
+
+basepri="http://ftp.halifax.rwth-aachen.de/fedora/linux"
+basesec="http://ftp-stud.hs-esslingen.de/pub/fedora-secondary"
+proxy="http://spunk.home.kraxel.org:3128"
+
+################################################################################
+
+function makerepo() {
+	local basearch="$1"
+	local releasever="$2"
+	local devel="$3"
+	local release=$(( 1 - $devel ))
+	local kraxel=""
+
+	case "$basearch" in
+	aarch64)	base="$basesec"; kraxel="$armv8"		;;
+	armv7hl)	base="$basepri"; kraxel="$armv7"		;;
+	i386)		base="$basesec"					;;
+	x86_64)		base="$basepri"					;;
+	*)		echo "unknown basearch: $basearch"; exit 1	;;
+	esac
+
+	cat <<EOF
+[mkimage-fedora-${releasever}-server-mirror]
+name=Fedora ${releasever} server mirror
+baseurl=${mirror}/f${releasever}-release/Server/${basearch}/os/
+cost=90
+enabled=$release
+
+[mkimage-fedora-${releasever}-everything]
+name=Fedora ${releasever} everything
+baseurl=${base}/releases/${releasever}/Everything/${basearch}/os/
+proxy=http://spunk.home.kraxel.org:3128
+enabled=$release
+
+[mkimage-fedora-${releasever}-updates]
+name=Fedora ${releasever} updates
+baseurl=${base}/updates/${releasever}/$basearch/
+proxy=http://spunk.home.kraxel.org:3128
+enabled=$release
+
+[mkimage-fedora-${releasever}-everything-devel]
+name=Fedora ${releasever} everything development
+baseurl=${base}/development/${releasever}/Everything/${basearch}/os/
+proxy=http://spunk.home.kraxel.org:3128
+enabled=$devel
+
+[mkimage-fedora-${releasever}-updates-devel]
+name=Fedora ${releasever} development updates
+baseurl=${base}/updates/${releasever}/$basearch/
+proxy=http://spunk.home.kraxel.org:3128
+enabled=$devel
+
+EOF
+
+	if test "$kraxel" != ""; then
+		cat <<EOF
+[mkimage-kraxel-${basearch}]
+name=kraxels ${basearch} packages
+baseurl=${kraxel}
+enabled=1
+
+EOF
+	fi
+}
+
+################################################################################
+
+rels="25 26"
+reldev="26"
+archs="aarch64 armv7hl i386 x86_64"
+
+for rel in $rels; do
+	if test "$rel" = "$reldev"; then devel=1; else devel=0; fi
+	for arch in aarch64 armv7hl i386 x86_64; do
+		makerepo "$arch" "$rel" "$devel" \
+			| tee "fedora-${rel}-${arch}.repo"
+	done
+done
diff --git a/repos/fedora-25-aarch64.repo b/repos/fedora-25-aarch64.repo
deleted file mode 100644
index ffb82f6..0000000
--- a/repos/fedora-25-aarch64.repo
+++ /dev/null
@@ -1,18 +0,0 @@
-[mkimage-fedora-25-server]
-baseurl=http://spunk.home.kraxel.org/mirror/fedora/rsync/f25-release/Server/$basearch/os/
-cost=90
-
-[mkimage-fedora-25-everything]
-baseurl=http://ftp-stud.hs-esslingen.de/pub/fedora-secondary/releases/25/Everything/$basearch/os/
-proxy=http://spunk.home.kraxel.org:3128
-
-[mkimage-fedora-25-updates]
-baseurl=http://ftp-stud.hs-esslingen.de/pub/fedora-secondary/updates/25/$basearch/
-proxy=http://spunk.home.kraxel.org:3128
-
-[mkimage-fedora-25-kraxel]
-baseurl=http://spunk.home.kraxel.org/mockify/jenkins/fedora-ko-25-$basearch/
-
-[mkimage-fedora-25-kraxel-rpi3]
-baseurl=http://spunk.home.kraxel.org/mockify/repos/qcom/
-
diff --git a/repos/fedora-25-armv7.repo b/repos/fedora-25-armv7.repo
deleted file mode 100644
index ccf850f..0000000
--- a/repos/fedora-25-armv7.repo
+++ /dev/null
@@ -1,18 +0,0 @@
-[mkimage-fedora-25-server]
-baseurl=http://spunk.home.kraxel.org/mirror/fedora/rsync/f25-release/Server/$basearch/os/
-cost=90
-
-[mkimage-fedora-25-everything]
-baseurl=http://ftp.halifax.rwth-aachen.de/fedora/linux/releases/25/Everything/$basearch/os/
-proxy=http://spunk.home.kraxel.org:3128
-
-[mkimage-fedora-25-updates]
-baseurl=http://ftp.halifax.rwth-aachen.de/fedora/linux/updates/25/$basearch/
-proxy=http://spunk.home.kraxel.org:3128
-
-[mkimage-fedora-25-kraxel]
-baseurl=http://spunk.home.kraxel.org/mockify/jenkins/fedora-ko-25-$basearch/
-
-[mkimage-fedora-25-kraxel-rpi2]
-baseurl=http://spunk.home.kraxel.org/mockify/repos/rpi2/
-
diff --git a/repos/fedora-25.repo b/repos/fedora-25.repo
deleted file mode 100644
index ecd9192..0000000
--- a/repos/fedora-25.repo
+++ /dev/null
@@ -1,3 +0,0 @@
-[mkimage-fedora-25-server]
-baseurl=http://spunk.home.kraxel.org/mirror/fedora/rsync/f25-release/Server/$basearch/os/
-
diff --git a/repos/fedora-26-aarch64.repo b/repos/fedora-26-aarch64.repo
deleted file mode 100644
index dcab244..0000000
--- a/repos/fedora-26-aarch64.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[mkimage-fedora-26-server]
-baseurl=http://spunk.home.kraxel.org/mirror/fedora/rsync/f26-release/Server/$basearch/os/
-cost=90
-enabled=0
-
-[mkimage-fedora-26-everything]
-baseurl=http://ftp-stud.hs-esslingen.de/pub/fedora-secondary/releases/26/Everything/$basearch/os/
-proxy=http://spunk.home.kraxel.org:3128
-enabled=0
-
-[mkimage-fedora-26-everything-beta]
-baseurl=http://ftp-stud.hs-esslingen.de/pub/fedora-secondary/development/26/Everything/$basearch/os/
-proxy=http://spunk.home.kraxel.org:3128
-enabled=1
-
-[mkimage-fedora-26-updates]
-baseurl=http://ftp-stud.hs-esslingen.de/pub/fedora-secondary/updates/26/$basearch/
-proxy=http://spunk.home.kraxel.org:3128
-enabled=0
-
-[mkimage-fedora-26-kraxel]
-baseurl=http://spunk.home.kraxel.org/mockify/jenkins/fedora-ko-26-$basearch/
-enabled=0
-
-[mkimage-fedora-26-kraxel-rpi3]
-baseurl=http://spunk.home.kraxel.org/mockify/repos/qcom/
-enabled=1
-
diff --git a/repos/fedora-26-armv7.repo b/repos/fedora-26-armv7.repo
deleted file mode 100644
index a859d39..0000000
--- a/repos/fedora-26-armv7.repo
+++ /dev/null
@@ -1,28 +0,0 @@
-[mkimage-fedora-26-server]
-baseurl=http://spunk.home.kraxel.org/mirror/fedora/rsync/f26-release/Server/$basearch/os/
-cost=90
-enabled=0
-
-[mkimage-fedora-26-everything]
-baseurl=http://ftp.halifax.rwth-aachen.de/fedora/linux/releases/26/Everything/$basearch/os/
-proxy=http://spunk.home.kraxel.org:3128
-enabled=0
-
-[mkimage-fedora-26-everything-beta]
-baseurl=http://ftp.halifax.rwth-aachen.de/fedora/linux/development/26/Everything/$basearch/os/
-proxy=http://spunk.home.kraxel.org:3128
-enabled=1
-
-[mkimage-fedora-26-updates]
-baseurl=http://ftp.halifax.rwth-aachen.de/fedora/linux/updates/26/$basearch/
-proxy=http://spunk.home.kraxel.org:3128
-enabled=0
-
-[mkimage-fedora-26-kraxel]
-baseurl=http://spunk.home.kraxel.org/mockify/jenkins/fedora-ko-26-$basearch/
-enabled=0
-
-[mkimage-fedora-26-kraxel-rpi2]
-baseurl=http://spunk.home.kraxel.org/mockify/repos/rpi2/
-enabled=1
-
diff --git a/repos/fedora-26.repo b/repos/fedora-26.repo
deleted file mode 100644
index 1be7be7..0000000
--- a/repos/fedora-26.repo
+++ /dev/null
@@ -1,13 +0,0 @@
-[mkimage-fedora-26-server]
-baseurl=http://spunk.home.kraxel.org/mirror/fedora/rsync/f26-release/Server/$basearch/os/
-enabled=0
-
-[mkimage-fedora-26-everything]
-baseurl=http://ftp.halifax.rwth-aachen.de/fedora/linux/releases/26/Everything/$basearch/os/
-proxy=http://spunk.home.kraxel.org:3128
-enabled=0
-
-[mkimage-fedora-26-everything-beta]
-baseurl=http://ftp.halifax.rwth-aachen.de/fedora/linux/development/26/Everything/$basearch/os/
-proxy=http://spunk.home.kraxel.org:3128
-enabled=1