Skip to contentSkip to conversation

klibc: fix runtime dependencies for shared utils

PATCH New Andrea Adami 1 participant 5 messages Aug 12, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 klibc: fix runtime dependencies for shared utils

* and remove bogus dependencies for the static utils
* introduced by do_split_packages
* bump INC_PR

---
 .../recipes-devtools/klibc/klibc-utils.inc         |   42 +++++++++++++++++++-
 meta-initramfs/recipes-devtools/klibc/klibc.inc    |    4 +-
 2 files changed, 43 insertions(+), 3 deletions(-)
meta-initramfs/recipes-devtools/klibc/klibc-utils.inc +40 -2
index 8ce3d77..c7e36e3 100644
@@ -58,13 +58,51 @@ do_install_append() {
         ln -s gzip ${D}${base_bindir}/zcat
 }
 
+RDEPENDS_klibc-utils-cat = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-chroot = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-cpio = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-dd = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-dmesg = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-false = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-fstype = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-gzip = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-halt = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-ipconfig = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-kill = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-kinit.shared = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-ln = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-losetup = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-ls = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-minips = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-mkdir = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-mkfifo = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-mknod = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-modprobe = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-mount = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-mv = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-nfsmount = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-nuke = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-pivot-root = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-poweroff = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-readlink = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-reboot = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-resume = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-run-init = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-sh.shared = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-sleep = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-sync = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-true = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-umount = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-uname = "${THIS_LIBKLIBC}"
+RDEPENDS_klibc-utils-wc = "${THIS_LIBKLIBC}"
+
 PACKAGES_DYNAMIC = "${KLIBC_UTILS_PKGNAME}-*"
 
 python populate_packages_prepend () {
 
     base_bin_dir = bb.data.expand('${base_bindir}', d)
-    do_split_packages(d, base_bin_dir, '(.*)', '${KLIBC_UTILS_PKGNAME}-%s', 'Klibc util for %s', allow_links=True, allow_dirs=True)
+    do_split_packages(d, base_bin_dir, '(.*)', '${KLIBC_UTILS_PKGNAME}-%s', 'Klibc util for %s', extra_depends='', allow_links=True, allow_dirs=True)
 
     base_sbin_dir = bb.data.expand('${base_sbindir}', d)
-    do_split_packages(d, base_sbin_dir, '(.*)', '${KLIBC_UTILS_PKGNAME}-%s', 'Klibc util for %s', allow_dirs=True)
+    do_split_packages(d, base_sbin_dir, '(.*)', '${KLIBC_UTILS_PKGNAME}-%s', 'Klibc util for %s', extra_depends='', allow_dirs=True)
 }
meta-initramfs/recipes-devtools/klibc/klibc.inc +3 -1
index 7741a58..4963a29 100644
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://usr/klibc/LICENSE;md5=d75181f10e998c21eb147f6d2e43ce8
 # 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'
@@ -47,3 +47,5 @@ do_configure () {
 
         ln -sf "${STAGING_DIR_TARGET}${exec_prefix}" linux
 }
+
+THIS_LIBKLIBC = "libklibc (= ${PV}-${PR})"
Signature · 1 line
1.7.8.6
#1 lore raw

PATCH 2/2 klibc: upgrade from 2.0 to 2.0.1

* remove unused patches legacy of oe-classic

