[PATCH] dump latest klibc into the udev build tree

[PATCH] dump latest klibc into the udev build tree

[Olaf Hering]

KLIBC is used as an internal makefile variable, it expands to either
true or false right now. udev should use something else than KLIBC to
allow build against the latest and greatest klibc version.


diff -p -purN udev.bk/Makefile udev.bk.new/Makefile
--- udev.bk/Makefile	2003-12-11 09:12:28.000000000 +0100
+++ udev.bk.new/Makefile	2003-12-13 09:28:26.000000000 +0100
@@ -22,7 +22,7 @@ DEBUG = false
 
 # Set the following to `true' to make udev emit a D-BUS signal when a
 # new node is created.
-DBUS = false
+USE_DBUS = false
 
 
 ROOT =		udev
@@ -56,7 +56,7 @@ udevdir = ${prefix}/udev
 
 # Comment out this line to build with something other 
 # than the local version of klibc
-#KLIBC = true
+#USE_KLIBC = true
 
 # If you are running a cross compiler, you may want to set this
 # to something more interesting, like "arm-linux-".  I you want
@@ -115,7 +115,7 @@ endif
 
 # If we are using our version of klibc, then we need to build and link it.
 # Otherwise, use glibc and link statically.
-ifeq ($(strip $(KLIBC)),true)
+ifeq ($(strip $(USE_KLIBC)),true)
 	KLIBC_BASE	= $(PWD)/klibc
 	KLIBC_DIR	= $(KLIBC_BASE)/klibc
 	INCLUDE_DIR	:= $(KLIBC_DIR)/include
@@ -179,11 +179,11 @@ OBJS =	udev.o		\
 	$(SYSFS)	\
 	$(TDB)
 
-ifeq ($(strip $(KLIBC)),true)
+ifeq ($(strip $(USE_KLIBC)),true)
 	OBJS += klibc_fixups.o
 endif
 
-ifeq ($(DBUS), true)
+ifeq ($(USE_DBUS), true)
 	CFLAGS += -DUSE_DBUS
 	CFLAGS += $(shell pkg-config --cflags dbus-1)
 	LDFLAGS += $(shell pkg-config --libs dbus-1)
@@ -260,7 +260,7 @@ small_release: $(DISTFILES) clean
 	@echo "Built $(RELEASE_NAME).tar.gz"
 
 
-ifeq ($(DBUS), true)
+ifeq ($(USE_DBUS), true)
 install-dbus-policy:
 	$(INSTALL) -d $(DESTDIR)$(dbusdir)
 	$(INSTALL_DATA) udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
diff -p -purN udev.bk/README udev.bk.new/README
--- udev.bk/README	2003-12-08 19:08:52.000000000 +0100
+++ udev.bk.new/README	2003-12-13 09:28:58.000000000 +0100
@@ -32,18 +32,18 @@ To use:
 		installed into.  This works just like the 'configure --prefix'
 		script does.  Default value is ''.  Only override this if you
 		really know what you are doing.
-	KLIBC - if set to 'true', udev is built and linked against the included
+	USE_KLIBC - if set to 'true', udev is built and linked against the included
 		version of klibc.  Default value is 'false'.
 	DEBUG - if set to 'true', debugging messages will be sent to the syslog
 		as udev is run.  Default value is 'false'.
-	DBUS -  if set to 'true', DBUS messages will be sent everytime udev
+	USE_DBUS -  if set to 'true', DBUS messages will be sent everytime udev
 		creates or removes a device node.  This requires that DBUS
 		development headers and libraries be present on your system to
 		build properly.  Default value is 'false'.
 
       So, if you want to build udev using klibc with debugging messages, you
       would do:
-	make KLIBC=true DEBUG=true
+	make USE_KLIBC=true DEBUG=true
 
 
 - Install the project:
-- 
USB is for mice, FireWire is for men!

sUse lINUX ag, n√úRNBERG


-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id\x1278&alloc_id371&op=click
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel

Re: [PATCH] dump latest klibc into the udev build tree

[Greg KH]

On Tue, Dec 16, 2003 at 09:22:42AM +0100, Olaf Hering wrote:
> KLIBC is used as an internal makefile variable, it expands to either
> true or false right now. udev should use something else than KLIBC to
> allow build against the latest and greatest klibc version.

Why is this needed?  I don't see the KLIBC variable needed in the latest
cvs tree of klibc.

thanks,

greg k-h


-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id\x1278&alloc_id371&op=click
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel

Re: [PATCH] dump latest klibc into the udev build tree

[Greg KH]

On Tue, Dec 16, 2003 at 09:22:42AM +0100, Olaf Hering wrote:
> KLIBC is used as an internal makefile variable, it expands to either
> true or false right now. udev should use something else than KLIBC to
> allow build against the latest and greatest klibc version.

Why is this needed?  I don't see the KLIBC variable needed in the latest
cvs tree of klibc.

thanks,

greg k-h


-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id\x1278&alloc_id371&op=click
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel

Re: [PATCH] dump latest klibc into the udev build tree

[Olaf Hering]

 On Tue, Dec 16, Greg KH wrote:

> On Tue, Dec 16, 2003 at 09:22:42AM +0100, Olaf Hering wrote:
> > KLIBC is used as an internal makefile variable, it expands to either
> > true or false right now. udev should use something else than KLIBC to
> > allow build against the latest and greatest klibc version.
> 
> Why is this needed?  I don't see the KLIBC variable needed in the latest
> cvs tree of klibc.

KLIBC holds libc.a

grep -wr KLIBC /trashcan/olaf/klibc/klibc-0.94/
/trashcan/olaf/klibc/klibc-0.94/ash/Makefile:LIBS     = $(KLIBC) $(LIBGCC)
/trashcan/olaf/klibc/klibc-0.94/MCONFIG:KLIBC   = $(KLIBSRC)/libc.a
/trashcan/olaf/klibc/klibc-0.94/gzip/Makefile:LIBS = $(KLIBC) $(LIBGCC)
/trashcan/olaf/klibc/klibc-0.94/ipconfig/Makefile:LIBS        = $(KLIBC) $(LIBGCC)
/trashcan/olaf/klibc/klibc-0.94/kinit/Makefile: $(KLIBC) $(LIBGCC)
/trashcan/olaf/klibc/klibc-0.94/nfsmount/Makefile:LIBS        = $(KLIBC) $(LIBGCC)
/trashcan/olaf/klibc/klibc-0.94/utils/Makefile:LIBS     = $(KLIBC) $(LIBGCC)



-- 
USB is for mice, FireWire is for men!

sUse lINUX ag, n√úRNBERG


-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id\x1278&alloc_id371&op=click
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel

Re: [PATCH] dump latest klibc into the udev build tree

[Greg KH]

On Tue, Dec 16, 2003 at 05:33:03PM +0100, Olaf Hering wrote:
>  On Tue, Dec 16, Greg KH wrote:
> 
> > On Tue, Dec 16, 2003 at 09:22:42AM +0100, Olaf Hering wrote:
> > > KLIBC is used as an internal makefile variable, it expands to either
> > > true or false right now. udev should use something else than KLIBC to
> > > allow build against the latest and greatest klibc version.
> > 
> > Why is this needed?  I don't see the KLIBC variable needed in the latest
> > cvs tree of klibc.
> 
> KLIBC holds libc.a
> 
> grep -wr KLIBC /trashcan/olaf/klibc/klibc-0.94/
> /trashcan/olaf/klibc/klibc-0.94/ash/Makefile:LIBS     = $(KLIBC) $(LIBGCC)
> /trashcan/olaf/klibc/klibc-0.94/MCONFIG:KLIBC   = $(KLIBSRC)/libc.a
> /trashcan/olaf/klibc/klibc-0.94/gzip/Makefile:LIBS = $(KLIBC) $(LIBGCC)
> /trashcan/olaf/klibc/klibc-0.94/ipconfig/Makefile:LIBS        = $(KLIBC) $(LIBGCC)
> /trashcan/olaf/klibc/klibc-0.94/kinit/Makefile: $(KLIBC) $(LIBGCC)
> /trashcan/olaf/klibc/klibc-0.94/nfsmount/Makefile:LIBS        = $(KLIBC) $(LIBGCC)
> /trashcan/olaf/klibc/klibc-0.94/utils/Makefile:LIBS     = $(KLIBC) $(LIBGCC)

But the udev build does not contain any of those "addons" in it's
version of the klibc tree, right?  So why would it matter to udev?

thanks,

greg k-h


-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id\x1278&alloc_id371&op=click
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel

Re: [PATCH] dump latest klibc into the udev build tree

[Olaf Hering]

 On Tue, Dec 16, Greg KH wrote:

> But the udev build does not contain any of those "addons" in it's
> version of the klibc tree, right?  So why would it matter to udev?

Thats the reason why the subject line reads: dump the latest and greatest ...

like that:
rm -rf klibc/* ; cp -a klibc-0.94/* klibc
make KLIBC=true -j || echo patch missing

I build udev and klibc stuff in one go.


-- 
USB is for mice, FireWire is for men!

sUse lINUX ag, n√úRNBERG


-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id\x1278&alloc_id371&op=click
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel

Re: [PATCH] dump latest klibc into the udev build tree

[Greg KH]

On Tue, Dec 16, 2003 at 07:36:16PM +0100, Olaf Hering wrote:
>  On Tue, Dec 16, Greg KH wrote:
> 
> > But the udev build does not contain any of those "addons" in it's
> > version of the klibc tree, right?  So why would it matter to udev?
> 
> Thats the reason why the subject line reads: dump the latest and greatest ...
> 
> like that:
> rm -rf klibc/* ; cp -a klibc-0.94/* klibc
> make KLIBC=true -j || echo patch missing
> 
> I build udev and klibc stuff in one go.

Ah, ok, that makes sense.  I've now applied your patch, thanks.

greg k-h


-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id\x1278&alloc_id371&op=click
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel