From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- .../recipes-core/newlib/libgloss_3.0.0.bb | 27 ---------- .../meta-xilinx-bsp/recipes-core/newlib/newlib.inc | 58 ---------------------- .../recipes-core/newlib/newlib_3.0.0.bb | 19 ------- 3 files changed, 104 deletions(-) delete mode 100644 meta-xilinx/meta-xilinx-bsp/recipes-core/newlib/libgloss_3.0.0.bb delete mode 100644 meta-xilinx/meta-xilinx-bsp/recipes-core/newlib/newlib.inc delete mode 100644 meta-xilinx/meta-xilinx-bsp/recipes-core/newlib/newlib_3.0.0.bb (limited to 'meta-xilinx/meta-xilinx-bsp/recipes-core/newlib') diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-core/newlib/libgloss_3.0.0.bb b/meta-xilinx/meta-xilinx-bsp/recipes-core/newlib/libgloss_3.0.0.bb deleted file mode 100644 index cff4a265b..000000000 --- a/meta-xilinx/meta-xilinx-bsp/recipes-core/newlib/libgloss_3.0.0.bb +++ /dev/null @@ -1,27 +0,0 @@ - -require newlib.inc - -DEPENDS += "newlib" - -do_configure() { - ${S}/libgloss/configure ${EXTRA_OECONF} -} - -do_install_prepend() { - # install doesn't create this itself, avoid install error - install -d ${D}${prefix}/${TARGET_SYS}/lib -} - -do_install_append() { - # Move libs to default directories so they can be picked up later - mv -v ${D}${prefix}/${TARGET_SYS}/lib ${D}${libdir} - - # Remove original directory - rmdir ${D}${prefix}/${TARGET_SYS} -} - -# Split packages correctly -FILES_${PN} += "${libdir}/*.ld ${libdir}/*.specs" - -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-core/newlib/newlib.inc b/meta-xilinx/meta-xilinx-bsp/recipes-core/newlib/newlib.inc deleted file mode 100644 index 37ad6be11..000000000 --- a/meta-xilinx/meta-xilinx-bsp/recipes-core/newlib/newlib.inc +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "Newlib is a C library intended for use on embedded systems" -HOMEPAGE = "https://sourceware.org/newlib/" -DESCRIPTION = "It is a conglomeration of several library parts, all under free software licenses that make them easily usable on embedded products." -SECTION = "libs" - -LICENSE = "GPLv2 & LGPLv3 & GPLv3 & LGPLv2" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LIBGLOSS;md5=73f5c98779aea7dba4a6c94a74ab0ae2 \ - file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://COPYING.NEWLIB;md5=956a4b1487f7677cdcceeee8f05a21f0 \ - file://newlib/libc/posix/COPYRIGHT;md5=103468ff1982be840fdf4ee9f8b51bbf \ - file://newlib/libc/sys/linux/linuxthreads/LICENSE;md5=73640207fbc79b198c7ffd4ad4d97aa0 \ - " - -SRC_URI = "ftp://sourceware.org/pub/newlib/newlib-${PV}.tar.gz" -SRC_URI[md5sum] = "81ec873108b8593c586f91ca65963952" -SRC_URI[sha256sum] = "c8566335ee74e5fcaeb8595b4ebd0400c4b043d6acb3263ecb1314f8f5501332" - -INHIBIT_DEFAULT_DEPS = "1" -DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial" - -PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" -STAGINGCC = "${MLPREFIX}gcc-cross-initial-${TARGET_ARCH}" - -S = "${WORKDIR}/newlib-${PV}" -B = "${WORKDIR}/build" - -# Disable use of a link hash style -TARGET_LINK_HASH_STYLE_microblaze = "" - -# disable stdlib -TARGET_CC_ARCH_append = " -nostdlib" - -EXTRA_OECONF = " \ - --build=${BUILD_SYS} \ - --target=${TARGET_SYS} \ - --host=${HOST_SYS} \ - --prefix=${prefix} \ - --exec-prefix=${exec_prefix} \ - --bindir=${bindir} \ - --libdir=${libdir} \ - --includedir=${includedir} \ - --enable-languages=c \ - --with-newlib \ - --with-gnu-as \ - --with-gnu-ld \ - --disable-multilib \ - " - -do_configure[cleandirs] = "${B}" - -do_install() { - oe_runmake install DESTDIR='${D}' -} - diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-core/newlib/newlib_3.0.0.bb b/meta-xilinx/meta-xilinx-bsp/recipes-core/newlib/newlib_3.0.0.bb deleted file mode 100644 index 3d313503f..000000000 --- a/meta-xilinx/meta-xilinx-bsp/recipes-core/newlib/newlib_3.0.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -require newlib.inc - -do_configure_prepend_microblaze() { - # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC) - export CC="${CC} -L${S}/libgloss/microblaze" -} - -do_configure() { - ${S}/configure ${EXTRA_OECONF} -} - -do_install_append() { - # Move include files and libs to default directories so they can be picked up later - mv -v ${D}${prefix}/${TARGET_SYS}/lib ${D}${libdir} - mv -v ${D}${prefix}/${TARGET_SYS}/include ${D}${includedir} - - # Remove original directory - rmdir ${D}${prefix}/${TARGET_SYS} -} -- cgit v1.2.3