---
 .../recipes-devtools/klibc/klcc-cross_2.0.1.bb     |   27 +
 .../recipes-devtools/klibc/klcc-cross_2.0.bb       |   27 -
 .../klibc/klibc-2.0.1/klcc_prefix.patch            |   24 +
 .../klibc/klibc-2.0.1/klibc-config-eabi.patch      |   14 +
 .../klibc/klibc-2.0.1/klibc-linux-libc-dev.patch   |   23 +
 .../klibc/klibc-2.0.1/prefix.patch                 |   14 +
 .../klibc/klibc-2.0.1/staging.patch                |  144 ++
 .../klibc/klibc-2.0.1/use-env-for-perl.patch       |   25 +
 .../klibc/klibc-2.0/dash_readopt.patch             |  111 --
 .../fstype-sane-vfat-and-jffs2-for-1.5.patch       |   74 -
 .../klibc/klibc-2.0/klcc_prefix.patch              |   24 -
 .../klibc/klibc-2.0/klibc-config-eabi.patch        |   14 -
 .../klibc/klibc-2.0/klibc-linux-libc-dev.patch     |   23 -
 .../klibc/klibc-2.0/modprobe.patch                 | 1984 --------------------
 .../recipes-devtools/klibc/klibc-2.0/prefix.patch  |   14 -
 .../recipes-devtools/klibc/klibc-2.0/staging.patch |  144 --
 .../klibc/klibc-2.0/use-env-for-perl.patch         |   25 -
 .../recipes-devtools/klibc/klibc-2.0/wc.patch      |  245 ---
 .../klibc/klibc-static-utils_2.0.1.bb              |   16 +
 .../klibc/klibc-static-utils_2.0.bb                |   16 -
 .../recipes-devtools/klibc/klibc-utils.inc         |    4 -
 .../recipes-devtools/klibc/klibc-utils_2.0.1.bb    |   16 +
 .../recipes-devtools/klibc/klibc-utils_2.0.bb      |   16 -
 meta-initramfs/recipes-devtools/klibc/klibc.inc    |    8 +-
 .../recipes-devtools/klibc/klibc_2.0.1.bb          |   28 +
 meta-initramfs/recipes-devtools/klibc/klibc_2.0.bb |   28 -
 26 files changed, 333 insertions(+), 2755 deletions(-)
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.1.bb
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.bb
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/klcc_prefix.patch
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/klibc-config-eabi.patch
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/klibc-linux-libc-dev.patch
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/prefix.patch
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/staging.patch
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/use-env-for-perl.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/dash_readopt.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/fstype-sane-vfat-and-jffs2-for-1.5.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/klcc_prefix.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/klibc-config-eabi.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/klibc-linux-libc-dev.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/modprobe.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/prefix.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/staging.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/use-env-for-perl.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/wc.patch
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.1.bb
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.bb
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.1.bb
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.bb
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc_2.0.1.bb
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc_2.0.bb
meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.1.bb new file +27 -0
new file mode 100644
index 0000000..56456f7
@@ -0,0 +1,27 @@
+PR = "${INC_PR}.0"
+
+require klibc.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}:"
+
+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
+}
meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.bb deleted +0 -27
deleted file mode 100644
index 56456f7..0000000
@@ -1,27 +0,0 @@
-PR = "${INC_PR}.0"
-
-require klibc.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}:"
-
-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
-}
meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/klcc_prefix.patch new file +24 -0
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
meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/klibc-config-eabi.patch new file +14 -0
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
meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/klibc-linux-libc-dev.patch new file +23 -0
new file mode 100644
index 0000000..3c55e14
@@ -0,0 +1,23 @@
+commit 43adf69062254fb4f8d4d11fb5fe36a60ae25d5a
+Author: Ben Hutchings <[email protected]>
+Date:   Sun Mar 14 18:41:56 2010 +0000
+
+    Taken from debian "Fix klibc Debian specific build trouble"
+
+Index: klibc-2.0~rc2/scripts/Kbuild.install
+===================================================================
+--- klibc-2.0~rc2.orig/scripts/Kbuild.install	2012-02-11 18:50:21.000000000 +0000
++++ klibc-2.0~rc2/scripts/Kbuild.install	2012-02-11 19:04:52.000000000 +0000
+@@ -95,8 +95,11 @@
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
+-	$(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
++	$(Q)for x in $(KLIBCKERNELSRC)/include/asm $(KLIBCKERNELSRC)/include/asm* $(KLIBCKERNELSRC)/include/linux $(KLIBCKERNELSRC)/include/mtd; do \
++		ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \
++	done
+ 	$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
++	$(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ 	$(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
+ 	$(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
+ 
meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/prefix.patch new file +14 -0
new file mode 100644
index 0000000..6f5ff0d
@@ -0,0 +1,14 @@
+Index: klibc-1.5.24/Makefile
+===================================================================
+--- a/Makefile	2011-07-27 15:50:53.000000000 +0200
++++ b/Makefile	2011-08-01 00:47:56.000000000 +0200
+@@ -39,7 +39,7 @@
+ export PERL       := perl
+ 
+ # Location for installation
+-export prefix      = /usr
++export prefix      = $(INST)
+ export bindir      = $(prefix)/bin
+ export libdir      = $(prefix)/lib
+ export mandir      = $(prefix)/man
+
meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/staging.patch new file +144 -0

144 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/use-env-for-perl.patch new file +25 -0
new file mode 100644
index 0000000..eac128c
@@ -0,0 +1,25 @@
+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";
meta-initramfs/recipes-devtools/klibc/klibc-2.0/dash_readopt.patch deleted +0 -111

111 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-2.0/fstype-sane-vfat-and-jffs2-for-1.5.patch deleted +0 -74

74 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-2.0/klcc_prefix.patch deleted +0 -24
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
meta-initramfs/recipes-devtools/klibc/klibc-2.0/klibc-config-eabi.patch deleted +0 -14
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
meta-initramfs/recipes-devtools/klibc/klibc-2.0/klibc-linux-libc-dev.patch deleted +0 -23
deleted file mode 100644
index 3c55e14..0000000
@@ -1,23 +0,0 @@
-commit 43adf69062254fb4f8d4d11fb5fe36a60ae25d5a
-Author: Ben Hutchings <[email protected]>
-Date:   Sun Mar 14 18:41:56 2010 +0000
-
-    Taken from debian "Fix klibc Debian specific build trouble"
-
-Index: klibc-2.0~rc2/scripts/Kbuild.install
-===================================================================
---- klibc-2.0~rc2.orig/scripts/Kbuild.install	2012-02-11 18:50:21.000000000 +0000
-+++ klibc-2.0~rc2/scripts/Kbuild.install	2012-02-11 19:04:52.000000000 +0000
-@@ -95,8 +95,11 @@
- 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
- 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
- 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
--	$(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
-+	$(Q)for x in $(KLIBCKERNELSRC)/include/asm $(KLIBCKERNELSRC)/include/asm* $(KLIBCKERNELSRC)/include/linux $(KLIBCKERNELSRC)/include/mtd; do \
-+		ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \
-+	done
- 	$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
-+	$(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
- 	$(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
- 	$(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
- 
meta-initramfs/recipes-devtools/klibc/klibc-2.0/modprobe.patch deleted +0 -1984

1,984 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-2.0/prefix.patch deleted +0 -14
deleted file mode 100644
index 6f5ff0d..0000000
@@ -1,14 +0,0 @@
-Index: klibc-1.5.24/Makefile
-===================================================================
---- a/Makefile	2011-07-27 15:50:53.000000000 +0200
-+++ b/Makefile	2011-08-01 00:47:56.000000000 +0200
-@@ -39,7 +39,7 @@
- export PERL       := perl
- 
- # Location for installation
--export prefix      = /usr
-+export prefix      = $(INST)
- export bindir      = $(prefix)/bin
- export libdir      = $(prefix)/lib
- export mandir      = $(prefix)/man
-
meta-initramfs/recipes-devtools/klibc/klibc-2.0/staging.patch deleted +0 -144

144 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-2.0/use-env-for-perl.patch deleted +0 -25
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";
meta-initramfs/recipes-devtools/klibc/klibc-2.0/wc.patch deleted +0 -245

245 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.1.bb new file +16 -0
new file mode 100644
index 0000000..484134e
@@ -0,0 +1,16 @@
+PR = "${INC_PR}.0"
+
+KLIBC_UTILS_VARIANT = "static"
+KLIBC_UTILS_PKGNAME = "klibc-static-utils"
+
+FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:"
+
+do_install() {
+        :
+}
+
+PACKAGES_${PN} = "${PN}"
+FILES_${PN} = ""
+
+require klibc-utils.inc
+require klibc.inc
meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.bb deleted +0 -16
deleted file mode 100644
index 484134e..0000000
@@ -1,16 +0,0 @@
-PR = "${INC_PR}.0"
-
-KLIBC_UTILS_VARIANT = "static"
-KLIBC_UTILS_PKGNAME = "klibc-static-utils"
-
-FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:"
-
-do_install() {
-        :
-}
-
-PACKAGES_${PN} = "${PN}"
-FILES_${PN} = ""
-
-require klibc-utils.inc
-require klibc.inc
meta-initramfs/recipes-devtools/klibc/klibc-utils.inc +0 -4
index c7e36e3..cd55dc2 100644
@@ -40,7 +40,6 @@ do_install_append() {
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkdir ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkfifo ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mknod ${D}${base_bindir}
-        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/modprobe ${D}${base_sbindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mount ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mv ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/nuke ${D}${base_bindir}
@@ -53,7 +52,6 @@ do_install_append() {
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/true ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/umount ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/uname ${D}${base_bindir}
-        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/wc ${D}${base_bindir}
         ln -s gzip ${D}${base_bindir}/gunzip
[… more lines in the raw message]

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

meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.1.bb new file +16 -0
new file mode 100644
index 0000000..37cab84

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

meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.bb deleted +0 -16
deleted file mode 100644
index 37cab84..0000000

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

meta-initramfs/recipes-devtools/klibc/klibc.inc +2 -6
index 4963a29..3ec603c 100644

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

meta-initramfs/recipes-devtools/klibc/klibc_2.0.1.bb new file +28 -0
new file mode 100644
index 0000000..8eaab2c

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

meta-initramfs/recipes-devtools/klibc/klibc_2.0.bb deleted +0 -28
deleted file mode 100644
index 8eaab2c..0000000

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

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.8.6

Part of the diff is not shown here. View the raw message.

#2 lore raw

PATCH v2 2/2 klibc: upgrade from 2.0 to 2.0.

* remove unused patches legacy of oe-classic

---
 .../recipes-devtools/klibc/klcc-cross_2.0.1.bb     |   27 +
 .../recipes-devtools/klibc/klcc-cross_2.0.bb       |   27 -
 .../klibc/klibc-2.0.1/klcc_prefix.patch            |   24 +
 .../klibc/klibc-2.0.1/klibc-config-eabi.patch      |   14 +
 .../klibc/klibc-2.0.1/klibc-linux-libc-dev.patch   |   23 +
 .../klibc/klibc-2.0.1/prefix.patch                 |   14 +
 .../klibc/klibc-2.0.1/staging.patch                |  144 ++
 .../klibc/klibc-2.0.1/use-env-for-perl.patch       |   25 +
 .../klibc/klibc-2.0/dash_readopt.patch             |  111 --
 .../fstype-sane-vfat-and-jffs2-for-1.5.patch       |   74 -
 .../klibc/klibc-2.0/klcc_prefix.patch              |   24 -
 .../klibc/klibc-2.0/klibc-config-eabi.patch        |   14 -
 .../klibc/klibc-2.0/klibc-linux-libc-dev.patch     |   23 -
 .../klibc/klibc-2.0/modprobe.patch                 | 1984 --------------------
 .../recipes-devtools/klibc/klibc-2.0/prefix.patch  |   14 -
 .../recipes-devtools/klibc/klibc-2.0/staging.patch |  144 --
 .../klibc/klibc-2.0/use-env-for-perl.patch         |   25 -
 .../recipes-devtools/klibc/klibc-2.0/wc.patch      |  245 ---
 .../klibc/klibc-static-utils_2.0.1.bb              |   16 +
 .../klibc/klibc-static-utils_2.0.bb                |   16 -
 .../recipes-devtools/klibc/klibc-utils.inc         |    4 -
 .../recipes-devtools/klibc/klibc-utils_2.0.1.bb    |   16 +
 .../recipes-devtools/klibc/klibc-utils_2.0.bb      |   16 -
 meta-initramfs/recipes-devtools/klibc/klibc.inc    |   10 +-
 .../recipes-devtools/klibc/klibc_2.0.1.bb          |   28 +
 meta-initramfs/recipes-devtools/klibc/klibc_2.0.bb |   28 -
 26 files changed, 334 insertions(+), 2756 deletions(-)
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.1.bb
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.bb
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/klcc_prefix.patch
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/klibc-config-eabi.patch
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/klibc-linux-libc-dev.patch
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/prefix.patch
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/staging.patch
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/use-env-for-perl.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/dash_readopt.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/fstype-sane-vfat-and-jffs2-for-1.5.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/klcc_prefix.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/klibc-config-eabi.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/klibc-linux-libc-dev.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/modprobe.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/prefix.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/staging.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/use-env-for-perl.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/wc.patch
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.1.bb
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.bb
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.1.bb
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.bb
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc_2.0.1.bb
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc_2.0.bb
meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.1.bb new file +27 -0
new file mode 100644
index 0000000..56456f7
@@ -0,0 +1,27 @@
+PR = "${INC_PR}.0"
+
+require klibc.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}:"
+
+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
+}
meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.bb deleted +0 -27
deleted file mode 100644
index 56456f7..0000000
@@ -1,27 +0,0 @@
-PR = "${INC_PR}.0"
-
-require klibc.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}:"
-
-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
-}
meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/klcc_prefix.patch new file +24 -0
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
meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/klibc-config-eabi.patch new file +14 -0
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
meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/klibc-linux-libc-dev.patch new file +23 -0
new file mode 100644
index 0000000..3c55e14
@@ -0,0 +1,23 @@
+commit 43adf69062254fb4f8d4d11fb5fe36a60ae25d5a
+Author: Ben Hutchings <[email protected]>
+Date:   Sun Mar 14 18:41:56 2010 +0000
+
+    Taken from debian "Fix klibc Debian specific build trouble"
+
+Index: klibc-2.0~rc2/scripts/Kbuild.install
+===================================================================
+--- klibc-2.0~rc2.orig/scripts/Kbuild.install	2012-02-11 18:50:21.000000000 +0000
++++ klibc-2.0~rc2/scripts/Kbuild.install	2012-02-11 19:04:52.000000000 +0000
+@@ -95,8 +95,11 @@
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
+-	$(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
++	$(Q)for x in $(KLIBCKERNELSRC)/include/asm $(KLIBCKERNELSRC)/include/asm* $(KLIBCKERNELSRC)/include/linux $(KLIBCKERNELSRC)/include/mtd; do \
++		ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \
++	done
+ 	$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
++	$(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ 	$(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
+ 	$(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
+ 
meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/prefix.patch new file +14 -0
new file mode 100644
index 0000000..6f5ff0d
@@ -0,0 +1,14 @@
+Index: klibc-1.5.24/Makefile
+===================================================================
+--- a/Makefile	2011-07-27 15:50:53.000000000 +0200
++++ b/Makefile	2011-08-01 00:47:56.000000000 +0200
+@@ -39,7 +39,7 @@
+ export PERL       := perl
+ 
+ # Location for installation
+-export prefix      = /usr
++export prefix      = $(INST)
+ export bindir      = $(prefix)/bin
+ export libdir      = $(prefix)/lib
+ export mandir      = $(prefix)/man
+
meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/staging.patch new file +144 -0

144 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/use-env-for-perl.patch new file +25 -0
new file mode 100644
index 0000000..eac128c
@@ -0,0 +1,25 @@
+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";
meta-initramfs/recipes-devtools/klibc/klibc-2.0/dash_readopt.patch deleted +0 -111

111 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-2.0/fstype-sane-vfat-and-jffs2-for-1.5.patch deleted +0 -74

74 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-2.0/klcc_prefix.patch deleted +0 -24
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
meta-initramfs/recipes-devtools/klibc/klibc-2.0/klibc-config-eabi.patch deleted +0 -14
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
meta-initramfs/recipes-devtools/klibc/klibc-2.0/klibc-linux-libc-dev.patch deleted +0 -23
deleted file mode 100644
index 3c55e14..0000000
@@ -1,23 +0,0 @@
-commit 43adf69062254fb4f8d4d11fb5fe36a60ae25d5a
-Author: Ben Hutchings <[email protected]>
-Date:   Sun Mar 14 18:41:56 2010 +0000
-
-    Taken from debian "Fix klibc Debian specific build trouble"
-
-Index: klibc-2.0~rc2/scripts/Kbuild.install
-===================================================================
---- klibc-2.0~rc2.orig/scripts/Kbuild.install	2012-02-11 18:50:21.000000000 +0000
-+++ klibc-2.0~rc2/scripts/Kbuild.install	2012-02-11 19:04:52.000000000 +0000
-@@ -95,8 +95,11 @@
- 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
- 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
- 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
--	$(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
-+	$(Q)for x in $(KLIBCKERNELSRC)/include/asm $(KLIBCKERNELSRC)/include/asm* $(KLIBCKERNELSRC)/include/linux $(KLIBCKERNELSRC)/include/mtd; do \
-+		ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \
-+	done
- 	$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
-+	$(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
- 	$(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
- 	$(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
- 
meta-initramfs/recipes-devtools/klibc/klibc-2.0/modprobe.patch deleted +0 -1984

1,984 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-2.0/prefix.patch deleted +0 -14
deleted file mode 100644
index 6f5ff0d..0000000
@@ -1,14 +0,0 @@
-Index: klibc-1.5.24/Makefile
-===================================================================
---- a/Makefile	2011-07-27 15:50:53.000000000 +0200
-+++ b/Makefile	2011-08-01 00:47:56.000000000 +0200
-@@ -39,7 +39,7 @@
- export PERL       := perl
- 
- # Location for installation
--export prefix      = /usr
-+export prefix      = $(INST)
- export bindir      = $(prefix)/bin
- export libdir      = $(prefix)/lib
- export mandir      = $(prefix)/man
-
meta-initramfs/recipes-devtools/klibc/klibc-2.0/staging.patch deleted +0 -144

144 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-2.0/use-env-for-perl.patch deleted +0 -25
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";
meta-initramfs/recipes-devtools/klibc/klibc-2.0/wc.patch deleted +0 -245

245 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.1.bb new file +16 -0
new file mode 100644
index 0000000..484134e
@@ -0,0 +1,16 @@
+PR = "${INC_PR}.0"
+
+KLIBC_UTILS_VARIANT = "static"
+KLIBC_UTILS_PKGNAME = "klibc-static-utils"
+
+FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:"
+
+do_install() {
+        :
+}
+
+PACKAGES_${PN} = "${PN}"
+FILES_${PN} = ""
+
+require klibc-utils.inc
+require klibc.inc
meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.bb deleted +0 -16
deleted file mode 100644
index 484134e..0000000
@@ -1,16 +0,0 @@
-PR = "${INC_PR}.0"
-
-KLIBC_UTILS_VARIANT = "static"
-KLIBC_UTILS_PKGNAME = "klibc-static-utils"
-
-FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:"
-
-do_install() {
-        :
-}
-
-PACKAGES_${PN} = "${PN}"
-FILES_${PN} = ""
-
-require klibc-utils.inc
-require klibc.inc
meta-initramfs/recipes-devtools/klibc/klibc-utils.inc +0 -4
index c7e36e3..cd55dc2 100644
@@ -40,7 +40,6 @@ do_install_append() {
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkdir ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkfifo ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mknod ${D}${base_bindir}
-        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/modprobe ${D}${base_sbindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mount ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mv ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/nuke ${D}${base_bindir}
@@ -53,7 +52,6 @@ do_install_append() {
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/true ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/umount ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/uname ${D}${base_bindir}
-        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/wc ${D}${base_bindir}
         ln -s gzip ${D}${base_bindir}/gunzip
[… more lines in the raw message]

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

meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.1.bb new file +16 -0
new file mode 100644
index 0000000..37cab84

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

meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.bb deleted +0 -16
deleted file mode 100644
index 37cab84..0000000

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

meta-initramfs/recipes-devtools/klibc/klibc.inc +3 -7
index 4963a29..b1f531a 100644

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

meta-initramfs/recipes-devtools/klibc/klibc_2.0.1.bb new file +28 -0
new file mode 100644
index 0000000..8eaab2c

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

meta-initramfs/recipes-devtools/klibc/klibc_2.0.bb deleted +0 -28
deleted file mode 100644
index 8eaab2c..0000000

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

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.8.6

Part of the diff is not shown here. View the raw message.

#3 lore raw

Re: [meta-oe][meta-initramfs][PATCH v2 2/2] klibc: upgrade from 2.0 to 2.0.

my bad, I'll fix description now... v3 coming

Sorry for the noise

Andrea

#4 lore raw

PATCH v3 2/2 klibc: upgrade from 2.0 to 2.0.1

In reply to Andrea Adami

* remove unused patches legacy of oe-classic

---
 .../recipes-devtools/klibc/klcc-cross_2.0.1.bb     |   27 +
 .../recipes-devtools/klibc/klcc-cross_2.0.bb       |   27 -
 .../klibc/klibc-2.0.1/klcc_prefix.patch            |   24 +
 .../klibc/klibc-2.0.1/klibc-config-eabi.patch      |   14 +
 .../klibc/klibc-2.0.1/klibc-linux-libc-dev.patch   |   23 +
 .../klibc/klibc-2.0.1/prefix.patch                 |   14 +
 .../klibc/klibc-2.0.1/staging.patch                |  144 ++
 .../klibc/klibc-2.0.1/use-env-for-perl.patch       |   25 +
 .../klibc/klibc-2.0/dash_readopt.patch             |  111 --
 .../fstype-sane-vfat-and-jffs2-for-1.5.patch       |   74 -
 .../klibc/klibc-2.0/klcc_prefix.patch              |   24 -
 .../klibc/klibc-2.0/klibc-config-eabi.patch        |   14 -
 .../klibc/klibc-2.0/klibc-linux-libc-dev.patch     |   23 -
 .../klibc/klibc-2.0/modprobe.patch                 | 1984 --------------------
 .../recipes-devtools/klibc/klibc-2.0/prefix.patch  |   14 -
 .../recipes-devtools/klibc/klibc-2.0/staging.patch |  144 --
 .../klibc/klibc-2.0/use-env-for-perl.patch         |   25 -
 .../recipes-devtools/klibc/klibc-2.0/wc.patch      |  245 ---
 .../klibc/klibc-static-utils_2.0.1.bb              |   16 +
 .../klibc/klibc-static-utils_2.0.bb                |   16 -
 .../recipes-devtools/klibc/klibc-utils.inc         |    4 -
 .../recipes-devtools/klibc/klibc-utils_2.0.1.bb    |   16 +
 .../recipes-devtools/klibc/klibc-utils_2.0.bb      |   16 -
 meta-initramfs/recipes-devtools/klibc/klibc.inc    |   10 +-
 .../recipes-devtools/klibc/klibc_2.0.1.bb          |   28 +
 meta-initramfs/recipes-devtools/klibc/klibc_2.0.bb |   28 -
 26 files changed, 334 insertions(+), 2756 deletions(-)
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.1.bb
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.bb
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/klcc_prefix.patch
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/klibc-config-eabi.patch
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/klibc-linux-libc-dev.patch
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/prefix.patch
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/staging.patch
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/use-env-for-perl.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/dash_readopt.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/fstype-sane-vfat-and-jffs2-for-1.5.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/klcc_prefix.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/klibc-config-eabi.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/klibc-linux-libc-dev.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/modprobe.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/prefix.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/staging.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/use-env-for-perl.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0/wc.patch
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.1.bb
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.bb
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.1.bb
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.bb
 create mode 100644 meta-initramfs/recipes-devtools/klibc/klibc_2.0.1.bb
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc_2.0.bb
meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.1.bb new file +27 -0
new file mode 100644
index 0000000..56456f7
@@ -0,0 +1,27 @@
+PR = "${INC_PR}.0"
+
+require klibc.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}:"
+
+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
+}
meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.bb deleted +0 -27
deleted file mode 100644
index 56456f7..0000000
@@ -1,27 +0,0 @@
-PR = "${INC_PR}.0"
-
-require klibc.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}:"
-
-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
-}
meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/klcc_prefix.patch new file +24 -0
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
meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/klibc-config-eabi.patch new file +14 -0
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
meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/klibc-linux-libc-dev.patch new file +23 -0
new file mode 100644
index 0000000..3c55e14
@@ -0,0 +1,23 @@
+commit 43adf69062254fb4f8d4d11fb5fe36a60ae25d5a
+Author: Ben Hutchings <[email protected]>
+Date:   Sun Mar 14 18:41:56 2010 +0000
+
+    Taken from debian "Fix klibc Debian specific build trouble"
+
+Index: klibc-2.0~rc2/scripts/Kbuild.install
+===================================================================
+--- klibc-2.0~rc2.orig/scripts/Kbuild.install	2012-02-11 18:50:21.000000000 +0000
++++ klibc-2.0~rc2/scripts/Kbuild.install	2012-02-11 19:04:52.000000000 +0000
+@@ -95,8 +95,11 @@
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
+-	$(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
++	$(Q)for x in $(KLIBCKERNELSRC)/include/asm $(KLIBCKERNELSRC)/include/asm* $(KLIBCKERNELSRC)/include/linux $(KLIBCKERNELSRC)/include/mtd; do \
++		ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \
++	done
+ 	$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
++	$(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ 	$(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
+ 	$(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
+ 
meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/prefix.patch new file +14 -0
new file mode 100644
index 0000000..6f5ff0d
@@ -0,0 +1,14 @@
+Index: klibc-1.5.24/Makefile
+===================================================================
+--- a/Makefile	2011-07-27 15:50:53.000000000 +0200
++++ b/Makefile	2011-08-01 00:47:56.000000000 +0200
+@@ -39,7 +39,7 @@
+ export PERL       := perl
+ 
+ # Location for installation
+-export prefix      = /usr
++export prefix      = $(INST)
+ export bindir      = $(prefix)/bin
+ export libdir      = $(prefix)/lib
+ export mandir      = $(prefix)/man
+
meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/staging.patch new file +144 -0

144 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-2.0.1/use-env-for-perl.patch new file +25 -0
new file mode 100644
index 0000000..eac128c
@@ -0,0 +1,25 @@
+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";
meta-initramfs/recipes-devtools/klibc/klibc-2.0/dash_readopt.patch deleted +0 -111

111 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-2.0/fstype-sane-vfat-and-jffs2-for-1.5.patch deleted +0 -74

74 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-2.0/klcc_prefix.patch deleted +0 -24
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
meta-initramfs/recipes-devtools/klibc/klibc-2.0/klibc-config-eabi.patch deleted +0 -14
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
meta-initramfs/recipes-devtools/klibc/klibc-2.0/klibc-linux-libc-dev.patch deleted +0 -23
deleted file mode 100644
index 3c55e14..0000000
@@ -1,23 +0,0 @@
-commit 43adf69062254fb4f8d4d11fb5fe36a60ae25d5a
-Author: Ben Hutchings <[email protected]>
-Date:   Sun Mar 14 18:41:56 2010 +0000
-
-    Taken from debian "Fix klibc Debian specific build trouble"
-
-Index: klibc-2.0~rc2/scripts/Kbuild.install
-===================================================================
---- klibc-2.0~rc2.orig/scripts/Kbuild.install	2012-02-11 18:50:21.000000000 +0000
-+++ klibc-2.0~rc2/scripts/Kbuild.install	2012-02-11 19:04:52.000000000 +0000
-@@ -95,8 +95,11 @@
- 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
- 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
- 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
--	$(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
-+	$(Q)for x in $(KLIBCKERNELSRC)/include/asm $(KLIBCKERNELSRC)/include/asm* $(KLIBCKERNELSRC)/include/linux $(KLIBCKERNELSRC)/include/mtd; do \
-+		ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \
-+	done
- 	$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
-+	$(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
- 	$(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
- 	$(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
- 
meta-initramfs/recipes-devtools/klibc/klibc-2.0/modprobe.patch deleted +0 -1984

1,984 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-2.0/prefix.patch deleted +0 -14
deleted file mode 100644
index 6f5ff0d..0000000
@@ -1,14 +0,0 @@
-Index: klibc-1.5.24/Makefile
-===================================================================
---- a/Makefile	2011-07-27 15:50:53.000000000 +0200
-+++ b/Makefile	2011-08-01 00:47:56.000000000 +0200
-@@ -39,7 +39,7 @@
- export PERL       := perl
- 
- # Location for installation
--export prefix      = /usr
-+export prefix      = $(INST)
- export bindir      = $(prefix)/bin
- export libdir      = $(prefix)/lib
- export mandir      = $(prefix)/man
-
meta-initramfs/recipes-devtools/klibc/klibc-2.0/staging.patch deleted +0 -144

144 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-2.0/use-env-for-perl.patch deleted +0 -25
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";
meta-initramfs/recipes-devtools/klibc/klibc-2.0/wc.patch deleted +0 -245

245 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.1.bb new file +16 -0
new file mode 100644
index 0000000..484134e
@@ -0,0 +1,16 @@
+PR = "${INC_PR}.0"
+
+KLIBC_UTILS_VARIANT = "static"
+KLIBC_UTILS_PKGNAME = "klibc-static-utils"
+
+FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:"
+
+do_install() {
+        :
+}
+
+PACKAGES_${PN} = "${PN}"
+FILES_${PN} = ""
+
+require klibc-utils.inc
+require klibc.inc
meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.bb deleted +0 -16
deleted file mode 100644
index 484134e..0000000
@@ -1,16 +0,0 @@
-PR = "${INC_PR}.0"
-
-KLIBC_UTILS_VARIANT = "static"
-KLIBC_UTILS_PKGNAME = "klibc-static-utils"
-
-FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:"
-
-do_install() {
-        :
-}
-
-PACKAGES_${PN} = "${PN}"
-FILES_${PN} = ""
-
-require klibc-utils.inc
-require klibc.inc
meta-initramfs/recipes-devtools/klibc/klibc-utils.inc +0 -4
index c7e36e3..cd55dc2 100644
@@ -40,7 +40,6 @@ do_install_append() {
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkdir ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkfifo ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mknod ${D}${base_bindir}
-        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/modprobe ${D}${base_sbindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mount ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mv ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/nuke ${D}${base_bindir}
@@ -53,7 +52,6 @@ do_install_append() {
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/true ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/umount ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/uname ${D}${base_bindir}
-        install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/wc ${D}${base_bindir}
         ln -s gzip ${D}${base_bindir}/gunzip
[… more lines in the raw message]

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

meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.1.bb new file +16 -0
new file mode 100644
index 0000000..37cab84

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

meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.bb deleted +0 -16
deleted file mode 100644
index 37cab84..0000000

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

meta-initramfs/recipes-devtools/klibc/klibc.inc +3 -7
index 4963a29..b1f531a 100644

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

meta-initramfs/recipes-devtools/klibc/klibc_2.0.1.bb new file +28 -0
new file mode 100644
index 0000000..8eaab2c

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

meta-initramfs/recipes-devtools/klibc/klibc_2.0.bb deleted +0 -28
deleted file mode 100644
index 8eaab2c..0000000

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

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.8.6

Part of the diff is not shown here. View the raw message.