klibc fixes and updates

deleted file mode 100644
index f690d98..0000000
@@ -1,36 +0,0 @@
-Do not strip binaries too early. Strip is done before packaging.
-Signed-off-by: Andrea Adami <[email protected]>
-
---- a/scripts/Kbuild.klibc	2011-06-14 17:11:17.000000000 +0200
-+++ b/scripts/Kbuild.klibc	2011-07-15 01:18:58.000000000 +0200
-@@ -332,8 +332,7 @@
-                        $(KLIBCLIBC)				\
- 		       $(KLIBCLIBGCC)				\
- 		       --end-group ;				\
--                      cp -f $@ [email protected] ;				\
--                      $(KLIBCSTRIP) $(KLIBCSTRIPFLAGS) $@
-+                       cp -f $@ [email protected]
- 
- 
- $(static-y): $(kprog-objs) $(lib-target) $(KLIBCCRT0) $(KLIBCLIBC) FORCE
-@@ -348,8 +347,7 @@
-                        -R $(KLIBCLIBCSHARED)			\
- 	               $(KLIBCLIBGCC)				\
- 		       --end-group ;				\
--                      cp -f $@ [email protected] ;				\
--                      $(KLIBCSTRIP) $(KLIBCSTRIPFLAGS) $@
-+                       cp -f $@ [email protected]
- 
- 
- $(shared-y): $(kprog-objs) $(lib-target) $(KLIBCCRTSHARED) \
-
---- a/usr/klibc/Kbuild	2011-07-15 01:46:32.000000000 +0200
-+++ b/usr/klibc/Kbuild	2011-07-15 01:47:17.000000000 +0200
-@@ -147,7 +147,6 @@
- 
- quiet_cmd_sohash = GEN     $@
-       cmd_sohash = cat $< > $@;                                           \
--                     $(KLIBCSTRIP) $(KLIBCSTRIPFLAGS) $@;                 \
- 		     chmod a+x $@;					  \
-                      rm -f $(obj)/klibc-???????????????????????????.so;   \
-                      ln -f $@ $(obj)/klibc-$(SOLIBHASH).so

