[Buildroot] [v2 1/3] package/systemd: Remove SYSTEMD_COMPAT option

[Buildroot] [v2 1/3] package/systemd: Remove SYSTEMD_COMPAT option

[Maxime Hadjinlian]

Since v230 of systemd, the compat libraries have been fully removed.
https://github.com/systemd/systemd/commit/4de282cf9324ab13d17ac334244d0d7cae2df37d

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
---
v1 -> v2:
    - Fix indent
---
 Config.in.legacy             |  7 +++++++
 package/dbus/Config.in       |  1 -
 package/liblogging/Config.in |  1 -
 package/systemd/Config.in    | 13 -------------
 package/systemd/systemd.mk   |  6 ------
 5 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 34bdaf0..70f6e0a 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -369,6 +369,13 @@ config BR2_PACKAGE_SYSTEMD_ALL_EXTRAS
 	  removed. To get the same features, the libgcrypt and xz
 	  package should now be enabled.
 
+config BR2_PACKAGE_SYSTEMD_COMPAT
+	bool "systemd compatibility libraries has been removed"
+	help
+	  The systemd option te enable the compatibility libraries has been
+	  removed. Theses libraries have been useless since a few version, and
+	  have been fully dropped from the source since v230.
+
 config BR2_GCC_VERSION_4_5_X
 	bool "gcc 4.5.x has been removed"
 	select BR2_LEGACY
diff --git a/package/dbus/Config.in b/package/dbus/Config.in
index 7d49ce5..653f748 100644
--- a/package/dbus/Config.in
+++ b/package/dbus/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_DBUS
 	# uses fork()
 	depends on BR2_USE_MMU
 	select BR2_PACKAGE_EXPAT
-	select BR2_PACKAGE_SYSTEMD_COMPAT if BR2_INIT_SYSTEMD
 	help
 	  The D-Bus message bus system.
 
diff --git a/package/liblogging/Config.in b/package/liblogging/Config.in
index 12ee950..23c3c1a 100644
--- a/package/liblogging/Config.in
+++ b/package/liblogging/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LIBLOGGING
 	bool "liblogging"
-	select BR2_PACKAGE_SYSTEMD_COMPAT if BR2_INIT_SYSTEMD
 	help
 	  Liblogging is an easy to use library for
 	  logging. It offers an enhanced replacement
diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 324e884..896a1ef 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -154,19 +154,6 @@ config BR2_PACKAGE_SYSTEMD_TIMESYNCD
 
 	  http://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html
 
-config BR2_PACKAGE_SYSTEMD_COMPAT
-	bool "enable compatibility libraries"
-	help
-	  Since systemd 209, the following libraries have been merged into
-	  libsystemd.so:
-
-	  - libsystemd-daemon
-	  - libsystemd-id128
-	  - libsystemd-journal
-	  - libsystemd-login
-
-	  This option enables the installation of compatibility *.pc files.
-
 config BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT
 	bool "enable SMACK support"
 	select BR2_PACKAGE_ATTR
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index c0503ae..75e832c 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -51,12 +51,6 @@ define SYSTEMD_RUN_INTLTOOLIZE
 endef
 SYSTEMD_PRE_CONFIGURE_HOOKS += SYSTEMD_RUN_INTLTOOLIZE
 
-ifeq ($(BR2_PACKAGE_SYSTEMD_COMPAT),y)
-SYSTEMD_CONF_OPTS += --enable-compat-libs
-else
-SYSTEMD_CONF_OPTS += --disable-compat-libs
-endif
-
 ifeq ($(BR2_PACKAGE_ACL),y)
 SYSTEMD_CONF_OPTS += --enable-acl
 SYSTEMD_DEPENDENCIES += acl
-- 
2.8.1

[Buildroot] [v2 2/3] package/systemd: Remove systemd-bootchart

[Maxime Hadjinlian]

Since systemd v230, bootchart has been removed from the source of
systemd and now lives in its own repository.
A new package will be added in the next commit.

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
---
 Config.in.legacy           |  6 ++++++
 package/systemd/Config.in  | 10 ----------
 package/systemd/systemd.mk |  6 ------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 70f6e0a..357f382 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -376,6 +376,12 @@ config BR2_PACKAGE_SYSTEMD_COMPAT
 	  removed. Theses libraries have been useless since a few version, and
 	  have been fully dropped from the source since v230.
 
+config BR2_PACKAGE_SYSTEMD_BOOTCHART
+	bool "systemd-bootchart option has been removed"
+	help
+	  From systemd v230, bootchart is not part of the systemd source anymore.
+	  It is now living in its own repository, a new package must be added.
+
 config BR2_GCC_VERSION_4_5_X
 	bool "gcc 4.5.x has been removed"
 	select BR2_LEGACY
diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 896a1ef..430fc45 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -111,16 +111,6 @@ config BR2_PACKAGE_SYSTEMD_VCONSOLE
 
 	  http://www.freedesktop.org/software/systemd/man/systemd-vconsole-setup.service.html
 
-config BR2_PACKAGE_SYSTEMD_BOOTCHART
-	bool "enable bootchart tool"
-	help
-	  systemd-bootchart is a tool, usually run at system startup,
-	  that collects the CPU load, disk load, memory usage, as well
-	  as per-process information from a running system. Collected
-	  results are output as an SVG graph.
-
-	  http://www.freedesktop.org/software/systemd/man/systemd-bootchart.html
-
 config BR2_PACKAGE_SYSTEMD_QUOTACHECK
 	bool "enable quotacheck tools"
 	help
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 75e832c..d55d264 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -141,12 +141,6 @@ else
 SYSTEMD_CONF_OPTS += --disable-vconsole
 endif
 
