* [Buildroot] [PATCH 1/1] package/dropbear: group post-extract hooks with their call site
@ 2019-12-20 15:34 Thomas De Schampheleire
2019-12-20 15:47 ` Thomas Petazzoni
0 siblings, 1 reply; 3+ messages in thread
From: Thomas De Schampheleire @ 2019-12-20 15:34 UTC (permalink / raw)
To: buildroot
From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
The organization of dropbear.mk was no longer very clear: for some
post-extract blocks, the block was separated from the place where it was
enabled, but for others they were grouped.
Regroup all blocks with their call site.
Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
package/dropbear/dropbear.mk | 31 ++++++++++++++-----------------
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index 7cbc16bc3d..8e09786bf0 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -70,21 +70,26 @@ endif
define DROPBEAR_ENABLE_REVERSE_DNS
echo '#define DO_HOST_LOOKUP 1' >> $(@D)/localoptions.h
endef
+ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),)
+DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS
+endif
define DROPBEAR_BUILD_FEATURED
echo '#define DROPBEAR_SMALL_CODE 0' >> $(@D)/localoptions.h
echo '#define DROPBEAR_TWOFISH128 1' >> $(@D)/localoptions.h
echo '#define DROPBEAR_TWOFISH256 1' >> $(@D)/localoptions.h
endef
-
-define DROPBEAR_DISABLE_STANDALONE
- echo '#define NON_INETD_MODE 0' >> $(@D)/localoptions.h
-endef
+ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y)
+DROPBEAR_CONF_OPTS += --disable-zlib --enable-bundled-libtom
+else
+DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED
+DROPBEAR_DEPENDENCIES += zlib libtomcrypt
+DROPBEAR_CONF_OPTS += --disable-bundled-libtom
+endif
define DROPBEAR_CUSTOM_PATH
echo '#define DEFAULT_PATH $(BR2_SYSTEM_DEFAULT_PATH)' >>$(@D)/localoptions.h
endef
-
DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_CUSTOM_PATH
define DROPBEAR_INSTALL_INIT_SYSTEMD
@@ -95,6 +100,10 @@ define DROPBEAR_INSTALL_INIT_SYSTEMD
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/dropbear.service
endef
+define DROPBEAR_DISABLE_STANDALONE
+ echo '#define NON_INETD_MODE 0' >> $(@D)/localoptions.h
+endef
+
ifeq ($(BR2_USE_MMU),y)
define DROPBEAR_INSTALL_INIT_SYSV
$(INSTALL) -D -m 755 package/dropbear/S50dropbear \
@@ -104,18 +113,6 @@ else
DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_STANDALONE
endif
-ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),)
-DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS
-endif
-
-ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y)
-DROPBEAR_CONF_OPTS += --disable-zlib --enable-bundled-libtom
-else
-DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED
-DROPBEAR_DEPENDENCIES += zlib libtomcrypt
-DROPBEAR_CONF_OPTS += --disable-bundled-libtom
-endif
-
ifneq ($(BR2_PACKAGE_DROPBEAR_WTMP),y)
DROPBEAR_CONF_OPTS += --disable-wtmp
endif
--
2.23.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] package/dropbear: group post-extract hooks with their call site
2019-12-20 15:34 [Buildroot] [PATCH 1/1] package/dropbear: group post-extract hooks with their call site Thomas De Schampheleire
@ 2019-12-20 15:47 ` Thomas Petazzoni
2019-12-20 16:05 ` Thomas De Schampheleire
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Petazzoni @ 2019-12-20 15:47 UTC (permalink / raw)
To: buildroot
On Fri, 20 Dec 2019 16:34:04 +0100
Thomas De Schampheleire <patrickdepinguin@gmail.com> wrote:
> From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
>
> The organization of dropbear.mk was no longer very clear: for some
> post-extract blocks, the block was separated from the place where it was
> enabled, but for others they were grouped.
>
> Regroup all blocks with their call site.
>
> Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> ---
> package/dropbear/dropbear.mk | 31 ++++++++++++++-----------------
> 1 file changed, 14 insertions(+), 17 deletions(-)
>
> diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
> index 7cbc16bc3d..8e09786bf0 100644
> --- a/package/dropbear/dropbear.mk
> +++ b/package/dropbear/dropbear.mk
> @@ -70,21 +70,26 @@ endif
> define DROPBEAR_ENABLE_REVERSE_DNS
> echo '#define DO_HOST_LOOKUP 1' >> $(@D)/localoptions.h
> endef
> +ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),)
> +DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS
> +endif
The hook definition should be within the condition as well, and
similarly for the other cases.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] package/dropbear: group post-extract hooks with their call site
2019-12-20 15:47 ` Thomas Petazzoni
@ 2019-12-20 16:05 ` Thomas De Schampheleire
0 siblings, 0 replies; 3+ messages in thread
From: Thomas De Schampheleire @ 2019-12-20 16:05 UTC (permalink / raw)
To: buildroot
El vie., 20 dic. 2019 a las 16:47, Thomas Petazzoni
(<thomas.petazzoni@bootlin.com>) escribi?:
>
> On Fri, 20 Dec 2019 16:34:04 +0100
> Thomas De Schampheleire <patrickdepinguin@gmail.com> wrote:
>
> > From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> >
> > The organization of dropbear.mk was no longer very clear: for some
> > post-extract blocks, the block was separated from the place where it was
> > enabled, but for others they were grouped.
> >
> > Regroup all blocks with their call site.
> >
> > Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> > ---
> > package/dropbear/dropbear.mk | 31 ++++++++++++++-----------------
> > 1 file changed, 14 insertions(+), 17 deletions(-)
> >
> > diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
> > index 7cbc16bc3d..8e09786bf0 100644
> > --- a/package/dropbear/dropbear.mk
> > +++ b/package/dropbear/dropbear.mk
> > @@ -70,21 +70,26 @@ endif
> > define DROPBEAR_ENABLE_REVERSE_DNS
> > echo '#define DO_HOST_LOOKUP 1' >> $(@D)/localoptions.h
> > endef
> > +ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),)
> > +DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS
> > +endif
>
> The hook definition should be within the condition as well, and
> similarly for the other cases.
>
> Thanks!
>
OK, thanks, v2 coming up...
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-20 16:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-20 15:34 [Buildroot] [PATCH 1/1] package/dropbear: group post-extract hooks with their call site Thomas De Schampheleire
2019-12-20 15:47 ` Thomas Petazzoni
2019-12-20 16:05 ` Thomas De Schampheleire
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.