antennine.org: rename profiles with a prefix

Author: a-gave

antennine.org/ca-bundle/Makefile antennine.org/an-ca-bundle/Makefileantennine.org/ca-bundle/Makefile renamed to antennine.org/an-ca-bundle/Makefile

@@ -6,15 +6,15 @@ PKG_NAME:=profile-$(PROFILE_COMMUNITY)-$(PROFILE_NAME)
 
 PKG_CA_CERTS_URLS:=\
 	https://letsencrypt.org/certs/isrgrootx1.pem \
-  https://letsencrypt.org/certs/isrg-root-x2.pem
+	https://letsencrypt.org/certs/isrg-root-x2.pem
 
 define Package/$(PKG_NAME)/preinst
-  [ -z "$${IPKG_INSTROOT}" ] && exit 0
-  $(INSTALL_DIR) $${IPKG_INSTROOT}/etc/ssl/certs
-  for ca_cert_url in $(PKG_CA_CERTS_URLS); do
-    wget "$${ca_cert_url}" -O - >> $${IPKG_INSTROOT}/etc/ssl/certs/ca-certificates.crt
-  done
-  $(LN) /etc/ssl/certs/ca-certificates.crt $${IPKG_INSTROOT}/etc/ssl/cert.pem
+	[ -z "$${IPKG_INSTROOT}" ] && exit 0
+	$(INSTALL_DIR) $${IPKG_INSTROOT}/etc/ssl/certs
+	for ca_cert_url in $(PKG_CA_CERTS_URLS); do
+		wget -q "$${ca_cert_url}" -O - >> $${IPKG_INSTROOT}/etc/ssl/certs/ca-certificates.crt
+	done
+	$(LN) /etc/ssl/certs/ca-certificates.crt $${IPKG_INSTROOT}/etc/ssl/cert.pem
 endef
 
 include ../../profile.mk

…ennine.org/generic-outdoor-8-64/Makefile …ine.org/an-generic-outdoor-8-64/Makefileantennine.org/generic-outdoor-8-64/Makefile renamed to antennine.org/an-generic-outdoor-8-64/Makefile antennine.org/generic-outdoor-8-64/Makefile renamed to antennine.org/an-generic-outdoor-8-64/Makefile

@@ -3,10 +3,11 @@ include $(TOPDIR)/rules.mk
 PROFILE_DESCRIPTION:=Generic metapackage for 8MB flash and/or 64MB RAM devices \
 	with lime files, pubkeys and metrics, and eff ca-cert
 PROFILE_DEPENDS:=\
-	+profile-antennine.org-ca-bundle \
-	+profile-antennine.org-generic \
-	+profile-antennine.org-metrics \
-	+profile-antennine.org-outdoor-8-64 
+	+profile-antennine.org-an-ca-bundle \
+	+profile-antennine.org-an-generic \
+	+profile-antennine.org-an-lime-owut \
+	+profile-antennine.org-an-metrics \
+	+profile-antennine.org-an-outdoor-8-64
 
 include ../../profile.mk
 

antennine.org/generic/Makefile antennine.org/an-generic/Makefileantennine.org/generic/Makefile renamed to antennine.org/an-generic/Makefile

@@ -0,0 +1,25 @@
+include $(TOPDIR)/rules.mk
+
+PROFILE_NAME=$(notdir ${CURDIR})
+PROFILE_COMMUNITY=$(lastword $(filter-out $(PROFILE_NAME),$(subst /, ,$(CURDIR))))
+PKG_NAME:=profile-$(PROFILE_COMMUNITY)-$(PROFILE_NAME)
+
+PROFILE_DESCRIPTION:=lime-owut
+PROFILE_DEPENDS:=+owut
+
+define Package/$(PKG_NAME)/postinst
+#!/bin/sh
+# Backup opkg status before cleaning if CONFIG_CLEAN_IPKG=y
+grep -q CONFIG_CLEAN_IPKG=y $${TOPDIR}/.config || exit 0
+
+cp $${IPKG_INSTROOT}/usr/lib/opkg/status $${IPKG_INSTROOT}/etc/opkg/
+cat << EOF >> $${IPKG_INSTROOT}/etc/uci-defaults/99_owut-packagelist
+#!/bin/sh
+rm /usr/lib/opkg/status
+ln -s /etc/opkg/status /usr/lib/opkg/status
+EOF
+endef
+
+include ../../profile.mk
+
+# call BuildPackage - OpenWrt buildroot signature

…eneric/root/etc/config/lime-44d9e7db9a67 …eneric/root/etc/config/lime-44d9e7db9a67antennine.org/generic/root/etc/config/lime-44d9e7db9a67 renamed to antennine.org/an-generic/root/etc/config/lime-44d9e7db9a67 antennine.org/generic/root/etc/config/lime-44d9e7db9a67 renamed to antennine.org/an-generic/root/etc/config/lime-44d9e7db9a67

@@ -0,0 +1,59 @@
+#!/bin/sh
+
+feed_host="http://feed.libremesh.org"
+sysupgrade_server="https://sysupgrade.antennine.org"
+openwrt_branch_ref="$(grep -m 1 "openwrt.org/" /etc/*/distfeeds* | sed 's|.*openwrt.org/\(.*\)|\1|' )"
+arch="$(grep OPENWRT_ARCH /etc/os-release | sed 's|OPENWRT_ARCH="\(.*\)"|\1|')"
+
+if [ -n "$openwrt_branch_ref" ]; then
+	if $(echo $openwrt_branch_ref | grep -q 'snapshots'); then
+		openwrt_branch='openwrt-main'
+	fi
+	if $(echo $openwrt_branch_ref | grep -q 'releases'); then
+		branch_n="$(echo $openwrt_branch_ref | sed 's|releases/||')"
+		openwrt_branch="openwrt-${branch_n:0:5}"
+	fi
+else
+	echo "String not found 'openwrt.org' in default ${repo} feeds, cannot determine openwrt branch"
+	exit 0
+fi
+
+feed_packages_path=$feed_host/master/$openwrt_branch
+feed_profiles_path=$feed_host/profiles/$openwrt_branch
+grep -q "repositories:" /usr/bin/owut && grep -q "let lime" /usr/bin/owut && exit 0
+
+# Add libremesh 'repositories' and 'repository_keys' to owut's build requests
+cat > /tmp/owut_repos << EOF
+		repositories: {
+			'libremesh': '$feed_packages_path/x86_64',
+			'libremesh_arch_packages': '$feed_packages_path/$arch',
+			'profiles': '$feed_profiles_path/x86_64'},
+		repository_keys: [ 
+			"RWSnGzyChavSiyQ+vLk3x7F0NqcLa4kKyXCdriThMhO78ldHgxGljM/8", 
+			"-----BEGIN PUBLIC KEY-----\n\
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdFJZ2qVti49Ol8LJZYuxgOCLowBS\n\
+8bI86a7zqhSbs5yon3JON7Yee7CQOgqwPOX5eMALGOu8iFGAqIRx5YjfYA==\n\
+-----END PUBLIC KEY-----" ],
+EOF
+sed -ie '/target:.*device.target/r /tmp/owut_repos' /usr/bin/owut
+
+# Add libremesh repositories to packages, arch_packages and profiles. Used by 'owut check'
+cat > /tmp/owut_repos << EOF
+	let lime = dl_json("$feed_packages_path/x86_64/index.json", 
+		"/tmp/owut-packages-lime.json", true);
+
+	let lime_arch_packages = dl_json("$feed_packages_path/$arch/index.json", 
+		"/tmp/owut-packages-lime_arch_packages.json", true);
+
+	let profiles = dl_json("$feed_profiles_path/x86_64/index.json", 
+		"/tmp/owut-packages-profiles.json", true);
+
+	return sort({ ...(arch ?? []), ...(plat?.packages ?? []), 
+		...(lime?.packages ?? []), ...(lime_arch_packages?.packages ?? []), ...(profiles?.packages ?? []) });
+EOF
+sed -i -e "/return\ sort({\ ...(arch/r /tmp/owut_repos" -e "//d" /usr/bin/owut
+rm /tmp/owut_repos
+
+# Set a default server
+uci set attendedsysupgrade.server.url="$sysupgrade_server"
+uci commit attendedsysupgrade