Skip to content

packages: convert builter packagesets to proper meta packages#391

Merged
akira25 merged 1 commit into
freifunk-berlin:masterfrom
pktpls:metapkg
Jul 23, 2023
Merged

packages: convert builter packagesets to proper meta packages#391
akira25 merged 1 commit into
freifunk-berlin:masterfrom
pktpls:metapkg

Conversation

@pktpls
Copy link
Copy Markdown
Contributor

@pktpls pktpls commented Jun 16, 2023

Maintainer:
Compile tested: master x86_64, master aarch64_generic
Run tested: not yet

Description:

Creates falter-standard, falter-notunnel, falter-backbone packages to replace builter's packagesets. On builter's side, the snapshot packagesets will only contain a single package, and eventually can be removed.

The falter-common package now pulls in everything that's needed falter-backbone, and the new falter-more package pulls in everything needed for falter-standard and falter-notunnel.

Needs testing.

Comment thread packages/falter-common/Makefile Outdated
CATEGORY:=LuCI
SUBMENU:=9. Freifunk
URL:=https://github.com/freifunk-berlin/falter-packages
PKGARCH:=all
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could check if there are better menu item options, but for now it's okay.

Comment thread packages/falter-common/Makefile Outdated
@pktpls pktpls force-pushed the metapkg branch 2 times, most recently from a9bd98e to 07d00d8 Compare June 19, 2023 17:44
@pktpls pktpls marked this pull request as ready for review June 19, 2023 17:44
@akira25
Copy link
Copy Markdown
Member

akira25 commented Jul 8, 2023

I will build this now on test-branch on the buildbot.

@akira25
Copy link
Copy Markdown
Member

akira25 commented Jul 8, 2023

This looks promising, thank you very much for this contribution.

Unfortunately I wasn't able to build some images with this. Am I missing something maybe?

./build_falter -p packageset/snapshot/standard.txt -v testbuildbot -t ath79/generic -r glinet_gl-ar150

results in:

Collected errors:
 * pkg_hash_check_unresolved: cannot find dependency collectd-mod-memo for falter-common
 * pkg_hash_fetch_best_installation_candidate: Packages for falter-common found, but incompatible with the architectures configured
 * opkg_install_cmd: Cannot install package falter-common.
 * pkg_hash_check_unresolved: cannot find dependency luci-i18n-firewall-en for falter-more
 * pkg_hash_fetch_best_installation_candidate: Packages for falter-more found, but incompatible with the architectures configured
 * opkg_install_cmd: Cannot install package falter-more.
 * satisfy_dependencies_for: Cannot satisfy the following dependencies for falter-standard:
 *      collectd-mod-memo
 *      luci-i18n-firewall-en
 * opkg_install_cmd: Cannot install package falter-standard.
make[2]: *** [Makefile:187: package_install] Error 255
make[1]: *** [Makefile:142: _call_image] Error 2
make: *** [Makefile:260: image] Fehler 2
$ cat packageset/snapshot/standard.txt
# pull in dependencies for falter standard
falter-common
falter-more
falter-standard

only having the standard-package doesn't work either.

In addition I've seen, that the package list seems to miss some tools from current standard-falter:

Building images for ath79 - GL.iNet GL-AR150
Packages: falter-common falter-more falter-standard base-files busybox ca-bundle dnsmasq dropbear firewall4 fstools kernel kmod-ath9k kmod-gpio-button-hotplug kmod-nft-offload kmod-usb-chipidea2 libc libgcc libustream-mbedtls logd mtd netifd nftables odhcp6c odhcpd-ipv6only opkg ppp ppp-mod-pppoe procd procd-seccomp procd-ujail swconfig uboot-envtools uci uclient-fetch urandom-seed urngd wpad-basic-mbedtls

Package list missing or not up-to-date, generating it.

vs.

Packages: falter-berlin-firewall-defaults falter-berlin-migration falter-profiles mtr ip iperf3 tmux vnstat ethtool qos-scripts firewall4 iptables-nft iwinfo libiwinfo-lua tcpdump-mini falter-common falter-policyrouting falter-profiles uhttpd uhttpd-mod-ubus luci luci-ssl luci-app-ffwizard-falter luci-mod-falter luci-app-olsr luci-app-opkg luci-app-firewall luci-app-olsr-services luci-app-falter-owm luci-app-falter-owm-ant luci-app-falter-owm-cmd luci-app-falter-owm-gui luci-proto-ppp luci-theme-bootstrap luci-i18n-base-de luci-i18n-firewall-de luci-i18n-olsr-de luci-i18n-opkg-de luci-i18n-statistics-de luci-i18n-falter-de luci-i18n-ffwizard-falter-de luci-i18n-falter-policyrouting-de falter-berlin-service-registrar luci-app-falter-service-registrar luci-i18n-falter-service-registrar-de olsrd olsrd-mod-arprefresh olsrd-mod-dyn-gw olsrd-mod-jsoninfo olsrd-mod-txtinfo olsrd-mod-nameservice olsrd-mod-watchdog kmod-ipip falter-berlin-uplink-tunnelberlin luci-app-statistics collectd collectd-mod-cpu collectd-mod-dhcpleases collectd-mod-interface collectd-mod-iwinfo collectd-mod-load collectd-mod-network collectd-mod-olsrd collectd-mod-rrdtool collectd-mod-ping collectd-mod-uptime collectd-mod-memory base-files busybox ca-bundle dropbear e2fsprogs firewall4 fstools grub2-bios-setup kernel kmod-amazon-ena kmod-amd-xgbe kmod-bnx2 kmod-button-hotplug kmod-e1000 kmod-e1000e kmod-forcedeth kmod-fs-vfat kmod-igb kmod-igc kmod-ixgbe kmod-nft-offload kmod-r8169 kmod-tg3 libc libgcc libustream-mbedtls logd mkf2fs mtd netifd nftables odhcp6c odhcpd-ipv6only opkg partx-utils ppp ppp-mod-pppoe procd procd-seccomp procd-ujail uci uclient-fetch urandom-seed urngd

Package list missing or not up-to-date, generating it.

Especially the debugging tools like ip, tmux, iperf3 and mtr might come in handy.

Nethertheless this is a great start!

@akira25
Copy link
Copy Markdown
Member

akira25 commented Jul 12, 2023

@pktpls I started a feedbuilder again on buildbot.

Copy link
Copy Markdown
Member

@akira25 akira25 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me and was buildable on buildbot via testbuildbot-branch. Image-generation with builter worked aswell.

@akira25 akira25 merged commit a445010 into freifunk-berlin:master Jul 23, 2023
@pktpls pktpls deleted the metapkg branch July 25, 2023 21:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants