From: Greg KH <greg@press.(none)>
Date: Wed, 6 Jul 2005 20:52:14 +0000 (-0700)
Subject: Merge gregkh@ehlo.org:/home/kay/public_html/pub/scm/linux/hotplug/udev-kay
X-Git-Tag: 061~1
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=831139235ea7dbacddbd1e6ce94ce7e958afea10;hp=0cc976eeaf6370490e1f40faf7926180cfeb85fe;p=elogind.git

Merge gregkh@ehlo.org:/home/kay/public_html/linux/hotplug/udev-kay
---

diff --git a/Makefile b/Makefile
index 25e082524..fd2a3f2b4 100644
--- a/Makefile
+++ b/Makefile
@@ -41,6 +41,7 @@ EXTRAS=
 # make the build silent. Set this to something else to make it noisy again.
 V=false
 
+VERSION =	060
 ROOT =		udev
 DAEMON =	udevd
 SENDER =	udevsend
@@ -51,7 +52,6 @@ CONTROL =	udevcontrol
 INFO =		udevinfo
 TESTER =	udevtest
 STARTER =	udevstart
-VERSION =	060
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =	etc/udev
 DESTDIR =
@@ -102,19 +102,18 @@ GCCINCDIR := ${shell LC_ALL=C $(CC) -print-search-dirs | sed -ne "s/install: \(.
 # code taken from uClibc to determine the libgcc.a filename
 GCC_LIB := $(shell $(CC) -print-libgcc-file-name )
 
-# use '-Os' optimization if available, else use -O2
-OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
-		then echo "-Os"; else echo "-O2" ; fi}
-
 # check if compiler option is supported
-cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;}
+cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi;}
 
 CFLAGS		+= -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith -Wstrict-prototypes -Wsign-compare
-CFLAGS		+= $(call cc-supports,-Wno-pointer-sign)
-CFLAGS		+= $(call cc-supports,-Wdeclaration-after-statement)
+CFLAGS		+= $(call cc-supports, -Wno-pointer-sign, )
+CFLAGS		+= $(call cc-supports, -Wdeclaration-after-statement, )
 CFLAGS		+= -pipe
 CFLAGS		+= -D_GNU_SOURCE
 
+# use '-Os' optimization if available, else use -O2
+OPTFLAGS := $(call cc-supports, -Os, -O2)
+
 HEADERS = \
 	udev.h			\
 	udev_utils.h		\
@@ -165,7 +164,7 @@ ifeq ($(strip $(DEBUG)),true)
 	LDFLAGS += -Wl
 	STRIPCMD = /bin/true -Since_we_are_debugging
 else
-	CFLAGS  += $(OPTIMIZATION) -fomit-frame-pointer
+	CFLAGS  += $(OPTFLAGS) -fomit-frame-pointer
 	LDFLAGS += -s -Wl
 	STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
 endif
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 46787704c..248944bd5 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,18 @@
+udev 061
+========
+We changed the  internal rule storage format. Our large rule files took
+2 MB of RAM, with the change we are down to 99kB.
+
+If the device-node has been created with default name and no symlink or
+options are to remenber, it is not longer stored in the udevdb. HAL will
+need to be updated to work correctly with that change.
+
+To overrride optimization flags, OPTFLAGS may be used now.
+
+udev 060
+========
+Bugfix release.
+
 udev 059
 ========
 Major changes happened with this release. The goal is to take over the