From f38fc412321c9cb6c17110d8a8aa6183823b0122 Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Thu, 23 Feb 2017 15:14:03 +0100 Subject: Changes for morty branch (sync with AGL's meta-sota) --- recipes-bsp/u-boot/u-boot_2016.11.bb | 6 ++++ ...eck-for-existence-of-old-file-to-renameat.patch | 40 ---------------------- recipes-devtools/pseudo/files/fallback-group | 2 -- recipes-devtools/pseudo/files/fallback-passwd | 1 - recipes-devtools/pseudo/pseudo_1.7.5.bbappend | 3 -- recipes-devtools/pseudo/pseudo_1.8.1.bb | 20 ----------- recipes-sota/ostree/ostree_git.bb | 14 ++++---- .../rvi-sota-client/rvi-sota-client_git.bb | 1 - recipes-support/libgsystem/libgsystem_git.bb | 8 +++-- recipes-support/lshw/lshw_02.16.bb | 4 +-- 10 files changed, 21 insertions(+), 78 deletions(-) delete mode 100644 recipes-devtools/pseudo/files/0001-Add-check-for-existence-of-old-file-to-renameat.patch delete mode 100644 recipes-devtools/pseudo/files/fallback-group delete mode 100644 recipes-devtools/pseudo/files/fallback-passwd delete mode 100644 recipes-devtools/pseudo/pseudo_1.7.5.bbappend delete mode 100644 recipes-devtools/pseudo/pseudo_1.8.1.bb diff --git a/recipes-bsp/u-boot/u-boot_2016.11.bb b/recipes-bsp/u-boot/u-boot_2016.11.bb index a05b37f..e6e1fcf 100644 --- a/recipes-bsp/u-boot/u-boot_2016.11.bb +++ b/recipes-bsp/u-boot/u-boot_2016.11.bb @@ -5,3 +5,9 @@ DEPENDS += "dtc-native" SRCREV = "5ea3e51fc481613a8dee8c02848d1b42c81ad892" PV = "v2016.11+git${SRCPV}" + +#This patch is not compliant with u-boot 2016.11 +#Version of u-boot from yocto 2.2 Morty is 2016.03 from: +# meta/recipes-bsp/u-boot/u-boot_2016.03.bb +SRC_URI_remove_raspberrypi3 = "file://0003-Include-lowlevel_init.o-for-rpi2.patch" +SRC_URI_remove_raspberrypi2 = "file://0003-Include-lowlevel_init.o-for-rpi2.patch" diff --git a/recipes-devtools/pseudo/files/0001-Add-check-for-existence-of-old-file-to-renameat.patch b/recipes-devtools/pseudo/files/0001-Add-check-for-existence-of-old-file-to-renameat.patch deleted file mode 100644 index 3da2ad7..0000000 --- a/recipes-devtools/pseudo/files/0001-Add-check-for-existence-of-old-file-to-renameat.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 41bb6c818a7ec9eeb33b60302c55c9c5ee393c5f Mon Sep 17 00:00:00 2001 -From: Anton Gerasimov -Date: Fri, 30 Sep 2016 17:12:19 +0200 -Subject: [PATCH 1/1] Add check for existence of old file to renameat - ---- - ports/unix/guts/renameat.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/ports/unix/guts/renameat.c b/ports/unix/guts/renameat.c -index ade0509..d5e36fa 100644 ---- a/ports/unix/guts/renameat.c -+++ b/ports/unix/guts/renameat.c -@@ -11,6 +11,7 @@ - int oldrc, newrc; - int save_errno; - int old_db_entry = 0; -+ int may_unlinked = 0; - - pseudo_debug(PDBGF_FILE, "renameat: %d,%s->%d,%s\n", - olddirfd, oldpath ? oldpath : "", -@@ -44,10 +45,14 @@ - /* as with unlink, we have to mark that the file may get deleted */ - msg = pseudo_client_op(OP_MAY_UNLINK, 0, -1, newdirfd, newpath, newrc ? NULL : &newbuf); - if (msg && msg->result == RESULT_SUCCEED) -+ may_unlinked = 1; -+ msg = pseudo_client_op(OP_STAT, 0, -1, olddirfd, oldpath, oldrc ? NULL : &oldbuf); -+ if (msg && msg->result == RESULT_SUCCEED) - old_db_entry = 1; -+ - rc = real_renameat(olddirfd, oldpath, newdirfd, newpath); - save_errno = errno; -- if (old_db_entry) { -+ if (may_unlinked) { - if (rc == -1) { - /* since we failed, that wasn't really unlinked -- put - * it back. --- -2.9.3 - diff --git a/recipes-devtools/pseudo/files/fallback-group b/recipes-devtools/pseudo/files/fallback-group deleted file mode 100644 index 81bf732..0000000 --- a/recipes-devtools/pseudo/files/fallback-group +++ /dev/null @@ -1,2 +0,0 @@ -root:*:0: -mail:*:8: diff --git a/recipes-devtools/pseudo/files/fallback-passwd b/recipes-devtools/pseudo/files/fallback-passwd deleted file mode 100644 index c1458dc..0000000 --- a/recipes-devtools/pseudo/files/fallback-passwd +++ /dev/null @@ -1 +0,0 @@ -root::0:0:root:/home/root:/bin/sh diff --git a/recipes-devtools/pseudo/pseudo_1.7.5.bbappend b/recipes-devtools/pseudo/pseudo_1.7.5.bbappend deleted file mode 100644 index 73b43df..0000000 --- a/recipes-devtools/pseudo/pseudo_1.7.5.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI += "file://0001-Add-check-for-existence-of-old-file-to-renameat.patch" diff --git a/recipes-devtools/pseudo/pseudo_1.8.1.bb b/recipes-devtools/pseudo/pseudo_1.8.1.bb deleted file mode 100644 index 211439e..0000000 --- a/recipes-devtools/pseudo/pseudo_1.8.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -require recipes-devtools/pseudo/pseudo.inc - -SRC_URI = " \ - http://downloads.yoctoproject.org/releases/pseudo/${BPN}-${PV}.tar.bz2 \ - file://fallback-passwd \ - file://fallback-group \ - file://0001-Add-check-for-existence-of-old-file-to-renameat.patch \ -" - -SRC_URI[md5sum] = "ee38e4fb62ff88ad067b1a5a3825bac7" -SRC_URI[sha256sum] = "dac4ad2d21228053151121320f629d41dd5c0c87695ac4e7aea286c414192ab5" - -PSEUDO_EXTRA_OPTS ?= "--enable-force-async --without-passwd-fallback" - -do_install_append_class-native () { - install -d ${D}${sysconfdir} - # The fallback files should never be modified - install -m 444 ${WORKDIR}/fallback-passwd ${D}${sysconfdir}/passwd - install -m 444 ${WORKDIR}/fallback-group ${D}${sysconfdir}/group -} diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb index 67b5047..5775dfa 100644 --- a/recipes-sota/ostree/ostree_git.bb +++ b/recipes-sota/ostree/ostree_git.bb @@ -8,13 +8,13 @@ INHERIT_remove_class-native = "systemd" SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master" -SRCREV="37c07d2f1c90b12bcfba85a7d900f81a7c362eb4" +SRCREV="6517a8a27a1386e7cb5482e7cb2919fe92721ccf" S = "${WORKDIR}/git" BBCLASSEXTEND = "native" -DEPENDS += "attr libarchive glib-2.0 pkgconfig gpgme libgsystem fuse libsoup-2.4 e2fsprogs" +DEPENDS += "attr libarchive glib-2.0 pkgconfig gpgme libgsystem fuse libsoup-2.4 e2fsprogs gtk-doc-native" DEPENDS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" DEPENDS_remove_class-native = "systemd-native" @@ -27,12 +27,12 @@ EXTRA_OEMAKE = "CFLAGS='-g'" EXTRA_OECONF_append_class-native = " --enable-wrpseudo-compat" SYSTEMD_REQUIRED = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" -SYSTEMD_REQUIRED_class-native = "false" +SYSTEMD_REQUIRED_class-native = "" SYSTEMD_SERVICE_${PN} = "ostree-prepare-root.service ostree-remount.service" SYSTEMD_SERVICE_${PN}_class-native = "" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" PACKAGECONFIG_class-native = "" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-dracut" @@ -42,7 +42,8 @@ export STAGING_INCDIR export STAGING_LIBDIR do_configure() { - NOCONFIGURE=true ./autogen.sh + unset docdir + NOCONFIGURE=1 ./autogen.sh oe_runconf } @@ -54,7 +55,8 @@ do_compile_prepend() { export SYSTEMD_REQUIRED do_install_append() { - if [ "$SYSTEMD_REQUIRED" == "true" ]; then + if [ -n $SYSTEMD_REQUIRED ]; then + install -p -D ${S}/src/boot/ostree-prepare-root.service ${D}${systemd_unitdir}/system/ostree-prepare-root.service install -p -D ${S}/src/boot/ostree-remount.service ${D}${systemd_unitdir}/system/ostree-remount.service fi } diff --git a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb index 15aa7a4..459cf6b 100644 --- a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb +++ b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb @@ -95,7 +95,6 @@ crate://crates.io/winapi/0.2.8 \ crate://crates.io/ws/0.5.3 \ crate://crates.io/ws2_32-sys/0.2.1 \ git://github.com/advancedtelematic/rvi_sota_client \ -crate-index://crates.io/213b1a455d9270888c03a42c8d29975369102caa \ " SRC_URI[index.md5sum] = "79f10f436dbf26737cc80445746f16b4" SRC_URI[index.sha256sum] = "86114b93f1f51aaf0aec3af0751d214b351f4ff9839ba031315c1b19dcbb1913" diff --git a/recipes-support/libgsystem/libgsystem_git.bb b/recipes-support/libgsystem/libgsystem_git.bb index 048c44b..e2b362f 100644 --- a/recipes-support/libgsystem/libgsystem_git.bb +++ b/recipes-support/libgsystem/libgsystem_git.bb @@ -9,9 +9,10 @@ S = "${WORKDIR}/git" inherit autotools-brokensep gobject-introspection -DEPENDS += "attr glib-2.0 pkgconfig libcap xz" - +DEPENDS += "attr glib-2.0 pkgconfig libcap gtk-doc-native gpgme" +RDEPENDS_${PN} = "xz " RDEPENDS_${PN}_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" + RDEPENDS_${PN}_remove_class-native = "systemd-native" BBCLASSEXTEND = "native" @@ -20,7 +21,8 @@ export STAGING_INCDIR export STAGING_LIBDIR do_configure() { - NOCONFIGURE=true ./autogen.sh + #NOCONFIGURE=true ./autogen.sh + autoreconf -vfi oe_runconf } diff --git a/recipes-support/lshw/lshw_02.16.bb b/recipes-support/lshw/lshw_02.16.bb index 0b057bd..53b0d65 100644 --- a/recipes-support/lshw/lshw_02.16.bb +++ b/recipes-support/lshw/lshw_02.16.bb @@ -18,8 +18,8 @@ PR="r1" SRC_URI="http://ezix.org/software/files/lshw-B.${PV}.tar.gz \ file://cross-compile.patch \ - file://ldflags.patch" - + file://ldflags.patch \ + " SRC_URI[md5sum] = "67479167add605e8f001097c30e96d0d" SRC_URI[sha256sum] = "809882429555b93259785cc261dbff04c16c93d064db5f445a51945bc47157cb" -- cgit v1.2.3-54-g00ecf