[Ipcop-svn] SF.net SVN: ipcop:[4528] ipcop/trunk

[<ges...@us...>]

Revision: 4528
          http://ipcop.svn.sourceforge.net/ipcop/?rev=4528&view=rev
Author:   gespinasse
Date:     2010-04-26 22:39:09 +0000 (Mon, 26 Apr 2010)

Log Message:
-----------
Change klibc installation to be in the PATH
That way, we could compile xzminidec for floppy without troubles

Modified Paths:
--------------
    ipcop/trunk/lfs/klibc

Added Paths:
-----------
    ipcop/trunk/config/rootfiles/arch_i486/klibc

Added: ipcop/trunk/config/rootfiles/arch_i486/klibc
===================================================================
--- ipcop/trunk/config/rootfiles/arch_i486/klibc	                        (rev 0)
+++ ipcop/trunk/config/rootfiles/arch_i486/klibc	2010-04-26 22:39:09 UTC (rev 4528)
@@ -0,0 +1,289 @@
+#lib/klibc-AHKpqVQAbHg_LnOj56OYAbfcJaU.so
+#usr/bin/klcc
+#usr/lib/klibc
+#usr/lib/klibc/bin
+#usr/lib/klibc/bin/cat
+#usr/lib/klibc/bin/chroot
+#usr/lib/klibc/bin/cpio
+#usr/lib/klibc/bin/dd
+#usr/lib/klibc/bin/dmesg
+#usr/lib/klibc/bin/false
+#usr/lib/klibc/bin/fstype
+#usr/lib/klibc/bin/gunzip
+#usr/lib/klibc/bin/gzip
+#usr/lib/klibc/bin/halt
+#usr/lib/klibc/bin/insmod
+#usr/lib/klibc/bin/ipconfig
+#usr/lib/klibc/bin/kill
+#usr/lib/klibc/bin/kinit
+#usr/lib/klibc/bin/kinit.shared
+#usr/lib/klibc/bin/ln
+#usr/lib/klibc/bin/losetup
+#usr/lib/klibc/bin/ls
+#usr/lib/klibc/bin/minips
+#usr/lib/klibc/bin/mkdir
+#usr/lib/klibc/bin/mkfifo
+#usr/lib/klibc/bin/mknod
+#usr/lib/klibc/bin/mount
+#usr/lib/klibc/bin/nfsmount
+#usr/lib/klibc/bin/nuke
+#usr/lib/klibc/bin/pivot_root
+#usr/lib/klibc/bin/poweroff
+#usr/lib/klibc/bin/readlink
+#usr/lib/klibc/bin/reboot
+#usr/lib/klibc/bin/resume
+#usr/lib/klibc/bin/run-init
+#usr/lib/klibc/bin/sh.shared
+#usr/lib/klibc/bin/sleep
+#usr/lib/klibc/bin/sync
+#usr/lib/klibc/bin/true
+#usr/lib/klibc/bin/umount
+#usr/lib/klibc/bin/uname
+#usr/lib/klibc/bin/zcat
+#usr/lib/klibc/include
+#usr/lib/klibc/include/Kbuild
+#usr/lib/klibc/include/alloca.h
+#usr/lib/klibc/include/arch
+#usr/lib/klibc/include/arch/alpha
+#usr/lib/klibc/include/arch/alpha/klibc
+#usr/lib/klibc/include/arch/alpha/klibc/archconfig.h
+#usr/lib/klibc/include/arch/alpha/klibc/archsetjmp.h
+#usr/lib/klibc/include/arch/alpha/klibc/archsignal.h
+#usr/lib/klibc/include/arch/alpha/klibc/archstat.h
+#usr/lib/klibc/include/arch/alpha/machine
+#usr/lib/klibc/include/arch/alpha/machine/asm.h
+#usr/lib/klibc/include/arch/arm
+#usr/lib/klibc/include/arch/arm/klibc
+#usr/lib/klibc/include/arch/arm/klibc/archconfig.h
+#usr/lib/klibc/include/arch/arm/klibc/archsetjmp.h
+#usr/lib/klibc/include/arch/arm/klibc/archsignal.h
+#usr/lib/klibc/include/arch/arm/klibc/archstat.h
+#usr/lib/klibc/include/arch/arm/klibc/asmmacros.h
+#usr/lib/klibc/include/arch/cris
+#usr/lib/klibc/include/arch/cris/klibc
+#usr/lib/klibc/include/arch/cris/klibc/archconfig.h
+#usr/lib/klibc/include/arch/cris/klibc/archsetjmp.h
+#usr/lib/klibc/include/arch/cris/klibc/archsignal.h
+#usr/lib/klibc/include/arch/cris/klibc/archstat.h
+#usr/lib/klibc/include/arch/i386
+#usr/lib/klibc/include/arch/i386/klibc
+#usr/lib/klibc/include/arch/i386/klibc/archconfig.h
+#usr/lib/klibc/include/arch/i386/klibc/archsetjmp.h
+#usr/lib/klibc/include/arch/i386/klibc/archsignal.h
+#usr/lib/klibc/include/arch/i386/klibc/archstat.h
+#usr/lib/klibc/include/arch/i386/klibc/diverr.h
+#usr/lib/klibc/include/arch/i386/sys
+#usr/lib/klibc/include/arch/i386/sys/io.h
+#usr/lib/klibc/include/arch/i386/sys/vm86.h
+#usr/lib/klibc/include/arch/ia64
+#usr/lib/klibc/include/arch/ia64/klibc
+#usr/lib/klibc/include/arch/ia64/klibc/archconfig.h
+#usr/lib/klibc/include/arch/ia64/klibc/archsetjmp.h
+#usr/lib/klibc/include/arch/ia64/klibc/archsignal.h
+#usr/lib/klibc/include/arch/ia64/klibc/archstat.h
+#usr/lib/klibc/include/arch/ia64/klibc/archsys.h
+#usr/lib/klibc/include/arch/m32r
+#usr/lib/klibc/include/arch/m32r/klibc
+#usr/lib/klibc/include/arch/m32r/klibc/archconfig.h
+#usr/lib/klibc/include/arch/m32r/klibc/archsetjmp.h
+#usr/lib/klibc/include/arch/m32r/klibc/archsignal.h
+#usr/lib/klibc/include/arch/m32r/klibc/archstat.h
+#usr/lib/klibc/include/arch/m68k
+#usr/lib/klibc/include/arch/m68k/klibc
+#usr/lib/klibc/include/arch/m68k/klibc/archconfig.h
+#usr/lib/klibc/include/arch/m68k/klibc/archsetjmp.h
+#usr/lib/klibc/include/arch/m68k/klibc/archsignal.h
+#usr/lib/klibc/include/arch/m68k/klibc/archstat.h
+#usr/lib/klibc/include/arch/mips
+#usr/lib/klibc/include/arch/mips/klibc
+#usr/lib/klibc/include/arch/mips/klibc/archconfig.h
+#usr/lib/klibc/include/arch/mips/klibc/archfcntl.h
+#usr/lib/klibc/include/arch/mips/klibc/archsetjmp.h
+#usr/lib/klibc/include/arch/mips/klibc/archsignal.h
+#usr/lib/klibc/include/arch/mips/klibc/archsocket.h
+#usr/lib/klibc/include/arch/mips/klibc/archstat.h
+#usr/lib/klibc/include/arch/mips/machine
+#usr/lib/klibc/include/arch/mips/machine/asm.h
+#usr/lib/klibc/include/arch/mips/sgidefs.h
+#usr/lib/klibc/include/arch/mips/spaces.h
+#usr/lib/klibc/include/arch/mips64
+#usr/lib/klibc/include/arch/mips64/klibc
+#usr/lib/klibc/include/arch/mips64/klibc/archconfig.h
+#usr/lib/klibc/include/arch/mips64/klibc/archsignal.h
+#usr/lib/klibc/include/arch/mips64/klibc/archsocket.h
+#usr/lib/klibc/include/arch/mips64/klibc/archstat.h
+#usr/lib/klibc/include/arch/parisc
+#usr/lib/klibc/include/arch/parisc/klibc
+#usr/lib/klibc/include/arch/parisc/klibc/archconfig.h
+#usr/lib/klibc/include/arch/parisc/klibc/archsetjmp.h
+#usr/lib/klibc/include/arch/parisc/klibc/archsignal.h
+#usr/lib/klibc/include/arch/parisc/klibc/archstat.h
+#usr/lib/klibc/include/arch/ppc
+#usr/lib/klibc/include/arch/ppc/klibc
+#usr/lib/klibc/include/arch/ppc/klibc/archconfig.h
+#usr/lib/klibc/include/arch/ppc/klibc/archsetjmp.h
+#usr/lib/klibc/include/arch/ppc/klibc/archsignal.h
+#usr/lib/klibc/include/arch/ppc/klibc/archstat.h
+#usr/lib/klibc/include/arch/ppc64
+#usr/lib/klibc/include/arch/ppc64/klibc
+#usr/lib/klibc/include/arch/ppc64/klibc/archconfig.h
+#usr/lib/klibc/include/arch/ppc64/klibc/archsetjmp.h
+#usr/lib/klibc/include/arch/ppc64/klibc/archsignal.h
+#usr/lib/klibc/include/arch/ppc64/klibc/archstat.h
+#usr/lib/klibc/include/arch/s390
+#usr/lib/klibc/include/arch/s390/klibc
+#usr/lib/klibc/include/arch/s390/klibc/archconfig.h
+#usr/lib/klibc/include/arch/s390/klibc/archsetjmp.h
+#usr/lib/klibc/include/arch/s390/klibc/archsignal.h
+#usr/lib/klibc/include/arch/s390/klibc/archstat.h
+#usr/lib/klibc/include/arch/sh
+#usr/lib/klibc/include/arch/sh/klibc
+#usr/lib/klibc/include/arch/sh/klibc/archconfig.h
+#usr/lib/klibc/include/arch/sh/klibc/archsetjmp.h
+#usr/lib/klibc/include/arch/sh/klibc/archsignal.h
+#usr/lib/klibc/include/arch/sh/klibc/archstat.h
+#usr/lib/klibc/include/arch/sparc
+#usr/lib/klibc/include/arch/sparc/klibc
+#usr/lib/klibc/include/arch/sparc/klibc/archconfig.h
+#usr/lib/klibc/include/arch/sparc/klibc/archsetjmp.h
+#usr/lib/klibc/include/arch/sparc/klibc/archsignal.h
+#usr/lib/klibc/include/arch/sparc/klibc/archstat.h
+#usr/lib/klibc/include/arch/sparc/machine
+#usr/lib/klibc/include/arch/sparc/machine/asm.h
+#usr/lib/klibc/include/arch/sparc/machine/frame.h
+#usr/lib/klibc/include/arch/sparc/machine/trap.h
+#usr/lib/klibc/include/arch/sparc64
+#usr/lib/klibc/include/arch/sparc64/klibc
+#usr/lib/klibc/include/arch/sparc64/klibc/archconfig.h
+#usr/lib/klibc/include/arch/sparc64/klibc/archsetjmp.h
+#usr/lib/klibc/include/arch/sparc64/klibc/archsignal.h
+#usr/lib/klibc/include/arch/sparc64/klibc/archstat.h
+#usr/lib/klibc/include/arch/x86_64
+#usr/lib/klibc/include/arch/x86_64/klibc
+#usr/lib/klibc/include/arch/x86_64/klibc/archconfig.h
+#usr/lib/klibc/include/arch/x86_64/klibc/archsetjmp.h
+#usr/lib/klibc/include/arch/x86_64/klibc/archsignal.h
+#usr/lib/klibc/include/arch/x86_64/klibc/archstat.h
+#usr/lib/klibc/include/arch/x86_64/sys
+#usr/lib/klibc/include/arch/x86_64/sys/io.h
+#usr/lib/klibc/include/arpa
+#usr/lib/klibc/include/arpa/inet.h
+#usr/lib/klibc/include/asm
+#usr/lib/klibc/include/asm-generic
+#usr/lib/klibc/include/assert.h
+#usr/lib/klibc/include/bits32
+#usr/lib/klibc/include/bits32/bitsize
+#usr/lib/klibc/include/bits32/bitsize.h
+#usr/lib/klibc/include/bits32/bitsize/limits.h
+#usr/lib/klibc/include/bits32/bitsize/stddef.h
+#usr/lib/klibc/include/bits32/bitsize/stdint.h
+#usr/lib/klibc/include/bits32/bitsize/stdintconst.h
+#usr/lib/klibc/include/bits32/bitsize/stdintlimits.h
+#usr/lib/klibc/include/bits64
+#usr/lib/klibc/include/bits64/bitsize
+#usr/lib/klibc/include/bits64/bitsize.h
+#usr/lib/klibc/include/bits64/bitsize/limits.h
+#usr/lib/klibc/include/bits64/bitsize/stddef.h
+#usr/lib/klibc/include/bits64/bitsize/stdint.h
+#usr/lib/klibc/include/bits64/bitsize/stdintconst.h
+#usr/lib/klibc/include/bits64/bitsize/stdintlimits.h
+#usr/lib/klibc/include/byteswap.h
+#usr/lib/klibc/include/ctype.h
+#usr/lib/klibc/include/dirent.h
+#usr/lib/klibc/include/elf.h
+#usr/lib/klibc/include/endian.h
+#usr/lib/klibc/include/errno.h
+#usr/lib/klibc/include/fcntl.h
+#usr/lib/klibc/include/fnmatch.h
+#usr/lib/klibc/include/getopt.h
+#usr/lib/klibc/include/grp.h
+#usr/lib/klibc/include/inttypes.h
+#usr/lib/klibc/include/klibc
+#usr/lib/klibc/include/klibc/compiler.h
+#usr/lib/klibc/include/klibc/diverr.h
+#usr/lib/klibc/include/klibc/endian.h
+#usr/lib/klibc/include/klibc/extern.h
+#usr/lib/klibc/include/klibc/havesyscall.h
+#usr/lib/klibc/include/klibc/stathelp.h
+#usr/lib/klibc/include/klibc/sysconfig.h
+#usr/lib/klibc/include/limits.h
+#usr/lib/klibc/include/linux
+#usr/lib/klibc/include/malloc.h
+#usr/lib/klibc/include/mntent.h
+#usr/lib/klibc/include/net
+#usr/lib/klibc/include/net/if.h
+#usr/lib/klibc/include/net/if_arp.h
+#usr/lib/klibc/include/net/if_packet.h
+#usr/lib/klibc/include/net/route.h
+#usr/lib/klibc/include/netinet
+#usr/lib/klibc/include/netinet/if_ether.h
+#usr/lib/klibc/include/netinet/in.h
+#usr/lib/klibc/include/netinet/in6.h
+#usr/lib/klibc/include/netinet/ip.h
+#usr/lib/klibc/include/netinet/tcp.h
+#usr/lib/klibc/include/netinet/udp.h
+#usr/lib/klibc/include/netpacket
+#usr/lib/klibc/include/netpacket/packet.h
+#usr/lib/klibc/include/paths.h
+#usr/lib/klibc/include/poll.h
+#usr/lib/klibc/include/pwd.h
+#usr/lib/klibc/include/sched.h
+#usr/lib/klibc/include/setjmp.h
+#usr/lib/klibc/include/signal.h
+#usr/lib/klibc/include/stdarg.h
+#usr/lib/klibc/include/stddef.h
+#usr/lib/klibc/include/stdint.h
+#usr/lib/klibc/include/stdio.h
+#usr/lib/klibc/include/stdlib.h
+#usr/lib/klibc/include/string.h
+#usr/lib/klibc/include/sys
+#usr/lib/klibc/include/sys/dirent.h
+#usr/lib/klibc/include/sys/elf32.h
+#usr/lib/klibc/include/sys/elf64.h
+#usr/lib/klibc/include/sys/elfcommon.h
+#usr/lib/klibc/include/sys/fsuid.h
+#usr/lib/klibc/include/sys/inotify.h
+#usr/lib/klibc/include/sys/ioctl.h
+#usr/lib/klibc/include/sys/klog.h
+#usr/lib/klibc/include/sys/md.h
+#usr/lib/klibc/include/sys/mman.h
+#usr/lib/klibc/include/sys/mount.h
+#usr/lib/klibc/include/sys/param.h
+#usr/lib/klibc/include/sys/poll.h
+#usr/lib/klibc/include/sys/prctl.h
+#usr/lib/klibc/include/sys/reboot.h
+#usr/lib/klibc/include/sys/resource.h
+#usr/lib/klibc/include/sys/select.h
+#usr/lib/klibc/include/sys/sendfile.h
+#usr/lib/klibc/include/sys/socket.h
+#usr/lib/klibc/include/sys/socketcalls.h
+#usr/lib/klibc/include/sys/splice.h
+#usr/lib/klibc/include/sys/stat.h
+#usr/lib/klibc/include/sys/statfs.h
+#usr/lib/klibc/include/sys/syscall.h
+#usr/lib/klibc/include/sys/sysinfo.h
+#usr/lib/klibc/include/sys/sysmacros.h
+#usr/lib/klibc/include/sys/time.h
+#usr/lib/klibc/include/sys/times.h
+#usr/lib/klibc/include/sys/types.h
+#usr/lib/klibc/include/sys/uio.h
+#usr/lib/klibc/include/sys/un.h
+#usr/lib/klibc/include/sys/utime.h
+#usr/lib/klibc/include/sys/utsname.h
+#usr/lib/klibc/include/sys/vfs.h
+#usr/lib/klibc/include/sys/wait.h
+#usr/lib/klibc/include/sysexits.h
+#usr/lib/klibc/include/syslog.h
+#usr/lib/klibc/include/termios.h
+#usr/lib/klibc/include/time.h
+#usr/lib/klibc/include/unistd.h
+#usr/lib/klibc/include/utime.h
+#usr/lib/klibc/include/zconf.h
+#usr/lib/klibc/include/zlib.h
+#usr/lib/klibc/lib
+#usr/lib/klibc/lib/crt0.o
+#usr/lib/klibc/lib/interp.o
+#usr/lib/klibc/lib/klibc-AHKpqVQAbHg_LnOj56OYAbfcJaU.so
+#usr/lib/klibc/lib/libc.a
+#usr/lib/klibc/lib/libc.so
+#usr/share/man/man1/klcc.1

