From patchwork Wed Feb 26 16:03:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Jean Texier X-Patchwork-Id: 1245167 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=koncepto.io Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=koncepto.io header.i=@koncepto.io header.a=rsa-sha256 header.s=default header.b=RkVVb5ap; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48SLFh1YmTz9sPK for ; Thu, 27 Feb 2020 03:03:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2FC3A21FF8; Wed, 26 Feb 2020 16:03:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JIMBNH+603Wx; Wed, 26 Feb 2020 16:03:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 054D321567; Wed, 26 Feb 2020 16:03:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id E363E1BF369 for ; Wed, 26 Feb 2020 16:03:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DB4F420011 for ; Wed, 26 Feb 2020 16:03:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MTp+mBcb-kWU for ; Wed, 26 Feb 2020 16:03:36 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from koncepto.io (koncepto.io [195.154.119.111]) by silver.osuosl.org (Postfix) with ESMTPS id 68F8E20004 for ; Wed, 26 Feb 2020 16:03:36 +0000 (UTC) Received: from menoah.home (lfbn-bor-1-1500-88.w193-250.abo.wanadoo.fr [193.250.66.88]) by koncepto.io (Postfix) with ESMTPSA id 255D260154; Wed, 26 Feb 2020 17:03:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=koncepto.io; s=default; t=1582733012; bh=5Y/eq+pWRT/bQSkC7XKuztFYBlzBpqShF9oLt6xcauc=; h=From:To:Cc:Subject:Date:From; b=RkVVb5appYb1m15fiukxNcg1vr68wd7+s/Zl2dDjYZmCRQnUScu6aW9YK+MrAf0iK GFG2LEZQewyLotqIznJ89Q2838+7RK78Ne7/d4Q72+qH5ewEIsuIU225rB7g5scyJa dPWTXRHOSwegDp1ZdHfMrLJxWyXxJakfWosS48nbcTIZ9l4OzKX6DM8aEws0+qSMCY uhXIie0e+J4rMHm3SimD6nPJXPkEj+oKy6zCP7qoCPN3eg9IofPulIQa8V8DmeQhsh F5XIjJUzoi8umUfMvDQsB2WlW/Y5W/UVtLGt4XGVFjK6dFGSMA2R7ZE/zlIWHWyyr/ qFETb82W6iUzg== From: Pierre-Jean Texier To: buildroot@buildroot.org Date: Wed, 26 Feb 2020 17:03:26 +0100 Message-Id: <1582733006-22049-1-git-send-email-pjtexier@koncepto.io> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH/next] package/psplash: bump to revision fd33a9b X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pierre-Jean Texier , Phil Eichinger MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This includes the following changes: 66c8f65 Makefile.am: use BUILT_SOURCES instead of BUILD_SOURCES f7a354d Generate image headers from their PNG source, while still including them in dist tarball 983837e Import png source for images, extracted from headers 3bd1557 Cleanup poky logo 773a397 Add configure flags for fullscreen logo and no startup message 2913c24 Double buffering support 8188d68 Support --with-font configure option to use other font headers 88c4b71 Add SPDX License information to files, drop boilerplate 904f4aa add systemd support e94bd11 process consecutive commands 568f28e use /run for communication FIFO ee053e0 add recovered bar.png 2015f70 Fix text width calculation. Also: - remove the 'psplash-quit.service' unit file - add 'psplash-systemd.service' to use the new systemd support in psplash Signed-off-by: Pierre-Jean Texier --- package/psplash/psplash-quit.service | 11 ----------- package/psplash/psplash-start.service | 3 +-- package/psplash/psplash-systemd.service | 12 ++++++++++++ package/psplash/psplash.hash | 2 +- package/psplash/psplash.mk | 14 +++++++++++--- 5 files changed, 25 insertions(+), 17 deletions(-) delete mode 100644 package/psplash/psplash-quit.service create mode 100644 package/psplash/psplash-systemd.service diff --git a/package/psplash/psplash-quit.service b/package/psplash/psplash-quit.service deleted file mode 100644 index 14bd499..0000000 --- a/package/psplash/psplash-quit.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Terminate Psplash Boot Screen -After=psplash-start.service - -[Service] -Type=oneshot -ExecStart=/usr/bin/psplash-write QUIT -TimeoutSec=20 - -[Install] -WantedBy=multi-user.target diff --git a/package/psplash/psplash-start.service b/package/psplash/psplash-start.service index 2de3cfc..b97e883 100644 --- a/package/psplash/psplash-start.service +++ b/package/psplash/psplash-start.service @@ -1,8 +1,7 @@ [Unit] Description=Starts Psplash Boot screen -Wants=systemd-vconsole-setup.service -After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd.service DefaultDependencies=no +RequiresMountsFor=/run [Service] ExecStart=/usr/bin/psplash -n diff --git a/package/psplash/psplash-systemd.service b/package/psplash/psplash-systemd.service new file mode 100644 index 0000000..249aa54 --- /dev/null +++ b/package/psplash/psplash-systemd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Start psplash-systemd progress communication helper +DefaultDependencies=no +After=systemd-start.service +Requires=psplash-start.service +RequiresMountsFor=/run + +[Service] +ExecStart=/usr/bin/psplash-systemd + +[Install] +WantedBy=sysinit.target diff --git a/package/psplash/psplash.hash b/package/psplash/psplash.hash index c886569..46d5e12 100644 --- a/package/psplash/psplash.hash +++ b/package/psplash/psplash.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 aaddb20ef892dfb03d4e046cc634159bbcdfe555f7291652dde2b7d4cf491289 psplash-5b3c1cc28f5abdc2c33830150b48b278cc4f7bca.tar.gz +sha256 0042192bf94be4f5792d9ff6b7a2ddff77c79e51274745180d14be5815b3a0f4 psplash-fd33a9b3d68c89fa22ff6873f4f9fd28bd85830c.tar.gz sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING diff --git a/package/psplash/psplash.mk b/package/psplash/psplash.mk index 3dd2f4d..39fcc22 100644 --- a/package/psplash/psplash.mk +++ b/package/psplash/psplash.mk @@ -4,18 +4,26 @@ # ################################################################################ -PSPLASH_VERSION = 5b3c1cc28f5abdc2c33830150b48b278cc4f7bca +PSPLASH_VERSION = fd33a9b3d68c89fa22ff6873f4f9fd28bd85830c PSPLASH_SITE = git://git.yoctoproject.org/psplash PSPLASH_LICENSE = GPL-2.0+ PSPLASH_LICENSE_FILES = COPYING PSPLASH_AUTORECONF = YES +PSPLASH_DEPENDENCIES = host-pkgconf + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +PSPLASH_DEPENDENCIES += systemd +PSPLASH_CONF_OPTS += --with-systemd +else +PSPLASH_CONF_OPTS += --without-systemd +endif define PSPLASH_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/psplash/psplash-start.service \ $(TARGET_DIR)/usr/lib/systemd/system/psplash-start.service - $(INSTALL) -D -m 644 package/psplash/psplash-quit.service \ - $(TARGET_DIR)/usr/lib/systemd/system/psplash-quit.service + $(INSTALL) -D -m 644 package/psplash/psplash-systemd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/psplash-systemd.service endef $(eval $(autotools-package))