Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] syslog-ng: update version in config file
@ 2019-09-09  9:54 Chris Packham
  2019-09-09  9:54 ` [Buildroot] [PATCH 2/2] eventlog: remove package Chris Packham
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Chris Packham @ 2019-09-09  9:54 UTC (permalink / raw)
  To: buildroot

syslog-ng warns when using a configuration from an older version. Update
the version in the example config.

Fixes: 9695f3e069 ("package/syslog-ng: bump version to 3.22.1")
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
 package/syslog-ng/syslog-ng.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf
index 9a56a1302d..cab3a7e75a 100644
--- a/package/syslog-ng/syslog-ng.conf
+++ b/package/syslog-ng/syslog-ng.conf
@@ -1,4 +1,4 @@
- at version: 3.19
+ at version: 3.22
 
 source s_sys {
 	file("/proc/kmsg" program_override("kernel"));
-- 
2.23.0

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 2/2] eventlog: remove package
  2019-09-09  9:54 [Buildroot] [PATCH 1/2] syslog-ng: update version in config file Chris Packham
@ 2019-09-09  9:54 ` Chris Packham
  2019-09-10 17:38   ` Thomas Petazzoni
  2019-09-15 13:38   ` Thomas Petazzoni
  2019-09-10  0:09 ` [Buildroot] [PATCH 1/2] syslog-ng: update version in config file Carlos Santos
  2019-09-10 17:35 ` Thomas Petazzoni
  2 siblings, 2 replies; 7+ messages in thread
From: Chris Packham @ 2019-09-09  9:54 UTC (permalink / raw)
  To: buildroot

Since syslog-ng 3.11.1 eventlog has been bundled with the sources.
Remove the separate package.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
 DEVELOPERS                     |  1 -
 package/Config.in              |  1 -
 package/eventlog/Config.in     |  8 --------
 package/eventlog/eventlog.hash |  2 --
 package/eventlog/eventlog.mk   | 15 ---------------
 package/syslog-ng/syslog-ng.mk |  2 +-
 6 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 package/eventlog/Config.in
 delete mode 100644 package/eventlog/eventlog.hash
 delete mode 100644 package/eventlog/eventlog.mk

diff --git a/DEVELOPERS b/DEVELOPERS
index 5784843e33..bdf3565f65 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -490,7 +490,6 @@ F:	configs/olimex_a13_olinuxino_defconfig
 F:	configs/orangepi_plus_defconfig
 
 N:	Chris Packham <judge.packham@gmail.com>
-F:	package/eventlog/
 F:	package/gstreamer1/gst1-shark/
 F:	package/micropython/
 F:	package/micropython-lib/
diff --git a/package/Config.in b/package/Config.in
index 9336261c5d..ee17778c45 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1489,7 +1489,6 @@ menu "JSON/XML"
 endmenu
 
 menu "Logging"
-	source "package/eventlog/Config.in"
 	source "package/glog/Config.in"
 	source "package/liblog4c-localtime/Config.in"
 	source "package/liblogging/Config.in"
diff --git a/package/eventlog/Config.in b/package/eventlog/Config.in
deleted file mode 100644
index f9442f6187..0000000000
--- a/package/eventlog/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_EVENTLOG
-	bool "eventlog"
-	help
-	  eventlog is a library for creating structured events from
-	  applications, and is the workhorse behind syslog-ng's own
-	  messages.
-
-	  https://my.balabit.com/downloads/eventlog/
diff --git a/package/eventlog/eventlog.hash b/package/eventlog/eventlog.hash
deleted file mode 100644
index b8f2ec6141..0000000000
--- a/package/eventlog/eventlog.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From https://my.balabit.com/downloads/eventlog/0.2/eventlog_0.2.12.dsc
-sha256 494dac8e01dc5ce323df2ad554d94874938dab51aa025987677b2bc6906a9c66 eventlog_0.2.12.tar.gz
diff --git a/package/eventlog/eventlog.mk b/package/eventlog/eventlog.mk
deleted file mode 100644
index 7253657165..0000000000
--- a/package/eventlog/eventlog.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# eventlog
-#
-################################################################################
-
-EVENTLOG_VERSION_MAJOR = 0.2
-EVENTLOG_VERSION = $(EVENTLOG_VERSION_MAJOR).12
-EVENTLOG_SOURCE = eventlog_$(EVENTLOG_VERSION).tar.gz
-EVENTLOG_SITE = https://my.balabit.com/downloads/eventlog/$(EVENTLOG_VERSION_MAJOR)
-EVENTLOG_LICENSE = BSD-3-Clause
-EVENTLOG_LICENSE_FILES = COPYING
-EVENTLOG_INSTALL_STAGING = YES
-
-$(eval $(autotools-package))
diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk
index 05ccd751e4..3885f0b942 100644
--- a/package/syslog-ng/syslog-ng.mk
+++ b/package/syslog-ng/syslog-ng.mk
@@ -11,7 +11,7 @@ SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-n
 SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules)
 SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt
 SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \
-	eventlog libglib2 openssl pcre
+	libglib2 openssl pcre
 # We're patching configure.ac
 SYSLOG_NG_AUTORECONF = YES
 SYSLOG_NG_CONF_OPTS = --disable-manpages --localstatedir=/var/run \
-- 
2.23.0

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 1/2] syslog-ng: update version in config file
  2019-09-09  9:54 [Buildroot] [PATCH 1/2] syslog-ng: update version in config file Chris Packham
  2019-09-09  9:54 ` [Buildroot] [PATCH 2/2] eventlog: remove package Chris Packham
@ 2019-09-10  0:09 ` Carlos Santos
  2019-09-10 17:35 ` Thomas Petazzoni
  2 siblings, 0 replies; 7+ messages in thread
From: Carlos Santos @ 2019-09-10  0:09 UTC (permalink / raw)
  To: buildroot

On Mon, Sep 9, 2019 at 6:54 AM Chris Packham <judge.packham@gmail.com> wrote:
>
> syslog-ng warns when using a configuration from an older version. Update
> the version in the example config.
>
> Fixes: 9695f3e069 ("package/syslog-ng: bump version to 3.22.1")
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
> ---
>  package/syslog-ng/syslog-ng.conf | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf
> index 9a56a1302d..cab3a7e75a 100644
> --- a/package/syslog-ng/syslog-ng.conf
> +++ b/package/syslog-ng/syslog-ng.conf
> @@ -1,4 +1,4 @@
> - at version: 3.19
> + at version: 3.22
>
>  source s_sys {
>         file("/proc/kmsg" program_override("kernel"));
> --
> 2.23.0

Tested-by: Carlos Santos <unixmania@gmail.com>

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 1/2] syslog-ng: update version in config file
  2019-09-09  9:54 [Buildroot] [PATCH 1/2] syslog-ng: update version in config file Chris Packham
  2019-09-09  9:54 ` [Buildroot] [PATCH 2/2] eventlog: remove package Chris Packham
  2019-09-10  0:09 ` [Buildroot] [PATCH 1/2] syslog-ng: update version in config file Carlos Santos
@ 2019-09-10 17:35 ` Thomas Petazzoni
  2 siblings, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2019-09-10 17:35 UTC (permalink / raw)
  To: buildroot

On Mon,  9 Sep 2019 21:54:31 +1200
Chris Packham <judge.packham@gmail.com> wrote:

> syslog-ng warns when using a configuration from an older version. Update
> the version in the example config.
> 
> Fixes: 9695f3e069 ("package/syslog-ng: bump version to 3.22.1")
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
> ---
>  package/syslog-ng/syslog-ng.conf | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 2/2] eventlog: remove package
  2019-09-09  9:54 ` [Buildroot] [PATCH 2/2] eventlog: remove package Chris Packham
@ 2019-09-10 17:38   ` Thomas Petazzoni
  2019-09-14 17:36     ` Arnout Vandecappelle
  2019-09-15 13:38   ` Thomas Petazzoni
  1 sibling, 1 reply; 7+ messages in thread
From: Thomas Petazzoni @ 2019-09-10 17:38 UTC (permalink / raw)
  To: buildroot

On Mon,  9 Sep 2019 21:54:32 +1200
Chris Packham <judge.packham@gmail.com> wrote:

> Since syslog-ng 3.11.1 eventlog has been bundled with the sources.
> Remove the separate package.
> 
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
> ---
>  DEVELOPERS                     |  1 -
>  package/Config.in              |  1 -
>  package/eventlog/Config.in     |  8 --------
>  package/eventlog/eventlog.hash |  2 --
>  package/eventlog/eventlog.mk   | 15 ---------------
>  package/syslog-ng/syslog-ng.mk |  2 +-
>  6 files changed, 1 insertion(+), 28 deletions(-)
>  delete mode 100644 package/eventlog/Config.in
>  delete mode 100644 package/eventlog/eventlog.hash
>  delete mode 100644 package/eventlog/eventlog.mk

