release 181181

4 files changed, 45 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 15bab064b..34a7cfb16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+Summary of changes from v180 to v181
+============================================
+
+Andreas Schwab (1):
+      ata_id: fix identify string fixup
+
+Bruno Redondi (1):
+      keymap: Add Fujitsu Siemens Amilo Li 2732
+
+James M. Leddy (1):
+      keymap: Fix touchpad toggle button on Lenovo Ideapad
+
+Kay Sievers (4):
+      configure: show ROOTPREFIX in firmware path option help text
+      extras: cdrom_id -  create /dev/cdrom and conditionally /dev/dvd for sr0
+      extras: cdrom_id -  create only /dev/cdrom
+      ata_id: whitespace fixes
+
+Lucas De Marchi (1):
+      builtin: kmod - depend on libkmod >= 5
+
+
 Summary of changes from v179 to v180
 ============================================
 
diff --git a/NEWS b/NEWS
index 281ed4056..3f0cf80af 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+udev 181
+========
+Require kmod version 5.
+
+Provide /dev/cdrom symlink for /dev/sr0.
+
 udev 180
 ========
 Fix for ID_PART_ENTRY_* property names, added by the blkid built-in. The
diff --git a/autogen.sh b/autogen.sh
index 180e423c4..55ee03afd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,18 +13,28 @@ libdir() {
         echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
 }
 
-args="\
+args="$args \
 --prefix=/usr \
---with-rootprefix= \
 --sysconfdir=/etc \
---bindir=/sbin \
 --libdir=$(libdir /usr/lib) \
---with-rootlibdir=$(libdir /lib) \
---libexecdir=/lib \
---with-systemdsystemunitdir=/lib/systemd/system \
 --with-selinux \
 --enable-gtk-doc"
 
+if [ -L /bin ]; then
+args="$args \
+--libexecdir=/usr/lib \
+--with-systemdsystemunitdir=/usr/lib/systemd/system \
+"
+else
+args="$args \
+--with-rootprefix= \
+---with-rootlibdir=$(libdir /lib) \
+--bindir=/sbin \
+--libexecdir=/lib \
+--with-systemdsystemunitdir=/lib/systemd/system \
+"
+fi
+
 echo
 echo "----------------------------------------------------------------"
 echo "Initialized build system. For a common configuration please run:"
diff --git a/configure.ac b/configure.ac
index d9e3f67bb..e7c10d5c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.60)
 AC_INIT([udev],
-       [180],
+       [181],
        [linux-hotplug@vger.kernel.org],
        [udev],
        [http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html])