Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
gluon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
ffbs
gluon
Commits
3949cf36
Commit
3949cf36
authored
10 years ago
by
Matthias Schiffer
Browse files
Options
Downloads
Patches
Plain Diff
Update OpenWrt core and packages
parent
91ce22ba
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules
+2
-2
2 additions, 2 deletions
modules
patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependencies.patch
+5
-5
5 additions, 5 deletions
...01-tools-Makefile-fix-host-tools-build-dependencies.patch
with
7 additions
and
7 deletions
modules
+
2
−
2
View file @
3949cf36
GLUON_FEEDS='openwrt gluon routing luci'
OPENWRT_REPO=git://git.openwrt.org/14.07/openwrt.git
OPENWRT_COMMIT=
22808d019dc6d2afd8946036740ea3caf84e5f5b
OPENWRT_COMMIT=
58e9eadd67bf5f83b9546395ed68698ca574c6e2
PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git
PACKAGES_OPENWRT_COMMIT=
d
83d5
f
68
0683c9266be8302e27e49e649ad871d9
PACKAGES_OPENWRT_COMMIT=
e27
83
1
d568
f5689602abae58f5ae92f060421ada
PACKAGES_OPENWRT_BRANCH=for-14.07
PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git
...
...
This diff is collapsed.
Click to expand it.
patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependencies.patch
+
5
−
5
View file @
3949cf36
...
...
@@ -3,10 +3,10 @@ Date: Sat, 26 Jul 2014 06:10:23 +0200
Subject: tools/Makefile: fix host tools build dependencies
diff --git a/tools/Makefile b/tools/Makefile
index
9595d62..b8eef3f
100644
index
13bb028..137ad61
100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -9
6
,10 +9
6
,16 @@
define PrepareStaging
@@ -9
7
,10 +9
7
,16 @@
define PrepareStaging
endef
# preparatory work
...
...
@@ -23,7 +23,7 @@ index 9595d62..b8eef3f 100644
$(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
$(call PrepareStaging,$(STAGING_DIR_HOST))
@@ -11
1
,7 +11
7
,7 @@
$(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
@@ -11
2
,7 +11
8
,7 @@
$(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
define PrepareCommand
...
...
@@ -32,7 +32,7 @@ index 9595d62..b8eef3f 100644
@mkdir -p "$$(dir $$@)"; rm -f "$$@"
@export FILE="$$$$(which $(2) 2>/dev/null | grep -v 'not found' | head -n1)"; [ -n "$$$$FILE" ] || { \
echo "Command $(1) not found."; false; \
@@ -12
0
,7 +12
6
,7 @@
$(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared
@@ -12
1
,7 +12
7
,7 @@
$(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared
endef
endif
...
...
@@ -41,7 +41,7 @@ index 9595d62..b8eef3f 100644
@rm -f $@
@if stat --version > /dev/null 2>&1; then \
ln -s `which stat` $@; \
@@ -14
4
,8 +15
0
,8 @@
$(eval $(call PrepareCommand,tar,gtar tar))
@@ -14
5
,8 +15
1
,8 @@
$(eval $(call PrepareCommand,tar,gtar tar))
$(eval $(call PrepareCommand,diff,gdiff diff))
$(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,md5sum cp stat seq python awk getopt grep tar diff)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment