* [Buildroot] [PATCH] busybox: adjust nommu swaponoff handling for busybox 1.26.0+
@ 2016-12-20 21:53 Peter Korsgaard
2016-12-20 22:11 ` Arnout Vandecappelle
0 siblings, 1 reply; 3+ messages in thread
From: Peter Korsgaard @ 2016-12-20 21:53 UTC (permalink / raw)
To: buildroot
Fixes:
http://autobuild.buildroot.net/results/dfe/dfec2c0626ab087325fd869bcbe0b9dc354d788c/
Busybox 1.26.0 gained separate config options for swapon / swapoff:
commit f417ffd88f194bbfd18605882ee242190c1bab34
Author: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon Nov 14 17:30:50 2016 +0100
Make swapon and swapoff individually selectable.
For example, without swapoff, code shrinks by 277 bytes.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
So adjust busybox.config and the logic to disable these applets for nommu
builds for the new names.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/busybox/busybox.config | 3 ++-
package/busybox/busybox.mk | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config
index 02b1ee1..3e3b5d4 100644
--- a/package/busybox/busybox.config
+++ b/package/busybox/busybox.config
@@ -633,9 +633,10 @@ CONFIG_READPROFILE=y
# CONFIG_RTCWAKE is not set
# CONFIG_SCRIPT is not set
# CONFIG_SCRIPTREPLAY is not set
-CONFIG_SWAPONOFF=y
+CONFIG_SWAPON=y
# CONFIG_FEATURE_SWAPON_DISCARD is not set
# CONFIG_FEATURE_SWAPON_PRI is not set
+CONFIG_SWAPOFF=y
CONFIG_SWITCH_ROOT=y
CONFIG_UMOUNT=y
CONFIG_FEATURE_UMOUNT_ALL=y
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index d7751b5..40fb4d9 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -96,7 +96,8 @@ endef
else
define BUSYBOX_SET_MMU
$(call KCONFIG_ENABLE_OPT,CONFIG_NOMMU,$(BUSYBOX_BUILD_CONFIG))
- $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPONOFF,$(BUSYBOX_BUILD_CONFIG))
+ $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPON,$(BUSYBOX_BUILD_CONFIG))
+ $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPOFF,$(BUSYBOX_BUILD_CONFIG))
$(call KCONFIG_DISABLE_OPT,CONFIG_ASH,$(BUSYBOX_BUILD_CONFIG))
$(call KCONFIG_ENABLE_OPT,CONFIG_HUSH,$(BUSYBOX_BUILD_CONFIG))
$(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_BASH_COMPAT,$(BUSYBOX_BUILD_CONFIG))
--
2.10.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] busybox: adjust nommu swaponoff handling for busybox 1.26.0+
2016-12-20 21:53 [Buildroot] [PATCH] busybox: adjust nommu swaponoff handling for busybox 1.26.0+ Peter Korsgaard
@ 2016-12-20 22:11 ` Arnout Vandecappelle
2016-12-20 22:21 ` Peter Korsgaard
0 siblings, 1 reply; 3+ messages in thread
From: Arnout Vandecappelle @ 2016-12-20 22:11 UTC (permalink / raw)
To: buildroot
On 20-12-16 22:53, Peter Korsgaard wrote:
> Fixes:
> http://autobuild.buildroot.net/results/dfe/dfec2c0626ab087325fd869bcbe0b9dc354d788c/
>
> Busybox 1.26.0 gained separate config options for swapon / swapoff:
>
> commit f417ffd88f194bbfd18605882ee242190c1bab34
> Author: Denys Vlasenko <vda.linux@googlemail.com>
> Date: Mon Nov 14 17:30:50 2016 +0100
>
> Make swapon and swapoff individually selectable.
>
> For example, without swapoff, code shrinks by 277 bytes.
>
> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
>
> So adjust busybox.config and the logic to disable these applets for nommu
> builds for the new names.
>
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
However, for the busybox.config part, perhaps it would be better to regenerate
it with 'make busybox-update-config'? It currently says that it's for 1.25.1,
which looks suspicious :-)
Regards,
Arnout
> ---
> package/busybox/busybox.config | 3 ++-
> package/busybox/busybox.mk | 3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config
> index 02b1ee1..3e3b5d4 100644
> --- a/package/busybox/busybox.config
> +++ b/package/busybox/busybox.config
> @@ -633,9 +633,10 @@ CONFIG_READPROFILE=y
> # CONFIG_RTCWAKE is not set
> # CONFIG_SCRIPT is not set
> # CONFIG_SCRIPTREPLAY is not set
> -CONFIG_SWAPONOFF=y
> +CONFIG_SWAPON=y
> # CONFIG_FEATURE_SWAPON_DISCARD is not set
> # CONFIG_FEATURE_SWAPON_PRI is not set
> +CONFIG_SWAPOFF=y
> CONFIG_SWITCH_ROOT=y
> CONFIG_UMOUNT=y
> CONFIG_FEATURE_UMOUNT_ALL=y
> diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
> index d7751b5..40fb4d9 100644
> --- a/package/busybox/busybox.mk
> +++ b/package/busybox/busybox.mk
> @@ -96,7 +96,8 @@ endef
> else
> define BUSYBOX_SET_MMU
> $(call KCONFIG_ENABLE_OPT,CONFIG_NOMMU,$(BUSYBOX_BUILD_CONFIG))
> - $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPONOFF,$(BUSYBOX_BUILD_CONFIG))
> + $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPON,$(BUSYBOX_BUILD_CONFIG))
> + $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPOFF,$(BUSYBOX_BUILD_CONFIG))
> $(call KCONFIG_DISABLE_OPT,CONFIG_ASH,$(BUSYBOX_BUILD_CONFIG))
> $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH,$(BUSYBOX_BUILD_CONFIG))
> $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_BASH_COMPAT,$(BUSYBOX_BUILD_CONFIG))
>
--
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: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] busybox: adjust nommu swaponoff handling for busybox 1.26.0+
2016-12-20 22:11 ` Arnout Vandecappelle
@ 2016-12-20 22:21 ` Peter Korsgaard
0 siblings, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2016-12-20 22:21 UTC (permalink / raw)
To: buildroot
>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:
Hi,
>> So adjust busybox.config and the logic to disable these applets for nommu
>> builds for the new names.
>>
>> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> However, for the busybox.config part, perhaps it would be better to regenerate
> it with 'make busybox-update-config'? It currently says that it's for 1.25.1,
> which looks suspicious :-)
We could. For thix fix I simply wanted to make to make as minimal as
possible change.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-12-20 22:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-20 21:53 [Buildroot] [PATCH] busybox: adjust nommu swaponoff handling for busybox 1.26.0+ Peter Korsgaard
2016-12-20 22:11 ` Arnout Vandecappelle
2016-12-20 22:21 ` Peter Korsgaard
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.