Modified: ipcop/trunk/lfs/klibc
===================================================================
--- ipcop/trunk/lfs/klibc	2010-04-26 22:32:30 UTC (rev 4527)
+++ ipcop/trunk/lfs/klibc	2010-04-26 22:39:09 UTC (rev 4528)
@@ -82,7 +82,8 @@
 ###############################################################################
 
 $(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
-	@rm -rf $(DIR_APP) /$(INSTALLER_DIR)/$(PKG_NAME)
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) /$(INSTALLER_DIR)/$(PKG_NAME) $(LFS)/usr/lib/klibc $(LFS)/lib/klibc-*.so
 	cd $(DIR_SRC)  && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_insmod.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_Kbuild-install.patch
@@ -94,25 +95,17 @@
 			ln -s $${x} linux/include; \
 		done
 
-	# workaround arch/ppc removal on 2.6.27
-	# TODO: verify if we still need this on 2.6.32/klibc-1.5.16
-	#cd /usr/src/linux-$(KVER)/arch/ && ln -sf powerpc ppc
-	#cd /usr/src/linux-$(KVER)/include && ln -sf arch-powerpc arch-ppc
-
-	# we should use xzminidec externally compiled, not gzip
+	# we use xzminidec externally compiled, not gzip
 	# but klibc do not compile with ZLIB disabled : error in function `load_ramdisk_compressed'
 	#cd $(DIR_APP) && sed -i 's/CONFIG_KLIBC_ZLIB=y/# CONFIG_KLIBC_ZLIB is not set/' defconfig
 
 	cd $(DIR_APP) && make
-	cd $(DIR_APP) && make INSTALLROOT=/$(INSTALLER_DIR)/$(PKG_NAME) install
+	# we need to install klibc in the PATH to be able to compile xzminidec against klibc
+	cd $(DIR_APP) && make install
+
 	# The two lines below are for when we start compiling on 64bit hosts
 	#cd $(DIR_APP) && make CROSS_COMPILE=$(MACHINE_REAL)-linux-
-	#cd $(DIR_APP) && make CROSS_COMPILE=$(MACHINE_REAL)-linux- INSTALLROOT=/$(INSTALLER_DIR)/$(PKG_NAME) install
+	#cd $(DIR_APP) && make CROSS_COMPILE=$(MACHINE_REAL)-linux- install
 
-	# we install out of tree to not have a big list of installed header files
-	# but need some files in place to be able to compile against klibc
-	# commented until xzminidec work
-	# cd $(DIR_APP) && make install
-
 	@rm -rf $(DIR_APP)
-	touch $(TARGET)
+	@$(POSTBUILD)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.