| Message ID | 20191113151724.12155-2-peter@korsgaard.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Fix license incompatibility with readline | expand |
Peter, All, On 2019-11-13 16:17 +0100, Peter Korsgaard spake thusly: > chrony is licensed under GPL-2.0, which is not license compatible with > readline (GPL-3.0+), so remove the optional readline handling and replace > with libedit instead. > > While we are at it, also explicitly disable the libedit backend when not > available. > > Signed-off-by: Peter Korsgaard <peter@korsgaard.com> > --- > package/chrony/chrony.mk | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk > index f6dcb11794..379745022c 100644 > --- a/package/chrony/chrony.mk > +++ b/package/chrony/chrony.mk > @@ -13,6 +13,7 @@ CHRONY_CONF_OPTS = \ > --host-system=Linux \ > --host-machine=$(BR2_ARCH) \ > --prefix=/usr \ > + --without-readline \ Why is this --without-readline needed here... > --without-tomcrypt \ > $(if $(BR2_PACKAGE_CHRONY_DEBUG_LOGGING),--enable-debug,--disable-debug) > > @@ -35,10 +36,10 @@ else > CHRONY_CONF_OPTS += --without-seccomp > endif > > -ifeq ($(BR2_PACKAGE_READLINE),y) > -CHRONY_DEPENDENCIES += readline > +ifeq ($(BR2_PACKAGE_LIBEDIT),y) > +CHRONY_DEPENDENCIES += libedit > else > -CHRONY_CONF_OPTS += --disable-readline > +CHRONY_CONF_OPTS += --without-editline --disable-readline ... with this other --disable-readline here? Regards, Yann E. MORIN. > endif > > # If pps-tools is available, build it before so the package can use it > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes: > Peter, All, > On 2019-11-13 16:17 +0100, Peter Korsgaard spake thusly: >> chrony is licensed under GPL-2.0, which is not license compatible with >> readline (GPL-3.0+), so remove the optional readline handling and replace >> with libedit instead. >> >> While we are at it, also explicitly disable the libedit backend when not >> available. >> >> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> >> --- >> package/chrony/chrony.mk | 7 ++++--- >> 1 file changed, 4 insertions(+), 3 deletions(-) >> >> diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk >> index f6dcb11794..379745022c 100644 >> --- a/package/chrony/chrony.mk >> +++ b/package/chrony/chrony.mk >> @@ -13,6 +13,7 @@ CHRONY_CONF_OPTS = \ >> --host-system=Linux \ >> --host-machine=$(BR2_ARCH) \ >> --prefix=/usr \ >> + --without-readline \ > Why is this --without-readline needed here... >> --without-tomcrypt \ >> $(if $(BR2_PACKAGE_CHRONY_DEBUG_LOGGING),--enable-debug,--disable-debug) >> >> @@ -35,10 +36,10 @@ else >> CHRONY_CONF_OPTS += --without-seccomp >> endif >> >> -ifeq ($(BR2_PACKAGE_READLINE),y) >> -CHRONY_DEPENDENCIES += readline >> +ifeq ($(BR2_PACKAGE_LIBEDIT),y) >> +CHRONY_DEPENDENCIES += libedit >> else >> -CHRONY_CONF_OPTS += --disable-readline >> +CHRONY_CONF_OPTS += --without-editline --disable-readline > ... with this other --disable-readline here? Because they do two different things (chrony uses a hand written configure script): --disable-readline Disable line editing support --without-readline Don't use GNU readline even if it is available --without-editline Don't use editline even if it is available
Peter, All, On 2019-11-13 16:17 +0100, Peter Korsgaard spake thusly: > chrony is licensed under GPL-2.0, which is not license compatible with > readline (GPL-3.0+), so remove the optional readline handling and replace > with libedit instead. > > While we are at it, also explicitly disable the libedit backend when not > available. > > Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/chrony/chrony.mk | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk > index f6dcb11794..379745022c 100644 > --- a/package/chrony/chrony.mk > +++ b/package/chrony/chrony.mk > @@ -13,6 +13,7 @@ CHRONY_CONF_OPTS = \ > --host-system=Linux \ > --host-machine=$(BR2_ARCH) \ > --prefix=/usr \ > + --without-readline \ > --without-tomcrypt \ > $(if $(BR2_PACKAGE_CHRONY_DEBUG_LOGGING),--enable-debug,--disable-debug) > > @@ -35,10 +36,10 @@ else > CHRONY_CONF_OPTS += --without-seccomp > endif > > -ifeq ($(BR2_PACKAGE_READLINE),y) > -CHRONY_DEPENDENCIES += readline > +ifeq ($(BR2_PACKAGE_LIBEDIT),y) > +CHRONY_DEPENDENCIES += libedit > else > -CHRONY_CONF_OPTS += --disable-readline > +CHRONY_CONF_OPTS += --without-editline --disable-readline > endif > > # If pps-tools is available, build it before so the package can use it > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes: > chrony is licensed under GPL-2.0, which is not license compatible with > readline (GPL-3.0+), so remove the optional readline handling and replace > with libedit instead. > While we are at it, also explicitly disable the libedit backend when not > available. > Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Committed to 2019.02.x and 2019.08.x, thanks.
diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index f6dcb11794..379745022c 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -13,6 +13,7 @@ CHRONY_CONF_OPTS = \ --host-system=Linux \ --host-machine=$(BR2_ARCH) \ --prefix=/usr \ + --without-readline \ --without-tomcrypt \ $(if $(BR2_PACKAGE_CHRONY_DEBUG_LOGGING),--enable-debug,--disable-debug) @@ -35,10 +36,10 @@ else CHRONY_CONF_OPTS += --without-seccomp endif -ifeq ($(BR2_PACKAGE_READLINE),y) -CHRONY_DEPENDENCIES += readline +ifeq ($(BR2_PACKAGE_LIBEDIT),y) +CHRONY_DEPENDENCIES += libedit else -CHRONY_CONF_OPTS += --disable-readline +CHRONY_CONF_OPTS += --without-editline --disable-readline endif # If pps-tools is available, build it before so the package can use it
chrony is licensed under GPL-2.0, which is not license compatible with readline (GPL-3.0+), so remove the optional readline handling and replace with libedit instead. While we are at it, also explicitly disable the libedit backend when not available. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- package/chrony/chrony.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)