The question is whether we need Config.in.legacy handling for the
removal of this package/option. Since it seems like the only user of
eventlog was syslog-ng, then supposedly anyone having eventlog enabled
also has syslog-ng enabled. If that's the case, then we probably can do
without any Config.in.legacy handling, because silently dropping the
BR2_PACKAGE_EVENTLOG=y when Buildroot gets updated is the right thing.

Chris, Arnout, any opinion on this ?

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 2/2] eventlog: remove package
  2019-09-10 17:38   ` Thomas Petazzoni
@ 2019-09-14 17:36     ` Arnout Vandecappelle
  0 siblings, 0 replies; 7+ messages in thread
From: Arnout Vandecappelle @ 2019-09-14 17:36 UTC (permalink / raw)
  To: buildroot



On 10/09/2019 19:38, Thomas Petazzoni wrote:
> On Mon,  9 Sep 2019 21:54:32 +1200
> Chris Packham <judge.packham@gmail.com> wrote:
> 
>> Since syslog-ng 3.11.1 eventlog has been bundled with the sources.
>> Remove the separate package.
>>
>> Signed-off-by: Chris Packham <judge.packham@gmail.com>
>> ---
>>  DEVELOPERS                     |  1 -
>>  package/Config.in              |  1 -
>>  package/eventlog/Config.in     |  8 --------
>>  package/eventlog/eventlog.hash |  2 --
>>  package/eventlog/eventlog.mk   | 15 ---------------
>>  package/syslog-ng/syslog-ng.mk |  2 +-
>>  6 files changed, 1 insertion(+), 28 deletions(-)
>>  delete mode 100644 package/eventlog/Config.in
>>  delete mode 100644 package/eventlog/eventlog.hash
>>  delete mode 100644 package/eventlog/eventlog.mk
> 
> The question is whether we need Config.in.legacy handling for the
> removal of this package/option. Since it seems like the only user of
> eventlog was syslog-ng, then supposedly anyone having eventlog enabled
> also has syslog-ng enabled.

 Well, theoretically it is possible that someone is using eventlog independently
in their own software...

 Given how difficult it was to find that package, however, I doubt that this is
the case, so I'm OK with dropping legacy handling. It will make life easier for
the (undoubtedly much more numerous) users who have syslog-ng enabled.

 Regards,
 Arnout


> If that's the case, then we probably can do
> without any Config.in.legacy handling, because silently dropping the
> BR2_PACKAGE_EVENTLOG=y when Buildroot gets updated is the right thing.
> 
> Chris, Arnout, any opinion on this ?
> 
> Thomas
> 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 2/2] eventlog: remove package
  2019-09-09  9:54 ` [Buildroot] [PATCH 2/2] eventlog: remove package Chris Packham
  2019-09-10 17:38   ` Thomas Petazzoni
@ 2019-09-15 13:38   ` Thomas Petazzoni
  1 sibling, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2019-09-15 13:38 UTC (permalink / raw)
  To: buildroot

On Mon,  9 Sep 2019 21:54:32 +1200
Chris Packham <judge.packham@gmail.com> wrote:

> Since syslog-ng 3.11.1 eventlog has been bundled with the sources.
> Remove the separate package.
> 
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
> ---
>  DEVELOPERS                     |  1 -
>  package/Config.in              |  1 -
>  package/eventlog/Config.in     |  8 --------
>  package/eventlog/eventlog.hash |  2 --
>  package/eventlog/eventlog.mk   | 15 ---------------
>  package/syslog-ng/syslog-ng.mk |  2 +-
>  6 files changed, 1 insertion(+), 28 deletions(-)
>  delete mode 100644 package/eventlog/Config.in
>  delete mode 100644 package/eventlog/eventlog.hash
>  delete mode 100644 package/eventlog/eventlog.mk

Applied to master after extending the commit log to explain why we
don't have any Config.in.legacy handling for this package removal.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2019-09-15 13:38 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-09  9:54 [Buildroot] [PATCH 1/2] syslog-ng: update version in config file Chris Packham
2019-09-09  9:54 ` [Buildroot] [PATCH 2/2] eventlog: remove package Chris Packham
2019-09-10 17:38   ` Thomas Petazzoni
2019-09-14 17:36     ` Arnout Vandecappelle
2019-09-15 13:38   ` Thomas Petazzoni
2019-09-10  0:09 ` [Buildroot] [PATCH 1/2] syslog-ng: update version in config file Carlos Santos
2019-09-10 17:35 ` Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox