Hi,

this is important. The patch which I've sent out for the Makefile contains one
"/" which can lead to trouble if one builds the RPMs as root. The problem is
that mklibs uses /lib64 as target instead of the relative path lib64. Please
use the attached patch, the mklibs block is now simplified. The target
directory for mklibs is tmp/boel_binaries/lib64 if the host system contains a
/lib64 directory, otherwise it is tmp/boel_binaries/lib . This should be okay
for i386, ia64 and x86_64. Is it what one would do for ppc, too?

In any case, I think the mklibs -L option should have the default system libs
at the end onstead of the beginning of the directories list, this way one
catches up the self compiled libs which come with systemimager.

Thanks
best regards
Erich


--- trunk/Makefile	2005-06-26 13:44:26.000000000 +0200
+++ systemimager-3.5.2/Makefile	2005-07-09 13:41:31.000000000 +0200
@@ -144,7 +144,12 @@
 # is userspace 64bit
 USERSPACE64 := 0
 ifeq ($(ARCH),ia64) 
-	USERSPACE64 :=1
+	USERSPACE64 := 1
+endif
+
+USERSPACE64 := 0
+ifeq ($(ARCH),x86_64)
+        USERSPACE64 := 1
 endif
 
 ifneq ($(BUILD_ARCH),)
@@ -564,13 +569,10 @@
 	test ! -d /lib64 || cp -a /lib64/ld* $(BOEL_BINARIES_DIR)/lib64
 endif
 
-ifeq ($(USERSPACE64),1)
-	cd $(BOEL_BINARIES_DIR) \
-		&& $(PYTHON) $(TOPDIR)/initrd_source/mklibs -L /lib64:/usr/lib64:$(SRC_DIR)/$(PARTED_DIR)/libparted/.libs:/usr/kerberos/lib:$(SRC_DIR)/$(DISCOVER_DIR)/lib/.libs -v -d lib bin/* sbin/*
-else
+	TGTDIR=lib ; \
+	test -d /lib64 && TGTDIR=lib64 ; \
 	cd $(BOEL_BINARIES_DIR) \
-		&& $(PYTHON) $(TOPDIR)/initrd_source/mklibs -L /lib:/usr/lib:$(SRC_DIR)/$(PARTED_DIR)/libparted/.libs:/usr/kerberos/lib:$(SRC_DIR)/$(DISCOVER_DIR)/lib/.libs -v -d lib bin/* sbin/*
-endif
+		&& $(PYTHON) $(TOPDIR)/initrd_source/mklibs -L $(SRC_DIR)/$(PARTED_DIR)/libparted/.libs:$(SRC_DIR)/$(DISCOVER_DIR)/lib/.libs:$(SRC_DIR)/$(DEVMAPPER_DIR)/lib/ioctl:$(SRC_DIR)/$(E2FSPROGS_DIR)/lib:/lib64:/usr/lib64:/usr/kerberos/lib64:/lib:/usr/lib:/usr/kerberos/lib -v -d $$TGTDIR bin/* sbin/*
 	#
 	# Include other files required by openssh that apparently aren't 
 	# picked up by mklibs for some reason. -BEF-

Reply via email to