Reorder package list sources
All checks were successful
buildbot/multibuild_parent Build done.
buildbot/travis_bionic Build done.
buildbot/job/openwrt Build done.

- local packages should be prioritiezed if we have custom builds, like
  collectd
- the docs at
  https://openwrt.org/docs/guide-user/additional-software/imagebuilder#adding_package_repositories
  explain that the repos are searched in the order they are in the file
This commit is contained in:
Peter Šurda 2023-08-05 17:30:13 +02:00
parent 04440d8f55
commit 8c947490b5
Signed by: PeterSurda
GPG Key ID: 3E47497CF67ABB95

View File

@ -56,6 +56,8 @@ make info
echo "CONFIG_TARGET_ROOTFS_PARTSIZE=308" >> .config echo "CONFIG_TARGET_ROOTFS_PARTSIZE=308" >> .config
# Disable ext4 images # Disable ext4 images
echo "CONFIG_TARGET_ROOTFS_EXT4FS=n" >> .config echo "CONFIG_TARGET_ROOTFS_EXT4FS=n" >> .config
# re-enable collectd encrypted network, it gets removed somewhere
echo "CONFIG_PACKAGE_COLLECTD_ENCRYPTED_NETWORK=y" >> .config
PACKAGES="kmod-i2c-bcm2835 kmod-i2c-mux kmod-i2c-mux-pinctrl \ PACKAGES="kmod-i2c-bcm2835 kmod-i2c-mux kmod-i2c-mux-pinctrl \
kmod-nf-nathelper-extra \ kmod-nf-nathelper-extra \
@ -122,6 +124,14 @@ pushd ${BOOTSOURCE}
git apply ${pwd}/patches/bootconfig-add.patch git apply ${pwd}/patches/bootconfig-add.patch
popd popd
# reorder packages so the local ones have a higher priority
sed -i -E 's/^(src imagebuilder file:packages.*)/#\1/
5i src imagebuilder file:packages' \
repositories.conf
# debug
cat repositories.conf
make image PROFILE=${PROFILE} \ make image PROFILE=${PROFILE} \
PACKAGES="${PACKAGES}" DISABLED_SERVICES="dropbear" FILES="files" || exit 1 PACKAGES="${PACKAGES}" DISABLED_SERVICES="dropbear" FILES="files" || exit 1