Skip to content

apk: align feed/repository handling with opkg #16940

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

Merged
merged 2 commits into from
Nov 16, 2024

Conversation

KanjiMonster
Copy link
Member

@KanjiMonster KanjiMonster commented Nov 13, 2024

With opkg we split up base/distfeeds and custom package feeds into two files, and only the latter is marked as a configuration file. apk currently does not define any configuration files, and uses a toplevel /etc/apk/repositories.

Luckily, apk also supports multiple repository lists, so align it to how we have it with opkg:

  • /etc/apk/repositories.d/distfeeds.list as the base feeds from/for the image
  • /etc/apk/repositories.d/customfeeds.list for any user feeds, marked as a configuration file.

@KanjiMonster KanjiMonster requested a review from aparcar November 13, 2024 13:32
@github-actions github-actions bot added the core packages pull request/issue for core (in-tree) packages label Nov 13, 2024
Analog to how we handle distfeeds with opkg, have the base feeds defined
in a file in repositories.d instead of the base /etc/apk/repositories.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: openwrt#16940
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Analog to how we handle custom feeds in opkg, add a customfeeds.list for
custom package feeds and mark it as a configuration file.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: openwrt#16940
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
@Ansuel Ansuel force-pushed the jogo_apk_customfeeds branch from a74c690 to a6e98a8 Compare November 16, 2024 16:26
@openwrt-bot openwrt-bot merged commit a6e98a8 into openwrt:main Nov 16, 2024
3 checks passed
@goldwrt
Copy link
Contributor

goldwrt commented Nov 16, 2024

Cool, thank you.

But shouldn't lines 375 and 380 of file /include/image.mk be adjusted now (/etc/apk/repositories -> /etc/apk/repositories.d)?

(I know that the commits are merged and this PR is closed.)

vincejv pushed a commit to vincejv/openwrt that referenced this pull request Nov 16, 2024
Analog to how we handle distfeeds with opkg, have the base feeds defined
in a file in repositories.d instead of the base /etc/apk/repositories.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: openwrt#16940
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
vincejv pushed a commit to vincejv/openwrt that referenced this pull request Nov 16, 2024
Analog to how we handle custom feeds in opkg, add a customfeeds.list for
custom package feeds and mark it as a configuration file.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: openwrt#16940
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
vincejv pushed a commit to vincejv/openwrt that referenced this pull request Nov 16, 2024
Analog to how we handle distfeeds with opkg, have the base feeds defined
in a file in repositories.d instead of the base /etc/apk/repositories.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: openwrt#16940
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
vincejv pushed a commit to vincejv/openwrt that referenced this pull request Nov 16, 2024
Analog to how we handle custom feeds in opkg, add a customfeeds.list for
custom package feeds and mark it as a configuration file.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: openwrt#16940
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
@ynezz ynezz added the ci:target:armsr:armv8 Triggers CI build job for armsr/armv8 target label Nov 17, 2024
Ra2-IFV pushed a commit to Ra2-IFV/openwrt that referenced this pull request Nov 17, 2024
Analog to how we handle distfeeds with opkg, have the base feeds defined
in a file in repositories.d instead of the base /etc/apk/repositories.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: openwrt#16940
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Ra2-IFV pushed a commit to Ra2-IFV/openwrt that referenced this pull request Nov 17, 2024
Analog to how we handle custom feeds in opkg, add a customfeeds.list for
custom package feeds and mark it as a configuration file.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: openwrt#16940
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
liudf0716 pushed a commit to liudf0716/openwrt that referenced this pull request Dec 5, 2024
Analog to how we handle distfeeds with opkg, have the base feeds defined
in a file in repositories.d instead of the base /etc/apk/repositories.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: openwrt#16940
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
liudf0716 pushed a commit to liudf0716/openwrt that referenced this pull request Dec 5, 2024
Analog to how we handle custom feeds in opkg, add a customfeeds.list for
custom package feeds and mark it as a configuration file.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: openwrt#16940
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Vladdrako pushed a commit to Vladdrako/openwrt that referenced this pull request Dec 11, 2024
Analog to how we handle distfeeds with opkg, have the base feeds defined
in a file in repositories.d instead of the base /etc/apk/repositories.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: openwrt#16940
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Vladdrako pushed a commit to Vladdrako/openwrt that referenced this pull request Dec 11, 2024
Analog to how we handle custom feeds in opkg, add a customfeeds.list for
custom package feeds and mark it as a configuration file.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: openwrt#16940
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
M3m3M4n pushed a commit to M3m3M4n/openwrt that referenced this pull request Feb 16, 2025
Analog to how we handle distfeeds with opkg, have the base feeds defined
in a file in repositories.d instead of the base /etc/apk/repositories.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: openwrt#16940
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
M3m3M4n pushed a commit to M3m3M4n/openwrt that referenced this pull request Feb 16, 2025
Analog to how we handle custom feeds in opkg, add a customfeeds.list for
custom package feeds and mark it as a configuration file.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: openwrt#16940
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
HateTM pushed a commit to HateTM/tplink_archer-ax80-v1 that referenced this pull request Mar 31, 2025
Analog to how we handle distfeeds with opkg, have the base feeds defined
in a file in repositories.d instead of the base /etc/apk/repositories.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: openwrt#16940
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
HateTM pushed a commit to HateTM/tplink_archer-ax80-v1 that referenced this pull request Mar 31, 2025
Analog to how we handle custom feeds in opkg, add a customfeeds.list for
custom package feeds and mark it as a configuration file.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: openwrt#16940
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
maurerr pushed a commit to maurerr/openwrt that referenced this pull request Apr 9, 2025
Analog to how we handle distfeeds with opkg, have the base feeds defined
in a file in repositories.d instead of the base /etc/apk/repositories.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: openwrt#16940
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
maurerr pushed a commit to maurerr/openwrt that referenced this pull request Apr 9, 2025
Analog to how we handle custom feeds in opkg, add a customfeeds.list for
custom package feeds and mark it as a configuration file.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: openwrt#16940
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci:target:armsr:armv8 Triggers CI build job for armsr/armv8 target core packages pull request/issue for core (in-tree) packages
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants