Skip to content
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.

Sign up for GitHub

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

update to Openwrt 19.07.4 #802

Merged
merged 7 commits into from
Sep 25, 2020
Merged

update to Openwrt 19.07.4 #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0b85fe4
modules: update to OpenWrt 19.07.3 release
SvenRoederer May 17, 2020
24cf35f
Update berlin-packages
SvenRoederer May 16, 2020
e70b320
patches/luci: update split-luci-base_PR2817
SvenRoederer May 8, 2020
a88c44f
patches/luci: fix split-luci-base_PR2817
SvenRoederer May 13, 2020
987cf1a
modules: update to OpenWrt 19.07.4 release
SvenRoederer Sep 7, 2020
cf3523b
Update community-feeds (freifunk-berlin, Gluon)
SvenRoederer Sep 7, 2020
0e29db3
patches/openwrt: update the apply on OpenWrt HEAD
SvenRoederer Jul 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions modules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
OPENWRT_REPO=https://git.openwrt.org/openwrt/openwrt.git
OPENWRT_COMMIT=33732f4a9c17921b782167a0dcaba9703d4e6753
OPENWRT_COMMIT=d5810aa61367a9424599935572f622d27f8303f0
OPENWRT_BRANCH=openwrt-19.07

PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
PACKAGES_PACKAGES_COMMIT=99efce0cd27adfcc53384fba93f37e5ee2e517de
PACKAGES_PACKAGES_COMMIT=eae1bb397f064befe003b01a36ae318321e81d35
PACKAGES_PACKAGES_BRANCH=openwrt-19.07

PACKAGES_LUCI_REPO=https://github.com/openwrt/luci.git
PACKAGES_LUCI_COMMIT=13dd17fca148965d38f0d4e578b19679a7c4daa2
PACKAGES_LUCI_COMMIT=0d0ab01a64f25d15325d3c98a7df252085382f1d
PACKAGES_LUCI_BRANCH=openwrt-19.07

PACKAGES_FREIFUNK_REPO=https://github.com/freifunk/openwrt-packages.git
PACKAGES_FREIFUNK_COMMIT=73454e6fe1bdc902c69ca0079d979fdb94d6fb1f
PACKAGES_FREIFUNK_BRANCH=openwrt-19.07

PACKAGES_ROUTING_REPO=https://github.com/openwrt-routing/packages.git
PACKAGES_ROUTING_COMMIT=efa6e5445adda9c6545f551808829ec927cbade8
PACKAGES_ROUTING_COMMIT=b77498bd56d5e45ab4577a1f4ad6ffc55b4a86b7
PACKAGES_ROUTING_BRANCH=openwrt-19.07

PACKAGES_PACKAGES_BERLIN_REPO=https://github.com/freifunk-berlin/firmware-packages.git
PACKAGES_PACKAGES_BERLIN_COMMIT=b03e01ed5a3b691a19cf284627aab9820ce6c2b8
PACKAGES_PACKAGES_BERLIN_COMMIT=7d9cc4f998ce76db71cd2e64acd23d3c5f1af458

PACKAGES_PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
PACKAGES_PACKAGES_GLUON_COMMIT=033401c18ecbf5073f5330b4462af6e450e358ff
PACKAGES_PACKAGES_GLUON_COMMIT=95c805c863cd0818f0e5196d3b7bde6860fd2861

GLUON_FEEDS='packages luci freifunk routing packages_berlin packages_gluon'
13 changes: 3 additions & 10 deletions patches/openwrt/1600-imagebuilder-custom-postinst-script.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,17 @@ From: template <nomail@local>
Date: Fri, 6 Sep 2019 08:29:50 +0000
Subject: imagebuilder-custom-postinst-script

---


diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 95df8bf113..0debd5a882 100644
index 835dd98ca5fe9f876247d3bf43c02459e640dcd1..59f99d13ab32634ef29591743d1d3b4dc020ee50 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -105,6 +105,9 @@ _call_image: staging_dir/host/.prereq-build
@@ -117,6 +117,9 @@ _call_image: staging_dir/host/.prereq-build
$(MAKE) package_reload
$(MAKE) package_install
$(MAKE) -s prepare_rootfs
+ifneq ($(CUSTOM_POSTINST_SCRIPT),)
+ (cd "$(TARGET_DIR)" ; bash $(CUSTOM_POSTINST_SCRIPT))
+endif
$(MAKE) -s build_image
$(MAKE) -s json_overview_image_info
$(MAKE) -s checksum

--
2.20.1


Loading