index a360c2e..0f195a3 100644
@@ -9,9 +9,15 @@ do_install_append() {
         install -d ${D}${base_bindir}
         install -d ${D}${base_sbindir}
 
-        # those 2 are always static
-        install -m 755 usr/dash/sh ${D}${base_bindir}/sh
-        install -m 755 usr/kinit/kinit ${D}${base_bindir}/kinit
+        # debian packages kinit + kinit.shared but only sh.shared
+        if [ "${KLIBC_UTILS_VARIANT}" = "shared" ]; then
+            install -m 755 usr/kinit/kinit ${D}${base_bindir}/kinit
+            install -m 755 usr/kinit/kinit.shared ${D}${base_bindir}/kinit.shared
+            install -m 755 usr/dash/sh.shared ${D}${base_bindir}/sh.shared
+        else
+            install -m 755 usr/dash/sh ${D}${base_bindir}/sh
+            install -m 755 usr/kinit/kinit ${D}${base_bindir}/kinit
+        fi
 
         install -m 755 usr/gzip/gzip ${D}${base_bindir}
         install -m 755 usr/kinit/fstype/${KLIBC_UTILS_VARIANT}/fstype ${D}${base_bindir}

new file mode 100644
index 0000000..b26dda4
@@ -0,0 +1,17 @@
+PR = "${INC_PR}.0"
+
+KLIBC_UTILS_VARIANT = "shared"
+KLIBC_UTILS_PKGNAME = "klibc-utils"
+
+FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:"
+
+do_install() {
+        :
+}
+
+PACKAGES_${PN} = "${PN}"
+FILES_${PN} = ""
+
+require klibc-utils.inc
+require klibc.inc
+require klibc-checksums_${PV}.inc

index 62bf1e7..6654123 100644
@@ -12,7 +12,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 # debugsources.list: No such file or directory:
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
-INC_PR = "r0"
+INC_PR = "r1"
 
 KLIBC_ARCH = '${TARGET_ARCH}'
 KLIBC_ARCH_armeb = 'arm'

@@ -33,7 +33,6 @@ SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \
             file://modprobe.patch \
             file://dash_readopt.patch \
             file://wc.patch \
-            file://no_strip.patch \
             file://staging.patch \
             file://socket.h.patch \
             "

index 124a416..a313bfd 100644
@@ -15,11 +15,6 @@ do_install() {
         find ${D}${base_libdir}/klibc/include -name '.install' -delete
         find ${D}${base_libdir}/klibc/include -name '..install.cmd' -delete
 
-        # only for sh.shared and kinit.shared
-        install -d ${D}${base_bindir}
-        install -m 755 usr/dash/sh.shared ${D}${base_bindir}/sh.shared
-        install -m 755 usr/kinit/kinit.shared ${D}${base_bindir}/kinit.shared
-
         install -d ${D}${base_libdir}
         install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir}
         (cd  ${D}${base_libdir}; ln -s klibc-*.so klibc.so)

@@ -35,6 +30,6 @@ FILES_libklibc-dev = "${base_libdir}/klibc.so \
 # see above
 # do not package it in -dev
 #                      ${base_bindir}/klcc \
-require klibc-utils.inc
+
 require klibc.inc
 require klibc-checksums_${PV}.inc

deleted file mode 100644
index 922c8d8..0000000
@@ -1,33 +0,0 @@
-PR = "${INC_PR}.0"
-
-require klibc.inc
-require klibc-checksums_${PV}.inc
-
-export KLCC_INST = "${STAGING_DIR_TARGET}/lib/klibc"
-
-SRC_URI += "file://klcc_prefix.patch \
-            file://use-env-for-perl.patch"
-
-DEPENDS = "klibc"
-
-FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:"
-
-# ${TARGET_PREFIX}klcc is just a
-# perl wrapper around gcc-cross
-# so give it the same arch and path
-PACKAGE_ARCH = "${TUNE_PKGARCH}"
-
-inherit cross
-
-do_configure () {
-        :
-}
-
-do_compile() {
-        oe_runmake klcc
-}
-
-do_install() {
-        install -d ${D}${base_bindir}
-        install -m 0755 klcc/klcc ${D}${base_bindir}/${TARGET_PREFIX}klcc
-}

new file mode 100644
index 0000000..922c8d8
@@ -0,0 +1,33 @@
+PR = "${INC_PR}.0"
+
+require klibc.inc
+require klibc-checksums_${PV}.inc
+
+export KLCC_INST = "${STAGING_DIR_TARGET}/lib/klibc"
+
+SRC_URI += "file://klcc_prefix.patch \
+            file://use-env-for-perl.patch"
+
+DEPENDS = "klibc"
+
+FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:"
+
+# ${TARGET_PREFIX}klcc is just a
+# perl wrapper around gcc-cross
+# so give it the same arch and path
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
+inherit cross
+
+do_configure () {
+        :
+}
+
+do_compile() {
+        oe_runmake klcc
+}
+
+do_install() {
+        install -d ${D}${base_bindir}
+        install -m 0755 klcc/klcc ${D}${base_bindir}/${TARGET_PREFIX}klcc
+}

111 lines not on this page · raw message

74 lines not on this page · raw message

deleted file mode 100644
index a4a0026..0000000
@@ -1,24 +0,0 @@
-Patch was imported from the OpenEmbedded git server
-(git://git.openembedded.org/openembedded)
-as of commit id a29bf15b9c9c0d15f96c254b2ed830e104ae3436
-Signed-off-by: Andrea Adami <[email protected]>
-
-Index: klibc-1.5.19/klcc/Kbuild
-===================================================================
---- --- klibc-1.5.19.orig/klcc/Kbuild	2010-07-07 14:07:48.000000000 +0200
-+++ --- klibc-1.5.19./klcc/Kbuild	2010-08-18 23:39:23.000000000 +0200
-@@ -22,10 +22,10 @@
- 	$(Q)echo 'EMAIN=$(KLIBCEMAIN)' >> $@
- 	$(Q)echo 'BITSIZE=$(KLIBCBITSIZE)' >> $@
- 	$(Q)echo 'VERSION=$(shell cat $(srctree)/usr/klibc/version)' >> $@
--	$(Q)echo 'prefix=$(INSTALLDIR)' >> $@
--	$(Q)echo 'bindir=$(INSTALLDIR)/$(KCROSS)bin' >> $@
--	$(Q)echo 'libdir=$(INSTALLDIR)/$(KCROSS)lib' >> $@
--	$(Q)echo 'includedir=$(INSTALLDIR)/$(KCROSS)include' >> $@
-+	$(Q)echo 'prefix=$(KLCC_INST)' >> $@
-+	$(Q)echo 'bindir=$(KLCC_INST)/$(KCROSS)bin' >> $@
-+	$(Q)echo 'libdir=$(KLCC_INST)/$(KCROSS)lib' >> $@
-+	$(Q)echo 'includedir=$(KLCC_INST)/$(KCROSS)include' >> $@
- 
- 
- # Generate klcc

deleted file mode 100644
index 316c80a..0000000
@@ -1,14 +0,0 @@
-Patch was imported from the OpenEmbedded git server
-(git://git.openembedded.org/openembedded)
-as of commit id b6764cf32ec93547531130dca364fb95e1c495f4
-Signed-off-by: Thomas Kunze <[email protected]>
-
-diff -Nur klibc-1.5/defconfig klibc-1.5p/defconfig
---- klibc-1.5/defconfig	2007-03-04 02:52:10.000000000 +0100
-+++ klibc-1.5p/defconfig	2008-02-08 19:24:22.337127756 +0100
-@@ -5,4 +5,4 @@
- CONFIG_REGPARM=y
- # ARM options
- # CONFIG_KLIBC_THUMB is not set
--# CONFIG_AEABI is not set
-+CONFIG_AEABI=y

1,984 lines not on this page · raw message

deleted file mode 100644
index c0a94ce..0000000
@@ -1,31 +0,0 @@
-Subject: Add relevant socket.h definitions
-
-* Discussed upstream:
-* http://www.zytor.com/pipermail/klibc/2010-February/002487.html
-* http://www.zytor.com/pipermail/klibc/2010-February/002488.html
-*
-* Was: Add guards for pre 2.6.33 compatibility.
-*
-* Changes for 1.5.24
-* Only include linux/sockios.h for SIOCGIFCONF and SIOCSIFFLAGS
-* requested by kexec-tools when building statically against klibc.
-
-Signed-off-by: Andrea Adami <[email protected]>
-
-Index: klibc-1.5.24/usr/include/sys/socket.h
-===================================================================
---- a/usr/include/sys/socket.h	2011-07-27 15:50:53.000000000 +0200
-+++ b/usr/include/sys/socket.h	2010-05-31 00:44:16.000000000 +0200
-@@ -10,6 +10,12 @@
- #include <klibc/compiler.h>
- #include <klibc/sysconfig.h>
- #include <linux/socket.h>
-+
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <linux/sockios.h>		/* the SIOCxxx I/O controls     */
-+#endif
-+
- #include <linux/uio.h>
- #include <asm/socket.h>
- #if _KLIBC_HAS_ARCHSOCKET_H

153 lines not on this page · raw message

deleted file mode 100644
index eac128c..0000000
@@ -1,25 +0,0 @@
-Patch was imported from the OpenEmbedded git server
-(git://git.openembedded.org/openembedded)
-as of commit id 676cbb54d42c89a4832871064cfcb7ee2ad372ee
-
-klcc-cross: Add patch to use /usr/bin/env perl
-Certain configurations (such as autobuilders) may build in very
-deep paths (that are longer than the #! mechanism allows) which
-makes it unsafe to use the direct path for perl.  In our case we know
-that /usr/bin/env perl will always return ours (if it has been built).
-
-Signed-off-by: Tom Rini <[email protected]>
-
-Index: klibc-1.5.20/klcc/makeklcc.pl
-===================================================================
---- a/klcc/makeklcc.pl
-+++ b/klcc/makeklcc.pl
-@@ -26,7 +26,7 @@ sub pathsearch($) {
-     return undef;
- }
- 
--print "#!${perlpath}\n";
-+print "#!/usr/bin/env perl\n";
- 
- open(KLIBCCONF, "< $klibcconf\0")
-     or die "$0: cannot open $klibcconf: $!\n";

245 lines not on this page · raw message

111 lines not on this page · raw message

74 lines not on this page · raw message

new file mode 100644
index 0000000..a4a0026
@@ -0,0 +1,24 @@
+Patch was imported from the OpenEmbedded git server
+(git://git.openembedded.org/openembedded)
+as of commit id a29bf15b9c9c0d15f96c254b2ed830e104ae3436
+Signed-off-by: Andrea Adami <[email protected]>
+
+Index: klibc-1.5.19/klcc/Kbuild
+===================================================================
+--- --- klibc-1.5.19.orig/klcc/Kbuild	2010-07-07 14:07:48.000000000 +0200
++++ --- klibc-1.5.19./klcc/Kbuild	2010-08-18 23:39:23.000000000 +0200
+@@ -22,10 +22,10 @@
+ 	$(Q)echo 'EMAIN=$(KLIBCEMAIN)' >> $@
+ 	$(Q)echo 'BITSIZE=$(KLIBCBITSIZE)' >> $@
+ 	$(Q)echo 'VERSION=$(shell cat $(srctree)/usr/klibc/version)' >> $@
+-	$(Q)echo 'prefix=$(INSTALLDIR)' >> $@
+-	$(Q)echo 'bindir=$(INSTALLDIR)/$(KCROSS)bin' >> $@
+-	$(Q)echo 'libdir=$(INSTALLDIR)/$(KCROSS)lib' >> $@
+-	$(Q)echo 'includedir=$(INSTALLDIR)/$(KCROSS)include' >> $@
++	$(Q)echo 'prefix=$(KLCC_INST)' >> $@
++	$(Q)echo 'bindir=$(KLCC_INST)/$(KCROSS)bin' >> $@
++	$(Q)echo 'libdir=$(KLCC_INST)/$(KCROSS)lib' >> $@
++	$(Q)echo 'includedir=$(KLCC_INST)/$(KCROSS)include' >> $@
+ 
+ 
+ # Generate klcc

new file mode 100644
index 0000000..316c80a
@@ -0,0 +1,14 @@
+Patch was imported from the OpenEmbedded git server
+(git://git.openembedded.org/openembedded)
+as of commit id b6764cf32ec93547531130dca364fb95e1c495f4
+Signed-off-by: Thomas Kunze <[email protected]>
+
+diff -Nur klibc-1.5/defconfig klibc-1.5p/defconfig
+--- klibc-1.5/defconfig	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5p/defconfig	2008-02-08 19:24:22.337127756 +0100
+@@ -5,4 +5,4 @@
+ CONFIG_REGPARM=y
+ # ARM options
+ # CONFIG_KLIBC_THUMB is not set
+-# CONFIG_AEABI is not set
++CONFIG_AEABI=y

50 lines not on this page · raw message

153 lines not on this page · raw message

new file mode 100644
index 0000000..eac128c

Lines of this file are not shown. View the raw message.

245 lines not on this page · raw message

deleted file mode 100644
index 31ed66b..0000000

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..ebba658

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index c9749f0..0000000

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..c9749f0

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index b26dda4..0000000

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..b26dda4

Lines of this file are not shown. View the raw message.

index 6654123..1b1f7c6 100644

Lines of this file are not shown. View the raw message.

deleted file mode 100644
index a313bfd..0000000

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..a313bfd

Lines of this file are not shown. View the raw message.