Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gluon
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ffbs
gluon
Commits
1090ba73
Commit
1090ba73
authored
Jul 04, 2014
by
Matthias Schiffer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update OpenWrt
parent
bf34a3c9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
32 deletions
+7
-32
modules
modules
+1
-1
patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependencies.patch
...01-tools-Makefile-fix-host-tools-build-dependencies.patch
+6
-6
patches/openwrt/0029-hotplug2-use-source-hosted-by-OpenWrt-as-the-original-source-is-down.patch
...ce-hosted-by-OpenWrt-as-the-original-source-is-down.patch
+0
-25
No files found.
modules
View file @
1090ba73
GLUON_FEEDS='openwrt gluon routing luci'
OPENWRT_REPO=git://git.openwrt.org/12.09/openwrt.git
OPENWRT_COMMIT=
595ebf6f0d39394e5518869d4fc436cfd27e4d3c
OPENWRT_COMMIT=
be9a71c6f07634f2570741b453055c6108500569
PACKAGES_OPENWRT_REPO=git://git.openwrt.org/12.09/packages.git
PACKAGES_OPENWRT_COMMIT=381bbea65989b63e30f43ab87e51b042325bbff3
...
...
patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependencies.patch
View file @
1090ba73
...
...
@@ -3,10 +3,10 @@ Date: Wed, 7 May 2014 22:57:10 +0200
Subject: tools/Makefile: fix host tools build dependencies
diff --git a/tools/Makefile b/tools/Makefile
index
2236373..1f45367
100644
index
6658f8c..26a3fb1
100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -7
4,6 +74
,7 @@
endif
@@ -7
5,6 +75
,7 @@
endif
$(curdir)/builddirs := $(tools-y) $(tools-dep) $(tools-)
$(curdir)/builddirs-default := $(tools-y)
...
...
@@ -14,7 +14,7 @@ index 2236373..1f45367 100644
ifndef DUMP_TARGET_DB
define PrepareStaging
@for dir in $(1); do ( \
@@ -8
5,10 +86
,16 @@
define PrepareStaging
@@ -8
6,10 +87
,16 @@
define PrepareStaging
endef
# preparatory work
...
...
@@ -31,7 +31,7 @@ index 2236373..1f45367 100644
$(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
$(call PrepareStaging,$(STAGING_DIR_HOST))
@@ -10
0,7 +107
,7 @@
$(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
@@ -10
1,7 +108
,7 @@
$(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
define PrepareCommand
...
...
@@ -40,7 +40,7 @@ index 2236373..1f45367 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; \
@@ -1
09,7 +116
,7 @@
$(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared
@@ -1
10,7 +117
,7 @@
$(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared
endef
endif
...
...
@@ -49,7 +49,7 @@ index 2236373..1f45367 100644
@rm -f $@
@if stat --version > /dev/null 2>&1; then \
ln -s `which stat` $@; \
@@ -12
7,8 +134
,8 @@
$(eval $(call PrepareCommand,seq,gseq seq))
@@ -12
8,8 +135
,8 @@
$(eval $(call PrepareCommand,seq,gseq seq))
$(eval $(call PrepareCommand,python,python2 python))
$(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,find md5sum cp stat seq python)
...
...
patches/openwrt/0029-hotplug2-use-source-hosted-by-OpenWrt-as-the-original-source-is-down.patch
deleted
100644 → 0
View file @
bf34a3c9
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 2 Jul 2014 16:19:16 +0200
Subject: hotplug2: use source hosted by OpenWrt as the original source is down
diff --git a/package/hotplug2/Makefile b/package/hotplug2/Makefile
index e8483dd..05134c2 100644
--- a/package/hotplug2/Makefile
+++ b/package/hotplug2/Makefile
@@ -12,13 +12,9 @@
PKG_REV:=201
PKG_VERSION:=$(PKG_REV)
PKG_RELEASE:=4
-PKG_SOURCE_PROTO:=svn
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_SUBDIR:=hotplug2-$(PKG_VERSION)
-PKG_SOURCE_URL:=http://svn.nomi.cz/svn/isteve/hotplug2
-PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
-#PKG_SOURCE_URL:=http://isteve.bofh.cz/~isteve/hotplug2
-#PKG_MD5SUM:=ea2c01d027b4002e4e6b0ff266f51a51
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
+PKG_MD5SUM:=7bab8ba67555a8400424f3c92ec67579
include $(INCLUDE_DIR)/package.mk
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment