From 4c88cacfa4045eb4ffb6ac6d07a9eb19b4fb9221 Mon Sep 17 00:00:00 2001
From: Chris Fiege <cfi@pengutronix.de>
Date: Thu, 17 Oct 2024 21:22:19 +0200
Subject: [PATCH] Add community-packages repo and use our packages from there
We have added `ffbs-debugbathosts` and `ffbs-collect-debug-info` to
community-packages.
This commit adds both packages from there and drops them from our feed.
All in all this should be a no-op for our image.
---
image-customization.lua | 3 ++-
modules | 7 ++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/image-customization.lua b/image-customization.lua
index 7a47b7b..477c936 100644
--- a/image-customization.lua
+++ b/image-customization.lua
@@ -30,7 +30,6 @@ packages({
'kmod-wireguard',
'gluon-ffbsnext-nodeconfig',
'gluon-ffbsnext-nodeconfig-respondd',
- 'gluon-ffbs-debugbathosts',
'gluon-ffbsnext-debugrsyslog',
'gluon-ffbsnext-nextnode',
'gluon-ffbsnext-info-pull',
@@ -43,6 +42,8 @@ packages({
'respondd-module-airtime',
'gluon-radv-filterd',
'kmod-nlmon',
+ 'ffbs-debugbathosts',
+ 'ffbs-collect-debug-info',
})
-- support acpi shutdown for openwrt as VM
diff --git a/modules b/modules
index f3e1c01..a003b1d 100644
--- a/modules
+++ b/modules
@@ -1,4 +1,9 @@
-GLUON_SITE_FEEDS='packages_ffbs'
+GLUON_SITE_FEEDS='packages_ffbs gluon_community'
+
PACKAGES_PACKAGES_FFBS_REPO=https://gitli.stratum0.org/ffbs/ffbs-packages.git
PACKAGES_PACKAGES_FFBS_COMMIT=fe1d306578553f8c13a7fb63928aec909a9c6092
PACKAGES_PACKAGES_FFBS_BRANCH=v2023.2.x-ffbs-next
+
+PACKAGES_GLUON_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git
+PACKAGES_GLUON_COMMUNITY_COMMIT=39a38b6f3b530607fa70114dad80434457ecf5e0
+PACKAGES_GLUON_COMMUNITY_BRANCH=master
--
GitLab