1.2.4 custom feeds points to 1.2.3 at mirror.freifunk.dev

[pmelange]

The customfeeds for opkg in 1.2.4 is pointing to

src/gz falter https://mirror.freifunk.dev/firmware.berlin.freifunk.net/feed/1.2.3-snapshot/packages/mips_24kc/falter

which is 1) the wrong fqdn and 2) should point to packages in 1.2.4

Also, on at least one router, the filename for the custom feeds file is /etc/opkg/customfeeds.confe with an extra e at the end.

[pktpls]

1. the mirror needs to be kept out of the running devices, yep
2. confe is a little puzzling
3. OpenWrt doesn't keep per-release feeds, only snapshots per-branch. The per-release feeds look like they exist on the webservers, but they're just symlinks to the respective per-branch feeds. For example see our own directory listing of 21.02.7: https://mirror.freifunk.dev/downloads.openwrt.org/releases/21.02.7/ - We do it similarly with the falter feed. What we do differently from OpenWrt is that we don't currently keep old versions of packages, the previous feed is always completely thrown out when a new feed build is made.

[pktpls]

Oh and if it were consistent with later branches, it'd be called 1.2.0-snapshot :) But we do treat it the same way, it's the branch name for all 1.2.x releases

[pktpls]

Also, on at least one router, the filename for the custom feeds file is /etc/opkg/customfeeds.confe with an extra e at the end.

Which device model is that? Worth extracting its 1.2.4 image and taking a look

[pmelange]

wdr3600. And when I take a look at /rom/etc/opkg, the contents of customfeeds.conf looks like this:

root@ptest:/rom/etc/opkg# cat customfeeds.conf 
src/gz falter https://mirror.freifunk.dev/firmware.berlin.freifunk.net/feed/1.2.3-snapshot/packages/mips_24kc/falter

I don't know why or how the file ended up with the confe extentension. Also interesting is /root/migrate.log

root@ptest:~# cat /root/migrate.log 
Migration is running on a Freifunk Berlin system
normal migration within Release ...
Migrating from 1.2.3 to 1.2.4.
Updating Community-Profiles.
Importing updates to /etc/config/freifunk
adjusting packagefeed to new version feed
updating /etc/profile.d
Setting new system version to 1.2.4.
Migration done.

And the code which does the "adjusting packagefeed to new version feed" looks like this:

bump_repo() {                                   
    # adjust the opkg packagefeed to point to new version
    local FEED_LINE=$(grep "openwrt_falter" /rom/etc/opkg/customfeeds.conf)
    log "adjusting packagefeed to new version feed"
    sed -ie "s,src\/gz.openwrt_falter.https\?:\/\/firmware\.berlin\.freifunk\.net.*,$FEED_LINE,g" /etc/opkg/customfeeds.conf
}

again, not sure what went wrong.

[pmelange]

when I take a look at another node which upgraded from 1.2.3 to 1.2.4 (curly.ff), it also has a strange .confe file, and the custonfeeds.conf file is empty. The model is Siemens WS-AP3610

root@curly:/etc/opkg# ls
customfeeds.conf   customfeeds.confe  distfeeds.conf     keys
root@curly:/etc/opkg# cat customfeeds.conf

# add your custom package feeds here
#
# src/gz example_feed_name http://www.example.com/path/to/files

root@curly:/etc/opkg# cat customfeeds.confe 

# add your custom package feeds here
#
# src/gz example_feed_name http://www.example.com/path/to/files
src/gz openwrt_falter http://firmware.berlin.freifunk.net/feed/1.2.3-snapshot/packages/mips_24kc/falter

[pmelange]

I took my testnode and did a system reset. Before running the wizard,..

root@gib-mir-einen-namen:~# cd /etc/opkg/
root@gib-mir-einen-namen:/etc/opkg# ls
customfeeds.conf  distfeeds.conf    keys
root@gib-mir-einen-namen:/etc/opkg# cat customfeeds.conf 
src/gz falter https://mirror.freifunk.dev/firmware.berlin.freifunk.net/feed/1.2.3-snapshot/packages/mips_24kc/falter

and it looks the same after filling out the wizard and rebooting. The file looks the same in /rom/etc/opkg. Note, there is no confe file.

[pmelange]

ok. so if I go step-by-step through the code in bump_repo, I end up with...

root@ptest:/etc/opkg# FEED_LINE=$(grep "openwrt_falter" /rom/etc/opk
g/customfeeds.conf)
root@ptest:/etc/opkg# echo $FEED_LINE

root@ptest:/etc/opkg# sed -ie "s,src\/gz.openwrt_falter.https\?:\/\/firmware\.berlin\.freifunk\.net.*,$FEED_LINE,g" /etc/opkg/customfeeds.conf
root@ptest:/etc/opkg# ls
customfeeds.conf   customfeeds.confe  distfeeds.conf     keys
root@ptest:/etc/opkg# cat customfeeds.conf
src/gz falter https://mirror.freifunk.dev/firmware.berlin.freifunk.net/feed/1.2.3-snapshot/packages/mips_24kc/falter
root@ptest:/etc/opkg# cat customfeeds.confe 
src/gz falter https://mirror.freifunk.dev/firmware.berlin.freifunk.net/feed/1.2.3-snapshot/packages/mips_24kc/falter

[pmelange]

runing sed -ie makes a backup file with an added e, therefore the "confe" file. Running sed -i -e acts like we would expect without creating a backup file. Running sed -i.backup -e runs like expected but also creates a .backup file of the original. This might be more desirable.

but the fqdn of mirror.freifunk.dev is still a problem.

[pktpls]

Fixed in freifunk-berlin/falter-builter@e962abd

It now handles mirroring separately for OpenWrt and Falter. Buildbot uses a mirror only for OpenWrt, so the Falter feed URL should point to firmware.berlin.freifunk.net as usual.

[pktpls]

Fixed in freifunk-berlin/falter-builter@e962abd

Nope not yet fixed