From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wi0-f173.google.com ([209.85.212.173]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1UJ6Eb-0007gj-Vv for openembedded-core@lists.openembedded.org; Fri, 22 Mar 2013 18:58:35 +0100 Received: by mail-wi0-f173.google.com with SMTP id ez12so28096wid.0 for ; Fri, 22 Mar 2013 10:41:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:x-gm-message-state; bh=cHUG4ODhUZpNfkSBVALfNPzGcc2qfPM2hHp0LxRa6OI=; b=Twcuy3prustG+rWqOCnw9bjDtVApLA18KVR8n8GBgT6W9PEB8fJZxZs9sWsgav2rjw 3d//Un6Wwx05ZblPH9Xq5tzV62fmhS12Yt1nPhas22HzHSA97mDPzCDOXVccKWAejKqi NGoqNcQ2vkzW3c8T2klx3j6kICre2meU8KYFsv0xATFNzhIRrkg5tp8qpKYlmUciFLHN QncaRWXQnzV0OvOVyCzc4HkaIxpGW8MQGIae3sC+6VBcR76XUM9RCH2OnRYqfkfWbWY2 CiwNQ/L4OlJct9kO2qDhumU/dwDW8ciMtRE0U27kZ3NrekZpo9gt5uCQxwOzwkOydTJp IUiw== X-Received: by 10.194.83.33 with SMTP id n1mr4842573wjy.7.1363974100172; Fri, 22 Mar 2013 10:41:40 -0700 (PDT) Received: from melchett.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by mx.google.com with ESMTPS id dm9sm12260880wib.3.2013.03.22.10.41.39 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 22 Mar 2013 10:41:39 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 22 Mar 2013 17:38:27 +0000 Message-Id: <45454ff4a5b7d742a1483664a8f5bcd059c7d810.1363973088.git.ross.burton@intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQmSYtk5MHAERTAfCGKvG8FdhwiiPt2mrHrC4zOeh8oju7Z98hQpnNZHKRGs5oxubngQVQ1e Cc: openembedded-devel@lists.openembedded.org Subject: [PATCH 07/22] systemd: split out the hwdb data X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Mar 2013 17:59:26 -0000 X-List-Received-Date: Fri, 22 Mar 2013 17:59:26 -0000 The hardware databases are not essential and also quite large, so split them out into udev-hwdb. Signed-off-by: Ross Burton --- meta/recipes-core/systemd/systemd_197.bb | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_197.bb b/meta/recipes-core/systemd/systemd_197.bb index 56ced66..a006ec8 100644 --- a/meta/recipes-core/systemd/systemd_197.bb +++ b/meta/recipes-core/systemd/systemd_197.bb @@ -180,13 +180,13 @@ RRECOMMENDS_${PN} += "systemd-serialgetty \ kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \ " -PACKAGES =+ "udev-dbg udev udev-consolekit udev-utils" +PACKAGES =+ "udev-dbg udev udev-consolekit udev-utils udev-hwdb" FILES_udev-dbg += "/lib/udev/.debug" RDEPENDS_udev += "udev-utils" RPROVIDES_udev = "hotplug" -RRECOMMENDS_udev += "udev-extraconf" +RRECOMMENDS_udev += "udev-extraconf udev-hwdb" FILES_udev += "${base_sbindir}/udevd \ ${base_libdir}/systemd/systemd-udevd \ @@ -209,7 +209,6 @@ FILES_udev += "${base_sbindir}/udevd \ /lib/udev/rules.d/78*.rules \ /lib/udev/rules.d/8*.rules \ /lib/udev/rules.d/95*.rules \ - ${base_libdir}/udev/hwdb.d \ ${sysconfdir}/udev \ ${systemd_unitdir}/system/*udev* \ ${systemd_unitdir}/system/*.wants/*udev* \ @@ -220,6 +219,8 @@ RDEPENDS_udev-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'console FILES_udev-utils = "${bindir}/udevadm" +FILES_udev-hwdb = "${base_libdir}/udev/hwdb.d" + # TODO: # u-a for runlevel and telinit @@ -239,6 +240,21 @@ update-alternatives --remove shutdown ${base_bindir}/systemctl update-alternatives --remove poweroff ${base_bindir}/systemctl } +pkg_postinst_udev-hwdb () { + if test -n "$D"; then + exit 1 + fi + + udevadm hwdb --update +} + +pkg_prerm_udev-hwdb () { + if test -n "$D"; then + exit 1 + fi + + rm -f ${sysconfdir}/udev/hwdb.bin +} # As this recipe builds udev, respect the systemd DISTRO_FEATURE so we don't try # building udev and systemd in world builds. -- 1.7.10.4