* [Buildroot] [PATCH 01/10] skeleton/S40network: tweak for debian ifupdown
2014-11-14 12:44 [Buildroot] [PATCHv2 00/10] systemV init without busybox series Gustavo Zacarias
@ 2014-11-14 12:44 ` Gustavo Zacarias
2014-11-14 21:33 ` Arnout Vandecappelle
2014-11-14 12:44 ` [Buildroot] [PATCH 02/10] dash: bump to 0.5.8-2 Gustavo Zacarias
` (8 subsequent siblings)
9 siblings, 1 reply; 35+ messages in thread
From: Gustavo Zacarias @ 2014-11-14 12:44 UTC (permalink / raw)
To: buildroot
Make the S40network script create the /run/network directory for the
debian variant of ifupdown which uses it as a lock directory.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
system/skeleton/etc/init.d/S40network | 3 +++
1 file changed, 3 insertions(+)
diff --git a/system/skeleton/etc/init.d/S40network b/system/skeleton/etc/init.d/S40network
index e69e613..4317d14 100755
--- a/system/skeleton/etc/init.d/S40network
+++ b/system/skeleton/etc/init.d/S40network
@@ -3,6 +3,9 @@
# Start the network....
#
+# Debian ifupdown needs the /run/network lock directory
+[ -h /sbin/ifup ] || mkdir -p /run/network
+
case "$1" in
start)
echo "Starting network..."
--
2.0.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [Buildroot] [PATCH 01/10] skeleton/S40network: tweak for debian ifupdown
2014-11-14 12:44 ` [Buildroot] [PATCH 01/10] skeleton/S40network: tweak for debian ifupdown Gustavo Zacarias
@ 2014-11-14 21:33 ` Arnout Vandecappelle
0 siblings, 0 replies; 35+ messages in thread
From: Arnout Vandecappelle @ 2014-11-14 21:33 UTC (permalink / raw)
To: buildroot
On 14/11/14 13:44, Gustavo Zacarias wrote:
> Make the S40network script create the /run/network directory for the
> debian variant of ifupdown which uses it as a lock directory.
>
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
> system/skeleton/etc/init.d/S40network | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/system/skeleton/etc/init.d/S40network
> b/system/skeleton/etc/init.d/S40network
> index e69e613..4317d14 100755
> --- a/system/skeleton/etc/init.d/S40network
> +++ b/system/skeleton/etc/init.d/S40network
> @@ -3,6 +3,9 @@
> # Start the network....
> #
>
> +# Debian ifupdown needs the /run/network lock directory
> +[ -h /sbin/ifup ] || mkdir -p /run/network
I think checking for a symlink is a pretty fragile way for distinguishing
between Debian and busybox ifupdown...
Why not just create the directory unconditionally? People who care about the
4K tmpfs wastage will probably want to get rid of this script entirely...
Regards,
Arnout
> +
> case "$1" in
> start)
> echo "Starting network..."
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 02/10] dash: bump to 0.5.8-2
2014-11-14 12:44 [Buildroot] [PATCHv2 00/10] systemV init without busybox series Gustavo Zacarias
2014-11-14 12:44 ` [Buildroot] [PATCH 01/10] skeleton/S40network: tweak for debian ifupdown Gustavo Zacarias
@ 2014-11-14 12:44 ` Gustavo Zacarias
2014-11-14 13:15 ` Thomas Petazzoni
2014-11-14 12:44 ` [Buildroot] [PATCH 03/10] debianutils: new package Gustavo Zacarias
` (7 subsequent siblings)
9 siblings, 1 reply; 35+ messages in thread
From: Gustavo Zacarias @ 2014-11-14 12:44 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/dash/dash.hash | 4 ++--
package/dash/dash.mk | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/dash/dash.hash b/package/dash/dash.hash
index 0198cd8..c4e60a4 100644
--- a/package/dash/dash.hash
+++ b/package/dash/dash.hash
@@ -1,3 +1,3 @@
-# From http://ftp.debian.org/debian/pool/main/d/dash/dash_0.5.8-1.dsc
+# From http://ftp.debian.org/debian/pool/main/d/dash/dash_0.5.8-2.dsc
sha256 c6db3a237747b02d20382a761397563d813b306c020ae28ce25a1c3915fac60f dash_0.5.8.orig.tar.gz
-sha256 d751769cc1ef8b825a177e782f1cd3e35bde7c268107fa4febf8d235e12c64d9 dash_0.5.8-1.diff.gz
+sha256 00168a934864c26cae9a51367fe7ea013ece2d4844ff8bd6893fc00a8fa7b38c dash_0.5.8-2.diff.gz
diff --git a/package/dash/dash.mk b/package/dash/dash.mk
index ed8525c..13169d1 100644
--- a/package/dash/dash.mk
+++ b/package/dash/dash.mk
@@ -6,8 +6,8 @@
DASH_VERSION = 0.5.8
DASH_SOURCE = dash_$(DASH_VERSION).orig.tar.gz
-DASH_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/d/dash
-DASH_PATCH = dash_$(DASH_VERSION)-1.diff.gz
+DASH_SITE = http://snapshot.debian.org/archive/debian/20141022T163236Z/pool/main/d/dash
+DASH_PATCH = dash_$(DASH_VERSION)-2.diff.gz
DASH_LICENSE = BSD-3c, GPLv2+ (mksignames.c)
DASH_LICENSE_FILES = COPYING
--
2.0.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [Buildroot] [PATCH 02/10] dash: bump to 0.5.8-2
2014-11-14 12:44 ` [Buildroot] [PATCH 02/10] dash: bump to 0.5.8-2 Gustavo Zacarias
@ 2014-11-14 13:15 ` Thomas Petazzoni
2014-11-14 13:39 ` Peter Korsgaard
0 siblings, 1 reply; 35+ messages in thread
From: Thomas Petazzoni @ 2014-11-14 13:15 UTC (permalink / raw)
To: buildroot
Dear Gustavo Zacarias,
On Fri, 14 Nov 2014 09:44:48 -0300, Gustavo Zacarias wrote:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
> package/dash/dash.hash | 4 ++--
> package/dash/dash.mk | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Peter, this one should probably go in 2014.11.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 02/10] dash: bump to 0.5.8-2
2014-11-14 13:15 ` Thomas Petazzoni
@ 2014-11-14 13:39 ` Peter Korsgaard
2014-11-14 13:42 ` Thomas Petazzoni
0 siblings, 1 reply; 35+ messages in thread
From: Peter Korsgaard @ 2014-11-14 13:39 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
> Dear Gustavo Zacarias,
> On Fri, 14 Nov 2014 09:44:48 -0300, Gustavo Zacarias wrote:
>> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
>> ---
>> package/dash/dash.hash | 4 ++--
>> package/dash/dash.mk | 4 ++--
>> 2 files changed, 4 insertions(+), 4 deletions(-)
> Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Peter, this one should probably go in 2014.11.
Why? Is it security related? I don't see anything special in the
changelog. In fact, I don't see anything affecting us at all:
http://metadata.ftp-master.debian.org/changelogs//main/d/dash/dash_0.5.8-2_changelog
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 02/10] dash: bump to 0.5.8-2
2014-11-14 13:39 ` Peter Korsgaard
@ 2014-11-14 13:42 ` Thomas Petazzoni
2014-11-14 13:49 ` Peter Korsgaard
0 siblings, 1 reply; 35+ messages in thread
From: Thomas Petazzoni @ 2014-11-14 13:42 UTC (permalink / raw)
To: buildroot
Dear Peter Korsgaard,
On Fri, 14 Nov 2014 14:39:00 +0100, Peter Korsgaard wrote:
> >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
>
> > Dear Gustavo Zacarias,
> > On Fri, 14 Nov 2014 09:44:48 -0300, Gustavo Zacarias wrote:
> >> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> >> ---
> >> package/dash/dash.hash | 4 ++--
> >> package/dash/dash.mk | 4 ++--
> >> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> > Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>
> > Peter, this one should probably go in 2014.11.
>
> Why? Is it security related? I don't see anything special in the
> changelog. In fact, I don't see anything affecting us at all:
>
> http://metadata.ftp-master.debian.org/changelogs//main/d/dash/dash_0.5.8-2_changelog
I should have said: s/should/could/. I believe it's a minor update, and
it's adding hash files, so it's fine for 2014.11. But it's your call :)
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 02/10] dash: bump to 0.5.8-2
2014-11-14 13:42 ` Thomas Petazzoni
@ 2014-11-14 13:49 ` Peter Korsgaard
2014-11-14 13:59 ` Gustavo Zacarias
0 siblings, 1 reply; 35+ messages in thread
From: Peter Korsgaard @ 2014-11-14 13:49 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Hi,
>> > Peter, this one should probably go in 2014.11.
>>
>> Why? Is it security related? I don't see anything special in the
>> changelog. In fact, I don't see anything affecting us at all:
>>
>> http://metadata.ftp-master.debian.org/changelogs//main/d/dash/dash_0.5.8-2_changelog
> I should have said: s/should/could/. I believe it's a minor update, and
> it's adding hash files, so it's fine for 2014.11. But it's your call :)
Ok. It only updates the .hash, we already have it for -1.
Gustavoz, what is the reason for the bump? According to the changelog
the only difference is in the debian packaging (should we also pass
--disable-lineno?)
--
Venlig hilsen,
Peter Korsgaard
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 02/10] dash: bump to 0.5.8-2
2014-11-14 13:49 ` Peter Korsgaard
@ 2014-11-14 13:59 ` Gustavo Zacarias
2014-11-14 14:10 ` Peter Korsgaard
0 siblings, 1 reply; 35+ messages in thread
From: Gustavo Zacarias @ 2014-11-14 13:59 UTC (permalink / raw)
To: buildroot
On 11/14/2014 10:49 AM, Peter Korsgaard wrote:
> Ok. It only updates the .hash, we already have it for -1.
>
> Gustavoz, what is the reason for the bump? According to the changelog
> the only difference is in the debian packaging (should we also pass
> --disable-lineno?)
Many tiny fixes, it's not only that.
I think we could consider it a security fix even if there's no
know/public vulnerability yet:
https://cygwin.com/ml/cygwin-announce/2014-09/msg00043.html
Regards.
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 02/10] dash: bump to 0.5.8-2
2014-11-14 13:59 ` Gustavo Zacarias
@ 2014-11-14 14:10 ` Peter Korsgaard
2014-11-14 14:14 ` Gustavo Zacarias
0 siblings, 1 reply; 35+ messages in thread
From: Peter Korsgaard @ 2014-11-14 14:10 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Hi,
>> Gustavoz, what is the reason for the bump? According to the changelog
>> the only difference is in the debian packaging (should we also pass
>> --disable-lineno?)
> Many tiny fixes, it's not only that.
> I think we could consider it a security fix even if there's no
> know/public vulnerability yet:
> https://cygwin.com/ml/cygwin-announce/2014-09/msg00043.html
But isn't this changelog against 5.7? We already have 5.8-1.
E.G.
wget -q http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/d/dash/dash_0.5.8-1.diff.gz
wget -q http://snapshot.debian.org/archive/debian/20141022T163236Z/pool/main/d/dash/dash_0.5.8-2.diff.gz
gunzip dash_0.5.8-*
diff -u dash_0.5.8-*
--- dash_0.5.8-1.diff 2014-10-01 19:10:25.000000000 +0200
+++ dash_0.5.8-2.diff 2014-10-22 18:36:50.000000000 +0200
@@ -85,7 +85,14 @@
+fi
--- dash-0.5.8.orig/debian/changelog
+++ dash-0.5.8/debian/changelog
-@@ -0,0 +1,1837 @@
+@@ -0,0 +1,1844 @@
++dash (0.5.8-2) experimental; urgency=medium
++
++ * debian/rules: pass --disable-lineno option to configure (thx Sven
++ Joachim, closes: #766048).
++
++ -- Gerrit Pape <pape@smarden.org> Mon, 20 Oct 2014 17:46:03 +0000
++
+dash (0.5.8-1) experimental; urgency=medium
+
+ * new upstream release (closes: #598238).
@@ -4180,7 +4187,7 @@
+"d. bash, tcsh)."
--- dash-0.5.8.orig/debian/rules
+++ dash-0.5.8/debian/rules
-@@ -0,0 +1,108 @@
+@@ -0,0 +1,109 @@
+#!/usr/bin/make -f
+
+CC =gcc
@@ -4226,7 +4233,8 @@
+ touch configure
+ (cd build-tmp && CC='$(CC)' \
+ CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' \
-+ exec ../configure --enable-fnmatch --host='$(DEB_HOST_GNU_TYPE)')
++ exec ../configure --enable-fnmatch --disable-lineno \
++ --host='$(DEB_HOST_GNU_TYPE)')
+ touch configure-stamp
+
+build: deb-checkdir build-stamp
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 02/10] dash: bump to 0.5.8-2
2014-11-14 14:10 ` Peter Korsgaard
@ 2014-11-14 14:14 ` Gustavo Zacarias
2014-11-14 14:16 ` Peter Korsgaard
0 siblings, 1 reply; 35+ messages in thread
From: Gustavo Zacarias @ 2014-11-14 14:14 UTC (permalink / raw)
To: buildroot
On 11/14/2014 11:10 AM, Peter Korsgaard wrote:
> But isn't this changelog against 5.7? We already have 5.8-1.
Huh right, i didn't know what i've fetched and diffed.
I don't think we should --disable-lineno anyway, we never did and we
never used debian build rules either.
Regards.
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 02/10] dash: bump to 0.5.8-2
2014-11-14 14:14 ` Gustavo Zacarias
@ 2014-11-14 14:16 ` Peter Korsgaard
0 siblings, 0 replies; 35+ messages in thread
From: Peter Korsgaard @ 2014-11-14 14:16 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
> On 11/14/2014 11:10 AM, Peter Korsgaard wrote:
>> But isn't this changelog against 5.7? We already have 5.8-1.
> Huh right, i didn't know what i've fetched and diffed.
> I don't think we should --disable-lineno anyway, we never did and we
> never used debian build rules either.
> Regards.
Ok, I'll mark the patch as rejected then. Thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 03/10] debianutils: new package
2014-11-14 12:44 [Buildroot] [PATCHv2 00/10] systemV init without busybox series Gustavo Zacarias
2014-11-14 12:44 ` [Buildroot] [PATCH 01/10] skeleton/S40network: tweak for debian ifupdown Gustavo Zacarias
2014-11-14 12:44 ` [Buildroot] [PATCH 02/10] dash: bump to 0.5.8-2 Gustavo Zacarias
@ 2014-11-14 12:44 ` Gustavo Zacarias
2014-11-14 21:35 ` Arnout Vandecappelle
2014-11-14 12:44 ` [Buildroot] [PATCH 04/10] ifupdown: " Gustavo Zacarias
` (6 subsequent siblings)
9 siblings, 1 reply; 35+ messages in thread
From: Gustavo Zacarias @ 2014-11-14 12:44 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/Config.in | 1 +
package/debianutils/Config.in | 7 +++++++
package/debianutils/debianutils.hash | 2 ++
package/debianutils/debianutils.mk | 14 ++++++++++++++
4 files changed, 24 insertions(+)
create mode 100644 package/debianutils/Config.in
create mode 100644 package/debianutils/debianutils.hash
create mode 100644 package/debianutils/debianutils.mk
diff --git a/package/Config.in b/package/Config.in
index 0dbb788..278134d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1199,6 +1199,7 @@ endif
source "package/cpuload/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/dcron/Config.in"
+ source "package/debianutils/Config.in"
endif
source "package/dsp-tools/Config.in"
source "package/ftop/Config.in"
diff --git a/package/debianutils/Config.in b/package/debianutils/Config.in
new file mode 100644
index 0000000..f865868
--- /dev/null
+++ b/package/debianutils/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_DEBIANUTILS
+ bool "debianutils"
+ depends on BR2_USE_MMU # fork()
+ help
+ Miscellaneous utilities specific to Debian.
+
+ https://tracker.debian.org/pkg/debianutils
diff --git a/package/debianutils/debianutils.hash b/package/debianutils/debianutils.hash
new file mode 100644
index 0000000..089dd42
--- /dev/null
+++ b/package/debianutils/debianutils.hash
@@ -0,0 +1,2 @@
+# From http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_4.4.dsc
+sha256 190850cdd6b5302e0a1ba1aaed1bc7074d67d3bd8d04c613f242f7145afa53a6 debianutils_4.4.tar.gz
diff --git a/package/debianutils/debianutils.mk b/package/debianutils/debianutils.mk
new file mode 100644
index 0000000..43d7cf3
--- /dev/null
+++ b/package/debianutils/debianutils.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# debianutils
+#
+################################################################################
+
+DEBIANUTILS_VERSION = 4.4
+DEBIANUTILS_SOURCE = debianutils_$(DEBIANUTILS_VERSION).tar.gz
+DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20130728T034252Z/pool/main/d/debianutils
+DEBIANUTILS_CONF_OPTS = --exec-prefix=/
+DEBIANUTILS_LICENSE = GPLv2+, SMAIL (savelog)
+DEBIANUTILS_LICENSE_FILES = debian/copyright
+
+$(eval $(autotools-package))
--
2.0.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [Buildroot] [PATCH 04/10] ifupdown: new package
2014-11-14 12:44 [Buildroot] [PATCHv2 00/10] systemV init without busybox series Gustavo Zacarias
` (2 preceding siblings ...)
2014-11-14 12:44 ` [Buildroot] [PATCH 03/10] debianutils: new package Gustavo Zacarias
@ 2014-11-14 12:44 ` Gustavo Zacarias
2014-11-14 21:56 ` Arnout Vandecappelle
2014-11-14 12:44 ` [Buildroot] [PATCH 05/10] start-stop-daemon: " Gustavo Zacarias
` (5 subsequent siblings)
9 siblings, 1 reply; 35+ messages in thread
From: Gustavo Zacarias @ 2014-11-14 12:44 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/Config.in | 3 +++
package/ifupdown/Config.in | 17 +++++++++++++++++
package/ifupdown/ifupdown.hash | 2 ++
package/ifupdown/ifupdown.mk | 33 +++++++++++++++++++++++++++++++++
4 files changed, 55 insertions(+)
create mode 100644 package/ifupdown/Config.in
create mode 100644 package/ifupdown/ifupdown.hash
create mode 100644 package/ifupdown/ifupdown.mk
diff --git a/package/Config.in b/package/Config.in
index 278134d..8f3cc3c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1014,6 +1014,9 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/ifplugd/Config.in"
endif
source "package/iftop/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+ source "package/ifupdown/Config.in"
+endif
source "package/igh-ethercat/Config.in"
source "package/igmpproxy/Config.in"
source "package/inadyn/Config.in"
diff --git a/package/ifupdown/Config.in b/package/ifupdown/Config.in
new file mode 100644
index 0000000..10cf2be
--- /dev/null
+++ b/package/ifupdown/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_IFUPDOWN
+ bool "ifupdown"
+ depends on BR2_USE_MMU # fork()
+ # Default/our uclibc lacks wordexp()
+ depends on !BR2_TOOLCHAIN_USES_UCLIBC
+ # runtime for ip binary
+ select BR2_PACKAGE_IPROUTE2 if !BR2_PACKAGE_BUSYBOX
+ # runtime for run-parts
+ select BR2_PACKAGE_DEBIANUTILS if !BR2_PACKAGE_BUSYBOX
+ help
+ High level tools to configure network interfaces.
+
+ https://tracker.debian.org/pkg/ifupdown
+
+comment "ifupdown needs an (e)glibc or musl toolchain"
+ depends on BR2_USE_MMU
+ depends on BR2_TOOLCHAIN_USES_UCLIBC
diff --git a/package/ifupdown/ifupdown.hash b/package/ifupdown/ifupdown.hash
new file mode 100644
index 0000000..f0c314b
--- /dev/null
+++ b/package/ifupdown/ifupdown.hash
@@ -0,0 +1,2 @@
+# From http://ftp.de.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.7.49.dsc
+sha256 5d07c73610ff90393c7273e2af9003eeb1825fc88144ae5ed11a5517547d0f58 ifupdown_0.7.49.tar.xz
diff --git a/package/ifupdown/ifupdown.mk b/package/ifupdown/ifupdown.mk
new file mode 100644
index 0000000..b05ffc9
--- /dev/null
+++ b/package/ifupdown/ifupdown.mk
@@ -0,0 +1,33 @@
+################################################################################
+#
+# ifupdown
+#
+################################################################################
+
+IFUPDOWN_VERSION = 0.7.49
+IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz
+IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20140923T221921Z/pool/main/i/ifupdown
+IFUPDOWN_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
+IFUPDOWN_LICENSE = GPLv2+
+IFUPDOWN_LICENSE_FILES = COPYING
+
+define IFUPDOWN_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS) -D'IFUPDOWN_VERSION=\"$(IFUPDOWN_VERSION)\"'" \
+ -C $(@D)
+endef
+
+define IFUPDOWN_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D $(@D)/ifup $(TARGET_DIR)/sbin/ifup
+ $(INSTALL) -m 0755 -D $(@D)/settle-dad.sh \
+ $(TARGET_DIR)/lib/ifupdown/settle-dad.sh
+ ln -sf ifup $(TARGET_DIR)/sbin/ifdown
+ ln -sf ifup $(TARGET_DIR)/sbin/ifquery
+endef
+
+define IFUPDOWN_INSTALL_INIT_SYSTEMD
+ echo "d /run/network 0755 - - - -" > \
+ $(TARGET_DIR)/usr/lib/tmpfiles.d/ifupdown.conf
+endef
+
+$(eval $(generic-package))
--
2.0.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [Buildroot] [PATCH 04/10] ifupdown: new package
2014-11-14 12:44 ` [Buildroot] [PATCH 04/10] ifupdown: " Gustavo Zacarias
@ 2014-11-14 21:56 ` Arnout Vandecappelle
2014-11-14 22:25 ` Gustavo Zacarias
0 siblings, 1 reply; 35+ messages in thread
From: Arnout Vandecappelle @ 2014-11-14 21:56 UTC (permalink / raw)
To: buildroot
On 14/11/14 13:44, Gustavo Zacarias wrote:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
A couple of questions below, but nothing critical.
> ---
> package/Config.in | 3 +++
> package/ifupdown/Config.in | 17 +++++++++++++++++
> package/ifupdown/ifupdown.hash | 2 ++
> package/ifupdown/ifupdown.mk | 33 +++++++++++++++++++++++++++++++++
> 4 files changed, 55 insertions(+)
> create mode 100644 package/ifupdown/Config.in
> create mode 100644 package/ifupdown/ifupdown.hash
> create mode 100644 package/ifupdown/ifupdown.mk
>
> diff --git a/package/Config.in b/package/Config.in
> index 278134d..8f3cc3c 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -1014,6 +1014,9 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
> source "package/ifplugd/Config.in"
> endif
> source "package/iftop/Config.in"
> +if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
> + source "package/ifupdown/Config.in"
> +endif
> source "package/igh-ethercat/Config.in"
> source "package/igmpproxy/Config.in"
> source "package/inadyn/Config.in"
> diff --git a/package/ifupdown/Config.in b/package/ifupdown/Config.in
> new file mode 100644
> index 0000000..10cf2be
> --- /dev/null
> +++ b/package/ifupdown/Config.in
> @@ -0,0 +1,17 @@
> +config BR2_PACKAGE_IFUPDOWN
> + bool "ifupdown"
> + depends on BR2_USE_MMU # fork()
> + # Default/our uclibc lacks wordexp()
> + depends on !BR2_TOOLCHAIN_USES_UCLIBC
> + # runtime for ip binary
> + select BR2_PACKAGE_IPROUTE2 if !BR2_PACKAGE_BUSYBOX
> + # runtime for run-parts
> + select BR2_PACKAGE_DEBIANUTILS if !BR2_PACKAGE_BUSYBOX
> + help
> + High level tools to configure network interfaces.
> +
> + https://tracker.debian.org/pkg/ifupdown
> +
> +comment "ifupdown needs an (e)glibc or musl toolchain"
> + depends on BR2_USE_MMU
> + depends on BR2_TOOLCHAIN_USES_UCLIBC
> diff --git a/package/ifupdown/ifupdown.hash b/package/ifupdown/ifupdown.hash
> new file mode 100644
> index 0000000..f0c314b
> --- /dev/null
> +++ b/package/ifupdown/ifupdown.hash
> @@ -0,0 +1,2 @@
> +# From http://ftp.de.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.7.49.dsc
> +sha256 5d07c73610ff90393c7273e2af9003eeb1825fc88144ae5ed11a5517547d0f58 ifupdown_0.7.49.tar.xz
Check!
> diff --git a/package/ifupdown/ifupdown.mk b/package/ifupdown/ifupdown.mk
> new file mode 100644
> index 0000000..b05ffc9
> --- /dev/null
> +++ b/package/ifupdown/ifupdown.mk
> @@ -0,0 +1,33 @@
> +################################################################################
> +#
> +# ifupdown
> +#
> +################################################################################
> +
> +IFUPDOWN_VERSION = 0.7.49
> +IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz
> +IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20140923T221921Z/pool/main/i/ifupdown
> +IFUPDOWN_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
> +IFUPDOWN_LICENSE = GPLv2+
> +IFUPDOWN_LICENSE_FILES = COPYING
> +
> +define IFUPDOWN_BUILD_CMDS
> + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
> + CFLAGS="$(TARGET_CFLAGS) -D'IFUPDOWN_VERSION=\"$(IFUPDOWN_VERSION)\"'" \
> + -C $(@D)
> +endef
> +
> +define IFUPDOWN_INSTALL_TARGET_CMDS
> + $(INSTALL) -m 0755 -D $(@D)/ifup $(TARGET_DIR)/sbin/ifup
> + $(INSTALL) -m 0755 -D $(@D)/settle-dad.sh \
> + $(TARGET_DIR)/lib/ifupdown/settle-dad.sh
> + ln -sf ifup $(TARGET_DIR)/sbin/ifdown
> + ln -sf ifup $(TARGET_DIR)/sbin/ifquery
Why not 'make BASEDIR=$(TARGET_DIR) install'?
> +endef
> +
> +define IFUPDOWN_INSTALL_INIT_SYSTEMD
> + echo "d /run/network 0755 - - - -" > \
> + $(TARGET_DIR)/usr/lib/tmpfiles.d/ifupdown.conf
Nice to see that the _INIT_SYSTEMD macro really needs to do something more than
copying a unit file!
Regards,
Arnout
> +endef
> +
> +$(eval $(generic-package))
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 04/10] ifupdown: new package
2014-11-14 21:56 ` Arnout Vandecappelle
@ 2014-11-14 22:25 ` Gustavo Zacarias
0 siblings, 0 replies; 35+ messages in thread
From: Gustavo Zacarias @ 2014-11-14 22:25 UTC (permalink / raw)
To: buildroot
On 11/14/2014 06:56 PM, Arnout Vandecappelle wrote:
> Why not 'make BASEDIR=$(TARGET_DIR) install'?
I'll switch it, forgot to clean that up once all the bits were working.
> Nice to see that the _INIT_SYSTEMD macro really needs to do something more than
> copying a unit file!
Actually i think we might want to do something like that for SysV since
at the moment we handle those in the initscripts, one big S02tmpfiles or
similar that gets "compiled" by buildroot according to package needs
might be nice - pretty low priority though :)
Regards.
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 05/10] start-stop-daemon: new package
2014-11-14 12:44 [Buildroot] [PATCHv2 00/10] systemV init without busybox series Gustavo Zacarias
` (3 preceding siblings ...)
2014-11-14 12:44 ` [Buildroot] [PATCH 04/10] ifupdown: " Gustavo Zacarias
@ 2014-11-14 12:44 ` Gustavo Zacarias
2014-11-14 13:34 ` Károly Kasza
2014-11-14 22:09 ` Arnout Vandecappelle
2014-11-14 12:44 ` [Buildroot] [PATCH 06/10] package/sysvinit: drop tty1/2 Gustavo Zacarias
` (4 subsequent siblings)
9 siblings, 2 replies; 35+ messages in thread
From: Gustavo Zacarias @ 2014-11-14 12:44 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/Config.in | 3 ++
.../0001-add-uclibc-alias-and-musl.patch | 42 ++++++++++++++++++++++
package/start-stop-daemon/Config.in | 8 +++++
package/start-stop-daemon/start-stop-daemon.hash | 2 ++
package/start-stop-daemon/start-stop-daemon.mk | 27 ++++++++++++++
5 files changed, 82 insertions(+)
create mode 100644 package/start-stop-daemon/0001-add-uclibc-alias-and-musl.patch
create mode 100644 package/start-stop-daemon/Config.in
create mode 100644 package/start-stop-daemon/start-stop-daemon.hash
create mode 100644 package/start-stop-daemon/start-stop-daemon.mk
diff --git a/package/Config.in b/package/Config.in
index 8f3cc3c..ce161cf 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1229,6 +1229,9 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/rsyslog/Config.in"
endif
source "package/smack/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+ source "package/start-stop-daemon/Config.in"
+endif
source "package/supervisor/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/sysklogd/Config.in"
diff --git a/package/start-stop-daemon/0001-add-uclibc-alias-and-musl.patch b/package/start-stop-daemon/0001-add-uclibc-alias-and-musl.patch
new file mode 100644
index 0000000..0b726d4
--- /dev/null
+++ b/package/start-stop-daemon/0001-add-uclibc-alias-and-musl.patch
@@ -0,0 +1,42 @@
+Make linux-uclibcgnueabi an alias for linux-uclibceabi since it's
+what we use in buildroot toolchains.
+Also add support for musl libc which is a backport from 1.17.x with
+a slight tweak for musleabi (non-hf).
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura dpkg-1.16.15.orig/ostable dpkg-1.16.15/ostable
+--- dpkg-1.16.15.orig/ostable 2014-11-07 08:09:07.358304926 -0300
++++ dpkg-1.16.15/ostable 2014-11-07 09:35:06.158580079 -0300
+@@ -14,8 +14,10 @@
+ # system part of the output of the GNU config.guess script.
+ #
+ # <Debian name> <GNU name> <config.guess regex>
+-uclibceabi-linux linux-uclibceabi linux[^-]*-uclibceabi
++uclibceabi-linux linux-uclibceabi linux[^-]*-uclibc.*eabi
+ uclibc-linux linux-uclibc linux[^-]*-uclibc
++musleabihf-linux linux-musleabihf linux[^-]*-musleabihf
++musl-linux linux-musl linux[^-]*-musl[^-]*
+ gnueabihf-linux linux-gnueabihf linux[^-]*-gnueabihf
+ gnueabi-linux linux-gnueabi linux[^-]*-gnueabi
+ gnuabin32-linux linux-gnuabin32 linux[^-]*-gnuabin32
+@@ -33,6 +35,6 @@
+ bsd-netbsd netbsd netbsd[^-]*
+ bsd-openbsd openbsd openbsd[^-]*
+ sysv-solaris solaris solaris[^-]*
+-uclibceabi-uclinux uclinux-uclibceabi uclinux[^-]*-uclibceabi
++uclibceabi-uclinux uclinux-uclibceabi uclinux[^-]*-uclibc.*eabi
+ uclibc-uclinux uclinux-uclibc uclinux[^-]*(-uclibc.*)?
+ tos-mint mint mint[^-]*
+diff -Nura dpkg-1.16.15.orig/triplettable dpkg-1.16.15/triplettable
+--- dpkg-1.16.15.orig/triplettable 2014-11-07 08:09:07.345304482 -0300
++++ dpkg-1.16.15/triplettable 2014-11-07 09:35:29.098364036 -0300
+@@ -5,6 +5,8 @@
+ # <Debian triplet> <Debian arch>
+ uclibceabi-linux-arm uclibc-linux-armel
+ uclibc-linux-<cpu> uclibc-linux-<cpu>
++musleabihf-linux-arm musl-linux-armhf
++musl-linux-<cpu> musl-linux-<cpu>
+ gnueabihf-linux-arm armhf
+ gnueabi-linux-arm armel
+ gnuabin32-linux-mips64el mipsn32el
diff --git a/package/start-stop-daemon/Config.in b/package/start-stop-daemon/Config.in
new file mode 100644
index 0000000..7d8eb34
--- /dev/null
+++ b/package/start-stop-daemon/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_START_STOP_DAEMON
+ bool "start-stop-daemon"
+ depends on BR2_USE_MMU # fork()
+ help
+ start-stop-daemon is used to control the creation and termination
+ of system-level processes.
+
+ https://tracker.debian.org/pkg/dpkg
diff --git a/package/start-stop-daemon/start-stop-daemon.hash b/package/start-stop-daemon/start-stop-daemon.hash
new file mode 100644
index 0000000..e3ab29f
--- /dev/null
+++ b/package/start-stop-daemon/start-stop-daemon.hash
@@ -0,0 +1,2 @@
+# From http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_1.16.15.dsc
+sha256 92bca9901ba2d9300be42f6de8dbea59b8367a918a2abeeb47d2176c9cf86b55 dpkg_1.16.15.tar.xz
diff --git a/package/start-stop-daemon/start-stop-daemon.mk b/package/start-stop-daemon/start-stop-daemon.mk
new file mode 100644
index 0000000..7a699d0
--- /dev/null
+++ b/package/start-stop-daemon/start-stop-daemon.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# start-stop-daemon
+#
+################################################################################
+
+START_STOP_DAEMON_VERSION = 1.16.15
+START_STOP_DAEMON_SOURCE = dpkg_$(START_STOP_DAEMON_VERSION).tar.xz
+START_STOP_DAEMON_SITE = http://snapshot.debian.org/archive/debian/20140616T044945Z/pool/main/d/dpkg
+START_STOP_DAEMON_CONF_OPTS = --disable-dselect --disable-update-alternatives \
+ --exec-prefix=/
+START_STOP_DAEMON_DEPENDENCIES = host-pkgconf \
+ $(if $(BR2_PACKAGE_BUSYBOX),busybox)
+START_STOP_DAEMON_LICENSE = GPLv2+
+START_STOP_DAEMON_LICENSE_FILES = debian/copyright
+
+define START_STOP_DAEMON_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/lib/compat
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/utils
+endef
+
+define START_STOP_DAEMON_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D $(@D)/utils/start-stop-daemon \
+ $(TARGET_DIR)/sbin/start-stop-daemon
+endef
+
+$(eval $(autotools-package))
--
2.0.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [Buildroot] [PATCH 05/10] start-stop-daemon: new package
2014-11-14 12:44 ` [Buildroot] [PATCH 05/10] start-stop-daemon: " Gustavo Zacarias
@ 2014-11-14 13:34 ` Károly Kasza
2014-11-14 13:42 ` Gustavo Zacarias
2014-11-14 22:09 ` Arnout Vandecappelle
1 sibling, 1 reply; 35+ messages in thread
From: Károly Kasza @ 2014-11-14 13:34 UTC (permalink / raw)
To: buildroot
Hello,
+START_STOP_DAEMON_CONF_OPTS = --disable-dselect
> --disable-update-alternatives \
> + --exec-prefix=/
>
I would also add --disable-install-info, to prevent building
utils/dpkg-install-info - this will still build 7 unwanted binaries.
Maybe add a small patch to configure to force "make" to skip dpkg-deb,
dpkg-split and src directories?
+START_STOP_DAEMON_LICENSE = GPLv2+
> +START_STOP_DAEMON_LICENSE_FILES = debian/copyright
That is not entirely true. utils/start-stop-daemon.c clearly states that it
is public domain. I guess dpkg is GPLv2+, but we are not packaging dpkg
here. What is Buildroot's policy in this case?
Best regards,
Karoly
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20141114/21496be0/attachment.html>
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 05/10] start-stop-daemon: new package
2014-11-14 13:34 ` Károly Kasza
@ 2014-11-14 13:42 ` Gustavo Zacarias
2014-11-14 13:49 ` Károly Kasza
0 siblings, 1 reply; 35+ messages in thread
From: Gustavo Zacarias @ 2014-11-14 13:42 UTC (permalink / raw)
To: buildroot
On 11/14/2014 10:34 AM, K?roly Kasza wrote:
> Hello,
>
> +START_STOP_DAEMON_CONF_OPTS = --disable-dselect
> --disable-update-alternatives \
> + --exec-prefix=/
>
>
> I would also add --disable-install-info, to prevent building
> utils/dpkg-install-info - this will still build 7 unwanted binaries.
> Maybe add a small patch to configure to force "make" to skip dpkg-deb,
> dpkg-split and src directories?
I can add that, yes.
I'm building inside lib/compat/ and utils/ later for the bare minimum,
which 7 binaries are you talking about?
> +START_STOP_DAEMON_LICENSE = GPLv2+
> +START_STOP_DAEMON_LICENSE_FILES = debian/copyright
>
>
> That is not entirely true. utils/start-stop-daemon.c clearly states that
> it is public domain. I guess dpkg is GPLv2+, but we are not packaging
> dpkg here. What is Buildroot's policy in this case?
True i'll adjust it.
Policy is cover all licenses for things that we are shipping, since it's
just start-stop-daemon, PD it is.
Thanks.
Regards.
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 05/10] start-stop-daemon: new package
2014-11-14 12:44 ` [Buildroot] [PATCH 05/10] start-stop-daemon: " Gustavo Zacarias
2014-11-14 13:34 ` Károly Kasza
@ 2014-11-14 22:09 ` Arnout Vandecappelle
2014-11-14 22:26 ` Gustavo Zacarias
1 sibling, 1 reply; 35+ messages in thread
From: Arnout Vandecappelle @ 2014-11-14 22:09 UTC (permalink / raw)
To: buildroot
On 14/11/14 13:44, Gustavo Zacarias wrote:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
[snip]
> diff --git a/package/start-stop-daemon/start-stop-daemon.mk b/package/start-stop-daemon/start-stop-daemon.mk
> new file mode 100644
> index 0000000..7a699d0
> --- /dev/null
> +++ b/package/start-stop-daemon/start-stop-daemon.mk
> @@ -0,0 +1,27 @@
> +################################################################################
> +#
> +# start-stop-daemon
> +#
> +################################################################################
> +
> +START_STOP_DAEMON_VERSION = 1.16.15
Why not 1.17.21?
> +START_STOP_DAEMON_SOURCE = dpkg_$(START_STOP_DAEMON_VERSION).tar.xz
> +START_STOP_DAEMON_SITE = http://snapshot.debian.org/archive/debian/20140616T044945Z/pool/main/d/dpkg
> +START_STOP_DAEMON_CONF_OPTS = --disable-dselect --disable-update-alternatives \
> + --exec-prefix=/
> +START_STOP_DAEMON_DEPENDENCIES = host-pkgconf \
> + $(if $(BR2_PACKAGE_BUSYBOX),busybox)
> +START_STOP_DAEMON_LICENSE = GPLv2+
> +START_STOP_DAEMON_LICENSE_FILES = debian/copyright
COPYING seems more appropriate/usual.
Regards,
Arnout
> +
> +define START_STOP_DAEMON_BUILD_CMDS
> + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/lib/compat
> + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/utils
> +endef
> +
> +define START_STOP_DAEMON_INSTALL_TARGET_CMDS
> + $(INSTALL) -m 0755 -D $(@D)/utils/start-stop-daemon \
> + $(TARGET_DIR)/sbin/start-stop-daemon
> +endef
> +
> +$(eval $(autotools-package))
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 05/10] start-stop-daemon: new package
2014-11-14 22:09 ` Arnout Vandecappelle
@ 2014-11-14 22:26 ` Gustavo Zacarias
0 siblings, 0 replies; 35+ messages in thread
From: Gustavo Zacarias @ 2014-11-14 22:26 UTC (permalink / raw)
To: buildroot
On 11/14/2014 07:09 PM, Arnout Vandecappelle wrote:
>> +START_STOP_DAEMON_VERSION = 1.16.15
>
> Why not 1.17.21?
The 1.17 unstable series isn't too happy cross-compiling.
>> +START_STOP_DAEMON_LICENSE = GPLv2+
>> +START_STOP_DAEMON_LICENSE_FILES = debian/copyright
>
> COPYING seems more appropriate/usual.
As Karoly pointed out start-stop-daemon itself is Public Domain, so i've
adjusted for the upcoming v3 series to point to the source where it's
mentioned instead.
Regards.
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 06/10] package/sysvinit: drop tty1/2
2014-11-14 12:44 [Buildroot] [PATCHv2 00/10] systemV init without busybox series Gustavo Zacarias
` (4 preceding siblings ...)
2014-11-14 12:44 ` [Buildroot] [PATCH 05/10] start-stop-daemon: " Gustavo Zacarias
@ 2014-11-14 12:44 ` Gustavo Zacarias
2014-11-14 13:17 ` Thomas Petazzoni
2014-11-14 13:36 ` Peter Korsgaard
2014-11-14 12:44 ` [Buildroot] [PATCH 07/10] dhcp: install dhclient to /sbin Gustavo Zacarias
` (3 subsequent siblings)
9 siblings, 2 replies; 35+ messages in thread
From: Gustavo Zacarias @ 2014-11-14 12:44 UTC (permalink / raw)
To: buildroot
We don't do it for busybox init so do the same for consistency here.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/sysvinit/inittab | 3 ---
1 file changed, 3 deletions(-)
diff --git a/package/sysvinit/inittab b/package/sysvinit/inittab
index fd0d2f0..9b3a119 100644
--- a/package/sysvinit/inittab
+++ b/package/sysvinit/inittab
@@ -12,9 +12,6 @@ moun::sysinit:/bin/mount -a
host::sysinit:/bin/hostname -F /etc/hostname
init::sysinit:/etc/init.d/rcS
-1:1:respawn:/sbin/getty 38400 tty1
-2:1:respawn:/sbin/getty 38400 tty2
-
# S0:1:respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL
# Stuff to do for the 3-finger salute
--
2.0.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [Buildroot] [PATCH 06/10] package/sysvinit: drop tty1/2
2014-11-14 12:44 ` [Buildroot] [PATCH 06/10] package/sysvinit: drop tty1/2 Gustavo Zacarias
@ 2014-11-14 13:17 ` Thomas Petazzoni
2014-11-14 13:36 ` Peter Korsgaard
1 sibling, 0 replies; 35+ messages in thread
From: Thomas Petazzoni @ 2014-11-14 13:17 UTC (permalink / raw)
To: buildroot
Dear Gustavo Zacarias,
On Fri, 14 Nov 2014 09:44:52 -0300, Gustavo Zacarias wrote:
> We don't do it for busybox init so do the same for consistency here.
>
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
> package/sysvinit/inittab | 3 ---
> 1 file changed, 3 deletions(-)
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Peter, this one should go in 2014.11.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 06/10] package/sysvinit: drop tty1/2
2014-11-14 12:44 ` [Buildroot] [PATCH 06/10] package/sysvinit: drop tty1/2 Gustavo Zacarias
2014-11-14 13:17 ` Thomas Petazzoni
@ 2014-11-14 13:36 ` Peter Korsgaard
1 sibling, 0 replies; 35+ messages in thread
From: Peter Korsgaard @ 2014-11-14 13:36 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
> We don't do it for busybox init so do the same for consistency here.
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 07/10] dhcp: install dhclient to /sbin
2014-11-14 12:44 [Buildroot] [PATCHv2 00/10] systemV init without busybox series Gustavo Zacarias
` (5 preceding siblings ...)
2014-11-14 12:44 ` [Buildroot] [PATCH 06/10] package/sysvinit: drop tty1/2 Gustavo Zacarias
@ 2014-11-14 12:44 ` Gustavo Zacarias
2014-11-14 22:17 ` Arnout Vandecappelle
2014-11-14 12:44 ` [Buildroot] [PATCH 08/10] dhcp: update dhclient-script Gustavo Zacarias
` (2 subsequent siblings)
9 siblings, 1 reply; 35+ messages in thread
From: Gustavo Zacarias @ 2014-11-14 12:44 UTC (permalink / raw)
To: buildroot
Debian ifupdown uses an explicit call to /sbin/dhclient.
Busybox ifupdown uses the search path.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/dhcp/dhcp.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 27fb60b..1eb6b32 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -59,7 +59,7 @@ define DHCP_INSTALL_CLIENT
mkdir -p $(TARGET_DIR)/var/lib
(cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
$(INSTALL) -m 0755 -D $(DHCP_DIR)/client/dhclient \
- $(TARGET_DIR)/usr/sbin/dhclient
+ $(TARGET_DIR)/sbin/dhclient
$(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \
$(TARGET_DIR)/etc/dhcp/dhclient.conf
$(INSTALL) -m 0755 -D package/dhcp/dhclient-script \
--
2.0.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [Buildroot] [PATCH 07/10] dhcp: install dhclient to /sbin
2014-11-14 12:44 ` [Buildroot] [PATCH 07/10] dhcp: install dhclient to /sbin Gustavo Zacarias
@ 2014-11-14 22:17 ` Arnout Vandecappelle
2014-11-14 22:27 ` Gustavo Zacarias
0 siblings, 1 reply; 35+ messages in thread
From: Arnout Vandecappelle @ 2014-11-14 22:17 UTC (permalink / raw)
To: buildroot
On 14/11/14 13:44, Gustavo Zacarias wrote:
> Debian ifupdown uses an explicit call to /sbin/dhclient.
> Busybox ifupdown uses the search path.
>
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
> package/dhcp/dhcp.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
> index 27fb60b..1eb6b32 100644
> --- a/package/dhcp/dhcp.mk
> +++ b/package/dhcp/dhcp.mk
> @@ -59,7 +59,7 @@ define DHCP_INSTALL_CLIENT
> mkdir -p $(TARGET_DIR)/var/lib
> (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
> $(INSTALL) -m 0755 -D $(DHCP_DIR)/client/dhclient \
> - $(TARGET_DIR)/usr/sbin/dhclient
> + $(TARGET_DIR)/sbin/dhclient
Then you should also update network-manager.mk:
NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/usr/sbin/dhclient
Regards,
Arnout
> $(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \
> $(TARGET_DIR)/etc/dhcp/dhclient.conf
> $(INSTALL) -m 0755 -D package/dhcp/dhclient-script \
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 07/10] dhcp: install dhclient to /sbin
2014-11-14 22:17 ` Arnout Vandecappelle
@ 2014-11-14 22:27 ` Gustavo Zacarias
0 siblings, 0 replies; 35+ messages in thread
From: Gustavo Zacarias @ 2014-11-14 22:27 UTC (permalink / raw)
To: buildroot
On 11/14/2014 07:17 PM, Arnout Vandecappelle wrote:
>> --- a/package/dhcp/dhcp.mk
>> +++ b/package/dhcp/dhcp.mk
>> @@ -59,7 +59,7 @@ define DHCP_INSTALL_CLIENT
>> mkdir -p $(TARGET_DIR)/var/lib
>> (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
>> $(INSTALL) -m 0755 -D $(DHCP_DIR)/client/dhclient \
>> - $(TARGET_DIR)/usr/sbin/dhclient
>> + $(TARGET_DIR)/sbin/dhclient
>
> Then you should also update network-manager.mk:
>
> NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/usr/sbin/dhclient
Evidently nobody used it because it never worked out of the box (because
of the lack of a proper dhclient-script) ;)
I'll adjust it.
Regards.
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 08/10] dhcp: update dhclient-script
2014-11-14 12:44 [Buildroot] [PATCHv2 00/10] systemV init without busybox series Gustavo Zacarias
` (6 preceding siblings ...)
2014-11-14 12:44 ` [Buildroot] [PATCH 07/10] dhcp: install dhclient to /sbin Gustavo Zacarias
@ 2014-11-14 12:44 ` Gustavo Zacarias
2014-11-14 13:19 ` Thomas Petazzoni
2014-11-14 12:44 ` [Buildroot] [PATCH 09/10] dhcpcd: bump to version 6.6.1 Gustavo Zacarias
2014-11-14 12:44 ` [Buildroot] [PATCH 10/10] dhcpcd: use standard installation Gustavo Zacarias
9 siblings, 1 reply; 35+ messages in thread
From: Gustavo Zacarias @ 2014-11-14 12:44 UTC (permalink / raw)
To: buildroot
The previous no-op dhclient-script is useless and in fact can lead users
to believe things will work.
dhclient-script is supposed to, among many other things, bring the
interface up for dhclient to pump an address, set the interface address,
set resolv.conf appropiately and set the default gateway.
It's a complex script since it has to deal with a lot of details so
let's just use the best fit which is the OpenWRT one since it uses the
"legacy" tools (ifconfig, route, ...) which can be easily provided by
busybox and/or net-tools.
There are newer and more feature-complete versions around but they
require full iproute2 ip and wouldn't fit as well with the busybox-only
approach.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/dhcp/dhclient-script | 281 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 280 insertions(+), 1 deletion(-)
diff --git a/package/dhcp/dhclient-script b/package/dhcp/dhclient-script
index 5566aca..4afebc0 100755
--- a/package/dhcp/dhclient-script
+++ b/package/dhcp/dhclient-script
@@ -1,2 +1,281 @@
#!/bin/sh
-# empty dhclient-script to keep dhclient from complaining
+
+make_resolv_conf() {
+ if [ x"$new_domain_name_servers" != x ]; then
+ cat /dev/null > /etc/resolv.conf.dhclient
+ chmod 644 /etc/resolv.conf.dhclient
+ if [ x"$new_domain_search" != x ]; then
+ echo search $new_domain_search >> /etc/resolv.conf.dhclient
+ elif [ x"$new_domain_name" != x ]; then
+ # Note that the DHCP 'Domain Name Option' is really just a domain
+ # name, and that this practice of using the domain name option as
+ # a search path is both nonstandard and deprecated.
+ echo search $new_domain_name >> /etc/resolv.conf.dhclient
+ fi
+ for nameserver in $new_domain_name_servers; do
+ echo nameserver $nameserver >>/etc/resolv.conf.dhclient
+ done
+
+ elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+ cat /dev/null > /etc/resolv.conf.dhclient6
+ chmod 644 /etc/resolv.conf.dhclient6
+
+ if [ "x${new_dhcp6_domain_search}" != x ] ; then
+ echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
+ fi
+ for nameserver in ${new_dhcp6_name_servers} ; do
+ echo nameserver ${nameserver} >> /etc/resolv.conf.dhclient6
+ done
+ fi
+
+ # if both v4 and v6 clients are running, concatenate results
+ cat /etc/resolv.conf.* > /etc/resolv.conf
+}
+
+# Must be used on exit. Invokes the local dhcp client exit hooks, if any.
+exit_with_hooks() {
+ exit_status=$1
+ if [ -f /etc/dhclient-exit-hooks ]; then
+ . /etc/dhclient-exit-hooks
+ fi
+# probably should do something with exit status of the local script
+ exit $exit_status
+}
+
+# Invoke the local dhcp client enter hooks, if they exist.
+if [ -f /etc/dhclient-enter-hooks ]; then
+ exit_status=0
+ . /etc/dhclient-enter-hooks
+ # allow the local script to abort processing of this state
+ # local script must set exit_status variable to nonzero.
+ if [ $exit_status -ne 0 ]; then
+ exit $exit_status
+ fi
+fi
+
+###
+### DHCPv4 Handlers
+###
+
+if [ x$new_broadcast_address != x ]; then
+ new_broadcast_arg="broadcast $new_broadcast_address"
+fi
+if [ x$new_subnet_mask != x ]; then
+ new_subnet_arg="netmask $new_subnet_mask"
+fi
+if [ x$alias_subnet_mask != x ]; then
+ alias_subnet_arg="netmask $alias_subnet_mask"
+fi
+
+if [ x$reason = xMEDIUM ]; then
+ # Linux doesn't do mediums (ok, ok, media).
+ exit_with_hooks 0
+fi
+
+if [ x$reason = xPREINIT ]; then
+ if [ x$alias_ip_address != x ]; then
+ # Bring down alias interface. Its routes will disappear too.
+ ifconfig $interface:0- 0.0.0.0
+ fi
+ ifconfig $interface 0.0.0.0 up
+
+ # We need to give the kernel some time to get the interface up.
+ sleep 1
+
+ exit_with_hooks 0
+fi
+
+if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then
+ exit_with_hooks 0
+fi
+
+if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
+ [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
+ current_hostname=`hostname`
+ if [ x$current_hostname = x ] || \
+ [ x$current_hostname = x$old_host_name ]; then
+ if [ x$current_hostname = x ] || \
+ [ x$new_host_name != x$old_host_name ]; then
+ hostname $new_host_name
+ fi
+ fi
+
+ if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
+ [ x$alias_ip_address != x$old_ip_address ]; then
+ # Possible new alias. Remove old alias.
+ ifconfig $interface:0- 0.0.0.0
+ fi
+ if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
+ # IP address changed. Bringing down the interface will delete all routes,
+ # and clear the ARP cache.
+ ifconfig $interface 0.0.0.0 down
+
+ fi
+ if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+ [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+
+ ifconfig $interface $new_ip_address $new_subnet_arg \
+ $new_broadcast_arg
+ for router in $new_routers; do
+ if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+ route add -host $router dev $interface
+ fi
+ route add default gw $router
+ done
+ fi
+ if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+ then
+ ifconfig $interface:0- 0.0.0.0
+ ifconfig $interface:0 $alias_ip_address $alias_subnet_arg
+ route add -host $alias_ip_address $interface:0
+ fi
+ make_resolv_conf
+ exit_with_hooks 0
+fi
+
+if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \
+ || [ x$reason = xSTOP ]; then
+ if [ x$alias_ip_address != x ]; then
+ # Turn off alias interface.
+ ifconfig $interface:0- 0.0.0.0
+ fi
+ if [ x$old_ip_address != x ]; then
+ # Shut down interface, which will delete routes and clear arp cache.
+ ifconfig $interface 0.0.0.0 down
+ fi
+ if [ x$alias_ip_address != x ]; then
+ ifconfig $interface:0 $alias_ip_address $alias_subnet_arg
+ route add -host $alias_ip_address $interface:0
+ fi
+
+ # remove v4 dns configuration for this interface
+ rm /etc/resolv.conf.dhclient
+ cat /etc/resolv.conf.* > /etc/resolv.conf
+
+ exit_with_hooks 0
+fi
+
+if [ x$reason = xTIMEOUT ]; then
+ if [ x$alias_ip_address != x ]; then
+ ifconfig $interface:0- 0.0.0.0
+ fi
+ ifconfig $interface $new_ip_address $new_subnet_arg \
+ $new_broadcast_arg
+ set $new_routers
+ if ping -q -c 1 $1; then
+ if [ x$new_ip_address != x$alias_ip_address ] && \
+ [ x$alias_ip_address != x ]; then
+ ifconfig $interface:0 $alias_ip_address $alias_subnet_arg
+ route add -host $alias_ip_address dev $interface:0
+ fi
+ for router in $new_routers; do
+ if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+ route add -host $router dev $interface
+ fi
+ route add default gw $router
+ done
+ make_resolv_conf
+ exit_with_hooks 0
+ fi
+ ifconfig $interface 0.0.0.0 down
+ exit_with_hooks 1
+fi
+
+###
+### DHCPv6 Handlers
+###
+
+if [ x$reason = xPREINIT6 ]; then
+ # Ensure interface is up.
+ ifconfig ${interface} up
+
+ # Remove any stale addresses from aborted clients.
+ ip -f inet6 addr flush dev ${interface} scope global
+
+ exit_with_hooks 0
+fi
+
+if [ x${old_ip6_prefix} != x ] || [ x${new_ip6_prefix} != x ] ; then
+ echo Prefix ${reason} old=${old_ip6_prefix} new=${new_ip6_prefix}
+
+ exit_with_hooks 0
+fi
+
+if [ x$reason = xBOUND6 ]; then
+ if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then
+ exit_with_hooks 2;
+ fi
+
+ ifconfig ${interface} add ${new_ip6_address}/${new_ip6_prefixlen}
+
+ # Check for nameserver options.
+ make_resolv_conf
+
+### <<
+ # Set up softwire tunnel
+ if [ x${new_dhcp6_softwire} != x ] ; then
+ /etc/init.d/dhclient stop
+ ifconfig ${interface} 0.0.0.0
+ ip -6 tunnel add tun0 mode ipip6 \
+ remote ${new_dhcp6_softwire} \
+ local ${new_ip6_address} \
+ dev ${interface} encaplimit none
+ ip link set tun0 up
+ ip route add default dev tun0
+ fi
+### >>
+
+ exit_with_hooks 0
+fi
+
+if [ x$reason = xRENEW6 ] || [ x$reason = xREBIND6 ]; then
+ if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then
+ exit_with_hooks 2;
+ fi
+
+ ifconfig ${interface} add ${new_ip6_address}/${new_ip6_prefixlen}
+
+ # Make sure nothing has moved around on us.
+
+ # Nameservers/domains/etc.
+ if [ "x${new_dhcp6_name_servers}" != "x${old_dhcp6_name_servers}" ] ||
+ [ "x${new_dhcp6_domain_search}" != "x${old_dhcp6_domain_search}" ] ; then
+ make_resolv_conf
+ fi
+
+ exit_with_hooks 0
+fi
+
+if [ x$reason = xDEPREF6 ]; then
+ if [ x${new_ip6_address} = x ] ; then
+ exit_with_hooks 2;
+ fi
+
+ # Busybox ifconfig has no way to communicate this to the kernel, so ignore it
+
+ exit_with_hooks 0
+fi
+
+if [ x$reason = xEXPIRE6 -o x$reason = xRELEASE6 -o x$reason = xSTOP6 ]; then
+ if [ x${old_ip6_address} = x ] || [ x${old_ip6_prefixlen} = x ] ; then
+ exit_with_hooks 2;
+ fi
+
+ ifconfig ${interface} del ${old_ip6_address}/${old_ip6_prefixlen}
+
+ # remove v6 dns configuration for this interface
+ rm /etc/resolv.conf.dhclient6
+ cat /etc/resolv.conf.* > /etc/resolv.conf
+
+### <<
+ # Tear down softwire tunnel
+ if [ x${old_dhcp6_softwire} != x ] ; then
+ ip link set tun0 down
+ ip tunnel del tun0
+ fi
+### >>
+
+ exit_with_hooks 0
+fi
+
+exit_with_hooks 0
--
2.0.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [Buildroot] [PATCH 08/10] dhcp: update dhclient-script
2014-11-14 12:44 ` [Buildroot] [PATCH 08/10] dhcp: update dhclient-script Gustavo Zacarias
@ 2014-11-14 13:19 ` Thomas Petazzoni
2014-11-14 13:54 ` Gustavo Zacarias
0 siblings, 1 reply; 35+ messages in thread
From: Thomas Petazzoni @ 2014-11-14 13:19 UTC (permalink / raw)
To: buildroot
Dear Gustavo Zacarias,
On Fri, 14 Nov 2014 09:44:54 -0300, Gustavo Zacarias wrote:
> diff --git a/package/dhcp/dhclient-script b/package/dhcp/dhclient-script
> index 5566aca..4afebc0 100755
> --- a/package/dhcp/dhclient-script
> +++ b/package/dhcp/dhclient-script
> @@ -1,2 +1,281 @@
> #!/bin/sh
> -# empty dhclient-script to keep dhclient from complaining
I think we want a comment here that tells where the script is coming
from (URL, license, etc.).
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 08/10] dhcp: update dhclient-script
2014-11-14 13:19 ` Thomas Petazzoni
@ 2014-11-14 13:54 ` Gustavo Zacarias
0 siblings, 0 replies; 35+ messages in thread
From: Gustavo Zacarias @ 2014-11-14 13:54 UTC (permalink / raw)
To: buildroot
On 11/14/2014 10:19 AM, Thomas Petazzoni wrote:
> I think we want a comment here that tells where the script is coming
> from (URL, license, etc.).
I'll add the source.
The license is a bit beneath my abilities, OpenWRT is GPLv2, however the
majority of dhclient-scripts are shipped/based on the ones bundled in
ISC dhcp which is ISC license (not up to date because of an older dhcp
version, in clients/scripts/openwrt for example).
So what would that make it?
Regards.
^ permalink raw reply [flat|nested] 35+ messages in thread
* [Buildroot] [PATCH 09/10] dhcpcd: bump to version 6.6.1
2014-11-14 12:44 [Buildroot] [PATCHv2 00/10] systemV init without busybox series Gustavo Zacarias
` (7 preceding siblings ...)
2014-11-14 12:44 ` [Buildroot] [PATCH 08/10] dhcp: update dhclient-script Gustavo Zacarias
@ 2014-11-14 12:44 ` Gustavo Zacarias
2014-11-14 12:44 ` [Buildroot] [PATCH 10/10] dhcpcd: use standard installation Gustavo Zacarias
9 siblings, 0 replies; 35+ messages in thread
From: Gustavo Zacarias @ 2014-11-14 12:44 UTC (permalink / raw)
To: buildroot
Also add hash file.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/dhcpcd/dhcpcd.hash | 2 ++
package/dhcpcd/dhcpcd.mk | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
create mode 100644 package/dhcpcd/dhcpcd.hash
diff --git a/package/dhcpcd/dhcpcd.hash b/package/dhcpcd/dhcpcd.hash
new file mode 100644
index 0000000..9439e5c
--- /dev/null
+++ b/package/dhcpcd/dhcpcd.hash
@@ -0,0 +1,2 @@
+# Locally calculated from download (no sig, hash)
+sha256 5d6a15fa064a91761601142232f23edb09b570555c3386e6d766759d78b8e1fe dhcpcd-6.6.1.tar.bz2
diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk
index 3bb7a13..5f7c1a6 100644
--- a/package/dhcpcd/dhcpcd.mk
+++ b/package/dhcpcd/dhcpcd.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DHCPCD_VERSION = 6.4.7
+DHCPCD_VERSION = 6.6.1
DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.bz2
DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd
DHCPCD_DEPENDENCIES = host-pkgconf
--
2.0.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [Buildroot] [PATCH 10/10] dhcpcd: use standard installation
2014-11-14 12:44 [Buildroot] [PATCHv2 00/10] systemV init without busybox series Gustavo Zacarias
` (8 preceding siblings ...)
2014-11-14 12:44 ` [Buildroot] [PATCH 09/10] dhcpcd: bump to version 6.6.1 Gustavo Zacarias
@ 2014-11-14 12:44 ` Gustavo Zacarias
2014-11-14 22:28 ` Arnout Vandecappelle
9 siblings, 1 reply; 35+ messages in thread
From: Gustavo Zacarias @ 2014-11-14 12:44 UTC (permalink / raw)
To: buildroot
Drop the custom/manual install cmds and do a normal make install.
This gets dhcpcd-hooks installed which are useful for many accesory
setup functions like dns, ntp server, and so on.
Also install dhcpcd to /sbin since it's expected by debian ifupdown,
For busybox ifupdown when external dhcp clients are enabled (not in the
default config we ship) will search the path.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/dhcpcd/dhcpcd.mk | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk
index 5f7c1a6..abd871f 100644
--- a/package/dhcpcd/dhcpcd.mk
+++ b/package/dhcpcd/dhcpcd.mk
@@ -35,12 +35,7 @@ define DHCPCD_BUILD_CMDS
endef
define DHCPCD_INSTALL_TARGET_CMDS
- $(INSTALL) -D -m 0755 $(@D)/dhcpcd \
- $(TARGET_DIR)/usr/sbin/dhcpcd
- $(INSTALL) -D -m 0644 $(@D)/dhcpcd.conf \
- $(TARGET_DIR)/etc/dhcpcd.conf
- $(INSTALL) -D -m 0755 $(@D)/dhcpcd-run-hooks \
- $(TARGET_DIR)/libexec/dhcpcd-run-hooks
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR)
endef
# NOTE: Even though this package has a configure script, it is not generated
--
2.0.4
^ permalink raw reply related [flat|nested] 35+ messages in thread* [Buildroot] [PATCH 10/10] dhcpcd: use standard installation
2014-11-14 12:44 ` [Buildroot] [PATCH 10/10] dhcpcd: use standard installation Gustavo Zacarias
@ 2014-11-14 22:28 ` Arnout Vandecappelle
0 siblings, 0 replies; 35+ messages in thread
From: Arnout Vandecappelle @ 2014-11-14 22:28 UTC (permalink / raw)
To: buildroot
On 14/11/14 13:44, Gustavo Zacarias wrote:
> Drop the custom/manual install cmds and do a normal make install.
> This gets dhcpcd-hooks installed which are useful for many accesory
> setup functions like dns, ntp server, and so on.
> Also install dhcpcd to /sbin since it's expected by debian ifupdown,
Same think, network-manager.mk needs to be adapted.
Regards,
Arnout
> For busybox ifupdown when external dhcp clients are enabled (not in the
> default config we ship) will search the path.
>
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
> package/dhcpcd/dhcpcd.mk | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk
> index 5f7c1a6..abd871f 100644
> --- a/package/dhcpcd/dhcpcd.mk
> +++ b/package/dhcpcd/dhcpcd.mk
> @@ -35,12 +35,7 @@ define DHCPCD_BUILD_CMDS
> endef
>
> define DHCPCD_INSTALL_TARGET_CMDS
> - $(INSTALL) -D -m 0755 $(@D)/dhcpcd \
> - $(TARGET_DIR)/usr/sbin/dhcpcd
> - $(INSTALL) -D -m 0644 $(@D)/dhcpcd.conf \
> - $(TARGET_DIR)/etc/dhcpcd.conf
> - $(INSTALL) -D -m 0755 $(@D)/dhcpcd-run-hooks \
> - $(TARGET_DIR)/libexec/dhcpcd-run-hooks
> + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR)
> endef
>
> # NOTE: Even though this package has a configure script, it is not generated
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 35+ messages in thread