Skip to contentSkip to conversation

python-pyflame: Disable for risv architecture

PATCH New Khem Raj 1 participant 2 messages Mar 12, 2019

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 python-pyflame: Disable for risv architecture

Not yet supported

---
 meta-python/recipes-devtools/python/python-pyflame.inc | 2 ++
 1 file changed, 2 insertions(+)
meta-python/recipes-devtools/python/python-pyflame.inc +2 -0
index b3b153c57b..d8d8349df1 100644
@@ -14,3 +14,5 @@ COMPATIBLE_HOST_libc-musl_class-target = "null"
 COMPATIBLE_HOST_mipsarch_class-target = "null"
 COMPATIBLE_HOST_aarch64_class-target = "null"
 COMPATIBLE_HOST_powerpc_class-target = "null"
+COMPATIBLE_HOST_riscv64_class-target = "null"
+COMPATIBLE_HOST_riscv32_class-target = "null"
Signature · 1 line
2.21.0
author
#1 lore raw

PATCH 2/2 klibc: Upgrade to 2.0.6 release

Drop staging related patches which are not needed anymore

Cc Andrea Adami <[email protected]>
---
 ...n_-structs-for-non-glibc-system-libs.patch |   0
 ...-ulocked_-fgets-fread-fwrite-aliases.patch |   0
 ...-path-to-compiler-headers-via-isyste.patch |   0
 ...-print-libgcc-file-name-instead-of-p.patch |   0
 .../0001-always-use-bfd-linker.patch          |   0
 ...o-not-set-a-fallback-march-and-mtune.patch |   0
 ...dash-Specify-format-string-in-fmtstr.patch |   0
 ...001-include-linux-sysinfo.h-directly.patch |   0
 ...libc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch |   0
 .../0001-klibc-add-getrandom-syscall.patch    |   0
 ...bc_2.0.4-add-kexec_file_load-syscall.patch |   0
 .../0001-mkfifo-Implement-mkfifo.patch        |   0
 .../armv4-fix-v4bx.patch                      |   0
 .../klcc-consider-sysroot.patch               |   0
 .../klcc-cross-accept-clang-options.patch     |   0
 .../klibc-config-eabi.patch                   |   0
 .../use-env-for-perl.patch                    |   0
 ...lcc-cross_2.0.4.bb => klcc-cross_2.0.6.bb} |   0
 ...c-utils-do-not-build-shared-binaries.patch | 213 ------------------
 .../klibc-2.0.4/klibc-linux-libc-dev.patch    |  29 ---
 .../klibc/klibc-2.0.4/staging.patch           | 151 -------------
 ...s_2.0.4.bb => klibc-static-utils_2.0.6.bb} |   2 -
 .../recipes-devtools/klibc/klibc-utils.inc    |   8 +-
 ...bc-utils_2.0.4.bb => klibc-utils_2.0.6.bb} |   0
 .../recipes-devtools/klibc/klibc.inc          |   4 +-
 .../klibc/{klibc_2.0.4.bb => klibc_2.0.6.bb}  |   2 +
 26 files changed, 7 insertions(+), 402 deletions(-)
 rename meta-initramfs/recipes-devtools/klibc/{klibc-2.0.4 => files}/0001-Define-in_-structs-for-non-glibc-system-libs.patch (100%)
 rename meta-initramfs/recipes-devtools/klibc/{klibc-2.0.4 => files}/0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch (100%)
 rename meta-initramfs/recipes-devtools/klibc/{klibc-2.0.4 => files}/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch (100%)
 rename meta-initramfs/recipes-devtools/klibc/{klibc-2.0.4 => files}/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch (100%)
 rename meta-initramfs/recipes-devtools/klibc/{klibc-2.0.4 => files}/0001-always-use-bfd-linker.patch (100%)
 rename meta-initramfs/recipes-devtools/klibc/{klibc-2.0.4 => files}/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch (100%)
 rename meta-initramfs/recipes-devtools/klibc/{klibc-2.0.4 => files}/0001-dash-Specify-format-string-in-fmtstr.patch (100%)
 rename meta-initramfs/recipes-devtools/klibc/{klibc-2.0.4 => files}/0001-include-linux-sysinfo.h-directly.patch (100%)
 rename meta-initramfs/recipes-devtools/klibc/{klibc-2.0.4 => files}/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch (100%)
 rename meta-initramfs/recipes-devtools/klibc/{klibc-2.0.4 => files}/0001-klibc-add-getrandom-syscall.patch (100%)
 rename meta-initramfs/recipes-devtools/klibc/{klibc-2.0.4 => files}/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch (100%)
 rename meta-initramfs/recipes-devtools/klibc/{klibc-2.0.4 => files}/0001-mkfifo-Implement-mkfifo.patch (100%)
 rename meta-initramfs/recipes-devtools/klibc/{klibc-2.0.4 => files}/armv4-fix-v4bx.patch (100%)
 rename meta-initramfs/recipes-devtools/klibc/{klibc-2.0.4 => files}/klcc-consider-sysroot.patch (100%)
 rename meta-initramfs/recipes-devtools/klibc/{klibc-2.0.4 => files}/klcc-cross-accept-clang-options.patch (100%)
 rename meta-initramfs/recipes-devtools/klibc/{klibc-2.0.4 => files}/klibc-config-eabi.patch (100%)
 rename meta-initramfs/recipes-devtools/klibc/{klibc-2.0.4 => files}/use-env-for-perl.patch (100%)
 rename meta-initramfs/recipes-devtools/klibc/{klcc-cross_2.0.4.bb => klcc-cross_2.0.6.bb} (100%)
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-static-utils-do-not-build-shared-binaries.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-linux-libc-dev.patch
 delete mode 100644 meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch
 rename meta-initramfs/recipes-devtools/klibc/{klibc-static-utils_2.0.4.bb => klibc-static-utils_2.0.6.bb} (80%)
 rename meta-initramfs/recipes-devtools/klibc/{klibc-utils_2.0.4.bb => klibc-utils_2.0.6.bb} (100%)
 rename meta-initramfs/recipes-devtools/klibc/{klibc_2.0.4.bb => klibc_2.0.6.bb} (91%)
meta-initramfs/recipes-devtools/klibc/files/0001-Define-in_-structs-for-non-glibc-system-libs.patch renamed from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Define-in_-structs-for-non-glibc-system-libs.patch +0 -0
similarity index 100%
rename from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Define-in_-structs-for-non-glibc-system-libs.patch
rename to meta-initramfs/recipes-devtools/klibc/files/0001-Define-in_-structs-for-non-glibc-system-libs.patch
meta-initramfs/recipes-devtools/klibc/files/0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch renamed from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch +0 -0
similarity index 100%
rename from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch
rename to meta-initramfs/recipes-devtools/klibc/files/0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch
meta-initramfs/recipes-devtools/klibc/files/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch renamed from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch +0 -0
similarity index 100%
rename from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch
rename to meta-initramfs/recipes-devtools/klibc/files/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch
meta-initramfs/recipes-devtools/klibc/files/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch renamed from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch +0 -0
similarity index 100%
rename from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch
rename to meta-initramfs/recipes-devtools/klibc/files/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch
meta-initramfs/recipes-devtools/klibc/files/0001-always-use-bfd-linker.patch renamed from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-always-use-bfd-linker.patch +0 -0
similarity index 100%
rename from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-always-use-bfd-linker.patch
rename to meta-initramfs/recipes-devtools/klibc/files/0001-always-use-bfd-linker.patch
meta-initramfs/recipes-devtools/klibc/files/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch renamed from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch +0 -0
similarity index 100%
rename from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch
rename to meta-initramfs/recipes-devtools/klibc/files/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch
meta-initramfs/recipes-devtools/klibc/files/0001-dash-Specify-format-string-in-fmtstr.patch renamed from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-dash-Specify-format-string-in-fmtstr.patch +0 -0
similarity index 100%
rename from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-dash-Specify-format-string-in-fmtstr.patch
rename to meta-initramfs/recipes-devtools/klibc/files/0001-dash-Specify-format-string-in-fmtstr.patch
meta-initramfs/recipes-devtools/klibc/files/0001-include-linux-sysinfo.h-directly.patch renamed from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-include-linux-sysinfo.h-directly.patch +0 -0
similarity index 100%
rename from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-include-linux-sysinfo.h-directly.patch
rename to meta-initramfs/recipes-devtools/klibc/files/0001-include-linux-sysinfo.h-directly.patch
meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch renamed from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch +0 -0
similarity index 100%
rename from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch
rename to meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch
meta-initramfs/recipes-devtools/klibc/files/0001-klibc-add-getrandom-syscall.patch renamed from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-add-getrandom-syscall.patch +0 -0
similarity index 100%
rename from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-add-getrandom-syscall.patch
rename to meta-initramfs/recipes-devtools/klibc/files/0001-klibc-add-getrandom-syscall.patch
meta-initramfs/recipes-devtools/klibc/files/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch renamed from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch +0 -0
similarity index 100%
rename from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch
rename to meta-initramfs/recipes-devtools/klibc/files/0001-klibc_2.0.4-add-kexec_file_load-syscall.patch
meta-initramfs/recipes-devtools/klibc/files/0001-mkfifo-Implement-mkfifo.patch renamed from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-mkfifo-Implement-mkfifo.patch +0 -0
similarity index 100%
rename from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-mkfifo-Implement-mkfifo.patch
rename to meta-initramfs/recipes-devtools/klibc/files/0001-mkfifo-Implement-mkfifo.patch
meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch renamed from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/armv4-fix-v4bx.patch +0 -0
similarity index 100%
rename from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/armv4-fix-v4bx.patch
rename to meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch
meta-initramfs/recipes-devtools/klibc/files/klcc-consider-sysroot.patch renamed from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-consider-sysroot.patch +0 -0
similarity index 100%
rename from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-consider-sysroot.patch
rename to meta-initramfs/recipes-devtools/klibc/files/klcc-consider-sysroot.patch
meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch renamed from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-cross-accept-clang-options.patch +0 -0
similarity index 100%
rename from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-cross-accept-clang-options.patch
rename to meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch
meta-initramfs/recipes-devtools/klibc/files/klibc-config-eabi.patch renamed from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-config-eabi.patch +0 -0
similarity index 100%
rename from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-config-eabi.patch
rename to meta-initramfs/recipes-devtools/klibc/files/klibc-config-eabi.patch
meta-initramfs/recipes-devtools/klibc/files/use-env-for-perl.patch renamed from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/use-env-for-perl.patch +0 -0
similarity index 100%
rename from meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/use-env-for-perl.patch
rename to meta-initramfs/recipes-devtools/klibc/files/use-env-for-perl.patch
meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.6.bb renamed from meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb +0 -0
similarity index 100%
rename from meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb
rename to meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.6.bb
meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-klibc-static-utils-do-not-build-shared-binaries.patch deleted +0 -213

