Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

APK #1073

Merged
merged 7 commits into from
Dec 6, 2024
Merged

APK #1073

merged 7 commits into from
Dec 6, 2024

Conversation

pktpls
Copy link
Contributor

@pktpls pktpls commented Nov 14, 2024

@spolack
Copy link
Member

spolack commented Nov 14, 2024

I think commit version: fix snapshot imagebuilder url can be dropped. That should be covered by 08873f6 which was merged last week by yourself.

@spolack
Copy link
Member

spolack commented Nov 14, 2024

Apart from the comment above, LGTM.

Wow, it really seems future is now, never imagined that OpenWRT will have another package manager than opkg :)

@pktpls
Copy link
Contributor Author

pktpls commented Nov 14, 2024

I think commit version: fix snapshot imagebuilder url can be dropped. That should be covered by 08873f6 which was merged last week by yourself.

No, you didn't test that and broke it, this fixed your commit :) 🍻

@spolack
Copy link
Member

spolack commented Nov 14, 2024

Ups i tested that with a device i was strongly assuming to run on snapshot. Let me fix that..

@spolack
Copy link
Member

spolack commented Nov 14, 2024

I'm confused.. actually i wasnt inteding to fix snapshot, but 24.10.

Can you rebase on that branch commits which contain the fix and a small change to the inline var templating on the feed_url, which now follows ansible common practice..
https://github.com/freifunk-berlin/bbb-configs/commits/fewfixes/

@pktpls pktpls force-pushed the apk branch 2 times, most recently from c50d41c to c9d3fcb Compare November 18, 2024 22:51
@pktpls
Copy link
Contributor Author

pktpls commented Nov 18, 2024

Can you rebase on that branch commits which contain the fix and a small change to the inline var templating on the feed_url, which now follows ansible common practice..
https://github.com/freifunk-berlin/bbb-configs/commits/fewfixes/

I picked the templating commit, didn't know the inline templates are evaluated lazily, very useful!

The URL string construction is perhaps a little overengineered for my taste - a) we have the version group_var exactly for this, b) we need a snapshot-specific feed URL as well, and c) I don't want to spend mental capacity only to figure out a simple URL string. And finally there's only 2 (at most 3) possible values for that URL string anyway 🍻 :)

spolack and others added 4 commits November 21, 2024 04:19
APK on snapshot exposes all kinds of old dependency issues.
Here it's that the iptables/iptables6 meta package has been
deprecated for years. (Also need to fix the same in olsrd.)

ERROR: unable to select packages:
  ip6tables (virtual):
    note: please select one of the 'provided by'
          packages explicitly
    provided by: ip6tables-nft
                 ip6tables-zz-legacy
    required by: world[ip6tables]
                 olsrd-2024.06.09~d72be9ad-r1[ip6tables]
  iptables (virtual):
    note: please select one of the 'provided by'
          packages explicitly
    provided by: iptables-nft iptables-zz-legacy
    required by: olsrd-2024.06.09~d72be9ad-r1[iptables]
@pktpls
Copy link
Contributor Author

pktpls commented Nov 21, 2024

The falter feed is now also set up within the image

root@pktpls-core:~# apk update
fetch https://downloads.openwrt.org/snapshots/targets/x86/64/packages/packages.adb
fetch https://downloads.openwrt.org/snapshots/packages/x86_64/base/packages.adb
fetch https://downloads.openwrt.org/snapshots/targets/x86/64/kmods/6.6.61-1-fcc34a80749f2bb1217ba31a0b7e4e32/packages.adb
fetch https://downloads.openwrt.org/snapshots/packages/x86_64/luci/packages.adb
fetch https://downloads.openwrt.org/snapshots/packages/x86_64/packages/packages.adb
fetch https://downloads.openwrt.org/snapshots/packages/x86_64/routing/packages.adb
fetch https://downloads.openwrt.org/snapshots/packages/x86_64/telephony/packages.adb
fetch https://firmware.berlin.freifunk.net/feed/testbuildbot/packages/x86_64/falter/packages.adb
OK: 10510 distinct packages available

@pktpls
Copy link
Contributor Author

pktpls commented Dec 4, 2024

Ping - bbb-configs mit snapshot ist jetzt schon einen Monat kaputt

@spolack
Copy link
Member

spolack commented Dec 6, 2024

Unfortune, as you did not develop in a freifunk-berlin/bbb-configs branch i cant test easily... Lets merge and test later...

@spolack spolack merged commit c395a3d into freifunk-berlin:main Dec 6, 2024
5 checks passed
@pktpls pktpls deleted the apk branch December 6, 2024 18:32
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