From patchwork Mon Aug 3 10:57:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 503109 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id D700B1402DE for ; Mon, 3 Aug 2015 20:57:25 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=TXN8F5L9; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 24C039335D; Mon, 3 Aug 2015 10:57:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GRwmqTTSMSm9; Mon, 3 Aug 2015 10:57:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 2E0B8939F6; Mon, 3 Aug 2015 10:57:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 105F81C1E4E for ; Mon, 3 Aug 2015 10:57:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0BBA7A3161 for ; Mon, 3 Aug 2015 10:57:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id i0loOM2FkxAO for ; Mon, 3 Aug 2015 10:57:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 7CB9E89E4F for ; Mon, 3 Aug 2015 10:57:16 +0000 (UTC) Received: by wibud3 with SMTP id ud3so108486453wib.0 for ; Mon, 03 Aug 2015 03:57:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=zFxHJVxQsySJVuwmJPGyQxEog5FkSBcxhMomuQZZzZc=; b=TXN8F5L9lO7HUuE5zCcDLQFGkUVhRIcFUxZfcXlfFoVnPCFEkI8aMocRSBbvTte6LV wcfFXZRu1JxjzdkQXCj9NaJZDgmapPe8grsLZFiHBJfX5oRUq380c1z2s/YIxY5KesjL 6lg78V63xvrtXQ8vLThqR6ZV633Jiw3p57RuoxIHA6BbsxptIIHxQCKc7IIHhJgE1h5O SGesT5dT9gNgiV+hIkef9cdo1sVJ4qmpXLSHXWTna4teue3+mblH+/Xd/ZbvYJqG1XML EbVIjLVkkTljG6e0auOX0XbgchTIlGjHmTcSyNTtdgETJfHBRGRNkaSSr+TMUqXpR5aX 0o2Q== X-Received: by 10.180.20.15 with SMTP id j15mr32408851wie.76.1438599435075; Mon, 03 Aug 2015 03:57:15 -0700 (PDT) Received: from cerise.lan (rea75-1-78-192-252-96.fbxo.proxad.net. [78.192.252.96]) by smtp.gmail.com with ESMTPSA id u7sm12993192wif.3.2015.08.03.03.57.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Aug 2015 03:57:14 -0700 (PDT) From: Maxime Hadjinlian To: buildroot@buildroot.org Date: Mon, 3 Aug 2015 12:57:09 +0200 Message-Id: <1438599429-7110-1-git-send-email-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 2.4.6 Subject: [Buildroot] [PATCH v2] systemd: Bump version and change hosting X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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. We need to use the autogen.sh scripts from systemd, since they don't provide the Makefile.in file in the 'po' directory, intltoolize which is called in the autogen.sh scripts will create it for us. Therefore, it's no longer needed to do AUTORECONF. Signed-off-by: Maxime Hadjinlian --- v1 -> v2: - Add missing host-auto{conf,make} and host-libtool as dependencies - Re-add '0002-build-sys-revert-use-of-ln-relative-option.patch' --- package/systemd/systemd.hash | 2 -- package/systemd/systemd.mk | 14 ++++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 package/systemd/systemd.hash diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash deleted file mode 100644 index f746051..0000000 --- a/package/systemd/systemd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 085e088650afbfc688ccb13459aedb1fbc7c8810358605b076301f472d51cc4f systemd-221.tar.xz diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b62fc08..3cad639 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,13 +4,15 @@ # ################################################################################ -SYSTEMD_VERSION = 221 -SYSTEMD_SITE = http://www.freedesktop.org/software/systemd -SYSTEMD_SOURCE = systemd-$(SYSTEMD_VERSION).tar.xz +SYSTEMD_VERSION = 224 +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 SYSTEMD_DEPENDENCIES = \ + host-automake \ + host-autoconf \ + host-libtool \ host-intltool \ libcap \ util-linux \ @@ -18,7 +20,6 @@ SYSTEMD_DEPENDENCIES = \ host-gperf SYSTEMD_PROVIDES = udev -SYSTEMD_AUTORECONF = YES # Make sure that systemd will always be built after busybox so that we have # a consistent init setup between two builds @@ -51,6 +52,11 @@ SYSTEMD_CONF_ENV = \ CFLAGS="$(SYSTEMD_CFLAGS)" \ ac_cv_path_KMOD=/usr/bin/kmod +define SYSTEMD_RUN_AUTOGEN + cd $(@D) && PATH=$(BR_PATH) ./autogen.sh +endef +SYSTEMD_PRE_CONFIGURE_HOOKS += SYSTEMD_RUN_AUTOGEN + ifeq ($(BR2_PACKAGE_SYSTEMD_COMPAT),y) SYSTEMD_CONF_OPTS += --enable-compat-libs else