Skip to content

Commit

Permalink
Revert "builder: switch to LuCI NethServer fork"
Browse files Browse the repository at this point in the history
This reverts commit 1ac23bf.

The fork makes the build fail with the error:

 fatal: refusing to merge unrelated histories
  • Loading branch information
gsanchietti committed Mar 26, 2024
1 parent fd5a63a commit dc7e011
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
6 changes: 0 additions & 6 deletions builder/build-builder
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,6 @@ buildah run --user build ${container} -- bash -c "cd /home/build/openwrt && sed
echo "Setup fast feed download"
buildah run --user build ${container} -- bash -c "cd /home/build/openwrt && sed -i 's/src-git-full/src-git/' feeds.conf.default"

luci_branch="nethsec-"$(echo $OWRT_VERSION | cut -d'.' -f 1,2)
echo "Switch to LuCI NethServer fork"
buildah run --user build ${container} -- bash -c "cd /home/build/openwrt && grep -v 'git.openwrt.org/project/luci.git' feeds.conf.default > feeds.tmp"
buildah run --user build ${container} -- bash -c "cd /home/build/openwrt && echo 'src-git luci https://github.com/NethServer/luci.git;$luci_branch' >> feeds.tmp"
buildah run --user build ${container} -- bash -c "cd /home/build/openwrt && mv feeds.tmp feeds.conf.default"

echo "Update feeds"
buildah run --user build ${container} -- bash -c "cd /home/build/openwrt && ./scripts/feeds update && ./scripts/feeds install -a"

Expand Down
3 changes: 0 additions & 3 deletions builder/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ echo "src-link nethsecurity /home/build/openwrt/nspackages" >> feeds.conf.defaul
./scripts/feeds update nethsecurity
./scripts/feeds install -a -p nethsecurity

# Update LuCI fork
./scripts/feeds update luci

# Replace upstream packages
for d in $(find /home/build/openwrt/nspackages/ -maxdepth 1 -type d)
do
Expand Down

0 comments on commit dc7e011

Please sign in to comment.