Skip to contentSkip to conversation

systemd: Bump version and change hosting

PATCH Superseded Maxime Hadjinlian 3 participants 5 messages Oct 3, 2015 – Oct 15, 2015

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 systemd: Bump version and change hosting

systemd seems to do its release using their github repository up from the 221 version.

Since they use the auto generated release, we can't have a hash file.

They don't provide the Makefile.in file in the 'po' directory. We need to run intltoolize so it's created for us.

---
v3 -> v4:
- Don't use autogen.sh (run some tests that applies on the host machine), instead call intltoolize alone.

---
 package/systemd/systemd.hash |  2 --
 package/systemd/systemd.mk   | 10 +++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 package/systemd/systemd.hash
package/systemd/systemd.hash deleted +0 -2
deleted file mode 100644
index f746051..0000000
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  085e088650afbfc688ccb13459aedb1fbc7c8810358605b076301f472d51cc4f  systemd-221.tar.xz
package/systemd/systemd.mk +7 -3
index b62fc08..6b9ce3f 100644
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-SYSTEMD_VERSION = 221
-SYSTEMD_SITE = http://www.freedesktop.org/software/systemd
-SYSTEMD_SOURCE = systemd-$(SYSTEMD_VERSION).tar.xz
+SYSTEMD_VERSION = 226
+SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION))
 SYSTEMD_LICENSE = LGPLv2.1+, GPLv2+ (udev), Public Domain (few source files, see README)
 SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README
 SYSTEMD_INSTALL_STAGING = YES
@@ -51,6 +50,11 @@ SYSTEMD_CONF_ENV = \
 	CFLAGS="$(SYSTEMD_CFLAGS)" \
 	ac_cv_path_KMOD=/usr/bin/kmod
 
+define SYSTEMD_RUN_INTLTOOLIZE
+	cd $(@D) && $(HOST_DIR)/usr/bin/intltoolize --force --automake
+endef
+SYSTEMD_PRE_CONFIGURE_HOOKS += SYSTEMD_RUN_INTLTOOLIZE
+
 ifeq ($(BR2_PACKAGE_SYSTEMD_COMPAT),y)
 SYSTEMD_CONF_OPTS += --enable-compat-libs
 else
Signature · 1 line
2.5.3
#1 lore raw

PATCH v4 1/1 systemd: Bump version and change hosting

Also, I bumped the version to 227 and tested it too, it also works fine.

Quoted 61 lines · Maxime Hadjinlian

systemd seems to do its release using their github repository up from the 221 version.

Since they use the auto generated release, we can't have a hash file.

They don't provide the Makefile.in file in the 'po' directory. We need to run intltoolize so it's created for us.

---
v3 -> v4:
- Don't use autogen.sh (run some tests that applies on the host machine), instead call intltoolize alone.

---
 package/systemd/systemd.hash |  2 --
 package/systemd/systemd.mk   | 10 +++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 package/systemd/systemd.hash
package/systemd/systemd.hash deleted +0 -2
deleted file mode 100644
index f746051..0000000
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  085e088650afbfc688ccb13459aedb1fbc7c8810358605b076301f472d51cc4f

systemd-221.tar.xz

package/systemd/systemd.mk +2 -3
index b62fc08..6b9ce3f 100644
@@ -4,9 +4,8 @@
 #
 
 ################################################################################
 
-SYSTEMD_VERSION = 221
-SYSTEMD_SITE = http://www.freedesktop.org/software/systemd
-SYSTEMD_SOURCE = systemd-$(SYSTEMD_VERSION).tar.xz
+SYSTEMD_VERSION = 226
+SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION))
 SYSTEMD_LICENSE = LGPLv2.1+, GPLv2+ (udev), Public Domain (few source
 files, see README)

SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README SYSTEMD_INSTALL_STAGING = YES

package/systemd/systemd.mk +5 -1
@@ -51,6 +50,11 @@ SYSTEMD_CONF_ENV = \
        CFLAGS="$(SYSTEMD_CFLAGS)" \
        ac_cv_path_KMOD=/usr/bin/kmod
 
+define SYSTEMD_RUN_INTLTOOLIZE
+       cd $(@D) && $(HOST_DIR)/usr/bin/intltoolize --force --automake
+endef
+SYSTEMD_PRE_CONFIGURE_HOOKS += SYSTEMD_RUN_INTLTOOLIZE
+
 ifeq ($(BR2_PACKAGE_SYSTEMD_COMPAT),y)
 SYSTEMD_CONF_OPTS += --enable-compat-libs
 else
--

2.5.3

Quoted 5 lines

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20151013/99793b1b/attachment.html>

#2 lore raw

PATCH v4 1/1 systemd: Bump version and change hosting

In reply to Maxime Hadjinlian

Dear Maxime Hadjinlian,

Quoted 13 lines · Maxime Hadjinlian

systemd seems to do its release using their github repository up from the 221 version.

Since they use the auto generated release, we can't have a hash file.

They don't provide the Makefile.in file in the 'po' directory. We need to run intltoolize so it's created for us.

---
v3 -> v4:
- Don't use autogen.sh (run some tests that applies on the host machine), instead call intltoolize alone.

Quoted 5 lines
---
 package/systemd/systemd.hash |  2 --
 package/systemd/systemd.mk   | 10 +++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 package/systemd/systemd.hash

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH v4 1/1 systemd: Bump version and change hosting

In reply to Maxime Hadjinlian

Dear Maxime Hadjinlian,

package/systemd/systemd.hash line 2

Quoted 8 lines · Maxime Hadjinlian
package/systemd/systemd.hash deleted +0 -2
deleted file mode 100644
index f746051..0000000
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  085e088650afbfc688ccb13459aedb1fbc7c8810358605b076301f472d51cc4f  systemd-221.tar.xz

Perhaps you could send a follow-up patch to re-add the hash file (following the discussion at the meeting regarding hashes for github downloads) and a bump to 227 ?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#4 lore raw

PATCH v4 1/1 systemd: Bump version and change hosting

Quoted 15 lines · Thomas Petazzoni

Dear Maxime Hadjinlian,

package/systemd/systemd.hash line 2

Quoted 8 lines · Maxime Hadjinlian
package/systemd/systemd.hash deleted +0 -2
deleted file mode 100644
index f746051..0000000
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256

085e088650afbfc688ccb13459aedb1fbc7c8810358605b076301f472d51cc4f systemd-221.tar.xz

Quoted 4 lines

Perhaps you could send a follow-up patch to re-add the hash file (following the discussion at the meeting regarding hashes for github downloads) and a bump to 227 ?

That's exactly what I intented to do :).
Forgot to remove this patch from patchwork.

Quoted 9 lines

Thanks,

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20151015/932f5f46/attachment.html>