From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail1.bemta7.messagelabs.com ([216.82.254.109]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1US5uN-0002rB-IT for ptxdist@pengutronix.de; Tue, 16 Apr 2013 15:26:52 +0200 From: Jon Ringle Date: Tue, 16 Apr 2013 09:26:37 -0400 Message-ID: <1366118797-22806-1-git-send-email-jringle@gridpoint.com> MIME-Version: 1.0 Subject: [ptxdist] [PATCH] systemd: version bump 201 Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Jon Ringle Signed-off-by: Jon Ringle --- rules/systemd.in | 2 ++ rules/systemd.make | 12 ++++++------ rules/udev.make | 5 +++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/rules/systemd.in b/rules/systemd.in index a5d77e8..3a9427d 100644 --- a/rules/systemd.in +++ b/rules/systemd.in @@ -17,10 +17,12 @@ menuconfig SYSTEMD select TCPWRAPPER if SYSTEMD_TCPWRAP select XZ if SYSTEMD_XZ select LIBSELINUX if GLOBAL_SELINUX + select ATTR # for udev: select ROOTFS_DEV select LIBKMOD select LIBBLKID + select LIBGCRYPT select GLIB if UDEV_LIBGUDEV select PCIUTILS if UDEV_PERSISTENT_PCI && RUNTIME select USBUTILS if UDEV_PERSISTENT_USB && RUNTIME diff --git a/rules/systemd.make b/rules/systemd.make index 84ad633..34b0a94 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd # # Paths and names # -SYSTEMD_VERSION := 195 -SYSTEMD_MD5 := 38e8c8144e7e6e5bc3ce32eb4260e680 +SYSTEMD_VERSION := 201 +SYSTEMD_MD5 := 3e758392ff0e9206b3f7ee252b4a654b SYSTEMD := systemd-$(SYSTEMD_VERSION) SYSTEMD_SUFFIX := tar.xz SYSTEMD_URL := http://www.freedesktop.org/software/systemd/$(SYSTEMD).$(SYSTEMD_SUFFIX) @@ -80,11 +80,11 @@ SYSTEMD_CONF_OPT := \ --$(call ptx/endis,PTXCONF_UDEV_KEYMAPS)-keymap \ --disable-manpages \ --enable-split-usr \ - --with-usb-ids-path=/usr/share/usb.ids \ - --with-pci-ids-path=/usr/share/pci.ids$(call ptx/ifdef, PTXCONF_PCIUTILS_COMPRESS,.gz,) \ - --with-distro=other \ + --enable-kmod \ + --enable-blkid \ --with-sysvinit-path="" \ - --with-sysvrcd-path="" \ + --with-sysvrcnd-path="" \ + --$(call ptx/wwo,PTXCONF_DBUS_PYTHON)-python \ --with-dbuspolicydir=/etc/dbus-1/system.d \ --with-dbussessionservicedir=/usr/share/dbus-1/services \ --with-dbussystemservicedir=/usr/share/dbus-1/system-services \ diff --git a/rules/udev.make b/rules/udev.make index 80c703f..66f1081 100644 --- a/rules/udev.make +++ b/rules/udev.make @@ -107,7 +107,8 @@ UDEV_RULES-y += \ 70-power-switch.rules \ 70-uaccess.rules \ 71-seat.rules \ - 73-seat-late.rules + 73-seat-late.rules \ + 80-net-name-slot.rules endif @@ -180,7 +181,7 @@ ifdef PTXCONF_UDEV_LEGACY else ifdef PTXCONF_SYSTEMD @$(call install_copy, udev, 0, 0, 0755, -, /lib/systemd/systemd-udevd) - @$(call install_copy, udev, 0, 0, 0755, -, /usr/bin/udevadm) + @$(call install_copy, udev, 0, 0, 0755, -, /bin/udevadm) else @$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/udevd) @$(call install_copy, udev, 0, 0, 0755, -, /bin/udevadm) -- 1.7.12.1.2.g0f9f35a The information contained in this transmission may contain confidential information. If the reader of this message is not the intended recipient, you are hereby notified that any review, dissemination, distribution or duplication of this communication is strictly prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. -- ptxdist mailing list ptxdist@pengutronix.de