[OE-core] [PATCH] dhcp: fix isc_boolean_t patch
Adrian Bunk
bunk at stusta.de
Sun Apr 14 20:02:03 UTC 2019
On Sun, Apr 14, 2019 at 02:47:01PM +0200, Enrico Scholz via Openembedded-core wrote:
> There is a copy & paste error in 5775e9ef2fce1d0b9860602f1065bb1e09bc1b61
> which breaks dhcpd.
>
> Cc: Armin Kuster <akuster808 at gmail.com>
> Signed-off-by: Enrico Scholz <enrico.scholz at sigma-chemnitz.de>
> ---
> ...1-dhcpd-fix-Replace-custom-isc_boolean_t-with-C-standa.patch | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-dhcpd-fix-Replace-custom-isc_boolean_t-with-C-standa.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-dhcpd-fix-Replace-custom-isc_boolean_t-with-C-standa.patch
> index d2e57714cd..fa3d9c4e1f 100644
> --- a/meta/recipes-connectivity/dhcp/dhcp/0001-dhcpd-fix-Replace-custom-isc_boolean_t-with-C-standa.patch
> +++ b/meta/recipes-connectivity/dhcp/dhcp/0001-dhcpd-fix-Replace-custom-isc_boolean_t-with-C-standa.patch
> @@ -1816,7 +1816,7 @@ Index: dhcp-4.4.1/common/options.c
> {
> if (universe->save_func)
> - (*universe->save_func)(universe, options, oc, ISC_FALSE);
> -+ (*universe->save_func)(universe, options, oc, true);
> ++ (*universe->save_func)(universe, options, oc, false);
> else
> log_error("can't store options in %s space.", universe->name);
> }
Nice catch.
The root problem is that OE is carrying an own huge patch,
instead of using the much simpler and shorter upstream fix.
I'll send a patch to replace it with the upstream fix.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
More information about the Openembedded-core
mailing list