* [Buildroot] [PATCH 1/2] dash: bump to version 0.5.9.1
@ 2017-09-27 16:41 Carlos Santos
2017-09-27 16:41 ` [Buildroot] [PATCH 2/2] dash: enable line editting if libedit is selected Carlos Santos
2017-09-27 19:17 ` [Buildroot] [PATCH 1/2] dash: bump to version 0.5.9.1 Thomas Petazzoni
0 siblings, 2 replies; 10+ messages in thread
From: Carlos Santos @ 2017-09-27 16:41 UTC (permalink / raw)
To: buildroot
Use the maintainer's repository, update the package description, based
on the official one, and drop an obsolete patch.
Change-Id: I2170aa4c1cc57de2a25ef04e89a216b254f2a859
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
---
package/dash/0002-fix-parallel-build.patch | 40 ------------------------------
package/dash/Config.in | 6 +++--
package/dash/dash.hash | 5 ++--
package/dash/dash.mk | 10 +++-----
4 files changed, 9 insertions(+), 52 deletions(-)
delete mode 100644 package/dash/0002-fix-parallel-build.patch
diff --git a/package/dash/0002-fix-parallel-build.patch b/package/dash/0002-fix-parallel-build.patch
deleted file mode 100644
index ac2be6a..0000000
--- a/package/dash/0002-fix-parallel-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-tokens: fix parallel builds
-
-Currently, tokens.h and token_vars.h are each generated by a call to
-mktokens, which means mktokens is called twice.
-
-But mktokens generates both in a single run.
-
-This means that, with a fast-enough machine, the call to mktokens that
-generates tokens.h may finish before the call that generates
-token_vars.h. Then tokens.h is transiently incomplete (it can even be
-empty). By the time it is fully generated in the second run, a compile
-job that ends up using token.h may have already started, and the source
-file would include an in complete token.h and would be missing some
-token definitions.
-
-We fix that by making token.h a dependency of token_vars.h, with a
-dummy recipe (to force it not being PHONY). The actual recipe is for
-token_vars.h
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-diff -durN dash-0.5.8.orig/src/Makefile.am dash-0.5.8/src/Makefile.am
---- dash-0.5.8.orig/src/Makefile.am 2014-09-28 10:19:32.000000000 +0200
-+++ dash-0.5.8/src/Makefile.am 2017-03-07 09:53:28.579811603 +0100
-@@ -45,7 +45,14 @@
- mktokens mkbuiltins builtins.def.in mkinit.c \
- mknodes.c nodetypes nodes.c.pat mksyntax.c mksignames.c
-
--token.h token_vars.h: mktokens
-+# Both token.h and token_vars.h are generated by a single call
-+# to mktokens. However, token.h is the only file that is used
-+# as a dependency, so we must ensure token_vars.h is generated
-+# first.
-+token.h: token_vars.h
-+ @:
-+
-+token_vars.h: mktokens
- sh $^
-
- builtins.def: builtins.def.in $(top_builddir)/config.h
diff --git a/package/dash/Config.in b/package/dash/Config.in
index af8fba4..00cacf8 100644
--- a/package/dash/Config.in
+++ b/package/dash/Config.in
@@ -3,7 +3,9 @@ config BR2_PACKAGE_DASH
depends on BR2_USE_MMU # fork()
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
help
- The Debian/Linux port of the NetBSD version of
- ash (the Almquist SHell).
+ DASH is a POSIX-compliant implementation of /bin/sh that aims to be
+ as small as possible. It does this without sacrificing speed where
+ possible. In fact, it is significantly faster than bash (the GNU
+ Bourne-Again SHell) for most tasks.
http://gondor.apana.org.au/~herbert/dash
diff --git a/package/dash/dash.hash b/package/dash/dash.hash
index 0198cd8..b5a37b6 100644
--- a/package/dash/dash.hash
+++ b/package/dash/dash.hash
@@ -1,3 +1,2 @@
-# From http://ftp.debian.org/debian/pool/main/d/dash/dash_0.5.8-1.dsc
-sha256 c6db3a237747b02d20382a761397563d813b306c020ae28ce25a1c3915fac60f dash_0.5.8.orig.tar.gz
-sha256 d751769cc1ef8b825a177e782f1cd3e35bde7c268107fa4febf8d235e12c64d9 dash_0.5.8-1.diff.gz
+# From http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.9.1.tar.gz.sha256sum
+sha256 5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659 dash-0.5.9.1.tar.gz
diff --git a/package/dash/dash.mk b/package/dash/dash.mk
index 0b58a46..72ef722 100644
--- a/package/dash/dash.mk
+++ b/package/dash/dash.mk
@@ -4,16 +4,12 @@
#
################################################################################
-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_VERSION = 0.5.9.1
+DASH_SOURCE = dash-$(DASH_VERSION).tar.gz
+DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files
DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c)
DASH_LICENSE_FILES = COPYING
-# 0002-fix-parallel-build.patch
-DASH_AUTORECONF = YES
-
define DASH_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 $(@D)/src/dash $(TARGET_DIR)/bin/dash
endef
--
2.7.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 2/2] dash: enable line editting if libedit is selected.
2017-09-27 16:41 [Buildroot] [PATCH 1/2] dash: bump to version 0.5.9.1 Carlos Santos
@ 2017-09-27 16:41 ` Carlos Santos
2017-09-27 19:18 ` Thomas Petazzoni
2017-09-27 19:17 ` [Buildroot] [PATCH 1/2] dash: bump to version 0.5.9.1 Thomas Petazzoni
1 sibling, 1 reply; 10+ messages in thread
From: Carlos Santos @ 2017-09-27 16:41 UTC (permalink / raw)
To: buildroot
Also, add a profile snippet enabling line editing, Emacs style.
Change-Id: I68c6dbbafa95e266860329cb9c7ff5519fda5bf8
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
---
package/dash/dash.mk | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/package/dash/dash.mk b/package/dash/dash.mk
index 72ef722..5c26994 100644
--- a/package/dash/dash.mk
+++ b/package/dash/dash.mk
@@ -10,6 +10,17 @@ DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files
DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c)
DASH_LICENSE_FILES = COPYING
+# Enable line editing, Emacs style
+define DASH_INSTALL_PROFILE
+ echo 'set -E' > $(TARGET_DIR)/etc/profile.d/dash.sh
+endef
+
+ifeq ($(BR2_PACKAGE_LIBEDIT),y)
+DASH_DEPENDENCIES += libedit
+DASH_CONF_OPTS += --with-libedit
+DASH_POST_INSTALL_TARGET_HOOKS += DASH_INSTALL_PROFILE
+endif
+
define DASH_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 $(@D)/src/dash $(TARGET_DIR)/bin/dash
endef
--
2.7.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 2/2] dash: enable line editting if libedit is selected.
2017-09-27 16:41 ` [Buildroot] [PATCH 2/2] dash: enable line editting if libedit is selected Carlos Santos
@ 2017-09-27 19:18 ` Thomas Petazzoni
2017-09-27 20:19 ` Carlos Santos
0 siblings, 1 reply; 10+ messages in thread
From: Thomas Petazzoni @ 2017-09-27 19:18 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 27 Sep 2017 13:41:54 -0300, Carlos Santos wrote:
> +# Enable line editing, Emacs style
> +define DASH_INSTALL_PROFILE
> + echo 'set -E' > $(TARGET_DIR)/etc/profile.d/dash.sh
> +endef
This really looks like a "personal preference" configuration, that is
more relevant in a custom rootfs overlay, no?
> +ifeq ($(BR2_PACKAGE_LIBEDIT),y)
> +DASH_DEPENDENCIES += libedit
> +DASH_CONF_OPTS += --with-libedit
> +DASH_POST_INSTALL_TARGET_HOOKS += DASH_INSTALL_PROFILE
What about --without-libedit in an else case ?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 2/2] dash: enable line editting if libedit is selected.
2017-09-27 19:18 ` Thomas Petazzoni
@ 2017-09-27 20:19 ` Carlos Santos
2017-09-28 6:59 ` Thomas Petazzoni
0 siblings, 1 reply; 10+ messages in thread
From: Carlos Santos @ 2017-09-27 20:19 UTC (permalink / raw)
To: buildroot
> From: "Thomas Petazzoni" <thomas.petazzoni@free-electrons.com>
> To: "Carlos Santos" <casantos@datacom.ind.br>
> Cc: buildroot at buildroot.org
> Sent: Wednesday, September 27, 2017 4:18:05 PM
> Subject: Re: [Buildroot] [PATCH 2/2] dash: enable line editting if libedit is selected.
> Hello,
>
> On Wed, 27 Sep 2017 13:41:54 -0300, Carlos Santos wrote:
>
>> +# Enable line editing, Emacs style
>> +define DASH_INSTALL_PROFILE
>> + echo 'set -E' > $(TARGET_DIR)/etc/profile.d/dash.sh
>> +endef
>
> This really looks like a "personal preference" configuration, that is
> more relevant in a custom rootfs overlay, no?
This is the default behavior of BusyBox's shell, which is used in 98.73%
of the Buldroot installations, according to my statistics factory, so I
think we should use it by default.
>> +ifeq ($(BR2_PACKAGE_LIBEDIT),y)
>> +DASH_DEPENDENCIES += libedit
>> +DASH_CONF_OPTS += --with-libedit
>> +DASH_POST_INSTALL_TARGET_HOOKS += DASH_INSTALL_PROFILE
>
> What about --without-libedit in an else case ?
In the case else there is no libedit to which not to link. :-)
--
Carlos Santos (Casantos) - DATACOM, P&D
?The greatest triumph that modern PR can offer is the transcendent
success of having your words and actions judged by your reputation,
rather than the other way about.? ? Christopher Hitchens
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 2/2] dash: enable line editting if libedit is selected.
2017-09-27 20:19 ` Carlos Santos
@ 2017-09-28 6:59 ` Thomas Petazzoni
2017-09-28 11:54 ` Carlos Santos
2017-09-28 18:07 ` [Buildroot] [PATCH v2] " Carlos Santos
0 siblings, 2 replies; 10+ messages in thread
From: Thomas Petazzoni @ 2017-09-28 6:59 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 27 Sep 2017 17:19:28 -0300 (BRT), Carlos Santos wrote:
> > This really looks like a "personal preference" configuration, that is
> > more relevant in a custom rootfs overlay, no?
>
> This is the default behavior of BusyBox's shell, which is used in 98.73%
> of the Buldroot installations, according to my statistics factory, so I
> think we should use it by default.
Hum, OK.
> >> +ifeq ($(BR2_PACKAGE_LIBEDIT),y)
> >> +DASH_DEPENDENCIES += libedit
> >> +DASH_CONF_OPTS += --with-libedit
> >> +DASH_POST_INSTALL_TARGET_HOOKS += DASH_INSTALL_PROFILE
> >
> > What about --without-libedit in an else case ?
>
> In the case else there is no libedit to which not to link. :-)
We always try to explicitly disable features, so that configure scripts
don't misdetect a system-installed libedit for example.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 2/2] dash: enable line editting if libedit is selected.
2017-09-28 6:59 ` Thomas Petazzoni
@ 2017-09-28 11:54 ` Carlos Santos
2017-09-28 18:07 ` [Buildroot] [PATCH v2] " Carlos Santos
1 sibling, 0 replies; 10+ messages in thread
From: Carlos Santos @ 2017-09-28 11:54 UTC (permalink / raw)
To: buildroot
> From: "Thomas Petazzoni" <thomas.petazzoni@free-electrons.com>
> To: "Carlos Santos" <casantos@datacom.ind.br>
> Cc: buildroot at buildroot.org
> Sent: Thursday, September 28, 2017 3:59:57 AM
> Subject: Re: [Buildroot] [PATCH 2/2] dash: enable line editting if libedit is selected.
> Hello,
>
> On Wed, 27 Sep 2017 17:19:28 -0300 (BRT), Carlos Santos wrote:
>
>> > This really looks like a "personal preference" configuration, that is
>> > more relevant in a custom rootfs overlay, no?
>>
>> This is the default behavior of BusyBox's shell, which is used in 98.73%
>> of the Buldroot installations, according to my statistics factory, so I
>> think we should use it by default.
>
> Hum, OK.
>
>> >> +ifeq ($(BR2_PACKAGE_LIBEDIT),y)
>> >> +DASH_DEPENDENCIES += libedit
>> >> +DASH_CONF_OPTS += --with-libedit
>> >> +DASH_POST_INSTALL_TARGET_HOOKS += DASH_INSTALL_PROFILE
>> >
>> > What about --without-libedit in an else case ?
>>
>> In the case else there is no libedit to which not to link. :-)
>
> We always try to explicitly disable features, so that configure scripts
> don't misdetect a system-installed libedit for example.
That's a good point. I will send an updated patch.
--
Carlos Santos (Casantos) - DATACOM, P&D
?The greatest triumph that modern PR can offer is the transcendent
success of having your words and actions judged by your reputation,
rather than the other way about.? ? Christopher Hitchens
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH v2] dash: enable line editting if libedit is selected.
2017-09-28 6:59 ` Thomas Petazzoni
2017-09-28 11:54 ` Carlos Santos
@ 2017-09-28 18:07 ` Carlos Santos
2018-02-04 11:07 ` Peter Korsgaard
2018-02-04 11:10 ` Peter Korsgaard
1 sibling, 2 replies; 10+ messages in thread
From: Carlos Santos @ 2017-09-28 18:07 UTC (permalink / raw)
To: buildroot
Otherwise, explicitly disable it, so that the configure script does not
misdetect a system-installed libedit for example.
Also, add a profile snippet enabling line editing, Emacs style.
Change-Id: I68c6dbbafa95e266860329cb9c7ff5519fda5bf8
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
---
package/dash/dash.mk | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/package/dash/dash.mk b/package/dash/dash.mk
index 72ef722..0098fad 100644
--- a/package/dash/dash.mk
+++ b/package/dash/dash.mk
@@ -10,6 +10,19 @@ DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files
DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c)
DASH_LICENSE_FILES = COPYING
+# Enable line editing, Emacs style
+define DASH_INSTALL_PROFILE
+ echo 'set -E' > $(TARGET_DIR)/etc/profile.d/dash.sh
+endef
+
+ifeq ($(BR2_PACKAGE_LIBEDIT),y)
+DASH_DEPENDENCIES += libedit
+DASH_CONF_OPTS += --with-libedit
+DASH_POST_INSTALL_TARGET_HOOKS += DASH_INSTALL_PROFILE
+else
+DASH_CONF_OPTS += --without-libedit
+endif
+
define DASH_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 $(@D)/src/dash $(TARGET_DIR)/bin/dash
endef
--
2.7.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH v2] dash: enable line editting if libedit is selected.
2017-09-28 18:07 ` [Buildroot] [PATCH v2] " Carlos Santos
@ 2018-02-04 11:07 ` Peter Korsgaard
2018-02-04 11:10 ` Peter Korsgaard
1 sibling, 0 replies; 10+ messages in thread
From: Peter Korsgaard @ 2018-02-04 11:07 UTC (permalink / raw)
To: buildroot
>>>>> "Carlos" == Carlos Santos <casantos@datacom.ind.br> writes:
> Otherwise, explicitly disable it, so that the configure script does not
> misdetect a system-installed libedit for example.
> Also, add a profile snippet enabling line editing, Emacs style.
> Change-Id: I68c6dbbafa95e266860329cb9c7ff5519fda5bf8
> Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
> ---
> package/dash/dash.mk | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
> diff --git a/package/dash/dash.mk b/package/dash/dash.mk
> index 72ef722..0098fad 100644
> --- a/package/dash/dash.mk
> +++ b/package/dash/dash.mk
> @@ -10,6 +10,19 @@ DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files
> DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c)
> DASH_LICENSE_FILES = COPYING
> +# Enable line editing, Emacs style
> +define DASH_INSTALL_PROFILE
> + echo 'set -E' > $(TARGET_DIR)/etc/profile.d/dash.sh
> +endef
> +
> +ifeq ($(BR2_PACKAGE_LIBEDIT),y)
> +DASH_DEPENDENCIES += libedit
> +DASH_CONF_OPTS += --with-libedit
> +DASH_POST_INSTALL_TARGET_HOOKS += DASH_INSTALL_PROFILE
Committed after moving DASH_INSTALL_PROFILE inside the conditional,
thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH v2] dash: enable line editting if libedit is selected.
2017-09-28 18:07 ` [Buildroot] [PATCH v2] " Carlos Santos
2018-02-04 11:07 ` Peter Korsgaard
@ 2018-02-04 11:10 ` Peter Korsgaard
1 sibling, 0 replies; 10+ messages in thread
From: Peter Korsgaard @ 2018-02-04 11:10 UTC (permalink / raw)
To: buildroot
>>>>> "Carlos" == Carlos Santos <casantos@datacom.ind.br> writes:
> Otherwise, explicitly disable it, so that the configure script does not
> misdetect a system-installed libedit for example.
> Also, add a profile snippet enabling line editing, Emacs style.
> Change-Id: I68c6dbbafa95e266860329cb9c7ff5519fda5bf8
> Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
> ---
> package/dash/dash.mk | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
> diff --git a/package/dash/dash.mk b/package/dash/dash.mk
> index 72ef722..0098fad 100644
> --- a/package/dash/dash.mk
> +++ b/package/dash/dash.mk
> @@ -10,6 +10,19 @@ DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files
> DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c)
> DASH_LICENSE_FILES = COPYING
> +# Enable line editing, Emacs style
> +define DASH_INSTALL_PROFILE
> + echo 'set -E' > $(TARGET_DIR)/etc/profile.d/dash.sh
/etc/profile.d is part of our standard skeleton, but may not be present
in custom skeletons, so I've also added a mkdir -p
${TARGET_DIR}/etc/profile.d
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/2] dash: bump to version 0.5.9.1
2017-09-27 16:41 [Buildroot] [PATCH 1/2] dash: bump to version 0.5.9.1 Carlos Santos
2017-09-27 16:41 ` [Buildroot] [PATCH 2/2] dash: enable line editting if libedit is selected Carlos Santos
@ 2017-09-27 19:17 ` Thomas Petazzoni
1 sibling, 0 replies; 10+ messages in thread
From: Thomas Petazzoni @ 2017-09-27 19:17 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 27 Sep 2017 13:41:53 -0300, Carlos Santos wrote:
> Use the maintainer's repository, update the package description, based
> on the official one, and drop an obsolete patch.
>
> Change-Id: I2170aa4c1cc57de2a25ef04e89a216b254f2a859
> Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
> ---
> package/dash/0002-fix-parallel-build.patch | 40 ------------------------------
> package/dash/Config.in | 6 +++--
> package/dash/dash.hash | 5 ++--
> package/dash/dash.mk | 10 +++-----
> 4 files changed, 9 insertions(+), 52 deletions(-)
> delete mode 100644 package/dash/0002-fix-parallel-build.patch
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-02-04 11:10 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-27 16:41 [Buildroot] [PATCH 1/2] dash: bump to version 0.5.9.1 Carlos Santos
2017-09-27 16:41 ` [Buildroot] [PATCH 2/2] dash: enable line editting if libedit is selected Carlos Santos
2017-09-27 19:18 ` Thomas Petazzoni
2017-09-27 20:19 ` Carlos Santos
2017-09-28 6:59 ` Thomas Petazzoni
2017-09-28 11:54 ` Carlos Santos
2017-09-28 18:07 ` [Buildroot] [PATCH v2] " Carlos Santos
2018-02-04 11:07 ` Peter Korsgaard
2018-02-04 11:10 ` Peter Korsgaard
2017-09-27 19:17 ` [Buildroot] [PATCH 1/2] dash: bump to version 0.5.9.1 Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.