Skip to content

Commit

Permalink
sonix: Move our software to a dedicated feed
Browse files Browse the repository at this point in the history
This should play better with merges of the upstream branch and seems to
be the way Things Should Be Done(TM).
  • Loading branch information
bluecmd committed Aug 1, 2024
1 parent a4667cf commit 88363e0
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 106 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/github-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,8 @@ jobs:
set -xeuo pipefail
rm -fr logs/
cp -v sonix/diffconfig .config
cat sonix/overrides >> .config
sed -i "s/SONIX-GIT/SONIX-${{ needs.setup.outputs.version_number }}/g" .config
# ensure only squashfs is being built
echo 'CONFIG_TARGET_ROOTFS_EXT4FS=n' >> .config
echo 'CONFIG_TARGET_ROOTFS_TARGZ=n' >> .config
./scripts/ext-toolchain.sh --toolchain $PWD/toolchain --overwrite-config --config ${{ matrix.target }}/${{ matrix.variant }}
if grep CONFIG_BUILD_NLS=y .config ; then echo '!!! We should not build with NLS as it increases build-time for no gain, remove it'; exit 1; fi
make -j$(nproc) download
Expand Down
44 changes: 0 additions & 44 deletions package/utils/nginx-luci-jwt-auth/Makefile

This file was deleted.

47 changes: 0 additions & 47 deletions package/utils/prometheus-node-exporter/Makefile

This file was deleted.

This file was deleted.

1 change: 1 addition & 0 deletions sonix/feeds.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# See https://openwrt.org/docs/guide-developer/feeds for syntax
src-git packages https://git.openwrt.org/feed/packages.git;master
src-git luci https://git.openwrt.org/project/luci.git;master
src-git sonix https://github.com/sonix-network/openwrt-packages.git;master
8 changes: 8 additions & 0 deletions sonix/overrides
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# This file contains options that are not properly preserved using ./scripts/diffconfig.sh

# Only use the SONIX feed for building, not for opkg/apk
CONFIG_FEED_sonix=n

# We are only using squashfs root
CONFIG_TARGET_ROOTFS_EXT4FS=n
CONFIG_TARGET_ROOTFS_TARGZ=n

0 comments on commit 88363e0

Please sign in to comment.