-ifeq ($(BR2_PACKAGE_SYSTEMD_BOOTCHART),y)
-SYSTEMD_CONF_OPTS += --enable-bootchart
-else
-SYSTEMD_CONF_OPTS += --disable-bootchart
-endif
-
 ifeq ($(BR2_PACKAGE_SYSTEMD_QUOTACHECK),y)
 SYSTEMD_CONF_OPTS += --enable-quotacheck
 else
-- 
2.8.1

[Buildroot] [v2 3/3] systemd-bootchart: New package

[Maxime Hadjinlian]

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
---
v1 -> v2:
    - Remove depends that were copied from systemd
    - Remove empty line in hash file

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
---
 package/Config.in                               |  1 +
 package/systemd-bootchart/Config.in             | 21 +++++++++++++++++++++
 package/systemd-bootchart/system-bootchart.hash |  2 ++
 package/systemd-bootchart/systemd-bootchart.mk  | 15 +++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 100644 package/systemd-bootchart/Config.in
 create mode 100644 package/systemd-bootchart/system-bootchart.hash
 create mode 100644 package/systemd-bootchart/systemd-bootchart.mk

diff --git a/package/Config.in b/package/Config.in
index 1bf7b1c..27519f7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1715,6 +1715,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/syslog-ng/Config.in"
 endif
 	source "package/systemd/Config.in"
+	source "package/systemd-bootchart/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/sysvinit/Config.in"
 	source "package/tar/Config.in"
diff --git a/package/systemd-bootchart/Config.in b/package/systemd-bootchart/Config.in
new file mode 100644
index 0000000..58fcfbb
--- /dev/null
+++ b/package/systemd-bootchart/Config.in
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_SYSTEMD_BOOTCHART
+	bool "systemd-bootchart"
+	depends on BR2_INIT_SYSTEMD
+	help
+	  systemd-bootchart is a tool, usually run at system startup,
+	  that collects the CPU load, disk load, memory usage, as well
+	  as per-process information from a running system. Collected
+	  results are output as an SVG graph.
+
+	  systemd-bootchart requires a Linux kernel >= 3.0 with the following
+	  options enabled:
+
+	  - CONFIG_SCHEDSTATS
+	  - CONFIG_SCHED_DEBUG
+
+	  These options will be automatically enabled by Buildroot if
+	  it is responsible for building the kernel. Otherwise, if you
+	  are building your kernel outside of Buildroot, make sure
+	  these options are enabled.
+
+	  http://www.freedesktop.org/software/systemd/man/systemd-bootchart.html
diff --git a/package/systemd-bootchart/system-bootchart.hash b/package/systemd-bootchart/system-bootchart.hash
new file mode 100644
index 0000000..c347ef5
--- /dev/null
+++ b/package/systemd-bootchart/system-bootchart.hash
@@ -0,0 +1,2 @@
+# sha256 locally computed
+sha256 8cfea4f604c00289394a4429f934e19f80dceafbe0ae1846e00997f70d81a20f systemd-bootchart-230.tar.xz
diff --git a/package/systemd-bootchart/systemd-bootchart.mk b/package/systemd-bootchart/systemd-bootchart.mk
new file mode 100644
index 0000000..c371b9f
--- /dev/null
+++ b/package/systemd-bootchart/systemd-bootchart.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# systemd-bootchart
+#
+################################################################################
+
+SYSTEMD_BOOTCHART_VERSION = 230
+SYSTEMD_BOOTCHART_SOURCE = systemd-bootchart-$(SYSTEMD_BOOTCHART_VERSION).tar.xz
+# Do not use the github helper here, the generated tarball is *NOT* the same
+# as the one uploaded by upstream for the release.
+SYSTEMD_BOOTCHART_SITE = https://github.com/systemd/systemd-bootchart/releases/download/v$(SYSTEMD_BOOTCHART_VERSION)
+SYSTEMD_BOOTCHART_LICENSE = LGPLv2.1+
+SYSTEMD_BOOTCHART_DEPENDENCIES = systemd
+
+$(eval $(autotools-package))
-- 
2.8.1

[Buildroot] [v2 1/3] package/systemd: Remove SYSTEMD_COMPAT option

[Ben Boeckel]

On Fri, 01 Jul, 2016 at 22:27:17 GMT, Maxime Hadjinlian wrote:
> +	  The systemd option te enable the compatibility libraries has been

I see this has already been merged, but 'te -> to'.

--Ben

[Buildroot] [v2 1/3] package/systemd: Remove SYSTEMD_COMPAT option

[Maxime Hadjinlian]

Hi Ben, all,

Thank you for noticing, I sent a quick patch with the typo fixed.

On Wed, Jul 6, 2016 at 3:04 AM, Ben Boeckel <mathstuf@gmail.com> wrote:
> On Fri, 01 Jul, 2016 at 22:27:17 GMT, Maxime Hadjinlian wrote:
>> +       The systemd option te enable the compatibility libraries has been
>
> I see this has already been merged, but 'te -> to'.
>
> --Ben
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot