From patchwork Fri Jul 10 22:26:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1327152 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=RJ7Bc6e9; 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 4B3SMn6pRZz9sRR for ; Sat, 11 Jul 2020 08:27:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 927C920367; Fri, 10 Jul 2020 22:27:11 +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 ECk-jUPKCvYl; Fri, 10 Jul 2020 22:27:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 3A9371FEAB; Fri, 10 Jul 2020 22:27:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 88F301BF41F for ; Fri, 10 Jul 2020 22:27:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7F5AA89C29 for ; Fri, 10 Jul 2020 22:27:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ANpBUAvo0E7K for ; Fri, 10 Jul 2020 22:27:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id B6F1A89AE1 for ; Fri, 10 Jul 2020 22:27:08 +0000 (UTC) Received: by mail-ej1-f66.google.com with SMTP id f12so7635682eja.9 for ; Fri, 10 Jul 2020 15:27:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=glQNYF/82t5pRRZSv4aLzDEtWXq56N8vYvjn0ZGMzB0=; b=RJ7Bc6e95nN5L6v8UYe0qRrD5A2rPgE4yuuL57hGpTwP6KMmFLejghXL5+eEZsk2dR LW44yUwkrNkyY5Hvm0h2d7IZiGAQF6J+n8QDsFJS3H4aAGoBV+laQP9zZGGq9S1pKFmH 2a7N0DRG1Lq0B5jIy9EAwln8gb56/wBs02Jc/fjlDcNoyyrwpR66EmJMaaDYvMsj8Y1f TcDl7xadxaa72Dev6y1lXKhvUIRAo0Y0XJlNx1P/gMx/oYZULxkl7D9rKh7otemsHUA3 ymXznhFbu7+GJRJ2bUfnpR/3/mDAHNL7CHE+mHO8EIsthnLo+h5mbMdJm5j4aDG/9gRq yrTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=glQNYF/82t5pRRZSv4aLzDEtWXq56N8vYvjn0ZGMzB0=; b=lG7dQzxKXK3Z14bP4YwTnpvHWUzeEIMzGtKVwmPX7FhzRyA4rIgHmZ/KYvp79uMxDu VPO813cKUnpO0c/VN5H6BtFRL/SxEBlN2jhtI69qOe/My3tS+/D7m5qEcXELtXOWeq/T S2xbNKCqTvYoJYs5gQWHQA9UxkWOpNOdT9EZDF1yO3Sbe17MHeH6xjsj9jR+chU9APNK KoiAPT1kWzOeJkgeWfTgcO8uc/pUEIpNRbWg5+OsTssLMEh2OyngcpWi9lUWgQ9x9HCE H3m5mFxyZ41V8qnspdmub+dI8mZCNVvwYdsy9kwpu2aOVsK1HJEW2NBTJplGuXd/W0aU P3mQ== X-Gm-Message-State: AOAM531RVNs4D1c0WBeqc4nDwFTxMB36oMtvLQhb2GSXdsoBkmmjTQh4 Z1+XbyCOxSdvxehhfnOOuHVDulBSWsQ= X-Google-Smtp-Source: ABdhPJzdGQQx5H07gAnWRxPBfrZ/MlbIulAXpOah61xZtoG8yu1NWSGLxs57WAP81T0jY1+k7HvOqQ== X-Received: by 2002:a17:906:e2ca:: with SMTP id gr10mr61065065ejb.81.1594420026697; Fri, 10 Jul 2020 15:27:06 -0700 (PDT) Received: from localhost.localdomain (84-114-45-16.cable.dynamic.surfer.at. [84.114.45.16]) by smtp.gmail.com with ESMTPSA id t2sm5480392eds.60.2020.07.10.15.27.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2020 15:27:05 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Sat, 11 Jul 2020 00:26:55 +0200 Message-Id: <20200710222656.6885-1-nolange79@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2] package/systemd: use current tool for generating HWDB 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: Norbert Lange , "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" udevadm has been deprecated for a while(for bulding the DB), systemd-hwdb should be used in its place. this tool further has a switch to generate the database in /usr which is a better place for a one-time created file. Also remove the config files from both paths (rootfs overlay could add stuff) aswell as the service and tool from the target fs. Signed-off-by: Norbert Lange --- v1 -> v2 - fix removal of service --- package/systemd/systemd.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 1a8eb86e53..05c1d1ff9a 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -229,11 +229,14 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y) SYSTEMD_CONF_OPTS += -Dhwdb=true define SYSTEMD_BUILD_HWDB - $(HOST_DIR)/bin/udevadm hwdb --update --root $(TARGET_DIR) + $(HOST_DIR)/bin/systemd-hwdb update --root $(TARGET_DIR) --usr endef SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_BUILD_HWDB define SYSTEMD_RM_HWDB_SRV - rm -rf $(TARGET_DIR)/$(HOST_EUDEV_SYSCONFDIR)/udev/hwdb.d/ + rm -rf $(TARGET_DIR)/usr/lib/udev/hwdb.d/ $(TARGET_DIR)/etc/udev/hwdb.d/ \ + $(TARGET_DIR)/usr/lib/systemd/system/systemd-hwdb-update.service \ + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-hwdb-update.service \ + $(TARGET_DIR)/usr/bin/systemd-hwdb endef SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_HWDB_SRV else @@ -633,7 +636,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dsysusers=false \ -Dtmpfiles=false \ -Dimportd=false \ - -Dhwdb=false \ + -Dhwdb=true \ -Drfkill=false \ -Dman=false \ -Dhtml=false \