213 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-linux-libc-dev.patch deleted +0 -29
deleted file mode 100644
index a5563b7407..0000000000
@@ -1,29 +0,0 @@
-From 1be2bc41f915922102a3ba671b54c2df6f0052e6 Mon Sep 17 00:00:00 2001
-From: Ben Hutchings <[email protected]>
-Date: Sun, 14 Mar 2010 18:41:56 +0000
-Subject: [PATCH] klibc_1.5.26: now build against linux-libc-headers
-
-commit 43adf69062254fb4f8d4d11fb5fe36a60ae25d5a
-
-    Taken from debian "Fix klibc Debian specific build trouble"
-    Adapted for klibc_2.0.2
-
----
- scripts/Kbuild.install | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/scripts/Kbuild.install b/scripts/Kbuild.install
-index 8af5697..d32a8a5 100644
---- a/scripts/Kbuild.install
-+++ b/scripts/Kbuild.install
-@@ -95,7 +95,9 @@ header:
- 	$(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 ../../../include/asm ../../../include/asm-generic ../../../include/linux ../../../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,go-w $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
- 	$(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch deleted +0 -151

151 lines not on this page · raw message

meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.6.bb renamed from meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.4.bb +0 -2
similarity index 80%
rename from meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.4.bb
rename to meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.6.bb
index 16778630c4..35e17b2cc4 100644
@@ -11,8 +11,6 @@ KLIBC_UTILS_PKGNAME = "klibc-static-utils"
 require klibc-utils.inc
 require klibc.inc
 
-SRC_URI += "file://0001-klibc-static-utils-do-not-build-shared-binaries.patch"
-
 # avoid textrel if linking with -pie
 SECURITY_CFLAGS = ""
 SECURITY_LDFLAGS = ""
meta-initramfs/recipes-devtools/klibc/klibc-utils.inc +4 -4
index 2aac9e6ebf..00cb86d3e6 100644
@@ -2,11 +2,11 @@ do_install() {
     install -d ${D}${base_bindir}
     install -d ${D}${base_sbindir}
     if [ "${KLIBC_UTILS_VARIANT}" = "shared" ]; then
-        install -m 755 usr/kinit/kinit.shared ${D}${base_bindir}/kinit.shared
-        install -m 755 usr/dash/sh.shared ${D}${base_bindir}/sh.shared
+        install -m 755 usr/kinit/shared/kinit ${D}${base_bindir}/kinit.shared
+        install -m 755 usr/dash/shared/sh ${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
+        install -m 755 usr/dash/static/sh ${D}${base_bindir}/sh
+        install -m 755 usr/kinit/static/kinit ${D}${base_bindir}/kinit
         install -m 755 usr/gzip/gzip ${D}${base_bindir}
         ln -s gzip ${D}${base_bindir}/gunzip
         ln -s gzip ${D}${base_bindir}/zcat
meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.6.bb renamed from meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.4.bb +0 -0
similarity index 100%
rename from meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.4.bb
rename to meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.6.bb
meta-initramfs/recipes-devtools/klibc/klibc.inc +1 -3
index ec52e9734f..096d4a25bd 100644
@@ -5,12 +5,10 @@ SECTION = "libs"
 LICENSE = "BSD-3-Clause & GPL-2.0 & MIT & Zlib"
 LIC_FILES_CHKSUM = "file://usr/klibc/LICENSE;md5=d75181f10e998c21eb147f6d2e43ce8b"
 DEPENDS = "linux-libc-headers perl-native"
-SRCREV = "4d19974d7020488f63651244e1f9f51727c3f66c"
+SRCREV = "22b36d1ae34416bc48869619cbb0cccb2070f48f"
 
 SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git \
            ${ARMPATCHES} \
-           file://klibc-linux-libc-dev.patch \
-           file://staging.patch \
            file://klcc-consider-sysroot.patch \
            file://klcc-cross-accept-clang-options.patch \
            file://0001-dash-Specify-format-string-in-fmtstr.patch \
meta-initramfs/recipes-devtools/klibc/klibc_2.0.6.bb renamed from meta-initramfs/recipes-devtools/klibc/klibc_2.0.4.bb +2 -0
similarity index 91%
rename from meta-initramfs/recipes-devtools/klibc/klibc_2.0.4.bb
rename to meta-initramfs/recipes-devtools/klibc/klibc_2.0.6.bb
index bc80f382fe..7df0b0a3d5 100644
@@ -10,6 +10,8 @@ do_install() {
     install -d ${D}${libdir}
     install -m 755 usr/klibc/klibc-*.so ${D}${libdir}
     (cd  ${D}${libdir}; ln -s klibc-*.so klibc.so)
+    rm -rf ${D}${exec_prefix}/man
+    rm -rf ${D}${libdir}/klibc/bin
 }
 
 PACKAGES = "libklibc libklibc-staticdev libklibc-dev"
Signature · 1 line
2.21.0