From 316dfdd917bec6a218f431211d28bf8df6b6fb0f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 25 Jun 2018 12:45:53 -0400 Subject: Yocto 2.5 Move OpenBMC to Yocto 2.5(sumo) Signed-off-by: Brad Bishop Change-Id: I5c5ad6904a16e14c1c397f0baf10c9d465594a78 --- .../meta-openembedded/meta-filesystems/README | 47 +- .../meta-filesystems/conf/layer.conf | 2 + ...CK_MODULES-to-found-headers-and-libraries.patch | 42 + .../smbnetfs/smbnetfs/configure.patch | 11 + .../recipes-filesystems/smbnetfs/smbnetfs_git.bb | 33 + .../aufs-util/0001-libau-Define-STRIP-weakly.patch | 10 +- ...dd-tool-concept-to-Makefile-for-cross-com.patch | 17 +- .../aufs-util-don-t-strip-executables.patch | 14 +- .../recipes-utils/xfsdump/xfsdump_3.1.7.bb | 2 + ...d-Check-for-sync_file_range-libc-function.patch | 82 + ...fs-remove-double-underscore-integer-types.patch | 2082 -- ...gs-remove-double-underscore-integer-types.patch | 3800 ---- .../files/remove_flags_from_build_flags.patch | 12 +- .../xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch | 117 - .../recipes-utils/xfsprogs/xfsprogs_4.12.0.bb | 65 - .../recipes-utils/xfsprogs/xfsprogs_4.14.0.bb | 63 + import-layers/meta-openembedded/meta-gnome/README | 33 +- .../meta-gnome/classes/sanity-meta-gnome.bbclass | 10 + .../meta-openembedded/meta-gnome/conf/layer.conf | 6 +- .../network-manager-applet_1.4.4.bb | 36 - .../network-manager-applet_1.8.10.bb | 45 + .../obex/obexd/ssize_t_definition.patch | 24 +- ...C_PRINTF-on-functions-with-format-strings.patch | 62 + ...gnome-doc-utils.make-sysrooted-pkg-config.patch | 51 + .../glade/glade3/0002-fix-gcc-6-build.patch | 39 + .../recipes-devtools/glade/glade3_%.bbappend | 1 - .../recipes-devtools/glade/glade3_3.8.5.bb | 23 + .../recipes-extended/gparted/gparted_0.28.1.bb | 38 - .../recipes-extended/gparted/gparted_0.31.0.bb | 40 + .../recipes-gnome/abiword/abiword_3.0.2.bb | 5 +- ...node-qualify-functions-with-G_GNUC_PRINTF.patch | 49 - .../recipes-gnome/bonobo/files/gcc5.patch | 12 - .../recipes-gnome/bonobo/files/gtk-doc.m4 | 53 - .../recipes-gnome/bonobo/files/gtk-doc.make | 173 - .../meta-gnome/recipes-gnome/bonobo/libbonobo.inc | 30 - .../0001-Remove-use-of-G_DISABLE_DEPRECATED.patch | 47 - .../libbonobo/do-not-use-srcdir-variable.patch | 24 - .../libbonobo/fix-nonliteral-in-string.patch | 26 - .../recipes-gnome/bonobo/libbonobo_2.32.1.bb | 9 - .../recipes-gnome/bonobo/libbonoboui_2.24.5.bb | 23 - .../recipes-gnome/devilspie/devilspie2_0.42.bb | 30 - .../recipes-gnome/devilspie/devilspie2_0.43.bb | 32 + .../devilspie/files/devilspie2.desktop | 1 + ...1-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch | 39 + ...lace-the-Novell-sample-contact-with-somet.patch | 215 - ...x-Fix-signature-for-imapx_tokenise_struct.patch | 33 - ...ists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch | 53 + .../0002-Fix-for-automake-1.12.x.patch | 32 - .../0003-Disable-Werror-for-automake.patch | 97 - ...lace-the-Novell-sample-contact-with-somet.patch | 202 + ...ix-libical-pkg-config-trying-to-use-host-.patch | 39 - ...-soup-adapt-to-new-libxml2-API-from-2.9.0.patch | 77 - ...6-configure.ac-do-not-overwrite-localedir.patch | 34 - .../eds/evolution-data-server_3.26.3.bb | 130 + .../recipes-gnome/eds/evolution-data-server_git.bb | 116 - .../recipes-gnome/evince/evince_3.24.0.bb | 2 + .../recipes-gnome/gdm/gdm/%gconf-tree.xml | 492 - .../meta-gnome/recipes-gnome/gdm/gdm/Default | 96 - .../recipes-gnome/gdm/gdm/cross-xdetection.diff | 96 - .../meta-gnome/recipes-gnome/gdm/gdm/gdm | 89 - .../meta-gnome/recipes-gnome/gdm/gdm/gdm-pam | 11 - .../meta-gnome/recipes-gnome/gdm/gdm/gdm.conf | 80 - .../recipes-gnome/gdm/gdm/gdm.service.in | 10 - .../meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb | 5 +- .../gnome-keyring/gnome-keyring/egg-asn1x.patch | 55 - .../gnome-keyring/gnome-keyring_2.32.1.bb | 56 - .../gnome-keyring/gnome-keyring_3.20.0.bb | 42 + .../gnome-keyring/libgnome-keyring_2.32.0.bb | 20 - .../gnome-keyring/libgnome-keyring_3.12.0.bb | 17 + .../gnome-menus/gnome-menus3_3.10.1.bb | 4 +- .../gnome-mime-data/pkgconfig.patch | 14 - .../gnome-mime-data/gnome-mime-data_2.18.0.bb | 19 - .../files/0001-help-remove-YELP-macro.patch | 28 + .../gnome-system-monitor_3.26.0.bb | 34 + ...kefile.am-remove-DG_DISABLE_DEPRECATED-to.patch | 77 - .../do-not-use-srcdir-variable.patch | 22 - .../gnome-vfs-2.24.4/gconftool-lossage.patch | 13 - .../gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch | 53 - .../recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb | 58 - .../libgnomecups/libgnomecups-0.2.3-cups-1.6.patch | 288 - .../libgnomecups/libgnomecups-0.2.3-glib.h.patch | 42 - .../gtk-engines/files/glib-2.32.patch | 23 - .../gtk-engines/files/substitute-tests.patch | 37 - .../gtk-engines/gtk-engines_2.20.2.bb | 55 - .../gtksourceview-classic-light/classic-light.xml | 131 + .../gtksourceview-classic-light_1.0.bb | 21 + .../gtksourceview/gtksourceview3_3.24.6.bb | 21 + .../meta-gnome/recipes-gnome/gvfs/gvfs_1.32.1.bb | 66 - .../meta-gnome/recipes-gnome/gvfs/gvfs_1.36.0.bb | 68 + .../recipes-gnome/libgdata/libgdata_0.16.1.bb | 8 +- ...nome-Makefile.am-allow-deprecated-symbols.patch | 35 - .../recipes-gnome/libgnome/libgnome_2.32.1.bb | 36 - .../libgnome/libgnomecanvas_2.30.3.bb | 20 - .../recipes-gnome/libgnome/libgnomekbd_3.22.0.bb | 4 +- ...ring-format-literal-warning-to-fix-build-.patch | 78 - .../libgnome/libgnomeui/gnome-stock-pixbufs.h | 4030 ---- .../libgnome/libgnomeui/no-pixbuf-csource.patch | 11 - .../recipes-gnome/libgnome/libgnomeui_2.24.5.bb | 31 - .../recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb | 4 +- .../recipes-gnome/libgtop/libgtop_2.30.0.bb | 15 - .../recipes-gnome/libgtop/libgtop_2.38.0.bb | 13 + .../recipes-gnome/libidl/libidl-native_0.8.14.bb | 10 - .../meta-gnome/recipes-gnome/libidl/libidl.inc | 13 - .../recipes-gnome/libidl/libidl_0.8.14.bb | 13 - .../libtimezonemap/libtimezonemap_0.4.5.bb | 4 +- .../metacity/0001-drop-zenity-detection.patch | 33 + .../metacity/0001-ui-Define-_GNU_SOURCE.patch | 27 - .../metacity/remove-yelp-help-rules-var.patch | 28 - .../recipes-gnome/metacity/metacity_2.34.13.bb | 35 - .../recipes-gnome/metacity/metacity_3.38.0.bb | 34 + .../nautilus/nautilus/no-try-run-strftime.diff | 28 - .../nautilus/nautilus3/no-try-run-strftime.diff | 41 - .../recipes-gnome/nautilus/nautilus_3.18.5.bb | 29 + ...-src-Makefile.am-fix-build-with-glib-2.36.patch | 34 - ...LAGS-instead-of-INCLUDES-and-fix-problem-.patch | 42 - .../orbit2/orbit2/configure-lossage.patch | 37 - .../orbit2/orbit2/pkgconfig-fix.patch | 12 - .../recipes-gnome/orbit2/orbit2_2.14.19.bb | 42 - .../pimlico/contacts/stock_contact.png | Bin 2311 -> 0 bytes .../pimlico/contacts/stock_person.png | Bin 2280 -> 0 bytes .../meta-gnome/recipes-gnome/pimlico/dates.inc | 11 - .../dates/0001-Fix-format-security-warnings.patch | 54 - .../dates/dso_linking_change_build_fix.patch | 44 - .../uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch | 37 - .../meta-gnome/recipes-gnome/pimlico/dates_git.bb | 18 - .../system-tools-backends | 74 - .../gnome-themes/drop-localedir-override.patch | 22 - .../themes/gnome-themes/iconpath-option.patch | 52 - .../recipes-gnome/themes/gnome-themes_2.32.1.bb | 37 - .../recipes-support/florence/florence_0.6.3.bb | 19 - .../recipes-support/keybinder/keybinder_3.0.bb | 4 +- .../recipes-support/onboard/onboard_1.4.1.bb | 4 +- .../recipes-support/tracker/files/90tracker | 4 - .../tracker/files/tracker-dbus.service | 15 - .../tracker/files/tracker-miner-fs.service | 12 - .../tracker/files/tracker-store.service | 12 - .../recipes-support/usermode/usermode_1.111.bb | 3 +- .../meta-gnome/site/riscv64-linux | 16 + .../meta-openembedded/meta-initramfs/README | 9 +- .../meta-initramfs/conf/layer.conf | 2 + .../images/initramfs-kexecboot-klibc-image.bb | 2 +- .../recipes-devtools/dracut/dracut_git.bb | 6 +- .../recipes-devtools/grubby/grubby_8.40.bb | 10 +- ...ine-in_-structs-for-non-glibc-system-libs.patch | 60 +- ...c-Add-path-to-compiler-headers-via-isyste.patch | 12 +- ...c-Use-print-libgcc-file-name-instead-of-p.patch | 10 +- .../klibc-2.0.4/0001-always-use-bfd-linker.patch | 8 +- ...arm-Do-not-set-a-fallback-march-and-mtune.patch | 10 +- ...0001-dash-Specify-format-string-in-fmtstr.patch | 8 +- .../0001-include-linux-sysinfo.h-directly.patch | 8 +- .../klibc-2.0.4/0001-mkfifo-Implement-mkfifo.patch | 8 +- .../klibc/klibc-2.0.4/armv4-fix-v4bx.patch | 17 +- .../klibc/klibc-2.0.4/klcc-consider-sysroot.patch | 8 + .../klibc/klibc-2.0.4/klibc-config-eabi.patch | 18 +- .../klibc/klibc-2.0.4/klibc-linux-libc-dev.patch | 23 +- .../klibc/klibc-2.0.4/staging.patch | 151 +- .../recipes-devtools/klibc/klibc-utils.inc | 2 +- .../0001-Makefile-build-ubi-utils-only.patch | 87 + .../0002-common.mk-for-klibc-CC-is-klcc.patch | 27 + ...bubi.c-add-klibc-specific-fixes-for-ioctl.patch | 76 + ...patibility-to-dietlibc-klibc-musl-libc-af.patch | 88 + ...-more-workarounds-for-klibc-compatibility.patch | 52 + ...rser-remove-unused-function-needing-float.patch | 85 + ...ls-common.c-convert-to-integer-arithmetic.patch | 64 + ...ubiformat.c-convert-to-integer-arithmetic.patch | 44 + ...arnings-about-implicit-non-const-casting-.patch | 48 + .../0001-Makefile-only-build-ubi-utils.patch | 84 - .../0002-common.mk-for-klibc-CC-is-klcc.patch | 27 - .../0003-libubi.c-add-klibc-specific-fixes.patch | 76 - .../0004-common.h-klibc-fixes-1.patch | 84 - .../0005-common.h-klibc-fixes-2.patch | 49 - ...rser-remove-unused-function-needing-float.patch | 85 - .../recipes-devtools/mtd/ubi-utils-klibc_1.5.2.bb | 11 +- .../kexec/kexec-tools-klibc_2.0.2.bb | 36 +- .../meta-openembedded/meta-multimedia/README | 11 +- .../meta-multimedia/conf/layer.conf | 1 + .../gupnp/gupnp-tools_0.8.13.bb | 4 +- .../libupnp/libupnp1.6/sepbuildfix.patch | 34 - .../libupnp/libupnp1.6_1.6.21.bb | 20 - .../recipes-connectivity/rygel/rygel_0.34.0.bb | 1 + .../recipes-mediacenter/kodi/kodi_17.bb | 190 +- .../0001-Do-not-use-obsolete-pow10f-function.patch | 50 + .../recipes-multimedia/caps/caps_0.9.24.bb | 1 + ...N-accelaration-for-float-multithreaded-se.patch | 76 + .../fluidsynth/fluidsynth_1.1.10.bb | 24 + .../fluidsynth/fluidsynth_1.1.6.bb | 23 - .../gst-ffmpeg-0.10.13/lower-rank.diff | 16 - .../gstreamer-0.10/gst-plugins-base_0.10.36.bb | 1 - ...ecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch | 34 +- .../recipes-multimedia/gstreamer-1.0/gstd.inc | 25 + .../gstd/0001-gstd-yocto-compatibility.patch | 63 + .../recipes-multimedia/gstreamer-1.0/gstd_1.0.bb | 3 + .../libdc1394/files/install_examples.patch | 8 +- .../recipes-multimedia/libde265/libde265_1.0.2.bb | 20 + .../musicbrainz/files/allow-libdir-override.patch | 10 +- .../recipes-multimedia/musicpd/mpd_0.19.21.bb | 100 - .../recipes-multimedia/musicpd/mpd_0.20.18.bb | 100 + .../recipes-multimedia/openh264/openh264_1.7.0.bb | 42 + .../recipes-multimedia/opusfile/opusfile_0.10.bb | 14 + .../schroedinger/schroedinger/configure.ac.patch | 8 +- .../sox/sox/0001-Update-exported-symbol-list.patch | 34 + ...error-line-and-live-without-file-type-det.patch | 10 +- .../recipes-multimedia/sox/sox_14.4.0.bb | 42 - .../recipes-multimedia/sox/sox_14.4.2.bb | 40 + .../recipes-multimedia/tinyalsa/tinyalsa_1.1.1.bb | 28 + .../meta-multimedia/recipes-multimedia/vlc/vlc.inc | 1 - .../gst-instruments/gst-instruments_0.2.3.bb | 12 +- .../recipes-support/libsrtp/libsrtp_1.5.2.bb | 8 +- .../meta-openembedded/meta-networking/MAINTAINERS | 7 +- .../meta-networking/classes/waf-samba.bbclass | 30 +- .../meta-networking/conf/layer.conf | 2 + .../waf-cross-answers/cross-answers-aarch64_be.txt | 39 + .../waf-cross-answers/cross-answers-riscv64.txt | 39 + .../crda/crda/fix-issues-when-USE_OPENSSL-1.patch | 2 +- .../fix-linking-of-libraries-used-by-reglib.patch | 21 +- .../recipes-connectivity/dhcpcd/dhcpcd_6.11.3.bb | 24 - .../recipes-connectivity/dhcpcd/dhcpcd_6.11.5.bb | 24 + .../inetutils/inetutils_1.9.4.bb | 3 + .../recipes-connectivity/mbedtls/mbedtls_1.3.17.bb | 37 - .../recipes-connectivity/mbedtls/mbedtls_2.8.0.bb | 42 + .../networkmanager/networkmanager-openvpn_1.2.8.bb | 2 +- ...adjust-net-headers-for-musl-compatibility.patch | 82 - .../0001-check-for-strndupa-before-using-it.patch | 67 - ...dns-resolved-add-systemd-resolved-backend.patch | 621 - ...ed-also-check-for-etc-resolv-conf.systemd.patch | 29 - ...o-run-sbin-dhclient-to-get-the-version-nu.patch | 36 - ...emove-net-ethernet.h-seems-to-be-over-spe.patch | 40 + ...stemd-xlocale.h-is-dropped-by-newer-glibc.patch | 29 - .../0002-Fix-nm-version-macro-includes.patch | 58 - ...figure.ac-Fix-pkgconfig-sysroot-locations.patch | 25 + ...et-util.h-Include-linux-sockios.h-on-musl.patch | 30 - ...-string-in-g_dbus_message_new_method_erro.patch | 67 - .../networkmanager/0003-Define-ETH_ALEN.patch | 39 - ...te-settings-settings-property-documentati.patch | 77 + ...Define-missing-features-to-cater-for-musl.patch | 93 - ...emove-net-ethernet.h-seems-to-be-over-spe.patch | 36 - .../networkmanager/musl/0001-musl-basic.patch | 53 + .../musl/0002-musl-dlopen-configure-ac.patch | 35 + .../musl/0003-musl-network-support.patch | 72 + .../musl/0004-musl-process-util.patch | 62 + ...further-conflicts-by-including-net-ethern.patch | 77 + .../0006-Add-a-strndupa-replacement-for-musl.patch | 47 + .../networkmanager/networkmanager_1.10.6.bb | 143 + .../networkmanager/networkmanager_1.4.4.bb | 136 - ...void-timeout-for-nmbd-if-started-offline-.patch | 5 +- .../samba/16-do-not-check-xsltproc-manpages.patch | 56 +- .../21-add-config-option-without-valgrind.patch | 19 +- .../samba/samba/dnsserver-4.7.0.patch | 19 + .../samba/samba/iconv-4.7.0.patch | 25 + .../samba/samba/samba-4.2.7-pam.patch | 36 - .../samba/samba/samba-pam.patch | 37 + .../samba/samba/smb_conf-4.7.0.patch | 19 + .../recipes-connectivity/samba/samba_4.6.7.bb | 256 - .../recipes-connectivity/samba/samba_4.7.6.bb | 318 + ...fix-do_package-failed-since-snort-2.9.7.0.patch | 6 +- .../0001-libpcap-search-sysroot-for-headers.patch | 12 +- .../snort/snort/disable-dap-address-space-id.patch | 26 +- .../snort/snort/disable-daq-flow-id.patch | 20 +- .../snort/snort/disable-daq-verdict-retry.patch | 21 +- .../snort/snort/disable-inaddr-none.patch | 18 +- ...host-contamination-when-enable-static-daq.patch | 9 + .../recipes-connectivity/vlan/vlan_1.9.bb | 6 + .../recipes-connectivity/wolfssl/wolfssl_3.12.0.bb | 9 +- ...fine-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch | 12 +- ...kup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch | 6 +- .../0002-Replace-__S_IEXEC-with-S_IEXEC.patch | 18 +- .../autofs/autofs/add-the-needed-stdarg.h.patch | 13 +- .../autofs-5.0.7-do-not-check-for-modprobe.patch | 46 +- .../autofs/autofs/autofs-5.0.7-fix-lib-deps.patch | 12 +- ...7-include-linux-nfs.h-directly-in-rpc_sub.patch | 14 +- .../autofs/autofs-5.1.2-libtirpc-as-need.patch | 19 +- .../recipes-daemons/autofs/autofs/cross.patch | 31 +- ...x-the-YACC-rule-to-fix-a-building-failure.patch | 11 +- .../autofs/autofs/fix_disable_ldap.patch | 17 +- .../autofs/autofs/force-STRIP-to-emtpy.patch | 13 +- .../recipes-daemons/autofs/autofs/libtirpc.patch | 45 +- .../recipes-daemons/autofs/autofs/no-bash.patch | 25 +- .../autofs/autofs/pkgconfig-libnsl.patch | 17 +- .../autofs/autofs/remove-bashism.patch | 10 +- ...-pkg-config-to-detect-libxml-2.0-and-krb5.patch | 15 +- .../cyrus-sasl/cyrus-sasl_2.1.26.bb | 6 +- ...openiscsiusr-Include-limit.h-for-PATH_MAX.patch | 25 + ...001-qedi.c-Removed-unused-linux-ethtool.h.patch | 25 + ...ude-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch | 25 + ...openiscsiusr-Add-CFLAGS-to-linker-cmdline.patch | 29 + ...rder-the-includes-to-avoid-duplicate-defi.patch | 49 + ...04-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch | 28 + ...nitiator-utils-Do-not-clean-kernel-source.patch | 44 - ...text-add-include-for-NI_MAXHOST-definiton.patch | 35 - .../iscsi-initiator-utils_2.0.874.bb | 122 - .../iscsi-initiator-utils_2.0.876.bb | 117 + .../recipes-daemons/keepalived/keepalived_1.3.5.bb | 49 - .../recipes-daemons/keepalived/keepalived_1.4.2.bb | 48 + .../openhpi/files/openhpi-fix-host-gcc.patch | 10 +- .../files/openhpi-fix-testfail-errors.patch | 18 +- .../files/openhpi-hpi-shell-thread-fix.patch | 10 +- .../files/openhpi-libxml2-cross-compile.patch | 10 +- ...i-use-serial-tests-config-needed-by-ptest.patch | 15 +- ...isable-format-overflow-if-supported-by-gc.patch | 34 +- .../recipes-daemons/opensaf/opensaf_5.17.07.bb | 67 - .../recipes-daemons/opensaf/opensaf_5.18.02.bb | 67 + .../recipes-daemons/postfix/files/main.cf | 105 + .../recipes-daemons/postfix/files/main.cf_2.0 | 102 - .../recipes-daemons/postfix/files/postfix.service | 2 +- .../recipes-daemons/postfix/postfix.inc | 32 +- .../recipes-daemons/postfix/postfix_3.2.2.bb | 17 +- .../recipes-daemons/radvd/radvd.inc | 2 +- ...e-noexcept-instead-of-throw-for-C-11-comp.patch | 6 +- ...heck-for-Wno-error-format-truncation-comp.patch | 58 +- ...0001-tools.cc-fixed-unused-result-warning.patch | 8 +- ...flawed-dynamic-ldb-link-test-in-configure.patch | 17 +- .../squid/files/Set-up-for-cross-compilation.patch | 21 +- .../squid/files/Skip-AC_RUN_IFELSE-tests.patch | 35 +- .../recipes-daemons/squid/files/gcc7-fixes.patch | 19 +- .../squid/files/set_sysroot_patch.patch | 18 +- ...d-don-t-do-squid-conf-tests-at-build-time.patch | 8 +- ...d-use-serial-tests-config-needed-by-ptest.patch | 8 +- .../vsftpd/files/change-secure_chroot_dir.patch | 37 +- ...c-Fix-with-musl-which-does-not-have-utmpx.patch | 6 +- ...ftpd-allow-sysinfo-in-the-seccomp-sandbox.patch | 6 +- .../vsftpd/vsftpd-3.0.3/makefile-destdir.patch | 14 +- .../vsftpd/vsftpd-3.0.3/makefile-libs.patch | 19 +- .../vsftpd/vsftpd-3.0.3/makefile-strip.patch | 10 +- .../vsftpd-3.0.3/nopam-with-tcp_wrappers.patch | 17 +- .../vsftpd/vsftpd-3.0.3/vsftpd-2.1.0-filter.patch | 38 +- .../vsftpd-3.0.3/vsftpd-tcp_wrappers-support.patch | 13 +- ...001-Include-fcntl.h-for-F_-and-O_-defines.patch | 28 - .../recipes-extended/corosync/corosync_2.4.2.bb | 80 - .../recipes-extended/corosync/corosync_2.4.3.bb | 79 + .../iscsitarget/iscsitarget_1.4.20.3+svn502.bb | 2 + .../ebtables/ebtables-2.0.10-4/ebtables.common | 12 +- .../recipes-filter/ebtables/ebtables_2.0.10-4.bb | 7 +- .../libnetfilter-cthelper-visibility-hidden.patch | 55 +- .../wireguard/wireguard-module_0.0.20170810.bb | 31 - .../wireguard/wireguard-module_0.0.20171221.bb | 31 + .../wireguard/wireguard-tools_0.0.20170810.bb | 27 - .../wireguard/wireguard-tools_0.0.20171221.bb | 27 + .../recipes-kernel/wireguard/wireguard.inc | 4 +- ...murhash-algorithm-with-Robert-Jenkin-s-ha.patch | 223 + .../freediameter/files/freeDiameter.conf | 250 + .../freediameter/files/freediameter.init | 72 + .../freediameter/files/freediameter.service | 11 + .../freediameter/files/install_test.patch | 22 + .../freediameter/files/pass-ptest-env.patch | 72 + .../recipes-protocols/freediameter/files/run-ptest | 11 + .../freediameter/freediameter_1.2.1.bb | 138 + ...mdns-Do-not-include-nss.h-when-libc-glibc.patch | 42 + .../recipes-protocols/mdns/mdns_765.50.9.bb | 1 + ...ix-snmptrap-to-use-clientaddr-from-snmp.c.patch | 17 +- .../net-snmp/0001-Remove-U64-typedef.patch | 2524 +++ .../0001-config_os_headers-Error-Fix.patch | 13 +- ...IPv6-transport-Add-a-missing-return-state.patch | 13 +- .../net-snmp/net-snmp/fix-libtool-finish.patch | 10 +- ...nmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch | 23 +- ...p-testing-add-the-output-format-for-ptest.patch | 13 +- .../recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 14 +- .../openl2tp/openl2tp/fix_linux_4.15_compile.patch | 44 + .../openl2tp/openl2tp/openl2tpd-enable-tests.patch | 24 + .../recipes-protocols/openl2tp/openl2tp/run-ptest | 97 + .../recipes-protocols/openl2tp/openl2tp_1.8.bb | 13 +- .../recipes-protocols/quagga/quagga_1.2.1.bb | 4 - .../recipes-protocols/quagga/quagga_1.2.4.bb | 4 + .../0001-ppoe-Dont-include-linux-if_ether.h.patch | 8 +- ...0002-Enable-support-for-the-kernel-module.patch | 8 +- .../rp-pppoe-3.12/configure.in-Error-fix.patch | 10 +- .../rp-pppoe/rp-pppoe-3.12/configure.patch | 16 +- .../rp-pppoe-3.12/configure_in_cross.patch | 21 +- .../discard-use-of-dnl-in-Makefile.am.patch | 10 +- .../rp-pppoe-3.12/dont-swallow-errors.patch | 10 +- .../rp-pppoe-3.12/pppoe-src-restrictions.patch | 19 +- .../rp-pppoe/rp-pppoe-3.12/top-autoconf.patch | 30 +- .../rp-pppoe/rp-pppoe-3.12/update-config.patch | 21 +- .../recipes-support/bridge-utils/bridge-utils.inc | 28 - ...ld-error-out-correctly-if-a-submake-fails.patch | 69 - ...idge-fix-some-build-time-warnings-fcntl.h.patch | 64 - ...idge-fix-some-build-time-warnings-errno.h.patch | 46 - ...dd-missing-include-s-fix-build-against-mu.patch | 47 - ...uild-don-t-ignore-CFLAGS-from-environment.patch | 29 +- ...ridge-Modifying-the-AR-to-cross-toolchain.patch | 51 + ...5-check-error-returns-from-write-to-sysfs.patch | 87 - ...5-fix-error-message-for-incorrect-command.patch | 33 - ...utils-1.5-fix-incorrect-command-in-manual.patch | 33 - .../bridge-utils/bridge-utils/kernel-headers.patch | 29 +- .../bridge-utils/bridge-utils_1.5.bb | 16 - .../bridge-utils/bridge-utils_1.6.bb | 35 + .../recipes-support/chrony/chrony/arm_eabi.patch | 36 +- .../recipes-support/chrony/chrony_2.4.bb | 134 - .../recipes-support/chrony/chrony_3.2.bb | 134 + .../recipes-support/cifs/cifs-utils_git.bb | 4 +- ...001-mount.cifs-Remove-data_blob.h-include.patch | 32 + .../cim-schema/cim-schema-exper_2.39.0.bb | 29 - .../cim-schema/cim-schema-exper_2.50.0.bb | 29 + .../ctdb/02-link-rep_snprintf-for-ltdbtool.patch | 11 +- .../recipes-support/dovecot/dovecot_2.2.29.bb | 71 - .../recipes-support/dovecot/dovecot_2.2.33.bb | 71 + .../recipes-support/drbd/drbd-utils_8.9.6.bb | 2 +- .../recipes-support/drbd/drbd_9.0.8-1.bb | 2 + .../recipes-support/fwknop/fwknop_2.6.9.bb | 3 + .../recipes-support/geoip/geoip-perl_1.50.bb | 11 +- .../recipes-support/geoip/geoip_1.6.11.bb | 90 + .../recipes-support/geoip/geoip_1.6.9.bb | 90 - .../geoip/geoipupdate-2.4.0/GeoIP.conf | 11 - .../geoip/geoipupdate-2.4.0/geoipupdate.cron | 5 - .../geoip/geoipupdate-2.5.0/GeoIP.conf | 11 + .../geoip/geoipupdate-2.5.0/geoipupdate.cron | 5 + .../recipes-support/geoip/geoipupdate_2.4.0.bb | 33 - .../recipes-support/geoip/geoipupdate_2.5.0.bb | 33 + .../0001-Makefile-pass-extra-linker-flags.patch | 31 + .../recipes-support/ipcalc/ipcalc_0.2.2.bb | 21 + .../ldb-Add-configure-options-for-packages.patch | 177 - .../libldb/libldb/options-1.3.1.patch | 193 + .../recipes-support/libldb/libldb_1.1.29.bb | 63 - .../recipes-support/libldb/libldb_1.3.1.bb | 63 + .../libtalloc/libtalloc/options-2.1.10.patch | 184 + ...talloc-Add-configure-options-for-packages.patch | 177 - .../recipes-support/libtalloc/libtalloc_2.1.11.bb | 49 + .../recipes-support/libtalloc/libtalloc_2.1.9.bb | 49 - .../recipes-support/libtdb/libtdb_1.3.14.bb | 44 - .../recipes-support/libtdb/libtdb_1.3.15.bb | 44 + .../libtevent/avoid-attr-unless-wanted.patch | 18 +- .../libtevent/libtevent/options-0.9.36.patch | 176 + ...tevent-Add-configure-options-for-packages.patch | 180 - .../recipes-support/libtevent/libtevent_0.9.31.bb | 44 - .../recipes-support/libtevent/libtevent_0.9.36.bb | 44 + .../lksctp-tools/lksctp-tools_1.0.17.bb | 21 +- ...001-coordinator-Fix-strncpy-range-warning.patch | 30 + .../lowpan-tools/lowpan-tools_git.bb | 5 +- .../recipes-support/ndisc6/ndisc6_git.bb | 4 + .../recipes-support/nghttp2/nghttp2_1.26.0.bb | 13 + .../meta-networking/recipes-support/nis/nis.inc | 2 +- ...ding_dup.c-Include-string.h-for-strdup-de.patch | 28 - ...mp_bindings.c-Include-string.h-for-memset.patch | 30 - .../recipes-support/nis/yp-tools_4.2.2.bb | 46 - .../recipes-support/nis/yp-tools_4.2.3.bb | 47 + .../recipes-support/ntimed/ntimed_git.bb | 2 +- .../ntp/ntp/ntp-4.2.4_p6-nano.patch | 20 +- .../recipes-support/ntp/ntp_4.2.8p10.bb | 170 - .../recipes-support/ntp/ntp_4.2.8p11.bb | 172 + .../recipes-support/open-isns/open-isns_0.97.bb | 12 +- .../fix-symlink-install-error-in-cmdlang.patch | 10 +- .../openipmi/files/include_sys_types.patch | 8 +- .../recipes-support/openvpn/openvpn_2.4.3.bb | 67 - .../recipes-support/openvpn/openvpn_2.4.4.bb | 67 + .../ssmtp/ssmtp/ssmtp-bug584162-fix.patch | 126 + .../recipes-support/ssmtp/ssmtp_2.64.bb | 24 +- ...1-memory.h-Include-stdint.h-for-uintptr_t.patch | 8 +- .../strongswan/files/fix-funtion-parameter.patch | 33 +- .../recipes-support/strongswan/strongswan_5.5.3.bb | 131 - .../recipes-support/strongswan/strongswan_5.6.2.bb | 132 + .../tcpdump/tcpdump/add-ptest.patch | 13 +- .../tcpdump/unnecessary-to-check-libpcap.patch | 19 +- .../recipes-support/tinyproxy/tinyproxy_1.8.4.bb | 4 +- .../wireshark/files/libgcrypt.patch | 53 + .../recipes-support/wireshark/wireshark_2.2.10.bb | 71 - .../recipes-support/wireshark/wireshark_2.4.6.bb | 73 + .../recipes-support/wpan-tools/wpan-tools_git.bb | 18 + .../meta-networking/site/endian-big | 2 + .../meta-networking/site/endian-little | 2 + import-layers/meta-openembedded/meta-oe/README | 9 +- .../meta-oe/classes/gitver.bbclass | 2 +- .../meta-oe/classes/meson.bbclass | 106 - .../meta-openembedded/meta-oe/conf/layer.conf | 2 + .../files/Fix-configure-for-sqrt-check.patch | 22 +- .../recipes-benchmark/iperf2/iperf2_2.0.10.bb | 19 + ...de-stdint.h-for-various-std-c99-int-types.patch | 39 - .../meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb | 1 - .../libc-bench/libc-bench_20110206.bb | 17 + .../recipes-benchmark/linpack/linpack_1.0.bb | 20 + ...usl-define-guard-before-redefining-sockle.patch | 8 +- .../0001-lat_http.c-Add-printf-format.patch | 6 +- ...t-CFLAGS-LDFLAGS-to-append-values-passed-.patch | 9 +- .../fix-lmbench-memory-check-failure.patch | 53 +- .../lmbench_result_html_report.patch | 12 +- .../lmbench/lmbench-3.0-a9/obey-ranlib.patch | 18 +- .../lmbench-3.0-a9/update-config-script.patch | 18 +- .../lmbench-3.0-a9/update-results-script.patch | 84 +- .../use-base_libdir-instead-of-hardcoded-lib.patch | 12 +- .../0001-avoid-gcc-optimize-away-the-loops.patch | 9 +- .../lmbench/lmbench/rename-line-binary.patch | 15 +- .../phoronix-test-suite_7.4.0.bb | 36 - .../phoronix-test-suite_7.8.0.bb | 41 + .../recipes-benchmark/whetstone/whetstone_1.2.bb | 20 + .../meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb | 13 + .../cpufrequtils/0001-dont-unset-cflags.patch | 30 + .../recipes-bsp/cpufrequtils/cpufrequtils_008.bb | 37 + .../recipes-bsp/edac-utils/edac-utils_git.bb | 47 + .../files/add-restart-to-initscript.patch | 33 + .../recipes-bsp/edac-utils/files/edac.service | 10 + ...cript-be-able-to-automatically-load-EDAC-.patch | 98 + .../recipes-bsp/efibootmgr/efibootmgr_0.15.bb | 27 + ...-Add-Wunknown-attributes-when-using-clang.patch | 33 + .../efivar/0001-efivar-fix-for-cross-compile.patch | 32 + ...Do-not-use-__bswap_constant_-16-32-macros.patch | 35 + .../efivar/0003-efivar-fix-for-cross-compile.patch | 42 + .../0004-fix-unknow-option-for-gold-linker.patch | 35 + .../allow-multi-definitions-for-native.patch | 32 + .../fix-compile-failure-with-host-gcc-4.6.patch | 43 + .../recipes-bsp/efivar/efivar/musl-strndupa.patch | 25 + .../meta-oe/recipes-bsp/efivar/efivar_0.31.bb | 50 + ...001-platform-Add-riscv-to-known-platforms.patch | 37 + .../recipes-bsp/flashrom/flashrom/sst26.patch | 198 + .../meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb | 19 + .../lm_sensors/lmsensors-config/fancontrol | 2 + .../lm_sensors/lmsensors-config/sensord | 16 + .../lm_sensors/lmsensors-config/sensord.cgi | 10 + .../lm_sensors/lmsensors-config/sensord.conf | 16 + .../lm_sensors/lmsensors-config/sensors.conf | 2 + .../recipes-bsp/lm_sensors/lmsensors-config_1.0.bb | 63 + ...ensors-detect-print-a-special-message-whe.patch | 40 + ...-limit-sys-io.h-header-include-to-just-gl.patch | 88 + .../lm_sensors/lmsensors/fancontrol.init | 47 + .../recipes-bsp/lm_sensors/lmsensors/sensord.init | 49 + .../recipes-bsp/lm_sensors/lmsensors_3.4.0.bb | 140 + .../meta-oe/recipes-bsp/lssci/lsscsi_0.28.bb | 12 + ...-Avoid-key-reinstallation-in-FT-handshake.patch | 177 + ...nstallation-of-an-already-in-use-group-ke.patch | 253 + ...ection-of-GTK-IGTK-reinstallation-of-WNM-.patch | 187 + ...04-Prevent-installation-of-an-all-zero-TK.patch | 82 + ...Fix-PTK-rekeying-to-generate-a-new-ANonce.patch | 67 + .../0006-TDLS-Reject-TPK-TK-reconfiguration.patch | 135 + ...llow-multiple-Reassociation-Response-fram.patch | 85 + .../hostapd/hostapd/key-replay-cve-multiple.patch | 984 - .../recipes-connectivity/hostapd/hostapd_2.6.bb | 44 +- ...d-parameter-to-disable-keyutils-detection.patch | 11 +- .../krb5/krb5/CVE-2017-11462.patch | 419 - .../krb5/krb5/etc/default/krb5-admin-server | 4 +- .../krb5/krb5/fix-CVE-2017-11368.patch | 116 - .../krb5/krb5/krb5-admin-server.service | 1 + .../krb5/krb5/krb5-kdc.service | 1 + .../recipes-connectivity/krb5/krb5_1.15.1.bb | 184 - .../meta-oe/recipes-connectivity/krb5/krb5_1.16.bb | 188 + .../libqmi/libqmi/0001-Detect-clang.patch | 3 +- .../recipes-connectivity/libqmi/libqmi_1.16.0.bb | 18 - .../recipes-connectivity/libqmi/libqmi_1.20.0.bb | 18 + .../recipes-connectivity/libuv/libuv_1.11.0.bb | 8 +- .../libwebsockets/libwebsockets_2.1.0.bb | 7 +- ...llow-prefix-mandir-localedir-from-environ.patch | 35 + .../files/0002-uthash-remove-in-tree-version.patch | 975 + .../mosquitto/files/build.patch | 94 - .../mosquitto/mosquitto_1.4.14.bb | 5 +- .../obex/obex-data-server_0.4.6.bb | 4 +- .../recipes-connectivity/obex/openobex_1.7.2.bb | 2 + .../recipes-connectivity/obexftp/obexftp_0.24.2.bb | 2 + .../smstools3/fix-makefile-override.patch | 24 - .../smstools3/smstools3/scripts_no_bash.patch | 51 + .../smstools3/smstools3/sms_binpath.patch | 24 + .../smstools3/sms_binpath_and_psops.patch | 19 - .../smstools3/smstools3_3.1.15.bb | 48 - .../smstools3/smstools3_3.1.21.bb | 47 + ...GCLD-with-SIGCHLD-and-include-sys-types.h.patch | 49 + ...READ_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch | 143 + .../meta-oe/recipes-connectivity/umip/umip_1.0.bb | 2 + .../recipes-connectivity/zeromq/cppzmq_git.bb | 4 +- .../recipes-connectivity/zeromq/zeromq_4.1.6.bb | 32 - .../recipes-connectivity/zeromq/zeromq_4.2.5.bb | 32 + .../0001-Comment-rst2man-related-stuff.patch | 34 + ...0002-Correct-including-directory-for-conf.patch | 25 + .../meta-oe/recipes-core/dbus/dbus-broker_git.bb | 32 + ...04-use-POSIX-poll.h-instead-of-sys-poll.h.patch | 29 +- .../fix-missing-unistd.h-include.patch | 14 +- .../ell/0001-ell-fix-build-with-musl-libc.patch | 39 + .../meta-oe/recipes-core/ell/ell_0.4.bb | 19 + .../meta-oe/recipes-core/ell/ell_git.bb | 17 - .../0001-Glib-Threads-Private-Fix-gobj.patch | 40 + .../glib-2.0/glibmm/remove-examples.patch | 29 +- .../meta-oe/recipes-core/glib-2.0/glibmm_2.50.1.bb | 36 - .../meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb | 37 + .../recipes-core/mm-common/mm-common_0.9.10.bb | 12 - .../recipes-core/mm-common/mm-common_0.9.11.bb | 9 + ...ath-to-systemd-tty-ask-password-agent-con.patch | 34 + .../recipes-core/plymouth/plymouth_0.9.2.bb | 12 +- .../meta-oe/recipes-core/toybox/toybox_0.7.5.bb | 71 + .../meta-oe/recipes-core/toybox/toybox_git.bb | 75 - .../recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb | 36 + .../engine-pkcs11/engine-pkcs11_0.2.2.bb | 31 + .../recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb | 12 + .../recipes-crypto/libsodium/libsodium_1.0.11.bb | 12 + .../pkcs11-helper/pkcs11-helper_1.11.bb | 29 + .../leveldb/0001-Makefile-Fix-parallel-build.patch | 34 + ...uild_detect_platform-Check-for-__SSE4_2__.patch | 37 + .../0002-makefile-build-SHARED_MEMENVLIB.patch | 43 + .../meta-oe/recipes-dbs/leveldb/leveldb_git.bb | 37 + .../meta-oe/recipes-dbs/libdbi/libdbi.inc | 17 + .../meta-oe/recipes-dbs/libdbi/libdbi_0.9.0.bb | 6 + ...FPMathLib20U1-Check-for-__DEFINED_wchar_t.patch | 36 + ...to-use-build-settings-from-environment-va.patch | 64 + ...__-to-control-use-of-gnu_get_libc_version.patch | 50 + .../0001-Use-long-long-instead-of-int64_t.patch | 64 + ...0001-Use-strerror_r-only-on-glibc-systems.patch | 26 + ...finition-for-the-macro-__ELF_NATIVE_CLASS.patch | 35 + ...-Add-missing-dependenncy-on-local_shardin.patch | 25 + ...-Conditionalize-glibc-specific-strerror_r.patch | 39 + .../0004-wiredtiger-Disable-strtouq-on-musl.patch | 26 + .../mongodb/mongodb/arm64-support.patch | 43 + .../mongodb/disable-hw-crc32-on-arm64-s390x.patch | 50 + .../meta-oe/recipes-dbs/mongodb/mongodb_git.bb | 76 + .../recipes-dbs/mysql/mariadb-native_5.5.59.bb | 19 + .../meta-oe/recipes-dbs/mysql/mariadb.inc | 297 + .../mariadb/0001-disable-ucontext-on-musl.patch | 28 + .../mysql/mariadb/change-cc-to-cc-version.patch | 26 + .../mariadb/configure.cmake-fix-valgrind.patch | 41 + .../mysql/mariadb/fix-a-building-failure.patch | 31 + .../mysql/mariadb/fix-cmake-module-path.patch | 29 + .../mysql/mariadb/fix-mysqlclient-r-version.patch | 160 + .../meta-oe/recipes-dbs/mysql/mariadb/install_db | 13 + .../recipes-dbs/mysql/mariadb/install_db.service | 17 + .../meta-oe/recipes-dbs/mysql/mariadb/my.cnf | 25 + .../recipes-dbs/mysql/mariadb/mysql-systemd-start | 66 + .../recipes-dbs/mysql/mariadb/mysqld.service | 25 + .../mysql/mariadb/remove-bad-path.patch | 18 + .../meta-oe/recipes-dbs/mysql/mariadb_5.5.59.bb | 27 + .../recipes-dbs/mysql/mysql-python_1.2.5.bb | 17 + ...0001-Use-pkg-config-for-libxml2-detection.patch | 40 + .../postgresql/files/not-check-libperl.patch | 28 + .../postgresql/files/postgresql-bashprofile | 4 + .../recipes-dbs/postgresql/files/postgresql-setup | 73 + .../recipes-dbs/postgresql/files/postgresql.init | 193 + .../recipes-dbs/postgresql/files/postgresql.pam | 4 + .../postgresql/files/postgresql.service | 27 + .../meta-oe/recipes-dbs/postgresql/postgresql.inc | 383 + .../recipes-dbs/postgresql/postgresql_9.4.17.bb | 14 + .../psqlodbc-donot-use-the-hardcode-libdir.patch | 26 + .../files/psqlodbc-fix-for-ptest-support.patch | 148 + ...bc-remove-some-checks-for-cross-compiling.patch | 118 + .../meta-oe/recipes-dbs/psqlodbc/files/run-ptest | 46 + .../meta-oe/recipes-dbs/psqlodbc/psqlodbc.inc | 50 + .../recipes-dbs/psqlodbc/psqlodbc_09.05.0300.bb | 14 + .../meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb | 32 + .../recipes-dbs/soci/soci/soci_libdir.patch | 28 + .../meta-oe/recipes-dbs/soci/soci_3.2.3.bb | 49 + ...c-Fix-format-not-a-string-literal-warning.patch | 32 + .../sqlite-2.8.17/mainmk_build_dynamic.patch | 32 + .../sqlite/sqlite-2.8.17/mainmk_no_tcl.patch | 20 + .../recipes-dbs/sqlite/sqlite-2.8.17/sqlite.pc | 12 + .../meta-oe/recipes-dbs/sqlite/sqlite_2.8.17.bb | 61 + .../android-tools/preserve-ownership.patch | 71 +- .../android-tools/android-tools_5.1.1.r37.bb | 20 +- ...001-disable-calls-to-getcontext-with-musl.patch | 52 + ...-Import-necessary-definitions-from-stab.h.patch | 199 - .../recipes-devtools/breakpad/breakpad_git.bb | 1 + .../concurrencykit/concurrencykit/cross.patch | 33 +- .../recipes-devtools/cppunit/cppunit_1.13.2.bb | 14 - ...e.am-do-not-preserve-file-flags-when-copy.patch | 31 - .../recipes-devtools/cpuid/cpuid_20170122.bb | 22 + .../meta-oe/recipes-devtools/cunit/cunit_2.1-3.bb | 19 - .../cunit/files/fixup-install-docdir.patch | 36 - .../recipes-devtools/cxxtest/cxxtest_4.3.bb | 21 - .../flatbuffers/flatbuffers_1.7.1.bb | 37 - .../flatbuffers/flatbuffers_1.9.0.bb | 37 + .../recipes-devtools/geany/geany-plugins_1.31.bb | 5 +- .../meta-oe/recipes-devtools/geany/geany_1.31.bb | 4 +- ...C_PRINTF-on-functions-with-format-strings.patch | 62 - ...gnome-doc-utils.make-sysrooted-pkg-config.patch | 51 - .../glade/glade3/0002-fix-gcc-6-build.patch | 39 - .../meta-oe/recipes-devtools/glade/glade3_3.8.5.bb | 24 - .../meta-oe/recipes-devtools/glade/glade_3.20.0.bb | 25 - .../meta-oe/recipes-devtools/glade/glade_3.20.2.bb | 27 + ...txt-Fix-grpc_cpp_plugin-path-during-cross.patch | 68 + ....txt-Fix-libraries-installation-for-Linux.patch | 166 + ...s.txt-Find-c-ares-in-target-sysroot-alone.patch | 42 + .../meta-oe/recipes-devtools/grpc/grpc_1.8.5.bb | 36 + .../recipes-devtools/jsoncpp/jsoncpp_1.8.3.bb | 21 - .../recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb | 21 + .../recipes-devtools/librcf/librcf_2.2.0.0.bb | 2 + .../recipes-devtools/luajit/luajit_2.0.5.bb | 3 + .../mercurial/files/mercurial-CVE-2017-9462.patch | 135 - .../mercurial/mercurial-native_4.0.1.bb | 28 - .../recipes-devtools/mercurial/mercurial_4.4.bb | 31 + .../meson/meson/native_bindir.patch | 71 - .../meta-oe/recipes-devtools/meson/meson_0.40.1.bb | 20 - .../meta-oe/recipes-devtools/mpich/mpich_3.2.bb | 5 + .../0001-Fix-Werror-class-memaccess.patch | 35 + .../recipes-devtools/msgpack/msgpack-c_2.1.5.bb | 3 +- ...isable-running-gyp-files-for-bundled-deps.patch | 29 - .../nodejs/nodejs/no-registry.patch | 59 - .../recipes-devtools/nodejs/nodejs_8.4.0.bb | 89 - .../recipes-devtools/nodejs/nodejs_8.9.4.bb | 90 + .../packagegroups/packagegroup-sdk-target.bb | 2 +- .../meta-oe/recipes-devtools/perl/ipc-run_0.94.bb | 24 - .../meta-oe/recipes-devtools/perl/ipc-run_0.96.bb | 24 + .../perl/libdbd-mysql-perl_4.036.bb | 25 - .../perl/libdbd-mysql-perl_4.043.bb | 25 + .../recipes-devtools/perl/libdbi-perl_1.636.bb | 26 - .../recipes-devtools/perl/libdbi-perl_1.641.bb | 36 + .../php/php-5.6.31/0001-Add-lpthread-to-link.patch | 38 - .../change-AC_TRY_RUN-to-AC_TRY_LINK.patch | 56 - .../php-7.1.9/0001-Specify-tag-with-libtool.patch | 62 - .../php/php-7.1.9/CVE-2017-16642.patch | 5241 ----- .../change-AC_TRY_RUN-to-AC_TRY_LINK.patch | 56 - .../meta-oe/recipes-devtools/php/php.inc | 37 +- .../php/php/0001-Add-lpthread-to-link.patch | 38 + ...-acinclude.m4-don-t-unset-cache-variables.patch | 39 + ...nclude.m4-skip-binconfig-check-for-libxml.patch | 56 + ...aused-by-a-new-variable-is-declared-after.patch | 45 + ...i.c-build-empty-php_load_zend_extension_c.patch | 63 + .../0001-opcache-config.m4-enable-opcache.patch | 385 + .../php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch | 61 + .../recipes-devtools/php/php/configure.patch | 11 - .../meta-oe/recipes-devtools/php/php/iconv.patch | 19 +- .../php/php/imap-fix-autofoo.patch | 19 +- .../recipes-devtools/php/php/pear-makefile.patch | 18 +- .../recipes-devtools/php/php/phar-makefile.patch | 15 +- ...hp5-0001-opcache-config.m4-enable-opcache.patch | 387 + .../php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch | 63 + .../php/php/php5-pear-makefile.patch | 26 + .../php/php/php5-phar-makefile.patch | 46 + .../recipes-devtools/php/php/php_exec_native.patch | 16 +- .../meta-oe/recipes-devtools/php/php_5.6.31.bb | 10 - .../meta-oe/recipes-devtools/php/php_5.6.35.bb | 23 + .../meta-oe/recipes-devtools/php/php_7.1.9.bb | 17 - .../meta-oe/recipes-devtools/php/php_7.2.4.bb | 24 + .../meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb | 65 - .../recipes-devtools/protobuf/protobuf/run-ptest | 38 + .../recipes-devtools/protobuf/protobuf_3.4.1.bb | 34 - .../recipes-devtools/protobuf/protobuf_3.5.1.bb | 84 + .../recipes-devtools/python/python-cpuset_1.5.7.bb | 11 +- .../python/python-futures_3.0.5.bb | 16 - .../python/python-futures_3.2.0.bb | 13 + ...c-add-sysroot-path-to-GI_DATADIR-don-t-se.patch | 19 +- .../python/python-pygobject_3.22.0.bb | 35 - .../python/python-pygobject_3.28.0.bb | 35 + .../meta-oe/recipes-devtools/sip/sip_4.19.2.bb | 42 - .../meta-oe/recipes-devtools/sip/sip_4.19.8.bb | 42 + .../recipes-devtools/tcltk/tk/confsearch.diff | 17 +- .../meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb | 79 - .../meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb | 79 + .../recipes-extended/acpitool/acpitool_0.5.1.bb | 13 - .../remove-policy-of-usr-local-sbin.patch | 28 - .../cfengine/cfengine-masterfiles_3.10.2.bb | 36 + .../cfengine/cfengine-masterfiles_3.9.0.bb | 37 - .../recipes-extended/cfengine/cfengine_3.10.2.bb | 73 + .../recipes-extended/cfengine/cfengine_3.9.0.bb | 70 - .../cmpi-bindings/cmpi-bindings_git.bb | 4 + .../0001-Fix-printf-format-errors-with-clang.patch | 28 - .../meta-oe/recipes-extended/dash/dash_0.5.8.bb | 29 - .../recipes-extended/ddrescue/ddrescue_1.19.bb | 45 - .../recipes-extended/ddrescue/ddrescue_1.22.bb | 45 + .../recipes-extended/dialog/dialog_1.3-20160828.bb | 29 - .../recipes-extended/dialog/dialog_1.3-20171209.bb | 29 + .../recipes-extended/dumb-init/dumb-init_1.2.0.bb | 15 + .../recipes-extended/efibootmgr/efibootmgr_0.15.bb | 27 - ...-Add-Wunknown-attributes-when-using-clang.patch | 32 - .../efivar/0001-efivar-fix-for-cross-compile.patch | 35 - ...Do-not-use-__bswap_constant_-16-32-macros.patch | 37 - .../efivar/0003-efivar-fix-for-cross-compile.patch | 44 - .../0004-fix-unknow-option-for-gold-linker.patch | 35 - .../allow-multi-definitions-for-native.patch | 23 - .../fix-compile-failure-with-host-gcc-4.6.patch | 42 - .../efivar/efivar/musl-strndupa.patch | 17 - .../meta-oe/recipes-extended/efivar/efivar_0.31.bb | 50 - .../flashrom/0001-Remove-undefined-behavior.patch | 82 - ...fine-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch | 28 - .../recipes-extended/flashrom/flashrom/sst26.patch | 198 - .../recipes-extended/flashrom/flashrom_0.9.9.bb | 20 - .../recipes-extended/fluentbit/fluentbit_0.12.1.bb | 4 + .../meta-oe/recipes-extended/gnuplot/gnuplot.inc | 42 - ...uild-to-conversion-tools-for-native-build.patch | 31 + .../gnuplot/gnuplot/0002-do-not-build-demos.patch | 31 + .../0003-Use-native-tools-to-build-docs.patch | 111 + ...configure-option-to-find-qt5-native-tools.patch | 42 + .../gnuplot/gnuplot/gnuplot.desktop | 4 +- .../gnuplot/lua-loadlibs-configure-in-fix.patch | 16 - .../recipes-extended/gnuplot/gnuplot/qtopia.trm | 483 - .../recipes-extended/gnuplot/gnuplot/subdirs.patch | 11 - .../recipes-extended/gnuplot/gnuplot_5.0.5.bb | 14 - .../recipes-extended/gnuplot/gnuplot_5.2.2.bb | 69 + ...init.d-Makefile.am-add-missing-dependency.patch | 32 + .../haveged/haveged/remove-systemd-unit-503.patch | 20 - .../recipes-extended/haveged/haveged_1.9.1.bb | 32 - .../recipes-extended/haveged/haveged_1.9.2.bb | 40 + .../hexedit/0001-don-t-strip-when-installing.patch | 30 - .../recipes-extended/hexedit/hexedit_1.2.13.bb | 17 - .../recipes-extended/hexedit/hexedit_1.4.2.bb | 16 + .../konkretcmpi/konkretcmpi_0.9.2.bb | 4 +- .../leveldb/0001-Makefile-Fix-parallel-build.patch | 34 - ...uild_detect_platform-Check-for-__SSE4_2__.patch | 37 - .../0002-makefile-build-SHARED_MEMENVLIB.patch | 43 - .../recipes-extended/leveldb/leveldb_git.bb | 37 - .../0001-fix-configure-and-compile-failures.patch | 14 +- ...emove-dmraid-while-compiling-with-with-dm.patch | 66 +- ...ix-compile-failure-against-musl-C-library.patch | 12 +- .../files/0005-fix-a-clang-compiling-issue.patch | 36 +- .../libblockdev/libblockdev_2.10.bb | 51 - .../libblockdev/libblockdev_2.16.bb | 51 + .../libdivecomputer/files/fix-ar.patch | 8 +- .../recipes-extended/libgxim/libgxim_0.5.0.bb | 4 +- ...-Remove-runtime-check-for-CLOCK_MONOTONIC.patch | 43 - ...onfigure-script-neglecting-re-enable-out-.patch | 56 + .../meta-oe/recipes-extended/libqb/libqb_1.0.2.bb | 23 - .../meta-oe/recipes-extended/libqb/libqb_1.0.3.bb | 25 + .../recipes-extended/libreport/libreport_2.9.2.bb | 5 +- .../recipes-extended/libwmf/libwmf_0.2.8.4.bb | 4 +- .../meta-oe/recipes-extended/lssci/lsscsi_0.28.bb | 12 - .../mml-widget/gtkmathview_0.8.0.bb | 4 +- .../mozjs/Manually_mmap_heap_memory_esr17.patch | 13 +- .../meta-oe/recipes-extended/mraa/mraa_git.bb | 17 +- .../recipes-extended/openwsman/openwsman_2.6.3.bb | 3 + ...0001-Fix-narrowing-errors-Wc-11-narrowing.patch | 48 + .../p7zip/files/CVE-2017-17969.patch | 31 + .../meta-oe/recipes-extended/p7zip/p7zip_16.02.bb | 5 +- .../pam/pam-ssh-agent-auth_0.10.3.bb | 3 + .../polkit/files/gtk-doc-check.patch | 12 - .../recipes-extended/polkit/polkit-gnome_0.105.bb | 26 - .../recipes-extended/rarpd/rarpd_ss981107.bb | 8 +- .../recipes-extended/rocksdb/rocksdb_git.bb | 31 - .../rsyslog/rsyslog/0001-Include-sys-time-h.patch | 6 +- .../rsyslog/rsyslog/0001-Undefine-GLOB_BRACE.patch | 35 - .../rsyslog/rsyslog-fix-ptest-not-finish.patch | 68 +- .../rsyslog/use-pkgconfig-to-check-libgcrypt.patch | 12 +- .../recipes-extended/rsyslog/rsyslog_8.29.0.bb | 1 - .../sblim-sfcb/sblim-sfcb_1.4.9.bb | 11 +- .../smartmontools/smartmontools_6.5.bb | 52 - .../smartmontools/smartmontools_6.6.bb | 52 + .../recipes-extended/socketcan/can-isotp_git.bb | 12 + .../meta-oe/recipes-extended/sysdig/sysdig_git.bb | 6 + .../t1lib/t1lib-5.1.2/configure.patch | 79 +- .../t1lib/t1lib-5.1.2/format_security.patch | 43 +- .../t1lib/t1lib-5.1.2/libtool.patch | 60 +- .../0001-Enable-system-malloc-on-all-linux.patch | 30 - .../tcsh/tcsh/0002-Add-debian-csh-scripts.patch | 60 - .../meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb | 44 - ...0001-Makefile-for-cross-compile-SoftFloat.patch | 348 - ...0002-Makefile-for-cross-compile-TestFloat.patch | 396 - .../recipes-extended/testfloat/testfloat_3a.bb | 35 - ...last-tipcc-Fix-struct-type-for-TIPC_GROUP.patch | 33 + .../recipes-extended/tipcutils/tipcutils_git.bb | 1 + .../recipes-extended/tiptop/tiptop_2.3.1.bb | 26 + .../meta-oe/recipes-extended/tiptop/tiptop_2.3.bb | 26 - .../meta-oe/recipes-extended/tmux/tmux_2.1.bb | 21 - .../meta-oe/recipes-extended/tmux/tmux_2.6.bb | 23 + ...15-fixed-case-logic-in-getThresh-function.patch | 54 - .../meta-oe/recipes-extended/upm/upm_git.bb | 13 +- .../vlock/vlock-2.2.3/disable_vlockrc.patch | 30 +- .../vlock/vlock-2.2.3/vlock-no_tally.patch | 35 +- .../vlock/vlock-2.2.3/vlock_pam_tally2_reset.patch | 19 +- .../meta-oe/recipes-extended/zram/zram/init | 2 +- .../meta-oe/recipes-extended/zsh/zsh_5.3.1.bb | 61 - .../meta-oe/recipes-gnome/atk/atkmm_2.24.2.bb | 4 +- .../gnome-common/gnome-common_3.18.0.bb | 4 + .../gtk+/files/0001-do-not-build-demos.patch | 51 + .../meta-oe/recipes-gnome/gtk+/gtkmm3_3.22.2.bb | 23 + .../meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb | 4 +- ...re.in-remove-deprecated-GNOME_COMMON_INIT.patch | 30 - .../libglade/libglade-2.6.4/glade-cruft.patch | 102 - .../libglade/libglade-2.6.4/no-xml2.patch | 501 - .../libglade-2.6.4/python_environment.patch | 14 - .../recipes-gnome/libglade/libglade_2.6.4.bb | 35 - ...-use-LIBTOOL-instead-of-hardcoded-libtool.patch | 27 - ...-unique-Add-format-qualifier-s-for-string.patch | 32 - .../recipes-gnome/libunique/libunique/build.patch | 421 - .../libunique/fix_for_compile_with_gcc-4.6.0.patch | 36 - .../libunique/libunique/noconst.patch | 130 - .../recipes-gnome/libunique/libunique_1.1.6.bb | 30 - .../meta-oe/recipes-graphics/directfb/directfb.inc | 4 +- ...-set-PYTHON_INSTALL_DIR-by-running-python.patch | 26 + .../0001-Run-python-scripts-using-env.patch | 25 + .../0001-To-fix-error-when-do_package.patch | 31 + .../dnfdragora/0001-disable-build-manpages.patch | 25 + .../recipes-graphics/dnfdragora/dnfdragora_git.bb | 30 + .../fontforge/fontforge_20170731.bb | 2 +- .../0001-Fix-compilation-for-disabled-gnome.patch | 69 + .../fvwm/fvwm/0002-Avoid-absolute-symlinks.patch | 27 + .../meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb | 114 + .../meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb | 4 +- .../meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb | 4 +- ...ENABLE_EXPERIMENTAL-a-configurable-option.patch | 860 + .../glm/files/0002-glm-install-headers-only.patch | 46 + .../meta-oe/recipes-graphics/glm/glm_0.9.8.5.bb | 22 - .../meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb | 28 + .../0001-configure.ac-remove-AM_PO_SUBDIRS.patch | 26 - ...k-for-popt-with-GP_CHECK_LIBRARY-function.patch | 32 - .../0001-configure.ac-remove-AM_PO_SUBDIRS.patch | 26 + ...k-for-popt-with-GP_CHECK_LIBRARY-function.patch | 32 + .../recipes-graphics/gphoto2/gphoto2_2.5.14.bb | 22 + .../recipes-graphics/gphoto2/gphoto2_2.5.8.bb | 22 - .../0001-configure.ac-remove-AM_PO_SUBDIRS.patch | 48 - .../0001-scripts-remove-bashisms.patch | 149 - .../0002-correct-jpeg-memsrcdest-support.patch | 54 - .../10-camera-libgphoto2-device.fdi | 9533 ---------- .../libgphoto2-2.5.8/10-camera-libgphoto2.fdi | 19018 ------------------- .../gphoto2/libgphoto2-2.5.8/40-libgphoto2.rules | 1955 -- .../libgphoto2-2.5.8/avoid_using_sprintf.patch | 133 - .../0001-configure.ac-remove-AM_PO_SUBDIRS.patch | 48 + .../libgphoto2/10-camera-libgphoto2-device.fdi | 9533 ++++++++++ .../gphoto2/libgphoto2/10-camera-libgphoto2.fdi | 19018 +++++++++++++++++++ .../gphoto2/libgphoto2/40-libgphoto2.rules | 1955 ++ .../recipes-graphics/gphoto2/libgphoto2_2.5.16.bb | 54 + .../recipes-graphics/gphoto2/libgphoto2_2.5.8.bb | 56 - .../recipes-graphics/gtkperf/gtkperf_0.40.bb | 4 +- .../libvncserver/libvncserver_0.9.11.bb | 4 +- ...1-Fix-the-error-of-can-t-find-header-file.patch | 101 + ...0001-use-_nl_msg_cat_cntr-only-with-glibc.patch | 40 + .../recipes-graphics/libyui/libyui-ncurses_git.bb | 49 + .../libyui/libyui/0001-Fix-GCC-8-warning.patch | 48 + .../libyui/libyui/0001-Fix-build-with-clang.patch | 687 + .../meta-oe/recipes-graphics/libyui/libyui_git.bb | 41 + .../recipes-graphics/openbox/openbox_3.6.1.bb | 7 +- .../packagegroups/packagegroup-fonts-truetype.bb | 2 +- .../recipes-graphics/pango/pangomm_2.40.1.bb | 4 +- .../recipes-graphics/qrencode/qrencode_git.bb | 4 +- .../meta-oe/recipes-graphics/slim/slim/Makefile.oe | 64 - .../meta-oe/recipes-graphics/slim/slim/slim-dynwm | 8 - .../meta-oe/recipes-graphics/slim/slim/slim.pamd | 19 - .../recipes-graphics/slim/slim/slim.service | 11 - .../recipes-graphics/slim/slim/update_slim_wmlist | 76 - .../meta-oe/recipes-graphics/tslib/tslib_1.1.bb | 53 - .../meta-oe/recipes-graphics/tslib/tslib_1.15.bb | 82 + .../meta-oe/recipes-graphics/vdpau/libvdpau_git.bb | 4 +- .../xcursorgen/xcursorgen_1.0.5.bb | 4 +- .../recipes-graphics/xorg-app/bdftopcf_1.0.5.bb | 13 - .../recipes-graphics/xorg-app/bdftopcf_1.1.bb | 13 + .../recipes-graphics/xorg-app/sessreg_1.1.0.bb | 11 - .../recipes-graphics/xorg-app/sessreg_1.1.1.bb | 11 + .../recipes-graphics/xorg-app/xlsclients_1.1.3.bb | 14 - .../recipes-graphics/xorg-app/xlsclients_1.1.4.bb | 14 + .../recipes-graphics/xorg-app/xlsfonts_1.0.5.bb | 10 - .../recipes-graphics/xorg-app/xlsfonts_1.0.6.bb | 10 + .../meta-oe/recipes-graphics/xorg-app/xterm_330.bb | 5 + .../recipes-graphics/xorg-app/xwud_1.0.4.bb | 12 - .../recipes-graphics/xorg-app/xwud_1.0.5.bb | 12 + .../xorg-data/xorg-data-common.inc | 4 +- .../0001-COPYING-add-GPLv2-license-file.patch | 12 +- .../0001-Don-t-install-Xsession-or-Xserver.patch | 14 +- .../0002-add-setdpi-Xinit.d-script.patch | 12 +- ...06-add-support-for-etc-X11-xserver-system.patch | 14 +- ...nctions-file-instead-etc-init.d-functions.patch | 20 +- ...mon-add-dpi-and-nocursor-params-for-gta01.patch | 16 +- ...mon-add-support-for-n900-alias-nokia_rx-5.patch | 15 +- ...mon-add-support-for-nexus-S-alias-herring.patch | 14 +- ...mon-add-support-for-nexus-one-alias-mahim.patch | 15 +- ...mon-add-support-for-gta04-alias-OpenPhoen.patch | 15 +- ...mon-add-support-for-tuna-alias-Galaxy-Nex.patch | 13 +- ...15-xserver-common-disable-TCP-connections.patch | 4 +- .../xserver-common/xserver-common_1.34.bb | 4 +- .../meta-oe/recipes-kernel/cpupower/cpupower.bb | 2 +- .../0004-crash-fix-build-failure-with-mips.patch | 87 - .../meta-oe/recipes-kernel/crash/crash_7.1.9.bb | 116 - .../meta-oe/recipes-kernel/crash/crash_7.2.0.bb | 115 + .../recipes-kernel/ipmitool/ipmitool_1.8.18.bb | 36 + .../ipmiutil/ipmiutil/fix_systemd_path.patch | 127 + .../recipes-kernel/ipmiutil/ipmiutil_3.0.5.bb | 46 + .../meta-oe/recipes-kernel/kpatch/kpatch.inc | 49 + ...patch-build-add-cross-compilation-support.patch | 103 + ...tch-build-allow-overriding-of-distro-name.patch | 62 + .../meta-oe/recipes-kernel/kpatch/kpatch_git.bb | 11 + .../meta-oe/recipes-kernel/linux/linux.inc | 2 +- .../minicoredumper/files/minicoredumper.init | 2 +- .../minicoredumper/files/minicoredumper.service | 2 +- .../minicoredumper/minicoredumper_2.0.0.bb | 4 + .../alsa/alsa-oss-1.0.17/libio.patch | 43 - .../recipes-multimedia/alsa/alsa-oss/libio.patch | 43 + .../recipes-multimedia/alsa/alsa-oss_1.0.17.bb | 22 - .../recipes-multimedia/alsa/alsa-oss_1.0.28.bb | 20 + .../recipes-multimedia/cdrkit/cdrkit_1.1.11.bb | 4 + .../0001-audio_alsa09.c-alsa-drain-fix.patch | 8 +- .../esound/0002-Undefine-open64-and-fopen64.patch | 8 +- .../esound/0003-Use-I-path-in-configure.patch | 8 +- .../recipes-multimedia/esound/esound/no-docs.patch | 18 +- ...1-typecast-input-parameter-to-int-for-abs.patch | 32 - .../meta-oe/recipes-multimedia/jack/jack_git.bb | 8 +- .../meta-oe/recipes-multimedia/libass/libass.inc | 28 - .../recipes-multimedia/libass/libass_0.13.6.bb | 4 - .../recipes-multimedia/libass/libass_0.14.0.bb | 30 + .../recipes-multimedia/libcdio/libcdio_0.93.bb | 28 - .../recipes-multimedia/libcdio/libcdio_2.0.0.bb | 29 + .../libsdl-mixer/libsdl2-mixer_2.0.1.bb | 27 - .../libsdl-mixer/libsdl2-mixer_2.0.2.bb | 27 + .../recipes-multimedia/mplayer/mpv_0.26.0.bb | 7 +- ...a-ctl-Don-t-install-libmediactl-and-libv4.patch | 6 +- ...tem-do-not-assume-building-in-source-tree.patch | 20 +- ...tl-Define-TEMP_FAILURE_RETRY-if-undefined.patch | 8 +- ...t-Link-mc_nextgen_test-with-libargp-if-ne.patch | 8 +- .../0003-v4l2-ctl-Do-not-use-getsubopt.patch | 8 +- .../v4l-utils/export-mediactl-headers.patch | 20 +- .../v4l2apps/v4l-utils/mediactl-pkgconfig.patch | 18 +- .../libvpx-configure-support-blank-prefix.patch | 23 +- .../recipes-navigation/geoclue/geoclue_2.4.4.bb | 4 +- ...prefix-includepy-with-sysroot-and-drop-sy.patch | 75 - .../gpsd-3.16/0001-include-sys-ttydefaults.h.patch | 35 - ...disable-html-and-man-docs-building-becaus.patch | 52 - ...prefix-includepy-with-sysroot-and-drop-sy.patch | 81 + .../gpsd-3.17/0001-include-sys-ttydefaults.h.patch | 35 + ...disable-html-and-man-docs-building-becaus.patch | 51 + .../recipes-navigation/gpsd/gpsd/60-gpsd.rules | 47 - .../meta-oe/recipes-navigation/gpsd/gpsd/gpsd | 136 - .../recipes-navigation/gpsd/gpsd/gpsd-default | 5 - .../recipes-navigation/gpsd/gpsd/gpsd.service | 10 - .../meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb | 140 - .../meta-oe/recipes-navigation/gpsd/gpsd_3.17.bb | 137 + .../recipes-navigation/orrery/orrery_2.7.bb | 4 +- .../passwdqc/passwdqc/makefile-add-ldflags.patch | 31 + .../recipes-security/passwdqc/passwdqc_1.3.1.bb | 66 + .../tomoyo-tools/tomoyo-tools_2.5.0.bb | 30 + .../0001-Fix-printf-format-errors-with-clang.patch | 28 + .../meta-oe/recipes-shells/dash/dash_0.5.9.1.bb | 29 + .../0001-Enable-system-malloc-on-all-linux.patch | 30 + .../tcsh/tcsh/0002-Add-debian-csh-scripts.patch | 60 + .../meta-oe/recipes-shells/tcsh/tcsh_6.20.00.bb | 44 + .../meta-oe/recipes-shells/zsh/zsh_5.4.2.bb | 64 + .../anthy/anthy/native-helpers.patch | 38 +- .../anthy/anthy/not_build_elc.patch | 11 +- ...need_charset_alias-when-building-for-musl.patch | 13 +- .../augeas/add-missing-argz-conditional.patch | 17 +- .../augeas/augeas/sepbuildfix.patch | 23 +- .../canonical-multitouch/geis_2.2.17.bb | 3 - .../ceres-solver/ceres-solver_1.13.bb | 20 - .../ceres-solver/ceres-solver_1.14.bb | 20 + .../cpprest/cpprest-2.10.2/fix-cmake-install.patch | 17 + .../recipes-support/cpprest/cpprest_2.10.2.bb | 17 + .../cpufrequtils/0001-dont-unset-cflags.patch | 30 - .../cpufrequtils/cpufrequtils_008.bb | 37 - .../recipes-support/cryptsetup/cryptsetup_1.7.4.bb | 36 - .../recipes-support/dos2unix/dos2unix_7.3.4.bb | 34 - .../recipes-support/dos2unix/dos2unix_7.4.0.bb | 34 + .../recipes-support/edac-utils/edac-utils_git.bb | 47 - .../files/add-restart-to-initscript.patch | 33 - .../recipes-support/edac-utils/files/edac.service | 10 - ...cript-be-able-to-automatically-load-EDAC-.patch | 98 - .../engine-pkcs11/engine-pkcs11_0.2.2.bb | 31 - .../recipes-support/eventlog/eventlog_0.2.13.bb | 2 +- .../meta-oe/recipes-support/evtest/evtest_git.bb | 17 - .../meta-oe/recipes-support/fbtest/fb-test_git.bb | 20 - .../meta-oe/recipes-support/fftw/fftw_3.3.6.bb | 81 - .../meta-oe/recipes-support/fftw/fftw_3.3.7.bb | 80 + .../flite-alsa-1.3/flite-1.3-alsa_support-1.2.diff | 6615 ------- .../meta-oe/recipes-support/fltk/fltk.bb | 16 +- ...d-Force-shared-libs-with-unsuffixed-names.patch | 41 + ...er_1_0-fix-build-failure-for-new-gstreame.patch | 71 - .../freerdp/0001-Fix-gstreamer-1.0-detection.patch | 27 + .../freerdp/freerdp/0003-add-missing-define.patch | 45 - .../winpr-makecert-Build-with-install-RPATH.patch | 28 +- .../meta-oe/recipes-support/freerdp/freerdp_git.bb | 9 +- .../meta-oe/recipes-support/gd/gd_2.2.4.bb | 48 - .../meta-oe/recipes-support/gd/gd_2.2.5.bb | 48 + .../meta-oe/recipes-support/gflags/gflags_2.2.0.bb | 2 + .../recipes-support/gnulib/gnulib_2017-08-20.18.bb | 6 +- .../0001-Support-Atomic-ops-on-clang.patch | 16 +- ...Use-ucontext_t-instead-of-struct-ucontext.patch | 8 +- ...heap-checkers-and-debug-allocator-on-musl.patch | 13 +- .../gperftools/0001-fix-build-with-musl-libc.patch | 6 +- ...001-include-fcntl.h-for-loff_t-definition.patch | 6 +- .../gperftools/disable_libunwind_aarch64.patch | 19 +- .../gperftools/gperftools/sgidef.patch | 18 +- .../hddtemp-0.3-beta15-autodetect-717479.patch | 20 +- .../hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff | 182 +- .../htop/files/0001-Use-pkg-config.patch | 39 + .../meta-oe/recipes-support/htop/htop_1.0.3.bb | 22 - .../meta-oe/recipes-support/htop/htop_2.1.0.bb | 35 + .../recipes-support/hunspell/hunspell_1.6.1.bb | 17 - .../recipes-support/hunspell/hunspell_1.6.2.bb | 17 + .../meta-oe/recipes-support/hwdata/hwdata_git.bb | 4 +- .../recipes-support/iksemel/iksemel-1.4/r25.diff | 32 - .../iksemel/avoid-obsolete-gnutls-apis.patch | 55 + .../iksemel/fix-configure-option-parsing.patch | 62 + .../meta-oe/recipes-support/iksemel/iksemel_1.5.bb | 24 + .../recipes-support/ipmitool/ipmitool_1.8.18.bb | 36 - .../ipmiutil/ipmiutil/fix_systemd_path.patch | 127 - .../recipes-support/ipmiutil/ipmiutil_3.0.5.bb | 46 - .../meta-oe/recipes-support/libdbi/libdbi.inc | 17 - .../meta-oe/recipes-support/libdbi/libdbi_0.9.0.bb | 6 - ...Lists.txt-install-FindEigen3.cmake-script.patch | 28 - .../recipes-support/libeigen/libeigen_3.2.8.bb | 21 - .../recipes-support/libeigen/libeigen_3.3.4.bb | 20 + .../meta-oe/recipes-support/libgpiod/libgpiod.bb | 23 - .../meta-oe/recipes-support/libgpiod/libgpiod.inc | 21 + .../recipes-support/libgpiod/libgpiod_0.3.3.bb | 4 + .../recipes-support/libgpiod/libgpiod_1.0.1.bb | 4 + .../meta-oe/recipes-support/libiio/libiio_git.bb | 32 +- .../recipes-support/libmcrypt/libmcrypt_2.5.8.bb | 12 - .../libmicrohttpd/libmicrohttpd_0.9.55.bb | 2 + .../meta-oe/recipes-support/libol/libol_0.3.18.bb | 2 +- .../libsdl-ttf/files/automake_foreign.patch | 13 - .../files/use.pkg-config.for.freetype2.patch | 57 - .../libsdl-ttf/use.pkg-config.for.freetype2.patch | 62 + .../libsdl-ttf/libsdl2-ttf/automake_foreign.patch | 21 + .../libsdl2-ttf/use.pkg-config.for.freetype2.patch | 62 + .../recipes-support/libsodium/libsodium_1.0.11.bb | 12 - ...asic_test.py-disable-RedHat-specific-test.patch | 32 + .../recipes-support/libteam/libteam/run-ptest | 3 + .../recipes-support/libteam/libteam_1.27.bb | 8 +- .../lm_sensors/lmsensors-config/fancontrol | 2 - .../lm_sensors/lmsensors-config/sensord | 16 - .../lm_sensors/lmsensors-config/sensord.cgi | 10 - .../lm_sensors/lmsensors-config/sensord.conf | 16 - .../lm_sensors/lmsensors-config/sensors.conf | 2 - .../lm_sensors/lmsensors-config_1.0.bb | 63 - ...ensors-detect-print-a-special-message-whe.patch | 40 - ...-limit-sys-io.h-header-include-to-just-gl.patch | 88 - .../lm_sensors/lmsensors/fancontrol.init | 47 - .../lm_sensors/lmsensors/sensord.init | 49 - .../recipes-support/lm_sensors/lmsensors_3.4.0.bb | 140 - ...FPMathLib20U1-Check-for-__DEFINED_wchar_t.patch | 36 - ...to-use-build-settings-from-environment-va.patch | 67 - ...__-to-control-use-of-gnu_get_libc_version.patch | 50 - .../0001-Use-long-long-instead-of-int64_t.patch | 67 - ...0001-Use-strerror_r-only-on-glibc-systems.patch | 26 - .../mongodb/0001-mongo-Add-using-std-string.patch | 72 - ...finition-for-the-macro-__ELF_NATIVE_CLASS.patch | 35 - ...-Add-missing-dependenncy-on-local_shardin.patch | 28 - ...-Conditionalize-glibc-specific-strerror_r.patch | 39 - .../0004-wiredtiger-Disable-strtouq-on-musl.patch | 26 - .../mongodb/mongodb/arm64-support.patch | 43 - .../mongodb/disable-hw-crc32-on-arm64-s390x.patch | 50 - .../meta-oe/recipes-support/mongodb/mongodb_git.bb | 77 - .../recipes-support/mysql/mariadb-native_5.5.57.bb | 19 - .../meta-oe/recipes-support/mysql/mariadb.inc | 293 - .../mariadb/0001-disable-ucontext-on-musl.patch | 28 - .../mysql/mariadb/change-cc-to-cc-version.patch | 26 - .../mariadb/configure.cmake-fix-valgrind.patch | 41 - .../mysql/mariadb/fix-a-building-failure.patch | 31 - .../mysql/mariadb/fix-cmake-module-path.patch | 29 - .../mysql/mariadb/fix-mysqlclient-r-version.patch | 161 - .../recipes-support/mysql/mariadb/install_db | 13 - .../mysql/mariadb/install_db.service | 17 - .../meta-oe/recipes-support/mysql/mariadb/my.cnf | 25 - .../mysql/mariadb/mysql-systemd-start | 66 - .../recipes-support/mysql/mariadb/mysqld.service | 25 - .../mysql/mariadb/remove-bad-path.patch | 18 - .../recipes-support/mysql/mariadb_5.5.57.bb | 27 - .../recipes-support/mysql/mysql-python_1.2.5.bb | 17 - .../meta-oe/recipes-support/nano/nano_2.7.4.bb | 4 - .../meta-oe/recipes-support/nano/nano_2.9.3.bb | 4 + .../meta-oe/recipes-support/ne10/ne10_1.2.1.bb | 2 +- .../recipes-support/neon/neon/pkgconfig.patch | 15 + .../meta-oe/recipes-support/neon/neon_0.30.2.bb | 38 + .../recipes-support/nghttp2/nghttp2_1.26.0.bb | 16 - .../open-vm-tools/files/vmtoolsd.init | 66 + .../open-vm-tools/open-vm-tools_10.1.5.bb | 17 +- .../recipes-support/openct/openct_0.6.20.bb | 8 +- .../opencv/opencv/already-exists.patch | 394 + .../recipes-support/opencv/opencv/javagen.patch | 16 + .../recipes-support/opencv/opencv/protobuf.patch | 57 + .../recipes-support/opencv/opencv/tinydnn.patch | 34 + .../meta-oe/recipes-support/opencv/opencv_3.3.bb | 17 +- .../passwdqc/passwdqc/makefile-add-ldflags.patch | 31 - .../recipes-support/passwdqc/passwdqc_1.3.1.bb | 63 - .../pidgin/pidgin/pidgin-cross-python-265.patch | 18 +- .../pidgin/pidgin/purple-OE-branding-25.patch | 18 +- .../pidgin/pidgin/sanitize-configure.ac.patch | 22 +- .../pkcs11-helper/pkcs11-helper_1.11.bb | 29 - .../meta-oe/recipes-support/poco/poco_1.7.9.bb | 106 - .../meta-oe/recipes-support/poco/poco_1.8.0.1.bb | 106 + .../recipes-support/poppler/poppler-data_0.4.7.bb | 36 - .../recipes-support/poppler/poppler-data_0.4.8.bb | 36 + ...0001-Do-not-overwrite-all-our-build-flags.patch | 38 + ...dd-manadatory-options-to-find-qt4-qt5-moc.patch | 91 - ...Dev.cc-fix-build-error-when-using-fixedpo.patch | 100 + .../0002-fix-gcc-6-math-ambiguous-errors.patch | 11 - .../recipes-support/poppler/poppler_0.57.0.bb | 55 - .../recipes-support/poppler/poppler_0.63.0.bb | 56 + ...0001-Use-pkg-config-for-libxml2-detection.patch | 43 - .../postgresql/files/not-check-libperl.patch | 31 - .../postgresql/files/postgresql-bashprofile | 4 - .../postgresql/files/postgresql-setup | 73 - .../postgresql/files/postgresql.init | 193 - .../postgresql/files/postgresql.pam | 4 - .../postgresql/files/postgresql.service | 27 - .../files/remove.autoconf.version.check.patch | 16 - .../recipes-support/postgresql/postgresql.inc | 383 - .../postgresql/postgresql_9.4.15.bb | 15 - .../psqlodbc-donot-use-the-hardcode-libdir.patch | 26 - .../files/psqlodbc-fix-for-ptest-support.patch | 148 - ...bc-remove-some-checks-for-cross-compiling.patch | 118 - .../recipes-support/psqlodbc/files/run-ptest | 46 - .../meta-oe/recipes-support/psqlodbc/psqlodbc.inc | 50 - .../psqlodbc/psqlodbc_09.05.0300.bb | 14 - .../recipes-support/soci/soci/soci_libdir.patch | 28 - .../meta-oe/recipes-support/soci/soci_3.2.2.bb | 49 - .../recipes-support/spitools/spitools_git.bb | 7 +- ...c-Fix-format-not-a-string-literal-warning.patch | 32 - .../sqlite-2.8.17/mainmk_build_dynamic.patch | 32 - .../sqlite/sqlite-2.8.17/mainmk_no_tcl.patch | 20 - .../recipes-support/sqlite/sqlite-2.8.17/sqlite.pc | 12 - .../recipes-support/sqlite/sqlite_2.8.17.bb | 61 - ...ry-leak-problem-when-HAVE_ENVIRON-defined.patch | 8 +- ...c-add-option-enable-thread-tls-to-manage-.patch | 19 +- .../syslog-ng/files/fix-config-libnet.patch | 15 +- .../syslog-ng/files/fix-invalid-ownership.patch | 13 +- .../recipes-support/syslog-ng/syslog-ng.inc | 4 +- .../tomoyo-tools/tomoyo-tools_2.5.0.bb | 30 - .../recipes-support/toscoterm/toscoterm_git.bb | 4 +- ...01-Make-udev-rules-directory-configurable.patch | 10 +- .../0001-fix-build-with-newer-glibc-versions.patch | 6 +- .../udisks/udisks/optional-depends.patch | 72 +- .../udisks/udisks-1.0.5-fix-service-file.patch | 5 +- .../udisks2/0001-data-fix-out-of-tree-build.patch | 35 + .../recipes-support/udisks/udisks2_2.1.8.bb | 39 - .../recipes-support/udisks/udisks2_2.7.6.bb | 49 + .../uim/uim/0001-Add-support-for-aarch64.patch | 6 +- .../uim/uim/0001-fix-bug-for-cross-compile.patch | 6 +- .../uim/uim/uim-module-manager.patch | 20 +- .../meta-oe/recipes-support/uim/uim_1.8.6.bb | 8 +- .../do-not-use-libltdl-source-directory.patch | 12 +- .../recipes-support/unixodbc/unixodbc_2.3.4.bb | 27 - .../recipes-support/unixodbc/unixodbc_2.3.6.bb | 27 + .../recipes-support/upower/upower_0.99.5.bb | 39 - .../recipes-support/upower/upower_0.99.7.bb | 34 + .../recipes-support/uriparser/uriparser_0.8.4.bb | 14 + .../usb-modeswitch/usb-modeswitch_2.5.0.bb | 8 +- .../recipes-support/uthash/uthash/run-ptest | 10 + .../meta-oe/recipes-support/uthash/uthash_1.9.7.bb | 16 - .../meta-oe/recipes-support/uthash/uthash_2.0.2.bb | 46 + .../vboxguestdrivers/vboxguestdrivers_5.1.26.bb | 69 - .../vboxguestdrivers/vboxguestdrivers_5.2.8.bb | 78 + .../recipes-support/vim/files/CVE-2017-17087.patch | 70 + .../meta-oe/recipes-support/vim/vim_8.0.0983.bb | 6 +- .../websocketpp-0.7.0/0001-Fix-issue-599.patch | 31 + .../4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch | 155 + .../9ddb300d874a30db35e3ad58f188944bef0bf31b.patch | 600 + .../websocketpp-0.7.0/disable-tests.patch | 51 + .../websocketpp/websocketpp_0.7.0.bb | 21 + ...disable-man-generation-disable-documentat.patch | 31 - .../xdg-user-dirs/files/xdg-user-dirs.desktop | 9 - .../xdg-user-dirs/xdg-user-dirs_0.15.bb | 25 - .../xdg-user-dirs/xdg-user-dirs_0.17.bb | 16 + .../recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb | 23 + ...istinguished_name-in-etc-xrdp-openssl.con.patch | 33 + .../xrdp/xrdp/0001-Fix-of-CVE-2017-16927.patch | 148 + .../xrdp/0001-Fix-sesman.ini-and-xrdp.ini.patch | 75 + .../xrdp/xrdp/0001-Fix-the-compile-error.patch | 35 + .../recipes-support/xrdp/xrdp/xrdp.sysconfig | 4 + .../meta-oe/recipes-support/xrdp/xrdp_0.9.4.bb | 99 + .../meta-oe/recipes-support/zile/zile_2.4.11.bb | 25 - .../meta-oe/recipes-support/zile/zile_2.4.14.bb | 25 + .../meta-oe/recipes-test/cppunit/cppunit_1.13.2.bb | 14 + ...e.am-do-not-preserve-file-flags-when-copy.patch | 31 + .../meta-oe/recipes-test/cunit/cunit_2.1-3.bb | 19 + .../cunit/files/fixup-install-docdir.patch | 36 + .../meta-oe/recipes-test/cxxtest/cxxtest_4.3.bb | 21 + .../meta-oe/recipes-test/evtest/evtest_git.bb | 17 + .../meta-oe/recipes-test/fbtest/fb-test_git.bb | 20 + .../meta-oe/recipes-test/gtest/gtest_1.8.0.bb | 9 +- .../meta-oe/recipes-test/pm-qa/pm-qa_git.bb | 65 + .../0001-Several-changes-to-fix-musl-build.patch | 141 + .../0002-stress-fcntl-fix-build-for-musl.patch | 25 + .../recipes-test/stress-ng/stress-ng_0.09.14.bb | 25 + ...0001-Makefile-for-cross-compile-SoftFloat.patch | 348 + ...0002-Makefile-for-cross-compile-TestFloat.patch | 396 + .../meta-oe/recipes-test/testfloat/testfloat_3a.bb | 35 + .../meta-openembedded/meta-oe/site/endian-big | 2 - .../meta-openembedded/meta-oe/site/endian-little | 2 - import-layers/meta-openembedded/meta-perl/README | 11 +- .../meta-openembedded/meta-perl/conf/layer.conf | 2 + .../recipes-perl/libcgi/libcgi-perl_4.36.bb | 20 - .../recipes-perl/libcgi/libcgi-perl_4.38.bb | 25 + .../recipes-perl/libdb/libdbd-sqlite-perl_1.54.bb | 2 + .../recipes-perl/libencode/libencode-perl_2.83.bb | 54 - .../recipes-perl/libencode/libencode-perl_2.94.bb | 68 + .../libextutils/libextutils-cppguess-perl_0.09.bb | 37 - .../libextutils/libextutils-cppguess-perl_0.12.bb | 37 + .../libio/libio-socket-ssl-perl_1.997.bb | 43 - .../libio/libio-socket-ssl-perl_2.054.bb | 47 + .../libmime/libmime-types-perl_2.13.bb | 26 - .../libmime/libmime-types-perl_2.17.bb | 42 + .../libmodule/libmodule-pluggable-perl_5.2.bb | 11 +- .../libmodule/libmodule-runtime-perl_0.015.bb | 35 - .../libmodule/libmodule-runtime-perl_0.016.bb | 37 + .../recipes-perl/libmoo/libmoo-perl_2.003002.bb | 44 - .../recipes-perl/libmoo/libmoo-perl_2.003004.bb | 44 + .../recipes-perl/libnet/libnet-dns-perl_1.10.bb | 25 - .../recipes-perl/libnet/libnet-dns-perl_1.14.bb | 27 + .../recipes-perl/libnet/libnet-ssleay-perl_1.81.bb | 44 - .../recipes-perl/libnet/libnet-ssleay-perl_1.84.bb | 47 + .../librole/librole-tiny-perl_2.000005.bb | 29 - .../librole/librole-tiny-perl_2.000006.bb | 29 + .../libtest/libtest-harness-perl_3.36.bb | 80 - .../libtest/libtest-harness-perl_3.42.bb | 120 + .../libxml/libxml-libxml-perl_2.0129.bb | 44 - .../libxml/libxml-libxml-perl_2.0132.bb | 47 + import-layers/meta-openembedded/meta-python/README | 7 +- .../meta-python/classes/pypi.bbclass | 26 - .../meta-openembedded/meta-python/conf/layer.conf | 2 + .../recipes-connectivity/gateone/gateone_git.bb | 1 - .../python-mprpc/python-mprpc.inc | 4 +- .../python-mprpc/python-mprpc_0.1.14.bb | 2 - .../python-mprpc/python-mprpc_0.1.16.bb | 2 + .../python-mprpc/python3-mprpc_0.1.14.bb | 2 - .../python-mprpc/python3-mprpc_0.1.16.bb | 2 + .../python-pyro4/python-pyro4_4.62.bb | 18 - .../python-pyro4/python-pyro4_4.63.bb | 18 + .../python-thrift/python-thrift_0.10.0.bb | 17 - .../python-thrift/python-thrift_0.11.0.bb | 15 + .../recipes-devtools/python/pyrtm_0.4.2.bb | 22 +- .../recipes-devtools/python/python-alembic.inc | 15 + .../python/python-alembic_0.9.8.bb | 2 + .../recipes-devtools/python/python-asn1crypto.inc | 14 +- .../python/python-asn1crypto_0.23.0.bb | 2 - .../python/python-asn1crypto_0.24.0.bb | 7 + .../recipes-devtools/python/python-astroid.inc | 19 +- .../python/python-astroid_1.5.3.bb | 7 - .../python/python-astroid_1.6.3.bb | 10 + .../recipes-devtools/python/python-attr.inc | 9 + .../recipes-devtools/python/python-attr_0.3.1.bb | 2 + .../recipes-devtools/python/python-attrs.inc | 9 +- .../recipes-devtools/python/python-attrs_17.3.0.bb | 2 - .../recipes-devtools/python/python-attrs_17.4.0.bb | 6 + ...001-setup.py-remove-the-dependency-on-m2r.patch | 13 +- .../python/python-aws-iot-device-sdk-python.inc | 33 +- .../python-aws-iot-device-sdk-python_1.2.0.bb | 2 - .../python-aws-iot-device-sdk-python_1.3.1.bb | 4 + .../recipes-devtools/python/python-babel.inc | 9 +- .../recipes-devtools/python/python-babel_2.5.1.bb | 2 - .../recipes-devtools/python/python-babel_2.5.3.bb | 6 + .../recipes-devtools/python/python-bcrypt.inc | 6 +- .../recipes-devtools/python/python-bcrypt_3.1.3.bb | 2 - .../recipes-devtools/python/python-bcrypt_3.1.4.bb | 6 + .../recipes-devtools/python/python-behave_1.2.5.bb | 10 - .../recipes-devtools/python/python-behave_1.2.6.bb | 10 + .../recipes-devtools/python/python-bitarray.inc | 2 +- .../recipes-devtools/python/python-blinker.inc | 7 + .../recipes-devtools/python/python-blinker_1.4.bb | 8 +- .../recipes-devtools/python/python-can.inc | 12 +- .../recipes-devtools/python/python-can_2.0.0b1.bb | 4 - .../recipes-devtools/python/python-can_2.1.0.bb | 8 + .../python/python-cassandra-driver.inc | 4 +- .../recipes-devtools/python/python-certifi.inc | 4 +- .../python/python-certifi_2017.7.27.1.bb | 2 - .../python/python-certifi_2018.1.18.bb | 2 + .../recipes-devtools/python/python-cffi.inc | 6 +- .../recipes-devtools/python/python-cffi_1.11.2.bb | 2 - .../recipes-devtools/python/python-cffi_1.11.5.bb | 6 + .../recipes-devtools/python/python-chardet.inc | 10 + .../python/python-chardet_3.0.4.bb | 2 + .../recipes-devtools/python/python-cmd2_0.7.7.bb | 20 - .../recipes-devtools/python/python-cmd2_0.8.1.bb | 21 + .../python/python-configparser.inc | 11 + .../python/python-configparser_3.5.0.bb | 2 + .../python/python-cryptography-vectors.inc | 4 +- .../python/python-cryptography-vectors_2.0.3.bb | 2 - .../python/python-cryptography-vectors_2.1.4.bb | 2 + .../python/python-cryptography.inc | 7 +- .../python/python-cryptography_2.0.3.bb | 21 - .../python/python-cryptography_2.1.4.bb | 22 + .../recipes-devtools/python/python-cython.inc | 22 +- .../python/python-cython_0.27.1.bb | 9 - .../python/python-cython_0.28.2.bb | 10 + .../recipes-devtools/python/python-dateutil.inc | 13 +- .../python/python-dateutil_2.6.1.bb | 2 - .../python/python-dateutil_2.7.2.bb | 2 + .../recipes-devtools/python/python-dbus_1.2.4.bb | 31 - .../recipes-devtools/python/python-dbus_1.2.6.bb | 32 + ...nality-to-add-own-objects-to-internal-obj.patch | 21 +- ...ibility-to-import-templates-from-packages.patch | 18 +- .../python/python-dbusmock_0.16.7.bb | 1 - .../recipes-devtools/python/python-decorator.inc | 4 +- .../python/python-decorator_4.1.2.bb | 4 - .../python/python-decorator_4.3.0.bb | 4 + .../python/python-django-south.inc | 2 +- .../recipes-devtools/python/python-django.inc | 22 +- .../python/python-django_1.11.10.bb | 8 + .../python/python-django_1.11.5.bb | 2 - .../recipes-devtools/python/python-dominate.inc | 11 + .../python/python-dominate_2.3.1.bb | 13 +- .../recipes-devtools/python/python-editor.inc | 9 + .../recipes-devtools/python/python-editor_1.0.3.bb | 2 + .../recipes-devtools/python/python-evdev.inc | 21 + .../recipes-devtools/python/python-evdev_0.7.0.bb | 17 +- .../recipes-devtools/python/python-flask-babel.inc | 16 + .../python/python-flask-babel_0.11.2.bb | 2 + .../python/python-flask-bootstrap.inc | 14 + .../python/python-flask-bootstrap_3.3.7.1.bb | 16 +- .../recipes-devtools/python/python-flask-login.inc | 4 +- .../python/python-flask-login_0.4.0.bb | 2 - .../python/python-flask-login_0.4.1.bb | 2 + .../recipes-devtools/python/python-flask-mail.inc | 12 + .../python/python-flask-mail_0.9.1.bb | 2 + .../python/python-flask-migrate.inc | 14 + .../python/python-flask-migrate_2.1.1.bb | 2 + .../recipes-devtools/python/python-flask-nav.inc | 13 + .../python/python-flask-nav_0.6.bb | 2 + .../python/python-flask-pymongo.inc | 2 +- .../python/python-flask-restful.inc | 16 + .../python/python-flask-restful_0.3.6.bb | 2 + .../python/python-flask-script.inc | 12 + .../python/python-flask-script_2.0.6.bb | 2 + .../python/python-flask-sqlalchemy.inc | 10 + .../python/python-flask-sqlalchemy_2.3.0.bb | 12 - .../python/python-flask-sqlalchemy_2.3.2.bb | 2 + .../python/python-flask-uploads.inc | 12 + .../python/python-flask-uploads_0.2.1.bb | 2 + .../recipes-devtools/python/python-flask-user.inc | 17 + .../python/python-flask-user_0.6.19.bb | 2 + .../recipes-devtools/python/python-flask-wtf.inc | 15 + .../import-simplejson-as-json.patch | 28 - .../python/python-flask-wtf_0.12.bb | 17 - .../python/python-flask-wtf_0.14.2.bb | 2 + .../python/python-flask-xstatic.inc | 16 + .../python-flask-xstatic/remove-pip-requires.patch | 7 + .../python/python-flask-xstatic_0.0.1.bb | 2 + .../recipes-devtools/python/python-flask.inc | 2 +- .../python/python-future_0.16.0.bb | 13 + .../recipes-devtools/python/python-gevent.inc | 1 - .../recipes-devtools/python/python-gevent_1.2.2.bb | 1 + .../recipes-devtools/python/python-greenlet.inc | 4 +- .../python/python-greenlet_0.4.12.bb | 2 - .../python/python-greenlet_0.4.13.bb | 2 + .../python/python-grpcio-tools_1.6.3.bb | 17 - .../python/python-grpcio-tools_1.8.4.bb | 17 + ...up.py-Do-not-mix-C-and-C-compiler-options.patch | 19 +- .../recipes-devtools/python/python-grpcio_1.6.0.bb | 25 - .../recipes-devtools/python/python-grpcio_1.8.4.bb | 25 + .../recipes-devtools/python/python-html5lib.inc | 7 +- .../python/python-html5lib_0.999999999.bb | 2 - .../python/python-html5lib_1.0.1.bb | 2 + .../recipes-devtools/python/python-humanize.inc | 4 + .../recipes-devtools/python/python-incremental.inc | 6 + .../python/python-ipaddress_1.0.18.bb | 13 - .../python/python-ipaddress_1.0.19.bb | 13 + .../recipes-devtools/python/python-iso8601.inc | 4 + .../recipes-devtools/python/python-isort.inc | 9 +- .../recipes-devtools/python/python-isort_4.2.15.bb | 2 - .../recipes-devtools/python/python-isort_4.3.4.bb | 2 + .../python/python-itsdangerous.inc | 5 + .../python/python-itsdangerous_0.24.bb | 4 + .../recipes-devtools/python/python-javaobj-py3.inc | 15 + .../python/python-javaobj-py3_0.2.4.bb | 2 + .../recipes-devtools/python/python-jinja2.inc | 8 +- .../recipes-devtools/python/python-jinja2_2.10.bb | 8 + .../recipes-devtools/python/python-jinja2_2.9.6.bb | 2 - .../recipes-devtools/python/python-jsonpatch.inc | 12 + .../python/python-jsonpatch_1.16.bb | 12 - .../python/python-jsonpatch_1.23.bb | 4 + .../recipes-devtools/python/python-jsonpointer.inc | 13 + .../python/python-jsonpointer_1.12.bb | 11 - .../python/python-jsonpointer_2.0.bb | 4 + .../recipes-devtools/python/python-jsonschema.inc | 4 - .../python/python-jsonschema_2.6.0.bb | 4 + .../python/python-lockfile_0.12.2.bb | 6 + .../recipes-devtools/python/python-lxml.inc | 10 +- .../recipes-devtools/python/python-lxml_4.1.0.bb | 2 - .../recipes-devtools/python/python-lxml_4.2.1.bb | 2 + ...y-link-in-sysroot-not-in-host-directories.patch | 19 +- .../recipes-devtools/python/python-mako.inc | 21 + .../recipes-devtools/python/python-mako_1.0.7.bb | 2 + .../recipes-devtools/python/python-markupsafe.inc | 2 +- .../python/python-markupsafe_1.0.bb | 2 + .../python/python-monotonic_1.3.bb | 10 - .../python/python-monotonic_1.4.bb | 10 + .../recipes-devtools/python/python-msgpack.inc | 8 +- .../python/python-msgpack_0.4.8.bb | 2 - .../python/python-msgpack_0.5.6.bb | 2 + .../python/python-ndg-httpsclient.inc | 11 +- .../python/python-ndg-httpsclient_0.4.3.bb | 2 - .../python/python-ndg-httpsclient_0.4.4.bb | 2 + .../recipes-devtools/python/python-netaddr.inc | 5 + .../python/python-netaddr_0.7.19.bb | 4 + .../python/python-networkx_1.11.bb | 10 - .../recipes-devtools/python/python-networkx_2.1.bb | 12 + .../recipes-devtools/python/python-oauthlib.inc | 25 + .../python/python-oauthlib_2.0.6.bb | 4 + .../recipes-devtools/python/python-paho-mqtt.inc | 12 +- .../python/python-paho-mqtt_1.3.0.bb | 3 - .../python/python-paho-mqtt_1.3.1.bb | 6 + .../recipes-devtools/python/python-pam_1.8.2.bb | 3 + .../recipes-devtools/python/python-pandas.inc | 10 +- .../python/python-pandas_0.20.3.bb | 7 - .../python/python-pandas_0.22.0.bb | 7 + .../recipes-devtools/python/python-parse_1.8.2.bb | 2 +- .../recipes-devtools/python/python-passlib.inc | 6 + .../recipes-devtools/python/python-pep8_1.7.0.bb | 14 - .../recipes-devtools/python/python-pep8_1.7.1.bb | 14 + .../recipes-devtools/python/python-pexpect.inc | 8 +- .../python/python-pexpect_4.2.1.bb | 2 - .../python/python-pexpect_4.5.0.bb | 2 + .../recipes-devtools/python/python-pip_9.0.1.bb | 14 - .../recipes-devtools/python/python-pip_9.0.3.bb | 14 + .../recipes-devtools/python/python-pluggy.inc | 9 + .../recipes-devtools/python/python-pluggy_0.6.0.bb | 2 + .../recipes-devtools/python/python-ply.inc | 18 + .../recipes-devtools/python/python-ply_3.10.bb | 17 - .../recipes-devtools/python/python-ply_3.11.bb | 2 + .../recipes-devtools/python/python-pretend.inc | 4 +- .../python/python-pretend_1.0.8.bb | 2 - .../python/python-pretend_1.0.9.bb | 2 + .../python/python-prompt-toolkit.inc | 1 - .../python/python-prompt-toolkit_1.0.15.bb | 4 + .../recipes-devtools/python/python-protobuf.inc | 17 +- .../python/python-protobuf_3.4.0.bb | 2 - .../python/python-protobuf_3.5.2.bb | 2 + .../recipes-devtools/python/python-psutil.inc | 14 +- .../recipes-devtools/python/python-psutil_5.3.1.bb | 2 - .../recipes-devtools/python/python-psutil_5.4.3.bb | 6 + .../recipes-devtools/python/python-py.inc | 6 +- .../recipes-devtools/python/python-py_1.4.34.bb | 2 - .../recipes-devtools/python/python-py_1.5.2.bb | 2 + .../python/python-pyasn1-modules.inc | 16 + .../python/python-pyasn1-modules_0.2.1.bb | 2 + .../recipes-devtools/python/python-pyasn1.inc | 5 +- .../recipes-devtools/python/python-pyasn1_0.3.6.bb | 2 - .../recipes-devtools/python/python-pyasn1_0.4.2.bb | 6 + .../recipes-devtools/python/python-pybind11.inc | 6 +- .../python/python-pybind11_2.2.1.bb | 2 - .../python/python-pybind11_2.2.2.bb | 2 + .../recipes-devtools/python/python-pybluez.inc | 21 + .../recipes-devtools/python/python-pybluez_0.22.bb | 19 +- .../recipes-devtools/python/python-pycparser.inc | 3 +- .../python/python-pycparser_2.18.bb | 4 + .../recipes-devtools/python/python-pycrypto.inc | 6 +- .../python/python-pycrypto_2.6.1.bb | 4 - .../python/python-pycryptodome.inc | 29 + .../python/python-pycryptodome_3.4.11.bb | 2 + .../recipes-devtools/python/python-pydbus.inc | 11 + .../recipes-devtools/python/python-pydbus_0.6.0.bb | 2 + .../recipes-devtools/python/python-pyexpect.inc | 11 + .../python/python-pyexpect_1.0.17.bb | 2 + .../python/python-pyflakes_1.2.3.bb | 14 - .../python/python-pyflakes_1.6.0.bb | 14 + ...001-reflect-2.1-reporting-for-key-imports.patch | 6 +- .../0002-passphrase_cb-is-deprecated.patch | 6 +- ...ric-error-when-no-passphrase-callback-pre.patch | 6 +- .../recipes-devtools/python/python-pyiface.inc | 11 + .../python/python-pyiface_0.0.5.bb | 2 + .../recipes-devtools/python/python-pyinotify.inc | 7 +- .../python/python-pyinotify_0.9.6.bb | 4 + .../recipes-devtools/python/python-pyjks.inc | 22 + .../recipes-devtools/python/python-pyjks_17.1.1.bb | 2 + .../recipes-devtools/python/python-pyjwt.inc | 17 + .../recipes-devtools/python/python-pyjwt_1.6.1.bb | 2 + .../recipes-devtools/python/python-pylint.inc | 30 +- .../recipes-devtools/python/python-pylint_1.7.4.bb | 4 - .../recipes-devtools/python/python-pylint_1.8.3.bb | 4 + .../recipes-devtools/python/python-pymisp.inc | 12 +- .../python/python-pymisp_2.4.80.bb | 2 - .../python/python-pymisp_2.4.89.bb | 2 + .../recipes-devtools/python/python-pymongo.inc | 8 +- .../python/python-pymongo_3.5.1.bb | 2 - .../python/python-pymongo_3.6.1.bb | 2 + .../recipes-devtools/python/python-pynetlinux.inc | 11 + .../python/python-pynetlinux_1.1.bb | 2 + .../recipes-devtools/python/python-pyopenssl.inc | 4 +- .../python/python-pyopenssl_17.3.0.bb | 2 - .../python/python-pyopenssl_17.5.0.bb | 2 + .../recipes-devtools/python/python-pyparsing.inc | 2 +- .../recipes-devtools/python/python-pyperclip.inc | 12 + .../python/python-pyperclip_1.6.0.bb | 7 + .../recipes-devtools/python/python-pyroute2.inc | 31 +- .../import-simplejson-as-json.patch | 26 - .../python/python-pyroute2_0.3.22.bb | 2 - .../python/python-pyroute2_0.4.21.bb | 6 + .../recipes-devtools/python/python-pyserial.inc | 43 +- .../recipes-devtools/python/python-pyserial_3.4.bb | 2 +- .../recipes-devtools/python/python-pysmi_0.1.2.bb | 22 - .../recipes-devtools/python/python-pysmi_0.2.2.bb | 16 + .../recipes-devtools/python/python-pysocks.inc | 7 +- .../python/python-pysocks_1.6.7.bb | 2 - .../python/python-pysocks_1.6.8.bb | 2 + .../recipes-devtools/python/python-pystache.inc | 13 + .../python/python-pystache_0.5.4.bb | 2 + .../python/python-pytest-runner.inc | 8 +- .../python/python-pytest-runner_2.12.1.bb | 5 - .../python/python-pytest-runner_3.0.bb | 5 + .../recipes-devtools/python/python-pytest.inc | 9 +- ...ove-the-setup_requires-for-setuptools-scm.patch | 15 +- .../python/python-pytest/pytest_version_fix.patch | 2 +- .../recipes-devtools/python/python-pytest_3.2.2.bb | 2 - .../recipes-devtools/python/python-pytest_3.4.2.bb | 8 + .../recipes-devtools/python/python-pytz.inc | 10 +- .../recipes-devtools/python/python-pytz_2017.2.bb | 2 - .../recipes-devtools/python/python-pytz_2018.4.bb | 2 + .../recipes-devtools/python/python-pyudev.inc | 1 - .../python/python-pyudev_0.21.0.bb | 1 + .../recipes-devtools/python/python-pyusb.inc | 6 +- .../python/python-pyusb_1.0.0b2.bb | 2 - .../recipes-devtools/python/python-pyusb_1.0.2.bb | 2 + .../recipes-devtools/python/python-pyyaml.inc | 4 + .../recipes-devtools/python/python-redis.inc | 4 + .../python/python-robotframework.inc | 26 + .../python/python-robotframework_3.0.2.bb | 6 + .../recipes-devtools/python/python-scrypt.inc | 16 + ...crypt-remove-the-hard-coded-include-paths.patch | 26 + .../recipes-devtools/python/python-scrypt_0.8.6.bb | 3 + .../recipes-devtools/python/python-serpent.inc | 6 +- .../recipes-devtools/python/python-serpent_1.23.bb | 2 - .../recipes-devtools/python/python-serpent_1.24.bb | 2 + .../python/python-setuptools-scm.inc | 8 +- .../python/python-setuptools-scm_1.15.6.bb | 2 - .../python/python-setuptools-scm_1.15.7.bb | 4 + .../recipes-devtools/python/python-simplejson.inc | 12 +- .../python/python-simplejson_3.11.1.bb | 2 - .../python/python-simplejson_3.13.2.bb | 4 + .../recipes-devtools/python/python-smbus.inc | 16 +- .../recipes-devtools/python/python-smbus_3.1.2.bb | 2 - .../recipes-devtools/python/python-smbus_4.0.bb | 2 + .../python/python-snimpy_0.8.11.bb | 26 - .../python/python-snimpy_0.8.12.bb | 20 + .../recipes-devtools/python/python-speaklater.inc | 9 + .../python/python-speaklater_1.3.bb | 2 + .../recipes-devtools/python/python-sqlalchemy.inc | 6 +- .../python/python-sqlalchemy_1.1.14.bb | 2 - .../python/python-sqlalchemy_1.1.17.bb | 2 + .../recipes-devtools/python/python-systemd.inc | 18 + ...ovide-implementation-of-strndupa-for-musl.patch | 42 + .../recipes-devtools/python/python-systemd_234.bb | 15 +- .../recipes-devtools/python/python-tornado.inc | 11 +- .../python/python-tornado_4.5.2.bb | 3 - .../python/python-tornado_4.5.3.bb | 8 + .../recipes-devtools/python/python-twisted.inc | 4 + .../python/python-twisted_17.9.0.bb | 6 - .../recipes-devtools/python/python-twofish.inc | 13 + .../python/python-twofish_0.3.0.bb | 2 + .../recipes-devtools/python/python-typing.inc | 4 +- .../recipes-devtools/python/python-typing_3.6.2.bb | 2 - .../recipes-devtools/python/python-typing_3.6.4.bb | 2 + .../recipes-devtools/python/python-ujson.inc | 2 +- .../recipes-devtools/python/python-unidiff.inc | 9 +- .../python/python-unidiff_0.5.4.bb | 2 - .../python/python-unidiff_0.5.5.bb | 2 + .../recipes-devtools/python/python-visitor.inc | 6 + .../python/python-visitor_0.1.3.bb | 8 +- .../recipes-devtools/python/python-webcolors.inc | 6 +- .../python/python-webcolors_1.7.bb | 2 - .../python/python-webcolors_1.8.1.bb | 2 + .../python/python-webencodings.inc | 7 +- .../recipes-devtools/python/python-werkzeug.inc | 21 +- .../python/python-werkzeug_0.12.2.bb | 4 - .../python/python-werkzeug_0.14.1.bb | 7 + .../recipes-devtools/python/python-whoosh.inc | 10 + .../recipes-devtools/python/python-whoosh_2.7.4.bb | 4 + .../recipes-devtools/python/python-wtforms.inc | 16 + .../recipes-devtools/python/python-wtforms_2.1.bb | 18 +- .../python/python-xstatic-font-awesome.inc | 17 + .../python/python-xstatic-font-awesome_4.7.0.0.bb | 2 + .../recipes-devtools/python/python-xstatic.inc | 14 + .../python/python-xstatic_1.0.1.bb | 2 + .../recipes-devtools/python/python-yappi.inc | 16 + .../recipes-devtools/python/python-yappi_0.98.bb | 17 +- .../python/python-zopeinterface.inc | 2 + .../python/python3-alembic_0.9.8.bb | 2 + .../python/python3-asn1crypto_0.24.0.bb | 6 + .../python/python3-astroid_1.5.3.bb | 2 - .../python/python3-astroid_1.6.3.bb | 2 + .../recipes-devtools/python/python3-attr_0.3.1.bb | 2 + .../python/python3-attrs_17.3.0.bb | 2 - .../python/python3-attrs_17.4.0.bb | 2 + .../python/python3-automat_0.6.0.bb | 2 - .../python3-aws-iot-device-sdk-python_1.2.0.bb | 2 - .../python3-aws-iot-device-sdk-python_1.3.1.bb | 2 + .../recipes-devtools/python/python3-babel_2.5.1.bb | 5 - .../recipes-devtools/python/python3-babel_2.5.3.bb | 2 + .../python/python3-bcrypt_3.1.3.bb | 2 - .../python/python3-bcrypt_3.1.4.bb | 2 + .../recipes-devtools/python/python3-blinker_1.4.bb | 2 + .../recipes-devtools/python/python3-can_2.0.0b1.bb | 4 - .../recipes-devtools/python/python3-can_2.1.0.bb | 7 + .../python/python3-cassandra-driver_3.11.0.bb | 8 - .../python/python3-cassandra-driver_3.13.0.bb | 8 + .../python/python3-certifi_2017.7.27.1.bb | 2 - .../python/python3-certifi_2018.1.18.bb | 2 + .../recipes-devtools/python/python3-cffi_1.11.2.bb | 2 - .../recipes-devtools/python/python3-cffi_1.11.5.bb | 2 + .../recipes-devtools/python/python3-click_6.7.bb | 2 - .../python/python3-configparser_3.5.0.bb | 2 + .../python/python3-coverage_4.4.1.bb | 10 - .../python/python3-coverage_4.4.2.bb | 10 + .../python/python3-cryptography-vectors_2.0.3.bb | 2 - .../python/python3-cryptography-vectors_2.1.4.bb | 2 + .../python/python3-cryptography_2.0.3.bb | 10 - .../python/python3-cryptography_2.1.4.bb | 8 + .../python/python3-cython_0.27.1.bb | 18 - .../python/python3-cython_0.28.2.bb | 18 + .../python/python3-dateutil_2.6.1.bb | 2 - .../python/python3-dateutil_2.7.2.bb | 2 + .../python/python3-decorator_4.1.2.bb | 6 - .../python/python3-decorator_4.3.0.bb | 2 + .../python/python3-django_1.11.10.bb | 2 + .../python/python3-django_1.11.5.bb | 2 - .../python/python3-dnspython_1.15.0.bb | 7 - .../python/python3-dominate_2.3.1.bb | 2 + .../python/python3-editor_1.0.3.bb | 2 + .../recipes-devtools/python/python3-evdev_0.7.0.bb | 2 + .../python/python3-flask-babel_0.11.2.bb | 2 + .../python/python3-flask-bootstrap_3.3.7.1.bb | 2 + .../python/python3-flask-login_0.4.0.bb | 2 - .../python/python3-flask-login_0.4.1.bb | 2 + .../python/python3-flask-mail_0.9.1.bb | 2 + .../python/python3-flask-migrate_2.1.1.bb | 2 + .../python/python3-flask-nav_0.6.bb | 2 + .../python/python3-flask-restful_0.3.6.bb | 2 + .../python/python3-flask-script_2.0.6.bb | 2 + .../python/python3-flask-sqlalchemy_2.3.2.bb | 2 + .../python/python3-flask-uploads_0.2.1.bb | 2 + .../python/python3-flask-user_0.6.19.bb | 2 + .../python/python3-flask-wtf_0.14.2.bb | 2 + .../python/python3-flask-xstatic_0.0.1.bb | 2 + .../python/python3-greenlet_0.4.12.bb | 2 - .../python/python3-greenlet_0.4.13.bb | 2 + .../python/python3-html5lib_0.999999999.bb | 2 - .../python/python3-html5lib_1.0.1.bb | 2 + .../python/python3-hyperlink_17.3.1.bb | 2 - .../python/python3-isort_4.2.15.bb | 2 - .../recipes-devtools/python/python3-isort_4.3.4.bb | 2 + .../python/python3-itsdangerous_0.24.bb | 4 + .../python/python3-javaobj-py3_0.2.4.bb | 2 + .../recipes-devtools/python/python3-jinja2_2.10.bb | 2 + .../python/python3-jinja2_2.9.6.bb | 7 - .../python/python3-jsonpatch_1.23.bb | 2 + .../python/python3-jsonpointer_2.0.bb | 2 + .../python/python3-jsonschema_2.6.0.bb | 4 - .../python/python3-langtable_0.0.37.bb | 22 - .../python/python3-langtable_0.0.38.bb | 29 + .../recipes-devtools/python/python3-lxml_4.1.0.bb | 2 - .../recipes-devtools/python/python3-lxml_4.2.1.bb | 2 + .../python/python3-msgpack_0.4.8.bb | 2 - .../python/python3-msgpack_0.5.6.bb | 2 + .../python/python3-multidict_3.2.0.bb | 9 - .../python/python3-multidict_3.3.2.bb | 9 + .../python/python3-ndg-httpsclient_0.4.3.bb | 2 - .../python/python3-ndg-httpsclient_0.4.4.bb | 2 + .../python/python3-ntplib_0.3.3.bb | 2 + .../python/python3-oauthlib_2.0.6.bb | 2 + .../python/python3-paho-mqtt_1.3.0.bb | 3 - .../python/python3-paho-mqtt_1.3.1.bb | 3 + .../python/python3-pandas_0.20.3.bb | 2 - .../python/python3-pandas_0.22.0.bb | 2 + .../python/python3-pexpect_4.2.1.bb | 2 - .../python/python3-pexpect_4.5.0.bb | 2 + .../recipes-devtools/python/python3-pid_2.1.1.bb | 14 - .../recipes-devtools/python/python3-pid_2.2.0.bb | 14 + .../python/python3-pluggy_0.6.0.bb | 2 + .../recipes-devtools/python/python3-ply_3.11.bb | 2 + .../python/python3-pretend_1.0.8.bb | 2 - .../python/python3-pretend_1.0.9.bb | 2 + .../python/python3-prompt-toolkit_1.0.15.bb | 2 - .../python/python3-protobuf_3.4.0.bb | 2 - .../python/python3-protobuf_3.5.2.bb | 2 + .../python/python3-psutil_5.3.1.bb | 4 - .../python/python3-psutil_5.4.3.bb | 4 + .../recipes-devtools/python/python3-py_1.4.34.bb | 2 - .../recipes-devtools/python/python3-py_1.5.2.bb | 2 + .../python/python3-pyasn1-modules_0.2.1.bb | 2 + .../python/python3-pyasn1_0.3.6.bb | 2 - .../python/python3-pyasn1_0.4.2.bb | 2 + .../python/python3-pybind11_2.2.1.bb | 2 - .../python/python3-pybind11_2.2.2.bb | 2 + .../python/python3-pybluez_0.22.bb | 2 + .../python/python3-pycrypto_2.6.1.bb | 9 + .../python/python3-pycryptodome_3.4.11.bb | 2 + .../python/python3-pydbus_0.6.0.bb | 2 + .../python/python3-pyexpect_1.0.17.bb | 2 + .../python/python3-pyiface_0.0.5.bb | 2 + .../python/python3-pyjks_17.1.1.bb | 2 + .../recipes-devtools/python/python3-pyjwt_1.6.1.bb | 2 + .../python/python3-pylint_1.7.4.bb | 2 - .../python/python3-pylint_1.8.3.bb | 2 + .../python/python3-pymisp_2.4.80.bb | 2 - .../python/python3-pymisp_2.4.89.bb | 2 + .../python/python3-pymongo_3.5.1.bb | 10 - .../python/python3-pymongo_3.6.1.bb | 2 + .../python/python3-pynetlinux_1.1.bb | 2 + .../python/python3-pyopenssl_17.3.0.bb | 2 - .../python/python3-pyopenssl_17.5.0.bb | 2 + .../python/python3-pyperclip_1.6.0.bb | 2 + .../python/python3-pyroute2_0.3.22.bb | 2 - .../python/python3-pyroute2_0.4.21.bb | 2 + .../python/python3-pyserial_3.4.bb | 2 - .../python/python3-pysocks_1.6.7.bb | 8 - .../python/python3-pysocks_1.6.8.bb | 6 + .../python/python3-pytest-runner_2.12.1.bb | 2 - .../python/python3-pytest-runner_3.0.bb | 2 + .../python/python3-pytest_3.2.2.bb | 2 - .../python/python3-pytest_3.4.2.bb | 2 + .../recipes-devtools/python/python3-pytz_2017.2.bb | 2 - .../recipes-devtools/python/python3-pytz_2018.4.bb | 2 + .../python/python3-pyudev_0.21.0.bb | 6 - .../python/python3-pyusb_1.0.0b2.bb | 2 - .../recipes-devtools/python/python3-pyusb_1.0.2.bb | 2 + .../python/python3-requests_2.18.4.bb | 3 - .../python/python3-robotframework_3.0.2.bb | 2 + .../recipes-devtools/python/python3-scapy_0.23.bb | 13 + .../python/python3-scrypt_0.8.6.bb | 3 + .../python/python3-serpent_1.23.bb | 8 - .../python/python3-serpent_1.24.bb | 2 + .../python/python3-setuptools-scm_1.15.6.bb | 2 - .../python/python3-setuptools-scm_1.15.7.bb | 2 + .../python/python3-simplejson_3.11.1.bb | 7 - .../python/python3-simplejson_3.13.2.bb | 2 + .../recipes-devtools/python/python3-smbus_3.1.2.bb | 2 - .../recipes-devtools/python/python3-smbus_4.0.bb | 2 + .../python/python3-speaklater_1.3.bb | 2 + .../python/python3-sqlalchemy_1.1.14.bb | 5 - .../python/python3-sqlalchemy_1.1.17.bb | 2 + .../recipes-devtools/python/python3-systemd_234.bb | 15 +- .../python/python3-tornado_4.5.2.bb | 7 - .../python/python3-tornado_4.5.3.bb | 7 + .../python/python3-twisted_17.9.0.bb | 2 +- .../python/python3-twofish_0.3.0.bb | 2 + .../python/python3-unidiff_0.5.4.bb | 2 - .../python/python3-unidiff_0.5.5.bb | 2 + .../python/python3-vcversioner_2.16.0.0.bb | 4 - .../python/python3-visitor_0.1.3.bb | 2 + .../python/python3-webcolors_1.7.bb | 2 - .../python/python3-webcolors_1.8.1.bb | 2 + .../python/python3-websockets_4.0.1.bb | 16 + .../python/python3-werkzeug_0.12.2.bb | 4 - .../python/python3-werkzeug_0.14.1.bb | 4 + .../recipes-devtools/python/python3-wtforms_2.1.bb | 2 + .../python/python3-xstatic-font-awesome_4.7.0.0.bb | 2 + .../python/python3-xstatic_1.0.1.bb | 2 + .../recipes-devtools/python/python3-yappi_0.98.bb | 2 + .../0014-invoking-dd-with-infinite-timeout.patch | 31 + .../python-blivet/python3-blivet_2.2.0.bb | 1 + .../python-blivet/python3-blivetgui_2.1.5.bb | 2 +- .../python-meh/python3-meh_0.45.bb | 17 - .../python-meh/python3-meh_0.46.bb | 17 + .../python-pyparted/python-pyparted.inc | 13 +- .../0001-fix-version-float-check.patch | 26 - .../python-pyparted/python-pyparted_3.10.7.bb | 12 - .../python-pyparted/python-pyparted_3.11.1.bb | 10 + .../0001-fix-version-float-check.patch | 26 - .../python-pyparted/python3-pyparted_3.10.7.bb | 12 - .../python-pyparted/python3-pyparted_3.11.1.bb | 10 + .../meta-openembedded/meta-webserver/README | 4 +- .../meta-webserver/conf/layer.conf | 2 + .../recipes-httpd/apache2/apache2-native_2.4.27.bb | 45 - .../recipes-httpd/apache2/apache2-native_2.4.29.bb | 45 + .../apache2/apache2/apache-configure_perlbin.patch | 12 +- .../apache2/apache2/apache-ssl-ltmain-rpath.patch | 23 +- .../replace-lynx-to-curl-in-apachectl-script.patch | 17 +- .../recipes-httpd/apache2/apache2_2.4.27.bb | 194 - .../recipes-httpd/apache2/apache2_2.4.29.bb | 194 + .../recipes-httpd/hiawatha/hiawatha_10.3.bb | 64 - .../recipes-httpd/hiawatha/hiawatha_10.7.bb | 64 + .../recipes-httpd/monkey/monkey_1.5.6.bb | 3 + ...verriding-of-the-endianness-via-the-confi.patch | 80 + .../recipes-httpd/nginx/files/nginx-cross.patch | 56 +- .../meta-webserver/recipes-httpd/nginx/nginx.inc | 5 +- .../recipes-httpd/nginx/nginx_1.12.1.bb | 6 - .../recipes-httpd/nginx/nginx_1.12.2.bb | 6 + .../recipes-httpd/nginx/nginx_1.13.5.bb | 10 - .../recipes-httpd/nginx/nginx_1.13.9.bb | 10 + .../recipes-httpd/sthttpd/sthttpd_2.27.1.bb | 3 + .../recipes-php/phpmyadmin/phpmyadmin_4.7.6.bb | 38 - .../recipes-php/phpmyadmin/phpmyadmin_4.7.9.bb | 41 + .../recipes-php/xdebug/xdebug_2.5.1.bb | 33 - .../recipes-php/xdebug/xdebug_2.6.0.bb | 33 + .../0001-makefile-Do-not-build-contrib-dir.patch | 6 +- .../recipes-webadmin/netdata/netdata_git.bb | 6 +- .../webmin/files/disable-version-check.patch | 11 +- .../webmin/files/exports-lib.pl.patch | 13 +- .../webmin/files/init-exclude.patch | 25 +- .../webmin/files/net-generic.patch | 12 +- .../recipes-webadmin/webmin/files/nfs-export.patch | 20 +- .../recipes-webadmin/webmin/webmin_1.850.bb | 3 + import-layers/meta-openembedded/meta-xfce/README | 11 +- .../meta-openembedded/meta-xfce/conf/layer.conf | 2 + ...launcher-Exit-early-if-no-row-is-selected.patch | 37 - ...0002-setup.py-avoid-usr-share-share-paths.patch | 40 - ...ulibreXdg.py-fix-loading-of-desktop-files.patch | 36 - .../recipes-apps/menulibre/menulibre_2.1.3.bb | 36 - .../recipes-apps/menulibre/menulibre_2.1.5.bb | 41 + .../recipes-apps/xarchiver/xarchiver_git.bb | 4 +- .../files/0001-fix-Name-Comment-fields.patch | 34 + .../recipes-apps/xfce-polkit/xfce-polkit_0.2.bb | 5 +- .../xfce4-notifyd/xfce4-notifyd_0.3.6.bb | 23 - .../xfce4-notifyd/xfce4-notifyd_0.4.2.bb | 35 + .../xfce4-terminal/xfce4-terminal_0.8.6.bb | 12 - .../xfce4-terminal/xfce4-terminal_0.8.7.3.bb | 12 + .../recipes-bindings/vala/xfce4-vala_4.10.3.bb | 6 +- .../0001-Rename-use-of-stdout-and-stderr.patch | 72 - .../imsettings/gtk-is-required-by-notify.patch | 18 - ...CAL_AMFLAGS-isnot-supported-by-autoreconf.patch | 19 - .../imsettings/imsettings_1.7.2.bb | 32 - .../imsettings/imsettings_1.7.3.bb | 31 + ...-use-LIBTOOL-instead-of-hardcoded-libtool.patch | 27 + ...-unique-Add-format-qualifier-s-for-string.patch | 32 + .../libunique/libunique/build.patch | 421 + .../libunique/fix_for_compile_with_gcc-4.6.0.patch | 36 + .../libunique/libunique/noconst.patch | 130 + .../recipes-extended/libunique/libunique_1.1.6.bb | 30 + .../recipes-multimedia/parole/parole_0.8.1.bb | 38 - .../recipes-multimedia/parole/parole_1.0.0.bb | 38 + .../pulseaudio/xfce4-pulseaudio-plugin_0.2.4.bb | 17 - .../pulseaudio/xfce4-pulseaudio-plugin_0.4.0.bb | 17 + .../0001-Specify-string-format-explicitly.patch | 32 - .../timer/xfce4-timer-plugin_1.6.0.bb | 12 - .../timer/xfce4-timer-plugin_1.7.0.bb | 10 + .../weather/xfce4-weather-plugin_0.8.10.bb | 13 + .../weather/xfce4-weather-plugin_0.8.9.bb | 13 - .../whiskermenu/xfce4-whiskermenu-plugin_2.1.3.bb | 11 - .../whiskermenu/xfce4-whiskermenu-plugin_2.1.6.bb | 11 + .../xkb/xfce4-xkb-plugin_0.8.0.bb | 16 - .../xkb/xfce4-xkb-plugin_0.8.1.bb | 16 + .../meta-xfce/recipes-support/vim/vim_%.bbappend | 7 +- .../meta-xfce/recipes-support/vim/vim_xfce.inc | 6 + .../meta-xfce/recipes-xfce/exo/exo/configure.patch | 20 +- .../recipes-xfce/exo/exo/exo-no-tests-0.8.patch | 21 +- .../exo/exo/reduce-build-to-exo-csource-only.patch | 11 +- .../meta-xfce/recipes-xfce/exo/exo_0.11.5.bb | 39 - .../meta-xfce/recipes-xfce/exo/exo_0.12.0.bb | 39 + .../gtk-xfce-engine/glib-2.54-ftbfs.patch | 23 + .../gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb | 2 + ...-private-xfce4-keyboard-shortcuts.xml-fix.patch | 5 +- .../packagegroups/packagegroup-xfce-extended.bb | 4 +- .../meta-xfce/recipes-xfce/thunar/thunar_1.6.12.bb | 35 - .../meta-xfce/recipes-xfce/thunar/thunar_1.6.15.bb | 35 + .../recipes-xfce/tumbler/tumbler_0.1.31.bb | 29 - .../recipes-xfce/tumbler/tumbler_0.2.0.bb | 35 + .../xfce4-appfinder/xfce4-appfinder_4.12.0.bb | 14 - .../xfce4-appfinder/xfce4-appfinder_4.13.0.bb | 14 + .../recipes-xfce/xfce4-panel/xfce4-panel_4.12.1.bb | 43 - .../recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb | 44 + .../xfce4-power-manager_1.6.0.bb | 44 - .../xfce4-power-manager_1.6.1.bb | 44 + .../xfce4-settings/xfce4-settings_git.bb | 6 +- .../recipes-xfce/xfdesktop/xfdesktop_4.12.3.bb | 17 - .../recipes-xfce/xfdesktop/xfdesktop_4.12.4.bb | 17 + 1906 files changed, 67664 insertions(+), 82066 deletions(-) create mode 100644 import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch create mode 100644 import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch create mode 100644 import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb create mode 100644 import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch delete mode 100644 import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-xfs-remove-double-underscore-integer-types.patch delete mode 100644 import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-xfsprogs-remove-double-underscore-integer-types.patch delete mode 100644 import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch delete mode 100644 import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.12.0.bb create mode 100644 import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb create mode 100644 import-layers/meta-openembedded/meta-gnome/classes/sanity-meta-gnome.bbclass delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.4.4.bb create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.10.bb create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3_%.bbappend create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.28.1.bb create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.31.0.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/files/0001-bonobo-ui-node-qualify-functions-with-G_GNUC_PRINTF.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/files/gcc5.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.m4 delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.make delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo.inc delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.42.bb create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml delete mode 100755 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/Default delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff delete mode 100755 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/gdm delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/gdm-pam delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/gdm.conf delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_2.32.0.bb create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_3.12.0.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-mime-data/gnome-mime-data/pkgconfig.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-mime-data/gnome-mime-data_2.18.0.bb create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-help-remove-YELP-macro.patch create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gconftool-lossage.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-cups-1.6.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-glib.h.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/glib-2.32.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/substitute-tests.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light/classic-light.xml create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.6.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.32.1.bb create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.36.0.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnome/0001-libgnome-Makefile.am-allow-deprecated-symbols.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.30.3.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui/0001-suppress-string-format-literal-warning-to-fix-build-.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui/gnome-stock-pixbufs.h delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui/no-pixbuf-csource.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/libidl/libidl-native_0.8.14.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/libidl/libidl.inc delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/libidl/libidl_0.8.14.bb create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Define-_GNU_SOURCE.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity/remove-yelp-help-rules-var.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.38.0.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/no-try-run-strftime.diff delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus3/no-try-run-strftime.diff create mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/orbit2/orbit2/0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/contacts/stock_contact.png delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/contacts/stock_person.png delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/dates.inc delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/dates/0001-Fix-format-security-warnings.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/dates/dso_linking_change_build_fix.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/dates/uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/dates_git.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/system-tools/system-tools-backends-2.10.2/system-tools-backends delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/themes/gnome-themes/drop-localedir-override.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/themes/gnome-themes/iconpath-option.patch delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-support/florence/florence_0.6.3.bb delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-support/tracker/files/90tracker delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-support/tracker/files/tracker-dbus.service delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-support/tracker/files/tracker-miner-fs.service delete mode 100644 import-layers/meta-openembedded/meta-gnome/recipes-support/tracker/files/tracker-store.service create mode 100644 import-layers/meta-openembedded/meta-gnome/site/riscv64-linux create mode 100644 import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0001-Makefile-build-ubi-utils-only.patch create mode 100644 import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0002-common.mk-for-klibc-CC-is-klcc.patch create mode 100644 import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0003-libubi.c-add-klibc-specific-fixes-for-ioctl.patch create mode 100644 import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0004-Restore-compatibility-to-dietlibc-klibc-musl-libc-af.patch create mode 100644 import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0005-common.h-more-workarounds-for-klibc-compatibility.patch create mode 100644 import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0006-libiniparser-remove-unused-function-needing-float.patch create mode 100644 import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0007-mtd-utils-common.c-convert-to-integer-arithmetic.patch create mode 100644 import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0008-ubi-utils-ubiformat.c-convert-to-integer-arithmetic.patch create mode 100644 import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0009-Eliminate-warnings-about-implicit-non-const-casting-.patch delete mode 100644 import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0001-Makefile-only-build-ubi-utils.patch delete mode 100644 import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0002-common.mk-for-klibc-CC-is-klcc.patch delete mode 100644 import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0003-libubi.c-add-klibc-specific-fixes.patch delete mode 100644 import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0004-common.h-klibc-fixes-1.patch delete mode 100644 import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0005-common.h-klibc-fixes-2.patch delete mode 100644 import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0006-libiniparser-remove-unused-function-needing-float.patch delete mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6/sepbuildfix.patch delete mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6_1.6.21.bb create mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch create mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/files/0001-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch create mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.10.bb delete mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.6.bb delete mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/lower-rank.diff create mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc create mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch create mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb create mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.2.bb delete mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb create mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.18.bb create mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb create mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb create mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox/0001-Update-exported-symbol-list.patch delete mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb create mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb create mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_1.1.1.bb create mode 100644 import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt create mode 100644 import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.3.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.5.bb delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_1.3.17.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.8.0.bb delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/dnsserver-4.7.0.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/iconv-4.7.0.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/smb_conf-4.7.0.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.6.7.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-qedi.c-Removed-unused-linux-ethtool.h.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.874.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_1.3.5.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_1.4.2.bb delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.17.07.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.18.02.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/main.cf delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/main.cf_2.0 delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-extended/corosync/corosync/0001-Include-fcntl.h-for-F_-and-O_-defines.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.2.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.3.bb delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170810.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20171221.bb delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170810.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20171221.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/freeDiameter.conf create mode 100755 import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/freediameter.init create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/freediameter.service create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/install_test.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/pass-ptest-env.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/run-ptest create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Remove-U64-typedef.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/fix_linux_4.15_compile.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-enable-tests.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/run-ptest delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_1.2.1.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_1.2.4.bb delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils.inc delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-build-error-out-correctly-if-a-submake-fails.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0002-libbridge-fix-some-build-time-warnings-fcntl.h.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0003-bridge-fix-some-build-time-warnings-errno.h.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-libbridge-add-missing-include-s-fix-build-against-mu.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/bridge-utils-1.5-check-error-returns-from-write-to-sysfs.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/bridge-utils-1.5-fix-error-message-for-incorrect-command.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/bridge-utils-1.5-fix-incorrect-command-in-manual.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.5.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.6.bb delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony_2.4.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.2.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.29.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.33.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.11.bb delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.9.bb delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/GeoIP.conf delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.4.0/geoipupdate.cron create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/GeoIP.conf create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/geoipupdate.cron delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.4.0.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc_0.2.2.bb delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb/ldb-Add-configure-options-for-packages.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb/options-1.3.1.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.1.29.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.3.1.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/talloc-Add-configure-options-for-packages.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.1.11.bb delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.1.9.bb delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.3.14.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.3.15.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/options-0.9.36.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/tevent-Add-configure-options-for-packages.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.31.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.36.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.26.0.bb delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools/0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools/0002-yp_dump_bindings.c-Include-string.h-for-memset.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_4.2.2.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p11.bb delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.3.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.4.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp/ssmtp-bug584162-fix.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.5.3.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/files/libgcrypt.patch delete mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.2.10.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.4.6.bb create mode 100644 import-layers/meta-openembedded/meta-networking/recipes-support/wpan-tools/wpan-tools_git.bb create mode 100644 import-layers/meta-openembedded/meta-networking/site/endian-big create mode 100644 import-layers/meta-openembedded/meta-networking/site/endian-little delete mode 100644 import-layers/meta-openembedded/meta-oe/classes/meson.bbclass create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_20110206.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_7.4.0.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_7.8.0.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/edac-utils/files/add-restart-to-initscript.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/edac-utils/files/edac.service create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/efibootmgr/efibootmgr_0.15.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-fix-for-cross-compile.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/musl-strndupa.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.31.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/sst26.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/fancontrol create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord.cgi create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord.conf create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensors.conf create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/fancontrol.init create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/sensord.init create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.4.0.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-bsp/lssci/lsscsi_0.28.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0004-Prevent-installation-of-an-all-zero-TK.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0006-TDLS-Reject-TPK-TK-reconfiguration.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0007-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/key-replay-cve-multiple.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/CVE-2017-11462.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/fix-CVE-2017-11368.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.15.1.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.16.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.16.0.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.0.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/mosquitto/files/0001-config.mk-allow-prefix-mandir-localedir-from-environ.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/mosquitto/files/0002-uthash-remove-in-tree-version.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/mosquitto/files/build.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3/fix-makefile-override.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath_and_psops.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/umip/files/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.6.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.2.5.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0001-Comment-rst2man-related-stuff.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-Correct-including-directory-for-conf.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_git.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-core/ell/ell/0001-ell-fix-build-with-musl-libc.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-core/ell/ell_0.4.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-core/ell/ell_git.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.50.1.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.10.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.11.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-core/toybox/toybox_git.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-crypto/engine-pkcs11/engine-pkcs11_0.2.2.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-crypto/libsodium/libsodium_1.0.11.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.11.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_git.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/libdbi/libdbi.inc create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/libdbi/libdbi_0.9.0.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-strerror_r-only-on-glibc-systems.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0003-Conditionalize-glibc-specific-strerror_r.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/arm64-support.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/disable-hw-crc32-on-arm64-s390x.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.59.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-disable-ucontext-on-musl.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/change-cc-to-cc-version.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-cmake-module-path.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-mysqlclient-r-version.patch create mode 100755 import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/install_db create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/install_db.service create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/my.cnf create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/remove-bad-path.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_5.5.59.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql-bashprofile create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql-setup create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql.init create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql.pam create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql.service create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_9.4.17.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/run-ptest create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc.inc create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc_09.05.0300.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/soci/soci/soci_libdir.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/soci/soci_3.2.3.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/0001-shell.c-Fix-format-not-a-string-literal-warning.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/sqlite.pc create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite_2.8.17.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-disable-calls-to-getcontext-with-musl.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0005-Import-necessary-definitions-from-stab.h.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/cppunit/cppunit_1.13.2.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20170122.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/cunit/cunit_2.1-3.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/cunit/files/fixup-install-docdir.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/cxxtest/cxxtest_4.3.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.7.1.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.9.0.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/glade/glade3_3.8.5.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.20.0.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.20.2.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.8.5.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.3.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/mercurial/files/mercurial-CVE-2017-9462.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial-native_4.0.1.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_4.4.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/meson/meson/native_bindir.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/meson/meson_0.40.1.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Fix-Werror-class-memaccess.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/no-registry.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_8.4.0.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_0.94.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_0.96.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.036.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.636.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.641.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php-5.6.31/0001-Add-lpthread-to-link.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php-5.6.31/change-AC_TRY_RUN-to-AC_TRY_LINK.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php-7.1.9/0001-Specify-tag-with-libtool.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php-7.1.9/CVE-2017-16642.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php-7.1.9/change-AC_TRY_RUN-to-AC_TRY_LINK.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-Add-lpthread-to-link.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-skip-binconfig-check-for-libxml.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-fix-error-caused-by-a-new-variable-is-declared-after.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-main-php_ini.c-build-empty-php_load_zend_extension_c.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/configure.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-0001-opcache-config.m4-enable-opcache.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-phar-makefile.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php_5.6.31.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php_5.6.35.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php_7.1.9.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php_7.2.4.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/run-ptest delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.4.1.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-futures_3.0.5.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-futures_3.2.0.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.22.0.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.28.0.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/sip/sip_4.19.2.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/sip/sip_4.19.8.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/acpitool/acpitool_0.5.1.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles/remove-policy-of-usr-local-sbin.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.9.0.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.9.0.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/dash/dash/0001-Fix-printf-format-errors-with-clang.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/dash/dash_0.5.8.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.22.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20160828.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20171209.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.0.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.15.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0001-efivar-fix-for-cross-compile.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0003-efivar-fix-for-cross-compile.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/allow-multi-definitions-for-native.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/musl-strndupa.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar_0.31.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0001-Remove-undefined-behavior.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/sst26.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom_0.9.9.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot.inc create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0004-Add-configure-option-to-find-qt5-native-tools.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/qtopia.trm delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/remove-systemd-unit-503.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.1.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.2.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit/0001-don-t-strip-when-installing.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.2.13.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.4.2.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb_git.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.10.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.16.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.2.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.3.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/lssci/lsscsi_0.28.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/rocksdb/rocksdb_git.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Undefine-GLOB_BRACE.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_6.5.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/tcsh/tcsh/0002-Add-debian-csh-scripts.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/testfloat/files/0001-Makefile-for-cross-compile-SoftFloat.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/testfloat/testfloat_3a.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_2.1.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_2.6.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/upm/files/ads1x15-fixed-case-logic-in-getThresh-function.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-extended/zsh/zsh_5.3.1.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.22.2.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-gnome/libglade/libglade-2.6.4/0001-configure.in-remove-deprecated-GNOME_COMMON_INIT.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-gnome/libglade/libglade-2.6.4/python_environment.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-gnome/libglade/libglade_2.6.4.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-gnome/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-gnome/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-gnome/libunique/libunique/build.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-gnome/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-gnome/libunique/libunique/noconst.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.8.5.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2-2.5.8/0001-configure.ac-remove-AM_PO_SUBDIRS.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2-2.5.8/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.14.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.8.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/0001-configure.ac-remove-AM_PO_SUBDIRS.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/0001-scripts-remove-bashisms.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/0002-correct-jpeg-memsrcdest-support.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/10-camera-libgphoto2-device.fdi delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/10-camera-libgphoto2.fdi delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/40-libgphoto2.rules delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/avoid_using_sprintf.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2-device.fdi create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2.fdi create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/40-libgphoto2.rules create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.16.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.8.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Fix-the-error-of-can-t-find-header-file.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-GCC-8-warning.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-build-with-clang.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_git.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/Makefile.oe delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/slim-dynwm delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/slim.pamd delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/slim.service delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/slim/slim/update_slim_wmlist delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.1.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.15.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.0.5.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.1.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.0.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.1.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.3.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.4.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.5.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.6.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwud_1.0.4.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwud_1.0.5.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0004-crash-fix-build-failure-with-mips.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.1.9.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.0.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-kernel/ipmiutil/ipmiutil/fix_systemd_path.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.0.5.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch.inc create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch_git.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-typecast-input-parameter-to-int-for-abs.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-multimedia/libass/libass.inc delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-multimedia/libass/libass_0.13.6.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-multimedia/libass/libass_0.14.0.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio_0.93.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio_2.0.0.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.1.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.2.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.16/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.16/0001-include-sys-ttydefaults.h.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.16/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-include-sys-ttydefaults.h.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/60-gpsd.rules delete mode 100755 import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/gpsd delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/gpsd-default delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.17.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-shells/dash/dash/0001-Fix-printf-format-errors-with-clang.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.9.1.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh/0002-Add-debian-csh-scripts.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh_6.20.00.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.4.2.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.13.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/cryptsetup/cryptsetup_1.7.4.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/dos2unix/dos2unix_7.3.4.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/dos2unix/dos2unix_7.4.0.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/edac-utils/edac-utils_git.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/edac-utils/files/add-restart-to-initscript.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/edac-utils/files/edac.service delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/engine-pkcs11/engine-pkcs11_0.2.2.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/evtest/evtest_git.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/fbtest/fb-test_git.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.6.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.7.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/flite/flite-alsa-1.3/flite-1.3-alsa_support-1.2.diff create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0001-FindGStreamer_1_0-fix-build-failure-for-new-gstreame.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-gstreamer-1.0-detection.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0003-add-missing-define.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/gd/gd_2.2.4.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/gd/gd_2.2.5.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/htop/htop_1.0.3.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/htop/htop_2.1.0.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell_1.6.1.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell_1.6.2.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel-1.4/r25.diff create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel_1.5.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/ipmitool/ipmitool_1.8.18.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/ipmiutil/ipmiutil/fix_systemd_path.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/ipmiutil/ipmiutil_3.0.5.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/libdbi/libdbi.inc delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/libdbi/libdbi_0.9.0.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen/0001-CMakeLists.txt-install-FindEigen3.cmake-script.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.2.8.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.0.1.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/libmcrypt/libmcrypt_2.5.8.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/files/automake_foreign.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/files/use.pkg-config.for.freetype2.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf/use.pkg-config.for.freetype2.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/automake_foreign.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/use.pkg-config.for.freetype2.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/libsodium/libsodium_1.0.11.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-disable-RedHat-specific-test.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/libteam/libteam/run-ptest delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/lm_sensors/lmsensors-config/fancontrol delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.cgi delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensord.conf delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/lm_sensors/lmsensors-config/sensors.conf delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/lm_sensors/lmsensors/fancontrol.init delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/lm_sensors/lmsensors/sensord.init delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mongodb/mongodb/0001-Use-strerror_r-only-on-glibc-systems.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mongodb/mongodb/0001-mongo-Add-using-std-string.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mongodb/mongodb/0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mongodb/mongodb/0003-Conditionalize-glibc-specific-strerror_r.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mongodb/mongodb/arm64-support.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mongodb/mongodb/disable-hw-crc32-on-arm64-s390x.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mongodb/mongodb_git.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mysql/mariadb-native_5.5.57.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mysql/mariadb.inc delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mysql/mariadb/change-cc-to-cc-version.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mysql/mariadb/configure.cmake-fix-valgrind.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mysql/mariadb/fix-a-building-failure.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mysql/mariadb/fix-cmake-module-path.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mysql/mariadb/fix-mysqlclient-r-version.patch delete mode 100755 import-layers/meta-openembedded/meta-oe/recipes-support/mysql/mariadb/install_db delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mysql/mariadb/install_db.service delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mysql/mariadb/my.cnf delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mysql/mariadb/mysql-systemd-start delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mysql/mariadb/mysqld.service delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mysql/mariadb/remove-bad-path.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mysql/mariadb_5.5.57.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/mysql/mysql-python_1.2.5.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/nano/nano_2.7.4.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/nano/nano_2.9.3.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/neon/neon/pkgconfig.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/neon/neon_0.30.2.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/nghttp2/nghttp2_1.26.0.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.init create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/already-exists.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/javagen.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/protobuf.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/tinydnn.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/passwdqc/passwdqc/makefile-add-ldflags.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/passwdqc/passwdqc_1.3.1.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/pkcs11-helper/pkcs11-helper_1.11.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/poco/poco_1.7.9.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/poco/poco_1.8.0.1.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.7.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.8.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0002-fix-gcc-6-math-ambiguous-errors.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.57.0.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.63.0.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/postgresql/files/not-check-libperl.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/postgresql/files/postgresql-bashprofile delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/postgresql/files/postgresql-setup delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/postgresql/files/postgresql.init delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/postgresql/files/postgresql.pam delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/postgresql/files/postgresql.service delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/postgresql/files/remove.autoconf.version.check.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/postgresql/postgresql.inc delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/postgresql/postgresql_9.4.15.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/psqlodbc/files/run-ptest delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/psqlodbc/psqlodbc.inc delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/psqlodbc/psqlodbc_09.05.0300.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/soci/soci/soci_libdir.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/soci/soci_3.2.2.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/sqlite/sqlite-2.8.17/0001-shell.c-Fix-format-not-a-string-literal-warning.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/sqlite/sqlite-2.8.17/sqlite.pc delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/tomoyo-tools/tomoyo-tools_2.5.0.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.1.8.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.7.6.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.4.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.6.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.5.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.7.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.8.4.bb create mode 100755 import-layers/meta-openembedded/meta-oe/recipes-support/uthash/uthash/run-ptest delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/uthash/uthash_1.9.7.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.0.2.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.8.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/vim/files/CVE-2017-17087.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/0001-Fix-issue-599.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/9ddb300d874a30db35e3ad58f188944bef0bf31b.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/disable-tests.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.7.0.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/xdg-user-dirs/files/0001-explicitly-disable-man-generation-disable-documentat.patch delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/xdg-user-dirs/files/xdg-user-dirs.desktop delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.15.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.17.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-of-CVE-2017-16927.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-sesman.ini-and-xrdp.ini.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/xrdp.sysconfig create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.4.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.11.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.13.2.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-test/cunit/files/fixup-install-docdir.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.3.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-test/evtest/evtest_git.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-test/fbtest/fb-test_git.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-test/pm-qa/pm-qa_git.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0002-stress-fcntl-fix-build-for-musl.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng_0.09.14.bb create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-test/testfloat/files/0001-Makefile-for-cross-compile-SoftFloat.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-test/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch create mode 100644 import-layers/meta-openembedded/meta-oe/recipes-test/testfloat/testfloat_3a.bb delete mode 100644 import-layers/meta-openembedded/meta-oe/site/endian-big delete mode 100644 import-layers/meta-openembedded/meta-oe/site/endian-little delete mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.36.bb create mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.38.bb delete mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_2.83.bb create mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_2.94.bb delete mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.09.bb create mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.12.bb delete mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_1.997.bb create mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.054.bb delete mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libmime/libmime-types-perl_2.13.bb create mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libmime/libmime-types-perl_2.17.bb delete mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-runtime-perl_0.015.bb create mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-runtime-perl_0.016.bb delete mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libmoo/libmoo-perl_2.003002.bb create mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libmoo/libmoo-perl_2.003004.bb delete mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.10.bb create mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.14.bb delete mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.81.bb create mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.84.bb delete mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.000005.bb create mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.000006.bb delete mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libtest/libtest-harness-perl_3.36.bb create mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libtest/libtest-harness-perl_3.42.bb delete mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0129.bb create mode 100644 import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0132.bb delete mode 100644 import-layers/meta-openembedded/meta-python/classes/pypi.bbclass delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-connectivity/python-mprpc/python-mprpc_0.1.14.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-connectivity/python-mprpc/python-mprpc_0.1.16.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-connectivity/python-mprpc/python3-mprpc_0.1.14.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-connectivity/python-mprpc/python3-mprpc_0.1.16.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.62.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.63.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python-thrift_0.10.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python-thrift_0.11.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-alembic.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_0.9.8.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto_0.23.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto_0.24.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-astroid_1.5.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-astroid_1.6.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-attr.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-attr_0.3.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-attrs_17.3.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-attrs_17.4.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.2.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.3.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-babel_2.5.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-babel_2.5.3.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-bcrypt_3.1.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-bcrypt_3.1.4.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-behave_1.2.5.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-behave_1.2.6.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-blinker.inc delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-can_2.0.0b1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-can_2.1.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2017.7.27.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2018.1.18.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cffi_1.11.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cffi_1.11.5.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.7.7.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.8.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-configparser.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-configparser_3.5.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography-vectors_2.0.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography-vectors_2.1.4.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography_2.0.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography_2.1.4.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cython_0.27.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cython_0.28.2.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dateutil_2.6.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dateutil_2.7.2.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.4.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.6.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-decorator_4.1.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-decorator_4.3.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-django_1.11.10.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-django_1.11.5.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dominate.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-editor.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-editor_1.0.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-evdev.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel_0.11.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bootstrap.inc delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-login_0.4.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-login_0.4.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-mail.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-mail_0.9.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate_2.1.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-nav.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-nav_0.6.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful_0.3.6.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-script.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-script_2.0.6.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy.inc delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy_2.3.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy_2.3.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-uploads.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-uploads_0.2.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-user.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-user_0.6.19.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-wtf.inc delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-wtf/import-simplejson-as-json.patch delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-wtf_0.12.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-wtf_0.14.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic/remove-pip-requires.patch create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic_0.0.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-future_0.16.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-greenlet_0.4.12.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-greenlet_0.4.13.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio-tools_1.6.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio-tools_1.8.4.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio_1.6.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio_1.8.4.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-html5lib_0.999999999.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-html5lib_1.0.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ipaddress_1.0.18.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ipaddress_1.0.19.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-isort_4.2.15.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-isort_4.3.4.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3_0.2.4.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jinja2_2.10.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jinja2_2.9.6.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpatch.inc delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpatch_1.16.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpatch_1.23.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpointer.inc delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpointer_1.12.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpointer_2.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-lxml_4.1.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-lxml_4.2.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-mako.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-mako_1.0.7.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-monotonic_1.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-monotonic_1.4.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-msgpack_0.4.8.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-msgpack_0.5.6.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.4.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.4.4.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-networkx_1.11.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-oauthlib.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-oauthlib_2.0.6.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt_1.3.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt_1.3.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pandas_0.20.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pandas_0.22.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pep8_1.7.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pep8_1.7.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pexpect_4.2.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pexpect_4.5.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pip_9.0.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pip_9.0.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.6.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ply.inc delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ply_3.10.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ply_3.11.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pretend_1.0.8.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pretend_1.0.9.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf_3.4.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf_3.5.2.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-psutil_5.3.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-psutil_5.4.3.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-py_1.4.34.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-py_1.5.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules_0.2.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1_0.3.6.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1_0.4.2.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11_2.2.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11_2.2.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pybluez.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome_3.4.11.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pydbus.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pydbus_0.6.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect_1.0.17.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyflakes_1.2.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyflakes_1.6.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyiface.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyiface_0.0.5.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks_17.1.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt_1.6.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pylint_1.7.4.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pylint_1.8.3.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp_2.4.80.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp_2.4.89.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pymongo_3.5.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pymongo_3.6.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pynetlinux.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pynetlinux_1.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyopenssl_17.3.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyopenssl_17.5.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyperclip.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyperclip_1.6.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2/import-simplejson-as-json.patch delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2_0.3.22.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2_0.4.21.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pysmi_0.1.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pysmi_0.2.2.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.6.7.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.6.8.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pystache.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pystache_0.5.4.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-runner_2.12.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-runner_3.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_3.2.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb delete mode 100755 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytz_2017.2.bb create mode 100755 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytz_2018.4.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb_1.0.0b2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb_1.0.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-robotframework.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-robotframework_3.0.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-scrypt.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-scrypt_0.8.6.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-serpent_1.23.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-serpent_1.24.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.6.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.7.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-simplejson_3.11.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-simplejson_3.13.2.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-smbus_3.1.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-smbus_4.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-snimpy_0.8.11.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-snimpy_0.8.12.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-speaklater.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-speaklater_1.3.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-sqlalchemy_1.1.14.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-sqlalchemy_1.1.17.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-systemd.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-tornado_4.5.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-tornado_4.5.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-twofish.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-twofish_0.3.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.6.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.6.4.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-unidiff_0.5.4.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-unidiff_0.5.5.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-visitor.inc delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-webcolors_1.7.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-webcolors_1.8.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-werkzeug_0.12.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-werkzeug_0.14.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-wtforms.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic-font-awesome.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic-font-awesome_4.7.0.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic_1.0.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-yappi.inc create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_0.9.8.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_0.24.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_1.5.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_1.6.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-attr_0.3.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_17.3.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_17.4.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.2.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.3.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-babel_2.5.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-babel_2.5.3.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt_3.1.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt_3.1.4.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-blinker_1.4.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-can_2.0.0b1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-can_2.1.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cassandra-driver_3.11.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cassandra-driver_3.13.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2017.7.27.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2018.1.18.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.11.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.11.5.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-configparser_3.5.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_4.4.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_4.4.2.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.0.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.1.4.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_2.0.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_2.1.4.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cython_0.27.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cython_0.28.2.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.6.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.7.2.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_4.1.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_4.3.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-django_1.11.10.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-django_1.11.5.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.3.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-editor_1.0.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_0.7.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.11.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-bootstrap_3.3.7.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.4.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.4.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-mail_0.9.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.1.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-nav_0.6.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.6.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-script_2.0.6.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_2.3.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-uploads_0.2.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-user_0.6.19.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_0.14.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-xstatic_0.0.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_0.4.12.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_0.4.13.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-html5lib_0.999999999.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-html5lib_1.0.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.2.15.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.4.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.2.4.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.10.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.9.6.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpatch_1.23.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpointer_2.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.37.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.38.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.1.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.2.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_0.4.8.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_0.5.6.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_3.2.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_3.3.2.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.4.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.4.4.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-oauthlib_2.0.6.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.3.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.3.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_0.20.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_0.22.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pexpect_4.2.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pexpect_4.5.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_2.1.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_2.2.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.6.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ply_3.11.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pretend_1.0.8.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pretend_1.0.9.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.4.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.5.2.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.3.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.4.3.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-py_1.4.34.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-py_1.5.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.2.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1_0.3.6.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1_0.4.2.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.2.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.2.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez_0.22.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pycrypto_2.6.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pycryptodome_3.4.11.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.17.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_0.0.5.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjks_17.1.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_1.6.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_1.7.4.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_1.8.3.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.80.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.89.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.5.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.6.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux_1.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyopenssl_17.3.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyopenssl_17.5.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.6.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.3.22.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.4.21.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.6.7.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.6.8.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_2.12.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_3.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_3.2.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb delete mode 100755 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2017.2.bb create mode 100755 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2018.4.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.0.0b2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.0.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_3.0.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-scapy_0.23.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.6.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.23.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.24.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-scm_1.15.6.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-scm_1.15.7.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.11.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.13.2.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_3.1.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-speaklater_1.3.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.1.14.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.1.17.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_4.5.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_4.5.3.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.5.4.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.5.5.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-visitor_0.1.3.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-webcolors_1.7.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-webcolors_1.8.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_4.0.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_0.12.2.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_0.14.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_2.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic-font-awesome_4.7.0.0.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic_1.0.1.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_0.98.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0014-invoking-dd-with-infinite-timeout.patch delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.45.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.46.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted/0001-fix-version-float-check.patch delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.10.7.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted/0001-fix-version-float-check.patch delete mode 100644 import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.10.7.bb create mode 100644 import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.1.bb delete mode 100644 import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.27.bb create mode 100644 import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.29.bb delete mode 100644 import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb create mode 100644 import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb delete mode 100644 import-layers/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.3.bb create mode 100644 import-layers/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.7.bb create mode 100644 import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/0001-Allow-the-overriding-of-the-endianness-via-the-confi.patch delete mode 100644 import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.12.1.bb create mode 100644 import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.12.2.bb delete mode 100644 import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.13.5.bb create mode 100644 import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.13.9.bb delete mode 100644 import-layers/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.7.6.bb create mode 100644 import-layers/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.7.9.bb delete mode 100644 import-layers/meta-openembedded/meta-webserver/recipes-php/xdebug/xdebug_2.5.1.bb create mode 100644 import-layers/meta-openembedded/meta-webserver/recipes-php/xdebug/xdebug_2.6.0.bb delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/files/0001-add_launcher-Exit-early-if-no-row-is-selected.patch delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/files/0002-setup.py-avoid-usr-share-share-paths.patch delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/files/0003-MenulibreXdg.py-fix-loading-of-desktop-files.patch delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.1.3.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.1.5.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.3.6.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.2.bb delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.6.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.3.bb delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/0001-Rename-use-of-stdout-and-stderr.patch delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.2.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/build.patch create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/noconst.patch create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_0.8.1.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.0.bb delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.2.4.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.0.bb delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.6.0.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.0.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.10.bb delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.9.bb delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.3.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.6.bb delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.0.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.1.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-support/vim/vim_xfce.inc delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.11.5.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.0.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine/glib-2.54-ftbfs.patch delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.12.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.15.bb delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.31.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.0.bb delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.12.0.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.0.bb delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.1.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.0.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.1.bb delete mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.3.bb create mode 100644 import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.4.bb (limited to 'import-layers/meta-openembedded') diff --git a/import-layers/meta-openembedded/meta-filesystems/README b/import-layers/meta-openembedded/meta-filesystems/README index 0f7cc9b3c..97d0e94bf 100644 --- a/import-layers/meta-openembedded/meta-filesystems/README +++ b/import-layers/meta-openembedded/meta-filesystems/README @@ -10,66 +10,31 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/bitbake - branch: 1.36 + branch: master URI: git://git.openembedded.org/openembedded-core layers: meta - branch: rocko + branch: master URI: git://git.openembedded.org/meta-openembedded layers: meta-oe - branch: rocko + branch: master Patches ======= Please submit any patches against the filesystems layer to the OpenEmbedded development mailing list (openembedded-devel@lists.openembedded.org) -with '[meta-filesystems][rocko]' in the subject. +with '[meta-filesystems]' in the subject. -Maintainers List: - physfs Andreas Müller - - fuse Koen Kooi - Philip Balister - hongxu jia - - ifuse Sander van Grieken - Koen Kooi - - sshfs-fuse Philip Balister - Koen Kooi - - owfs Otavio Salvador - Koen Kooi - hongxu jia - - ntfs-3g-ntfsprogs Otavio Salvador - hongxu jia - - cramfs Koen Kooi - - smbnetfs Sander van Grieken - Koen Kooi - - fuse-exfat hongxu jia - - exfat-utils hongxu jia - - f2fs-tools Martin Jansa - Koen Kooi - - xfsprogs Koen Kooi - hongxu jia +Layer maintainer: Armin Kuster When sending single patches, please use something like: git send-email -1 -M \ --to openembedded-devel@lists.openembedded.org \ - --subject-prefix=meta-filesystems][rocko][PATCH + --subject-prefix=meta-filesystems][PATCH -rocko Branch Maintainer: -Armin Kuster Table of Contents ================= diff --git a/import-layers/meta-openembedded/meta-filesystems/conf/layer.conf b/import-layers/meta-openembedded/meta-filesystems/conf/layer.conf index 9ed6d1b73..dbcff42d4 100644 --- a/import-layers/meta-openembedded/meta-filesystems/conf/layer.conf +++ b/import-layers/meta-openembedded/meta-filesystems/conf/layer.conf @@ -14,3 +14,5 @@ BBFILE_PRIORITY_filesystems-layer = "6" LAYERVERSION_filesystems-layer = "1" LAYERDEPENDS_filesystems-layer = "core openembedded-layer" + +LAYERSERIES_COMPAT_filesystems-layer = "sumo" diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch b/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch new file mode 100644 index 000000000..6d60c9d22 --- /dev/null +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch @@ -0,0 +1,42 @@ +From 7a524d49b3d4459280f18942df2980603400ec52 Mon Sep 17 00:00:00 2001 +From: Bian Naimeng +Date: Fri, 19 Jun 2015 11:54:44 +0900 +Subject: [PATCH] Using PKG_CHECK_MODULES to found headers and libraries of + smbclient + +Signed-off-by: Bian Naimeng +--- + configure.in | 5 +++++ + src/Makefile.am | 3 +++ + 2 files changed, 8 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 4c03409..8d22e71 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -119,6 +119,11 @@ AC_CHECK_LIB(smbclient, smbc_setOptionUseCCache, [], [ + LIBS="$LIBS $SMBCLIENT_LIBS" + CFLAGS="$CFLAGS $SMBCLIENT_CFLAGS" + ++dnl ***************************************************************** ++dnl *** Check libsmbclient by pkgconfig to get cflags and ldflags *** ++dnl ***************************************************************** ++PKG_CHECK_MODULES(SMBCLIENT, smbclient) ++ + dnl ****************** + dnl *** Final step *** + dnl ****************** +diff --git a/src/Makefile.am b/src/Makefile.am +index ccaa8c3..6598317 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -17,3 +17,6 @@ smbnetfs_SOURCES = \ + event.c event.h \ + reconfigure.c reconfigure.h \ + main.c ++ ++smbnetfs_CFLAGS=${SMBCLIENT_CFLAGS} ++smbnetfs_LDFLAGS=${SMBCLIENT_LDFLAGS} +-- +1.8.4.2 + diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch b/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch new file mode 100644 index 000000000..55275669b --- /dev/null +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch @@ -0,0 +1,11 @@ +Index: git/configure.in +=================================================================== +--- git.orig/configure.ac 2014-06-18 16:06:16.040721349 +0000 ++++ git/configure.ac 2014-07-18 07:49:17.085552256 +0000 +@@ -1,5 +1,5 @@ + AC_INIT([SMBNetFS],[0.6.1]) +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([foreign]) + AC_CONFIG_HEADERS([src/config.h]) + AC_PROG_CC + diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb b/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb new file mode 100644 index 000000000..c72936c08 --- /dev/null +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb @@ -0,0 +1,33 @@ +SUMMARY = "FUSE module for mounting an entire SMB/NMB network in a single directory" +DESCRIPTION = "SMBNetFS is a Linux/FreeBSD filesystem that allow you to use \ + samba/microsoft network in the same manner as the network \ + neighborhood in Microsoft Windows. Please donate me to help \ + in SMBNetFS development." + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" +HOMEPAGE ="http://sourceforge.net/projects/smbnetfs" + +DEPENDS = "fuse samba" +DEPENDS_append_libc-musl = " libexecinfo" + +# samba depends on libpam +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + +inherit autotools gitpkgv pkgconfig + +PKGV = "${GITPKGVTAG}" + +SRCREV = "bc6b94b015fdaf7c4dab56ccb996eecea8bc4373" + +SRC_URI = "git://smbnetfs.git.sourceforge.net/gitroot/smbnetfs/smbnetfs;branch=master \ + file://configure.patch \ + file://Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[libsecret] = "--with-libsecret=yes,--with-libsecret=no,libsecret" + +S = "${WORKDIR}/git" + +LDFLAGS_append_libc-musl = " -lexecinfo" diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch index 9efea804b..6732dc42e 100644 --- a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch @@ -1,4 +1,4 @@ -From bb8801fb21ac8d73e3b1a11a8555aaf822182a51 Mon Sep 17 00:00:00 2001 +From daf04dc9ca1f2e4c65ec338ab439e0a792e1a8ac Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 5 Sep 2017 10:36:52 -0700 Subject: [PATCH] libau: Define STRIP weakly @@ -6,10 +6,11 @@ Subject: [PATCH] libau: Define STRIP weakly STRIP can be set on environment to use cross version of strip utility hardcoding to strip is not working in cross environment -Signed-off-by: Khem Raj ---- Upstream-Status: Submitted +Signed-off-by: Khem Raj + +--- libau/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) @@ -34,6 +35,3 @@ index 81520ac..c25eef2 100644 # readelf --syms --use-dynamic libau.so install_ulib: File = ${LibSo}.${LibSoMajor}.${LibSoMinor} --- -2.14.1 - diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch index 5c3558689..c832696a3 100644 --- a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch @@ -1,3 +1,6 @@ +From 13a60c631d7cf6c7e1926473d8069795c0def9b6 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Thu, 19 Jun 2014 15:09:56 +0100 Subject: [PATCH] aufs-util: add tool concept to Makefile for cross compiling purpose @@ -7,23 +10,21 @@ Add a tools target to Makefile to allow for this. Upstream-Status: Pending Signed-off-by: Chen Qi + --- - Makefile | 2 +- + Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 2f905ad..49c3cd5 100644 +index dbbe43d..aff969e 100644 --- a/Makefile +++ b/Makefile -@@ -85,7 +85,7 @@ aufs.5: aufs.in.5 c2tmac +@@ -152,7 +152,7 @@ aufs.5: aufs.in.5 c2tmac chmod a-w $@ c2sh c2tmac ver: CC = ${HOSTCC} -.INTERMEDIATE: c2sh c2tmac ver +tools: c2sh c2tmac ver - Install = install -o root -g root -p - install_sbin: File = auibusy auplink mount.aufs umount.aufs --- -1.7.9.5 - + install_sbin: File = auibusy aumvdown auplink mount.aufs umount.aufs + ifeq (${Glibc},no) diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-don-t-strip-executables.patch b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-don-t-strip-executables.patch index fe2a6a576..b40822c0d 100644 --- a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-don-t-strip-executables.patch +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-don-t-strip-executables.patch @@ -1,4 +1,4 @@ -From 244863eca77fcaa1187884836c3e28d6b6d1504a Mon Sep 17 00:00:00 2001 +From 9d5e7eff4ae906f1ea6e6527080fded0b595fbd4 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 9 Apr 2013 18:50:34 -0700 Subject: [PATCH] aufs-util: don't strip executables @@ -14,16 +14,19 @@ as follows: To prevent this, we remove -s from LDFLAGS. +Upstream-Status: Inappropriate [oe specific] + Signed-off-by: Bruce Ashfield + --- - Makefile | 2 +- + Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 2f905ad..e0c6dcd 100644 +index 54f8d97..dbbe43d 100644 --- a/Makefile +++ b/Makefile -@@ -56,7 +56,7 @@ all: ver_test ${Man} ${Bin} ${Etc} +@@ -118,7 +118,7 @@ clean: ver_test: ver ./ver @@ -32,6 +35,3 @@ index 2f905ad..e0c6dcd 100644 ${Bin}: LDLIBS = -L. -lautil ${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil} --- -1.7.10.4 - diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb index 0ac991b23..39f11890e 100644 --- a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb @@ -34,6 +34,8 @@ EXTRA_OEMAKE += "'LIBTOOL=${HOST_SYS}-libtool' V=1" do_configure () { export DEBUG="-DNDEBUG" + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} oe_runconf } diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch new file mode 100644 index 000000000..d8ff55531 --- /dev/null +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch @@ -0,0 +1,82 @@ +From ae7172194d3fbb563ff8bbe7c02d34f1bd0e5ec9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 31 Jan 2018 21:28:53 -0800 +Subject: [PATCH] build: Check for sync_file_range libc function + +glibc 2.27 now has sync_file_range() + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + include/builddefs.in | 1 + + io/Makefile | 5 ++++- + io/io.h | 2 +- + io/sync_file_range.c | 3 +++ + 4 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/include/builddefs.in b/include/builddefs.in +index 92d5076..504225a 100644 +--- a/include/builddefs.in ++++ b/include/builddefs.in +@@ -105,6 +105,7 @@ HAVE_FIEMAP = @have_fiemap@ + HAVE_PREADV = @have_preadv@ + HAVE_PWRITEV2 = @have_pwritev2@ + HAVE_COPY_FILE_RANGE = @have_copy_file_range@ ++HAVE_NR_COPY_FILE_RANGE = @have_nr_copy_file_range@ + HAVE_SYNC_FILE_RANGE = @have_sync_file_range@ + HAVE_SYNCFS = @have_syncfs@ + HAVE_READDIR = @have_readdir@ +diff --git a/io/Makefile b/io/Makefile +index 6725936..1876e95 100644 +--- a/io/Makefile ++++ b/io/Makefile +@@ -59,10 +59,13 @@ CFILES += inject.c resblks.c + LCFLAGS += -DHAVE_INJECT -DHAVE_RESBLKS + endif + +-ifeq ($(HAVE_COPY_FILE_RANGE),yes) ++ifeq ($(HAVE_NR_COPY_FILE_RANGE),yes) + CFILES += copy_file_range.c ++LCFLAGS += -DHAVE_NR_COPY_FILE_RANGE ++ifeq ($(HAVE_COPY_FILE_RANGE),yes) + LCFLAGS += -DHAVE_COPY_FILE_RANGE + endif ++endif + + ifeq ($(HAVE_SYNC_FILE_RANGE),yes) + CFILES += sync_file_range.c +diff --git a/io/io.h b/io/io.h +index 3862985..79ddc7b 100644 +--- a/io/io.h ++++ b/io/io.h +@@ -158,7 +158,7 @@ extern void fiemap_init(void); + #define fiemap_init() do { } while (0) + #endif + +-#ifdef HAVE_COPY_FILE_RANGE ++#if defined(HAVE_NR_COPY_FILE_RANGE) && !defined(HAVE_COPY_FILE_RANGE) + extern void copy_range_init(void); + #else + #define copy_range_init() do { } while (0) +diff --git a/io/sync_file_range.c b/io/sync_file_range.c +index 7e4f3e6..aafea01 100644 +--- a/io/sync_file_range.c ++++ b/io/sync_file_range.c +@@ -16,6 +16,7 @@ + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#ifndef HAVE_COPY_FILE_RANGE + #include "command.h" + #include "input.h" + #include "init.h" +@@ -104,3 +105,5 @@ sync_range_init(void) + + add_command(&sync_range_cmd); + } ++ ++#endif +-- +2.16.1 + diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-xfs-remove-double-underscore-integer-types.patch b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-xfs-remove-double-underscore-integer-types.patch deleted file mode 100644 index a47c48707..000000000 --- a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-xfs-remove-double-underscore-integer-types.patch +++ /dev/null @@ -1,2082 +0,0 @@ -From 4a492e72515509ee702286a42afe7d8f89d37636 Mon Sep 17 00:00:00 2001 -From: "Darrick J. Wong" -Date: Mon, 31 Jul 2017 15:08:10 -0500 -Subject: [PATCH] xfs: remove double-underscore integer types - -Source kernel commit: c8ce540db5f67d254aafb14b5d76422c62a906df - -This is a purely mechanical patch that removes the private -__{u,}int{8,16,32,64}_t typedefs in favor of using the system -{u,}int{8,16,32,64}_t typedefs. This is the sed script used to perform -the transformation and fix the resulting whitespace and indentation -errors: - -s/typedef\t__uint8_t/typedef __uint8_t\t/g -s/typedef\t__uint/typedef __uint/g -s/typedef\t__int\([0-9]*\)_t/typedef int\1_t\t/g -s/__uint8_t\t/__uint8_t\t\t/g -s/__uint/uint/g -s/__int\([0-9]*\)_t\t/__int\1_t\t\t/g -s/__int/int/g -/^typedef.*int[0-9]*_t;$/d - -Signed-off-by: Darrick J. Wong -Reviewed-by: Christoph Hellwig -Signed-off-by: Eric Sandeen ---- - libxfs/libxfs_priv.h | 1 + - libxfs/xfs_alloc_btree.c | 20 ++-- - libxfs/xfs_attr_remote.c | 8 +- - libxfs/xfs_attr_sf.h | 10 +- - libxfs/xfs_bit.h | 24 ++--- - libxfs/xfs_bmap_btree.c | 8 +- - libxfs/xfs_btree.c | 22 ++-- - libxfs/xfs_btree.h | 18 ++-- - libxfs/xfs_cksum.h | 16 +-- - libxfs/xfs_da_btree.c | 2 +- - libxfs/xfs_da_btree.h | 8 +- - libxfs/xfs_da_format.c | 28 ++--- - libxfs/xfs_da_format.h | 64 +++++------ - libxfs/xfs_dir2.h | 8 +- - libxfs/xfs_dir2_leaf.c | 12 +-- - libxfs/xfs_dir2_priv.h | 2 +- - libxfs/xfs_dir2_sf.c | 4 +- - libxfs/xfs_format.h | 112 +++++++++---------- - libxfs/xfs_fs.h | 12 +-- - libxfs/xfs_ialloc.c | 6 +- - libxfs/xfs_ialloc_btree.c | 4 +- - libxfs/xfs_inode_buf.c | 2 +- - libxfs/xfs_inode_buf.h | 28 ++--- - libxfs/xfs_log_format.h | 256 ++++++++++++++++++++++---------------------- - libxfs/xfs_quota_defs.h | 4 +- - libxfs/xfs_refcount_btree.c | 8 +- - libxfs/xfs_rmap.c | 8 +- - libxfs/xfs_rmap.h | 8 +- - libxfs/xfs_rmap_btree.c | 30 +++--- - libxfs/xfs_rtbitmap.c | 2 +- - libxfs/xfs_sb.c | 4 +- - libxfs/xfs_types.h | 46 ++++---- - 32 files changed, 393 insertions(+), 392 deletions(-) - -diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h -index 0b4c4890..b3cc7e53 100644 ---- a/libxfs/libxfs_priv.h -+++ b/libxfs/libxfs_priv.h -@@ -504,5 +504,6 @@ bool xfs_log_check_lsn(struct xfs_mount *, xfs_lsn_t); - #define XFS_STATS_INC_OFF(mp, off) - #define XFS_STATS_ADD_OFF(mp, off, val) - -+typedef unsigned char u8; - - #endif /* __LIBXFS_INTERNAL_XFS_H__ */ -diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c -index e11d89a3..8e77e6e3 100644 ---- a/libxfs/xfs_alloc_btree.c -+++ b/libxfs/xfs_alloc_btree.c -@@ -251,7 +251,7 @@ xfs_allocbt_init_ptr_from_cur( - ptr->s = agf->agf_roots[cur->bc_btnum]; - } - --STATIC __int64_t -+STATIC int64_t - xfs_bnobt_key_diff( - struct xfs_btree_cur *cur, - union xfs_btree_key *key) -@@ -259,42 +259,42 @@ xfs_bnobt_key_diff( - xfs_alloc_rec_incore_t *rec = &cur->bc_rec.a; - xfs_alloc_key_t *kp = &key->alloc; - -- return (__int64_t)be32_to_cpu(kp->ar_startblock) - rec->ar_startblock; -+ return (int64_t)be32_to_cpu(kp->ar_startblock) - rec->ar_startblock; - } - --STATIC __int64_t -+STATIC int64_t - xfs_cntbt_key_diff( - struct xfs_btree_cur *cur, - union xfs_btree_key *key) - { - xfs_alloc_rec_incore_t *rec = &cur->bc_rec.a; - xfs_alloc_key_t *kp = &key->alloc; -- __int64_t diff; -+ int64_t diff; - -- diff = (__int64_t)be32_to_cpu(kp->ar_blockcount) - rec->ar_blockcount; -+ diff = (int64_t)be32_to_cpu(kp->ar_blockcount) - rec->ar_blockcount; - if (diff) - return diff; - -- return (__int64_t)be32_to_cpu(kp->ar_startblock) - rec->ar_startblock; -+ return (int64_t)be32_to_cpu(kp->ar_startblock) - rec->ar_startblock; - } - --STATIC __int64_t -+STATIC int64_t - xfs_bnobt_diff_two_keys( - struct xfs_btree_cur *cur, - union xfs_btree_key *k1, - union xfs_btree_key *k2) - { -- return (__int64_t)be32_to_cpu(k1->alloc.ar_startblock) - -+ return (int64_t)be32_to_cpu(k1->alloc.ar_startblock) - - be32_to_cpu(k2->alloc.ar_startblock); - } - --STATIC __int64_t -+STATIC int64_t - xfs_cntbt_diff_two_keys( - struct xfs_btree_cur *cur, - union xfs_btree_key *k1, - union xfs_btree_key *k2) - { -- __int64_t diff; -+ int64_t diff; - - diff = be32_to_cpu(k1->alloc.ar_blockcount) - - be32_to_cpu(k2->alloc.ar_blockcount); -diff --git a/libxfs/xfs_attr_remote.c b/libxfs/xfs_attr_remote.c -index abe17052..1f25e363 100644 ---- a/libxfs/xfs_attr_remote.c -+++ b/libxfs/xfs_attr_remote.c -@@ -248,7 +248,7 @@ xfs_attr_rmtval_copyout( - xfs_ino_t ino, - int *offset, - int *valuelen, -- __uint8_t **dst) -+ uint8_t **dst) - { - char *src = bp->b_addr; - xfs_daddr_t bno = bp->b_bn; -@@ -296,7 +296,7 @@ xfs_attr_rmtval_copyin( - xfs_ino_t ino, - int *offset, - int *valuelen, -- __uint8_t **src) -+ uint8_t **src) - { - char *dst = bp->b_addr; - xfs_daddr_t bno = bp->b_bn; -@@ -350,7 +350,7 @@ xfs_attr_rmtval_get( - struct xfs_mount *mp = args->dp->i_mount; - struct xfs_buf *bp; - xfs_dablk_t lblkno = args->rmtblkno; -- __uint8_t *dst = args->value; -+ uint8_t *dst = args->value; - int valuelen; - int nmap; - int error; -@@ -416,7 +416,7 @@ xfs_attr_rmtval_set( - struct xfs_bmbt_irec map; - xfs_dablk_t lblkno; - xfs_fileoff_t lfileoff = 0; -- __uint8_t *src = args->value; -+ uint8_t *src = args->value; - int blkcnt; - int valuelen; - int nmap; -diff --git a/libxfs/xfs_attr_sf.h b/libxfs/xfs_attr_sf.h -index 90928bbe..afd684ae 100644 ---- a/libxfs/xfs_attr_sf.h -+++ b/libxfs/xfs_attr_sf.h -@@ -31,10 +31,10 @@ typedef struct xfs_attr_sf_entry xfs_attr_sf_entry_t; - * We generate this then sort it, attr_list() must return things in hash-order. - */ - typedef struct xfs_attr_sf_sort { -- __uint8_t entno; /* entry number in original list */ -- __uint8_t namelen; /* length of name value (no null) */ -- __uint8_t valuelen; /* length of value */ -- __uint8_t flags; /* flags bits (see xfs_attr_leaf.h) */ -+ uint8_t entno; /* entry number in original list */ -+ uint8_t namelen; /* length of name value (no null) */ -+ uint8_t valuelen; /* length of value */ -+ uint8_t flags; /* flags bits (see xfs_attr_leaf.h) */ - xfs_dahash_t hash; /* this entry's hash value */ - unsigned char *name; /* name value, pointer into buffer */ - } xfs_attr_sf_sort_t; -@@ -42,7 +42,7 @@ typedef struct xfs_attr_sf_sort { - #define XFS_ATTR_SF_ENTSIZE_BYNAME(nlen,vlen) /* space name/value uses */ \ - (((int)sizeof(xfs_attr_sf_entry_t)-1 + (nlen)+(vlen))) - #define XFS_ATTR_SF_ENTSIZE_MAX /* max space for name&value */ \ -- ((1 << (NBBY*(int)sizeof(__uint8_t))) - 1) -+ ((1 << (NBBY*(int)sizeof(uint8_t))) - 1) - #define XFS_ATTR_SF_ENTSIZE(sfep) /* space an entry uses */ \ - ((int)sizeof(xfs_attr_sf_entry_t)-1 + (sfep)->namelen+(sfep)->valuelen) - #define XFS_ATTR_SF_NEXTENTRY(sfep) /* next entry in struct */ \ -diff --git a/libxfs/xfs_bit.h b/libxfs/xfs_bit.h -index e1649c0d..61c6b202 100644 ---- a/libxfs/xfs_bit.h -+++ b/libxfs/xfs_bit.h -@@ -25,47 +25,47 @@ - /* - * masks with n high/low bits set, 64-bit values - */ --static inline __uint64_t xfs_mask64hi(int n) -+static inline uint64_t xfs_mask64hi(int n) - { -- return (__uint64_t)-1 << (64 - (n)); -+ return (uint64_t)-1 << (64 - (n)); - } --static inline __uint32_t xfs_mask32lo(int n) -+static inline uint32_t xfs_mask32lo(int n) - { -- return ((__uint32_t)1 << (n)) - 1; -+ return ((uint32_t)1 << (n)) - 1; - } --static inline __uint64_t xfs_mask64lo(int n) -+static inline uint64_t xfs_mask64lo(int n) - { -- return ((__uint64_t)1 << (n)) - 1; -+ return ((uint64_t)1 << (n)) - 1; - } - - /* Get high bit set out of 32-bit argument, -1 if none set */ --static inline int xfs_highbit32(__uint32_t v) -+static inline int xfs_highbit32(uint32_t v) - { - return fls(v) - 1; - } - - /* Get high bit set out of 64-bit argument, -1 if none set */ --static inline int xfs_highbit64(__uint64_t v) -+static inline int xfs_highbit64(uint64_t v) - { - return fls64(v) - 1; - } - - /* Get low bit set out of 32-bit argument, -1 if none set */ --static inline int xfs_lowbit32(__uint32_t v) -+static inline int xfs_lowbit32(uint32_t v) - { - return ffs(v) - 1; - } - - /* Get low bit set out of 64-bit argument, -1 if none set */ --static inline int xfs_lowbit64(__uint64_t v) -+static inline int xfs_lowbit64(uint64_t v) - { -- __uint32_t w = (__uint32_t)v; -+ uint32_t w = (uint32_t)v; - int n = 0; - - if (w) { /* lower bits */ - n = ffs(w); - } else { /* upper bits */ -- w = (__uint32_t)(v >> 32); -+ w = (uint32_t)(v >> 32); - if (w) { - n = ffs(w); - if (n) -diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c -index c48cbec1..9ee40d8b 100644 ---- a/libxfs/xfs_bmap_btree.c -+++ b/libxfs/xfs_bmap_btree.c -@@ -91,8 +91,8 @@ xfs_bmdr_to_bmbt( - */ - STATIC void - __xfs_bmbt_get_all( -- __uint64_t l0, -- __uint64_t l1, -+ uint64_t l0, -+ uint64_t l1, - xfs_bmbt_irec_t *s) - { - int ext_flag; -@@ -585,12 +585,12 @@ xfs_bmbt_init_ptr_from_cur( - ptr->l = 0; - } - --STATIC __int64_t -+STATIC int64_t - xfs_bmbt_key_diff( - struct xfs_btree_cur *cur, - union xfs_btree_key *key) - { -- return (__int64_t)be64_to_cpu(key->bmbt.br_startoff) - -+ return (int64_t)be64_to_cpu(key->bmbt.br_startoff) - - cur->bc_rec.b.br_startoff; - } - -diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c -index 3d293520..56b50a5b 100644 ---- a/libxfs/xfs_btree.c -+++ b/libxfs/xfs_btree.c -@@ -39,7 +39,7 @@ kmem_zone_t *xfs_btree_cur_zone; - /* - * Btree magic numbers. - */ --static const __uint32_t xfs_magics[2][XFS_BTNUM_MAX] = { -+static const uint32_t xfs_magics[2][XFS_BTNUM_MAX] = { - { XFS_ABTB_MAGIC, XFS_ABTC_MAGIC, 0, XFS_BMAP_MAGIC, XFS_IBT_MAGIC, - XFS_FIBT_MAGIC, 0 }, - { XFS_ABTB_CRC_MAGIC, XFS_ABTC_CRC_MAGIC, XFS_RMAP_CRC_MAGIC, -@@ -47,12 +47,12 @@ static const __uint32_t xfs_magics[2][XFS_BTNUM_MAX] = { - XFS_REFC_CRC_MAGIC } - }; - --__uint32_t -+uint32_t - xfs_btree_magic( - int crc, - xfs_btnum_t btnum) - { -- __uint32_t magic = xfs_magics[crc][btnum]; -+ uint32_t magic = xfs_magics[crc][btnum]; - - /* Ensure we asked for crc for crc-only magics. */ - ASSERT(magic != 0); -@@ -774,14 +774,14 @@ xfs_btree_lastrec( - */ - void - xfs_btree_offsets( -- __int64_t fields, /* bitmask of fields */ -+ int64_t fields, /* bitmask of fields */ - const short *offsets, /* table of field offsets */ - int nbits, /* number of bits to inspect */ - int *first, /* output: first byte offset */ - int *last) /* output: last byte offset */ - { - int i; /* current bit number */ -- __int64_t imask; /* mask for current bit number */ -+ int64_t imask; /* mask for current bit number */ - - ASSERT(fields != 0); - /* -@@ -1842,7 +1842,7 @@ xfs_btree_lookup( - int *stat) /* success/failure */ - { - struct xfs_btree_block *block; /* current btree block */ -- __int64_t diff; /* difference for the current key */ -+ int64_t diff; /* difference for the current key */ - int error; /* error return value */ - int keyno; /* current key number */ - int level; /* level in the btree */ -@@ -4435,7 +4435,7 @@ xfs_btree_visit_blocks( - * recovery completion writes the changes to disk. - */ - struct xfs_btree_block_change_owner_info { -- __uint64_t new_owner; -+ uint64_t new_owner; - struct list_head *buffer_list; - }; - -@@ -4481,7 +4481,7 @@ xfs_btree_block_change_owner( - int - xfs_btree_change_owner( - struct xfs_btree_cur *cur, -- __uint64_t new_owner, -+ uint64_t new_owner, - struct list_head *buffer_list) - { - struct xfs_btree_block_change_owner_info bbcoi; -@@ -4585,7 +4585,7 @@ xfs_btree_simple_query_range( - { - union xfs_btree_rec *recp; - union xfs_btree_key rec_key; -- __int64_t diff; -+ int64_t diff; - int stat; - bool firstrec = true; - int error; -@@ -4682,8 +4682,8 @@ xfs_btree_overlapped_query_range( - union xfs_btree_key *hkp; - union xfs_btree_rec *recp; - struct xfs_btree_block *block; -- __int64_t ldiff; -- __int64_t hdiff; -+ int64_t ldiff; -+ int64_t hdiff; - int level; - struct xfs_buf *bp; - int i; -diff --git a/libxfs/xfs_btree.h b/libxfs/xfs_btree.h -index 05cf35b5..3c1fed23 100644 ---- a/libxfs/xfs_btree.h -+++ b/libxfs/xfs_btree.h -@@ -76,7 +76,7 @@ union xfs_btree_rec { - #define XFS_BTNUM_RMAP ((xfs_btnum_t)XFS_BTNUM_RMAPi) - #define XFS_BTNUM_REFC ((xfs_btnum_t)XFS_BTNUM_REFCi) - --__uint32_t xfs_btree_magic(int crc, xfs_btnum_t btnum); -+uint32_t xfs_btree_magic(int crc, xfs_btnum_t btnum); - - /* - * For logging record fields. -@@ -150,14 +150,14 @@ struct xfs_btree_ops { - union xfs_btree_rec *rec); - - /* difference between key value and cursor value */ -- __int64_t (*key_diff)(struct xfs_btree_cur *cur, -+ int64_t (*key_diff)(struct xfs_btree_cur *cur, - union xfs_btree_key *key); - - /* - * Difference between key2 and key1 -- positive if key1 > key2, - * negative if key1 < key2, and zero if equal. - */ -- __int64_t (*diff_two_keys)(struct xfs_btree_cur *cur, -+ int64_t (*diff_two_keys)(struct xfs_btree_cur *cur, - union xfs_btree_key *key1, - union xfs_btree_key *key2); - -@@ -213,11 +213,11 @@ typedef struct xfs_btree_cur - union xfs_btree_irec bc_rec; /* current insert/search record value */ - struct xfs_buf *bc_bufs[XFS_BTREE_MAXLEVELS]; /* buf ptr per level */ - int bc_ptrs[XFS_BTREE_MAXLEVELS]; /* key/record # */ -- __uint8_t bc_ra[XFS_BTREE_MAXLEVELS]; /* readahead bits */ -+ uint8_t bc_ra[XFS_BTREE_MAXLEVELS]; /* readahead bits */ - #define XFS_BTCUR_LEFTRA 1 /* left sibling has been read-ahead */ - #define XFS_BTCUR_RIGHTRA 2 /* right sibling has been read-ahead */ -- __uint8_t bc_nlevels; /* number of levels in the tree */ -- __uint8_t bc_blocklog; /* log2(blocksize) of btree blocks */ -+ uint8_t bc_nlevels; /* number of levels in the tree */ -+ uint8_t bc_blocklog; /* log2(blocksize) of btree blocks */ - xfs_btnum_t bc_btnum; /* identifies which btree type */ - int bc_statoff; /* offset of btre stats array */ - union { -@@ -330,7 +330,7 @@ xfs_btree_islastblock( - */ - void - xfs_btree_offsets( -- __int64_t fields, /* bitmask of fields */ -+ int64_t fields, /* bitmask of fields */ - const short *offsets,/* table of field offsets */ - int nbits, /* number of bits to inspect */ - int *first, /* output: first byte offset */ -@@ -408,7 +408,7 @@ int xfs_btree_new_iroot(struct xfs_btree_cur *, int *, int *); - int xfs_btree_insert(struct xfs_btree_cur *, int *); - int xfs_btree_delete(struct xfs_btree_cur *, int *); - int xfs_btree_get_rec(struct xfs_btree_cur *, union xfs_btree_rec **, int *); --int xfs_btree_change_owner(struct xfs_btree_cur *cur, __uint64_t new_owner, -+int xfs_btree_change_owner(struct xfs_btree_cur *cur, uint64_t new_owner, - struct list_head *buffer_list); - - /* -@@ -434,7 +434,7 @@ static inline int xfs_btree_get_numrecs(struct xfs_btree_block *block) - } - - static inline void xfs_btree_set_numrecs(struct xfs_btree_block *block, -- __uint16_t numrecs) -+ uint16_t numrecs) - { - block->bb_numrecs = cpu_to_be16(numrecs); - } -diff --git a/libxfs/xfs_cksum.h b/libxfs/xfs_cksum.h -index a416c7cb..8211f48b 100644 ---- a/libxfs/xfs_cksum.h -+++ b/libxfs/xfs_cksum.h -@@ -1,7 +1,7 @@ - #ifndef _XFS_CKSUM_H - #define _XFS_CKSUM_H 1 - --#define XFS_CRC_SEED (~(__uint32_t)0) -+#define XFS_CRC_SEED (~(uint32_t)0) - - /* - * Calculate the intermediate checksum for a buffer that has the CRC field -@@ -9,11 +9,11 @@ - * cksum_offset parameter. We do not modify the buffer during verification, - * hence we have to split the CRC calculation across the cksum_offset. - */ --static inline __uint32_t -+static inline uint32_t - xfs_start_cksum_safe(char *buffer, size_t length, unsigned long cksum_offset) - { -- __uint32_t zero = 0; -- __uint32_t crc; -+ uint32_t zero = 0; -+ uint32_t crc; - - /* Calculate CRC up to the checksum. */ - crc = crc32c(XFS_CRC_SEED, buffer, cksum_offset); -@@ -30,7 +30,7 @@ xfs_start_cksum_safe(char *buffer, size_t length, unsigned long cksum_offset) - * Fast CRC method where the buffer is modified. Callers must have exclusive - * access to the buffer while the calculation takes place. - */ --static inline __uint32_t -+static inline uint32_t - xfs_start_cksum_update(char *buffer, size_t length, unsigned long cksum_offset) - { - /* zero the CRC field */ -@@ -48,7 +48,7 @@ xfs_start_cksum_update(char *buffer, size_t length, unsigned long cksum_offset) - * so that it is consistent on disk. - */ - static inline __le32 --xfs_end_cksum(__uint32_t crc) -+xfs_end_cksum(uint32_t crc) - { - return ~cpu_to_le32(crc); - } -@@ -62,7 +62,7 @@ xfs_end_cksum(__uint32_t crc) - static inline void - xfs_update_cksum(char *buffer, size_t length, unsigned long cksum_offset) - { -- __uint32_t crc = xfs_start_cksum_update(buffer, length, cksum_offset); -+ uint32_t crc = xfs_start_cksum_update(buffer, length, cksum_offset); - - *(__le32 *)(buffer + cksum_offset) = xfs_end_cksum(crc); - } -@@ -73,7 +73,7 @@ xfs_update_cksum(char *buffer, size_t length, unsigned long cksum_offset) - static inline int - xfs_verify_cksum(char *buffer, size_t length, unsigned long cksum_offset) - { -- __uint32_t crc = xfs_start_cksum_safe(buffer, length, cksum_offset); -+ uint32_t crc = xfs_start_cksum_safe(buffer, length, cksum_offset); - - return *(__le32 *)(buffer + cksum_offset) == xfs_end_cksum(crc); - } -diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c -index bc12f58f..08447be8 100644 ---- a/libxfs/xfs_da_btree.c -+++ b/libxfs/xfs_da_btree.c -@@ -1947,7 +1947,7 @@ xfs_da3_path_shift( - * This is implemented with some source-level loop unrolling. - */ - xfs_dahash_t --xfs_da_hashname(const __uint8_t *name, int namelen) -+xfs_da_hashname(const uint8_t *name, int namelen) - { - xfs_dahash_t hash; - -diff --git a/libxfs/xfs_da_btree.h b/libxfs/xfs_da_btree.h -index 4e29cb6a..ae6de174 100644 ---- a/libxfs/xfs_da_btree.h -+++ b/libxfs/xfs_da_btree.h -@@ -60,10 +60,10 @@ enum xfs_dacmp { - */ - typedef struct xfs_da_args { - struct xfs_da_geometry *geo; /* da block geometry */ -- const __uint8_t *name; /* string (maybe not NULL terminated) */ -+ const uint8_t *name; /* string (maybe not NULL terminated) */ - int namelen; /* length of string (maybe no NULL) */ -- __uint8_t filetype; /* filetype of inode for directories */ -- __uint8_t *value; /* set of bytes (maybe contain NULLs) */ -+ uint8_t filetype; /* filetype of inode for directories */ -+ uint8_t *value; /* set of bytes (maybe contain NULLs) */ - int valuelen; /* length of value */ - int flags; /* argument flags (eg: ATTR_NOCREATE) */ - xfs_dahash_t hashval; /* hash value of name */ -@@ -207,7 +207,7 @@ int xfs_da_reada_buf(struct xfs_inode *dp, xfs_dablk_t bno, - int xfs_da_shrink_inode(xfs_da_args_t *args, xfs_dablk_t dead_blkno, - struct xfs_buf *dead_buf); - --uint xfs_da_hashname(const __uint8_t *name_string, int name_length); -+uint xfs_da_hashname(const uint8_t *name_string, int name_length); - enum xfs_dacmp xfs_da_compname(struct xfs_da_args *args, - const unsigned char *name, int len); - -diff --git a/libxfs/xfs_da_format.c b/libxfs/xfs_da_format.c -index 2b732b3c..f30004f6 100644 ---- a/libxfs/xfs_da_format.c -+++ b/libxfs/xfs_da_format.c -@@ -49,7 +49,7 @@ xfs_dir3_sf_entsize( - struct xfs_dir2_sf_hdr *hdr, - int len) - { -- return xfs_dir2_sf_entsize(hdr, len) + sizeof(__uint8_t); -+ return xfs_dir2_sf_entsize(hdr, len) + sizeof(uint8_t); - } - - static struct xfs_dir2_sf_entry * -@@ -77,7 +77,7 @@ xfs_dir3_sf_nextentry( - * not necessary. For non-filetype enable directories, the type is always - * unknown and we never store the value. - */ --static __uint8_t -+static uint8_t - xfs_dir2_sfe_get_ftype( - struct xfs_dir2_sf_entry *sfep) - { -@@ -87,16 +87,16 @@ xfs_dir2_sfe_get_ftype( - static void - xfs_dir2_sfe_put_ftype( - struct xfs_dir2_sf_entry *sfep, -- __uint8_t ftype) -+ uint8_t ftype) - { - ASSERT(ftype < XFS_DIR3_FT_MAX); - } - --static __uint8_t -+static uint8_t - xfs_dir3_sfe_get_ftype( - struct xfs_dir2_sf_entry *sfep) - { -- __uint8_t ftype; -+ uint8_t ftype; - - ftype = sfep->name[sfep->namelen]; - if (ftype >= XFS_DIR3_FT_MAX) -@@ -107,7 +107,7 @@ xfs_dir3_sfe_get_ftype( - static void - xfs_dir3_sfe_put_ftype( - struct xfs_dir2_sf_entry *sfep, -- __uint8_t ftype) -+ uint8_t ftype) - { - ASSERT(ftype < XFS_DIR3_FT_MAX); - -@@ -124,7 +124,7 @@ xfs_dir3_sfe_put_ftype( - static xfs_ino_t - xfs_dir2_sf_get_ino( - struct xfs_dir2_sf_hdr *hdr, -- __uint8_t *from) -+ uint8_t *from) - { - if (hdr->i8count) - return get_unaligned_be64(from) & 0x00ffffffffffffffULL; -@@ -135,7 +135,7 @@ xfs_dir2_sf_get_ino( - static void - xfs_dir2_sf_put_ino( - struct xfs_dir2_sf_hdr *hdr, -- __uint8_t *to, -+ uint8_t *to, - xfs_ino_t ino) - { - ASSERT((ino & 0xff00000000000000ULL) == 0); -@@ -225,7 +225,7 @@ xfs_dir3_sfe_put_ino( - - #define XFS_DIR3_DATA_ENTSIZE(n) \ - round_up((offsetof(struct xfs_dir2_data_entry, name[0]) + (n) + \ -- sizeof(xfs_dir2_data_off_t) + sizeof(__uint8_t)), \ -+ sizeof(xfs_dir2_data_off_t) + sizeof(uint8_t)), \ - XFS_DIR2_DATA_ALIGN) - - static int -@@ -242,7 +242,7 @@ xfs_dir3_data_entsize( - return XFS_DIR3_DATA_ENTSIZE(n); - } - --static __uint8_t -+static uint8_t - xfs_dir2_data_get_ftype( - struct xfs_dir2_data_entry *dep) - { -@@ -252,16 +252,16 @@ xfs_dir2_data_get_ftype( - static void - xfs_dir2_data_put_ftype( - struct xfs_dir2_data_entry *dep, -- __uint8_t ftype) -+ uint8_t ftype) - { - ASSERT(ftype < XFS_DIR3_FT_MAX); - } - --static __uint8_t -+static uint8_t - xfs_dir3_data_get_ftype( - struct xfs_dir2_data_entry *dep) - { -- __uint8_t ftype = dep->name[dep->namelen]; -+ uint8_t ftype = dep->name[dep->namelen]; - - if (ftype >= XFS_DIR3_FT_MAX) - return XFS_DIR3_FT_UNKNOWN; -@@ -271,7 +271,7 @@ xfs_dir3_data_get_ftype( - static void - xfs_dir3_data_put_ftype( - struct xfs_dir2_data_entry *dep, -- __uint8_t type) -+ uint8_t type) - { - ASSERT(type < XFS_DIR3_FT_MAX); - ASSERT(dep->namelen != 0); -diff --git a/libxfs/xfs_da_format.h b/libxfs/xfs_da_format.h -index 9a492a9e..3771edcb 100644 ---- a/libxfs/xfs_da_format.h -+++ b/libxfs/xfs_da_format.h -@@ -111,11 +111,11 @@ struct xfs_da3_intnode { - * appropriate. - */ - struct xfs_da3_icnode_hdr { -- __uint32_t forw; -- __uint32_t back; -- __uint16_t magic; -- __uint16_t count; -- __uint16_t level; -+ uint32_t forw; -+ uint32_t back; -+ uint16_t magic; -+ uint16_t count; -+ uint16_t level; - }; - - /* -@@ -187,14 +187,14 @@ struct xfs_da3_icnode_hdr { - /* - * Byte offset in data block and shortform entry. - */ --typedef __uint16_t xfs_dir2_data_off_t; -+typedef uint16_t xfs_dir2_data_off_t; - #define NULLDATAOFF 0xffffU - typedef uint xfs_dir2_data_aoff_t; /* argument form */ - - /* - * Offset in data space of a data entry. - */ --typedef __uint32_t xfs_dir2_dataptr_t; -+typedef uint32_t xfs_dir2_dataptr_t; - #define XFS_DIR2_MAX_DATAPTR ((xfs_dir2_dataptr_t)0xffffffff) - #define XFS_DIR2_NULL_DATAPTR ((xfs_dir2_dataptr_t)0) - -@@ -206,7 +206,7 @@ typedef xfs_off_t xfs_dir2_off_t; - /* - * Directory block number (logical dirblk in file) - */ --typedef __uint32_t xfs_dir2_db_t; -+typedef uint32_t xfs_dir2_db_t; - - #define XFS_INO32_SIZE 4 - #define XFS_INO64_SIZE 8 -@@ -226,9 +226,9 @@ typedef __uint32_t xfs_dir2_db_t; - * over them. - */ - typedef struct xfs_dir2_sf_hdr { -- __uint8_t count; /* count of entries */ -- __uint8_t i8count; /* count of 8-byte inode #s */ -- __uint8_t parent[8]; /* parent dir inode number */ -+ uint8_t count; /* count of entries */ -+ uint8_t i8count; /* count of 8-byte inode #s */ -+ uint8_t parent[8]; /* parent dir inode number */ - } __packed xfs_dir2_sf_hdr_t; - - typedef struct xfs_dir2_sf_entry { -@@ -447,11 +447,11 @@ struct xfs_dir3_leaf_hdr { - }; - - struct xfs_dir3_icleaf_hdr { -- __uint32_t forw; -- __uint32_t back; -- __uint16_t magic; -- __uint16_t count; -- __uint16_t stale; -+ uint32_t forw; -+ uint32_t back; -+ uint16_t magic; -+ uint16_t count; -+ uint16_t stale; - }; - - /* -@@ -538,10 +538,10 @@ struct xfs_dir3_free { - * xfs_dir3_free_hdr_from_disk/xfs_dir3_free_hdr_to_disk. - */ - struct xfs_dir3_icfree_hdr { -- __uint32_t magic; -- __uint32_t firstdb; -- __uint32_t nvalid; -- __uint32_t nused; -+ uint32_t magic; -+ uint32_t firstdb; -+ uint32_t nvalid; -+ uint32_t nused; - - }; - -@@ -632,10 +632,10 @@ typedef struct xfs_attr_shortform { - __u8 padding; - } hdr; - struct xfs_attr_sf_entry { -- __uint8_t namelen; /* actual length of name (no NULL) */ -- __uint8_t valuelen; /* actual length of value (no NULL) */ -- __uint8_t flags; /* flags bits (see xfs_attr_leaf.h) */ -- __uint8_t nameval[1]; /* name & value bytes concatenated */ -+ uint8_t namelen; /* actual length of name (no NULL) */ -+ uint8_t valuelen; /* actual length of value (no NULL) */ -+ uint8_t flags; /* flags bits (see xfs_attr_leaf.h) */ -+ uint8_t nameval[1]; /* name & value bytes concatenated */ - } list[1]; /* variable sized array */ - } xfs_attr_shortform_t; - -@@ -725,22 +725,22 @@ struct xfs_attr3_leafblock { - * incore, neutral version of the attribute leaf header - */ - struct xfs_attr3_icleaf_hdr { -- __uint32_t forw; -- __uint32_t back; -- __uint16_t magic; -- __uint16_t count; -- __uint16_t usedbytes; -+ uint32_t forw; -+ uint32_t back; -+ uint16_t magic; -+ uint16_t count; -+ uint16_t usedbytes; - /* - * firstused is 32-bit here instead of 16-bit like the on-disk variant - * to support maximum fsb size of 64k without overflow issues throughout - * the attr code. Instead, the overflow condition is handled on - * conversion to/from disk. - */ -- __uint32_t firstused; -+ uint32_t firstused; - __u8 holes; - struct { -- __uint16_t base; -- __uint16_t size; -+ uint16_t base; -+ uint16_t size; - } freemap[XFS_ATTR_LEAF_MAPSIZE]; - }; - -diff --git a/libxfs/xfs_dir2.h b/libxfs/xfs_dir2.h -index d6e6d9d1..21c8f8bf 100644 ---- a/libxfs/xfs_dir2.h -+++ b/libxfs/xfs_dir2.h -@@ -47,9 +47,9 @@ struct xfs_dir_ops { - struct xfs_dir2_sf_entry * - (*sf_nextentry)(struct xfs_dir2_sf_hdr *hdr, - struct xfs_dir2_sf_entry *sfep); -- __uint8_t (*sf_get_ftype)(struct xfs_dir2_sf_entry *sfep); -+ uint8_t (*sf_get_ftype)(struct xfs_dir2_sf_entry *sfep); - void (*sf_put_ftype)(struct xfs_dir2_sf_entry *sfep, -- __uint8_t ftype); -+ uint8_t ftype); - xfs_ino_t (*sf_get_ino)(struct xfs_dir2_sf_hdr *hdr, - struct xfs_dir2_sf_entry *sfep); - void (*sf_put_ino)(struct xfs_dir2_sf_hdr *hdr, -@@ -60,9 +60,9 @@ struct xfs_dir_ops { - xfs_ino_t ino); - - int (*data_entsize)(int len); -- __uint8_t (*data_get_ftype)(struct xfs_dir2_data_entry *dep); -+ uint8_t (*data_get_ftype)(struct xfs_dir2_data_entry *dep); - void (*data_put_ftype)(struct xfs_dir2_data_entry *dep, -- __uint8_t ftype); -+ uint8_t ftype); - __be16 * (*data_entry_tag_p)(struct xfs_dir2_data_entry *dep); - struct xfs_dir2_data_free * - (*data_bestfree_p)(struct xfs_dir2_data_hdr *hdr); -diff --git a/libxfs/xfs_dir2_leaf.c b/libxfs/xfs_dir2_leaf.c -index f80d91fc..40a35b84 100644 ---- a/libxfs/xfs_dir2_leaf.c -+++ b/libxfs/xfs_dir2_leaf.c -@@ -142,7 +142,7 @@ xfs_dir3_leaf_check_int( - static bool - xfs_dir3_leaf_verify( - struct xfs_buf *bp, -- __uint16_t magic) -+ uint16_t magic) - { - struct xfs_mount *mp = bp->b_target->bt_mount; - struct xfs_dir2_leaf *leaf = bp->b_addr; -@@ -151,7 +151,7 @@ xfs_dir3_leaf_verify( - - if (xfs_sb_version_hascrc(&mp->m_sb)) { - struct xfs_dir3_leaf_hdr *leaf3 = bp->b_addr; -- __uint16_t magic3; -+ uint16_t magic3; - - magic3 = (magic == XFS_DIR2_LEAF1_MAGIC) ? XFS_DIR3_LEAF1_MAGIC - : XFS_DIR3_LEAFN_MAGIC; -@@ -175,7 +175,7 @@ xfs_dir3_leaf_verify( - static void - __read_verify( - struct xfs_buf *bp, -- __uint16_t magic) -+ uint16_t magic) - { - struct xfs_mount *mp = bp->b_target->bt_mount; - -@@ -192,7 +192,7 @@ __read_verify( - static void - __write_verify( - struct xfs_buf *bp, -- __uint16_t magic) -+ uint16_t magic) - { - struct xfs_mount *mp = bp->b_target->bt_mount; - struct xfs_buf_log_item *bip = bp->b_fspriv; -@@ -296,7 +296,7 @@ xfs_dir3_leaf_init( - struct xfs_trans *tp, - struct xfs_buf *bp, - xfs_ino_t owner, -- __uint16_t type) -+ uint16_t type) - { - struct xfs_dir2_leaf *leaf = bp->b_addr; - -@@ -340,7 +340,7 @@ xfs_dir3_leaf_get_buf( - xfs_da_args_t *args, - xfs_dir2_db_t bno, - struct xfs_buf **bpp, -- __uint16_t magic) -+ uint16_t magic) - { - struct xfs_inode *dp = args->dp; - struct xfs_trans *tp = args->trans; -diff --git a/libxfs/xfs_dir2_priv.h b/libxfs/xfs_dir2_priv.h -index 39f8604f..011df4da 100644 ---- a/libxfs/xfs_dir2_priv.h -+++ b/libxfs/xfs_dir2_priv.h -@@ -69,7 +69,7 @@ extern void xfs_dir3_leaf_compact_x1(struct xfs_dir3_icleaf_hdr *leafhdr, - struct xfs_dir2_leaf_entry *ents, int *indexp, - int *lowstalep, int *highstalep, int *lowlogp, int *highlogp); - extern int xfs_dir3_leaf_get_buf(struct xfs_da_args *args, xfs_dir2_db_t bno, -- struct xfs_buf **bpp, __uint16_t magic); -+ struct xfs_buf **bpp, uint16_t magic); - extern void xfs_dir3_leaf_log_ents(struct xfs_da_args *args, - struct xfs_buf *bp, int first, int last); - extern void xfs_dir3_leaf_log_header(struct xfs_da_args *args, -diff --git a/libxfs/xfs_dir2_sf.c b/libxfs/xfs_dir2_sf.c -index 195f816d..0c453988 100644 ---- a/libxfs/xfs_dir2_sf.c -+++ b/libxfs/xfs_dir2_sf.c -@@ -125,7 +125,7 @@ xfs_dir2_block_sfsize( - * Calculate the new size, see if we should give up yet. - */ - size = xfs_dir2_sf_hdr_size(i8count) + /* header */ -- count * 3 * sizeof(__u8) + /* namelen + offset */ -+ count * 3 * sizeof(u8) + /* namelen + offset */ - namelen + /* name */ - (i8count ? /* inumber */ - count * XFS_INO64_SIZE : -@@ -645,7 +645,7 @@ xfs_dir2_sf_verify( - int offset; - int size; - int error; -- __uint8_t filetype; -+ uint8_t filetype; - - ASSERT(ip->i_d.di_format == XFS_DINODE_FMT_LOCAL); - /* -diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h -index 4c3ed1fd..a53f035f 100644 ---- a/libxfs/xfs_format.h -+++ b/libxfs/xfs_format.h -@@ -103,8 +103,8 @@ struct xfs_ifork; - * Must be padded to 64 bit alignment. - */ - typedef struct xfs_sb { -- __uint32_t sb_magicnum; /* magic number == XFS_SB_MAGIC */ -- __uint32_t sb_blocksize; /* logical block size, bytes */ -+ uint32_t sb_magicnum; /* magic number == XFS_SB_MAGIC */ -+ uint32_t sb_blocksize; /* logical block size, bytes */ - xfs_rfsblock_t sb_dblocks; /* number of data blocks */ - xfs_rfsblock_t sb_rblocks; /* number of realtime blocks */ - xfs_rtblock_t sb_rextents; /* number of realtime extents */ -@@ -118,45 +118,45 @@ typedef struct xfs_sb { - xfs_agnumber_t sb_agcount; /* number of allocation groups */ - xfs_extlen_t sb_rbmblocks; /* number of rt bitmap blocks */ - xfs_extlen_t sb_logblocks; /* number of log blocks */ -- __uint16_t sb_versionnum; /* header version == XFS_SB_VERSION */ -- __uint16_t sb_sectsize; /* volume sector size, bytes */ -- __uint16_t sb_inodesize; /* inode size, bytes */ -- __uint16_t sb_inopblock; /* inodes per block */ -+ uint16_t sb_versionnum; /* header version == XFS_SB_VERSION */ -+ uint16_t sb_sectsize; /* volume sector size, bytes */ -+ uint16_t sb_inodesize; /* inode size, bytes */ -+ uint16_t sb_inopblock; /* inodes per block */ - char sb_fname[12]; /* file system name */ -- __uint8_t sb_blocklog; /* log2 of sb_blocksize */ -- __uint8_t sb_sectlog; /* log2 of sb_sectsize */ -- __uint8_t sb_inodelog; /* log2 of sb_inodesize */ -- __uint8_t sb_inopblog; /* log2 of sb_inopblock */ -- __uint8_t sb_agblklog; /* log2 of sb_agblocks (rounded up) */ -- __uint8_t sb_rextslog; /* log2 of sb_rextents */ -- __uint8_t sb_inprogress; /* mkfs is in progress, don't mount */ -- __uint8_t sb_imax_pct; /* max % of fs for inode space */ -+ uint8_t sb_blocklog; /* log2 of sb_blocksize */ -+ uint8_t sb_sectlog; /* log2 of sb_sectsize */ -+ uint8_t sb_inodelog; /* log2 of sb_inodesize */ -+ uint8_t sb_inopblog; /* log2 of sb_inopblock */ -+ uint8_t sb_agblklog; /* log2 of sb_agblocks (rounded up) */ -+ uint8_t sb_rextslog; /* log2 of sb_rextents */ -+ uint8_t sb_inprogress; /* mkfs is in progress, don't mount */ -+ uint8_t sb_imax_pct; /* max % of fs for inode space */ - /* statistics */ - /* - * These fields must remain contiguous. If you really - * want to change their layout, make sure you fix the - * code in xfs_trans_apply_sb_deltas(). - */ -- __uint64_t sb_icount; /* allocated inodes */ -- __uint64_t sb_ifree; /* free inodes */ -- __uint64_t sb_fdblocks; /* free data blocks */ -- __uint64_t sb_frextents; /* free realtime extents */ -+ uint64_t sb_icount; /* allocated inodes */ -+ uint64_t sb_ifree; /* free inodes */ -+ uint64_t sb_fdblocks; /* free data blocks */ -+ uint64_t sb_frextents; /* free realtime extents */ - /* - * End contiguous fields. - */ - xfs_ino_t sb_uquotino; /* user quota inode */ - xfs_ino_t sb_gquotino; /* group quota inode */ -- __uint16_t sb_qflags; /* quota flags */ -- __uint8_t sb_flags; /* misc. flags */ -- __uint8_t sb_shared_vn; /* shared version number */ -+ uint16_t sb_qflags; /* quota flags */ -+ uint8_t sb_flags; /* misc. flags */ -+ uint8_t sb_shared_vn; /* shared version number */ - xfs_extlen_t sb_inoalignmt; /* inode chunk alignment, fsblocks */ -- __uint32_t sb_unit; /* stripe or raid unit */ -- __uint32_t sb_width; /* stripe or raid width */ -- __uint8_t sb_dirblklog; /* log2 of dir block size (fsbs) */ -- __uint8_t sb_logsectlog; /* log2 of the log sector size */ -- __uint16_t sb_logsectsize; /* sector size for the log, bytes */ -- __uint32_t sb_logsunit; /* stripe unit size for the log */ -- __uint32_t sb_features2; /* additional feature bits */ -+ uint32_t sb_unit; /* stripe or raid unit */ -+ uint32_t sb_width; /* stripe or raid width */ -+ uint8_t sb_dirblklog; /* log2 of dir block size (fsbs) */ -+ uint8_t sb_logsectlog; /* log2 of the log sector size */ -+ uint16_t sb_logsectsize; /* sector size for the log, bytes */ -+ uint32_t sb_logsunit; /* stripe unit size for the log */ -+ uint32_t sb_features2; /* additional feature bits */ - - /* - * bad features2 field as a result of failing to pad the sb structure to -@@ -167,17 +167,17 @@ typedef struct xfs_sb { - * the value in sb_features2 when formatting the incore superblock to - * the disk buffer. - */ -- __uint32_t sb_bad_features2; -+ uint32_t sb_bad_features2; - - /* version 5 superblock fields start here */ - - /* feature masks */ -- __uint32_t sb_features_compat; -- __uint32_t sb_features_ro_compat; -- __uint32_t sb_features_incompat; -- __uint32_t sb_features_log_incompat; -+ uint32_t sb_features_compat; -+ uint32_t sb_features_ro_compat; -+ uint32_t sb_features_incompat; -+ uint32_t sb_features_log_incompat; - -- __uint32_t sb_crc; /* superblock crc */ -+ uint32_t sb_crc; /* superblock crc */ - xfs_extlen_t sb_spino_align; /* sparse inode chunk alignment */ - - xfs_ino_t sb_pquotino; /* project quota inode */ -@@ -449,7 +449,7 @@ static inline void xfs_sb_version_addprojid32bit(struct xfs_sb *sbp) - static inline bool - xfs_sb_has_compat_feature( - struct xfs_sb *sbp, -- __uint32_t feature) -+ uint32_t feature) - { - return (sbp->sb_features_compat & feature) != 0; - } -@@ -465,7 +465,7 @@ xfs_sb_has_compat_feature( - static inline bool - xfs_sb_has_ro_compat_feature( - struct xfs_sb *sbp, -- __uint32_t feature) -+ uint32_t feature) - { - return (sbp->sb_features_ro_compat & feature) != 0; - } -@@ -482,7 +482,7 @@ xfs_sb_has_ro_compat_feature( - static inline bool - xfs_sb_has_incompat_feature( - struct xfs_sb *sbp, -- __uint32_t feature) -+ uint32_t feature) - { - return (sbp->sb_features_incompat & feature) != 0; - } -@@ -492,7 +492,7 @@ xfs_sb_has_incompat_feature( - static inline bool - xfs_sb_has_incompat_log_feature( - struct xfs_sb *sbp, -- __uint32_t feature) -+ uint32_t feature) - { - return (sbp->sb_features_log_incompat & feature) != 0; - } -@@ -594,8 +594,8 @@ xfs_is_quota_inode(struct xfs_sb *sbp, xfs_ino_t ino) - */ - #define XFS_FSB_TO_B(mp,fsbno) ((xfs_fsize_t)(fsbno) << (mp)->m_sb.sb_blocklog) - #define XFS_B_TO_FSB(mp,b) \ -- ((((__uint64_t)(b)) + (mp)->m_blockmask) >> (mp)->m_sb.sb_blocklog) --#define XFS_B_TO_FSBT(mp,b) (((__uint64_t)(b)) >> (mp)->m_sb.sb_blocklog) -+ ((((uint64_t)(b)) + (mp)->m_blockmask) >> (mp)->m_sb.sb_blocklog) -+#define XFS_B_TO_FSBT(mp,b) (((uint64_t)(b)) >> (mp)->m_sb.sb_blocklog) - #define XFS_B_FSB_OFFSET(mp,b) ((b) & (mp)->m_blockmask) - - /* -@@ -1072,7 +1072,7 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev) - * next agno_log bits - ag number - * high agno_log-agblklog-inopblog bits - 0 - */ --#define XFS_INO_MASK(k) (__uint32_t)((1ULL << (k)) - 1) -+#define XFS_INO_MASK(k) (uint32_t)((1ULL << (k)) - 1) - #define XFS_INO_OFFSET_BITS(mp) (mp)->m_sb.sb_inopblog - #define XFS_INO_AGBNO_BITS(mp) (mp)->m_sb.sb_agblklog - #define XFS_INO_AGINO_BITS(mp) (mp)->m_agino_log -@@ -1269,16 +1269,16 @@ typedef __be32 xfs_alloc_ptr_t; - #define XFS_FIBT_MAGIC 0x46494254 /* 'FIBT' */ - #define XFS_FIBT_CRC_MAGIC 0x46494233 /* 'FIB3' */ - --typedef __uint64_t xfs_inofree_t; -+typedef uint64_t xfs_inofree_t; - #define XFS_INODES_PER_CHUNK (NBBY * sizeof(xfs_inofree_t)) - #define XFS_INODES_PER_CHUNK_LOG (XFS_NBBYLOG + 3) - #define XFS_INOBT_ALL_FREE ((xfs_inofree_t)-1) - #define XFS_INOBT_MASK(i) ((xfs_inofree_t)1 << (i)) - - #define XFS_INOBT_HOLEMASK_FULL 0 /* holemask for full chunk */ --#define XFS_INOBT_HOLEMASK_BITS (NBBY * sizeof(__uint16_t)) -+#define XFS_INOBT_HOLEMASK_BITS (NBBY * sizeof(uint16_t)) - #define XFS_INODES_PER_HOLEMASK_BIT \ -- (XFS_INODES_PER_CHUNK / (NBBY * sizeof(__uint16_t))) -+ (XFS_INODES_PER_CHUNK / (NBBY * sizeof(uint16_t))) - - static inline xfs_inofree_t xfs_inobt_maskn(int i, int n) - { -@@ -1312,9 +1312,9 @@ typedef struct xfs_inobt_rec { - - typedef struct xfs_inobt_rec_incore { - xfs_agino_t ir_startino; /* starting inode number */ -- __uint16_t ir_holemask; /* hole mask for sparse chunks */ -- __uint8_t ir_count; /* total inode count */ -- __uint8_t ir_freecount; /* count of free inodes (set bits) */ -+ uint16_t ir_holemask; /* hole mask for sparse chunks */ -+ uint8_t ir_count; /* total inode count */ -+ uint8_t ir_freecount; /* count of free inodes (set bits) */ - xfs_inofree_t ir_free; /* free inode mask */ - } xfs_inobt_rec_incore_t; - -@@ -1397,15 +1397,15 @@ struct xfs_rmap_rec { - * rm_offset:54-60 aren't used and should be zero - * rm_offset:0-53 is the block offset within the inode - */ --#define XFS_RMAP_OFF_ATTR_FORK ((__uint64_t)1ULL << 63) --#define XFS_RMAP_OFF_BMBT_BLOCK ((__uint64_t)1ULL << 62) --#define XFS_RMAP_OFF_UNWRITTEN ((__uint64_t)1ULL << 61) -+#define XFS_RMAP_OFF_ATTR_FORK ((uint64_t)1ULL << 63) -+#define XFS_RMAP_OFF_BMBT_BLOCK ((uint64_t)1ULL << 62) -+#define XFS_RMAP_OFF_UNWRITTEN ((uint64_t)1ULL << 61) - --#define XFS_RMAP_LEN_MAX ((__uint32_t)~0U) -+#define XFS_RMAP_LEN_MAX ((uint32_t)~0U) - #define XFS_RMAP_OFF_FLAGS (XFS_RMAP_OFF_ATTR_FORK | \ - XFS_RMAP_OFF_BMBT_BLOCK | \ - XFS_RMAP_OFF_UNWRITTEN) --#define XFS_RMAP_OFF_MASK ((__uint64_t)0x3FFFFFFFFFFFFFULL) -+#define XFS_RMAP_OFF_MASK ((uint64_t)0x3FFFFFFFFFFFFFULL) - - #define XFS_RMAP_OFF(off) ((off) & XFS_RMAP_OFF_MASK) - -@@ -1431,8 +1431,8 @@ struct xfs_rmap_rec { - struct xfs_rmap_irec { - xfs_agblock_t rm_startblock; /* extent start block */ - xfs_extlen_t rm_blockcount; /* extent length */ -- __uint64_t rm_owner; /* extent owner */ -- __uint64_t rm_offset; /* offset within the owner */ -+ uint64_t rm_owner; /* extent owner */ -+ uint64_t rm_offset; /* offset within the owner */ - unsigned int rm_flags; /* state flags */ - }; - -@@ -1544,11 +1544,11 @@ typedef struct xfs_bmbt_rec { - __be64 l0, l1; - } xfs_bmbt_rec_t; - --typedef __uint64_t xfs_bmbt_rec_base_t; /* use this for casts */ -+typedef uint64_t xfs_bmbt_rec_base_t; /* use this for casts */ - typedef xfs_bmbt_rec_t xfs_bmdr_rec_t; - - typedef struct xfs_bmbt_rec_host { -- __uint64_t l0, l1; -+ uint64_t l0, l1; - } xfs_bmbt_rec_host_t; - - /* -diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h -index 99f7f881..8a0c0eec 100644 ---- a/libxfs/xfs_fs.h -+++ b/libxfs/xfs_fs.h -@@ -323,10 +323,10 @@ typedef struct xfs_bstat { - * and using two 16bit values to hold new 32bit projid was choosen - * to retain compatibility with "old" filesystems). - */ --static inline __uint32_t -+static inline uint32_t - bstat_get_projid(struct xfs_bstat *bs) - { -- return (__uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo; -+ return (uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo; - } - - /* -@@ -472,10 +472,10 @@ typedef struct xfs_handle { - */ - typedef struct xfs_swapext - { -- __int64_t sx_version; /* version */ -+ int64_t sx_version; /* version */ - #define XFS_SX_VERSION 0 -- __int64_t sx_fdtarget; /* fd of target file */ -- __int64_t sx_fdtmp; /* fd of tmp file */ -+ int64_t sx_fdtarget; /* fd of target file */ -+ int64_t sx_fdtmp; /* fd of tmp file */ - xfs_off_t sx_offset; /* offset into file */ - xfs_off_t sx_length; /* leng from offset */ - char sx_pad[16]; /* pad space, unused */ -@@ -562,7 +562,7 @@ typedef struct xfs_swapext - #define XFS_IOC_ATTRLIST_BY_HANDLE _IOW ('X', 122, struct xfs_fsop_attrlist_handlereq) - #define XFS_IOC_ATTRMULTI_BY_HANDLE _IOW ('X', 123, struct xfs_fsop_attrmulti_handlereq) - #define XFS_IOC_FSGEOMETRY _IOR ('X', 124, struct xfs_fsop_geom) --#define XFS_IOC_GOINGDOWN _IOR ('X', 125, __uint32_t) -+#define XFS_IOC_GOINGDOWN _IOR ('X', 125, uint32_t) - /* XFS_IOC_GETFSUUID ---------- deprecated 140 */ - - /* reflink ioctls; these MUST match the btrfs ioctl definitions */ -diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c -index 55cc4507..8d245184 100644 ---- a/libxfs/xfs_ialloc.c -+++ b/libxfs/xfs_ialloc.c -@@ -134,9 +134,9 @@ xfs_inobt_get_rec( - STATIC int - xfs_inobt_insert_rec( - struct xfs_btree_cur *cur, -- __uint16_t holemask, -- __uint8_t count, -- __int32_t freecount, -+ uint16_t holemask, -+ uint8_t count, -+ int32_t freecount, - xfs_inofree_t free, - int *stat) - { -diff --git a/libxfs/xfs_ialloc_btree.c b/libxfs/xfs_ialloc_btree.c -index 7b4be766..5b281054 100644 ---- a/libxfs/xfs_ialloc_btree.c -+++ b/libxfs/xfs_ialloc_btree.c -@@ -218,12 +218,12 @@ xfs_finobt_init_ptr_from_cur( - ptr->s = agi->agi_free_root; - } - --STATIC __int64_t -+STATIC int64_t - xfs_inobt_key_diff( - struct xfs_btree_cur *cur, - union xfs_btree_key *key) - { -- return (__int64_t)be32_to_cpu(key->inobt.ir_startino) - -+ return (int64_t)be32_to_cpu(key->inobt.ir_startino) - - cur->bc_rec.i.ir_startino; - } - -diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c -index 2972701d..fcc6fb8e 100644 ---- a/libxfs/xfs_inode_buf.c -+++ b/libxfs/xfs_inode_buf.c -@@ -442,7 +442,7 @@ xfs_dinode_calc_crc( - struct xfs_mount *mp, - struct xfs_dinode *dip) - { -- __uint32_t crc; -+ uint32_t crc; - - if (dip->di_version < 3) - return; -diff --git a/libxfs/xfs_inode_buf.h b/libxfs/xfs_inode_buf.h -index 6848a0af..0827d7de 100644 ---- a/libxfs/xfs_inode_buf.h -+++ b/libxfs/xfs_inode_buf.h -@@ -28,26 +28,26 @@ struct xfs_dinode; - * format specific structures at the appropriate time. - */ - struct xfs_icdinode { -- __int8_t di_version; /* inode version */ -- __int8_t di_format; /* format of di_c data */ -- __uint16_t di_flushiter; /* incremented on flush */ -- __uint32_t di_uid; /* owner's user id */ -- __uint32_t di_gid; /* owner's group id */ -- __uint16_t di_projid_lo; /* lower part of owner's project id */ -- __uint16_t di_projid_hi; /* higher part of owner's project id */ -+ int8_t di_version; /* inode version */ -+ int8_t di_format; /* format of di_c data */ -+ uint16_t di_flushiter; /* incremented on flush */ -+ uint32_t di_uid; /* owner's user id */ -+ uint32_t di_gid; /* owner's group id */ -+ uint16_t di_projid_lo; /* lower part of owner's project id */ -+ uint16_t di_projid_hi; /* higher part of owner's project id */ - xfs_fsize_t di_size; /* number of bytes in file */ - xfs_rfsblock_t di_nblocks; /* # of direct & btree blocks used */ - xfs_extlen_t di_extsize; /* basic/minimum extent size for file */ - xfs_extnum_t di_nextents; /* number of extents in data fork */ - xfs_aextnum_t di_anextents; /* number of extents in attribute fork*/ -- __uint8_t di_forkoff; /* attr fork offs, <<3 for 64b align */ -- __int8_t di_aformat; /* format of attr fork's data */ -- __uint32_t di_dmevmask; /* DMIG event mask */ -- __uint16_t di_dmstate; /* DMIG state info */ -- __uint16_t di_flags; /* random flags, XFS_DIFLAG_... */ -+ uint8_t di_forkoff; /* attr fork offs, <<3 for 64b align */ -+ int8_t di_aformat; /* format of attr fork's data */ -+ uint32_t di_dmevmask; /* DMIG event mask */ -+ uint16_t di_dmstate; /* DMIG state info */ -+ uint16_t di_flags; /* random flags, XFS_DIFLAG_... */ - -- __uint64_t di_flags2; /* more random flags */ -- __uint32_t di_cowextsize; /* basic cow extent size for file */ -+ uint64_t di_flags2; /* more random flags */ -+ uint32_t di_cowextsize; /* basic cow extent size for file */ - - xfs_ictimestamp_t di_crtime; /* time created */ - }; -diff --git a/libxfs/xfs_log_format.h b/libxfs/xfs_log_format.h -index 7ae571f8..8372e9bc 100644 ---- a/libxfs/xfs_log_format.h -+++ b/libxfs/xfs_log_format.h -@@ -31,7 +31,7 @@ struct xfs_trans_res; - * through all the log items definitions and everything they encode into the - * log. - */ --typedef __uint32_t xlog_tid_t; -+typedef uint32_t xlog_tid_t; - - #define XLOG_MIN_ICLOGS 2 - #define XLOG_MAX_ICLOGS 8 -@@ -211,7 +211,7 @@ typedef struct xfs_log_iovec { - typedef struct xfs_trans_header { - uint th_magic; /* magic number */ - uint th_type; /* transaction type */ -- __int32_t th_tid; /* transaction id (unused) */ -+ int32_t th_tid; /* transaction id (unused) */ - uint th_num_items; /* num items logged by trans */ - } xfs_trans_header_t; - -@@ -265,52 +265,52 @@ typedef struct xfs_trans_header { - * must be added on to the end. - */ - typedef struct xfs_inode_log_format { -- __uint16_t ilf_type; /* inode log item type */ -- __uint16_t ilf_size; /* size of this item */ -- __uint32_t ilf_fields; /* flags for fields logged */ -- __uint16_t ilf_asize; /* size of attr d/ext/root */ -- __uint16_t ilf_dsize; /* size of data/ext/root */ -- __uint64_t ilf_ino; /* inode number */ -+ uint16_t ilf_type; /* inode log item type */ -+ uint16_t ilf_size; /* size of this item */ -+ uint32_t ilf_fields; /* flags for fields logged */ -+ uint16_t ilf_asize; /* size of attr d/ext/root */ -+ uint16_t ilf_dsize; /* size of data/ext/root */ -+ uint64_t ilf_ino; /* inode number */ - union { -- __uint32_t ilfu_rdev; /* rdev value for dev inode*/ -+ uint32_t ilfu_rdev; /* rdev value for dev inode*/ - uuid_t ilfu_uuid; /* mount point value */ - } ilf_u; -- __int64_t ilf_blkno; /* blkno of inode buffer */ -- __int32_t ilf_len; /* len of inode buffer */ -- __int32_t ilf_boffset; /* off of inode in buffer */ -+ int64_t ilf_blkno; /* blkno of inode buffer */ -+ int32_t ilf_len; /* len of inode buffer */ -+ int32_t ilf_boffset; /* off of inode in buffer */ - } xfs_inode_log_format_t; - - typedef struct xfs_inode_log_format_32 { -- __uint16_t ilf_type; /* inode log item type */ -- __uint16_t ilf_size; /* size of this item */ -- __uint32_t ilf_fields; /* flags for fields logged */ -- __uint16_t ilf_asize; /* size of attr d/ext/root */ -- __uint16_t ilf_dsize; /* size of data/ext/root */ -- __uint64_t ilf_ino; /* inode number */ -+ uint16_t ilf_type; /* inode log item type */ -+ uint16_t ilf_size; /* size of this item */ -+ uint32_t ilf_fields; /* flags for fields logged */ -+ uint16_t ilf_asize; /* size of attr d/ext/root */ -+ uint16_t ilf_dsize; /* size of data/ext/root */ -+ uint64_t ilf_ino; /* inode number */ - union { -- __uint32_t ilfu_rdev; /* rdev value for dev inode*/ -+ uint32_t ilfu_rdev; /* rdev value for dev inode*/ - uuid_t ilfu_uuid; /* mount point value */ - } ilf_u; -- __int64_t ilf_blkno; /* blkno of inode buffer */ -- __int32_t ilf_len; /* len of inode buffer */ -- __int32_t ilf_boffset; /* off of inode in buffer */ -+ int64_t ilf_blkno; /* blkno of inode buffer */ -+ int32_t ilf_len; /* len of inode buffer */ -+ int32_t ilf_boffset; /* off of inode in buffer */ - } __attribute__((packed)) xfs_inode_log_format_32_t; - - typedef struct xfs_inode_log_format_64 { -- __uint16_t ilf_type; /* inode log item type */ -- __uint16_t ilf_size; /* size of this item */ -- __uint32_t ilf_fields; /* flags for fields logged */ -- __uint16_t ilf_asize; /* size of attr d/ext/root */ -- __uint16_t ilf_dsize; /* size of data/ext/root */ -- __uint32_t ilf_pad; /* pad for 64 bit boundary */ -- __uint64_t ilf_ino; /* inode number */ -+ uint16_t ilf_type; /* inode log item type */ -+ uint16_t ilf_size; /* size of this item */ -+ uint32_t ilf_fields; /* flags for fields logged */ -+ uint16_t ilf_asize; /* size of attr d/ext/root */ -+ uint16_t ilf_dsize; /* size of data/ext/root */ -+ uint32_t ilf_pad; /* pad for 64 bit boundary */ -+ uint64_t ilf_ino; /* inode number */ - union { -- __uint32_t ilfu_rdev; /* rdev value for dev inode*/ -+ uint32_t ilfu_rdev; /* rdev value for dev inode*/ - uuid_t ilfu_uuid; /* mount point value */ - } ilf_u; -- __int64_t ilf_blkno; /* blkno of inode buffer */ -- __int32_t ilf_len; /* len of inode buffer */ -- __int32_t ilf_boffset; /* off of inode in buffer */ -+ int64_t ilf_blkno; /* blkno of inode buffer */ -+ int32_t ilf_len; /* len of inode buffer */ -+ int32_t ilf_boffset; /* off of inode in buffer */ - } xfs_inode_log_format_64_t; - - -@@ -379,8 +379,8 @@ static inline int xfs_ilog_fdata(int w) - * information. - */ - typedef struct xfs_ictimestamp { -- __int32_t t_sec; /* timestamp seconds */ -- __int32_t t_nsec; /* timestamp nanoseconds */ -+ int32_t t_sec; /* timestamp seconds */ -+ int32_t t_nsec; /* timestamp nanoseconds */ - } xfs_ictimestamp_t; - - /* -@@ -388,18 +388,18 @@ typedef struct xfs_ictimestamp { - * kept identical to struct xfs_dinode except for the endianness annotations. - */ - struct xfs_log_dinode { -- __uint16_t di_magic; /* inode magic # = XFS_DINODE_MAGIC */ -- __uint16_t di_mode; /* mode and type of file */ -- __int8_t di_version; /* inode version */ -- __int8_t di_format; /* format of di_c data */ -- __uint8_t di_pad3[2]; /* unused in v2/3 inodes */ -- __uint32_t di_uid; /* owner's user id */ -- __uint32_t di_gid; /* owner's group id */ -- __uint32_t di_nlink; /* number of links to file */ -- __uint16_t di_projid_lo; /* lower part of owner's project id */ -- __uint16_t di_projid_hi; /* higher part of owner's project id */ -- __uint8_t di_pad[6]; /* unused, zeroed space */ -- __uint16_t di_flushiter; /* incremented on flush */ -+ uint16_t di_magic; /* inode magic # = XFS_DINODE_MAGIC */ -+ uint16_t di_mode; /* mode and type of file */ -+ int8_t di_version; /* inode version */ -+ int8_t di_format; /* format of di_c data */ -+ uint8_t di_pad3[2]; /* unused in v2/3 inodes */ -+ uint32_t di_uid; /* owner's user id */ -+ uint32_t di_gid; /* owner's group id */ -+ uint32_t di_nlink; /* number of links to file */ -+ uint16_t di_projid_lo; /* lower part of owner's project id */ -+ uint16_t di_projid_hi; /* higher part of owner's project id */ -+ uint8_t di_pad[6]; /* unused, zeroed space */ -+ uint16_t di_flushiter; /* incremented on flush */ - xfs_ictimestamp_t di_atime; /* time last accessed */ - xfs_ictimestamp_t di_mtime; /* time last modified */ - xfs_ictimestamp_t di_ctime; /* time created/inode modified */ -@@ -408,23 +408,23 @@ struct xfs_log_dinode { - xfs_extlen_t di_extsize; /* basic/minimum extent size for file */ - xfs_extnum_t di_nextents; /* number of extents in data fork */ - xfs_aextnum_t di_anextents; /* number of extents in attribute fork*/ -- __uint8_t di_forkoff; /* attr fork offs, <<3 for 64b align */ -- __int8_t di_aformat; /* format of attr fork's data */ -- __uint32_t di_dmevmask; /* DMIG event mask */ -- __uint16_t di_dmstate; /* DMIG state info */ -- __uint16_t di_flags; /* random flags, XFS_DIFLAG_... */ -- __uint32_t di_gen; /* generation number */ -+ uint8_t di_forkoff; /* attr fork offs, <<3 for 64b align */ -+ int8_t di_aformat; /* format of attr fork's data */ -+ uint32_t di_dmevmask; /* DMIG event mask */ -+ uint16_t di_dmstate; /* DMIG state info */ -+ uint16_t di_flags; /* random flags, XFS_DIFLAG_... */ -+ uint32_t di_gen; /* generation number */ - - /* di_next_unlinked is the only non-core field in the old dinode */ - xfs_agino_t di_next_unlinked;/* agi unlinked list ptr */ - - /* start of the extended dinode, writable fields */ -- __uint32_t di_crc; /* CRC of the inode */ -- __uint64_t di_changecount; /* number of attribute changes */ -+ uint32_t di_crc; /* CRC of the inode */ -+ uint64_t di_changecount; /* number of attribute changes */ - xfs_lsn_t di_lsn; /* flush sequence */ -- __uint64_t di_flags2; /* more random flags */ -- __uint32_t di_cowextsize; /* basic cow extent size for file */ -- __uint8_t di_pad2[12]; /* more padding for future expansion */ -+ uint64_t di_flags2; /* more random flags */ -+ uint32_t di_cowextsize; /* basic cow extent size for file */ -+ uint8_t di_pad2[12]; /* more padding for future expansion */ - - /* fields only written to during inode creation */ - xfs_ictimestamp_t di_crtime; /* time created */ -@@ -483,7 +483,7 @@ typedef struct xfs_buf_log_format { - unsigned short blf_size; /* size of this item */ - unsigned short blf_flags; /* misc state */ - unsigned short blf_len; /* number of blocks in this buf */ -- __int64_t blf_blkno; /* starting blkno of this buf */ -+ int64_t blf_blkno; /* starting blkno of this buf */ - unsigned int blf_map_size; /* used size of data bitmap in words */ - unsigned int blf_data_map[XFS_BLF_DATAMAP_SIZE]; /* dirty bitmap */ - } xfs_buf_log_format_t; -@@ -533,7 +533,7 @@ xfs_blft_to_flags(struct xfs_buf_log_format *blf, enum xfs_blft type) - blf->blf_flags |= ((type << XFS_BLFT_SHIFT) & XFS_BLFT_MASK); - } - --static inline __uint16_t -+static inline uint16_t - xfs_blft_from_flags(struct xfs_buf_log_format *blf) - { - return (blf->blf_flags & XFS_BLFT_MASK) >> XFS_BLFT_SHIFT; -@@ -554,14 +554,14 @@ typedef struct xfs_extent { - * conversion routine. - */ - typedef struct xfs_extent_32 { -- __uint64_t ext_start; -- __uint32_t ext_len; -+ uint64_t ext_start; -+ uint32_t ext_len; - } __attribute__((packed)) xfs_extent_32_t; - - typedef struct xfs_extent_64 { -- __uint64_t ext_start; -- __uint32_t ext_len; -- __uint32_t ext_pad; -+ uint64_t ext_start; -+ uint32_t ext_len; -+ uint32_t ext_pad; - } xfs_extent_64_t; - - /* -@@ -570,26 +570,26 @@ typedef struct xfs_extent_64 { - * size is given by efi_nextents. - */ - typedef struct xfs_efi_log_format { -- __uint16_t efi_type; /* efi log item type */ -- __uint16_t efi_size; /* size of this item */ -- __uint32_t efi_nextents; /* # extents to free */ -- __uint64_t efi_id; /* efi identifier */ -+ uint16_t efi_type; /* efi log item type */ -+ uint16_t efi_size; /* size of this item */ -+ uint32_t efi_nextents; /* # extents to free */ -+ uint64_t efi_id; /* efi identifier */ - xfs_extent_t efi_extents[1]; /* array of extents to free */ - } xfs_efi_log_format_t; - - typedef struct xfs_efi_log_format_32 { -- __uint16_t efi_type; /* efi log item type */ -- __uint16_t efi_size; /* size of this item */ -- __uint32_t efi_nextents; /* # extents to free */ -- __uint64_t efi_id; /* efi identifier */ -+ uint16_t efi_type; /* efi log item type */ -+ uint16_t efi_size; /* size of this item */ -+ uint32_t efi_nextents; /* # extents to free */ -+ uint64_t efi_id; /* efi identifier */ - xfs_extent_32_t efi_extents[1]; /* array of extents to free */ - } __attribute__((packed)) xfs_efi_log_format_32_t; - - typedef struct xfs_efi_log_format_64 { -- __uint16_t efi_type; /* efi log item type */ -- __uint16_t efi_size; /* size of this item */ -- __uint32_t efi_nextents; /* # extents to free */ -- __uint64_t efi_id; /* efi identifier */ -+ uint16_t efi_type; /* efi log item type */ -+ uint16_t efi_size; /* size of this item */ -+ uint32_t efi_nextents; /* # extents to free */ -+ uint64_t efi_id; /* efi identifier */ - xfs_extent_64_t efi_extents[1]; /* array of extents to free */ - } xfs_efi_log_format_64_t; - -@@ -599,26 +599,26 @@ typedef struct xfs_efi_log_format_64 { - * size is given by efd_nextents; - */ - typedef struct xfs_efd_log_format { -- __uint16_t efd_type; /* efd log item type */ -- __uint16_t efd_size; /* size of this item */ -- __uint32_t efd_nextents; /* # of extents freed */ -- __uint64_t efd_efi_id; /* id of corresponding efi */ -+ uint16_t efd_type; /* efd log item type */ -+ uint16_t efd_size; /* size of this item */ -+ uint32_t efd_nextents; /* # of extents freed */ -+ uint64_t efd_efi_id; /* id of corresponding efi */ - xfs_extent_t efd_extents[1]; /* array of extents freed */ - } xfs_efd_log_format_t; - - typedef struct xfs_efd_log_format_32 { -- __uint16_t efd_type; /* efd log item type */ -- __uint16_t efd_size; /* size of this item */ -- __uint32_t efd_nextents; /* # of extents freed */ -- __uint64_t efd_efi_id; /* id of corresponding efi */ -+ uint16_t efd_type; /* efd log item type */ -+ uint16_t efd_size; /* size of this item */ -+ uint32_t efd_nextents; /* # of extents freed */ -+ uint64_t efd_efi_id; /* id of corresponding efi */ - xfs_extent_32_t efd_extents[1]; /* array of extents freed */ - } __attribute__((packed)) xfs_efd_log_format_32_t; - - typedef struct xfs_efd_log_format_64 { -- __uint16_t efd_type; /* efd log item type */ -- __uint16_t efd_size; /* size of this item */ -- __uint32_t efd_nextents; /* # of extents freed */ -- __uint64_t efd_efi_id; /* id of corresponding efi */ -+ uint16_t efd_type; /* efd log item type */ -+ uint16_t efd_size; /* size of this item */ -+ uint32_t efd_nextents; /* # of extents freed */ -+ uint64_t efd_efi_id; /* id of corresponding efi */ - xfs_extent_64_t efd_extents[1]; /* array of extents freed */ - } xfs_efd_log_format_64_t; - -@@ -626,11 +626,11 @@ typedef struct xfs_efd_log_format_64 { - * RUI/RUD (reverse mapping) log format definitions - */ - struct xfs_map_extent { -- __uint64_t me_owner; -- __uint64_t me_startblock; -- __uint64_t me_startoff; -- __uint32_t me_len; -- __uint32_t me_flags; -+ uint64_t me_owner; -+ uint64_t me_startblock; -+ uint64_t me_startoff; -+ uint32_t me_len; -+ uint32_t me_flags; - }; - - /* rmap me_flags: upper bits are flags, lower byte is type code */ -@@ -659,10 +659,10 @@ struct xfs_map_extent { - * size is given by rui_nextents. - */ - struct xfs_rui_log_format { -- __uint16_t rui_type; /* rui log item type */ -- __uint16_t rui_size; /* size of this item */ -- __uint32_t rui_nextents; /* # extents to free */ -- __uint64_t rui_id; /* rui identifier */ -+ uint16_t rui_type; /* rui log item type */ -+ uint16_t rui_size; /* size of this item */ -+ uint32_t rui_nextents; /* # extents to free */ -+ uint64_t rui_id; /* rui identifier */ - struct xfs_map_extent rui_extents[]; /* array of extents to rmap */ - }; - -@@ -680,19 +680,19 @@ xfs_rui_log_format_sizeof( - * size is given by rud_nextents; - */ - struct xfs_rud_log_format { -- __uint16_t rud_type; /* rud log item type */ -- __uint16_t rud_size; /* size of this item */ -- __uint32_t __pad; -- __uint64_t rud_rui_id; /* id of corresponding rui */ -+ uint16_t rud_type; /* rud log item type */ -+ uint16_t rud_size; /* size of this item */ -+ uint32_t __pad; -+ uint64_t rud_rui_id; /* id of corresponding rui */ - }; - - /* - * CUI/CUD (refcount update) log format definitions - */ - struct xfs_phys_extent { -- __uint64_t pe_startblock; -- __uint32_t pe_len; -- __uint32_t pe_flags; -+ uint64_t pe_startblock; -+ uint32_t pe_len; -+ uint32_t pe_flags; - }; - - /* refcount pe_flags: upper bits are flags, lower byte is type code */ -@@ -707,10 +707,10 @@ struct xfs_phys_extent { - * size is given by cui_nextents. - */ - struct xfs_cui_log_format { -- __uint16_t cui_type; /* cui log item type */ -- __uint16_t cui_size; /* size of this item */ -- __uint32_t cui_nextents; /* # extents to free */ -- __uint64_t cui_id; /* cui identifier */ -+ uint16_t cui_type; /* cui log item type */ -+ uint16_t cui_size; /* size of this item */ -+ uint32_t cui_nextents; /* # extents to free */ -+ uint64_t cui_id; /* cui identifier */ - struct xfs_phys_extent cui_extents[]; /* array of extents */ - }; - -@@ -728,10 +728,10 @@ xfs_cui_log_format_sizeof( - * size is given by cud_nextents; - */ - struct xfs_cud_log_format { -- __uint16_t cud_type; /* cud log item type */ -- __uint16_t cud_size; /* size of this item */ -- __uint32_t __pad; -- __uint64_t cud_cui_id; /* id of corresponding cui */ -+ uint16_t cud_type; /* cud log item type */ -+ uint16_t cud_size; /* size of this item */ -+ uint32_t __pad; -+ uint64_t cud_cui_id; /* id of corresponding cui */ - }; - - /* -@@ -755,10 +755,10 @@ struct xfs_cud_log_format { - * size is given by bui_nextents. - */ - struct xfs_bui_log_format { -- __uint16_t bui_type; /* bui log item type */ -- __uint16_t bui_size; /* size of this item */ -- __uint32_t bui_nextents; /* # extents to free */ -- __uint64_t bui_id; /* bui identifier */ -+ uint16_t bui_type; /* bui log item type */ -+ uint16_t bui_size; /* size of this item */ -+ uint32_t bui_nextents; /* # extents to free */ -+ uint64_t bui_id; /* bui identifier */ - struct xfs_map_extent bui_extents[]; /* array of extents to bmap */ - }; - -@@ -776,10 +776,10 @@ xfs_bui_log_format_sizeof( - * size is given by bud_nextents; - */ - struct xfs_bud_log_format { -- __uint16_t bud_type; /* bud log item type */ -- __uint16_t bud_size; /* size of this item */ -- __uint32_t __pad; -- __uint64_t bud_bui_id; /* id of corresponding bui */ -+ uint16_t bud_type; /* bud log item type */ -+ uint16_t bud_size; /* size of this item */ -+ uint32_t __pad; -+ uint64_t bud_bui_id; /* id of corresponding bui */ - }; - - /* -@@ -789,12 +789,12 @@ struct xfs_bud_log_format { - * 32 bits : log_recovery code assumes that. - */ - typedef struct xfs_dq_logformat { -- __uint16_t qlf_type; /* dquot log item type */ -- __uint16_t qlf_size; /* size of this item */ -+ uint16_t qlf_type; /* dquot log item type */ -+ uint16_t qlf_size; /* size of this item */ - xfs_dqid_t qlf_id; /* usr/grp/proj id : 32 bits */ -- __int64_t qlf_blkno; /* blkno of dquot buffer */ -- __int32_t qlf_len; /* len of dquot buffer */ -- __uint32_t qlf_boffset; /* off of dquot in buffer */ -+ int64_t qlf_blkno; /* blkno of dquot buffer */ -+ int32_t qlf_len; /* len of dquot buffer */ -+ uint32_t qlf_boffset; /* off of dquot in buffer */ - } xfs_dq_logformat_t; - - /* -@@ -853,8 +853,8 @@ typedef struct xfs_qoff_logformat { - * decoding can be done correctly. - */ - struct xfs_icreate_log { -- __uint16_t icl_type; /* type of log format structure */ -- __uint16_t icl_size; /* size of log format structure */ -+ uint16_t icl_type; /* type of log format structure */ -+ uint16_t icl_size; /* size of log format structure */ - __be32 icl_ag; /* ag being allocated in */ - __be32 icl_agbno; /* start block of inode range */ - __be32 icl_count; /* number of inodes to initialise */ -diff --git a/libxfs/xfs_quota_defs.h b/libxfs/xfs_quota_defs.h -index 8eed5127..d69c7722 100644 ---- a/libxfs/xfs_quota_defs.h -+++ b/libxfs/xfs_quota_defs.h -@@ -27,8 +27,8 @@ - * they may need 64-bit accounting. Hence, 64-bit quota-counters, - * and quota-limits. This is a waste in the common case, but hey ... - */ --typedef __uint64_t xfs_qcnt_t; --typedef __uint16_t xfs_qwarncnt_t; -+typedef uint64_t xfs_qcnt_t; -+typedef uint16_t xfs_qwarncnt_t; - - /* - * flags for q_flags field in the dquot. -diff --git a/libxfs/xfs_refcount_btree.c b/libxfs/xfs_refcount_btree.c -index 2814f94f..bd1a8f2d 100644 ---- a/libxfs/xfs_refcount_btree.c -+++ b/libxfs/xfs_refcount_btree.c -@@ -201,7 +201,7 @@ xfs_refcountbt_init_ptr_from_cur( - ptr->s = agf->agf_refcount_root; - } - --STATIC __int64_t -+STATIC int64_t - xfs_refcountbt_key_diff( - struct xfs_btree_cur *cur, - union xfs_btree_key *key) -@@ -209,16 +209,16 @@ xfs_refcountbt_key_diff( - struct xfs_refcount_irec *rec = &cur->bc_rec.rc; - struct xfs_refcount_key *kp = &key->refc; - -- return (__int64_t)be32_to_cpu(kp->rc_startblock) - rec->rc_startblock; -+ return (int64_t)be32_to_cpu(kp->rc_startblock) - rec->rc_startblock; - } - --STATIC __int64_t -+STATIC int64_t - xfs_refcountbt_diff_two_keys( - struct xfs_btree_cur *cur, - union xfs_btree_key *k1, - union xfs_btree_key *k2) - { -- return (__int64_t)be32_to_cpu(k1->refc.rc_startblock) - -+ return (int64_t)be32_to_cpu(k1->refc.rc_startblock) - - be32_to_cpu(k2->refc.rc_startblock); - } - -diff --git a/libxfs/xfs_rmap.c b/libxfs/xfs_rmap.c -index f78771d1..0d6b5d41 100644 ---- a/libxfs/xfs_rmap.c -+++ b/libxfs/xfs_rmap.c -@@ -2059,7 +2059,7 @@ int - xfs_rmap_finish_one( - struct xfs_trans *tp, - enum xfs_rmap_intent_type type, -- __uint64_t owner, -+ uint64_t owner, - int whichfork, - xfs_fileoff_t startoff, - xfs_fsblock_t startblock, -@@ -2180,7 +2180,7 @@ __xfs_rmap_add( - struct xfs_mount *mp, - struct xfs_defer_ops *dfops, - enum xfs_rmap_intent_type type, -- __uint64_t owner, -+ uint64_t owner, - int whichfork, - struct xfs_bmbt_irec *bmap) - { -@@ -2264,7 +2264,7 @@ xfs_rmap_alloc_extent( - xfs_agnumber_t agno, - xfs_agblock_t bno, - xfs_extlen_t len, -- __uint64_t owner) -+ uint64_t owner) - { - struct xfs_bmbt_irec bmap; - -@@ -2288,7 +2288,7 @@ xfs_rmap_free_extent( - xfs_agnumber_t agno, - xfs_agblock_t bno, - xfs_extlen_t len, -- __uint64_t owner) -+ uint64_t owner) - { - struct xfs_bmbt_irec bmap; - -diff --git a/libxfs/xfs_rmap.h b/libxfs/xfs_rmap.h -index 98f908fe..265116d0 100644 ---- a/libxfs/xfs_rmap.h -+++ b/libxfs/xfs_rmap.h -@@ -179,7 +179,7 @@ enum xfs_rmap_intent_type { - struct xfs_rmap_intent { - struct list_head ri_list; - enum xfs_rmap_intent_type ri_type; -- __uint64_t ri_owner; -+ uint64_t ri_owner; - int ri_whichfork; - struct xfs_bmbt_irec ri_bmap; - }; -@@ -196,15 +196,15 @@ int xfs_rmap_convert_extent(struct xfs_mount *mp, struct xfs_defer_ops *dfops, - struct xfs_bmbt_irec *imap); - int xfs_rmap_alloc_extent(struct xfs_mount *mp, struct xfs_defer_ops *dfops, - xfs_agnumber_t agno, xfs_agblock_t bno, xfs_extlen_t len, -- __uint64_t owner); -+ uint64_t owner); - int xfs_rmap_free_extent(struct xfs_mount *mp, struct xfs_defer_ops *dfops, - xfs_agnumber_t agno, xfs_agblock_t bno, xfs_extlen_t len, -- __uint64_t owner); -+ uint64_t owner); - - void xfs_rmap_finish_one_cleanup(struct xfs_trans *tp, - struct xfs_btree_cur *rcur, int error); - int xfs_rmap_finish_one(struct xfs_trans *tp, enum xfs_rmap_intent_type type, -- __uint64_t owner, int whichfork, xfs_fileoff_t startoff, -+ uint64_t owner, int whichfork, xfs_fileoff_t startoff, - xfs_fsblock_t startblock, xfs_filblks_t blockcount, - xfs_exntst_t state, struct xfs_btree_cur **pcur); - -diff --git a/libxfs/xfs_rmap_btree.c b/libxfs/xfs_rmap_btree.c -index a186c872..45ac436f 100644 ---- a/libxfs/xfs_rmap_btree.c -+++ b/libxfs/xfs_rmap_btree.c -@@ -197,7 +197,7 @@ xfs_rmapbt_init_high_key_from_rec( - union xfs_btree_key *key, - union xfs_btree_rec *rec) - { -- __uint64_t off; -+ uint64_t off; - int adj; - - adj = be32_to_cpu(rec->rmap.rm_blockcount) - 1; -@@ -239,7 +239,7 @@ xfs_rmapbt_init_ptr_from_cur( - ptr->s = agf->agf_roots[cur->bc_btnum]; - } - --STATIC __int64_t -+STATIC int64_t - xfs_rmapbt_key_diff( - struct xfs_btree_cur *cur, - union xfs_btree_key *key) -@@ -247,9 +247,9 @@ xfs_rmapbt_key_diff( - struct xfs_rmap_irec *rec = &cur->bc_rec.r; - struct xfs_rmap_key *kp = &key->rmap; - __u64 x, y; -- __int64_t d; -+ int64_t d; - -- d = (__int64_t)be32_to_cpu(kp->rm_startblock) - rec->rm_startblock; -+ d = (int64_t)be32_to_cpu(kp->rm_startblock) - rec->rm_startblock; - if (d) - return d; - -@@ -269,7 +269,7 @@ xfs_rmapbt_key_diff( - return 0; - } - --STATIC __int64_t -+STATIC int64_t - xfs_rmapbt_diff_two_keys( - struct xfs_btree_cur *cur, - union xfs_btree_key *k1, -@@ -277,10 +277,10 @@ xfs_rmapbt_diff_two_keys( - { - struct xfs_rmap_key *kp1 = &k1->rmap; - struct xfs_rmap_key *kp2 = &k2->rmap; -- __int64_t d; -+ int64_t d; - __u64 x, y; - -- d = (__int64_t)be32_to_cpu(kp1->rm_startblock) - -+ d = (int64_t)be32_to_cpu(kp1->rm_startblock) - - be32_to_cpu(kp2->rm_startblock); - if (d) - return d; -@@ -382,10 +382,10 @@ xfs_rmapbt_keys_inorder( - union xfs_btree_key *k1, - union xfs_btree_key *k2) - { -- __uint32_t x; -- __uint32_t y; -- __uint64_t a; -- __uint64_t b; -+ uint32_t x; -+ uint32_t y; -+ uint64_t a; -+ uint64_t b; - - x = be32_to_cpu(k1->rmap.rm_startblock); - y = be32_to_cpu(k2->rmap.rm_startblock); -@@ -412,10 +412,10 @@ xfs_rmapbt_recs_inorder( - union xfs_btree_rec *r1, - union xfs_btree_rec *r2) - { -- __uint32_t x; -- __uint32_t y; -- __uint64_t a; -- __uint64_t b; -+ uint32_t x; -+ uint32_t y; -+ uint64_t a; -+ uint64_t b; - - x = be32_to_cpu(r1->rmap.rm_startblock); - y = be32_to_cpu(r2->rmap.rm_startblock); -diff --git a/libxfs/xfs_rtbitmap.c b/libxfs/xfs_rtbitmap.c -index dbd2f881..8f8a99d6 100644 ---- a/libxfs/xfs_rtbitmap.c -+++ b/libxfs/xfs_rtbitmap.c -@@ -1006,7 +1006,7 @@ xfs_rtfree_extent( - mp->m_sb.sb_rextents) { - if (!(mp->m_rbmip->i_d.di_flags & XFS_DIFLAG_NEWRTBM)) - mp->m_rbmip->i_d.di_flags |= XFS_DIFLAG_NEWRTBM; -- *(__uint64_t *)&VFS_I(mp->m_rbmip)->i_atime = 0; -+ *(uint64_t *)&VFS_I(mp->m_rbmip)->i_atime = 0; - xfs_trans_log_inode(tp, mp->m_rbmip, XFS_ILOG_CORE); - } - return 0; -diff --git a/libxfs/xfs_sb.c b/libxfs/xfs_sb.c -index 93a18190..51f69704 100644 ---- a/libxfs/xfs_sb.c -+++ b/libxfs/xfs_sb.c -@@ -430,7 +430,7 @@ xfs_sb_quota_to_disk( - struct xfs_dsb *to, - struct xfs_sb *from) - { -- __uint16_t qflags = from->sb_qflags; -+ uint16_t qflags = from->sb_qflags; - - to->sb_uquotino = cpu_to_be64(from->sb_uquotino); - if (xfs_sb_version_has_pquotino(from)) { -@@ -738,7 +738,7 @@ xfs_sb_mount_common( - mp->m_refc_mnr[1] = mp->m_refc_mxr[1] / 2; - - mp->m_bsize = XFS_FSB_TO_BB(mp, 1); -- mp->m_ialloc_inos = (int)MAX((__uint16_t)XFS_INODES_PER_CHUNK, -+ mp->m_ialloc_inos = (int)MAX((uint16_t)XFS_INODES_PER_CHUNK, - sbp->sb_inopblock); - mp->m_ialloc_blks = mp->m_ialloc_inos >> sbp->sb_inopblog; - -diff --git a/libxfs/xfs_types.h b/libxfs/xfs_types.h -index 717909f2..0220159b 100644 ---- a/libxfs/xfs_types.h -+++ b/libxfs/xfs_types.h -@@ -18,34 +18,34 @@ - #ifndef __XFS_TYPES_H__ - #define __XFS_TYPES_H__ - --typedef __uint32_t prid_t; /* project ID */ -+typedef uint32_t prid_t; /* project ID */ - --typedef __uint32_t xfs_agblock_t; /* blockno in alloc. group */ --typedef __uint32_t xfs_agino_t; /* inode # within allocation grp */ --typedef __uint32_t xfs_extlen_t; /* extent length in blocks */ --typedef __uint32_t xfs_agnumber_t; /* allocation group number */ --typedef __int32_t xfs_extnum_t; /* # of extents in a file */ --typedef __int16_t xfs_aextnum_t; /* # extents in an attribute fork */ --typedef __int64_t xfs_fsize_t; /* bytes in a file */ --typedef __uint64_t xfs_ufsize_t; /* unsigned bytes in a file */ -+typedef uint32_t xfs_agblock_t; /* blockno in alloc. group */ -+typedef uint32_t xfs_agino_t; /* inode # within allocation grp */ -+typedef uint32_t xfs_extlen_t; /* extent length in blocks */ -+typedef uint32_t xfs_agnumber_t; /* allocation group number */ -+typedef int32_t xfs_extnum_t; /* # of extents in a file */ -+typedef int16_t xfs_aextnum_t; /* # extents in an attribute fork */ -+typedef int64_t xfs_fsize_t; /* bytes in a file */ -+typedef uint64_t xfs_ufsize_t; /* unsigned bytes in a file */ - --typedef __int32_t xfs_suminfo_t; /* type of bitmap summary info */ --typedef __int32_t xfs_rtword_t; /* word type for bitmap manipulations */ -+typedef int32_t xfs_suminfo_t; /* type of bitmap summary info */ -+typedef int32_t xfs_rtword_t; /* word type for bitmap manipulations */ - --typedef __int64_t xfs_lsn_t; /* log sequence number */ --typedef __int32_t xfs_tid_t; /* transaction identifier */ -+typedef int64_t xfs_lsn_t; /* log sequence number */ -+typedef int32_t xfs_tid_t; /* transaction identifier */ - --typedef __uint32_t xfs_dablk_t; /* dir/attr block number (in file) */ --typedef __uint32_t xfs_dahash_t; /* dir/attr hash value */ -+typedef uint32_t xfs_dablk_t; /* dir/attr block number (in file) */ -+typedef uint32_t xfs_dahash_t; /* dir/attr hash value */ - --typedef __uint64_t xfs_fsblock_t; /* blockno in filesystem (agno|agbno) */ --typedef __uint64_t xfs_rfsblock_t; /* blockno in filesystem (raw) */ --typedef __uint64_t xfs_rtblock_t; /* extent (block) in realtime area */ --typedef __uint64_t xfs_fileoff_t; /* block number in a file */ --typedef __uint64_t xfs_filblks_t; /* number of blocks in a file */ -+typedef uint64_t xfs_fsblock_t; /* blockno in filesystem (agno|agbno) */ -+typedef uint64_t xfs_rfsblock_t; /* blockno in filesystem (raw) */ -+typedef uint64_t xfs_rtblock_t; /* extent (block) in realtime area */ -+typedef uint64_t xfs_fileoff_t; /* block number in a file */ -+typedef uint64_t xfs_filblks_t; /* number of blocks in a file */ - --typedef __int64_t xfs_srtblock_t; /* signed version of xfs_rtblock_t */ --typedef __int64_t xfs_sfiloff_t; /* signed block number in a file */ -+typedef int64_t xfs_srtblock_t; /* signed version of xfs_rtblock_t */ -+typedef int64_t xfs_sfiloff_t; /* signed block number in a file */ - - /* - * Null values for the types. -@@ -125,7 +125,7 @@ struct xfs_name { - * uid_t and gid_t are hard-coded to 32 bits in the inode. - * Hence, an 'id' in a dquot is 32 bits.. - */ --typedef __uint32_t xfs_dqid_t; -+typedef uint32_t xfs_dqid_t; - - /* - * Constants for bit manipulations. --- -2.14.1 - diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-xfsprogs-remove-double-underscore-integer-types.patch b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-xfsprogs-remove-double-underscore-integer-types.patch deleted file mode 100644 index 5e08f0d84..000000000 --- a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-xfsprogs-remove-double-underscore-integer-types.patch +++ /dev/null @@ -1,3800 +0,0 @@ -From 14f8b6810bd240cc58131483790a099fcf56c073 Mon Sep 17 00:00:00 2001 -From: "Darrick J. Wong" -Date: Fri, 4 Aug 2017 16:33:51 -0500 -Subject: [PATCH] xfsprogs: remove double-underscore integer types - -This is a purely mechanical patch that removes the private -__{u,}int{8,16,32,64}_t typedefs in favor of using the system -{u,}int{8,16,32,64}_t typedefs. This is the sed script used to perform -the transformation and fix the resulting whitespace and indentation -errors: - -s/typedef\t__uint8_t/typedef __uint8_t\t/g -s/typedef\t__uint/typedef __uint/g -s/typedef\t__int\([0-9]*\)_t/typedef int\1_t\t/g -s/__uint8_t\t/__uint8_t\t\t/g -s/__uint/uint/g -s/__int\([0-9]*\)_t\t/__int\1_t\t\t/g -s/__int/int/g -/^typedef.*int[0-9]*_t;$/d - -Signed-off-by: Darrick J. Wong -Reviewed-by: Carlos Maiolino -[sandeen: fix whitespace incidentals] -Reviewed-by: Darrick J. Wong -Signed-off-by: Eric Sandeen ---- - copy/xfs_copy.c | 14 ++++----- - copy/xfs_copy.h | 2 +- - db/attr.c | 8 ++--- - db/attrshort.c | 4 +-- - db/bit.c | 4 +-- - db/bit.h | 2 +- - db/block.c | 8 ++--- - db/check.c | 18 +++++------ - db/convert.c | 28 ++++++++--------- - db/faddr.c | 14 ++++----- - db/field.c | 44 +++++++++++++-------------- - db/fprint.c | 8 ++--- - db/frag.c | 8 ++--- - db/inode.c | 34 ++++++++++----------- - db/io.c | 2 +- - db/io.h | 6 ++-- - db/metadump.c | 12 ++++---- - db/sb.c | 6 ++-- - fsr/xfs_fsr.c | 2 +- - include/darwin.h | 18 +++++------ - include/freebsd.h | 6 ++-- - include/gnukfreebsd.h | 6 ++-- - include/libxcmd.h | 6 ++-- - include/linux.h | 8 ++--- - include/xfs_arch.h | 22 +++++++------- - include/xfs_inode.h | 4 +-- - include/xfs_log_recover.h | 2 +- - include/xfs_metadump.h | 4 +-- - include/xfs_mount.h | 22 +++++++------- - libhandle/handle.c | 2 +- - libhandle/jdm.c | 2 +- - libxcmd/topology.c | 14 ++++----- - libxfs/darwin.c | 2 +- - libxfs/freebsd.c | 2 +- - libxfs/init.c | 2 +- - libxfs/irix.c | 2 +- - libxfs/libxfs_priv.h | 4 +-- - libxfs/linux.c | 2 +- - libxfs/logitem.c | 2 +- - libxfs/radix-tree.c | 8 ++--- - libxfs/rdwr.c | 6 ++-- - libxfs/util.c | 8 ++--- - logprint/log_misc.c | 6 ++-- - mdrestore/xfs_mdrestore.c | 2 +- - mkfs/proto.c | 2 +- - mkfs/xfs_mkfs.c | 76 +++++++++++++++++++++++------------------------ - quota/edit.c | 64 +++++++++++++++++++-------------------- - quota/free.c | 44 +++++++++++++-------------- - quota/quot.c | 24 +++++++-------- - quota/quota.c | 4 +-- - quota/quota.h | 12 ++++---- - quota/report.c | 4 +-- - quota/state.c | 2 +- - quota/util.c | 66 ++++++++++++++++++++-------------------- - repair/README | 2 +- - repair/agheader.h | 14 ++++----- - repair/attr_repair.h | 26 ++++++++-------- - repair/avl64.c | 38 ++++++++++++------------ - repair/avl64.h | 18 +++++------ - repair/dinode.c | 38 ++++++++++++------------ - repair/dinode.h | 4 +-- - repair/dir2.c | 2 +- - repair/globals.h | 18 +++++------ - repair/incore.c | 10 +++---- - repair/incore.h | 46 ++++++++++++++-------------- - repair/incore_ext.c | 6 ++-- - repair/incore_ino.c | 72 ++++++++++++++++++++++---------------------- - repair/phase2.c | 2 +- - repair/phase3.c | 6 ++-- - repair/phase4.c | 4 +-- - repair/phase5.c | 28 ++++++++--------- - repair/phase6.c | 16 +++++----- - repair/phase7.c | 6 ++-- - repair/progress.c | 30 +++++++++---------- - repair/progress.h | 4 +-- - repair/rmap.c | 18 +++++------ - repair/rmap.h | 2 +- - repair/sb.c | 24 +++++++-------- - repair/scan.c | 50 +++++++++++++++---------------- - repair/scan.h | 12 ++++---- - 80 files changed, 590 insertions(+), 590 deletions(-) - -diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c -index a7da824f..33e05dfd 100644 ---- a/copy/xfs_copy.c -+++ b/copy/xfs_copy.c -@@ -43,7 +43,7 @@ unsigned int source_sectorsize; /* source disk sectorsize */ - - xfs_agblock_t first_agbno; - --__uint64_t barcount[11]; -+uint64_t barcount[11]; - - unsigned int num_targets; - target_control *target; -@@ -313,7 +313,7 @@ usage(void) - } - - void --init_bar(__uint64_t source_blocks) -+init_bar(uint64_t source_blocks) - { - int i; - -@@ -322,7 +322,7 @@ init_bar(__uint64_t source_blocks) - } - - int --bump_bar(int tenths, __uint64_t numblocks) -+bump_bar(int tenths, uint64_t numblocks) - { - static char *bar[11] = { - " 0% ", -@@ -534,8 +534,8 @@ main(int argc, char **argv) - xfs_off_t pos; - size_t length; - int c; -- __uint64_t size, sizeb; -- __uint64_t numblocks = 0; -+ uint64_t size, sizeb; -+ uint64_t numblocks = 0; - int wblocks = 0; - int num_threads = 0; - struct dioattr d; -@@ -951,8 +951,8 @@ main(int argc, char **argv) - num_ags = mp->m_sb.sb_agcount; - - init_bar(mp->m_sb.sb_blocksize / BBSIZE -- * ((__uint64_t)mp->m_sb.sb_dblocks -- - (__uint64_t)mp->m_sb.sb_fdblocks + 10 * num_ags)); -+ * ((uint64_t)mp->m_sb.sb_dblocks -+ - (uint64_t)mp->m_sb.sb_fdblocks + 10 * num_ags)); - - kids = num_targets; - -diff --git a/copy/xfs_copy.h b/copy/xfs_copy.h -index 27370688..53c6e42c 100644 ---- a/copy/xfs_copy.h -+++ b/copy/xfs_copy.h -@@ -76,7 +76,7 @@ typedef struct { - - typedef int thread_id; - typedef int tm_index; /* index into thread mask array */ --typedef __uint32_t thread_mask; /* a thread mask */ -+typedef uint32_t thread_mask; /* a thread mask */ - - typedef struct { - char *name; -diff --git a/db/attr.c b/db/attr.c -index 31536a8b..23ffcd5f 100644 ---- a/db/attr.c -+++ b/db/attr.c -@@ -77,16 +77,16 @@ const field_t attr_leaf_entry_flds[] = { - { "nameidx", FLDT_UINT16D, OI(LEOFF(nameidx)), C1, 0, TYP_NONE }, - { "flags", FLDT_UINT8X, OI(LEOFF(flags)), C1, FLD_SKIPALL, TYP_NONE }, - { "incomplete", FLDT_UINT1, -- OI(LEOFF(flags) + bitsz(__uint8_t) - XFS_ATTR_INCOMPLETE_BIT - 1), C1, -+ OI(LEOFF(flags) + bitsz(uint8_t) - XFS_ATTR_INCOMPLETE_BIT - 1), C1, - 0, TYP_NONE }, - { "root", FLDT_UINT1, -- OI(LEOFF(flags) + bitsz(__uint8_t) - XFS_ATTR_ROOT_BIT - 1), C1, 0, -+ OI(LEOFF(flags) + bitsz(uint8_t) - XFS_ATTR_ROOT_BIT - 1), C1, 0, - TYP_NONE }, - { "secure", FLDT_UINT1, -- OI(LEOFF(flags) + bitsz(__uint8_t) - XFS_ATTR_SECURE_BIT - 1), C1, 0, -+ OI(LEOFF(flags) + bitsz(uint8_t) - XFS_ATTR_SECURE_BIT - 1), C1, 0, - TYP_NONE }, - { "local", FLDT_UINT1, -- OI(LEOFF(flags) + bitsz(__uint8_t) - XFS_ATTR_LOCAL_BIT - 1), C1, 0, -+ OI(LEOFF(flags) + bitsz(uint8_t) - XFS_ATTR_LOCAL_BIT - 1), C1, 0, - TYP_NONE }, - { "pad2", FLDT_UINT8X, OI(LEOFF(pad2)), C1, FLD_SKIPALL, TYP_NONE }, - { NULL } -diff --git a/db/attrshort.c b/db/attrshort.c -index d82559cc..2ef358f5 100644 ---- a/db/attrshort.c -+++ b/db/attrshort.c -@@ -51,10 +51,10 @@ const field_t attr_sf_entry_flds[] = { - { "valuelen", FLDT_UINT8D, OI(EOFF(valuelen)), C1, 0, TYP_NONE }, - { "flags", FLDT_UINT8X, OI(EOFF(flags)), C1, FLD_SKIPALL, TYP_NONE }, - { "root", FLDT_UINT1, -- OI(EOFF(flags) + bitsz(__uint8_t) - XFS_ATTR_ROOT_BIT - 1), C1, 0, -+ OI(EOFF(flags) + bitsz(uint8_t) - XFS_ATTR_ROOT_BIT - 1), C1, 0, - TYP_NONE }, - { "secure", FLDT_UINT1, -- OI(EOFF(flags) + bitsz(__uint8_t) - XFS_ATTR_SECURE_BIT - 1), C1, 0, -+ OI(EOFF(flags) + bitsz(uint8_t) - XFS_ATTR_SECURE_BIT - 1), C1, 0, - TYP_NONE }, - { "name", FLDT_CHARNS, OI(EOFF(nameval)), attr_sf_entry_name_count, - FLD_COUNT, TYP_NONE }, -diff --git a/db/bit.c b/db/bit.c -index 24872bf7..f5ebf681 100644 ---- a/db/bit.c -+++ b/db/bit.c -@@ -60,7 +60,7 @@ setbit( - } - } - --__int64_t -+int64_t - getbitval( - void *obj, - int bitoff, -@@ -70,7 +70,7 @@ getbitval( - int bit; - int i; - char *p; -- __int64_t rval; -+ int64_t rval; - int signext; - int z1, z2, z3, z4; - -diff --git a/db/bit.h b/db/bit.h -index 80ba24c4..9fd71f4b 100644 ---- a/db/bit.h -+++ b/db/bit.h -@@ -25,5 +25,5 @@ - #define BVUNSIGNED 0 - #define BVSIGNED 1 - --extern __int64_t getbitval(void *obj, int bitoff, int nbits, int flags); -+extern int64_t getbitval(void *obj, int bitoff, int nbits, int flags); - extern void setbitval(void *obuf, int bitoff, int nbits, void *ibuf); -diff --git a/db/block.c b/db/block.c -index 4a357ced..5ecd687a 100644 ---- a/db/block.c -+++ b/db/block.c -@@ -98,7 +98,7 @@ ablock_f( - } - dfsbno = bm.startblock + (bno - bm.startoff); - ASSERT(typtab[TYP_ATTR].typnm == TYP_ATTR); -- set_cur(&typtab[TYP_ATTR], (__int64_t)XFS_FSB_TO_DADDR(mp, dfsbno), -+ set_cur(&typtab[TYP_ATTR], (int64_t)XFS_FSB_TO_DADDR(mp, dfsbno), - blkbb, DB_RING_ADD, NULL); - return 0; - } -@@ -128,14 +128,14 @@ daddr_f( - int argc, - char **argv) - { -- __int64_t d; -+ int64_t d; - char *p; - - if (argc == 1) { - dbprintf(_("current daddr is %lld\n"), iocur_top->off >> BBSHIFT); - return 0; - } -- d = (__int64_t)strtoull(argv[1], &p, 0); -+ d = (int64_t)strtoull(argv[1], &p, 0); - if (*p != '\0' || - d >= mp->m_sb.sb_dblocks << (mp->m_sb.sb_blocklog - BBSHIFT)) { - dbprintf(_("bad daddr %s\n"), argv[1]); -@@ -197,7 +197,7 @@ dblock_f( - ASSERT(typtab[type].typnm == type); - if (nex > 1) - make_bbmap(&bbmap, nex, bmp); -- set_cur(&typtab[type], (__int64_t)XFS_FSB_TO_DADDR(mp, dfsbno), -+ set_cur(&typtab[type], (int64_t)XFS_FSB_TO_DADDR(mp, dfsbno), - nb * blkbb, DB_RING_ADD, nex > 1 ? &bbmap : NULL); - free(bmp); - return 0; -diff --git a/db/check.c b/db/check.c -index 8e618a23..81ba63a6 100644 ---- a/db/check.c -+++ b/db/check.c -@@ -114,8 +114,8 @@ typedef struct dirhash { - - static xfs_extlen_t agffreeblks; - static xfs_extlen_t agflongest; --static __uint64_t agf_aggr_freeblks; /* aggregate count over all */ --static __uint32_t agfbtreeblks; -+static uint64_t agf_aggr_freeblks; /* aggregate count over all */ -+static uint32_t agfbtreeblks; - static int lazycount; - static xfs_agino_t agicount; - static xfs_agino_t agifreecount; -@@ -124,10 +124,10 @@ static int blist_size; - static char **dbmap; /* really dbm_t:8 */ - static dirhash_t **dirhash; - static int error; --static __uint64_t fdblocks; --static __uint64_t frextents; --static __uint64_t icount; --static __uint64_t ifree; -+static uint64_t fdblocks; -+static uint64_t frextents; -+static uint64_t icount; -+static uint64_t ifree; - static inodata_t ***inodata; - static int inodata_hash_size; - static inodata_t ***inomap; -@@ -1187,7 +1187,7 @@ blocktrash_f( - goto out; - } - for (i = 0; i < count; i++) { -- randb = (xfs_rfsblock_t)((((__int64_t)random() << 32) | -+ randb = (xfs_rfsblock_t)((((int64_t)random() << 32) | - random()) % blocks); - for (bi = 0, agno = 0, done = 0; - !done && agno < mp->m_sb.sb_agcount; -@@ -3032,7 +3032,7 @@ process_leaf_node_dir_v2( - } - if (v) - dbprintf(_("dir inode %lld block %u=%llu\n"), id->ino, -- (__uint32_t)dbno, -+ (uint32_t)dbno, - (xfs_fsblock_t)bmp->startblock); - push_cur(); - if (nex > 1) -@@ -3045,7 +3045,7 @@ process_leaf_node_dir_v2( - if (!sflag || v) - dbprintf(_("can't read block %u for directory " - "inode %lld\n"), -- (__uint32_t)dbno, id->ino); -+ (uint32_t)dbno, id->ino); - error++; - pop_cur(); - dbno += mp->m_dir_geo->fsbcount - 1; -diff --git a/db/convert.c b/db/convert.c -index a337abea..fa4f9623 100644 ---- a/db/convert.c -+++ b/db/convert.c -@@ -24,13 +24,13 @@ - - #define M(A) (1 << CT_ ## A) - #define agblock_to_bytes(x) \ -- ((__uint64_t)(x) << mp->m_sb.sb_blocklog) -+ ((uint64_t)(x) << mp->m_sb.sb_blocklog) - #define agino_to_bytes(x) \ -- ((__uint64_t)(x) << mp->m_sb.sb_inodelog) -+ ((uint64_t)(x) << mp->m_sb.sb_inodelog) - #define agnumber_to_bytes(x) \ -- agblock_to_bytes((__uint64_t)(x) * mp->m_sb.sb_agblocks) -+ agblock_to_bytes((uint64_t)(x) * mp->m_sb.sb_agblocks) - #define daddr_to_bytes(x) \ -- ((__uint64_t)(x) << BBSHIFT) -+ ((uint64_t)(x) << BBSHIFT) - #define fsblock_to_bytes(x) \ - (agnumber_to_bytes(XFS_FSB_TO_AGNO(mp, (x))) + \ - agblock_to_bytes(XFS_FSB_TO_AGBNO(mp, (x)))) -@@ -38,7 +38,7 @@ - (agnumber_to_bytes(XFS_INO_TO_AGNO(mp, (x))) + \ - agino_to_bytes(XFS_INO_TO_AGINO(mp, (x)))) - #define inoidx_to_bytes(x) \ -- ((__uint64_t)(x) << mp->m_sb.sb_inodelog) -+ ((uint64_t)(x) << mp->m_sb.sb_inodelog) - - typedef enum { - CT_NONE = -1, -@@ -68,7 +68,7 @@ typedef union { - xfs_agnumber_t agnumber; - int bboff; - int blkoff; -- __uint64_t byte; -+ uint64_t byte; - xfs_daddr_t daddr; - xfs_fsblock_t fsblock; - xfs_ino_t ino; -@@ -76,7 +76,7 @@ typedef union { - int inooff; - } cval_t; - --static __uint64_t bytevalue(ctype_t ctype, cval_t *val); -+static uint64_t bytevalue(ctype_t ctype, cval_t *val); - static int convert_f(int argc, char **argv); - static int getvalue(char *s, ctype_t ctype, cval_t *val); - static ctype_t lookupcty(char *ctyname); -@@ -118,7 +118,7 @@ static const cmdinfo_t convert_cmd = - { "convert", NULL, convert_f, 3, 9, 0, "type num [type num]... type", - "convert from one address form to another", NULL }; - --static __uint64_t -+static uint64_t - bytevalue(ctype_t ctype, cval_t *val) - { - switch (ctype) { -@@ -129,9 +129,9 @@ bytevalue(ctype_t ctype, cval_t *val) - case CT_AGNUMBER: - return agnumber_to_bytes(val->agnumber); - case CT_BBOFF: -- return (__uint64_t)val->bboff; -+ return (uint64_t)val->bboff; - case CT_BLKOFF: -- return (__uint64_t)val->blkoff; -+ return (uint64_t)val->blkoff; - case CT_BYTE: - return val->byte; - case CT_DADDR: -@@ -143,7 +143,7 @@ bytevalue(ctype_t ctype, cval_t *val) - case CT_INOIDX: - return inoidx_to_bytes(val->inoidx); - case CT_INOOFF: -- return (__uint64_t)val->inooff; -+ return (uint64_t)val->inooff; - case CT_NONE: - case NCTS: - break; -@@ -160,7 +160,7 @@ convert_f(int argc, char **argv) - cval_t cvals[NCTS] = {}; - int i; - int mask; -- __uint64_t v; -+ uint64_t v; - ctype_t wtype; - - /* move past the "convert" command */ -@@ -262,7 +262,7 @@ static int - getvalue(char *s, ctype_t ctype, cval_t *val) - { - char *p; -- __uint64_t v; -+ uint64_t v; - - v = strtoull(s, &p, 0); - if (*p != '\0') { -@@ -286,7 +286,7 @@ getvalue(char *s, ctype_t ctype, cval_t *val) - val->blkoff = (int)v; - break; - case CT_BYTE: -- val->byte = (__uint64_t)v; -+ val->byte = (uint64_t)v; - break; - case CT_DADDR: - val->daddr = (xfs_daddr_t)v; -diff --git a/db/faddr.c b/db/faddr.c -index 877200bf..56207648 100644 ---- a/db/faddr.c -+++ b/db/faddr.c -@@ -79,11 +79,11 @@ fa_attrblock( - typnm_t next) - { - bmap_ext_t bm; -- __uint32_t bno; -+ uint32_t bno; - xfs_fsblock_t dfsbno; - int nex; - -- bno = (__uint32_t)getbitval(obj, bit, bitsz(bno), BVUNSIGNED); -+ bno = (uint32_t)getbitval(obj, bit, bitsz(bno), BVUNSIGNED); - if (bno == 0) { - dbprintf(_("null attribute block number, cannot set new addr\n")); - return; -@@ -96,7 +96,7 @@ fa_attrblock( - } - dfsbno = bm.startblock + (bno - bm.startoff); - ASSERT(typtab[next].typnm == next); -- set_cur(&typtab[next], (__int64_t)XFS_FSB_TO_DADDR(mp, dfsbno), blkbb, -+ set_cur(&typtab[next], (int64_t)XFS_FSB_TO_DADDR(mp, dfsbno), blkbb, - DB_RING_ADD, NULL); - } - -@@ -276,11 +276,11 @@ fa_dirblock( - { - bbmap_t bbmap; - bmap_ext_t *bmp; -- __uint32_t bno; -+ uint32_t bno; - xfs_fsblock_t dfsbno; - int nex; - -- bno = (__uint32_t)getbitval(obj, bit, bitsz(bno), BVUNSIGNED); -+ bno = (uint32_t)getbitval(obj, bit, bitsz(bno), BVUNSIGNED); - if (bno == 0) { - dbprintf(_("null directory block number, cannot set new addr\n")); - return; -@@ -297,7 +297,7 @@ fa_dirblock( - ASSERT(typtab[next].typnm == next); - if (nex > 1) - make_bbmap(&bbmap, nex, bmp); -- set_cur(&typtab[next], (__int64_t)XFS_FSB_TO_DADDR(mp, dfsbno), -+ set_cur(&typtab[next], (int64_t)XFS_FSB_TO_DADDR(mp, dfsbno), - XFS_FSB_TO_BB(mp, mp->m_dir_geo->fsbcount), DB_RING_ADD, - nex > 1 ? &bbmap : NULL); - free(bmp); -@@ -317,7 +317,7 @@ fa_drfsbno( - return; - } - ASSERT(typtab[next].typnm == next); -- set_cur(&typtab[next], (__int64_t)XFS_FSB_TO_BB(mp, bno), blkbb, -+ set_cur(&typtab[next], (int64_t)XFS_FSB_TO_BB(mp, bno), blkbb, - DB_RING_ADD, NULL); - } - -diff --git a/db/field.c b/db/field.c -index 865b0b71..f1e5f35e 100644 ---- a/db/field.c -+++ b/db/field.c -@@ -83,7 +83,7 @@ const ftattr_t ftattrtab[] = { - attr_sf_entry_size, FTARG_SIZE, NULL, attr_sf_entry_flds }, - { FLDT_ATTR_SF_HDR, "attr_sf_hdr", NULL, (char *)attr_sf_hdr_flds, - SI(bitsz(struct xfs_attr_sf_hdr)), 0, NULL, attr_sf_hdr_flds }, -- { FLDT_ATTRBLOCK, "attrblock", fp_num, "%u", SI(bitsz(__uint32_t)), 0, -+ { FLDT_ATTRBLOCK, "attrblock", fp_num, "%u", SI(bitsz(uint32_t)), 0, - fa_attrblock, NULL }, - { FLDT_ATTRSHORT, "attrshort", NULL, (char *)attr_shortform_flds, - attrshort_size, FTARG_SIZE, NULL, attr_shortform_flds }, -@@ -199,7 +199,7 @@ const ftattr_t ftattrtab[] = { - SI(bitsz(struct xfs_refcount_rec)), 0, NULL, refcbt_rec_flds }, - - /* CRC field */ -- { FLDT_CRC, "crc", fp_crc, "%#x (%s)", SI(bitsz(__uint32_t)), -+ { FLDT_CRC, "crc", fp_crc, "%#x (%s)", SI(bitsz(uint32_t)), - 0, NULL, NULL }, - - { FLDT_DEV, "dev", fp_num, "%#x", SI(bitsz(xfs_dev_t)), 0, NULL, NULL }, -@@ -214,7 +214,7 @@ const ftattr_t ftattrtab[] = { - { FLDT_DINODE_CORE, "dinode_core", NULL, (char *)inode_core_flds, - SI(bitsz(xfs_dinode_t)), 0, NULL, inode_core_flds }, - { FLDT_DINODE_FMT, "dinode_fmt", fp_dinode_fmt, NULL, -- SI(bitsz(__int8_t)), 0, NULL, NULL }, -+ SI(bitsz(int8_t)), 0, NULL, NULL }, - { FLDT_DINODE_U, "dinode_u", NULL, (char *)inode_u_flds, inode_u_size, - FTARG_SIZE|FTARG_OKEMPTY, NULL, inode_u_flds }, - { FLDT_DINODE_V3, "dinode_v3", NULL, (char *)inode_v3_flds, -@@ -295,7 +295,7 @@ const ftattr_t ftattrtab[] = { - { FLDT_DA3_NODE_HDR, "dir_node_hdr", NULL, (char *)da3_node_hdr_flds, - SI(bitsz(struct xfs_da3_node_hdr)), 0, NULL, da3_node_hdr_flds }, - -- { FLDT_DIRBLOCK, "dirblock", fp_num, "%u", SI(bitsz(__uint32_t)), 0, -+ { FLDT_DIRBLOCK, "dirblock", fp_num, "%u", SI(bitsz(uint32_t)), 0, - fa_dirblock, NULL }, - { FLDT_DISK_DQUOT, "disk_dquot", NULL, (char *)disk_dquot_flds, - SI(bitsz(xfs_disk_dquot_t)), 0, NULL, disk_dquot_flds }, -@@ -335,15 +335,15 @@ const ftattr_t ftattrtab[] = { - FTARG_SIZE, NULL, inode_crc_flds }, - { FLDT_INOFREE, "inofree", fp_num, "%#llx", SI(bitsz(xfs_inofree_t)), 0, - NULL, NULL }, -- { FLDT_INT16D, "int16d", fp_num, "%d", SI(bitsz(__int16_t)), -+ { FLDT_INT16D, "int16d", fp_num, "%d", SI(bitsz(int16_t)), - FTARG_SIGNED, NULL, NULL }, -- { FLDT_INT32D, "int32d", fp_num, "%d", SI(bitsz(__int32_t)), -+ { FLDT_INT32D, "int32d", fp_num, "%d", SI(bitsz(int32_t)), - FTARG_SIGNED, NULL, NULL }, -- { FLDT_INT64D, "int64d", fp_num, "%lld", SI(bitsz(__int64_t)), -+ { FLDT_INT64D, "int64d", fp_num, "%lld", SI(bitsz(int64_t)), - FTARG_SIGNED, NULL, NULL }, -- { FLDT_INT8D, "int8d", fp_num, "%d", SI(bitsz(__int8_t)), FTARG_SIGNED, -+ { FLDT_INT8D, "int8d", fp_num, "%d", SI(bitsz(int8_t)), FTARG_SIGNED, - NULL, NULL }, -- { FLDT_NSEC, "nsec", fp_num, "%09d", SI(bitsz(__int32_t)), FTARG_SIGNED, -+ { FLDT_NSEC, "nsec", fp_num, "%09d", SI(bitsz(int32_t)), FTARG_SIGNED, - NULL, NULL }, - { FLDT_QCNT, "qcnt", fp_num, "%llu", SI(bitsz(xfs_qcnt_t)), 0, NULL, - NULL }, -@@ -356,34 +356,34 @@ const ftattr_t ftattrtab[] = { - { FLDT_SYMLINK_CRC, "symlink", NULL, (char *)symlink_crc_flds, - symlink_size, FTARG_SIZE, NULL, symlink_crc_flds }, - -- { FLDT_TIME, "time", fp_time, NULL, SI(bitsz(__int32_t)), FTARG_SIGNED, -+ { FLDT_TIME, "time", fp_time, NULL, SI(bitsz(int32_t)), FTARG_SIGNED, - NULL, NULL }, - { FLDT_TIMESTAMP, "timestamp", NULL, (char *)timestamp_flds, - SI(bitsz(xfs_timestamp_t)), 0, NULL, timestamp_flds }, - { FLDT_UINT1, "uint1", fp_num, "%u", SI(1), 0, NULL, NULL }, -- { FLDT_UINT16D, "uint16d", fp_num, "%u", SI(bitsz(__uint16_t)), 0, NULL, -+ { FLDT_UINT16D, "uint16d", fp_num, "%u", SI(bitsz(uint16_t)), 0, NULL, - NULL }, -- { FLDT_UINT16O, "uint16o", fp_num, "%#o", SI(bitsz(__uint16_t)), 0, -+ { FLDT_UINT16O, "uint16o", fp_num, "%#o", SI(bitsz(uint16_t)), 0, - NULL, NULL }, -- { FLDT_UINT16X, "uint16x", fp_num, "%#x", SI(bitsz(__uint16_t)), 0, -+ { FLDT_UINT16X, "uint16x", fp_num, "%#x", SI(bitsz(uint16_t)), 0, - NULL, NULL }, -- { FLDT_UINT32D, "uint32d", fp_num, "%u", SI(bitsz(__uint32_t)), 0, NULL, -+ { FLDT_UINT32D, "uint32d", fp_num, "%u", SI(bitsz(uint32_t)), 0, NULL, - NULL }, -- { FLDT_UINT32O, "uint32o", fp_num, "%#o", SI(bitsz(__uint32_t)), 0, -+ { FLDT_UINT32O, "uint32o", fp_num, "%#o", SI(bitsz(uint32_t)), 0, - NULL, NULL }, -- { FLDT_UINT32X, "uint32x", fp_num, "%#x", SI(bitsz(__uint32_t)), 0, -+ { FLDT_UINT32X, "uint32x", fp_num, "%#x", SI(bitsz(uint32_t)), 0, - NULL, NULL }, -- { FLDT_UINT64D, "uint64d", fp_num, "%llu", SI(bitsz(__uint64_t)), 0, -+ { FLDT_UINT64D, "uint64d", fp_num, "%llu", SI(bitsz(uint64_t)), 0, - NULL, NULL }, -- { FLDT_UINT64O, "uint64o", fp_num, "%#llo", SI(bitsz(__uint64_t)), 0, -+ { FLDT_UINT64O, "uint64o", fp_num, "%#llo", SI(bitsz(uint64_t)), 0, - NULL, NULL }, -- { FLDT_UINT64X, "uint64x", fp_num, "%#llx", SI(bitsz(__uint64_t)), 0, -+ { FLDT_UINT64X, "uint64x", fp_num, "%#llx", SI(bitsz(uint64_t)), 0, - NULL, NULL }, -- { FLDT_UINT8D, "uint8d", fp_num, "%u", SI(bitsz(__uint8_t)), 0, NULL, -+ { FLDT_UINT8D, "uint8d", fp_num, "%u", SI(bitsz(uint8_t)), 0, NULL, - NULL }, -- { FLDT_UINT8O, "uint8o", fp_num, "%#o", SI(bitsz(__uint8_t)), 0, NULL, -+ { FLDT_UINT8O, "uint8o", fp_num, "%#o", SI(bitsz(uint8_t)), 0, NULL, - NULL }, -- { FLDT_UINT8X, "uint8x", fp_num, "%#x", SI(bitsz(__uint8_t)), 0, NULL, -+ { FLDT_UINT8X, "uint8x", fp_num, "%#x", SI(bitsz(uint8_t)), 0, NULL, - NULL }, - { FLDT_UUID, "uuid", fp_uuid, NULL, SI(bitsz(uuid_t)), 0, NULL, NULL }, - { FLDT_ZZZ, NULL } -diff --git a/db/fprint.c b/db/fprint.c -index fd7e7f45..261a31ef 100644 ---- a/db/fprint.c -+++ b/db/fprint.c -@@ -80,7 +80,7 @@ fp_num( - int bitpos; - int i; - int isnull; -- __int64_t val; -+ int64_t val; - - for (i = 0, bitpos = bit; - i < count && !seenint(); -@@ -100,7 +100,7 @@ fp_num( - else if (size > 32) - dbprintf(fmtstr, val); - else -- dbprintf(fmtstr, (__int32_t)val); -+ dbprintf(fmtstr, (int32_t)val); - if (i < count - 1) - dbprintf(" "); - } -@@ -203,7 +203,7 @@ fp_crc( - { - int bitpos; - int i; -- __int64_t val; -+ int64_t val; - char *ok; - - switch (iocur_crc_valid()) { -@@ -230,7 +230,7 @@ fp_crc( - if (size > 32) - dbprintf(fmtstr, val, ok); - else -- dbprintf(fmtstr, (__int32_t)val, ok); -+ dbprintf(fmtstr, (int32_t)val, ok); - if (i < count - 1) - dbprintf(" "); - } -diff --git a/db/frag.c b/db/frag.c -index 8005e45d..d224f0c2 100644 ---- a/db/frag.c -+++ b/db/frag.c -@@ -42,8 +42,8 @@ typedef struct extmap { - - static int aflag; - static int dflag; --static __uint64_t extcount_actual; --static __uint64_t extcount_ideal; -+static uint64_t extcount_actual; -+static uint64_t extcount_ideal; - static int fflag; - static int lflag; - static int qflag; -@@ -310,8 +310,8 @@ process_inode( - xfs_agino_t agino, - xfs_dinode_t *dip) - { -- __uint64_t actual; -- __uint64_t ideal; -+ uint64_t actual; -+ uint64_t ideal; - xfs_ino_t ino; - int skipa; - int skipd; -diff --git a/db/inode.c b/db/inode.c -index 8b7a41e4..6cc47d6a 100644 ---- a/db/inode.c -+++ b/db/inode.c -@@ -119,49 +119,49 @@ const field_t inode_core_flds[] = { - { "dmstate", FLDT_UINT16D, OI(COFF(dmstate)), C1, 0, TYP_NONE }, - { "flags", FLDT_UINT16X, OI(COFF(flags)), C1, FLD_SKIPALL, TYP_NONE }, - { "newrtbm", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_NEWRTBM_BIT - 1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_NEWRTBM_BIT - 1), C1, - 0, TYP_NONE }, - { "prealloc", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_PREALLOC_BIT - 1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_PREALLOC_BIT - 1), C1, - 0, TYP_NONE }, - { "realtime", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_REALTIME_BIT - 1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_REALTIME_BIT - 1), C1, - 0, TYP_NONE }, - { "immutable", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_IMMUTABLE_BIT-1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_IMMUTABLE_BIT-1), C1, - 0, TYP_NONE }, - { "append", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_APPEND_BIT - 1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_APPEND_BIT - 1), C1, - 0, TYP_NONE }, - { "sync", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_SYNC_BIT - 1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_SYNC_BIT - 1), C1, - 0, TYP_NONE }, - { "noatime", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_NOATIME_BIT - 1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_NOATIME_BIT - 1), C1, - 0, TYP_NONE }, - { "nodump", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_NODUMP_BIT - 1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_NODUMP_BIT - 1), C1, - 0, TYP_NONE }, - { "rtinherit", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_RTINHERIT_BIT-1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_RTINHERIT_BIT-1), C1, - 0, TYP_NONE }, - { "projinherit", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_PROJINHERIT_BIT-1),C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_PROJINHERIT_BIT-1), C1, - 0, TYP_NONE }, - { "nosymlinks", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_NOSYMLINKS_BIT-1), C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_NOSYMLINKS_BIT-1), C1, - 0, TYP_NONE }, - { "extsz", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_EXTSIZE_BIT-1),C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_EXTSIZE_BIT-1), C1, - 0, TYP_NONE }, - { "extszinherit", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_EXTSZINHERIT_BIT-1),C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_EXTSZINHERIT_BIT-1), C1, - 0, TYP_NONE }, - { "nodefrag", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_NODEFRAG_BIT-1),C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_NODEFRAG_BIT-1), C1, - 0, TYP_NONE }, - { "filestream", FLDT_UINT1, -- OI(COFF(flags) + bitsz(__uint16_t) - XFS_DIFLAG_FILESTREAM_BIT-1),C1, -+ OI(COFF(flags) + bitsz(uint16_t) - XFS_DIFLAG_FILESTREAM_BIT-1), C1, - 0, TYP_NONE }, - { "gen", FLDT_UINT32D, OI(COFF(gen)), C1, 0, TYP_NONE }, - { NULL } -@@ -177,10 +177,10 @@ const field_t inode_v3_flds[] = { - { "inumber", FLDT_INO, OI(COFF(ino)), C1, 0, TYP_NONE }, - { "uuid", FLDT_UUID, OI(COFF(uuid)), C1, 0, TYP_NONE }, - { "reflink", FLDT_UINT1, -- OI(COFF(flags2) + bitsz(__uint64_t) - XFS_DIFLAG2_REFLINK_BIT-1), C1, -+ OI(COFF(flags2) + bitsz(uint64_t) - XFS_DIFLAG2_REFLINK_BIT-1), C1, - 0, TYP_NONE }, - { "cowextsz", FLDT_UINT1, -- OI(COFF(flags2) + bitsz(__uint64_t) - XFS_DIFLAG2_COWEXTSIZE_BIT-1), C1, -+ OI(COFF(flags2) + bitsz(uint64_t) - XFS_DIFLAG2_COWEXTSIZE_BIT-1), C1, - 0, TYP_NONE }, - { NULL } - }; -diff --git a/db/io.c b/db/io.c -index 1f27f6b3..fd9b9f4b 100644 ---- a/db/io.c -+++ b/db/io.c -@@ -545,7 +545,7 @@ set_cur( - struct xfs_buf *bp; - xfs_ino_t dirino; - xfs_ino_t ino; -- __uint16_t mode; -+ uint16_t mode; - const struct xfs_buf_ops *ops = type ? type->bops : NULL; - - if (iocur_sp < 0) { -diff --git a/db/io.h b/db/io.h -index 99730048..df0fdd75 100644 ---- a/db/io.h -+++ b/db/io.h -@@ -25,7 +25,7 @@ typedef struct bbmap { - } bbmap_t; - - typedef struct iocur { -- __int64_t bb; /* BB number in filesystem of buf */ -+ int64_t bb; /* BB number in filesystem of buf */ - int blen; /* length of "buf", bb's */ - int boff; /* data - buf */ - void *buf; /* base address of buffer */ -@@ -33,7 +33,7 @@ typedef struct iocur { - xfs_ino_t dirino; /* current directory inode number */ - xfs_ino_t ino; /* current inode number */ - int len; /* length of "data", bytes */ -- __uint16_t mode; /* current inode's mode */ -+ uint16_t mode; /* current inode's mode */ - xfs_off_t off; /* fs offset of "data" in bytes */ - const struct typ *typ; /* type of "data" */ - bbmap_t *bbmap; /* map daddr if fragmented */ -@@ -57,7 +57,7 @@ extern void off_cur(int off, int len); - extern void pop_cur(void); - extern void print_iocur(char *tag, iocur_t *ioc); - extern void push_cur(void); --extern int read_buf(__int64_t daddr, int count, void *bufp); -+extern int read_buf(int64_t daddr, int count, void *bufp); - extern void write_cur(void); - extern void set_cur(const struct typ *type, xfs_daddr_t blknum, - int len, int ring_add, bbmap_t *bbmap); -diff --git a/db/metadump.c b/db/metadump.c -index 31bb5959..67bdf14e 100644 ---- a/db/metadump.c -+++ b/db/metadump.c -@@ -175,7 +175,7 @@ write_index(void) - static int - write_buf_segment( - char *data, -- __int64_t off, -+ int64_t off, - int len) - { - int i; -@@ -1256,7 +1256,7 @@ process_sf_dir( - { - struct xfs_dir2_sf_hdr *sfp; - xfs_dir2_sf_entry_t *sfep; -- __uint64_t ino_dir_size; -+ uint64_t ino_dir_size; - int i; - - sfp = (struct xfs_dir2_sf_hdr *)XFS_DFORK_DPTR(dip); -@@ -1322,7 +1322,7 @@ process_sf_dir( - static void - obfuscate_path_components( - char *buf, -- __uint64_t len) -+ uint64_t len) - { - unsigned char *comp = (unsigned char *)buf; - unsigned char *end = comp + len; -@@ -1359,7 +1359,7 @@ static void - process_sf_symlink( - xfs_dinode_t *dip) - { -- __uint64_t len; -+ uint64_t len; - char *buf; - - len = be64_to_cpu(dip->di_size); -@@ -1631,7 +1631,7 @@ process_attr_block( - xfs_attr_leaf_entry_t *entry; - xfs_attr_leaf_name_local_t *local; - xfs_attr_leaf_name_remote_t *remote; -- __uint32_t bs = mp->m_sb.sb_blocksize; -+ uint32_t bs = mp->m_sb.sb_blocksize; - char *first_name; - - -@@ -2270,7 +2270,7 @@ done: - return success; - } - --static __uint32_t inodes_copied = 0; -+static uint32_t inodes_copied; - - static int - copy_inode_chunk( -diff --git a/db/sb.c b/db/sb.c -index 8e7722cd..f19248d7 100644 ---- a/db/sb.c -+++ b/db/sb.c -@@ -606,7 +606,7 @@ version_help(void) - } - - static int --do_version(xfs_agnumber_t agno, __uint16_t version, __uint32_t features) -+do_version(xfs_agnumber_t agno, uint16_t version, uint32_t features) - { - xfs_sb_t tsb; - -@@ -710,8 +710,8 @@ version_f( - int argc, - char **argv) - { -- __uint16_t version = 0; -- __uint32_t features = 0; -+ uint16_t version = 0; -+ uint32_t features = 0; - xfs_agnumber_t ag; - - if (argc == 2) { /* WRITE VERSION */ -diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c -index 517b75f0..d4846a32 100644 ---- a/fsr/xfs_fsr.c -+++ b/fsr/xfs_fsr.c -@@ -54,7 +54,7 @@ struct getbmap *outmap = NULL; - int outmap_size = 0; - int RealUid; - int tmp_agi; --static __int64_t minimumfree = 2048; -+static int64_t minimumfree = 2048; - - #define MNTTYPE_XFS "xfs" - -diff --git a/include/darwin.h b/include/darwin.h -index 7bbd5764..51031c42 100644 ---- a/include/darwin.h -+++ b/include/darwin.h -@@ -125,15 +125,15 @@ typedef signed int __s32; - typedef unsigned long long int __u64; - typedef signed long long int __s64; - --#define __int8_t int8_t --#define __int16_t int16_t --#define __int32_t int32_t --#define __int32_t int32_t --#define __int64_t int64_t --#define __uint8_t u_int8_t --#define __uint16_t u_int16_t --#define __uint32_t u_int32_t --#define __uint64_t u_int64_t -+#define int8_t int8_t -+#define int16_t int16_t -+#define int32_t int32_t -+#define int32_t int32_t -+#define int64_t int64_t -+#define uint8_t u_int8_t -+#define uint16_t u_int16_t -+#define uint32_t u_int32_t -+#define uint64_t u_int64_t - - typedef off_t xfs_off_t; - typedef u_int64_t xfs_ino_t; -diff --git a/include/freebsd.h b/include/freebsd.h -index fb318b89..f52ed0a9 100644 ---- a/include/freebsd.h -+++ b/include/freebsd.h -@@ -50,9 +50,9 @@ typedef unsigned long long int __u64; - typedef signed long long int __s64; - - typedef off_t xfs_off_t; --typedef __uint64_t xfs_ino_t; --typedef __uint32_t xfs_dev_t; --typedef __int64_t xfs_daddr_t; -+typedef uint64_t xfs_ino_t; -+typedef uint32_t xfs_dev_t; -+typedef int64_t xfs_daddr_t; - typedef __u32 xfs_nlink_t; - - #define O_LARGEFILE 0 -diff --git a/include/gnukfreebsd.h b/include/gnukfreebsd.h -index 6916e65a..1db3f4f0 100644 ---- a/include/gnukfreebsd.h -+++ b/include/gnukfreebsd.h -@@ -46,9 +46,9 @@ typedef unsigned long long int __u64; - typedef signed long long int __s64; - - typedef off_t xfs_off_t; --typedef __uint64_t xfs_ino_t; --typedef __uint32_t xfs_dev_t; --typedef __int64_t xfs_daddr_t; -+typedef uint64_t xfs_ino_t; -+typedef uint32_t xfs_dev_t; -+typedef int64_t xfs_daddr_t; - typedef __u32 xfs_nlink_t; - - #define HAVE_FID 1 -diff --git a/include/libxcmd.h b/include/libxcmd.h -index e8d2ffc8..6806380c 100644 ---- a/include/libxcmd.h -+++ b/include/libxcmd.h -@@ -42,10 +42,10 @@ get_topology( - extern void - calc_default_ag_geometry( - int blocklog, -- __uint64_t dblocks, -+ uint64_t dblocks, - int multidisk, -- __uint64_t *agsize, -- __uint64_t *agcount); -+ uint64_t *agsize, -+ uint64_t *agcount); - - extern int - check_overwrite( -diff --git a/include/linux.h b/include/linux.h -index 9611a37f..6ce344c5 100644 ---- a/include/linux.h -+++ b/include/linux.h -@@ -132,7 +132,7 @@ static __inline__ void platform_uuid_copy(uuid_t *dst, uuid_t *src) - static __inline__ int - platform_discard_blocks(int fd, uint64_t start, uint64_t len) - { -- __uint64_t range[2] = { start, len }; -+ uint64_t range[2] = { start, len }; - - if (ioctl(fd, BLKDISCARD, &range) < 0) - return errno; -@@ -144,9 +144,9 @@ platform_discard_blocks(int fd, uint64_t start, uint64_t len) - #define EFSBADCRC EBADMSG /* Bad CRC detected */ - - typedef off_t xfs_off_t; --typedef __uint64_t xfs_ino_t; --typedef __uint32_t xfs_dev_t; --typedef __int64_t xfs_daddr_t; -+typedef uint64_t xfs_ino_t; -+typedef uint32_t xfs_dev_t; -+typedef int64_t xfs_daddr_t; - typedef __u32 xfs_nlink_t; - - /** -diff --git a/include/xfs_arch.h b/include/xfs_arch.h -index 12cd43e6..186cadba 100644 ---- a/include/xfs_arch.h -+++ b/include/xfs_arch.h -@@ -244,39 +244,39 @@ static inline void be64_add_cpu(__be64 *a, __s64 b) - *a = cpu_to_be64(be64_to_cpu(*a) + b); - } - --static inline __uint16_t get_unaligned_be16(void *p) -+static inline uint16_t get_unaligned_be16(void *p) - { -- __uint8_t *__p = p; -+ uint8_t *__p = p; - return __p[0] << 8 | __p[1]; - } - --static inline __uint32_t get_unaligned_be32(void *p) -+static inline uint32_t get_unaligned_be32(void *p) - { -- __uint8_t *__p = p; -+ uint8_t *__p = p; - return __p[0] << 24 | __p[1] << 16 | __p[2] << 8 | __p[3]; - } - --static inline __uint64_t get_unaligned_be64(void *p) -+static inline uint64_t get_unaligned_be64(void *p) - { -- return (__uint64_t)get_unaligned_be32(p) << 32 | -+ return (uint64_t)get_unaligned_be32(p) << 32 | - get_unaligned_be32(p + 4); - } - --static inline void put_unaligned_be16(__uint16_t val, void *p) -+static inline void put_unaligned_be16(uint16_t val, void *p) - { -- __uint8_t *__p = p; -+ uint8_t *__p = p; - *__p++ = val >> 8; - *__p++ = val; - } - --static inline void put_unaligned_be32(__uint32_t val, void *p) -+static inline void put_unaligned_be32(uint32_t val, void *p) - { -- __uint8_t *__p = p; -+ uint8_t *__p = p; - put_unaligned_be16(val >> 16, __p); - put_unaligned_be16(val, __p + 2); - } - --static inline void put_unaligned_be64(__uint64_t val, void *p) -+static inline void put_unaligned_be64(uint64_t val, void *p) - { - put_unaligned_be32(val >> 32, p); - put_unaligned_be32(val, p + 4); -diff --git a/include/xfs_inode.h b/include/xfs_inode.h -index fb6b5429..8766024e 100644 ---- a/include/xfs_inode.h -+++ b/include/xfs_inode.h -@@ -123,8 +123,8 @@ xfs_get_projid(struct xfs_icdinode *id) - static inline void - xfs_set_projid(struct xfs_icdinode *id, prid_t projid) - { -- id->di_projid_hi = (__uint16_t) (projid >> 16); -- id->di_projid_lo = (__uint16_t) (projid & 0xffff); -+ id->di_projid_hi = (uint16_t) (projid >> 16); -+ id->di_projid_lo = (uint16_t) (projid & 0xffff); - } - - static inline bool xfs_is_reflink_inode(struct xfs_inode *ip) -diff --git a/include/xfs_log_recover.h b/include/xfs_log_recover.h -index 7582676b..0d098628 100644 ---- a/include/xfs_log_recover.h -+++ b/include/xfs_log_recover.h -@@ -26,7 +26,7 @@ - #define XLOG_RHASH_SIZE 16 - #define XLOG_RHASH_SHIFT 2 - #define XLOG_RHASH(tid) \ -- ((((__uint32_t)tid)>>XLOG_RHASH_SHIFT) & (XLOG_RHASH_SIZE-1)) -+ ((((uint32_t)tid)>>XLOG_RHASH_SHIFT) & (XLOG_RHASH_SIZE-1)) - - #define XLOG_MAX_REGIONS_IN_ITEM (XFS_MAX_BLOCKSIZE / XFS_BLF_CHUNK / 2 + 1) - -diff --git a/include/xfs_metadump.h b/include/xfs_metadump.h -index 7f3039eb..13afb8dd 100644 ---- a/include/xfs_metadump.h -+++ b/include/xfs_metadump.h -@@ -24,8 +24,8 @@ - typedef struct xfs_metablock { - __be32 mb_magic; - __be16 mb_count; -- __uint8_t mb_blocklog; -- __uint8_t mb_info; -+ uint8_t mb_blocklog; -+ uint8_t mb_info; - /* followed by an array of xfs_daddr_t */ - } xfs_metablock_t; - -diff --git a/include/xfs_mount.h b/include/xfs_mount.h -index 5ff24ebf..5b323bb1 100644 ---- a/include/xfs_mount.h -+++ b/include/xfs_mount.h -@@ -48,12 +48,12 @@ typedef struct xfs_mount { - #define m_dev m_ddev_targp - #define m_logdev m_logdev_targp - #define m_rtdev m_rtdev_targp -- __uint8_t m_dircook_elog; /* log d-cookie entry bits */ -- __uint8_t m_blkbit_log; /* blocklog + NBBY */ -- __uint8_t m_blkbb_log; /* blocklog - BBSHIFT */ -- __uint8_t m_sectbb_log; /* sectorlog - BBSHIFT */ -- __uint8_t m_agno_log; /* log #ag's */ -- __uint8_t m_agino_log; /* #bits for agino in inum */ -+ uint8_t m_dircook_elog; /* log d-cookie entry bits */ -+ uint8_t m_blkbit_log; /* blocklog + NBBY */ -+ uint8_t m_blkbb_log; /* blocklog - BBSHIFT */ -+ uint8_t m_sectbb_log; /* sectorlog - BBSHIFT */ -+ uint8_t m_agno_log; /* log #ag's */ -+ uint8_t m_agino_log; /* #bits for agino in inum */ - uint m_inode_cluster_size;/* min inode buf size */ - uint m_blockmask; /* sb_blocksize-1 */ - uint m_blockwsize; /* sb_blocksize in words */ -@@ -88,7 +88,7 @@ typedef struct xfs_mount { - int m_litino; /* size of inode union area */ - int m_inoalign_mask;/* mask sb_inoalignmt if used */ - struct xfs_trans_resv m_resv; /* precomputed res values */ -- __uint64_t m_maxicount; /* maximum inode count */ -+ uint64_t m_maxicount; /* maximum inode count */ - int m_dalign; /* stripe unit */ - int m_swidth; /* stripe width */ - int m_sinoalign; /* stripe unit inode alignmnt */ -@@ -144,12 +144,12 @@ typedef struct xfs_perag { - char pagi_init; /* this agi's entry is initialized */ - char pagf_metadata; /* the agf is preferred to be metadata */ - char pagi_inodeok; /* The agi is ok for inodes */ -- __uint8_t pagf_levels[XFS_BTNUM_AGF]; -+ uint8_t pagf_levels[XFS_BTNUM_AGF]; - /* # of levels in bno & cnt btree */ -- __uint32_t pagf_flcount; /* count of blocks in freelist */ -+ uint32_t pagf_flcount; /* count of blocks in freelist */ - xfs_extlen_t pagf_freeblks; /* total free blocks */ - xfs_extlen_t pagf_longest; /* longest free space */ -- __uint32_t pagf_btreeblks; /* # of blocks held in AGF btrees */ -+ uint32_t pagf_btreeblks; /* # of blocks held in AGF btrees */ - xfs_agino_t pagi_freecount; /* number of free inodes */ - xfs_agino_t pagi_count; /* number of allocated inodes */ - -@@ -169,7 +169,7 @@ typedef struct xfs_perag { - struct xfs_ag_resv pag_agfl_resv; - - /* reference count */ -- __uint8_t pagf_refcount_level; -+ uint8_t pagf_refcount_level; - } xfs_perag_t; - - static inline struct xfs_ag_resv * -diff --git a/libhandle/handle.c b/libhandle/handle.c -index 236ed22a..00127b3c 100644 ---- a/libhandle/handle.c -+++ b/libhandle/handle.c -@@ -232,7 +232,7 @@ obj_to_handle( - { - char hbuf [MAXHANSIZ]; - int ret; -- __uint32_t handlen; -+ uint32_t handlen; - xfs_fsop_handlereq_t hreq; - - if (opcode == XFS_IOC_FD_TO_HANDLE) { -diff --git a/libhandle/jdm.c b/libhandle/jdm.c -index e52f5d83..821061b4 100644 ---- a/libhandle/jdm.c -+++ b/libhandle/jdm.c -@@ -36,7 +36,7 @@ typedef struct filehandle { - fshandle_t fh_fshandle; /* handle of fs containing this inode */ - int16_t fh_sz_following; /* bytes in handle after this member */ - char fh_pad[FILEHANDLE_SZ_PAD]; /* padding, must be zeroed */ -- __uint32_t fh_gen; /* generation count */ -+ uint32_t fh_gen; /* generation count */ - xfs_ino_t fh_ino; /* 64 bit ino */ - } filehandle_t; - -diff --git a/libxcmd/topology.c b/libxcmd/topology.c -index 8b0276a7..f66dd1bc 100644 ---- a/libxcmd/topology.c -+++ b/libxcmd/topology.c -@@ -23,19 +23,19 @@ - #endif /* ENABLE_BLKID */ - #include "xfs_multidisk.h" - --#define TERABYTES(count, blog) ((__uint64_t)(count) << (40 - (blog))) --#define GIGABYTES(count, blog) ((__uint64_t)(count) << (30 - (blog))) --#define MEGABYTES(count, blog) ((__uint64_t)(count) << (20 - (blog))) -+#define TERABYTES(count, blog) ((uint64_t)(count) << (40 - (blog))) -+#define GIGABYTES(count, blog) ((uint64_t)(count) << (30 - (blog))) -+#define MEGABYTES(count, blog) ((uint64_t)(count) << (20 - (blog))) - - void - calc_default_ag_geometry( - int blocklog, -- __uint64_t dblocks, -+ uint64_t dblocks, - int multidisk, -- __uint64_t *agsize, -- __uint64_t *agcount) -+ uint64_t *agsize, -+ uint64_t *agcount) - { -- __uint64_t blocks = 0; -+ uint64_t blocks = 0; - int shift = 0; - - /* -diff --git a/libxfs/darwin.c b/libxfs/darwin.c -index 74507e81..16d2c35c 100644 ---- a/libxfs/darwin.c -+++ b/libxfs/darwin.c -@@ -68,7 +68,7 @@ platform_flush_device(int fd, dev_t device) - void - platform_findsizes(char *path, int fd, long long *sz, int *bsz) - { -- __uint64_t size; -+ uint64_t size; - struct stat st; - - if (fstat(fd, &st) < 0) { -diff --git a/libxfs/freebsd.c b/libxfs/freebsd.c -index 4667d1f5..d7bca142 100644 ---- a/libxfs/freebsd.c -+++ b/libxfs/freebsd.c -@@ -109,7 +109,7 @@ void - platform_findsizes(char *path, int fd, long long *sz, int *bsz) - { - struct stat st; -- __int64_t size; -+ int64_t size; - u_int ssize; - - if (fstat(fd, &st) < 0) { -diff --git a/libxfs/init.c b/libxfs/init.c -index fc14c5e4..0f41a853 100644 ---- a/libxfs/init.c -+++ b/libxfs/init.c -@@ -546,7 +546,7 @@ libxfs_initialize_perag( - * the max inode percentage. - */ - if (mp->m_maxicount) { -- __uint64_t icount; -+ uint64_t icount; - - icount = sbp->sb_dblocks * sbp->sb_imax_pct; - do_div(icount, 100); -diff --git a/libxfs/irix.c b/libxfs/irix.c -index 32fcb3e5..0f14aec7 100644 ---- a/libxfs/irix.c -+++ b/libxfs/irix.c -@@ -22,7 +22,7 @@ - - int platform_has_uuid = 0; - extern char *progname; --extern __int64_t findsize(char *); -+extern int64_t findsize(char *); - - int - platform_check_ismounted(char *name, char *block, struct stat *s, int verbose) -diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h -index b4f766db..d525b667 100644 ---- a/libxfs/libxfs_priv.h -+++ b/libxfs/libxfs_priv.h -@@ -296,8 +296,8 @@ roundup_pow_of_two(uint v) - return 0; - } - --static inline __uint64_t --roundup_64(__uint64_t x, __uint32_t y) -+static inline uint64_t -+roundup_64(uint64_t x, uint32_t y) - { - x += y - 1; - do_div(x, y); -diff --git a/libxfs/linux.c b/libxfs/linux.c -index 69f04ad9..0bace3eb 100644 ---- a/libxfs/linux.c -+++ b/libxfs/linux.c -@@ -163,7 +163,7 @@ void - platform_findsizes(char *path, int fd, long long *sz, int *bsz) - { - struct stat st; -- __uint64_t size; -+ uint64_t size; - int error; - - if (fstat(fd, &st) < 0) { -diff --git a/libxfs/logitem.c b/libxfs/logitem.c -index 7e93f609..466b4421 100644 ---- a/libxfs/logitem.c -+++ b/libxfs/logitem.c -@@ -121,7 +121,7 @@ xfs_buf_item_init( - bip->bli_item.li_mountp = mp; - bip->bli_buf = bp; - bip->bli_format.blf_type = XFS_LI_BUF; -- bip->bli_format.blf_blkno = (__int64_t)XFS_BUF_ADDR(bp); -+ bip->bli_format.blf_blkno = (int64_t)XFS_BUF_ADDR(bp); - bip->bli_format.blf_len = (unsigned short)BTOBB(XFS_BUF_COUNT(bp)); - XFS_BUF_SET_FSPRIVATE(bp, bip); - } -diff --git a/libxfs/radix-tree.c b/libxfs/radix-tree.c -index eef9c36d..3f0257fe 100644 ---- a/libxfs/radix-tree.c -+++ b/libxfs/radix-tree.c -@@ -66,21 +66,21 @@ static unsigned long height_to_maxindex[RADIX_TREE_MAX_PATH]; - static inline void tag_set(struct radix_tree_node *node, unsigned int tag, - int offset) - { -- *((__uint32_t *)node->tags[tag] + (offset >> 5)) |= (1 << (offset & 31)); -+ *((uint32_t *)node->tags[tag] + (offset >> 5)) |= (1 << (offset & 31)); - } - - static inline void tag_clear(struct radix_tree_node *node, unsigned int tag, - int offset) - { -- __uint32_t *p = (__uint32_t*)node->tags[tag] + (offset >> 5); -- __uint32_t m = 1 << (offset & 31); -+ uint32_t *p = (uint32_t*)node->tags[tag] + (offset >> 5); -+ uint32_t m = 1 << (offset & 31); - *p &= ~m; - } - - static inline int tag_get(struct radix_tree_node *node, unsigned int tag, - int offset) - { -- return 1 & (((const __uint32_t *)node->tags[tag])[offset >> 5] >> (offset & 31)); -+ return 1 & (((const uint32_t *)node->tags[tag])[offset >> 5] >> (offset & 31)); - } - - /* -diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c -index 21c42f14..474e5ebc 100644 ---- a/libxfs/rdwr.c -+++ b/libxfs/rdwr.c -@@ -118,9 +118,9 @@ static void unmount_record(void *p) - xlog_op_header_t *op = (xlog_op_header_t *)p; - /* the data section must be 32 bit size aligned */ - struct { -- __uint16_t magic; -- __uint16_t pad1; -- __uint32_t pad2; /* may as well make it 64 bits */ -+ uint16_t magic; -+ uint16_t pad1; -+ uint32_t pad2; /* may as well make it 64 bits */ - } magic = { XLOG_UNMOUNT_TYPE, 0, 0 }; - - memset(p, 0, BBSIZE); -diff --git a/libxfs/util.c b/libxfs/util.c -index dcfca397..7938e317 100644 ---- a/libxfs/util.c -+++ b/libxfs/util.c -@@ -170,8 +170,8 @@ libxfs_trans_ichgtime( - if (flags & XFS_ICHGTIME_CHG) - VFS_I(ip)->i_ctime = tv; - if (flags & XFS_ICHGTIME_CREATE) { -- ip->i_d.di_crtime.t_sec = (__int32_t)tv.tv_sec; -- ip->i_d.di_crtime.t_nsec = (__int32_t)tv.tv_nsec; -+ ip->i_d.di_crtime.t_sec = (int32_t)tv.tv_sec; -+ ip->i_d.di_crtime.t_nsec = (int32_t)tv.tv_nsec; - } - } - -@@ -261,8 +261,8 @@ libxfs_ialloc( - ASSERT(uuid_equal(&ip->i_d.di_uuid, &mp->m_sb.sb_meta_uuid)); - VFS_I(ip)->i_version = 1; - ip->i_d.di_flags2 = 0; -- ip->i_d.di_crtime.t_sec = (__int32_t)VFS_I(ip)->i_mtime.tv_sec; -- ip->i_d.di_crtime.t_nsec = (__int32_t)VFS_I(ip)->i_mtime.tv_nsec; -+ ip->i_d.di_crtime.t_sec = (int32_t)VFS_I(ip)->i_mtime.tv_sec; -+ ip->i_d.di_crtime.t_nsec = (int32_t)VFS_I(ip)->i_mtime.tv_nsec; - } - - flags = XFS_ILOG_CORE; -diff --git a/logprint/log_misc.c b/logprint/log_misc.c -index 0dfcfd19..2fd01ceb 100644 ---- a/logprint/log_misc.c -+++ b/logprint/log_misc.c -@@ -166,12 +166,12 @@ xlog_print_trans_header(char **ptr, int len) - { - xfs_trans_header_t *h; - char *cptr = *ptr; -- __uint32_t magic; -+ uint32_t magic; - char *magic_c = (char *)&magic; - - *ptr += len; - -- magic=*(__uint32_t*)cptr; /* XXX be32_to_cpu soon */ -+ magic = *(uint32_t *)cptr; /* XXX be32_to_cpu soon */ - - if (len >= 4) { - #if __BYTE_ORDER == __LITTLE_ENDIAN -@@ -201,7 +201,7 @@ xlog_print_trans_buffer(char **ptr, int len, int *i, int num_ops) - int num, skip; - int super_block = 0; - int bucket, col, buckets; -- __int64_t blkno; -+ int64_t blkno; - xfs_buf_log_format_t lbuf; - int size, blen, map_size, struct_size; - __be64 x, y; -diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c -index 9d1b4e80..c49c13aa 100644 ---- a/mdrestore/xfs_mdrestore.c -+++ b/mdrestore/xfs_mdrestore.c -@@ -66,7 +66,7 @@ perform_restore( - int mb_count; - xfs_metablock_t tmb; - xfs_sb_t sb; -- __int64_t bytes_read; -+ int64_t bytes_read; - - /* - * read in first blocks (superblock 0), set "inprogress" flag for it, -diff --git a/mkfs/proto.c b/mkfs/proto.c -index 89cd2379..cf8cc391 100644 ---- a/mkfs/proto.c -+++ b/mkfs/proto.c -@@ -667,7 +667,7 @@ rtinit( - mp->m_sb.sb_rbmino = rbmip->i_ino; - rbmip->i_d.di_size = mp->m_sb.sb_rbmblocks * mp->m_sb.sb_blocksize; - rbmip->i_d.di_flags = XFS_DIFLAG_NEWRTBM; -- *(__uint64_t *)&VFS_I(rbmip)->i_atime = 0; -+ *(uint64_t *)&VFS_I(rbmip)->i_atime = 0; - libxfs_trans_log_inode(tp, rbmip, XFS_ILOG_CORE); - libxfs_log_sb(tp); - mp->m_rbmip = rbmip; -diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c -index b5c3a57e..7bb6408f 100644 ---- a/mkfs/xfs_mkfs.c -+++ b/mkfs/xfs_mkfs.c -@@ -705,9 +705,9 @@ struct opt_params mopts = { - }, - }; - --#define TERABYTES(count, blog) ((__uint64_t)(count) << (40 - (blog))) --#define GIGABYTES(count, blog) ((__uint64_t)(count) << (30 - (blog))) --#define MEGABYTES(count, blog) ((__uint64_t)(count) << (20 - (blog))) -+#define TERABYTES(count, blog) ((uint64_t)(count) << (40 - (blog))) -+#define GIGABYTES(count, blog) ((uint64_t)(count) << (30 - (blog))) -+#define MEGABYTES(count, blog) ((uint64_t)(count) << (20 - (blog))) - - /* - * Use this macro before we have superblock and mount structure -@@ -878,7 +878,7 @@ fixup_log_stripe_unit( - xfs_rfsblock_t *logblocks, - int blocklog) - { -- __uint64_t tmp_logblocks; -+ uint64_t tmp_logblocks; - - /* - * Make sure that the log size is a multiple of the stripe unit -@@ -910,7 +910,7 @@ fixup_internal_log_stripe( - xfs_mount_t *mp, - int lsflag, - xfs_fsblock_t logstart, -- __uint64_t agsize, -+ uint64_t agsize, - int sunit, - xfs_rfsblock_t *logblocks, - int blocklog, -@@ -934,7 +934,7 @@ fixup_internal_log_stripe( - } - - void --validate_log_size(__uint64_t logblocks, int blocklog, int min_logblocks) -+validate_log_size(uint64_t logblocks, int blocklog, int min_logblocks) - { - if (logblocks < min_logblocks) { - fprintf(stderr, -@@ -959,7 +959,7 @@ validate_log_size(__uint64_t logblocks, int blocklog, int min_logblocks) - static int - calc_default_imaxpct( - int blocklog, -- __uint64_t dblocks) -+ uint64_t dblocks) - { - /* - * This returns the % of the disk space that is used for -@@ -981,9 +981,9 @@ calc_default_imaxpct( - static void - validate_ag_geometry( - int blocklog, -- __uint64_t dblocks, -- __uint64_t agsize, -- __uint64_t agcount) -+ uint64_t dblocks, -+ uint64_t agsize, -+ uint64_t agcount) - { - if (agsize < XFS_AG_MIN_BLOCKS(blocklog)) { - fprintf(stderr, -@@ -1059,7 +1059,7 @@ zero_old_xfs_structures( - { - void *buf; - xfs_sb_t sb; -- __uint32_t bsize; -+ uint32_t bsize; - int i; - xfs_off_t off; - -@@ -1112,8 +1112,8 @@ zero_old_xfs_structures( - i != sb.sb_blocklog) - goto done; - -- if (sb.sb_dblocks > ((__uint64_t)sb.sb_agcount * sb.sb_agblocks) || -- sb.sb_dblocks < ((__uint64_t)(sb.sb_agcount - 1) * -+ if (sb.sb_dblocks > ((uint64_t)sb.sb_agcount * sb.sb_agblocks) || -+ sb.sb_dblocks < ((uint64_t)(sb.sb_agcount - 1) * - sb.sb_agblocks + XFS_MIN_AG_BLOCKS)) - goto done; - -@@ -1133,7 +1133,7 @@ done: - } - - static void --discard_blocks(dev_t dev, __uint64_t nsectors) -+discard_blocks(dev_t dev, uint64_t nsectors) - { - int fd; - -@@ -1395,11 +1395,11 @@ main( - int argc, - char **argv) - { -- __uint64_t agcount; -+ uint64_t agcount; - xfs_agf_t *agf; - xfs_agi_t *agi; - xfs_agnumber_t agno; -- __uint64_t agsize; -+ uint64_t agsize; - xfs_alloc_rec_t *arec; - struct xfs_btree_block *block; - int blflag; -@@ -1475,10 +1475,10 @@ main( - char *rtsize; - xfs_sb_t *sbp; - int sectorlog; -- __uint64_t sector_mask; -+ uint64_t sector_mask; - int slflag; - int ssflag; -- __uint64_t tmp_agsize; -+ uint64_t tmp_agsize; - uuid_t uuid; - int worst_freelist; - libxfs_init_t xi; -@@ -2167,7 +2167,7 @@ _("rmapbt not supported with realtime devices\n")); - - - if (dsize) { -- __uint64_t dbytes; -+ uint64_t dbytes; - - dbytes = getnum(dsize, &dopts, D_SIZE); - if (dbytes % XFS_MIN_BLOCKSIZE) { -@@ -2199,7 +2199,7 @@ _("rmapbt not supported with realtime devices\n")); - } - - if (logsize) { -- __uint64_t logbytes; -+ uint64_t logbytes; - - logbytes = getnum(logsize, &lopts, L_SIZE); - if (logbytes % XFS_MIN_BLOCKSIZE) { -@@ -2216,7 +2216,7 @@ _("rmapbt not supported with realtime devices\n")); - (long long)(logblocks << blocklog)); - } - if (rtsize) { -- __uint64_t rtbytes; -+ uint64_t rtbytes; - - rtbytes = getnum(rtsize, &ropts, R_SIZE); - if (rtbytes % XFS_MIN_BLOCKSIZE) { -@@ -2236,7 +2236,7 @@ _("rmapbt not supported with realtime devices\n")); - * If specified, check rt extent size against its constraints. - */ - if (rtextsize) { -- __uint64_t rtextbytes; -+ uint64_t rtextbytes; - - rtextbytes = getnum(rtextsize, &ropts, R_EXTSIZE); - if (rtextbytes % blocksize) { -@@ -2252,8 +2252,8 @@ _("rmapbt not supported with realtime devices\n")); - * and the underlying volume is striped, then set rtextblocks - * to the stripe width. - */ -- __uint64_t rswidth; -- __uint64_t rtextbytes; -+ uint64_t rswidth; -+ uint64_t rtextbytes; - - if (!norsflag && !xi.risfile && !(!rtsize && xi.disfile)) - rswidth = ft.rtswidth; -@@ -2335,10 +2335,10 @@ _("rmapbt not supported with realtime devices\n")); - * multiple of the sector size, or 1024, whichever is larger. - */ - -- sector_mask = (__uint64_t)-1 << (MAX(sectorlog, 10) - BBSHIFT); -+ sector_mask = (uint64_t)-1 << (MAX(sectorlog, 10) - BBSHIFT); - xi.dsize &= sector_mask; - xi.rtsize &= sector_mask; -- xi.logBBsize &= (__uint64_t)-1 << (MAX(lsectorlog, 10) - BBSHIFT); -+ xi.logBBsize &= (uint64_t)-1 << (MAX(lsectorlog, 10) - BBSHIFT); - - - /* don't do discards on print-only runs or on files */ -@@ -2696,9 +2696,9 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"), - mp = &mbuf; - sbp = &mp->m_sb; - memset(mp, 0, sizeof(xfs_mount_t)); -- sbp->sb_blocklog = (__uint8_t)blocklog; -- sbp->sb_sectlog = (__uint8_t)sectorlog; -- sbp->sb_agblklog = (__uint8_t)libxfs_log2_roundup((unsigned int)agsize); -+ sbp->sb_blocklog = (uint8_t)blocklog; -+ sbp->sb_sectlog = (uint8_t)sectorlog; -+ sbp->sb_agblklog = (uint8_t)libxfs_log2_roundup((unsigned int)agsize); - sbp->sb_agblocks = (xfs_agblock_t)agsize; - mp->m_blkbb_log = sbp->sb_blocklog - BBSHIFT; - mp->m_sectbb_log = sbp->sb_sectlog - BBSHIFT; -@@ -2805,14 +2805,14 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"), - sbp->sb_agcount = (xfs_agnumber_t)agcount; - sbp->sb_rbmblocks = nbmblocks; - sbp->sb_logblocks = (xfs_extlen_t)logblocks; -- sbp->sb_sectsize = (__uint16_t)sectorsize; -- sbp->sb_inodesize = (__uint16_t)isize; -- sbp->sb_inopblock = (__uint16_t)(blocksize / isize); -- sbp->sb_sectlog = (__uint8_t)sectorlog; -- sbp->sb_inodelog = (__uint8_t)inodelog; -- sbp->sb_inopblog = (__uint8_t)(blocklog - inodelog); -+ sbp->sb_sectsize = (uint16_t)sectorsize; -+ sbp->sb_inodesize = (uint16_t)isize; -+ sbp->sb_inopblock = (uint16_t)(blocksize / isize); -+ sbp->sb_sectlog = (uint8_t)sectorlog; -+ sbp->sb_inodelog = (uint8_t)inodelog; -+ sbp->sb_inopblog = (uint8_t)(blocklog - inodelog); - sbp->sb_rextslog = -- (__uint8_t)(rtextents ? -+ (uint8_t)(rtextents ? - libxfs_highbit32((unsigned int)rtextents) : 0); - sbp->sb_inprogress = 1; /* mkfs is in progress */ - sbp->sb_imax_pct = imaxpct; -@@ -2840,8 +2840,8 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"), - } else - sbp->sb_inoalignmt = 0; - if (lsectorsize != BBSIZE || sectorsize != BBSIZE) { -- sbp->sb_logsectlog = (__uint8_t)lsectorlog; -- sbp->sb_logsectsize = (__uint16_t)lsectorsize; -+ sbp->sb_logsectlog = (uint8_t)lsectorlog; -+ sbp->sb_logsectsize = (uint16_t)lsectorsize; - } else { - sbp->sb_logsectlog = 0; - sbp->sb_logsectsize = 0; -diff --git a/quota/edit.c b/quota/edit.c -index 36b327a5..8418e858 100644 ---- a/quota/edit.c -+++ b/quota/edit.c -@@ -115,16 +115,16 @@ warn_help(void) - - static void - set_limits( -- __uint32_t id, -+ uint32_t id, - uint type, - uint mask, - char *dev, -- __uint64_t *bsoft, -- __uint64_t *bhard, -- __uint64_t *isoft, -- __uint64_t *ihard, -- __uint64_t *rtbsoft, -- __uint64_t *rtbhard) -+ uint64_t *bsoft, -+ uint64_t *bhard, -+ uint64_t *isoft, -+ uint64_t *ihard, -+ uint64_t *rtbsoft, -+ uint64_t *rtbhard) - { - fs_disk_quota_t d; - -@@ -152,12 +152,12 @@ set_user_limits( - char *name, - uint type, - uint mask, -- __uint64_t *bsoft, -- __uint64_t *bhard, -- __uint64_t *isoft, -- __uint64_t *ihard, -- __uint64_t *rtbsoft, -- __uint64_t *rtbhard) -+ uint64_t *bsoft, -+ uint64_t *bhard, -+ uint64_t *isoft, -+ uint64_t *ihard, -+ uint64_t *rtbsoft, -+ uint64_t *rtbhard) - { - uid_t uid = uid_from_string(name); - -@@ -175,12 +175,12 @@ set_group_limits( - char *name, - uint type, - uint mask, -- __uint64_t *bsoft, -- __uint64_t *bhard, -- __uint64_t *isoft, -- __uint64_t *ihard, -- __uint64_t *rtbsoft, -- __uint64_t *rtbhard) -+ uint64_t *bsoft, -+ uint64_t *bhard, -+ uint64_t *isoft, -+ uint64_t *ihard, -+ uint64_t *rtbsoft, -+ uint64_t *rtbhard) - { - gid_t gid = gid_from_string(name); - -@@ -198,12 +198,12 @@ set_project_limits( - char *name, - uint type, - uint mask, -- __uint64_t *bsoft, -- __uint64_t *bhard, -- __uint64_t *isoft, -- __uint64_t *ihard, -- __uint64_t *rtbsoft, -- __uint64_t *rtbhard) -+ uint64_t *bsoft, -+ uint64_t *bhard, -+ uint64_t *isoft, -+ uint64_t *ihard, -+ uint64_t *rtbsoft, -+ uint64_t *rtbhard) - { - prid_t prid = prid_from_string(name); - -@@ -224,7 +224,7 @@ extractb( - int length, - uint blocksize, - uint sectorsize, -- __uint64_t *value) -+ uint64_t *value) - { - long long v; - char *s = string; -@@ -238,7 +238,7 @@ extractb( - progname, s); - return 0; - } -- *value = (__uint64_t)v >> 9; /* syscalls use basic blocks */ -+ *value = (uint64_t)v >> 9; /* syscalls use basic blocks */ - if (v > 0 && *value == 0) - fprintf(stderr, _("%s: Warning: `%s' in quota blocks is 0 (unlimited).\n"), progname, s); - return 1; -@@ -252,7 +252,7 @@ extracti( - char *string, - const char *prefix, - int length, -- __uint64_t *value) -+ uint64_t *value) - { - char *sp, *s = string; - -@@ -270,7 +270,7 @@ limit_f( - char **argv) - { - char *name; -- __uint64_t bsoft, bhard, isoft, ihard, rtbsoft, rtbhard; -+ uint64_t bsoft, bhard, isoft, ihard, rtbsoft, rtbhard; - int c, type = 0, mask = 0, flags = 0; - uint bsize, ssize, endoptions; - -@@ -384,8 +384,8 @@ restore_file( - char *dev = NULL; - uint mask; - int cnt; -- __uint32_t id; -- __uint64_t bsoft, bhard, isoft, ihard, rtbsoft, rtbhard; -+ uint32_t id; -+ uint64_t bsoft, bhard, isoft, ihard, rtbsoft, rtbhard; - - while (fgets(buffer, sizeof(buffer), fp) != NULL) { - if (strncmp("fs = ", buffer, 5) == 0) { -@@ -546,7 +546,7 @@ timer_f( - - static void - set_warnings( -- __uint32_t id, -+ uint32_t id, - uint type, - uint mask, - char *dev, -diff --git a/quota/free.c b/quota/free.c -index cee15ee9..1f8378d2 100644 ---- a/quota/free.c -+++ b/quota/free.c -@@ -49,20 +49,20 @@ free_help(void) - static int - mount_free_space_data( - struct fs_path *mount, -- __uint64_t *bcount, -- __uint64_t *bused, -- __uint64_t *bfree, -- __uint64_t *icount, -- __uint64_t *iused, -- __uint64_t *ifree, -- __uint64_t *rcount, -- __uint64_t *rused, -- __uint64_t *rfree) -+ uint64_t *bcount, -+ uint64_t *bused, -+ uint64_t *bfree, -+ uint64_t *icount, -+ uint64_t *iused, -+ uint64_t *ifree, -+ uint64_t *rcount, -+ uint64_t *rused, -+ uint64_t *rfree) - { - struct xfs_fsop_counts fscounts; - struct xfs_fsop_geom fsgeo; - struct statfs st; -- __uint64_t logsize, count, free; -+ uint64_t logsize, count, free; - int fd; - - if ((fd = open(mount->fs_dir, O_RDONLY)) < 0) { -@@ -132,15 +132,15 @@ mount_free_space_data( - static int - projects_free_space_data( - struct fs_path *path, -- __uint64_t *bcount, -- __uint64_t *bused, -- __uint64_t *bfree, -- __uint64_t *icount, -- __uint64_t *iused, -- __uint64_t *ifree, -- __uint64_t *rcount, -- __uint64_t *rused, -- __uint64_t *rfree) -+ uint64_t *bcount, -+ uint64_t *bused, -+ uint64_t *bfree, -+ uint64_t *icount, -+ uint64_t *iused, -+ uint64_t *ifree, -+ uint64_t *rcount, -+ uint64_t *rused, -+ uint64_t *rfree) - { - fs_quota_stat_t qfs; - fs_disk_quota_t d; -@@ -226,9 +226,9 @@ free_space( - fs_path_t *path, - uint flags) - { -- __uint64_t bcount, bused, bfree; -- __uint64_t icount, iused, ifree; -- __uint64_t rcount, rused, rfree; -+ uint64_t bcount, bused, bfree; -+ uint64_t icount, iused, ifree; -+ uint64_t rcount, rused, rfree; - char a[8], s[8], u[8], p[8]; - int count; - -diff --git a/quota/quot.c b/quota/quot.c -index ccc154f5..6378fbb7 100644 ---- a/quota/quot.c -+++ b/quota/quot.c -@@ -26,17 +26,17 @@ - - typedef struct du { - struct du *next; -- __uint64_t blocks; -- __uint64_t blocks30; -- __uint64_t blocks60; -- __uint64_t blocks90; -- __uint64_t nfiles; -- __uint32_t id; -+ uint64_t blocks; -+ uint64_t blocks30; -+ uint64_t blocks60; -+ uint64_t blocks90; -+ uint64_t nfiles; -+ uint32_t id; - } du_t; - - #define TSIZE 500 --static __uint64_t sizes[TSIZE]; --static __uint64_t overflow; -+static uint64_t sizes[TSIZE]; -+static uint64_t overflow; - - #define NDU 60000 - #define DUHASH 8209 -@@ -84,8 +84,8 @@ quot_bulkstat_add( - { - du_t *dp; - du_t **hp; -- __uint64_t size; -- __uint32_t i, id; -+ uint64_t size; -+ uint32_t i, id; - - if ((p->bs_mode & S_IFMT) == 0) - return; -@@ -203,7 +203,7 @@ qcompare( - return 0; - } - --typedef char *(*idtoname_t)(__uint32_t); -+typedef char *(*idtoname_t)(uint32_t); - - static void - quot_report_mount_any_type( -@@ -291,7 +291,7 @@ quot_histogram_mount( - fs_path_t *mount, - uint flags) - { -- __uint64_t t = 0; -+ uint64_t t = 0; - int i; - - fprintf(fp, _("%s (%s):\n"), mount->fs_name, mount->fs_dir); -diff --git a/quota/quota.c b/quota/quota.c -index d09e239b..479b970e 100644 ---- a/quota/quota.c -+++ b/quota/quota.c -@@ -52,7 +52,7 @@ quota_help(void) - static int - quota_mount( - FILE *fp, -- __uint32_t id, -+ uint32_t id, - char *name, - uint form, - uint type, -@@ -181,7 +181,7 @@ quota_mount( - static void - quota( - FILE *fp, -- __uint32_t id, -+ uint32_t id, - char *name, - uint form, - uint type, -diff --git a/quota/quota.h b/quota/quota.h -index 4bde3513..9ed28bee 100644 ---- a/quota/quota.h -+++ b/quota/quota.h -@@ -53,9 +53,9 @@ enum { - extern char *type_to_string(uint __type); - extern char *form_to_string(uint __form); - extern char *time_to_string(time_t __time, uint __flags); --extern char *bbs_to_string(__uint64_t __v, char *__c, uint __size); --extern char *num_to_string(__uint64_t __v, char *__c, uint __size); --extern char *pct_to_string(__uint64_t __v, __uint64_t __t, char *__c, uint __s); -+extern char *bbs_to_string(uint64_t __v, char *__c, uint __size); -+extern char *num_to_string(uint64_t __v, char *__c, uint __size); -+extern char *pct_to_string(uint64_t __v, uint64_t __t, char *__c, uint __s); - - extern FILE *fopen_write_secure(char *__filename); - -@@ -81,7 +81,7 @@ enum { - * Identifier (uid/gid/prid) cache routines - */ - #define NMAX 32 --extern char *uid_to_name(__uint32_t __uid); --extern char *gid_to_name(__uint32_t __gid); --extern char *prid_to_name(__uint32_t __prid); -+extern char *uid_to_name(uint32_t __uid); -+extern char *gid_to_name(uint32_t __gid); -+extern char *prid_to_name(uint32_t __prid); - extern bool isdigits_only(const char *); -diff --git a/quota/report.c b/quota/report.c -index d0509c25..b2ea3bbe 100644 ---- a/quota/report.c -+++ b/quota/report.c -@@ -333,9 +333,9 @@ report_header( - static int - report_mount( - FILE *fp, -- __uint32_t id, -+ uint32_t id, - char *name, -- __uint32_t *oid, -+ uint32_t *oid, - uint form, - uint type, - fs_path_t *mount, -diff --git a/quota/state.c b/quota/state.c -index 09dfa705..b08bf50b 100644 ---- a/quota/state.c -+++ b/quota/state.c -@@ -135,7 +135,7 @@ static void - state_timelimit( - FILE *fp, - uint form, -- __uint32_t timelimit) -+ uint32_t timelimit) - { - fprintf(fp, _("%s grace time: %s\n"), - form_to_string(form), -diff --git a/quota/util.c b/quota/util.c -index cafd45f5..37840a86 100644 ---- a/quota/util.c -+++ b/quota/util.c -@@ -94,8 +94,8 @@ round_snprintf( - size_t size, - const char *fmt_round, - const char *fmt_not_round, -- __uint64_t value, -- __uint64_t divisor) -+ uint64_t value, -+ uint64_t divisor) - { - double v = (double)value / divisor; - -@@ -107,23 +107,23 @@ round_snprintf( - } - - /* Basic blocks (512) bytes are returned from quotactl */ --#define BBS_TO_EXABYTES(bbs) ((__uint64_t)(bbs)>>51) --#define BBS_TO_PETABYTES(bbs) ((__uint64_t)(bbs)>>41) --#define BBS_TO_TERABYTES(bbs) ((__uint64_t)(bbs)>>31) --#define BBS_TO_GIGABYTES(bbs) ((__uint64_t)(bbs)>>21) --#define BBS_TO_MEGABYTES(bbs) ((__uint64_t)(bbs)>>11) --#define BBS_TO_KILOBYTES(bbs) ((__uint64_t)(bbs)>>1) -- --#define BBEXABYTE ((__uint64_t)1<<51) --#define BBPETABYTE ((__uint64_t)1<<41) --#define BBTERABYTE ((__uint64_t)1<<31) --#define BBGIGABYTE ((__uint64_t)1<<21) --#define BBMEGABYTE ((__uint64_t)1<<11) --#define BBKILOBYTE ((__uint64_t)1<< 1) -+#define BBS_TO_EXABYTES(bbs) ((uint64_t)(bbs)>>51) -+#define BBS_TO_PETABYTES(bbs) ((uint64_t)(bbs)>>41) -+#define BBS_TO_TERABYTES(bbs) ((uint64_t)(bbs)>>31) -+#define BBS_TO_GIGABYTES(bbs) ((uint64_t)(bbs)>>21) -+#define BBS_TO_MEGABYTES(bbs) ((uint64_t)(bbs)>>11) -+#define BBS_TO_KILOBYTES(bbs) ((uint64_t)(bbs)>>1) -+ -+#define BBEXABYTE ((uint64_t)1<<51) -+#define BBPETABYTE ((uint64_t)1<<41) -+#define BBTERABYTE ((uint64_t)1<<31) -+#define BBGIGABYTE ((uint64_t)1<<21) -+#define BBMEGABYTE ((uint64_t)1<<11) -+#define BBKILOBYTE ((uint64_t)1<< 1) - - char * - bbs_to_string( -- __uint64_t v, -+ uint64_t v, - char *sp, - uint size) - { -@@ -146,17 +146,17 @@ bbs_to_string( - return sp; - } - --#define THOUSAND ((__uint64_t)1000) --#define MILLION ((__uint64_t)1000*1000) --#define BILLION ((__uint64_t)1000*1000*1000) --#define TRILLION ((__uint64_t)1000*1000*1000*1000) --#define GAZILLION ((__uint64_t)1000*1000*1000*1000*1000) --#define RIDICULOUS ((__uint64_t)1000*1000*1000*1000*1000*1000) --#define STOPALREADY ((__uint64_t)1000*1000*1000*1000*1000*1000*1000) -+#define THOUSAND ((uint64_t)1000) -+#define MILLION ((uint64_t)1000*1000) -+#define BILLION ((uint64_t)1000*1000*1000) -+#define TRILLION ((uint64_t)1000*1000*1000*1000) -+#define GAZILLION ((uint64_t)1000*1000*1000*1000*1000) -+#define RIDICULOUS ((uint64_t)1000*1000*1000*1000*1000*1000) -+#define STOPALREADY ((uint64_t)1000*1000*1000*1000*1000*1000*1000) - - char * - num_to_string( -- __uint64_t v, -+ uint64_t v, - char *sp, - uint size) - { -@@ -183,8 +183,8 @@ num_to_string( - - char * - pct_to_string( -- __uint64_t portion, -- __uint64_t whole, -+ uint64_t portion, -+ uint64_t whole, - char *buf, - uint size) - { -@@ -237,7 +237,7 @@ type_to_string( - #define IDMASK (NID-1) - - typedef struct { -- __uint32_t id; -+ uint32_t id; - char name[NMAX+1]; - } idcache_t; - -@@ -250,7 +250,7 @@ static int pentriesleft = NID; - - static idcache_t * - getnextpwent( -- __uint32_t id, -+ uint32_t id, - int byid) - { - struct passwd *pw; -@@ -266,7 +266,7 @@ getnextpwent( - - static idcache_t * - getnextgrent( -- __uint32_t id, -+ uint32_t id, - int byid) - { - struct group *gr; -@@ -281,7 +281,7 @@ getnextgrent( - - static idcache_t * - getnextprent( -- __uint32_t id, -+ uint32_t id, - int byid) - { - fs_project_t *pr; -@@ -296,7 +296,7 @@ getnextprent( - - char * - uid_to_name( -- __uint32_t id) -+ uint32_t id) - { - idcache_t *ncp, *idp; - -@@ -333,7 +333,7 @@ uid_to_name( - - char * - gid_to_name( -- __uint32_t id) -+ uint32_t id) - { - idcache_t *ncp, *idp; - -@@ -370,7 +370,7 @@ gid_to_name( - - char * - prid_to_name( -- __uint32_t id) -+ uint32_t id) - { - idcache_t *ncp, *idp; - -diff --git a/repair/README b/repair/README -index 7f168e69..4692463d 100644 ---- a/repair/README -+++ b/repair/README -@@ -189,7 +189,7 @@ D - 0) look at usage of XFS_MAKE_IPTR(). It does the right - - - D - 0) look at references to XFS_INODES_PER_CHUNK. change the -- ones that really mean sizeof(__uint64_t)*NBBY to -+ ones that really mean sizeof(uint64_t)*NBBY to - something else (like that only defined as a constant - INOS_PER_IREC. this isn't as important since - XFS_INODES_PER_CHUNK will never chang -diff --git a/repair/agheader.h b/repair/agheader.h -index 6b2974ca..2f7246d2 100644 ---- a/repair/agheader.h -+++ b/repair/agheader.h -@@ -20,7 +20,7 @@ typedef struct fs_geometry { - /* - * these types should match the superblock types - */ -- __uint32_t sb_blocksize; /* blocksize (bytes) */ -+ uint32_t sb_blocksize; /* blocksize (bytes) */ - xfs_rfsblock_t sb_dblocks; /* # data blocks */ - xfs_rfsblock_t sb_rblocks; /* # realtime blocks */ - xfs_rtblock_t sb_rextents; /* # realtime extents */ -@@ -30,9 +30,9 @@ typedef struct fs_geometry { - xfs_agnumber_t sb_agcount; /* # of ags */ - xfs_extlen_t sb_rbmblocks; /* # of rt bitmap blocks */ - xfs_extlen_t sb_logblocks; /* # of log blocks */ -- __uint16_t sb_sectsize; /* volume sector size (bytes) */ -- __uint16_t sb_inodesize; /* inode size (bytes) */ -- __uint8_t sb_imax_pct; /* max % of fs for inode space */ -+ uint16_t sb_sectsize; /* volume sector size (bytes) */ -+ uint16_t sb_inodesize; /* inode size (bytes) */ -+ uint8_t sb_imax_pct; /* max % of fs for inode space */ - - /* - * these don't have to match the superblock types but are placed -@@ -49,10 +49,10 @@ typedef struct fs_geometry { - /* - * fields after this point have to be checked manually in compare_sb() - */ -- __uint8_t sb_shared_vn; /* shared version number */ -+ uint8_t sb_shared_vn; /* shared version number */ - xfs_extlen_t sb_inoalignmt; /* inode chunk alignment, fsblocks */ -- __uint32_t sb_unit; /* stripe or raid unit */ -- __uint32_t sb_width; /* stripe or width unit */ -+ uint32_t sb_unit; /* stripe or raid unit */ -+ uint32_t sb_width; /* stripe or width unit */ - - /* - * these don't have to match, they track superblock properties -diff --git a/repair/attr_repair.h b/repair/attr_repair.h -index 7010e4ff..294fad44 100644 ---- a/repair/attr_repair.h -+++ b/repair/attr_repair.h -@@ -32,10 +32,10 @@ - #define ACL_WRITE 02 - #define ACL_EXECUTE 01 - --typedef __uint16_t xfs_acl_perm_t; --typedef __int32_t xfs_acl_type_t; --typedef __int32_t xfs_acl_tag_t; --typedef __int32_t xfs_acl_id_t; -+typedef uint16_t xfs_acl_perm_t; -+typedef int32_t xfs_acl_type_t; -+typedef int32_t xfs_acl_tag_t; -+typedef int32_t xfs_acl_id_t; - - /* - * "icacl" = in-core ACL. There is no equivalent in the XFS kernel code, -@@ -50,7 +50,7 @@ struct xfs_icacl_entry { - }; - - struct xfs_icacl { -- __int32_t acl_cnt; -+ int32_t acl_cnt; - struct xfs_icacl_entry acl_entry[0]; - }; - -@@ -59,14 +59,14 @@ struct xfs_icacl { - */ - #define XFS_MAC_MAX_SETS 250 - typedef struct xfs_mac_label { -- __uint8_t ml_msen_type; /* MSEN label type */ -- __uint8_t ml_mint_type; /* MINT label type */ -- __uint8_t ml_level; /* Hierarchical level */ -- __uint8_t ml_grade; /* Hierarchical grade */ -- __uint16_t ml_catcount; /* Category count */ -- __uint16_t ml_divcount; /* Division count */ -+ uint8_t ml_msen_type; /* MSEN label type */ -+ uint8_t ml_mint_type; /* MINT label type */ -+ uint8_t ml_level; /* Hierarchical level */ -+ uint8_t ml_grade; /* Hierarchical grade */ -+ uint16_t ml_catcount; /* Category count */ -+ uint16_t ml_divcount; /* Division count */ - /* Category set, then Division set */ -- __uint16_t ml_list[XFS_MAC_MAX_SETS]; -+ uint16_t ml_list[XFS_MAC_MAX_SETS]; - } xfs_mac_label_t; - - /* MSEN label type names. Choose an upper case ASCII character. */ -@@ -93,7 +93,7 @@ typedef struct xfs_mac_label { - /* - * Capabilities (IRIX) - */ --typedef __uint64_t xfs_cap_value_t; -+typedef uint64_t xfs_cap_value_t; - - typedef struct xfs_cap_set { - xfs_cap_value_t cap_effective; /* use in capability checks */ -diff --git a/repair/avl64.c b/repair/avl64.c -index 51cd624c..8f4a1211 100644 ---- a/repair/avl64.c -+++ b/repair/avl64.c -@@ -70,8 +70,8 @@ avl64_checktree( - avl64node_t *root) - { - avl64node_t *nlast, *nnext, *np; -- __uint64_t offset = 0; -- __uint64_t end; -+ uint64_t offset = 0; -+ uint64_t end; - - nlast = nnext = root; - -@@ -583,8 +583,8 @@ attach: - avl64node_t * - avl64_findanyrange( - avl64tree_desc_t *tree, -- __uint64_t start, -- __uint64_t end, -+ uint64_t start, -+ uint64_t end, - int checklen) - { - avl64node_t *np = tree->avl_root; -@@ -655,7 +655,7 @@ avl64_findanyrange( - avl64node_t * - avl64_findrange( - avl64tree_desc_t *tree, -- __uint64_t value) -+ uint64_t value) - { - avl64node_t *np = tree->avl_root; - -@@ -682,10 +682,10 @@ avl64_findrange( - avl64node_t * - avl64_find( - avl64tree_desc_t *tree, -- __uint64_t value) -+ uint64_t value) - { - avl64node_t *np = tree->avl_root; -- __uint64_t nvalue; -+ uint64_t nvalue; - - while (np) { - nvalue = AVL_START(tree, np); -@@ -909,8 +909,8 @@ static - avl64node_t * - avl64_insert_find_growth( - avl64tree_desc_t *tree, -- __uint64_t start, /* range start at start, */ -- __uint64_t end, /* exclusive */ -+ uint64_t start, /* range start at start, */ -+ uint64_t end, /* exclusive */ - int *growthp) /* OUT */ - { - avl64node_t *root = tree->avl_root; -@@ -963,7 +963,7 @@ avl64_insert_grow( - int growth) - { - avl64node_t *nnext; -- __uint64_t start = AVL_START(tree, newnode); -+ uint64_t start = AVL_START(tree, newnode); - - if (growth == AVL_BACK) { - -@@ -1005,8 +1005,8 @@ avl64_insert( - avl64node_t *newnode) - { - avl64node_t *np; -- __uint64_t start = AVL_START(tree, newnode); -- __uint64_t end = AVL_END(tree, newnode); -+ uint64_t start = AVL_START(tree, newnode); -+ uint64_t end = AVL_END(tree, newnode); - int growth; - - ASSERT(newnode); -@@ -1159,16 +1159,16 @@ avl64ops_t avl_debug_ops = { - avl_debug_end, - } - --static __uint64_t -+static uint64_t - avl64_debug_start(avl64node_t *node) - { -- return (__uint64_t)(struct avl_debug_node *)node->avl_start; -+ return (uint64_t)(struct avl_debug_node *)node->avl_start; - } - --static __uint64_t -+static uint64_t - avl64_debug_end(avl64node_t *node) - { -- return (__uint64_t) -+ return (uint64_t) - ((struct avl_debug_node *)node->avl_start + - (struct avl_debug_node *)node->avl_size); - } -@@ -1304,7 +1304,7 @@ main() - avl64node_t * - avl64_findadjacent( - avl64tree_desc_t *tree, -- __uint64_t value, -+ uint64_t value, - int dir) - { - avl64node_t *np = tree->avl_root; -@@ -1378,8 +1378,8 @@ avl64_findadjacent( - void - avl64_findranges( - avl64tree_desc_t *tree, -- __uint64_t start, -- __uint64_t end, -+ uint64_t start, -+ uint64_t end, - avl64node_t **startp, - avl64node_t **endp) - { -diff --git a/repair/avl64.h b/repair/avl64.h -index fd193218..cd079a00 100644 ---- a/repair/avl64.h -+++ b/repair/avl64.h -@@ -32,8 +32,8 @@ typedef struct avl64node { - * avl-tree operations - */ - typedef struct avl64ops { -- __uint64_t (*avl_start)(avl64node_t *); -- __uint64_t (*avl_end)(avl64node_t *); -+ uint64_t (*avl_start)(avl64node_t *); -+ uint64_t (*avl_end)(avl64node_t *); - } avl64ops_t; - - /* -@@ -89,32 +89,32 @@ avl64_init_tree( - avl64node_t * - avl64_findrange( - avl64tree_desc_t *tree, -- __uint64_t value); -+ uint64_t value); - - avl64node_t * - avl64_find( - avl64tree_desc_t *tree, -- __uint64_t value); -+ uint64_t value); - - avl64node_t * - avl64_findanyrange( - avl64tree_desc_t *tree, -- __uint64_t start, -- __uint64_t end, -+ uint64_t start, -+ uint64_t end, - int checklen); - - - avl64node_t * - avl64_findadjacent( - avl64tree_desc_t *tree, -- __uint64_t value, -+ uint64_t value, - int dir); - - void - avl64_findranges( - avl64tree_desc_t *tree, -- __uint64_t start, -- __uint64_t end, -+ uint64_t start, -+ uint64_t end, - avl64node_t **startp, - avl64node_t **endp); - -diff --git a/repair/dinode.c b/repair/dinode.c -index d664f87a..da872178 100644 ---- a/repair/dinode.c -+++ b/repair/dinode.c -@@ -746,7 +746,7 @@ _("%s fork in ino %" PRIu64 " claims dup extent, " - case XR_E_FREE1: - do_warn( - _("%s fork in ino %" PRIu64 " claims free block %" PRIu64 "\n"), -- forkname, ino, (__uint64_t) b); -+ forkname, ino, (uint64_t) b); - /* fall through ... */ - case XR_E_INUSE1: /* seen by rmap */ - case XR_E_UNKNOWN: -@@ -923,7 +923,7 @@ process_btinode( - int type, - int *dirty, - xfs_rfsblock_t *tot, -- __uint64_t *nex, -+ uint64_t *nex, - blkmap_t **blkmapp, - int whichfork, - int check_dups) -@@ -939,7 +939,7 @@ process_btinode( - int level; - int numrecs; - bmap_cursor_t cursor; -- __uint64_t magic; -+ uint64_t magic; - - dib = (xfs_bmdr_block_t *)XFS_DFORK_PTR(dip, whichfork); - lino = XFS_AGINO_TO_INO(mp, agno, ino); -@@ -1098,7 +1098,7 @@ process_exinode( - int type, - int *dirty, - xfs_rfsblock_t *tot, -- __uint64_t *nex, -+ uint64_t *nex, - blkmap_t **blkmapp, - int whichfork, - int check_dups) -@@ -1200,14 +1200,14 @@ process_symlink_extlist(xfs_mount_t *mp, xfs_ino_t lino, xfs_dinode_t *dino) - do_warn( - _("mismatch between format (%d) and size (%" PRId64 ") in symlink ino %" PRIu64 "\n"), - dino->di_format, -- (__int64_t)be64_to_cpu(dino->di_size), lino); -+ (int64_t)be64_to_cpu(dino->di_size), lino); - return 1; - } - if (dino->di_format == XFS_DINODE_FMT_LOCAL) { - do_warn( - _("mismatch between format (%d) and size (%" PRId64 ") in symlink inode %" PRIu64 "\n"), - dino->di_format, -- (__int64_t)be64_to_cpu(dino->di_size), lino); -+ (int64_t)be64_to_cpu(dino->di_size), lino); - return 1; - } - -@@ -1454,22 +1454,22 @@ _("inode %" PRIu64 " has bad inode type (IFMNT)\n"), lino); - case XR_INO_CHRDEV: - do_warn( - _("size of character device inode %" PRIu64 " != 0 (%" PRId64 " bytes)\n"), lino, -- (__int64_t)be64_to_cpu(dino->di_size)); -+ (int64_t)be64_to_cpu(dino->di_size)); - break; - case XR_INO_BLKDEV: - do_warn( - _("size of block device inode %" PRIu64 " != 0 (%" PRId64 " bytes)\n"), lino, -- (__int64_t)be64_to_cpu(dino->di_size)); -+ (int64_t)be64_to_cpu(dino->di_size)); - break; - case XR_INO_SOCK: - do_warn( - _("size of socket inode %" PRIu64 " != 0 (%" PRId64 " bytes)\n"), lino, -- (__int64_t)be64_to_cpu(dino->di_size)); -+ (int64_t)be64_to_cpu(dino->di_size)); - break; - case XR_INO_FIFO: - do_warn( - _("size of fifo inode %" PRIu64 " != 0 (%" PRId64 " bytes)\n"), lino, -- (__int64_t)be64_to_cpu(dino->di_size)); -+ (int64_t)be64_to_cpu(dino->di_size)); - break; - default: - do_warn(_("Internal error - process_misc_ino_types, " -@@ -1743,12 +1743,12 @@ _("found inode %" PRIu64 " claiming to be a real-time file\n"), lino); - break; - - case XR_INO_RTBITMAP: -- if (size != (__int64_t)mp->m_sb.sb_rbmblocks * -+ if (size != (int64_t)mp->m_sb.sb_rbmblocks * - mp->m_sb.sb_blocksize) { - do_warn( - _("realtime bitmap inode %" PRIu64 " has bad size %" PRId64 " (should be %" PRIu64 ")\n"), - lino, size, -- (__int64_t) mp->m_sb.sb_rbmblocks * -+ (int64_t) mp->m_sb.sb_rbmblocks * - mp->m_sb.sb_blocksize); - return 1; - } -@@ -1817,8 +1817,8 @@ static int - process_inode_blocks_and_extents( - xfs_dinode_t *dino, - xfs_rfsblock_t nblocks, -- __uint64_t nextents, -- __uint64_t anextents, -+ uint64_t nextents, -+ uint64_t anextents, - xfs_ino_t lino, - int *dirty) - { -@@ -1908,7 +1908,7 @@ process_inode_data_fork( - int type, - int *dirty, - xfs_rfsblock_t *totblocks, -- __uint64_t *nextents, -+ uint64_t *nextents, - blkmap_t **dblkmap, - int check_dups) - { -@@ -2017,7 +2017,7 @@ process_inode_attr_fork( - int type, - int *dirty, - xfs_rfsblock_t *atotblocks, -- __uint64_t *anextents, -+ uint64_t *anextents, - int check_dups, - int extra_attr_check, - int *retval) -@@ -2228,8 +2228,8 @@ process_dinode_int(xfs_mount_t *mp, - int di_mode; - int type; - int retval = 0; -- __uint64_t nextents; -- __uint64_t anextents; -+ uint64_t nextents; -+ uint64_t anextents; - xfs_ino_t lino; - const int is_free = 0; - const int is_used = 1; -@@ -2346,7 +2346,7 @@ _("inode identifier %llu mismatch on inode %" PRIu64 "\n"), - if (!uncertain) - do_warn( - _("bad (negative) size %" PRId64 " on inode %" PRIu64 "\n"), -- (__int64_t)be64_to_cpu(dino->di_size), -+ (int64_t)be64_to_cpu(dino->di_size), - lino); - if (verify_mode) - return 1; -diff --git a/repair/dinode.h b/repair/dinode.h -index 61d07363..39d6a72f 100644 ---- a/repair/dinode.h -+++ b/repair/dinode.h -@@ -46,8 +46,8 @@ process_bmbt_reclist(xfs_mount_t *mp, - xfs_ino_t ino, - xfs_rfsblock_t *tot, - struct blkmap **blkmapp, -- __uint64_t *first_key, -- __uint64_t *last_key, -+ uint64_t *first_key, -+ uint64_t *last_key, - int whichfork); - - int -diff --git a/repair/dir2.c b/repair/dir2.c -index e6415e49..73dff902 100644 ---- a/repair/dir2.c -+++ b/repair/dir2.c -@@ -160,7 +160,7 @@ process_sf_dir2( - int bad_sfnamelen; - int i; - int i8; -- __int64_t ino_dir_size; -+ int64_t ino_dir_size; - int ino_off; - ino_tree_node_t *irec_p; - int junkit; -diff --git a/repair/globals.h b/repair/globals.h -index 4085ccc4..c7bbe6f1 100644 ---- a/repair/globals.h -+++ b/repair/globals.h -@@ -141,7 +141,7 @@ EXTERN int inodes_per_cluster; - EXTERN unsigned int glob_agcount; - EXTERN int chunks_pblock; /* # of 64-ino chunks per allocation */ - EXTERN int max_symlink_blocks; --EXTERN __int64_t fs_max_file_offset; -+EXTERN int64_t fs_max_file_offset; - - /* realtime info */ - -@@ -161,24 +161,24 @@ EXTERN int full_ino_ex_data;/* - - /* superblock counters */ - --EXTERN __uint64_t sb_icount; /* allocated (made) inodes */ --EXTERN __uint64_t sb_ifree; /* free inodes */ --EXTERN __uint64_t sb_fdblocks; /* free data blocks */ --EXTERN __uint64_t sb_frextents; /* free realtime extents */ -+EXTERN uint64_t sb_icount; /* allocated (made) inodes */ -+EXTERN uint64_t sb_ifree; /* free inodes */ -+EXTERN uint64_t sb_fdblocks; /* free data blocks */ -+EXTERN uint64_t sb_frextents; /* free realtime extents */ - - /* superblock geometry info */ - - EXTERN xfs_extlen_t sb_inoalignmt; --EXTERN __uint32_t sb_unit; --EXTERN __uint32_t sb_width; -+EXTERN uint32_t sb_unit; -+EXTERN uint32_t sb_width; - - struct aglock { - pthread_mutex_t lock __attribute__((__aligned__(64))); - }; - EXTERN struct aglock *ag_locks; - --EXTERN int report_interval; --EXTERN __uint64_t *prog_rpt_done; -+EXTERN int report_interval; -+EXTERN uint64_t *prog_rpt_done; - - EXTERN int ag_stride; - EXTERN int thread_count; -diff --git a/repair/incore.c b/repair/incore.c -index cb573165..a9191ae2 100644 ---- a/repair/incore.c -+++ b/repair/incore.c -@@ -179,7 +179,7 @@ get_bmap_ext( - static uint64_t *rt_bmap; - static size_t rt_bmap_size; - --/* block records fit into __uint64_t's units */ -+/* block records fit into uint64_t's units */ - #define XR_BB_UNIT 64 /* number of bits/unit */ - #define XR_BB 4 /* bits per block record */ - #define XR_BB_NUM (XR_BB_UNIT/XR_BB) /* number of records per unit */ -@@ -203,8 +203,8 @@ set_rtbmap( - { - *(rt_bmap + bno / XR_BB_NUM) = - ((*(rt_bmap + bno / XR_BB_NUM) & -- (~((__uint64_t) XR_BB_MASK << ((bno % XR_BB_NUM) * XR_BB)))) | -- (((__uint64_t) state) << ((bno % XR_BB_NUM) * XR_BB))); -+ (~((uint64_t) XR_BB_MASK << ((bno % XR_BB_NUM) * XR_BB)))) | -+ (((uint64_t) state) << ((bno % XR_BB_NUM) * XR_BB))); - } - - static void -@@ -222,9 +222,9 @@ init_rt_bmap( - return; - - rt_bmap_size = roundup(mp->m_sb.sb_rextents / (NBBY / XR_BB), -- sizeof(__uint64_t)); -+ sizeof(uint64_t)); - -- rt_bmap = memalign(sizeof(__uint64_t), rt_bmap_size); -+ rt_bmap = memalign(sizeof(uint64_t), rt_bmap_size); - if (!rt_bmap) { - do_error( - _("couldn't allocate realtime block map, size = %" PRIu64 "\n"), -diff --git a/repair/incore.h b/repair/incore.h -index c23a3a3c..fd66084f 100644 ---- a/repair/incore.h -+++ b/repair/incore.h -@@ -257,7 +257,7 @@ typedef xfs_ino_t parent_entry_t; - struct nlink_ops; - - typedef struct parent_list { -- __uint64_t pmask; -+ uint64_t pmask; - parent_entry_t *pentries; - #ifdef DEBUG - short cnt; -@@ -265,14 +265,14 @@ typedef struct parent_list { - } parent_list_t; - - union ino_nlink { -- __uint8_t *un8; -- __uint16_t *un16; -- __uint32_t *un32; -+ uint8_t *un8; -+ uint16_t *un16; -+ uint32_t *un32; - }; - - typedef struct ino_ex_data { -- __uint64_t ino_reached; /* bit == 1 if reached */ -- __uint64_t ino_processed; /* reference checked bit mask */ -+ uint64_t ino_reached; /* bit == 1 if reached */ -+ uint64_t ino_processed; /* reference checked bit mask */ - parent_list_t *parents; - union ino_nlink counted_nlinks;/* counted nlinks in P6 */ - } ino_ex_data_t; -@@ -281,22 +281,22 @@ typedef struct ino_tree_node { - avlnode_t avl_node; - xfs_agino_t ino_startnum; /* starting inode # */ - xfs_inofree_t ir_free; /* inode free bit mask */ -- __uint64_t ir_sparse; /* sparse inode bitmask */ -- __uint64_t ino_confirmed; /* confirmed bitmask */ -- __uint64_t ino_isa_dir; /* bit == 1 if a directory */ -- __uint64_t ino_was_rl; /* bit == 1 if reflink flag set */ -- __uint64_t ino_is_rl; /* bit == 1 if reflink flag should be set */ -- __uint8_t nlink_size; -+ uint64_t ir_sparse; /* sparse inode bitmask */ -+ uint64_t ino_confirmed; /* confirmed bitmask */ -+ uint64_t ino_isa_dir; /* bit == 1 if a directory */ -+ uint64_t ino_was_rl; /* bit == 1 if reflink flag set */ -+ uint64_t ino_is_rl; /* bit == 1 if reflink flag should be set */ -+ uint8_t nlink_size; - union ino_nlink disk_nlinks; /* on-disk nlinks, set in P3 */ - union { - ino_ex_data_t *ex_data; /* phases 6,7 */ - parent_list_t *plist; /* phases 2-5 */ - } ino_un; -- __uint8_t *ftypes; /* phases 3,6 */ -+ uint8_t *ftypes; /* phases 3,6 */ - } ino_tree_node_t; - --#define INOS_PER_IREC (sizeof(__uint64_t) * NBBY) --#define IREC_MASK(i) ((__uint64_t)1 << (i)) -+#define INOS_PER_IREC (sizeof(uint64_t) * NBBY) -+#define IREC_MASK(i) ((uint64_t)1 << (i)) - - void add_ino_ex_data(xfs_mount_t *mp); - -@@ -543,10 +543,10 @@ static inline int inode_is_rl(struct ino_tree_node *irec, int offset) - */ - void add_inode_ref(struct ino_tree_node *irec, int offset); - void drop_inode_ref(struct ino_tree_node *irec, int offset); --__uint32_t num_inode_references(struct ino_tree_node *irec, int offset); -+uint32_t num_inode_references(struct ino_tree_node *irec, int offset); - --void set_inode_disk_nlinks(struct ino_tree_node *irec, int offset, __uint32_t nlinks); --__uint32_t get_inode_disk_nlinks(struct ino_tree_node *irec, int offset); -+void set_inode_disk_nlinks(struct ino_tree_node *irec, int offset, uint32_t nlinks); -+uint32_t get_inode_disk_nlinks(struct ino_tree_node *irec, int offset); - - static inline int is_inode_reached(struct ino_tree_node *irec, int offset) - { -@@ -567,13 +567,13 @@ static inline void add_inode_reached(struct ino_tree_node *irec, int offset) - static inline void - set_inode_ftype(struct ino_tree_node *irec, - int ino_offset, -- __uint8_t ftype) -+ uint8_t ftype) - { - if (irec->ftypes) - irec->ftypes[ino_offset] = ftype; - } - --static inline __uint8_t -+static inline uint8_t - get_inode_ftype( - struct ino_tree_node *irec, - int ino_offset) -@@ -606,11 +606,11 @@ typedef struct bm_level_state { - xfs_fsblock_t fsbno; - xfs_fsblock_t left_fsbno; - xfs_fsblock_t right_fsbno; -- __uint64_t first_key; -- __uint64_t last_key; -+ uint64_t first_key; -+ uint64_t last_key; - /* - int level; -- __uint64_t prev_last_key; -+ uint64_t prev_last_key; - xfs_buf_t *bp; - xfs_bmbt_block_t *block; - */ -diff --git a/repair/incore_ext.c b/repair/incore_ext.c -index 7e6786c5..0a8138a9 100644 ---- a/repair/incore_ext.c -+++ b/repair/incore_ext.c -@@ -721,13 +721,13 @@ search_rt_dup_extent(xfs_mount_t *mp, xfs_rtblock_t bno) - return(ret); - } - --static __uint64_t -+static uint64_t - avl64_rt_ext_start(avl64node_t *node) - { - return(((rt_extent_tree_node_t *) node)->rt_startblock); - } - --static __uint64_t -+static uint64_t - avl64_ext_end(avl64node_t *node) - { - return(((rt_extent_tree_node_t *) node)->rt_startblock + -@@ -834,7 +834,7 @@ count_extents(xfs_agnumber_t agno, avltree_desc_t *tree, int whichtree) - int - count_bno_extents_blocks(xfs_agnumber_t agno, uint *numblocks) - { -- __uint64_t nblocks; -+ uint64_t nblocks; - extent_tree_node_t *node; - int i = 0; - -diff --git a/repair/incore_ino.c b/repair/incore_ino.c -index 2ec17657..3b6b44d4 100644 ---- a/repair/incore_ino.c -+++ b/repair/incore_ino.c -@@ -38,7 +38,7 @@ static avltree_desc_t **inode_uncertain_tree_ptrs; - /* memory optimised nlink counting for all inodes */ - - static void * --alloc_nlink_array(__uint8_t nlink_size) -+alloc_nlink_array(uint8_t nlink_size) - { - void *ptr; - -@@ -51,10 +51,10 @@ alloc_nlink_array(__uint8_t nlink_size) - static void - nlink_grow_8_to_16(ino_tree_node_t *irec) - { -- __uint16_t *new_nlinks; -+ uint16_t *new_nlinks; - int i; - -- irec->nlink_size = sizeof(__uint16_t); -+ irec->nlink_size = sizeof(uint16_t); - - new_nlinks = alloc_nlink_array(irec->nlink_size); - for (i = 0; i < XFS_INODES_PER_CHUNK; i++) -@@ -76,10 +76,10 @@ nlink_grow_8_to_16(ino_tree_node_t *irec) - static void - nlink_grow_16_to_32(ino_tree_node_t *irec) - { -- __uint32_t *new_nlinks; -+ uint32_t *new_nlinks; - int i; - -- irec->nlink_size = sizeof(__uint32_t); -+ irec->nlink_size = sizeof(uint32_t); - - new_nlinks = alloc_nlink_array(irec->nlink_size); - for (i = 0; i < XFS_INODES_PER_CHUNK; i++) -@@ -104,21 +104,21 @@ void add_inode_ref(struct ino_tree_node *irec, int ino_offset) - ASSERT(irec->ino_un.ex_data != NULL); - - switch (irec->nlink_size) { -- case sizeof(__uint8_t): -+ case sizeof(uint8_t): - if (irec->ino_un.ex_data->counted_nlinks.un8[ino_offset] < 0xff) { - irec->ino_un.ex_data->counted_nlinks.un8[ino_offset]++; - break; - } - nlink_grow_8_to_16(irec); - /*FALLTHRU*/ -- case sizeof(__uint16_t): -+ case sizeof(uint16_t): - if (irec->ino_un.ex_data->counted_nlinks.un16[ino_offset] < 0xffff) { - irec->ino_un.ex_data->counted_nlinks.un16[ino_offset]++; - break; - } - nlink_grow_16_to_32(irec); - /*FALLTHRU*/ -- case sizeof(__uint32_t): -+ case sizeof(uint32_t): - irec->ino_un.ex_data->counted_nlinks.un32[ino_offset]++; - break; - default: -@@ -128,20 +128,20 @@ void add_inode_ref(struct ino_tree_node *irec, int ino_offset) - - void drop_inode_ref(struct ino_tree_node *irec, int ino_offset) - { -- __uint32_t refs = 0; -+ uint32_t refs = 0; - - ASSERT(irec->ino_un.ex_data != NULL); - - switch (irec->nlink_size) { -- case sizeof(__uint8_t): -+ case sizeof(uint8_t): - ASSERT(irec->ino_un.ex_data->counted_nlinks.un8[ino_offset] > 0); - refs = --irec->ino_un.ex_data->counted_nlinks.un8[ino_offset]; - break; -- case sizeof(__uint16_t): -+ case sizeof(uint16_t): - ASSERT(irec->ino_un.ex_data->counted_nlinks.un16[ino_offset] > 0); - refs = --irec->ino_un.ex_data->counted_nlinks.un16[ino_offset]; - break; -- case sizeof(__uint32_t): -+ case sizeof(uint32_t): - ASSERT(irec->ino_un.ex_data->counted_nlinks.un32[ino_offset] > 0); - refs = --irec->ino_un.ex_data->counted_nlinks.un32[ino_offset]; - break; -@@ -153,16 +153,16 @@ void drop_inode_ref(struct ino_tree_node *irec, int ino_offset) - irec->ino_un.ex_data->ino_reached &= ~IREC_MASK(ino_offset); - } - --__uint32_t num_inode_references(struct ino_tree_node *irec, int ino_offset) -+uint32_t num_inode_references(struct ino_tree_node *irec, int ino_offset) - { - ASSERT(irec->ino_un.ex_data != NULL); - - switch (irec->nlink_size) { -- case sizeof(__uint8_t): -+ case sizeof(uint8_t): - return irec->ino_un.ex_data->counted_nlinks.un8[ino_offset]; -- case sizeof(__uint16_t): -+ case sizeof(uint16_t): - return irec->ino_un.ex_data->counted_nlinks.un16[ino_offset]; -- case sizeof(__uint32_t): -+ case sizeof(uint32_t): - return irec->ino_un.ex_data->counted_nlinks.un32[ino_offset]; - default: - ASSERT(0); -@@ -171,24 +171,24 @@ __uint32_t num_inode_references(struct ino_tree_node *irec, int ino_offset) - } - - void set_inode_disk_nlinks(struct ino_tree_node *irec, int ino_offset, -- __uint32_t nlinks) -+ uint32_t nlinks) - { - switch (irec->nlink_size) { -- case sizeof(__uint8_t): -+ case sizeof(uint8_t): - if (nlinks < 0xff) { - irec->disk_nlinks.un8[ino_offset] = nlinks; - break; - } - nlink_grow_8_to_16(irec); - /*FALLTHRU*/ -- case sizeof(__uint16_t): -+ case sizeof(uint16_t): - if (nlinks < 0xffff) { - irec->disk_nlinks.un16[ino_offset] = nlinks; - break; - } - nlink_grow_16_to_32(irec); - /*FALLTHRU*/ -- case sizeof(__uint32_t): -+ case sizeof(uint32_t): - irec->disk_nlinks.un32[ino_offset] = nlinks; - break; - default: -@@ -196,14 +196,14 @@ void set_inode_disk_nlinks(struct ino_tree_node *irec, int ino_offset, - } - } - --__uint32_t get_inode_disk_nlinks(struct ino_tree_node *irec, int ino_offset) -+uint32_t get_inode_disk_nlinks(struct ino_tree_node *irec, int ino_offset) - { - switch (irec->nlink_size) { -- case sizeof(__uint8_t): -+ case sizeof(uint8_t): - return irec->disk_nlinks.un8[ino_offset]; -- case sizeof(__uint16_t): -+ case sizeof(uint16_t): - return irec->disk_nlinks.un16[ino_offset]; -- case sizeof(__uint32_t): -+ case sizeof(uint32_t): - return irec->disk_nlinks.un32[ino_offset]; - default: - ASSERT(0); -@@ -211,11 +211,11 @@ __uint32_t get_inode_disk_nlinks(struct ino_tree_node *irec, int ino_offset) - return 0; - } - --static __uint8_t * -+static uint8_t * - alloc_ftypes_array( - struct xfs_mount *mp) - { -- __uint8_t *ptr; -+ uint8_t *ptr; - - if (!xfs_sb_version_hasftype(&mp->m_sb)) - return NULL; -@@ -262,23 +262,23 @@ alloc_ino_node( - irec->ir_free = (xfs_inofree_t) - 1; - irec->ir_sparse = 0; - irec->ino_un.ex_data = NULL; -- irec->nlink_size = sizeof(__uint8_t); -+ irec->nlink_size = sizeof(uint8_t); - irec->disk_nlinks.un8 = alloc_nlink_array(irec->nlink_size); - irec->ftypes = alloc_ftypes_array(mp); - return irec; - } - - static void --free_nlink_array(union ino_nlink nlinks, __uint8_t nlink_size) -+free_nlink_array(union ino_nlink nlinks, uint8_t nlink_size) - { - switch (nlink_size) { -- case sizeof(__uint8_t): -+ case sizeof(uint8_t): - free(nlinks.un8); - break; -- case sizeof(__uint16_t): -+ case sizeof(uint16_t): - free(nlinks.un16); - break; -- case sizeof(__uint32_t): -+ case sizeof(uint32_t): - free(nlinks.un32); - break; - default: -@@ -609,7 +609,7 @@ set_inode_parent( - int i; - int cnt; - int target; -- __uint64_t bitmask; -+ uint64_t bitmask; - parent_entry_t *tmp; - - if (full_ino_ex_data) -@@ -699,7 +699,7 @@ set_inode_parent( - xfs_ino_t - get_inode_parent(ino_tree_node_t *irec, int offset) - { -- __uint64_t bitmask; -+ uint64_t bitmask; - parent_list_t *ptbl; - int i; - int target; -@@ -740,15 +740,15 @@ alloc_ex_data(ino_tree_node_t *irec) - irec->ino_un.ex_data->parents = ptbl; - - switch (irec->nlink_size) { -- case sizeof(__uint8_t): -+ case sizeof(uint8_t): - irec->ino_un.ex_data->counted_nlinks.un8 = - alloc_nlink_array(irec->nlink_size); - break; -- case sizeof(__uint16_t): -+ case sizeof(uint16_t): - irec->ino_un.ex_data->counted_nlinks.un16 = - alloc_nlink_array(irec->nlink_size); - break; -- case sizeof(__uint32_t): -+ case sizeof(uint32_t): - irec->ino_un.ex_data->counted_nlinks.un32 = - alloc_nlink_array(irec->nlink_size); - break; -diff --git a/repair/phase2.c b/repair/phase2.c -index c21778b8..0085732b 100644 ---- a/repair/phase2.c -+++ b/repair/phase2.c -@@ -179,7 +179,7 @@ phase2( - - bad_ino_btree = 0; - -- set_progress_msg(PROG_FMT_SCAN_AG, (__uint64_t) glob_agcount); -+ set_progress_msg(PROG_FMT_SCAN_AG, (uint64_t) glob_agcount); - - scan_ags(mp, scan_threads); - -diff --git a/repair/phase3.c b/repair/phase3.c -index 0890a27d..17b1c28d 100644 ---- a/repair/phase3.c -+++ b/repair/phase3.c -@@ -122,7 +122,7 @@ phase3( - else - do_log(_(" - scan (but don't clear) agi unlinked lists...\n")); - -- set_progress_msg(PROG_FMT_AGI_UNLINKED, (__uint64_t) glob_agcount); -+ set_progress_msg(PROG_FMT_AGI_UNLINKED, (uint64_t) glob_agcount); - - /* first clear the agi unlinked AGI list */ - if (!no_modify) { -@@ -142,7 +142,7 @@ phase3( - do_log(_( - " - process known inodes and perform inode discovery...\n")); - -- set_progress_msg(PROG_FMT_PROCESS_INO, (__uint64_t) mp->m_sb.sb_icount); -+ set_progress_msg(PROG_FMT_PROCESS_INO, (uint64_t) mp->m_sb.sb_icount); - - process_ags(mp); - -@@ -152,7 +152,7 @@ phase3( - * process newly discovered inode chunks - */ - do_log(_(" - process newly discovered inodes...\n")); -- set_progress_msg(PROG_FMT_NEW_INODES, (__uint64_t) glob_agcount); -+ set_progress_msg(PROG_FMT_NEW_INODES, (uint64_t) glob_agcount); - - counts = calloc(sizeof(*counts), mp->m_sb.sb_agcount); - if (!counts) { -diff --git a/repair/phase4.c b/repair/phase4.c -index e59464b1..cc17ec03 100644 ---- a/repair/phase4.c -+++ b/repair/phase4.c -@@ -290,7 +290,7 @@ phase4(xfs_mount_t *mp) - do_log(_("Phase 4 - check for duplicate blocks...\n")); - do_log(_(" - setting up duplicate extent list...\n")); - -- set_progress_msg(PROG_FMT_DUP_EXTENT, (__uint64_t) glob_agcount); -+ set_progress_msg(PROG_FMT_DUP_EXTENT, (uint64_t) glob_agcount); - - irec = find_inode_rec(mp, XFS_INO_TO_AGNO(mp, mp->m_sb.sb_rootino), - XFS_INO_TO_AGINO(mp, mp->m_sb.sb_rootino)); -@@ -404,7 +404,7 @@ phase4(xfs_mount_t *mp) - reset_bmaps(mp); - - do_log(_(" - check for inodes claiming duplicate blocks...\n")); -- set_progress_msg(PROG_FMT_DUP_BLOCKS, (__uint64_t) mp->m_sb.sb_icount); -+ set_progress_msg(PROG_FMT_DUP_BLOCKS, (uint64_t) mp->m_sb.sb_icount); - - /* - * ok, now process the inodes -- signal 2-pass check per inode. -diff --git a/repair/phase5.c b/repair/phase5.c -index 0b833f13..21dce67a 100644 ---- a/repair/phase5.c -+++ b/repair/phase5.c -@@ -86,9 +86,9 @@ struct agi_stat { - xfs_agino_t freecount; - }; - --static __uint64_t *sb_icount_ag; /* allocated inodes per ag */ --static __uint64_t *sb_ifree_ag; /* free inodes per ag */ --static __uint64_t *sb_fdblocks_ag; /* free data blocks per ag */ -+static uint64_t *sb_icount_ag; /* allocated inodes per ag */ -+static uint64_t *sb_ifree_ag; /* free inodes per ag */ -+static uint64_t *sb_fdblocks_ag; /* free data blocks per ag */ - - static int - mk_incore_fstree(xfs_mount_t *mp, xfs_agnumber_t agno) -@@ -886,10 +886,10 @@ build_freespace_tree(xfs_mount_t *mp, xfs_agnumber_t agno, - */ - static void - init_ino_cursor(xfs_mount_t *mp, xfs_agnumber_t agno, bt_status_t *btree_curs, -- __uint64_t *num_inos, __uint64_t *num_free_inos, int finobt) -+ uint64_t *num_inos, uint64_t *num_free_inos, int finobt) - { -- __uint64_t ninos; -- __uint64_t nfinos; -+ uint64_t ninos; -+ uint64_t nfinos; - int rec_nfinos; - int rec_ninos; - ino_tree_node_t *ino_rec; -@@ -2193,10 +2193,10 @@ phase5_func( - xfs_agnumber_t agno, - struct xfs_slab *lost_fsb) - { -- __uint64_t num_inos; -- __uint64_t num_free_inos; -- __uint64_t finobt_num_inos; -- __uint64_t finobt_num_free_inos; -+ uint64_t num_inos; -+ uint64_t num_free_inos; -+ uint64_t finobt_num_inos; -+ uint64_t finobt_num_free_inos; - bt_status_t bno_btree_curs; - bt_status_t bcnt_btree_curs; - bt_status_t ino_btree_curs; -@@ -2471,7 +2471,7 @@ phase5(xfs_mount_t *mp) - int error; - - do_log(_("Phase 5 - rebuild AG headers and trees...\n")); -- set_progress_msg(PROG_FMT_REBUILD_AG, (__uint64_t )glob_agcount); -+ set_progress_msg(PROG_FMT_REBUILD_AG, (uint64_t)glob_agcount); - - #ifdef XR_BLD_FREE_TRACE - fprintf(stderr, "inobt level 1, maxrec = %d, minrec = %d\n", -@@ -2497,15 +2497,15 @@ phase5(xfs_mount_t *mp) - keep_fsinos(mp); - - /* allocate per ag counters */ -- sb_icount_ag = calloc(mp->m_sb.sb_agcount, sizeof(__uint64_t)); -+ sb_icount_ag = calloc(mp->m_sb.sb_agcount, sizeof(uint64_t)); - if (sb_icount_ag == NULL) - do_error(_("cannot alloc sb_icount_ag buffers\n")); - -- sb_ifree_ag = calloc(mp->m_sb.sb_agcount, sizeof(__uint64_t)); -+ sb_ifree_ag = calloc(mp->m_sb.sb_agcount, sizeof(uint64_t)); - if (sb_ifree_ag == NULL) - do_error(_("cannot alloc sb_ifree_ag buffers\n")); - -- sb_fdblocks_ag = calloc(mp->m_sb.sb_agcount, sizeof(__uint64_t)); -+ sb_fdblocks_ag = calloc(mp->m_sb.sb_agcount, sizeof(uint64_t)); - if (sb_fdblocks_ag == NULL) - do_error(_("cannot alloc sb_fdblocks_ag buffers\n")); - -diff --git a/repair/phase6.c b/repair/phase6.c -index 08636dcf..373b1a5b 100644 ---- a/repair/phase6.c -+++ b/repair/phase6.c -@@ -82,7 +82,7 @@ typedef struct dir_hash_ent { - struct dir_hash_ent *nextbyhash; /* next in name bucket */ - struct dir_hash_ent *nextbyorder; /* next in order added */ - xfs_dahash_t hashval; /* hash value of name */ -- __uint32_t address; /* offset of data entry */ -+ uint32_t address; /* offset of data entry */ - xfs_ino_t inum; /* inode num of entry */ - short junkit; /* name starts with / */ - short seen; /* have seen leaf entry */ -@@ -170,11 +170,11 @@ static int - dir_hash_add( - xfs_mount_t *mp, - dir_hash_tab_t *hashtab, -- __uint32_t addr, -+ uint32_t addr, - xfs_ino_t inum, - int namelen, - unsigned char *name, -- __uint8_t ftype) -+ uint8_t ftype) - { - xfs_dahash_t hash = 0; - int byaddr; -@@ -357,7 +357,7 @@ static void - dir_hash_update_ftype( - dir_hash_tab_t *hashtab, - xfs_dir2_dataptr_t addr, -- __uint8_t ftype) -+ uint8_t ftype) - { - int i; - dir_hash_ent_t *p; -@@ -1791,8 +1791,8 @@ longform_dir2_entry_check_data( - - /* validate ftype field if supported */ - if (xfs_sb_version_hasftype(&mp->m_sb)) { -- __uint8_t dir_ftype; -- __uint8_t ino_ftype; -+ uint8_t dir_ftype; -+ uint8_t ino_ftype; - - dir_ftype = M_DIROPS(mp)->data_get_ftype(dep); - ino_ftype = get_inode_ftype(irec, ino_offset); -@@ -2703,8 +2703,8 @@ _("entry \"%s\" (ino %" PRIu64 ") in dir %" PRIu64 " is a duplicate name"), - - /* validate ftype field if supported */ - if (xfs_sb_version_hasftype(&mp->m_sb)) { -- __uint8_t dir_ftype; -- __uint8_t ino_ftype; -+ uint8_t dir_ftype; -+ uint8_t ino_ftype; - - dir_ftype = M_DIROPS(mp)->sf_get_ftype(sfep); - ino_ftype = get_inode_ftype(irec, ino_offset); -diff --git a/repair/phase7.c b/repair/phase7.c -index 8bce117d..4ffb81a8 100644 ---- a/repair/phase7.c -+++ b/repair/phase7.c -@@ -32,7 +32,7 @@ static void - update_inode_nlinks( - xfs_mount_t *mp, - xfs_ino_t ino, -- __uint32_t nlinks) -+ uint32_t nlinks) - { - xfs_trans_t *tp; - xfs_inode_t *ip; -@@ -104,7 +104,7 @@ do_link_updates( - { - ino_tree_node_t *irec; - int j; -- __uint32_t nrefs; -+ uint32_t nrefs; - - for (irec = findfirst_inode_rec(agno); irec; - irec = next_ino_rec(irec)) { -@@ -143,7 +143,7 @@ phase7( - else - do_log(_("Phase 7 - verify link counts...\n")); - -- set_progress_msg(PROGRESS_FMT_CORR_LINK, (__uint64_t) glob_agcount); -+ set_progress_msg(PROGRESS_FMT_CORR_LINK, (uint64_t) glob_agcount); - - create_work_queue(&wq, mp, scan_threads); - -diff --git a/repair/progress.c b/repair/progress.c -index 2a09b239..99d2658c 100644 ---- a/repair/progress.c -+++ b/repair/progress.c -@@ -85,8 +85,8 @@ pthread_t report_thread; - typedef struct msg_block_s { - pthread_mutex_t mutex; - progress_rpt_t *format; -- __uint64_t *done; -- __uint64_t *total; -+ uint64_t *done; -+ uint64_t *total; - int count; - int interval; - } msg_block_t; -@@ -96,14 +96,14 @@ typedef struct phase_times_s { - time_t start; - time_t end; - time_t duration; -- __uint64_t item_counts[4]; -+ uint64_t item_counts[4]; - } phase_times_t; - static phase_times_t phase_times[8]; - - static void *progress_rpt_thread(void *); - static int current_phase; - static int running; --static __uint64_t prog_rpt_total; -+static uint64_t prog_rpt_total; - - void - init_progress_rpt (void) -@@ -113,11 +113,11 @@ init_progress_rpt (void) - * allocate the done vector - */ - -- if ((prog_rpt_done = (__uint64_t *) -- malloc(sizeof(__uint64_t)*glob_agcount)) == NULL ) { -+ if ((prog_rpt_done = (uint64_t *) -+ malloc(sizeof(uint64_t)*glob_agcount)) == NULL) { - do_error(_("cannot malloc pointer to done vector\n")); - } -- bzero(prog_rpt_done, sizeof(__uint64_t)*glob_agcount); -+ bzero(prog_rpt_done, sizeof(uint64_t)*glob_agcount); - - /* - * Setup comm block, start the thread -@@ -165,10 +165,10 @@ progress_rpt_thread (void *p) - timer_t timerid; - struct itimerspec timespec; - char *msgbuf; -- __uint64_t *donep; -- __uint64_t sum; -+ uint64_t *donep; -+ uint64_t sum; - msg_block_t *msgp = (msg_block_t *)p; -- __uint64_t percent; -+ uint64_t percent; - - /* It's possible to get here very early w/ no progress msg set */ - if (!msgp->format) -@@ -286,7 +286,7 @@ progress_rpt_thread (void *p) - } - - int --set_progress_msg (int report, __uint64_t total) -+set_progress_msg(int report, uint64_t total) - { - - if (!ag_stride) -@@ -300,7 +300,7 @@ set_progress_msg (int report, __uint64_t total) - - /* reset all the accumulative totals */ - if (prog_rpt_done) -- bzero(prog_rpt_done, sizeof(__uint64_t)*glob_agcount); -+ bzero(prog_rpt_done, sizeof(uint64_t)*glob_agcount); - - if (pthread_mutex_unlock(&global_msgs.mutex)) - do_error(_("set_progress_msg: cannot unlock progress mutex\n")); -@@ -308,14 +308,14 @@ set_progress_msg (int report, __uint64_t total) - return (0); - } - --__uint64_t -+uint64_t - print_final_rpt(void) - { - int i; - struct tm *tmp; - time_t now; -- __uint64_t *donep; -- __uint64_t sum; -+ uint64_t *donep; -+ uint64_t sum; - msg_block_t *msgp = &global_msgs; - char msgbuf[DURATION_BUF_SIZE]; - -diff --git a/repair/progress.h b/repair/progress.h -index 33db8344..51526483 100644 ---- a/repair/progress.h -+++ b/repair/progress.h -@@ -32,8 +32,8 @@ - extern void init_progress_rpt(void); - extern void stop_progress_rpt(void); - extern void summary_report(void); --extern int set_progress_msg(int report, __uint64_t total); --extern __uint64_t print_final_rpt(void); -+extern int set_progress_msg(int report, uint64_t total); -+extern uint64_t print_final_rpt(void); - extern char *timestamp(int end, int phase, char *buf); - extern char *duration(int val, char *buf); - extern int do_parallel; -diff --git a/repair/rmap.c b/repair/rmap.c -index ab6e5839..01d6f0fc 100644 ---- a/repair/rmap.c -+++ b/repair/rmap.c -@@ -343,7 +343,7 @@ err: - - static int - find_first_zero_bit( -- __uint64_t mask) -+ uint64_t mask) - { - int n; - int b = 0; -@@ -356,7 +356,7 @@ find_first_zero_bit( - - static int - popcnt( -- __uint64_t mask) -+ uint64_t mask) - { - int n; - int b = 0; -@@ -1064,14 +1064,14 @@ err: - * Compare the key fields of two rmap records -- positive if key1 > key2, - * negative if key1 < key2, and zero if equal. - */ --__int64_t -+int64_t - rmap_diffkeys( - struct xfs_rmap_irec *kp1, - struct xfs_rmap_irec *kp2) - { - __u64 oa; - __u64 ob; -- __int64_t d; -+ int64_t d; - struct xfs_rmap_irec tmp; - - tmp = *kp1; -@@ -1081,7 +1081,7 @@ rmap_diffkeys( - tmp.rm_flags &= ~XFS_RMAP_REC_FLAGS; - ob = libxfs_rmap_irec_offset_pack(&tmp); - -- d = (__int64_t)kp1->rm_startblock - kp2->rm_startblock; -+ d = (int64_t)kp1->rm_startblock - kp2->rm_startblock; - if (d) - return d; - -@@ -1192,10 +1192,10 @@ fix_inode_reflink_flags( - { - struct ino_tree_node *irec; - int bit; -- __uint64_t was; -- __uint64_t is; -- __uint64_t diff; -- __uint64_t mask; -+ uint64_t was; -+ uint64_t is; -+ uint64_t diff; -+ uint64_t mask; - int error = 0; - xfs_agino_t agino; - -diff --git a/repair/rmap.h b/repair/rmap.h -index 752ece82..1616ab7d 100644 ---- a/repair/rmap.h -+++ b/repair/rmap.h -@@ -44,7 +44,7 @@ extern int rmap_init_cursor(xfs_agnumber_t, struct xfs_slab_cursor **); - extern void rmap_avoid_check(void); - extern int rmaps_verify_btree(struct xfs_mount *, xfs_agnumber_t); - --extern __int64_t rmap_diffkeys(struct xfs_rmap_irec *kp1, -+extern int64_t rmap_diffkeys(struct xfs_rmap_irec *kp1, - struct xfs_rmap_irec *kp2); - extern void rmap_high_key_from_rec(struct xfs_rmap_irec *rec, - struct xfs_rmap_irec *key); -diff --git a/repair/sb.c b/repair/sb.c -index 77e51546..acc92839 100644 ---- a/repair/sb.c -+++ b/repair/sb.c -@@ -40,7 +40,7 @@ copy_sb(xfs_sb_t *source, xfs_sb_t *dest) - xfs_ino_t uquotino; - xfs_ino_t gquotino; - xfs_ino_t pquotino; -- __uint16_t versionnum; -+ uint16_t versionnum; - - rootino = dest->sb_rootino; - rbmino = dest->sb_rbmino; -@@ -106,8 +106,8 @@ verify_sb_blocksize(xfs_sb_t *sb) - static int - __find_secondary_sb( - xfs_sb_t *rsb, -- __uint64_t start, -- __uint64_t skip) -+ uint64_t start, -+ uint64_t skip) - { - xfs_off_t off; - xfs_sb_t *sb; -@@ -187,13 +187,13 @@ __find_secondary_sb( - - static int - guess_default_geometry( -- __uint64_t *agsize, -- __uint64_t *agcount, -+ uint64_t *agsize, -+ uint64_t *agcount, - libxfs_init_t *x) - { - struct fs_topology ft; - int blocklog; -- __uint64_t dblocks; -+ uint64_t dblocks; - int multidisk; - - memset(&ft, 0, sizeof(ft)); -@@ -216,9 +216,9 @@ int - find_secondary_sb(xfs_sb_t *rsb) - { - int retval = 0; -- __uint64_t agcount; -- __uint64_t agsize; -- __uint64_t skip; -+ uint64_t agcount; -+ uint64_t agsize; -+ uint64_t skip; - int blocklog; - - /* -@@ -229,7 +229,7 @@ find_secondary_sb(xfs_sb_t *rsb) - do_warn(_("\nattempting to find secondary superblock...\n")); - - if (verify_sb_blocksize(rsb) == 0) { -- skip = (__uint64_t)rsb->sb_agblocks * rsb->sb_blocksize; -+ skip = (uint64_t)rsb->sb_agblocks * rsb->sb_blocksize; - if (skip >= XFS_AG_MIN_BYTES && skip <= XFS_AG_MAX_BYTES) - retval = __find_secondary_sb(rsb, skip, skip); - } -@@ -343,7 +343,7 @@ sb_validate_ino_align(struct xfs_sb *sb) - int - verify_sb(char *sb_buf, xfs_sb_t *sb, int is_primary_sb) - { -- __uint32_t bsize; -+ uint32_t bsize; - int i; - int ret; - -@@ -399,7 +399,7 @@ verify_sb(char *sb_buf, xfs_sb_t *sb, int is_primary_sb) - sb->sb_dblocks < XFS_MIN_DBLOCKS(sb)) - return(XR_BAD_FS_SIZE_DATA); - -- if (sb->sb_agblklog != (__uint8_t)libxfs_log2_roundup(sb->sb_agblocks)) -+ if (sb->sb_agblklog != (uint8_t)libxfs_log2_roundup(sb->sb_agblocks)) - return(XR_BAD_FS_SIZE_DATA); - - if (sb->sb_inodesize < XFS_DINODE_MIN_SIZE || -diff --git a/repair/scan.c b/repair/scan.c -index b9ef4dc3..447611ac 100644 ---- a/repair/scan.c -+++ b/repair/scan.c -@@ -42,13 +42,13 @@ struct aghdr_cnts { - xfs_agnumber_t agno; - xfs_extlen_t agffreeblks; - xfs_extlen_t agflongest; -- __uint64_t agfbtreeblks; -- __uint32_t agicount; -- __uint32_t agifreecount; -- __uint64_t fdblocks; -- __uint64_t usedblocks; -- __uint64_t ifreecount; -- __uint32_t fibtfreecount; -+ uint64_t agfbtreeblks; -+ uint32_t agicount; -+ uint32_t agifreecount; -+ uint64_t fdblocks; -+ uint64_t usedblocks; -+ uint64_t ifreecount; -+ uint32_t fibtfreecount; - }; - - void -@@ -70,10 +70,10 @@ scan_sbtree( - xfs_agnumber_t agno, - int suspect, - int isroot, -- __uint32_t magic, -+ uint32_t magic, - void *priv), - int isroot, -- __uint32_t magic, -+ uint32_t magic, - void *priv, - const struct xfs_buf_ops *ops) - { -@@ -110,23 +110,23 @@ scan_lbtree( - xfs_fsblock_t bno, - xfs_ino_t ino, - xfs_rfsblock_t *tot, -- __uint64_t *nex, -+ uint64_t *nex, - blkmap_t **blkmapp, - bmap_cursor_t *bm_cursor, - int isroot, - int check_dups, - int *dirty, -- __uint64_t magic), -+ uint64_t magic), - int type, - int whichfork, - xfs_ino_t ino, - xfs_rfsblock_t *tot, -- __uint64_t *nex, -+ uint64_t *nex, - blkmap_t **blkmapp, - bmap_cursor_t *bm_cursor, - int isroot, - int check_dups, -- __uint64_t magic, -+ uint64_t magic, - const struct xfs_buf_ops *ops) - { - xfs_buf_t *bp; -@@ -179,13 +179,13 @@ scan_bmapbt( - xfs_fsblock_t bno, - xfs_ino_t ino, - xfs_rfsblock_t *tot, -- __uint64_t *nex, -+ uint64_t *nex, - blkmap_t **blkmapp, - bmap_cursor_t *bm_cursor, - int isroot, - int check_dups, - int *dirty, -- __uint64_t magic) -+ uint64_t magic) - { - int i; - int err; -@@ -548,7 +548,7 @@ scan_allocbt( - xfs_agnumber_t agno, - int suspect, - int isroot, -- __uint32_t magic, -+ uint32_t magic, - void *priv) - { - struct aghdr_cnts *agcnts = priv; -@@ -930,7 +930,7 @@ scan_rmapbt( - xfs_agnumber_t agno, - int suspect, - int isroot, -- __uint32_t magic, -+ uint32_t magic, - void *priv) - { - const char *name = "rmap"; -@@ -1233,7 +1233,7 @@ scan_refcbt( - xfs_agnumber_t agno, - int suspect, - int isroot, -- __uint32_t magic, -+ uint32_t magic, - void *priv) - { - const char *name = "refcount"; -@@ -1939,7 +1939,7 @@ scan_inobt( - xfs_agnumber_t agno, - int suspect, - int isroot, -- __uint32_t magic, -+ uint32_t magic, - void *priv) - { - struct aghdr_cnts *agcnts = priv; -@@ -2176,7 +2176,7 @@ validate_agf( - struct aghdr_cnts *agcnts) - { - xfs_agblock_t bno; -- __uint32_t magic; -+ uint32_t magic; - - bno = be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNO]); - if (bno != 0 && verify_agbno(mp, agno, bno)) { -@@ -2274,7 +2274,7 @@ validate_agi( - { - xfs_agblock_t bno; - int i; -- __uint32_t magic; -+ uint32_t magic; - - bno = be32_to_cpu(agi->agi_root); - if (bno != 0 && verify_agbno(mp, agno, bno)) { -@@ -2499,10 +2499,10 @@ scan_ags( - int scan_threads) - { - struct aghdr_cnts *agcnts; -- __uint64_t fdblocks = 0; -- __uint64_t icount = 0; -- __uint64_t ifreecount = 0; -- __uint64_t usedblocks = 0; -+ uint64_t fdblocks = 0; -+ uint64_t icount = 0; -+ uint64_t ifreecount = 0; -+ uint64_t usedblocks = 0; - xfs_agnumber_t i; - work_queue_t wq; - -diff --git a/repair/scan.h b/repair/scan.h -index ea8c0bf2..9bbe1e69 100644 ---- a/repair/scan.h -+++ b/repair/scan.h -@@ -30,23 +30,23 @@ int scan_lbtree( - xfs_fsblock_t bno, - xfs_ino_t ino, - xfs_rfsblock_t *tot, -- __uint64_t *nex, -+ uint64_t *nex, - struct blkmap **blkmapp, - bmap_cursor_t *bm_cursor, - int isroot, - int check_dups, - int *dirty, -- __uint64_t magic), -+ uint64_t magic), - int type, - int whichfork, - xfs_ino_t ino, - xfs_rfsblock_t *tot, -- __uint64_t *nex, -+ uint64_t *nex, - struct blkmap **blkmapp, - bmap_cursor_t *bm_cursor, - int isroot, - int check_dups, -- __uint64_t magic, -+ uint64_t magic, - const struct xfs_buf_ops *ops); - - int scan_bmapbt( -@@ -57,13 +57,13 @@ int scan_bmapbt( - xfs_fsblock_t bno, - xfs_ino_t ino, - xfs_rfsblock_t *tot, -- __uint64_t *nex, -+ uint64_t *nex, - struct blkmap **blkmapp, - bmap_cursor_t *bm_cursor, - int isroot, - int check_dups, - int *dirty, -- __uint64_t magic); -+ uint64_t magic); - - void - scan_ags( --- -2.14.1 - diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch index bba9a25c2..bd2d02563 100644 --- a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch @@ -1,13 +1,13 @@ -Index: xfsprogs-4.12.0/include/builddefs.in +Index: xfsprogs-4.14.0/include/builddefs.in =================================================================== ---- xfsprogs-4.12.0.orig/include/builddefs.in -+++ xfsprogs-4.12.0/include/builddefs.in -@@ -164,7 +164,7 @@ ifeq ($(ENABLE_GETTEXT),yes) +--- xfsprogs-4.14.0.orig/include/builddefs.in ++++ xfsprogs-4.14.0/include/builddefs.in +@@ -168,7 +168,7 @@ ifeq ($(ENABLE_GETTEXT),yes) GCFLAGS += -DENABLE_GETTEXT endif -BUILD_CFLAGS += $(GCFLAGS) $(PCFLAGS) +BUILD_CFLAGS += $(GCFLAGS) - # First, Global, Platform, Local CFLAGS - CFLAGS += $(FCFLAGS) $(OPTIMIZER) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) + # First, Sanitizer, Global, Platform, Local CFLAGS + CFLAGS += $(FCFLAGS) $(SANITIZER_CFLAGS) $(OPTIMIZER) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch deleted file mode 100644 index efc57e4f6..000000000 --- a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 21253610f9ef87db8e2a75b863b7fcfbd0cdb421 Mon Sep 17 00:00:00 2001 -From: "Darrick J. Wong" -Date: Tue, 25 Jul 2017 13:45:01 -0500 -Subject: [PATCH] In patch 4944defad4 ("xfs_db: redirect printfs when - metadumping to stdout"), we solved the problem of xfs_db printfs ending up in - the metadump stream by reassigning stdout for the duration of a stdout - metadump. Unfortunately, musl doesn't allow stdout to be reassigned (in - their view "extern FILE *stdout" means "extern FILE * const stdout"), so we - abandon the old approach in favor of playing games with dup() to switch the - raw file descriptors. - -While we're at it, fix a regression where an unconverted outf test -allows progress info to end up in the metadump stream. - -Signed-off-by: Darrick J. Wong ---- - db/metadump.c | 47 ++++++++++++++++++++++++++++++++++++----------- - 1 file changed, 36 insertions(+), 11 deletions(-) - -diff --git a/db/metadump.c b/db/metadump.c -index 96641e0..4e2f648 100644 ---- a/db/metadump.c -+++ b/db/metadump.c -@@ -78,6 +78,7 @@ static int obfuscate = 1; - static int zero_stale_data = 1; - static int show_warnings = 0; - static int progress_since_warning = 0; -+static bool stdout_metadump; - - void - metadump_init(void) -@@ -137,7 +138,7 @@ print_progress(const char *fmt, ...) - va_end(ap); - buf[sizeof(buf)-1] = '\0'; - -- f = (outf == stdout) ? stderr : stdout; -+ f = stdout_metadump ? stderr : stdout; - fprintf(f, "\r%-59s", buf); - fflush(f); - progress_since_warning = 1; -@@ -2750,7 +2751,8 @@ metadump_f( - xfs_agnumber_t agno; - int c; - int start_iocur_sp; -- bool stdout_metadump = false; -+ int outfd = -1; -+ int ret; - char *p; - - exitcode = 1; -@@ -2870,16 +2872,35 @@ metadump_f( - * metadump operation so that dbprintf and other messages - * are sent to the console instead of polluting the - * metadump stream. -+ * -+ * We get to do this the hard way because musl doesn't -+ * allow reassignment of stdout. - */ -- outf = stdout; -- stdout = stderr; -+ fflush(stdout); -+ outfd = dup(STDOUT_FILENO); -+ if (outfd < 0) { -+ perror("opening dump stream"); -+ goto out; -+ } -+ ret = dup2(STDERR_FILENO, STDOUT_FILENO); -+ if (ret < 0) { -+ perror("redirecting stdout"); -+ close(outfd); -+ goto out; -+ } -+ outf = fdopen(outfd, "a"); -+ if (outf == NULL) { -+ fprintf(stderr, "cannot create dump stream\n"); -+ dup2(outfd, 1); -+ close(outfd); -+ goto out; -+ } - stdout_metadump = true; - } else { - outf = fopen(argv[optind], "wb"); - if (outf == NULL) { - print_warning("cannot create dump file"); -- free(metablock); -- return 0; -+ goto out; - } - } - -@@ -2907,15 +2928,19 @@ metadump_f( - if (progress_since_warning) - fputc('\n', stdout_metadump ? stderr : stdout); - -- if (stdout_metadump) -- stdout = outf; -- else -- fclose(outf); -+ if (stdout_metadump) { -+ fflush(outf); -+ fflush(stdout); -+ ret = dup2(outfd, STDOUT_FILENO); -+ if (ret < 0) -+ perror("un-redirecting stdout"); -+ } -+ fclose(outf); - - /* cleanup iocur stack */ - while (iocur_sp > start_iocur_sp) - pop_cur(); -- -+out: - free(metablock); - - return 0; --- -2.13.3 diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.12.0.bb b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.12.0.bb deleted file mode 100644 index 0788695ee..000000000 --- a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.12.0.bb +++ /dev/null @@ -1,65 +0,0 @@ -SUMMARY = "XFS Filesystem Utilities" -HOMEPAGE = "http://oss.sgi.com/projects/xfs" -SECTION = "base" -LICENSE = "GPLv2 & LGPLv2.1" -LICENSE_libhandle = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://doc/COPYING;md5=102f7fec3d53c7c8f0b7baf9bf9d76a8" -DEPENDS = "util-linux util-linux-native" -SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ - file://0001-xfsprogs-remove-double-underscore-integer-types.patch \ - file://0001-xfs-remove-double-underscore-integer-types.patch \ - file://remove_flags_from_build_flags.patch \ - file://xfsprogs-4.12.0-fix_musl.patch \ - " -SRC_URI[md5sum] = "e348b0e1d7bd1cd82d64b91ff37e727e" -SRC_URI[sha256sum] = "b330ad8d737f4152ae511580102e2fc49212bb51dfb4b614084344abae46d0df" - -inherit autotools-brokensep - -PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" - -DEPENDS += "util-linux" - -RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair" - -FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs" -FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs" -FILES_${PN}-repair = "${base_sbindir}/xfs_repair" - -FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}" - -EXTRA_OECONF = "--enable-gettext=no \ - INSTALL_USER=root \ - INSTALL_GROUP=root \ - ac_cv_header_aio_h=yes \ - ac_cv_lib_rt_lio_listio=yes \ -" - -DISABLE_STATIC = "" -EXTRA_AUTORECONF += "-I ${S}/m4 --exclude=autoheader" - -PACKAGECONFIG ??= "readline blkid" - -PACKAGECONFIG[readline] = "--enable-readline=yes,--enable-readline=no,readline" -PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux" - -export DEBUG="-DNDEBUG" -export BUILD_VERBOSE="1" -export tagname="CC" - -EXTRA_OEMAKE = "DIST_ROOT='${D}'" - -do_configure_prepend () { - export BUILD_CC="${BUILD_CC} ${BUILD_CFLAGS}" - # Prevent Makefile from calling configure without arguments, - # when do_configure gets called for a second time. - rm -f ${B}/include/builddefs ${B}/include/platform_defs.h ${B}/configure - # Recreate configure script. - oe_runmake configure -} - -do_install_append() { - oe_runmake 'DESTDIR=${D}' install-dev - rm ${D}${libdir}/*.la - rmdir --ignore-fail-on-non-empty ${D}${libdir} -} diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb new file mode 100644 index 000000000..5d76afe00 --- /dev/null +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb @@ -0,0 +1,63 @@ +SUMMARY = "XFS Filesystem Utilities" +HOMEPAGE = "http://oss.sgi.com/projects/xfs" +SECTION = "base" +LICENSE = "GPLv2 & LGPLv2.1" +LICENSE_libhandle = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=102f7fec3d53c7c8f0b7baf9bf9d76a8" +DEPENDS = "util-linux util-linux-native" +SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ + file://remove_flags_from_build_flags.patch \ + file://0001-build-Check-for-sync_file_range-libc-function.patch \ + " +SRC_URI[md5sum] = "2d50e3751cc98e6c9364bc3d2297b9fd" +SRC_URI[sha256sum] = "b1b710b268bc95d6f45eca06e1262c29eb38865a19cd4404e48ba446e043b7ec" + +inherit autotools-brokensep + +PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" + +DEPENDS += "util-linux" + +RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair" + +FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs" +FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs" +FILES_${PN}-repair = "${base_sbindir}/xfs_repair" + +FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}" + +EXTRA_OECONF = "--enable-gettext=no \ + INSTALL_USER=root \ + INSTALL_GROUP=root \ + ac_cv_header_aio_h=yes \ + ac_cv_lib_rt_lio_listio=yes \ +" + +DISABLE_STATIC = "" +EXTRA_AUTORECONF += "-I ${S}/m4 --exclude=autoheader" + +PACKAGECONFIG ??= "readline blkid" + +PACKAGECONFIG[readline] = "--enable-readline=yes,--enable-readline=no,readline" +PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux" + +export DEBUG="-DNDEBUG" +export BUILD_VERBOSE="1" +export tagname="CC" + +EXTRA_OEMAKE = "DIST_ROOT='${D}'" + +do_configure_prepend () { + export BUILD_CC="${BUILD_CC} ${BUILD_CFLAGS}" + # Prevent Makefile from calling configure without arguments, + # when do_configure gets called for a second time. + rm -f ${B}/include/builddefs ${B}/include/platform_defs.h ${B}/configure + # Recreate configure script. + oe_runmake configure +} + +do_install_append() { + oe_runmake 'DESTDIR=${D}' install-dev + rm ${D}${libdir}/*.la + rmdir --ignore-fail-on-non-empty ${D}${libdir} +} diff --git a/import-layers/meta-openembedded/meta-gnome/README b/import-layers/meta-openembedded/meta-gnome/README index 25ef85d3f..2a682e72d 100644 --- a/import-layers/meta-openembedded/meta-gnome/README +++ b/import-layers/meta-openembedded/meta-gnome/README @@ -1,17 +1,38 @@ +meta-gnome +=========== + +The recipe in this layer needs to have 'x11' in DISTRO_FEATURES +to have effect. To enable them, add in configuration file the following line. + + DISTRO_FEATURES_append = " x11" + +If meta-gnome is included, but x11 is not enabled as a +distro feature a warning is printed at parse time: + + You have included the meta-gnome layer, but + 'x11' has not been enabled in your DISTRO_FEATURES. + +If you know what you are doing, this warning can be disabled by setting the following +variable in your configuration: + + SKIP_META_GNOME_SANITY_CHECK = 1 + + +Dependencies +------------ This layer depends on: URI: git://github.com/openembedded/oe-core.git -branch: rocko +branch: master revision: HEAD URI: git://github.com/openembedded/meta-oe.git -branch: rocko +branch: master revision: HEAD -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome][rocko]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome]' in the subject' When sending single patches, please using something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gnome][rocko][PATCH' +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gnome][PATCH' -rocko Branch Maintainer: -Armin Kuster +Layer maintainer: Andreas Müller diff --git a/import-layers/meta-openembedded/meta-gnome/classes/sanity-meta-gnome.bbclass b/import-layers/meta-openembedded/meta-gnome/classes/sanity-meta-gnome.bbclass new file mode 100644 index 000000000..331ea193d --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/classes/sanity-meta-gnome.bbclass @@ -0,0 +1,10 @@ +addhandler gnome_bbappend_distrocheck +gnome_bbappend_distrocheck[eventmask] = "bb.event.SanityCheck" +python gnome_bbappend_distrocheck() { + skip_check = e.data.getVar('SKIP_META_GNOME_SANITY_CHECK') == "1" + if 'x11' not in e.data.getVar('DISTRO_FEATURES').split() and not skip_check: + bb.warn("You have included the meta-gnome layer, but \ +'x11' has not been enabled in your DISTRO_FEATURES. Some bbappend files \ +may not take effect. See the meta-gnome README for details on enabling \ +meta-gnome support.") +} diff --git a/import-layers/meta-openembedded/meta-gnome/conf/layer.conf b/import-layers/meta-openembedded/meta-gnome/conf/layer.conf index a13881848..e6e9532b4 100644 --- a/import-layers/meta-openembedded/meta-gnome/conf/layer.conf +++ b/import-layers/meta-openembedded/meta-gnome/conf/layer.conf @@ -14,4 +14,8 @@ LAYERVERSION_gnome-layer = "1" LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer" -AVAHI_GTK_pn-avahi-ui = "gtk gtk3" +LAYERSERIES_COMPAT_gnome-layer = "sumo" + +# Sanity check for meta-gnome layer. +# Setting SKIP_META_GNOME_SANITY_CHECK to "1" would skip the bbappend files check. +INHERIT += "sanity-meta-gnome" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.4.4.bb b/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.4.4.bb deleted file mode 100644 index 14b336a1e..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.4.4.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "GTK+ applet for NetworkManager" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib \ - gconf libgnome-keyring iso-codes nss \ - intltool-native \ -" - -inherit gnomebase gsettings gtk-icon-cache gobject-introspection - -GNOME_COMPRESS_TYPE = "xz" - -SRC_URI[archive.md5sum] = "3f82cedc4703df0277c76d9feb5bf2c8" -SRC_URI[archive.sha256sum] = "693846eeae0986e79eb1cedfbc499f132f27a9976ef189a0f16938ac59ec3226" - -PACKAGECONFIG[modemmanager] = "--with-wwan,--without-wwan,modemmanager" -PACKAGECONFIG ??= "" - -GI_DATA_ENABLED_libc-musl = "False" - -do_configure_append() { - # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror - for i in $(find ${B} -name "Makefile") ; do - sed -i -e s%-Werror[^[:space:]]*%%g $i - done -} - -RDEPENDS_${PN} =+ "networkmanager" - -FILES_${PN} += " \ - ${datadir}/appdata \ - ${datadir}/nm-applet/ \ - ${datadir}/libnm-gtk/wifi.ui \ - ${datadir}/libnma/wifi.ui \ -" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.10.bb b/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.10.bb new file mode 100644 index 000000000..dc2b964be --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.10.bb @@ -0,0 +1,45 @@ +SUMMARY = "GTK+ applet for NetworkManager" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib \ + gconf libgnome-keyring iso-codes nss \ + intltool-native \ +" + +inherit distro_features_check gnomebase gsettings gtk-icon-cache gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.md5sum] = "eae3be75e77ff1a7ea3174be25e62d03" +SRC_URI[archive.sha256sum] = "0adc4bfae8b49f7a1d929c22ef20933bd41fb4a8b458280f44c65f9e45b4c9c3" + +PACKAGECONFIG[modemmanager] = "--with-wwan,--without-wwan,modemmanager" +PACKAGECONFIG ??= "" + +EXTRA_OECONF = " \ + --without-selinux \ +" + +do_configure_append() { + # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror + for i in $(find ${B} -name "Makefile") ; do + sed -i -e s%-Werror[^[:space:]]*%%g $i + done +} + +# gobject-introspection related +GI_DATA_ENABLED_libc-musl = "False" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/src/libnma/.libs:${B}/src/libnm-gtk/.libs" +} + +RDEPENDS_${PN} =+ "networkmanager" + +FILES_${PN} += " \ + ${datadir}/appdata \ + ${datadir}/nm-applet/ \ + ${datadir}/libnm-gtk/wifi.ui \ + ${datadir}/libnma/wifi.ui \ +" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch b/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch index 2009dcd22..570cb9ef3 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch +++ b/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch @@ -1,4 +1,7 @@ -include unistd.h to get ssize_t definitions +From fb5056fea9559b3ec3bb61967a112b6c793b700d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 8 Jan 2013 21:33:34 -0800 +Subject: [PATCH] include unistd.h to get ssize_t definitions Fixes errors like @@ -18,15 +21,20 @@ Fixes errors like Upstream-Status: Pending Signed-off-by: Khem Raj -Index: obexd-0.44/plugins/mas.c -=================================================================== ---- obexd-0.44.orig/plugins/mas.c 2012-01-11 14:53:53.000000000 -0800 -+++ obexd-0.44/plugins/mas.c 2013-01-08 12:51:12.681882174 -0800 -@@ -29,6 +29,7 @@ + +--- + plugins/mas.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/mas.c b/plugins/mas.c +index 1b18059..b519507 100644 +--- a/plugins/mas.c ++++ b/plugins/mas.c +@@ -30,6 +30,7 @@ #include #include #include +#include - #include "obexd.h" - #include "plugin.h" + #include + #include diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch b/import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch new file mode 100644 index 000000000..03cb762ce --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch @@ -0,0 +1,62 @@ +From fcf29abe59607b5791f9de18ddb86b9ae3c9b7cc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 26 Aug 2017 23:50:05 -0700 +Subject: [PATCH] Add G_GNUC_PRINTF on functions with format strings + +This allows compilation with clang without errors, even when +-Wformat-nonliteral is active (as long as there are no real cases of +non literal formatting). + +Signed-off-by: Khem Raj +--- + gladeui/glade-command.c | 4 ++-- + gladeui/glade-utils.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/gladeui/glade-command.c b/gladeui/glade-command.c +index 9819766..4ac40ee 100644 +--- a/gladeui/glade-command.c ++++ b/gladeui/glade-command.c +@@ -266,7 +266,7 @@ glade_command_collapse (GladeCommand *command, + * + * Marks the begining of a group. + */ +-void ++G_GNUC_PRINTF(1, 2) void + glade_command_push_group (const gchar *fmt, ...) + { + va_list args; +@@ -655,7 +655,7 @@ glade_command_set_properties_list (GladeProject *project, GList *props) + + multiple = g_list_length (me->sdata) > 1; + if (multiple) +- glade_command_push_group (cmd->description); ++ glade_command_push_group ("%s", cmd->description); + + + glade_command_check_group (GLADE_COMMAND (me)); +diff --git a/gladeui/glade-utils.c b/gladeui/glade-utils.c +index ae52501..c51ae59 100644 +--- a/gladeui/glade-utils.c ++++ b/gladeui/glade-utils.c +@@ -197,7 +197,7 @@ glade_utils_get_pspec_from_funcname (const gchar *funcname) + * selected "OK", True if the @type was GLADE_UI_YES_OR_NO and + * the user selected "YES"; False otherwise. + */ +-gint ++G_GNUC_PRINTF(4, 5) gint + glade_util_ui_message (GtkWidget *parent, + GladeUIMessageType type, + GtkWidget *widget, +@@ -320,7 +320,7 @@ remove_message_timeout (FlashInfo * fi) + * + * Flash a temporary message on the statusbar. + */ +-void ++G_GNUC_PRINTF(3, 4) void + glade_util_flash_message (GtkWidget *statusbar, guint context_id, gchar *format, ...) + { + va_list args; +-- +2.14.1 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch b/import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch new file mode 100644 index 000000000..1b24c39ce --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch @@ -0,0 +1,51 @@ +From aed002cd9ff9e8f972120fbac33b4a65aba952e1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 25 Sep 2012 10:28:33 +0200 +Subject: [PATCH] gnome-doc-utils.make: sysrooted pkg-config +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +same approach as used used in gnome-disk-utility: + +In cross environment we have to prepend the sysroot to the path found by +pkgconfig since the path returned from pkgconfig does not have sysroot prefixed +it ends up using the files from host system. Now usually people have gnome installed +so the build succeeds but if you dont have gnome installed on build host then +it wont find the files on host system and packages using gnome-doc-utils wont +compile. + +This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR +will be empty + +Upstream-Status: pending + +Signed-off-by: Andreas Müller +--- + gnome-doc-utils.make | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make +index 42d9df3..f71bbfa 100644 +--- a/gnome-doc-utils.make ++++ b/gnome-doc-utils.make +@@ -133,11 +133,11 @@ _DOC_ABS_SRCDIR = @abs_srcdir@ + _xml2po ?= `which xml2po` + _xml2po_mode = $(if $(DOC_ID),mallard,docbook) + +-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` +-_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` +-_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl +-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl +-_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl ++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` ++_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` ++_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl ++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl ++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl + + if ENABLE_SK + _ENABLE_SK = true +-- +1.7.6.5 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch b/import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch new file mode 100644 index 000000000..f735ff819 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch @@ -0,0 +1,39 @@ +From 5aa3d2abb905fa8594f6c6572a87809da54c9342 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 5 Sep 2016 11:25:27 +0200 +Subject: [PATCH] fix gcc-6 build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + gladeui/glade-editor-property.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c +index a0c1039..5e9ac38 100644 +--- a/gladeui/glade-editor-property.c ++++ b/gladeui/glade-editor-property.c +@@ -2703,6 +2703,8 @@ glade_eprop_object_view (gboolean radio) + } + + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + static gchar * + glade_eprop_object_dialog_title (GladeEditorProperty *eprop) + { +@@ -2731,6 +2733,7 @@ glade_eprop_object_dialog_title (GladeEditorProperty *eprop) + return g_strdup_printf (format, g_type_name + (eprop->klass->pspec->value_type)); + } ++#pragma GCC diagnostic pop + + + gboolean +-- +2.5.5 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3_%.bbappend b/import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3_%.bbappend deleted file mode 100644 index 3abacfb86..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -PACKAGECONFIG ??= "gnome" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb b/import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb new file mode 100644 index 000000000..c3da3e9b9 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb @@ -0,0 +1,23 @@ +SUMMARY = "Glade - A User Interface Designer" +HOMEPAGE = "http://www.gnu.org/software/gnash" +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \ + file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \ + file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475" +DEPENDS = "gtk+ gnome-doc-utils gnome-common libxml2 intltool-native" + +inherit distro_features_check autotools pkgconfig pythonnative gtk-icon-cache + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \ + file://0001-gnome-doc-utils.make-sysrooted-pkg-config.patch \ + file://0002-fix-gcc-6-build.patch \ + file://0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch \ + " +SRC_URI[md5sum] = "4e4b4f5ee34a03e017e4cef97d796c1f" +SRC_URI[sha256sum] = "58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735" + +EXTRA_OECONF += "--disable-scrollkeeper" + +FILES_${PN} += "${datadir}/icons" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.28.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.28.1.bb deleted file mode 100644 index 83ab6f29d..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.28.1.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "A partition editor to graphically manage disk partitions " -HOMEPAGE = "http://gparted.org/index.php" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit autotools pkgconfig gtk-icon-cache - -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ - file://org.yoctoproject.pkexec.run-gparted.policy \ - file://gparted_polkit \ -" -SRC_URI[md5sum] = "ab72464a3ab2137664d9df8462befd3f" -SRC_URI[sha256sum] = "76891f14394754f7d6ecceba2af0e585bf89f9d780c389a255dcd41a2f45d333" - -DEPENDS = "glib-2.0 glib-2.0-native gtkmm parted gnome-doc-utils intltool-native" - -do_install_append() { - # Add a script which checks if polkit is installed. - # If yes: a policy is requested from polkit / otherwise start as usual - install ${WORKDIR}/gparted_polkit ${D}${sbindir} - sed -i 's:%sbindir%:${sbindir}:g' ${D}${sbindir}/gparted_polkit - # relink menu entry to use our script - sed -i 's:${sbindir}/gparted:${sbindir}/gparted_polkit:g' ${D}${datadir}/applications/gparted.desktop - - install -d ${D}${datadir}/polkit-1/actions - install ${WORKDIR}/org.yoctoproject.pkexec.run-gparted.policy ${D}${datadir}/polkit-1/actions/org.yoctoproject.pkexec.run-gparted.policy -} - -EXTRA_OECONF = "--disable-scrollkeeper --disable-doc" - -FILES_${PN} += " \ - ${datadir}/appdata \ - ${datadir}/icons \ - ${datadir}/polkit-1 \ -" - -RDEPENDS_${PN} = "dosfstools mtools e2fsprogs" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.31.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.31.0.bb new file mode 100644 index 000000000..58beaf6c5 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.31.0.bb @@ -0,0 +1,40 @@ +SUMMARY = "A partition editor to graphically manage disk partitions " +HOMEPAGE = "http://gparted.org/index.php" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit distro_features_check autotools pkgconfig gtk-icon-cache + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ + file://org.yoctoproject.pkexec.run-gparted.policy \ + file://gparted_polkit \ +" +SRC_URI[md5sum] = "c554cc5734c50459dd551bd3fa10710e" +SRC_URI[sha256sum] = "3b7b49a434d9e4b397bc41a1f5acab8539b9ff402b472dfd83ad77b2decd07ba" + +DEPENDS = "glib-2.0 glib-2.0-native gtkmm parted gnome-doc-utils intltool-native" + +do_install_append() { + # Add a script which checks if polkit is installed. + # If yes: a policy is requested from polkit / otherwise start as usual + install ${WORKDIR}/gparted_polkit ${D}${sbindir} + sed -i 's:%sbindir%:${sbindir}:g' ${D}${sbindir}/gparted_polkit + # relink menu entry to use our script + sed -i 's:${sbindir}/gparted:${sbindir}/gparted_polkit:g' ${D}${datadir}/applications/gparted.desktop + + install -d ${D}${datadir}/polkit-1/actions + install ${WORKDIR}/org.yoctoproject.pkexec.run-gparted.policy ${D}${datadir}/polkit-1/actions/org.yoctoproject.pkexec.run-gparted.policy +} + +EXTRA_OECONF = "--disable-scrollkeeper --disable-doc" + +FILES_${PN} += " \ + ${datadir}/appdata \ + ${datadir}/icons \ + ${datadir}/polkit-1 \ +" + +RDEPENDS_${PN} = "dosfstools mtools e2fsprogs" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb index 2a13e4839..d2c0186b5 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb @@ -8,7 +8,6 @@ DEPENDS = " \ gtk+ \ gtkmathview \ wv \ - libglade \ libfribidi \ jpeg \ libpng \ @@ -38,7 +37,9 @@ SRC_URI[sha256sum] = "afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090 #want 3.x from 3.x.y for the installation directory SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -inherit autotools-brokensep pkgconfig +inherit distro_features_check autotools-brokensep pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" PACKAGECONFIG ??= " \ collab-backend-xmpp collab-backend-tcp \ diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/files/0001-bonobo-ui-node-qualify-functions-with-G_GNUC_PRINTF.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/files/0001-bonobo-ui-node-qualify-functions-with-G_GNUC_PRINTF.patch deleted file mode 100644 index e9aebb853..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/files/0001-bonobo-ui-node-qualify-functions-with-G_GNUC_PRINTF.patch +++ /dev/null @@ -1,49 +0,0 @@ -From b75879e8c3e24d338c0e5843d616bc9b02da4d04 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 26 Aug 2017 09:52:17 -0700 -Subject: [PATCH] bonobo-ui-node: qualify functions with G_GNUC_PRINTF - -This helps compiler in doing format checking correctly -Fixes -bonobo-ui-node.c:864:38: error: format string is not a string literal [-Werror,-Wformat-nonliteral] -| g_logv ("XML", G_LOG_LEVEL_ERROR, msg, args); - -Signed-off-by: Khem Raj ---- - bonobo/bonobo-ui-node.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/bonobo/bonobo-ui-node.c b/bonobo/bonobo-ui-node.c -index 9bab5e5..6ec66e2 100644 ---- a/bonobo/bonobo-ui-node.c -+++ b/bonobo/bonobo-ui-node.c -@@ -835,7 +835,7 @@ uiCharacters (ParseState *ps, const xmlChar *chars, int len) - g_string_append_len (ps->content, chars, len); - } - --static void -+static G_GNUC_PRINTF(2, 3) void - uiWarning (ParseState *ps, const char *msg, ...) - { - va_list args; -@@ -845,7 +845,7 @@ uiWarning (ParseState *ps, const char *msg, ...) - va_end (args); - } - --static void -+static G_GNUC_PRINTF(2, 3) void - uiError (ParseState *ps, const char *msg, ...) - { - va_list args; -@@ -855,7 +855,7 @@ uiError (ParseState *ps, const char *msg, ...) - va_end (args); - } - --static void -+static G_GNUC_PRINTF(2, 3) void - uiFatalError (ParseState *ps, const char *msg, ...) - { - va_list args; --- -2.14.1 - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/files/gcc5.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/files/gcc5.patch deleted file mode 100644 index f7528adad..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/files/gcc5.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: libbonoboui-2.24.5/tools/browser/Makefile.am -=================================================================== ---- libbonoboui-2.24.5.orig/tools/browser/Makefile.am -+++ libbonoboui-2.24.5/tools/browser/Makefile.am -@@ -2,7 +2,6 @@ INCLUDES = \ - -DBONOBO_BROWSER_DATADIR=\""$(datadir)"\" \ - -DBONOBO_SUPPORT_LOCALEDIR=\""$(datadir)/locale"\" \ - -I$(srcdir) -I$(top_srcdir) \ -- -I$(top_srcdir)/bonobo-browser \ - $(BONOBOUI_CFLAGS) \ - $(WARN_CFLAGS) - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.m4 b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.m4 deleted file mode 100644 index 3ec41666b..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.m4 +++ /dev/null @@ -1,53 +0,0 @@ -dnl -*- mode: autoconf -*- - -# serial 1 - -dnl Usage: -dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -AC_DEFUN([GTK_DOC_CHECK], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - dnl for overriding the documentation installation directory - AC_ARG_WITH(html-dir, - AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${datadir}/gtk-doc/html']) - HTML_DIR="$with_html_dir" - AC_SUBST(HTML_DIR) - - dnl enable/disable documentation building - AC_ARG_ENABLE(gtk-doc, - AC_HELP_STRING([--enable-gtk-doc], - [use gtk-doc to build documentation [default=no]]),, - enable_gtk_doc=no) - - have_gtk_doc=no - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then - have_gtk_doc=yes - fi - - dnl do we want to do a version check? -ifelse([$1],[],, - [gtk_doc_min_version=$1 - if test "$have_gtk_doc" = yes; then - AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) - if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - have_gtk_doc=no - fi - fi -]) - if test x$enable_gtk_doc = xyes; then - if test "$have_gtk_doc" != yes; then - enable_gtk_doc=no - fi - fi - - AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) - AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") -]) diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.make b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.make deleted file mode 100644 index 354ffb7c6..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.make +++ /dev/null @@ -1,173 +0,0 @@ -# -*- mode: makefile -*- - -#################################### -# Everything below here is generic # -#################################### - -if GTK_DOC_USE_LIBTOOL -GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -else -GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -endif - -# We set GPATH here; this gives us semantics for GNU make -# which are more like other make's VPATH, when it comes to -# whether a source that is a target of one rule is then -# searched for in VPATH/GPATH. -# -GPATH = $(srcdir) - -TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) - -EXTRA_DIST = \ - $(content_files) \ - $(HTML_IMAGES) \ - $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt - -DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - -SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).interfaces \ - $(DOC_MODULE).prerequisites \ - $(DOC_MODULE).signals - -REPORT_FILES = \ - $(DOC_MODULE)-undocumented.txt \ - $(DOC_MODULE)-undeclared.txt \ - $(DOC_MODULE)-unused.txt - -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) - -if ENABLE_GTK_DOC -all-local: html-build.stamp -else -all-local: -endif - -docs: html-build.stamp - -#### scan #### - -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo 'gtk-doc: Scanning header files' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ - fi - touch scan-build.stamp - -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp - @true - -#### templates #### - -tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo 'gtk-doc: Rebuilding template files' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -tmpl/*.sgml: - @true - - -#### xml #### - -sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo 'gtk-doc: Building XML' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) - touch sgml-build.stamp - -sgml.stamp: sgml-build.stamp - @true - -#### html #### - -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building HTML' - @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html - mkdir $(srcdir)/html - cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - touch html-build.stamp - -############## - -clean-local: - rm -f *~ *.bak - rm -rf .libs - -distclean-local: - cd $(srcdir) && \ - rm -rf xml $(REPORT_FILES) \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - -maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html - -install-data-local: - -installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ - else \ - $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ - for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ - echo '-- Installing $(srcdir)/html/index.sgml' ; \ - $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ - which gtkdoc-rebase >/dev/null && \ - gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ - fi - - -uninstall-local: - rm -f $(DESTDIR)$(TARGET_DIR)/* - -# -# Require gtk-doc when making dist -# -if ENABLE_GTK_DOC -dist-check-gtkdoc: -else -dist-check-gtkdoc: - @echo "*** gtk-doc must be installed and enabled in order to make dist" - @false -endif - -dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl - mkdir $(distdir)/xml - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/xml/*.xml $(distdir)/xml - cp $(srcdir)/html/* $(distdir)/html - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) - -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html - -.PHONY : dist-hook-local docs diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo.inc b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo.inc deleted file mode 100644 index e4759a87c..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo.inc +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "Bonobo CORBA interfaces library" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" -SECTION = "x11/gnome/libs" -DEPENDS = "gnome-common-native glib-2.0 orbit2-native orbit2 intltool-native libxml2 dbus dbus-glib" - -inherit gnomebase gtk-doc lib_package - -EXTRA_OECONF += "'PERL_PATH=${USRBINPATH}/env perl'" -ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2" - -RDEPENDS_${PN}-bin = "${PN} perl" -FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so" -FILES_${PN}-dbg += "${libdir}/bonobo/monikers/.debug \ - ${libdir}/bonobo-2.0/samples/.debug ${libdir}/orbit-2.0/.debug" -FILES_${PN}-dev += "${libdir}/orbit-2.0/*.la ${libdir}/bonobo/monikers/*.la ${libdir}/bonobo-2.0/samples" -FILES_${PN}-staticdev += "${libdir}/orbit-2.0/*.a ${libdir}/bonobo/monikers/*.a" - -LEAD_SONAME = "libbonobo-2.so" - -PARALLEL_MAKE = "" - -do_compile() { - oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" -} - -do_install() { - oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install -} diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch deleted file mode 100644 index 44cf1f9fa..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch +++ /dev/null @@ -1,47 +0,0 @@ -From fef13a371fc91f6d9b42518126c2a8b459fdf0e8 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Thu, 2 May 2013 14:17:38 -0400 -Subject: [PATCH] Remove use of G_DISABLE_DEPRECATED -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This now trips up on GStaticRecMutex; I'm not going to bother to port, -realistically no one is actively maintaining this code anymore. - -Upstream-Status: Applied - -Signed-off-by: Andreas Müller ---- - activation-server/Makefile.am | 1 - - configure.in | 2 +- - 2 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/activation-server/Makefile.am b/activation-server/Makefile.am -index efb18a8..ffa90f6 100644 ---- a/activation-server/Makefile.am -+++ b/activation-server/Makefile.am -@@ -17,7 +17,6 @@ INCLUDES= \ - $(SERVER_CFLAGS) \ - $(WARN_CFLAGS) \ - -DSERVER_CONFDIR=\"$(sysconfdir)\" \ -- -DG_DISABLE_DEPRECATED \ - -DG_LOG_DOMAIN=\"Bonobo-Activation-Server\" \ - $(NULL) - -diff --git a/configure.in b/configure.in -index 70a4e26..6be2bca 100644 ---- a/configure.in -+++ b/configure.in -@@ -132,7 +132,7 @@ AC_SUBST(SERVER_LIBS) - AC_SUBST(SERVER_CFLAGS) - - if test "$enable_maintainer_mode" = "yes"; then -- DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES" -+ DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_SINGLE_INCLUDES" - AC_SUBST(DISABLE_DEPRECATED_CFLAGS) - fi - --- -1.7.6.5 - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch deleted file mode 100644 index a20edda84..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch +++ /dev/null @@ -1,24 +0,0 @@ -| tests/Makefile.am:55: error: using '$(srcdir)' in TESTS is currently broken: '$(srcdir)/te -st-properties.sh' -| tests/test-activation/Makefile.am:76: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS -' (or '*_CPPFLAGS') -| utils/Makefile.am:9: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS -') -| autoreconf: automake failed with exit status: 1 - -Signed-off-by: Khem Raj -Upstream-Status: Not Submitted - -Index: libbonobo-2.32.1/tests/Makefile.am -=================================================================== ---- libbonobo-2.32.1.orig/tests/Makefile.am 2010-08-29 04:56:00.000000000 -0700 -+++ libbonobo-2.32.1/tests/Makefile.am 2014-04-25 15:38:22.024744384 -0700 -@@ -55,7 +55,7 @@ - MODELS_DIR="$(srcdir)/models" - - TESTS = test-moniker$(EXEEXT) test-event-source$(EXEEXT) test-object$(EXEEXT) \ -- test-stream-mem$(EXEEXT) $(srcdir)/test-properties.sh test-storage-mem$(EXEEXT) \ -+ test-stream-mem$(EXEEXT) test-properties.sh test-storage-mem$(EXEEXT) \ - test-main-loop$(EXEEXT) - - # TESTS += test-generic-factory.sh diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch deleted file mode 100644 index 20db671e0..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch +++ /dev/null @@ -1,26 +0,0 @@ -This checks whether the format string is a literal on the calling function. As bonobo_debug_print() -takes already a va_list, we specify the format on the functions that call it -The second number, which is 0 here, should then be the argument index of the variadic argument - -Fixed warning with clang - -| ../../libbonobo-2.32.1/bonobo/bonobo-debug.c:58:32: error: format string is not a string literal [-Werror,-Wformat-nonliteral] -| vfprintf (_bonobo_debug_file, fmt, args); -| ^~~ -| 1 error generated. - -Upstream-Status: Pending -Signed-off-by: Khem Raj - -Index: libbonobo-2.32.1/bonobo/bonobo-debug.c -=================================================================== ---- libbonobo-2.32.1.orig/bonobo/bonobo-debug.c -+++ libbonobo-2.32.1/bonobo/bonobo-debug.c -@@ -47,6 +47,7 @@ bonobo_debug_init(void) - _bonobo_debug_file = stderr; - } - -+__attribute__((__format__ (printf, 2, 0))) - void - bonobo_debug_print (const char *name, char *fmt, ...) - { diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb deleted file mode 100644 index 8e00eb4d2..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require libbonobo.inc - -SRC_URI += "file://0001-Remove-use-of-G_DISABLE_DEPRECATED.patch \ - file://do-not-use-srcdir-variable.patch \ - file://fix-nonliteral-in-string.patch \ - " -SRC_URI[archive.md5sum] = "27fa902d4fdf6762ee010e7053aaf77b" -SRC_URI[archive.sha256sum] = "9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b" -GNOME_COMPRESS_TYPE="bz2" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb deleted file mode 100644 index b3ca0a465..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb +++ /dev/null @@ -1,23 +0,0 @@ -SECTION = "x11/gnome/libs" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" - -inherit gnomebase pkgconfig gtk-doc - -SRC_URI += "file://gcc5.patch \ - file://0001-bonobo-ui-node-qualify-functions-with-G_GNUC_PRINTF.patch \ - " - -SRC_URI[archive.md5sum] = "853be8e28aaa4ce48ba60be7d9046bf4" -SRC_URI[archive.sha256sum] = "fab5f2ac6c842d949861c07cb520afe5bee3dce55805151ce9cd01be0ec46fcd" -GNOME_COMPRESS_TYPE="bz2" - -DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gconf libxml2 libglade gnome-common intltool-native" - -FILES_${PN} += "${libdir}/libglade/2.0/*.so" -FILES_${PN}-dev += "${libdir}/libglade/2.0/*.la ${datadir}/gnome-2.0/ui \ - ${libdir}/bonobo-2.0/samples" -FILES_${PN}-staticdev += "${libdir}/libglade/2.0/*.a" -FILES_${PN}-dbg += "${libdir}/bonobo-2.0/samples/.debug \ - ${libdir}/libglade/2.0/.debug" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.42.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.42.bb deleted file mode 100644 index ae2ec5a59..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.42.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "Devilspie2 is a window matching utility, allowing the user to perform scripted actions on windows as they are created" -HOMEPAGE = "http://www.gusnan.se/devilspie2" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=00aefaa50aad75c21367df66102d542c \ - file://GPL3.txt;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = "gtk+ glib-2.0 libwnck lua virtual/libx11" - -SRC_URI = " \ - http://download.savannah.gnu.org/releases/${BPN}/${BPN}_${PV}-src.tar.gz \ - file://default.lua \ - file://devilspie2.desktop \ -" -SRC_URI[md5sum] = "f205409e921aa2d86481f1b8d518da45" -SRC_URI[sha256sum] = "11f5bc310fba4df404c057461ffb3fadac8ef51d211008c665c48f587a5a3f85" - -inherit pkgconfig gettext - -do_compile() { - export GTK2=1 - oe_runmake CC="${CC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS=" -ldl -lm ${LDFLAGS}" -} - -do_install() { - oe_runmake DESTDIR="${D}" PREFIX="${prefix}" install - install -d ${D}/${sysconfdir}/devilspie2 - install -m 644 ${WORKDIR}/default.lua ${D}/${sysconfdir}/devilspie2 - install -d ${D}/${sysconfdir}/xdg/autostart - install -m 644 ${WORKDIR}/devilspie2.desktop ${D}/${sysconfdir}/xdg/autostart -} diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb new file mode 100644 index 000000000..6ef8e8a62 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Devilspie2 is a window matching utility, allowing the user to perform scripted actions on windows as they are created" +HOMEPAGE = "http://www.gusnan.se/devilspie2" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=00aefaa50aad75c21367df66102d542c \ + file://GPL3.txt;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = "gtk+ glib-2.0 libwnck lua virtual/libx11" + +SRC_URI = " \ + http://download.savannah.gnu.org/releases/${BPN}/${BPN}_${PV}-src.tar.gz \ + file://default.lua \ + file://devilspie2.desktop \ +" +SRC_URI[md5sum] = "26eed0b5b4af5c7e13c551eceaeab832" +SRC_URI[sha256sum] = "ecffc17c62b41e196b72340192a90c4223329df041f135e74c0990860595f828" + +inherit distro_features_check pkgconfig gettext + +REQUIRED_DISTRO_FEATURES = "x11" + +do_compile() { + export GTK2=1 + oe_runmake CC="${CC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS=" -ldl -lm ${LDFLAGS}" +} + +do_install() { + oe_runmake DESTDIR="${D}" PREFIX="${prefix}" install + install -d ${D}/${sysconfdir}/devilspie2 + install -m 644 ${WORKDIR}/default.lua ${D}/${sysconfdir}/devilspie2 + install -d ${D}/${sysconfdir}/xdg/autostart + install -m 644 ${WORKDIR}/devilspie2.desktop ${D}/${sysconfdir}/xdg/autostart +} diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/devilspie/files/devilspie2.desktop b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/devilspie/files/devilspie2.desktop index e34e881cd..b80904a0d 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/devilspie/files/devilspie2.desktop +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/devilspie/files/devilspie2.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Type=Application Name=Devilspie2 +Comment=Perform scripted actions on windows as they are created Exec=devilspie2 -f /etc/devilspie2 diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch new file mode 100644 index 000000000..a821a14ab --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch @@ -0,0 +1,39 @@ +From 131b88a81aba3d72d566bc8a9d968941a98e0007 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 19 Dec 2017 16:37:20 +0100 +Subject: [PATCH] CMakeLists.txt: Remove TRY_RUN for iconv +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +| CMake Error: TRY_RUN() invoked in cross-compiling mode, please set the following cache variables appropriately: +| _correct_iconv_EXITCODE (advanced) + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8d07772..a2396f2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -521,13 +521,8 @@ if(NOT HAVE_ICONV) + endif(NOT HAVE_ICONV) + + set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBS}) +-CHECK_C_SOURCE_RUNS("#include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv) + unset(CMAKE_REQUIRED_LIBRARIES) + +-if(NOT _correct_iconv) +- message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv") +-endif(NOT _correct_iconv) +- + # ****************************** + # Backtraces for debugging + # ****************************** +-- +2.14.3 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch deleted file mode 100644 index b77e7b9bd..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-contact-Replace-the-Novell-sample-contact-with-somet.patch +++ /dev/null @@ -1,215 +0,0 @@ -From 4df8bd8ae4258289663b27af1207027c7ee06340 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 4 Aug 2013 09:13:25 +0200 -Subject: [PATCH 1/5] contact: Replace the Novell sample contact with something - more appropriate - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Martin Jansa ---- - addressbook/backends/file/Makefile.am | 1 + - addressbook/libedata-book/ximian-vcard.h | 179 ++++++++++++++++++------------- - 2 files changed, 103 insertions(+), 77 deletions(-) - -diff --git a/addressbook/backends/file/Makefile.am b/addressbook/backends/file/Makefile.am -index 08cf58f..17e7149 100644 ---- a/addressbook/backends/file/Makefile.am -+++ b/addressbook/backends/file/Makefile.am -@@ -2,6 +2,7 @@ ebook_backend_LTLIBRARIES = libebookbackendfile.la - - libebookbackendfile_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ -+ -DCREATE_DEFAULT_VCARD \ - -DG_LOG_DOMAIN=\"libebookbackend\" \ - -I$(top_srcdir) \ - -I$(top_builddir) \ -diff --git a/addressbook/libedata-book/ximian-vcard.h b/addressbook/libedata-book/ximian-vcard.h -index 782d37b..5b0b250 100644 ---- a/addressbook/libedata-book/ximian-vcard.h -+++ b/addressbook/libedata-book/ximian-vcard.h -@@ -1,80 +1,105 @@ - #define XIMIAN_VCARD \ - "BEGIN:VCARD\n" \ --"X-EVOLUTION-FILE-AS:Novell Ximian Group\n" \ --"ADR;TYPE=WORK:;Suite 500;8 Cambridge Center;Cambridge;MA;02142;USA\n" \ --"LABEL;TYPE=WORK:8 Cambridge Center, Suite 500\\nCambridge\\, MA\\n02142\\nUSA\n" \ --"TEL;WORK;VOICE:(617) 613-2000\n" \ --"TEL;WORK;FAX:(617) 613-2001\n" \ --"EMAIL;INTERNET:hello@ximian.com\n" \ --"URL:http://www.ximian.com/\n" \ --"ORG:Novell;Ximian Group\n" \ --"PHOTO;ENCODING=b;TYPE=JPEG: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\n" \ -+"VERSION:3.0\n" \ -+"FN:Yocto Project\n" \ -+"URL:http://www.yoctoproject.org/\n" \ -+"EMAIL:yocto@yoctoproject.org\n" \ -+"TEL;TYPE=VOICE:+00 000 000 0000\n" \ -+"ADR;TYPE=HOME:;1720 Beaver Creek;Dam #4;Planet Earth\n" \ -+"LABEL:1720 Beaver Creek\\nDam #4\\nPlanet Earth\n" \ -+"PHOTO;ENCODING=b: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\n" \ - "END:VCARD" --- -1.8.3.2 - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch deleted file mode 100644 index f82a76df3..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0e10e976025b21d12df099e82951f759024ad649 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 24 Aug 2017 22:04:56 -0700 -Subject: [PATCH] imapx: Fix signature for imapx_tokenise_struct() - -clang complains about different signature for this patch - -Fixes -camel/providers/imapx/camel-imapx-tokens.txt:56:1: error: conflicting types for 'imapx_tokenise_struct' -| imapx_tokenise_struct (register const char *str, register size_t len) -| ^ - -Signed-off-by: Khem Raj ---- - camel/providers/imapx/camel-imapx-tokens.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/camel/providers/imapx/camel-imapx-tokens.txt b/camel/providers/imapx/camel-imapx-tokens.txt -index d48501865..994c368c0 100644 ---- a/camel/providers/imapx/camel-imapx-tokens.txt -+++ b/camel/providers/imapx/camel-imapx-tokens.txt -@@ -1,7 +1,7 @@ - /* This contains all of the keywords we care about. These - can be converted to an id very efficiently */ - struct _imapx_keyword {const gchar *name; camel_imapx_id_t id; }; --struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register unsigned int len); -+struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register size_t len); - %% - ALERT, IMAPX_ALERT - APPENDUID, IMAPX_APPENDUID --- -2.14.1 - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch new file mode 100644 index 000000000..c8dc7e12c --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch @@ -0,0 +1,53 @@ +From 210b204d9edd71202454ff04013cc52b23c598e4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 19 Dec 2017 16:55:13 +0100 +Subject: [PATCH] CMakeLists.txt: remove CHECK_C_SOURCE_RUNS check +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* TRY_RUN: does not work for OE +* HAVE_LKSTRFTIME is set by recipe as configure option + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 23 ----------------------- + 1 file changed, 23 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a2396f2..f3b271b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -573,29 +573,6 @@ CHECK_C_SOURCE_COMPILES("#include + CHECK_C_SOURCE_COMPILES("#include + int main(void) { char *detail = nl_langinfo (_NL_ADDRESS_COUNTRY_AB2); return 0; }" HAVE__NL_ADDRESS_COUNTRY_AB2) + +-# ******************************************************* +-# Check to see if strftime supports the use of %l and %k +-# ******************************************************* +- +-CHECK_C_SOURCE_RUNS(" +- #include +- #include +- #include +- int main(int argc, char **argv) { +- char buf[10]; +- time_t rawtime; +- struct tm *timeinfo; +- +- time(&rawtime); +- timeinfo=localtime(&rawtime); +- buf[0] = 0; +- strftime(buf, 10, \"%lx%k\", timeinfo); +- +- if (!buf[0] || buf[0] == 'x' || strstr(buf, \"l\") || strstr(buf, \"k\")) +- return 1; +- return 0; +- }" HAVE_LKSTRFTIME) +- + # ****************************** + # system mail stuff + # ****************************** +-- +2.14.3 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch deleted file mode 100644 index 5f222aeaa..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-Fix-for-automake-1.12.x.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f46423c9e4b8b19eda27b307456a717de79b75f3 Mon Sep 17 00:00:00 2001 -From: Nitin A Kamble -Date: Sun, 4 Aug 2013 09:15:43 +0200 -Subject: [PATCH 2/5] Fix for automake-1.12.x - -Fixed these kinds if warning-errors - -warning: 'libebookbackendfile.la': linking libtool libraries using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac' - -Upstream-Status: Pending - -Signed-Off-By: Nitin A Kamble -Signed-off-by: Martin Jansa ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 9bd97db..49d7506 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -31,6 +31,7 @@ AC_LANG(C) - - dnl Automake 1.11 - Silent Build Rules - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12 - - dnl Required Package Versions - m4_define([glib_minimum_version], [2.28]) --- -1.8.3.2 - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch deleted file mode 100644 index a182d4d5e..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-Disable-Werror-for-automake.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 37b227cff78fd4c652651662dafd71537280824e Mon Sep 17 00:00:00 2001 -From: Nitin A Kamble -Date: Sun, 4 Aug 2013 09:16:59 +0200 -Subject: [PATCH 3/5] Disable Werror for automake - -Avoid these warning-errors - -automake: warnings are treated as errors -Makefile.am:15: warning: '%'-style pattern rules are a GNU make extension -Makefile.am:21: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name -addressbook/backends/file/Makefile.am: installing './depcomp' -addressbook/libebook/Makefile.am:55: warning: '%'-style pattern rules are a GNU make extension -addressbook/libebook/Makefile.am:65: warning: '%'-style pattern rules are a GNU make extension -addressbook/libebook/Makefile.am:66: warning: subst -,_,$*: non-POSIX variable name -addressbook/libebook/Makefile.am:66: (probably a GNU make extension) -addressbook/libebook/Makefile.am:72: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name -addressbook/libedata-book/Makefile.am:2: warning: '%'-style pattern rules are a GNU make extension -addressbook/libedata-book/Makefile.am:3: warning: subst -,_,$*: non-POSIX variable name -addressbook/libedata-book/Makefile.am:3: (probably a GNU make extension) -glib-gen.mak:9: warning: '%'-style pattern rules are a GNU make extension -addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here -glib-gen.mak:13: warning: '%'-style pattern rules are a GNU make extension -addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here -glib-gen.mak:18: warning: '%'-style pattern rules are a GNU make extension -addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here -glib-gen.mak:26: warning: '%'-style pattern rules are a GNU make extension -addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here -glib-gen.mak:38: warning: '%'-style pattern rules are a GNU make extension -addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here -glib-gen.mak:41: warning: '%'-style pattern rules are a GNU make extension -addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here -addressbook/libedata-book/Makefile.am:86: warning: '%'-style pattern rules are a GNU make extension -addressbook/libedata-book/Makefile.am:101: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name -calendar/backends/weather/Makefile.am:44: warning: '%'-style pattern rules are a GNU make extension -calendar/libecal/Makefile.am:53: warning: '%'-style pattern rules are a GNU make extension -calendar/libecal/Makefile.am:61: warning: '%'-style pattern rules are a GNU make extension -calendar/libecal/Makefile.am:62: warning: subst -,_,$*: non-POSIX variable name -calendar/libecal/Makefile.am:62: (probably a GNU make extension) calendar/libecal/Makefile.am:68: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name -calendar/libedata-cal/Makefile.am:5: warning: '%'-style pattern rules are a GNU make extension -calendar/libedata-cal/Makefile.am:6: warning: subst -,_,$*: non-POSIX variable name -calendar/libedata-cal/Makefile.am:6: (probably a GNU make extension) -glib-gen.mak:9: warning: '%'-style pattern rules are a GNU make extension -calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here -glib-gen.mak:13: warning: '%'-style pattern rules are a GNU make extension -calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here -glib-gen.mak:18: warning: '%'-style pattern rules are a GNU make extension -calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here -glib-gen.mak:26: warning: '%'-style pattern rules are a GNU make extension -calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here -glib-gen.mak:38: warning: '%'-style pattern rules are a GNU make extension -calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here -glib-gen.mak:41: warning: '%'-style pattern rules are a GNU make extension -calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here -calendar/libedata-cal/Makefile.am:71: warning: '%'-style pattern rules are a GNU make extension -calendar/libedata-cal/Makefile.am:86: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name -camel/Makefile.am:17: warning: '%'-style pattern rules are a GNU make extension -libebackend/Makefile.am:35: warning: '%'-style pattern rules are a GNU make extension -libebackend/Makefile.am:41: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name -libedataserver/Makefile.am:91: warning: '%'-style pattern rules are a GNU make extension -libedataserver/Makefile.am:97: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name -libedataserverui/Makefile.am:108: warning: '%'-style pattern rules are a GNU make extension -libedataserverui/Makefile.am:118: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name -servers/google/libgdata-google/Makefile.am:27: warning: '%'-style pattern rules are a GNU make extension -servers/google/libgdata-google/Makefile.am:33: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name -servers/google/libgdata/Makefile.am:31: warning: '%'-style pattern rules are a GNU make extension -servers/google/libgdata/Makefile.am:37: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name -servers/groupwise/Makefile.am:85: warning: '%'-style pattern rules are a GNU make extension -servers/groupwise/Makefile.am:91: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name -autoreconf: automake failed with exit status: 1 - -Upstream-Status: Inappropriate [embedded specific] - -Signed-Off-By: Nitin A Kamble -Signed-off-by: Martin Jansa - -Conflicts: - configure.ac ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 49d7506..1c802ff 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -21,7 +21,7 @@ m4_define([api_version], [1.2]) - dnl Autoconf / Automake Initialization - AC_PREREQ(2.62) - AC_INIT([evolution-data-server],[eds_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server]) --AM_INIT_AUTOMAKE([gnu 1.10 tar-ustar dist-xz no-dist-gzip -Wall -Wno-portability -Werror foreign]) -+AM_INIT_AUTOMAKE([gnu 1.10 tar-ustar dist-xz no-dist-gzip -Wall -Wno-portability foreign]) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_SRCDIR(README) - AC_CONFIG_HEADERS(config.h) --- -1.8.3.2 - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch new file mode 100644 index 000000000..3cdfa8b6f --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch @@ -0,0 +1,202 @@ +From 4df8bd8ae4258289663b27af1207027c7ee06340 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 4 Aug 2013 09:13:25 +0200 +Subject: [PATCH 1/5] contact: Replace the Novell sample contact with something + more appropriate + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Martin Jansa +--- + src/addressbook/libedata-book/ximian-vcard.h | 179 ++++++++++++++++++------------- + 2 files changed, 103 insertions(+), 77 deletions(-) + +diff --git a/src/addressbook/libedata-book/ximian-vcard.h b/src/addressbook/libedata-book/ximian-vcard.h +index 782d37b..5b0b250 100644 +--- a/src/addressbook/libedata-book/ximian-vcard.h ++++ b/src/addressbook/libedata-book/ximian-vcard.h +@@ -1,80 +1,105 @@ + #define XIMIAN_VCARD \ + "BEGIN:VCARD\n" \ +-"X-EVOLUTION-FILE-AS:Novell Ximian Group\n" \ +-"ADR;TYPE=WORK:;Suite 500;8 Cambridge Center;Cambridge;MA;02142;USA\n" \ +-"LABEL;TYPE=WORK:8 Cambridge Center, Suite 500\\nCambridge\\, MA\\n02142\\nUSA\n" \ +-"TEL;WORK;VOICE:(617) 613-2000\n" \ +-"TEL;WORK;FAX:(617) 613-2001\n" \ +-"EMAIL;INTERNET:hello@ximian.com\n" \ +-"URL:http://www.ximian.com/\n" \ +-"ORG:Novell;Ximian Group\n" \ +-"PHOTO;ENCODING=b;TYPE=JPEG:/9j/4AAQSkZJRgABAQEARwBHAAD//gAXQ3JlYXRlZCB3aXRo\n" \ +-" IFRoZSBHSU1Q/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCM\n" \ +-" cHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMj\n" \ +-" IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAbgBkAwEiAAIRAQMRAf/EA\n" \ +-" BwAAAIDAQEBAQAAAAAAAAAAAAAHBQYIBAMBAv/EAEYQAAEDAwEFBgMEBgQPAAAAAAECAwQABREG\n" \ +-" BxIhMWETIkFRcYEUkaEIMkLBFSNSsbLRFmJydRgkMzY3Q0RGgpKTosLh8P/EABsBAQACAwEBAAA\n" \ +-" AAAAAAAAAAAAEBQIDBgEH/8QALREAAQMCAwYGAgMAAAAAAAAAAQACAwQREiFRBRMiMUFhMnGBkb\n" \ +-" HRBsEUofD/2gAMAwEAAhEDEQA/AH/RRRREVwXe9W2wwFzbpNZixkc1uqwPQeZ6CoHXevLfom1ds\n" \ +-" 9h6a6D8PGCsFZHMk+CR4n86yzdbrqfaZqYBSnp0hRPZMoG62ynoOSR1Pua8Lg0XPJegX5Jv6k+0\n" \ +-" bBjrWxp22LlkcBIlHs0HqEjiR64peT9umupqyWrhHhpP4WI6eHureNW7Tmw+DGaTI1FJVJdxksM\n" \ +-" qKG09CrmfbFMCHpCw2xATDs8JrH4gykq+Z4mqifbMUZsxpd/QUllK53M2SCb2xa+bXvf0gcV0Uw\n" \ +-" 0R/DVktH2hdUwlpFxjQrg1490tLPuOH0pvv2qE4jdchx1p8lNAj91Va87OtM3RCt+2Nx3Dyci/q\n" \ +-" yPYcD7g1EZ+RR4rSMI9b/S2mhdbhKsmkdtWmNTuNxnXVW2cvgGZRASo+SV8j74PSmOlQUMpORWP\n" \ +-" NU7MrjY0rlQFmdDTxOE4cQOo8R1Hyqe2Z7ZJ2m32bXfHnJVpJCUuqO8uP7+Kenh4eVXkFRFUMxx\n" \ +-" G4UOSN0Zs4LU1FeEOWxOityYzqHWXEhSFoOQoHkQa963rBFFFFERUdfr1E09Y5d1mr3Y8ZsrV5n\n" \ +-" yA6k4A6mpGkL9ojUym0W/TrLmAsGU+AeYBwgfPJ/4RREqrrcb1tJ1oUpBXLmObqUZ7rSByT0SkZ\n" \ +-" J8zk1pHQmiLXo+zpbabC3SAp55Q7zyvM9PIUudiGmURbS7fpCMvzFFton8LSTxx6qH0FM7VV9VY\n" \ +-" 9MzZ7aQt5tASw3+26ohKB/zEVSVFVvZzGMw02tqe/kpbI8LMR6/C/Xxq9QagfbbP+IW1QQ4Rycf\n" \ +-" xncHRAIJ/rEfsmu2a9Fgsl2XIZjtj8bqwgfM1+9L2VFksESAV9o6hG886ebjqjvLWepUSarutdn\n" \ +-" MXV+obRcZks/CwCQ5DKMpeBOTxzwzgA9KwfTtfxPOSB5GQUXc9pOjoC+zXe2HV5xiOC6PmkEfWp\n" \ +-" xe6tAWghSVDIIOQRXxekNOx4b0WPZYLLTram19mwlJKSMHjjNUzQd2dZM7SNxczcLOsttqVzdYz\n" \ +-" 3FewI9iKpK2mjMZdFe7ed9NfT9qZDI4OAd1Vkko50ndoui22kuXq2NBOO9JZSOH9sD9/z86c8gc\n" \ +-" DUJNQlaFJUkKSoYII4EVGoKp9PIHt9e6lyRNlZhcqlsJ2guQpydL3F4mO7kw1KP3Fcyj0PEjrnz\n" \ +-" rSAIIyOVYfvsJ3TGqlCKpTfYuJfjLHMDOR8jw9q2Foy+o1FpWBckY/XMpUoeRxxHsciu/jeJGB7\n" \ +-" eRXPvaWuLT0U/RRRWaxQeVY82x3BVw2oXbJyhgoZR0AQM/UmthK+6fSsWbRQW9pV73x/tZPtwNE\n" \ +-" Wj9Nw0WuwwIKQAGI6G/cAZ+tRW0lx5nTEW4Ntqdat9xjy5CEjJLSFZP5H2qaYdCkpUk5BGQa7Ap\n" \ +-" DrSm3EpWhYKVJUMgg8wRXz+kqyyTG7VXUsV22Clrfc48+CzMiPIejvIC23EHIUDXNe79b7HbXbh\n" \ +-" c5SI8ZvmtZ5nyA5k9BS7d0nfdMPuSdD3JtEZaitdom5Uznx3DzT6cPWkvq/V1611fGW5nZtBCgy\n" \ +-" zFbXhtCycE5JxknxPhXR07RUeB3D11H+9lAfwcxmrrqLbxcHpikWGAw1FScByUkqWvrgEBPpxqi\n" \ +-" ztdXWdqmNqIIjx7gykJUphJCXAM/eBJ5g4PQCmBZNiDKWEu364uF0jJYh4AT6qUDn2FVu6bPIkT\n" \ +-" aTB08xKeMOU2H99eCtKRvZGQMZ7hwceNZxVGzsbmMzIBv5dfNeOjnsCdUwbTtKsV8nJgIccZkqw\n" \ +-" lJcThDqvJJz8s4zUtLVzpc2vZZKt+qBIkyUKt0V0ONKSe+7g5SCPDr9Kv0tznXP1cNMyQfxnXBC\n" \ +-" tqUyuB3gslftPjJLkGWB3u82o/Ij86bf2e7iqRoxyIpWfhpC0JHQ4V/5GlVtJcBt0RPiXif+00w\n" \ +-" Ps5BQtNxP4TJP8Ka6rZZJpW37/Kq68ATlPeiiirBQ0HlWR9t9qVbtpEp/dwiY0h5J8Mgbp/h+ta\n" \ +-" 4pM7fdKLumn2rxGbKn4BKl4HEtn73ywD7GiL7o28JuulLbKCsqLKUL/tJ7p+oqyIe4c6RGyzU4g\n" \ +-" THLNJc3WpCt9gk8A54j3GPcdaZuoosy82V23QpaYpkEIdeIJKUeIAHieXPkTXA11DuassJsCefY\n" \ +-" /SvYZN5FiGZU9edRwLDAXJny2mRukoStQBWQOQHjSjg7PYE7ZmzcZb7cG6KK5CZD6txOCcJQvPg\n" \ +-" QAQfAn2q6RNOWi1D9J3R5dwlR2xmZPVv9mlI8ByTj59ar09Lm0jUIQl5Y0zAUMrQSPiXfHHpyz4\n" \ +-" D1qTRvMQIieQAQXOtllfIDre/X2WqVmI8Qz6D9q0bP9SO37SrSpW8ZUVXw7q+YcKeSgeRyMZ65q\n" \ +-" qammvWTalEv1yjOJtaWfh25CBvBOUkHPlxUeHlyq/MiPCitxorSGWG07qG0DASK45xZlx3GJDaH\n" \ +-" WljCkLGQR6VGinY2ofIG8Lri2gOi37hxYG3zC+uT2HY6ZDbyFMrAUlwK7pB5HNRcp7nxqpzdN3G\n" \ +-" CFQ7NObTa3nApcaSN/suOe4SDw6VK3O4swojsp9WGmxk9fIDrW4UzWkbt2K/v691vjec8YtZUTa\n" \ +-" BL+IuMaIjiWWytXQn/wBD608tgtrVC0W2+tOFSFqd9icD6AVnmFFl6n1AhoAmRPdwcfgR4n2H7q\n" \ +-" 2Ppi1N2exRojaQlKEBIHkAK7Gmi3MTWaLn6iTeSF+qmaKKK3rSiuedEanQ3I7qQpC0kEEZzXRRR\n" \ +-" FjnaRoSVoq/KcYQv9HOr3mHB/qzz3SenhVi0ftAbnNNwLo6G5iQEodUcJd9fJX760ZqLTkHUdsd\n" \ +-" hTWEOtuJwQoVl/XGyS7aakOPwGnJcDORujK0DqPH2qJV0cdUzC/0Oi3QTuhddqY84IuFukwnFFK\n" \ +-" JDSmlEcwFDGR86ISI1tgtQ4jYaYaTuoSP/udJS1azvFoAZLnbsp4dm/klPQHmKs0faVEWkfEw32\n" \ +-" 1f1CFj8q56XZNSwYG5t7fSt46yB5ucimM5L4c643pXWqU5tCteMpRKUfIIH86ipmvnnAUwoQSf2\n" \ +-" 3lZ+g/nWEey5yfCtrquBo8Su0+4sQ46pEp1LTSeZUfoPOlnfr67fZKQlK0QkK/VtficV5nrXOkX\n" \ +-" XUk9KQHp0gnghI7qPyAp1bOdkCmH2rneQHHxxQjHdb9OvWr2j2c2Didm74VZVVplGFuQXRsc2fO\n" \ +-" Qgb1cmsSXQN1JH+TT4D+dPEAAADkK848duMylppISkDGBXrVkoCKKKKIiiqrrbX9m0JARIua1re\n" \ +-" dJDMdoArcI58+AA8zVLsO26RqiS9Gsukpct5lHaKbTLaSrd8wFEZ9s0RN6vGRGZktlDqAoHzFKq\n" \ +-" JtomzrPOuzGjZvwEBRTJfckttpbUOae9jJ5cBk8R514Wrbo7e489+3aTlvtQGTIkqElsdm2Mkq4\n" \ +-" 4zyPKiKf1Hsj09flKdXEQh4/jR3VfMUvJ/2et1ZMOe8keSgFfyqz2LbfJ1M9IZs2kJsx2O0XnEN\n" \ +-" yEAhA4ZwcZ58hxr7ZdtkvUS5SbTo2fJMRsuPkPoSG0jzKsDPPhz4HyoipDewC47+FXFWOjYH51Y\n" \ +-" bTsAgtrSqc88/jwWrA+QxUlYtujupZ6oNo0nLlSUtqdKEyW04SMZOVYHiKjP8ACUt5/wB3pX/XT\n" \ +-" /KiJnWLQ1nsTSURorad39lIFWZKUoThIAHSlNqDbLP0siKu96MnQ0ygSyVyGzvYxnlnB4jga87F\n" \ +-" ttlamXJbs2j50xcZvtXUtyEZCfPB5+gyaIm9RSetm3J68RbhJgaSmPM25vtZaviW09knjxIOM8j\n" \ +-" y8q7LHtzstwv/AOhrlBftkkudkFOLS43v5xgqSeHHx5daImrRX5QtK0hSTkGiiLMP2ho8wa1iSn\n" \ +-" QoxVRQ20fAKClFQ9eIqq7LLJe7vreG7ZZCoZhqD8iZjustjnnwORkY8c+Wa1ZqbStt1PBMa4MId\n" \ +-" Rz7wzg+dL8bEbA1vpa7RtK+CkpdWAfXjRFB7UpCNe6Kdm6NnJft1qluKuUJlvdKznPbYH3hzPXJ\n" \ +-" PMGqZsk/zc2gf3G5/Cumc3sRsTO92Rcb3uB3XVjP1r4jYfYGwoN76QsYUEurGR5HjREudhUt2BP\n" \ +-" 1TMYID0eyuuoJGRvJII+oq96I2iwtVz7rb7ZZWbalyzyJ9wKUjLsrKEkjH4cE8+Jz049bew+wNb\n" \ +-" 3Z76N4YO66sZHlzob2H2Bkktb6CRglLqxkeXOiJZbAv9IMj+7X/wB6ag9lGnEaj17CRJA+BhZmy\n" \ +-" lK+6EI44PQq3R6E06W9h9gZVvNb6FYxlLqwcfOhvYhYWt7s99G8MK3XVjI68aIo7UxgbR9IajhQ\n" \ +-" 7/Du9yiSF3S3tMNrStlkAAt94DPDI4eJFUvYfNetqNYz4xAfjWZx5skZAUnJHD1FMVrYhYWVbzW\n" \ +-" +2ojGUOrBx86EbD7A0FBvfRvDCt11YyPI8aIo23zdP6i2e621TaUJiXCfa1IucFPJt5KVnfHRWS\n" \ +-" euPPNZ2YadfkNsspUp1aglCU8yTyrTSNh9gbCgjfSFjCgl1YyPI8al9PbItP2WamUywkuJ5KOVE\n" \ +-" emeVEVw02ZH9H4YkEqdDYCifE4oqXbaS02lCRhIGBRRF//Z\n" \ ++"VERSION:3.0\n" \ ++"FN:Yocto Project\n" \ ++"URL:http://www.yoctoproject.org/\n" \ ++"EMAIL:yocto@yoctoproject.org\n" \ ++"TEL;TYPE=VOICE:+00 000 000 0000\n" \ ++"ADR;TYPE=HOME:;1720 Beaver Creek;Dam #4;Planet Earth\n" \ ++"LABEL:1720 Beaver Creek\\nDam #4\\nPlanet Earth\n" \ ++"PHOTO;ENCODING=b:iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pV\n" \ ++" UAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAFE9JREFUeJztnXmQHNV9xz\n" \ ++" +ve86dvU/tanUiCVwRQuaIhSEOMsIiEsbGRtiVGFy4EsdU4bINOICPUtkQHOxgYoiDTVJxCBiwM\n" \ ++" CBxBjAlsIUlEQzISAhZN5JW2l3tvbNz9JU/fu/N7CwgVquVmEr194/t7enu97p73vf9zvcbCBEi\n" \ ++" RIgQIUKECDH5UB/0DYwXwZv/Mh8AK3ISgBs4AwAR29oCwNwFfQBKLXY/mDucHFgf9A2EKEXZMiT\n" \ ++" YdtdUADff+QCA5Q/9BQB+Xk7w9a27vpxP8g0AO9J4IYA64/qOE3m/k4WQIWWGsmJI/q0fn2P+t5\n" \ ++" zerwFYDK0ACAgCAMsXRuCLqPDTQ7LvBgogSDY8DODWLvguQOLkv9t6Qm5+khAypMwQfiFlhkmZs\n" \ ++" vY/9rOzAXK59EkAEc87BDD9c99cC6CU8t7tumD/PQ0A/uCOHwF4Vm6pOWbnc20AlvIDOTnQF8nU\n" \ ++" hJOT3XQ/AK7jyJRWUSXHIw1vAQQV078BEJ1/7f9MwqMed4QMKTNMiCF/uP/ONgC7Y/ODAF52YCE\n" \ ++" ArhcBwMIDiMZiLkAsVX8fwClfvfOrALldd5wGYGe6HgRQQfpkABXxi/fjCKkCX6ihtJ6rtFAP8i\n" \ ++" Ny3nAfAJ4dk/OiCQBsZSn5vLoXIJ+aezVAxfxvPDCRZz5RCBlSZpgQQzbe+qXzAYLcwAMAgRM0A\n" \ ++" UTQ072Sf6JKmo8HWQVgNSc7AU6+YG4AELiZKXITIic8gsL92J5uyzXixzBGbx1tIA73yIMkK2Vr\n" \ ++" x/R5cg9KaXU40gCAH2//lOkjsm3WkwB97KoEyOHUA2TTw9J5U0MWwNm5rw9g3tfuzB3lqzpqhAw\n" \ ++" pM0QmclE0knIBvOywD+ApB4BAG2u2EmoEnnw+xEAAsODD7S0AuGLMKZRRnYRBRpMCfMMMLTNUIP\n" \ ++" vKc0u2WPoaSz+KbeuPPQXge8I+5XeLDAqsX5k+OnK7bwJwe50bAHLZfBWAo9v2DnfK3dnxtQCv3\n" \ ++" vH1WwB2TPnoWoDLLrvsXbXHY0HIkDLDhBhizzx1J4C7tXcYQAVOC4CtRYAVyKh2/DQA886ZoQAS\n" \ ++" VVGgaEqosTJsFEOUN8aJyNjB6JdeY+mxFZQ2qSwtQzw50c4eSJhjUW/wHwF275O+UpX1Its0w72\n" \ ++" 88eSPLAZwoiMfAWj1131aH3iOSUbIkDLDhBhy2me/vB9gw21XPQQQH8zcAOArmdADJ6MApp5SB0\n" \ ++" D1lKqS6wtjODBGuLYt/FGxJSM7fDNmglF/QRkfo2aORel5Zlvsy9NMKfbR0CLXJPZIG44n51hKP\n" \ ++" ncLfcp+3sknALxMunbsO5kshAwpM0yIIQaLrr3rRoD1t15ZB5AY6vx7gGhKRlxNe61oOLYto1Nf\n" \ ++" F2hmKE/LBTNqNVNglP3hyvyuCtfIvm/cYyqpt7Y+T2t8Y5lSuqsvEf60z4gD8MarYvVX1WibRZ/\n" \ ++" saHnlqOQWgFjDzFfe+60cG0KGlBkmNUC1/t9XngfQ1nTg1wDTZ9jizS3M23p4+qZz3X1ExoWy7E\n" \ ++" JbgXHyau1JG/0of0xbuo3A1Z97pZZ9gX3umC2gHQRkhrIAvLxeLHTbEoYYZntWbBjAr5t6HcDHr\n" \ ++" 73950d4DceEkCFlhmOSIWOx6LwqmYyzNdUAXrav5LiypTsVE39TwYYwE7w3yg7Rmo7RtgjMyDfX\n" \ ++" 2HrP7BsmGc1IU8pY8rbpsiinDItiCfEU19aLzdLZKYxJVNbtAnAq638CcMFxZIZByJAyw6TIkGD\n" \ ++" vc7MBvM5nNgCoYKAJINDD1dIeVxPLANGEKPirHNPSqEaNvDHMUKVbY5nbhimaIfq4r4IxVwW6uV\n" \ ++" EWvyf3Y2lZ0tNrdQFs3hb7KYCTaH4U4IJrb3/j/d7BZCFkSJlhUmRILuckAGKD2SYAnAwAFmL5Z\n" \ ++" jKZACCTFgs+OyzHs3kJLzg62S2fLxLW08ywtWyIxuRYLCG3XBGXbVV1BQCpSn2tlhWWHdVPKGIt\n" \ ++" MHZKiSEibfiabTXNElP5y2mNjwGoj9xywphhEDKkzDApDEnMW/YmQG7DDyS2PsBXAF7dsPNigDe\n" \ ++" 27msDCIzfyZZRa+mRGTExjFESzVKxkj6M1Vzwe3nCMiffr9uQ4w3V0nZzszTWWC99NDbK6E9WJg\n" \ ++" ttqmhC7I7KavFhxWqbAdxI5ZSjfQeThZAhZYbwCykzTKphGF904yb971UAv1l5hQPQ3uZdLZ1Jt\n" \ ++" KngXNT+EEuZgFVxfPgFhdUIYatkz1zrG/VYq7M5TxSFvQdlf9N22R/JSDi2rqo4L86cJprAwvl2\n" \ ++" L0BFW634VWKRD2yNSciQMsOkMsRg67rVVQDD69acBoCq1u73Uoeg75e6Q7xRrhO/4IfUzsPRHg+\n" \ ++" KLDNX+JackNTqbjwqR6qrdLBJG6X5UQGq/f362r2V1wF8tL71fwFinTM+sIz5kCFlhuPCkNxbW2\n" \ ++" YAJOxYG0CvttYefWUnAGfOqAfg9FbZ5rXj0LOL87uvKeIaEVHIudYukDHnKW34YRtnozxajzZCa\n" \ ++" 5Ki7laM0qar4non0ZoBiC/95uaJPO9kImRImeG4MCTiZWYDxJORaQDPbpTlfvslK4hUp4zas2bK\n" \ ++" fB9xSmULFI1EIzsK3nhvjLNRlTLH4M2DAwA8sWk/AOd9qA2AD0+rL56kU4yi5C/Wnzw47oc8Tgg\n" \ ++" ZUmY4LgyxLW8ugB94cYADg7mSlFETNIpoGng6dBtRxfHhaoejju7iGQYYd3spIQpamQlodQ8KC1\n" \ ++" 0tW/b3yf6HWopaVkVSZIibHT7l6J/y+CBkSJlhUhnyp6eeigPk9v52FkBUB6C0x5z+rIze2Y2SO\n" \ ++" KfGWOyj00BNwoMJapnAk9L6lTVG7JgosGFKbUq0Ks+X5QoZR6/a9YoGja95FnhOJUAQBDF9P/mj\n" \ ++" ffbJQsiQMsOkMiTa2akA0k5OfOCOhGaXzW8HoCct+6e31wCQ0dpVXssLNdr/ruVJoBliZIrJB1K\n" \ ++" 2DtkWBrz8Y3Sw2U3Cwnk66NSiA1mxaHEMKl8CaK4nnW1/+j6TiB0yJIRgUhmyZ+ZMF6Byy5ZuKO\n" \ ++" akTauS+Xx6jWzNqDbmhxfIuOjuOlxoK1mRAqD5zLMBmDp/AQAdL64FYHDPdgBc7ZuKxoWURitLa\n" \ ++" at/+fxpQHHkGc8ygGuqQyjlAsxbdvngBB6bTZs2tANYFfE5APPnLPyDOaaUGjqatkKGlBkmlSGL\n" \ ++" F0utqg0/ve4FAKWiVwPkA6cKIHB8naqpSuIiRvNpbGgotGVkQVWrRFNrpk4H4GC7bL0dkn8QT1S\n" \ ++" U3oRxZWkZFLeMbFHvcAd4nvwfj9dMaKn0s8/ffzHAa5s2rgF4fNUaABoaG3abc35868rLAK65/n\n" \ ++" vjStAOGVJmOC7VgFYGIhTO/+dr7gDIDXd+CSDieUmASCFzuvQu7FFtFOZ8bU3bKdHMRgYlPTWql\n" \ ++" 5sZJcvEO4yZkdNZEb5ehOPp4zkVKdj4qqLuBYDPfu/ujx/N8z3x9H2fkrbdVQB73z4YA3ju8acD\n" \ ++" gP7unsJ7bZnSlgGYffKsCwFuve3u3x6p7ZAhZYYTUi9rzc1f/i5A98G3vw9Qoxf3VyVFhMULDqv\n" \ ++" Rlrp8ZhVSQsdEG8fE1M3WK0QG5eysF+QAPMt+HcCJVj5i+vibW/7zNnjv4jjveI41v1gE4OFLTS\n" \ ++" 7sNgBli99goH9QATy3+qkCC/ds26kAmqc0DwEsXXrRJQBXX3f98+/WR8iQMsNx8fYaGN/QvXddd\n" \ ++" T7Azr1iAO/auQcA1xGpYevRPm9mMYktEZNYSTIqW9ss3DFMcOUaNyeDeyAt+4Pa+LF04kheW//1\n" \ ++" 7W3bASJnT/9X08d4mfHLX981FyDvuqKNRWyd+Ie+F6F2MiUa3+KLLixQ/Yn06gBgsKurCuB3v3v\n" \ ++" uh/rQGe/WV8iQMkP4hZQZjotQf+WXP28EcBP+zwCG4sGnAQb6hy2A7l1bFcCiOgmvbu8Wj8Xat4\n" \ ++" vFdmrrqgFIJHX1B1MVVmc9ZLK6jsqQTINbtsv+nsOy/cxZcn0kIVpBqqVOAbTHpz1m+vjKd/6tU\n" \ ++" Bno3fDoow9MA3C9YUkAjFp1UHT1eDrDIghMtQh94SgnaW5EVmP96r/ulRXJmXwHwA/vuvN0gIUL\n" \ ++" z+ka3WfIkDLDMTHk9f++NgUQT0eaAEac3JUAvV2Hvg6wr3egGmD3iIzqs5b/FQCREUnrPCsiAy+\n" \ ++" bl1F0y7qBQttVzbLUpLJCC/WoKACONghHRoQJ+3d1A9CxR5gyNCLH/3yOFB46c34rANs6DwYAFf\n" \ ++" 3FRSgNze1vAcSTkRsAalMtUrZ8SnsGwG+s3ghgRW0p6myq22nXj6etUM8kXhgaB6MWoUTFy9nXI\n" \ ++" UR45uHHfgTw9Avr/+GdbzRkSNlhQmrvlv/49gyA6NDw7QD5bN8lAP6weJrNiLeaWgKAzte3K4C8\n" \ ++" /v47B2UARdNSN3HJKcKCl94qEna7Tua0IibZQa6Ja89HhTYYG4fkeI1OfqhNySO98baEbrd3Sr5\n" \ ++" odVRmgznVscLojXXvPwUgn0isBhipEpbVTm0GQNutONoLalnWEWeUIChlEICn1fDmltbV8N7MMA\n" \ ++" gZUmYYN0N2r/1Foc5Udstr3wIg138JQKATCNxAhrEKZCQ5VlIBXLrkPACaDu0DYOfmHQAMW5I5F\n" \ ++" 3xY5vmVFxb7+/4a0bjmatnRpjPmDudlgL+o5VKVzmqoTsjxXp1CGtGGpakE0ZeTezw0VJQhlQlp\n" \ ++" O6mrGFHfqAA2bJT40vwzTpf7ntqqQ7263uOYFKRgTOZ3aWK49RiAW2t9gXEgZEiZYdwM6d38ZiE\n" \ ++" HM54fOgPAz4umk8nLMM27kpvpOTJENq2XmExSj5zzW8S1UN8j2lTPdAm7Zl4TO2T+1mII958qpI\n" \ ++" 2WKaJtDc+eAUDt1l0A/G1C2KUCGfmNmkkHtUP+qRHZf13HiWt0FQl3OF3ow6/XNX4rErJaWAe79\n" \ ++" u4Q+2jX9r0AXHL5ZdJ3kwTQXLO+PijZoHSuUhCo9aYP2/a/CnDF0iuKHR8BIUPKDOPXspLFUGkm\n" \ ++" I3Oun5XRmdajMK0ZM5AVbaVrUOTAqoyMqFPrJCUn1yo2wut/Et28tUOOVwcFMUWtkS/aYu8+YxE\n" \ ++" ATXtEDjVrmRBTIitSMWHEbJ1gl9d1fdf3y3k9SNtWtugNmK3lj601obgenhVVcp993aKprb53FQ\n" \ ++" CXXiliIFktCRieXmFkGdPcsg4CpJI115s+VnxyxdscBUKGlBnGzZDTTzqv4HN5qXfViwBZV50JM\n" \ ++" JyRytWDOWHI7l5JbN6ake97d81skTE1LQrg2ks/BsCT9z0NwOY+sbaXnrug0N+da34PwEU7JGQ7\n" \ ++" c794vndoP9Kd/RLSnabXoX9xkSTjPfuaeAEe7hdZslWZer5yXrKY7MD2nhEFUF8hsizWI9b8SXO\n" \ ++" mK4BX+6RvNysOtGdWP6kAPnHJ8gAgkUpqH5bqArDtxOcBVnxyxe/e80W+D0KGlBnGzRC1uPhzdC\n" \ ++" /+9Ns/ARgeGJgG0DGUXQLQPTB8AGBzt5SuPhhtOB3Ar2tIAGw4JMx5/hWxQ7py0v36PgnpLpozt\n" \ ++" 9Df7mYZ6Vcf0rlrGZMYYcK+woAfzJH9tC+y5O4D0lZXXIJdkZSMfs/8RFIuU7BDtg1k0gDVKacX\n" \ ++" gM7N0wDmnHlmL8CfLZwfA/jjy5sqAboPCINeenatAjh36ZJBgGgscTnAFy79whETGMaDkCFlhmP\n" \ ++" y9r696rYkwM+fWf95gG279n8OoLM/PRWgI8fJAJ2pKVGAkXpJeivQUntLnRHRqM6e11Zoe5tekt\n" \ ++" aTLy0uYIziuOQusETcTgxpL/Dve6T1IKK3+gnjfQcBaBop2jqtFXZeN5oGUL5bBzB9SuPNABd/8\n" \ ++" Yu/AXjt5ZcfAXjzj3+sB1BW0AfwieUXXQnwtWu+s2Ycr2tcCBlSZjgmhtz07etOAtj86saNAE5m\n" \ ++" pBYgl3ctAE/n6gxlZUnbznxKAfQ0zAIgSIhtYGr0Wn7RSRQoPefrytaB+XUEnSJqKlmbKkAmLcj\n" \ ++" Tn1s6CTvZK3bL9LyIicZUtNCJrbMrzHK5vF4EWlFVGQC0z5p1GsA55yw+AOA72cUA6ezwawDXXH\n" \ ++" PjrqN4XeNCyJAywzEx5IpPffwJAC+fWwaQ1dZzoNtNZyUuMqLj33kdD+90RfM5VK1/TiQqlq/yi\n" \ ++" pE2W7mOfOZmAGxNEU9XCAgsKwngWzrrzpKN0nHu6NBBBTAzIzZOoy6YGo0Ux2ChrKPeutpGsXW9\n" \ ++" 3qbW1ucBVj365JKjfzsTQ8iQMsOEIobf+PJfnwrQsXf3qQC5jKhCvv6Vm5z2ablBacVqSy8NaLI\n" \ ++" kUhjpk/m9XzPEihfrXiz72MduBVix5NyHAJYtW9YF8MILLzQB/OSBxy8C2LZ330UAnQNDCwGC9E\n" \ ++" AKoCUv2lS9DvtFDDPUaIYYQhbctvIcOu6RT4+ce3Rv5tgRMqTMEH4hZYYJTVmeE9QA+L5UqjSra\n" \ ++" ANLV/XxSjPSi9+7WW0rbo5qW85PepL1oLLFckCnpOxfASxfvnzLmO479XYzwLp16x4C+Ob1Nz4C\n" \ ++" MJTvWQCQiprqQDpLXt+Tskb9JIapYl5YA19aN8Vx8/H3exeTjZAhZYYJMSTrcxgg70uBw+IaDTn\n" \ ++" ujd2aWldarTSV5Fy9TtwPxECrb6j9jenj+ptuehPghptvPuK9ZLq6+gHswBUdW7PQ9WSs2VrVDm\n" \ ++" zzG0klY1BSQY2DZUxloVi8YkKrco8FIUPKDBNiyJeuurwD4I5bbt8IMJLubgfIZXMWjKqXaKrCm\n" \ ++" a1ZuK5LNtTU1h8GaG+fthLg/oceusv0oVQxkHQkXPCZz/QA3HPPPSsAnn7y8SsBeroOnwtg4y8A\n" \ ++" yOez8qORjluQC+YHJH1fll1F7UgOIJlK7gOYPmvubXLmpP863nsiZEiZYVKWI6xc+a2FAHv/tP1\n" \ ++" cgM7OzmqAwLdaARzP6QCobajrA5gza+5LALfefuJ+BsKgt7d3xtjP6urqxP2u1OF3XnFiETIkRI\n" \ ++" gQIUKE+H+C/wMGX8Ias1s6CQAAAABJRU5ErkJggg==\n" \ + "END:VCARD" +-- +1.8.3.2 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch deleted file mode 100644 index 138334798..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 2c73b588b9018cb59c666eae3a15fa1af42c56be Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 4 Aug 2013 10:57:08 +0200 -Subject: [PATCH 4/5] configure: Fix libical pkg-config trying to use host - paths - -Signed-off-by: Martin Jansa ---- - calendar/libecal/libecal.pc.in | 2 +- - configure.ac | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/calendar/libecal/libecal.pc.in b/calendar/libecal/libecal.pc.in -index fc6b359..d3435bb 100644 ---- a/calendar/libecal/libecal.pc.in -+++ b/calendar/libecal/libecal.pc.in -@@ -12,4 +12,4 @@ Description: Client library for evolution calendars - Version: @VERSION@ - Requires: libical >= @LIBICAL_REQUIRED@ libedataserver-1.2 gio-2.0 - Libs: -L${libdir} -lecal-1.2 --Cflags: -I${privincludedir} @LIBICAL_EXTRA_CFLAGS@ -+Cflags: -I${privincludedir} -diff --git a/configure.ac b/configure.ac -index 1c802ff..f1d4ce8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1351,7 +1351,8 @@ dnl to differentiate between and - dnl We have fixed all our instances to use . Until the .pc from - dnl libical is fixed, we have to work-around the buggy CFlags. - dnl ***** -- LIBICAL_EXTRA_CFLAGS=" -I`$PKG_CONFIG --variable=includedir libical` " -+ m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$]) -+ LIBICAL_EXTRA_CFLAGS=" -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir libical` " - LIBICAL_EXTRA_LIBS="" - AC_SUBST(LIBICAL_EXTRA_CFLAGS) - AC_SUBST(LIBICAL_EXTRA_LIBS) --- -1.8.3.2 - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch deleted file mode 100644 index addf2ee8d..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch +++ /dev/null @@ -1,77 +0,0 @@ -From ac95e89749a01618f98b554a98e78d7c988bfc10 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Tue, 27 Nov 2012 08:46:51 +0100 -Subject: [PATCH 5/5] soup: adapt to new libxml2 API from 2.9.0 - -* for more info see - https://mail.gnome.org/archives/xml/2012-August/msg00005.html - -Signed-off-by: Martin Jansa ---- - calendar/backends/caldav/e-cal-backend-caldav.c | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c -index 12f8f22..5555a3e 100644 ---- a/calendar/backends/caldav/e-cal-backend-caldav.c -+++ b/calendar/backends/caldav/e-cal-backend-caldav.c -@@ -1172,8 +1172,13 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav) - soup_message_set_request (message, - "application/xml", - SOUP_MEMORY_COPY, -+#ifdef LIBXML2_NEW_BUFFER -+ (gchar *) xmlOutputBufferGetContent(buf), -+ xmlOutputBufferGetSize(buf)); -+#else - (gchar *) buf->buffer->content, - buf->buffer->use); -+#endif - - /* Send the request now */ - send_and_handle_redirection (priv->session, message, NULL); -@@ -1321,8 +1326,13 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav, - soup_message_set_request (message, - "application/xml", - SOUP_MEMORY_COPY, -+#ifdef LIBXML2_NEW_BUFFER -+ (gchar *) xmlOutputBufferGetContent(buf), -+ xmlOutputBufferGetSize(buf)); -+#else - (gchar *) buf->buffer->content, - buf->buffer->use); -+#endif - - /* Send the request now */ - send_and_handle_redirection (priv->session, message, NULL); -@@ -1715,8 +1725,14 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav) - soup_message_set_request (message, - "application/xml", - SOUP_MEMORY_COPY, -+#ifdef LIBXML2_NEW_BUFFER -+ (gchar *) xmlOutputBufferGetContent(buf), -+ xmlOutputBufferGetSize(buf)); -+#else - (gchar *) buf->buffer->content, - buf->buffer->use); -+#endif -+ - - /* Send the request now */ - send_and_handle_redirection (priv->session, message, NULL); -@@ -1765,8 +1781,13 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav) - soup_message_set_request (message, - "application/xml", - SOUP_MEMORY_COPY, -+#ifdef LIBXML2_NEW_BUFFER -+ (gchar *) xmlOutputBufferGetContent(buf), -+ xmlOutputBufferGetSize(buf)); -+#else - (gchar *) buf->buffer->content, - buf->buffer->use); -+#endif - - /* Send the request now */ - send_and_handle_redirection (priv->session, message, NULL); --- -1.8.3.2 - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch deleted file mode 100644 index 741e5e97d..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3feaea8e84b3ad8dc2d551e42224f3b4a9413e7d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 3 Sep 2015 11:14:24 +0200 -Subject: [PATCH] configure.ac: do not overwrite localedir -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Backport [1] - -[1] https://git.gnome.org/browse/evolution-data-server/tree/configure.ac#n298 - -Signed-off-by: Andreas Müller ---- - configure.ac | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f1d4ce8..cee847f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -257,9 +257,6 @@ GETTEXT_PACKAGE=evolution-data-server-$BASE_VERSION - AC_SUBST(GETTEXT_PACKAGE) - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext]) - --localedir='$(prefix)/$(DATADIRNAME)/locale' --AC_SUBST(localedir) -- - dnl ****************************** - dnl Initialize libtool - dnl ****************************** --- -2.1.0 - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb new file mode 100644 index 000000000..2303b8f18 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb @@ -0,0 +1,130 @@ +SUMMARY = "Evolution database backend server" +HOMEPAGE = "http://www.gnome.org/projects/evolution/" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "LGPLv2 & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ + file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \ + file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543 \ + file://src/calendar/libecal/e-cal.h;endline=24;md5=e699ec3866f73f129f7a4ffffdcfc196" + +DEPENDS = " \ + intltool-native gperf-native \ + glib-2.0 gtk+3 gconf libgnome-keyring libgdata \ + dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \ +" + +inherit distro_features_check gnomebase cmake gtk-doc gettext gobject-introspection perlnative pythonnative + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI += " \ + file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \ + file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \ + file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \ + file://iconv-detect.h \ +" +SRC_URI[archive.md5sum] = "568a21a4df4e0ec985c849b38fc66908" +SRC_URI[archive.sha256sum] = "63b1ae5f76be818862f455bf841b5ebb1ec3e1f4df6d3a16dc2be348b7e0a1c5" + +LKSTRFTIME = "HAVE_LKSTRFTIME=ON" +LKSTRFTIME_libc-musl = "HAVE_LKSTRFTIME=OFF" + +EXTRA_OECMAKE = " \ + -DWITH_KRB5=OFF \ + -DENABLE_GOA=OFF \ + -DENABLE_UOA=OFF \ + -DENABLE_GOOGLE_AUTH=OFF \ + -DENABLE_WEATHER=OFF \ + -D${LKSTRFTIME} \ +" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap" + +EXTRA_OECONF = "--with-libdb=${STAGING_DIR_HOST}${prefix} \ + --disable-nntp --disable-gtk-doc" + +# -ldb needs this on some platforms +LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0" + +do_configure_append () { + cp ${WORKDIR}/iconv-detect.h ${S}/src + + # fix native perl shebang + sed -i 's:${STAGING_BINDIR_NATIVE}/perl-native:${bindir}:' ${B}/src/tools/addressbook-export/csv2vcard +} + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/camel/.libs:${B}/libedataserver/.libs" +} + + +PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \ + libedata-book libedata-book-dev libedata-cal libedata-cal-dev \ + libedataserver libedataserver-dev \ + libedataserverui libedataserverui-dev" + +FILES_${PN} =+ "${systemd_user_unitdir} \ + ${datadir}/dbus-1 \ + ${datadir}/evolution-data-server-*/ui/" +RDEPENDS_${PN} += "perl" + +FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc" +FILES_${PN}-dbg =+ "${libdir}/evolution-data-server*/camel-providers/.debug \ + ${libdir}/evolution-data-server*/calendar-backends/.debug \ + ${libdir}/evolution-data-server*/addressbook-backends/.debug \ + ${libdir}/evolution-data-server*/extensions/.debug/" + +RRECOMMENDS_${PN}-dev += "libecal-dev libebook-dev" + +FILES_libcamel = "${libdir}/libcamel-*.so.* \ + ${libdir}/libcamel-provider-*.so.* \ + ${libdir}/evolution-data-server*/camel-providers/*.so \ + ${libdir}/evolution-data-server*/camel-providers/*.urls" +FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so \ + ${libdir}/pkgconfig/camel*pc \ + ${libdir}/evolution-data-server*/camel-providers/*.la \ + ${includedir}/evolution-data-server*/camel" + +FILES_libebook = "${libdir}/libebook-*.so.*" +FILES_libebook-dev = "${libdir}/libebook-1.2.so \ + ${libdir}/pkgconfig/libebook-*.pc \ + ${includedir}/evolution-data-server*/libebook/*.h" +RRECOMMENDS_libebook = "libedata-book" + +FILES_libecal = "${libdir}/libecal-*.so.* \ + ${datadir}/evolution-data-server-1.4/zoneinfo" +FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc \ + ${includedir}/evolution-data-server*/libecal/*.h \ + ${includedir}/evolution-data-server*/libical/*.h" +RRECOMMENDS_libecal = "libedata-cal tzdata" + +FILES_libedata-book = "${libexecdir}/e-addressbook-factory \ + ${datadir}/dbus-1/services/*.AddressBook.service \ + ${libdir}/libedata-book-*.so.* \ + ${libdir}/evolution-data-server-*/extensions/libebook*.so \ + ${datadir}/evolution-data-server-1.4/weather/Locations.xml" +FILES_libedata-book-dev = "${libdir}/libedata-book-*.so \ + ${libdir}/pkgconfig/libedata-book-*.pc \ + ${libdir}/evolution-data-server-*/extensions/libebook*.la \ + ${includedir}/evolution-data-server-*/libedata-book" + +FILES_libedata-cal = "${libexecdir}/e-calendar-factory \ + ${datadir}/dbus-1/services/*.Calendar.service \ + ${libdir}/libedata-cal-*.so.* \ + ${libdir}/evolution-data-server-*/extensions/libecal*.so" +FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so \ + ${libdir}/pkgconfig/libedata-cal-*.pc \ + ${includedir}/evolution-data-server-*/libedata-cal \ + ${libdir}/evolution-data-server-*/extensions/libecal*.la" + +FILES_libedataserver = "${libdir}/libedataserver-*.so.*" +FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \ + ${libdir}/pkgconfig/libedataserver-*.pc \ + ${includedir}/evolution-data-server-*/libedataserver/*.h" + +FILES_libedataserverui = "${libdir}/libedataserverui-*.so.* ${datadir}/evolution-data-server-1.4/glade/*.glade" +FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \ + ${libdir}/pkgconfig/libedataserverui-*.pc \ + ${includedir}/evolution-data-server-*/libedataserverui/*.h" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb deleted file mode 100644 index aadc4b5e3..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb +++ /dev/null @@ -1,116 +0,0 @@ -SUMMARY = "Evolution database backend server" -HOMEPAGE = "http://www.gnome.org/projects/evolution/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "LGPLv2 & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ - file://camel/camel.h;endline=24;md5=b02175c88f821224746b347a89731a2b \ - file://libedataserver/e-data-server-util.h;endline=20;md5=934502f03c84523aa059d4825887b380 \ - file://calendar/libecal/e-cal.h;endline=24;md5=5d496b9b6fd2a4fdbbfc31ef9455c9d0" - -DEPENDS = "intltool-native glib-2.0 gtk+3 gconf dbus db virtual/libiconv zlib libsoup-2.4 libglade libical libgnome-keyring gperf-native libgdata nss" - -SRCREV = "a9e4e74ec4473a4fd09e56b690bd4fa72f686687" - -# 3.4 series needs libgdata-0.10*, 3.8 series needs also libsecret instead of gnome-keyring -PV = "3.2.3+git${SRCPV}" - -SRC_URI = "git://git.gnome.org/evolution-data-server;branch=gnome-3-2 \ - file://0001-contact-Replace-the-Novell-sample-contact-with-somet.patch \ - file://0002-Fix-for-automake-1.12.x.patch \ - file://0003-Disable-Werror-for-automake.patch \ - file://0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch \ - file://0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch \ - file://0006-configure.ac-do-not-overwrite-localedir.patch \ - file://iconv-detect.h \ - file://0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch \ - " - -S = "${WORKDIR}/git" - -inherit autotools gtk-doc pkgconfig gettext gobject-introspection - -# -ldb needs this on some platforms -LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0" - -# Parallel make shows many issues with this source code. -# Current problems seem to be duplicate execution of the calander/backends -# directories by make resulting in truncated/corrupt .la files -#PARALLEL_MAKE = "" - -do_configure_append () { - cp ${WORKDIR}/iconv-detect.h ${S} -} - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/camel/.libs:${B}/libedataserver/.libs" -} - -EXTRA_OECONF = "--without-openldap \ - --with-libdb=${STAGING_DIR_HOST}${prefix} \ - --disable-nntp --disable-goa --disable-weather --disable-gtk-doc" - -PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \ - libedata-book libedata-book-dev libedata-cal libedata-cal-dev \ - libedataserver libedataserver-dev \ - libedataserverui libedataserverui-dev" - -FILES_${PN} =+ "${datadir}/evolution-data-server-*/ui/" -FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc" -FILES_${PN}-dbg =+ "${libdir}/evolution-data-server*/camel-providers/.debug \ - ${libdir}/evolution-data-server*/calendar-backends/.debug \ - ${libdir}/evolution-data-server*/addressbook-backends/.debug \ - ${libdir}/evolution-data-server*/extensions/.debug/" - -RRECOMMENDS_${PN}-dev += "libecal-dev libebook-dev" - -FILES_libcamel = "${libdir}/libcamel-*.so.* \ - ${libdir}/libcamel-provider-*.so.* \ - ${libdir}/evolution-data-server*/camel-providers/*.so \ - ${libdir}/evolution-data-server*/camel-providers/*.urls" -FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so \ - ${libdir}/pkgconfig/camel*pc \ - ${libdir}/evolution-data-server*/camel-providers/*.la \ - ${includedir}/evolution-data-server*/camel" - -FILES_libebook = "${libdir}/libebook-*.so.*" -FILES_libebook-dev = "${libdir}/libebook-1.2.so \ - ${libdir}/pkgconfig/libebook-*.pc \ - ${includedir}/evolution-data-server*/libebook/*.h" -RRECOMMENDS_libebook = "libedata-book" - -FILES_libecal = "${libdir}/libecal-*.so.* \ - ${datadir}/evolution-data-server-1.4/zoneinfo" -FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc \ - ${includedir}/evolution-data-server*/libecal/*.h \ - ${includedir}/evolution-data-server*/libical/*.h" -RRECOMMENDS_libecal = "libedata-cal tzdata" - -FILES_libedata-book = "${libexecdir}/e-addressbook-factory \ - ${datadir}/dbus-1/services/*.AddressBook.service \ - ${libdir}/libedata-book-*.so.* \ - ${libdir}/evolution-data-server-*/extensions/libebook*.so \ - ${datadir}/evolution-data-server-1.4/weather/Locations.xml" -FILES_libedata-book-dev = "${libdir}/libedata-book-*.so \ - ${libdir}/pkgconfig/libedata-book-*.pc \ - ${libdir}/evolution-data-server-*/extensions/libebook*.la \ - ${includedir}/evolution-data-server-*/libedata-book" - -FILES_libedata-cal = "${libexecdir}/e-calendar-factory \ - ${datadir}/dbus-1/services/*.Calendar.service \ - ${libdir}/libedata-cal-*.so.* \ - ${libdir}/evolution-data-server-*/extensions/libecal*.so" -FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so \ - ${libdir}/pkgconfig/libedata-cal-*.pc \ - ${includedir}/evolution-data-server-*/libedata-cal \ - ${libdir}/evolution-data-server-*/extensions/libecal*.la" - -FILES_libedataserver = "${libdir}/libedataserver-*.so.*" -FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \ - ${libdir}/pkgconfig/libedataserver-*.pc \ - ${includedir}/evolution-data-server-*/libedataserver/*.h" - -FILES_libedataserverui = "${libdir}/libedataserverui-*.so.* ${datadir}/evolution-data-server-1.4/glade/*.glade" -FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \ - ${libdir}/pkgconfig/libedataserverui-*.pc \ - ${includedir}/evolution-data-server-*/libedataserverui/*.h" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb index 78a949526..c7ecf2ba5 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb @@ -7,6 +7,8 @@ PR = "r5" inherit gnome pkgconfig gtk-icon-cache gsettings gobject-introspection distro_features_check systemd +REQUIRED_DISTRO_FEATURES = "x11" + SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0001-help-remove-YELP-macro.patch \ file://0001-Add-format-attribute-to-_synctex_malloc.patch \ diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml deleted file mode 100644 index f8c2e9cc2..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml +++ /dev/null @@ -1,492 +0,0 @@ - - - - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - /bin/true - - - - - - - - - - - - - - - - - - - - - /bin/true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /bin/true - - - gdm-screenshot - - - - - disabled - - - disabled - - - disabled - - - disabled - - - disabled - - - disabled - - - disabled - - - Print - - - disabled - - - disabled - - - - - - - - - - - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - Disabled - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - gdm-screenshot - - -
  • - cube -
    • -
  • - decoration -
    • -
  • - gconf -
    • -
  • - glib -
    • -
  • - move -
    • -
  • - place -
    • -
  • - resize -
    • -
  • - screenshot -
    • -
  • - wobbly -
    • -     -     -     -     -     - - - - - - - - - - - - - - - - -     -     diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/Default b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/Default deleted file mode 100755 index a7a7fcf7f..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/Default +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh -# Stolen from the debian kdm setup, aren't I sneaky -# Plus a lot of fun stuff added -# -George - -PATH="/usr/bin:$PATH" -OLD_IFS=$IFS - -gdmwhich () { - COMMAND="$1" - OUTPUT= - IFS=: - for dir in $PATH - do - if test -x "$dir/$COMMAND" ; then - if test "x$OUTPUT" = "x" ; then - OUTPUT="$dir/$COMMAND" - fi - fi - done - IFS=$OLD_IFS - echo "$OUTPUT" -} - -sysresources=/etc/X11/Xresources - -# merge in defaults -if [ -f "$sysresources" ]; then - xrdb -merge "$sysresources" -fi - -sysmodmap=/etc/X11/Xmodmap - -XMODMAP=`gdmwhich xmodmap` -if [ "x$XMODMAP" != "x" ] ; then - if [ "x$GDM_PARENT_DISPLAY" = "x" ]; then - if [ -f $sysmodmap ]; then - $XMODMAP $sysmodmap - fi - else - ( DISPLAY=$GDM_PARENT_DISPLAY XAUTHORITY=$GDM_PARENT_XAUTHORITY $XMODMAP -pke ) | $XMODMAP - - fi - - # - # Switch Sun's Alt and Meta mod mappings - # - - UNAME=`gdmwhich uname` - PROCESSOR=`$UNAME -p` - if [ "x$PROCESSOR" = "xsparc" ]; then - if $XMODMAP | /usr/bin/grep mod4 | /usr/bin/grep Alt > /dev/null 2>/dev/null - then - $XMODMAP -e "clear Mod1" \ - -e "clear Mod4" \ - -e "add Mod1 = Alt_L" \ - -e "add Mod1 = Alt_R" \ - -e "add Mod4 = Meta_L" \ - -e "add Mod4 = Meta_R" - fi - fi -fi - -SETXKBMAP=`gdmwhich setxkbmap` -if [ "x$SETXKBMAP" != "x" ] ; then - # FIXME: is this all right? Is this completely on crack? - # What this does is move the xkb configuration from the GDM_PARENT_DISPLAY - # FIXME: This should be done in code. Or there must be an easier way ... - if [ -n "$GDM_PARENT_DISPLAY" ]; then - XKBSETUP=`( DISPLAY=$GDM_PARENT_DISPLAY XAUTHORITY=$GDM_PARENT_XAUTHORITY $SETXKBMAP -v )` - if [ -n "$XKBSETUP" ]; then - XKBKEYMAP=`echo "$XKBSETUP" | grep '^keymap' | awk '{ print $2 }'` - XKBTYPES=`echo "$XKBSETUP" | grep '^types' | awk '{ print $2 }'` - XKBCOMPAT=`echo "$XKBSETUP" | grep '^compat' | awk '{ print $2 }'` - XKBSYMBOLS=`echo "$XKBSETUP" | grep '^symbols' | awk '{ print $2 }'` - XKBGEOMETRY=`echo "$XKBSETUP" | grep '^geometry' | awk '{ print $2 }'` - if [ -n "$XKBKEYMAP" ]; then - $SETXKBMAP -keymap "$XKBKEYMAP" - elif [ -n "$XKBTYPES" -a -n "$XKBCOMPAT" -a -n "$XKBSYMBOLS" -a -n "$XKBGEOMETRY" ]; then - $SETXKBMAP -types "$XKBTYPES" -compat "$XKBCOMPAT" -symbols "$XKBSYMBOLS" -geometry "$XKBGEOMETRY" - elif [ -n "$XKBTYPES" -a -n "$XKBCOMPAT" -a -n "$XKBSYMBOLS" ]; then - $SETXKBMAP -types "$XKBTYPES" -compat "$XKBCOMPAT" -symbols "$XKBSYMBOLS" - elif [ -n "$XKBSYMBOLS" ]; then - $SETXKBMAP -symbols "$XKBSYMBOLS" - fi - fi - fi -fi - -# FIXME: the housekeeping below really should be moved to the postinst of packages that require it -# brute force approach for now -update-desktop-database -glib-compile-schemas /usr/share/glib-2.0/schemas/ - -#x11vnc -q -bg -display :0 -forever -avahi -xkb - -exit 0 diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff deleted file mode 100644 index bee35116e..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff +++ /dev/null @@ -1,96 +0,0 @@ -From 60084e7e973634971c9643f2459e5d3e248ee3f1 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Thu, 9 Jun 2011 18:12:45 +0200 -Subject: [PATCH] build-sys: hardcode x paths to fix crosscompiling - -Signed-off-by: Koen Kooi ---- - configure.ac | 72 ++++----------------------------------------------------- - 1 files changed, 5 insertions(+), 67 deletions(-) - -diff --git a/configure.ac b/configure.ac -index eeaf3dc..841efe0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1101,73 +1101,11 @@ dnl --------------------------------------------------------------------------- - dnl - Check for X Server location - dnl --------------------------------------------------------------------------- - --# First check with "! -h" for /usr/X11R6 and /usr/X11 since they often --# symlink to each other, and configure should use the more stable --# location (the real directory) if possible. --# --# On Solaris, the /usr/bin/Xserver script is used to decide whether to --# use Xsun or Xorg, so this is used on Solaris. --# --# When testing for /usr/X11R6, first check with "! -h" for /usr/X11R6 --# and /usr/X11 since they often symlink to each other, and configure --# should use the more stable location (the real directory) if possible. --# --if test -x /usr/X11/bin/Xserver; then -- X_PATH="/usr/X11/bin" -- X_SERVER_PATH="/usr/X11/bin" -- X_SERVER="/usr/X11/bin/Xserver" -- X_CONFIG_OPTIONS="-audit 0" --elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then -- X_PATH="/usr/X11R6/bin" -- X_SERVER_PATH="/usr/X11R6/bin" -- X_SERVER="/usr/X11R6/bin/X" -- X_CONFIG_OPTIONS="-audit 0" --elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then -- X_PATH="/usr/X11/bin" -- X_SERVER_PATH="/usr/X11/bin" -- X_SERVER="/usr/X11/bin/X" -- X_CONFIG_OPTIONS="-audit 0" --elif test -x /usr/X11R6/bin/X; then -- X_PATH="/usr/X11R6/bin" -- X_SERVER_PATH="/usr/X11R6/bin" -- X_SERVER="/usr/X11R6/bin/X" -- X_CONFIG_OPTIONS="-audit 0" --elif test -x /usr/bin/Xorg; then -- X_PATH="/usr/bin" -- X_SERVER_PATH="/usr/bin" -- X_SERVER="/usr/bin/Xorg" -- X_CONFIG_OPTIONS="-audit 0" --elif test -x /usr/X11/bin/X; then -- X_PATH="/usr/X11/bin" -- X_SERVER_PATH="/usr/X11/bin" -- X_SERVER="/usr/X11/bin/X" -- X_CONFIG_OPTIONS="-audit 0" --elif test -x /usr/openwin/bin/Xsun; then -- # Do not add /usr/openwin/bin here because on Solaris you need -- # /usr/openwin/bin in your PATH even if you are using the Xorg -- # Xserver. We add this to the path below. -- X_PATH="/usr/openwin/bin" -- X_SERVER_PATH="/usr/openwin/bin" -- X_SERVER="/usr/openwin/bin/Xsun" -- X_CONFIG_OPTIONS="-audit 0 -nobanner" --elif test -x /opt/X11R6/bin/X; then -- X_PATH="/opt/X11R6/bin" -- X_SERVER_PATH="/opt/X11R6/bin" -- X_SERVER="/opt/X11R6/bin/X" -- X_CONFIG_OPTIONS="-audit 0" --elif test -x /usr/bin/X; then -- X_PATH="/usr/bin" -- X_SERVER_PATH="/usr/bin" -- X_SERVER="/usr/bin/X" -- X_CONFIG_OPTIONS="-audit 0" --else -- # what to do, what to do, this is wrong, but this just sets the -- # defaults, perhaps this user is cross compiling or some such -- X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin" -- X_SERVER_PATH="/usr/bin" -- X_SERVER="/usr/bin/X" -- X_CONFIG_OPTIONS="-audit 0" --fi -+# We hardcode the X paths since we know where it will be in the OE univers -+X_PATH="/usr/bin" -+X_SERVER_PATH="/usr/bin" -+X_SERVER="/usr/bin/X" -+X_CONFIG_OPTIONS="-audit 0" - - dnl --------------------------------------------------------------------------- - dnl - Check for Xnest / Xephyr support --- -1.6.6.1 - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/gdm b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/gdm deleted file mode 100755 index bb5b41864..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/gdm +++ /dev/null @@ -1,89 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: gdm -# Should-Start: console-screen acpid dbus hal network-manager -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs -# Default-Start: 5 -# Default-Stop: 0 1 2 3 6 -# Short-Description: GNOME Display Manager -# Description: Debian init script for the GNOME Display Manager -### END INIT INFO -# -# Author: Ryan Murray -# -set -e - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/sbin/gdm - -test -x $DAEMON || exit 0 - -if [ -r /etc/default/locale ]; then - . /etc/default/locale - export LANG LANGUAGE -fi - -# To start gdm even if it is not the default display manager, change -# HEED_DEFAULT_DISPLAY_MANAGER to "false." -HEED_DEFAULT_DISPLAY_MANAGER=true -DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager - -case "$1" in - start) - # make needed directories in volatile - - if [ -e /var/log/gdm ] ; then - rm -rf /var/log/gdm - fi - - mkdir -m 01770 /var/log/gdm - chown gdm:gdm /var/log/gdm - - if [ -e /tmp/.ICE-unix ] ; then - rm -rf /tmp/.ICE-unix - fi - - mkdir -m 01777 /tmp/.ICE-unix - chown root:root /tmp/.ICE-unix - - CONFIGURED_DAEMON=$(basename "$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)") - if grep -wqs text /proc/cmdline; then - echo "Not starting GNOME Display Manager (gdm); found 'text' in kernel commandline." - elif [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ] && \ - [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && \ - [ "$CONFIGURED_DAEMON" != gdm ] ; then - echo "Not starting GNOME Display Manager; it is not the default display manager" - else - echo "Starting GNOME Display Manager" "gdm" - start-stop-daemon --start -b --exec $DAEMON - fi - ;; - stop) - echo "Stopping GNOME Display Manager" "gdm" - set +e - start-stop-daemon --stop --quiet --pidfile /var/run/gdm.pid \ - --name gdm --retry 5 - set -e - ;; - reload) - echo "Scheduling reload of GNOME Display Manager configuration" "gdm" - set +e - start-stop-daemon --stop --signal USR1 --quiet --pidfile \ - /var/run/gdm.pid --name gdm - set -e - ;; - status) - status_of_proc -p "$PIDFILE" "$DAEMON" gdm && exit 0 || exit $? - ;; - restart|force-reload) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/gdm {start|stop|restart|reload|force-reload|status}" - exit 1 - ;; -esac - -exit 0 diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/gdm-pam b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/gdm-pam deleted file mode 100644 index f9fafed9d..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/gdm-pam +++ /dev/null @@ -1,11 +0,0 @@ -# -# default; standard UN*X access -# -auth required pam_unix.so -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so - -auth optional pam_gnome_keyring.so -session optional pam_gnome_keyring.so auto_start - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/gdm.conf b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/gdm.conf deleted file mode 100644 index 559823b86..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/gdm.conf +++ /dev/null @@ -1,80 +0,0 @@ -# GDM Custom Configuration file. -# -# This file is the appropriate place for specifying your customizations to the -# GDM configuration. If you run gdmsetup, it will automatically edit this -# file for you and will cause the daemon and any running GDM GUI programs to -# automatically update with the new configuration. Not all configuration -# options are supported by gdmsetup, so to modify some values it may be -# necessary to modify this file directly by hand. -# -# This file overrides the default configuration settings. These settings -# are stored in the GDM System Defaults configuration file, which is found -# at the following location. -# -# /usr/share/gdm/defaults.conf. -# -# This file contains comments about the meaning of each configuration option, -# so is also a useful reference. Also refer to the documentation links at -# the end of this comment for further information. In short, to hand-edit -# this file, simply add or modify the key=value combination in the -# appropriate section in the template below this comment section. -# -# For example, if you want to specify a different value for the Enable key -# in the "[debug]" section of your GDM System Defaults configuration file, -# then add "Enable=true" in the "[debug]" section of this file. If the -# key already exists in this file, then simply modify it. -# -# Older versions of GDM used the "gdm.conf" file for configuration. If your -# system has an old gdm.conf file on the system, it will be used instead of -# this file - so changes made to this file will not take effect. Consider -# migrating your configuration to this file and removing the gdm.conf file. -# -# If you hand edit a GDM configuration file, you can run the following -# command and the GDM daemon will immediately reflect the change. Any -# running GDM GUI programs will also be notified to update with the new -# configuration. -# -# gdmflexiserver --command="UPDATE_CONFIG " -# -# e.g, the "Enable" key in the "[debug]" section would be "debug/Enable". -# -# You can also run gdm-restart or gdm-safe-restart to cause GDM to restart and -# re-read the new configuration settings. You can also restart GDM by sending -# a HUP or USR1 signal to the daemon. HUP behaves like gdm-restart and causes -# any user session started by GDM to exit immediately while USR1 behaves like -# gdm-safe-restart and will wait until all users log out before restarting GDM. -# -# For full reference documentation see the gnome help browser under -# GNOME|System category. You can also find the docs in HTML form on -# http://www.gnome.org/projects/gdm/ -# -# NOTE: Lines that begin with "#" are considered comments. -# -# Have fun! - -[daemon] - -[security] - -[xdmcp] - -[gui] - -[greeter] - -[chooser] - -[debug] - -# Note that to disable servers defined in the GDM System Defaults -# configuration file (such as 0=Standard, you must put a line in this file -# that says 0=inactive, as described in the Configuration section of the GDM -# documentation. -# -[servers] - -# Also note, that if you redefine a [server-foo] section, then GDM will -# use the definition in this file, not the GDM System Defaults configuration -# file. It is currently not possible to disable a [server-foo] section -# defined in the GDM System Defaults configuration file. -# diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in deleted file mode 100644 index 3e1556ae0..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Gnome Display Manager -After=systemd-user-sessions.service - -[Service] -ExecStart=%sbindir%/gdm -nodaemon -StandardOutput=syslog - -[Install] -Alias=display-manager.service diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb index 5d244de64..ba425ad6b 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb @@ -7,7 +7,10 @@ DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 gtk+ gtksourceview2 iso-c LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -inherit gnome gettext pythonnative +inherit distro_features_check gnome gettext pythonnative + +REQUIRED_DISTRO_FEATURES = "x11" + SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0001-workaround-void-pointer-arithmetic.patch \ file://0001-Remove-help-directory-from-build.patch \ diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch deleted file mode 100644 index ad8a40ccf..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch +++ /dev/null @@ -1,55 +0,0 @@ -Fixed build error with gcc 4.8 - -Errors like below - -egg-asn1x.c: In function 'anode_encode_build': -egg-asn1x.c:1280:7: warning: variable 'type' set but not used [-Wunused-but-set-variable] -egg-asn1x.c: In function 'traverse_and_prepare': -egg-asn1x.c:3354:3: warning: passing argument 1 of 'egg_asn1x_create' from incompatible pointer type [enabled by default] -In file included from egg-asn1x.c:50:0: -egg-asn1x.h:38:8: note: expected 'const struct static_struct_asn *' but argument is of type 'const struct asn1_static_node *' -egg-asn1x.c: At top level: -egg-asn1x.c:3509:1: error: conflicting types for 'egg_asn1x_create' -In file included from egg-asn1x.c:50:0: -egg-asn1x.h:38:8: note: previous declaration of 'egg_asn1x_create' was here -egg-asn1x.c:3572:1: error: conflicting types for 'egg_asn1x_create_quark' -In file included from egg-asn1x.c:50:0: -egg-asn1x.h:41:8: note: previous declaration of 'egg_asn1x_create_quark' was here -egg-asn1x.c:3579:1: error: conflicting types for 'egg_asn1x_create_and_decode' -In file included from egg-asn1x.c:50:0: -egg-asn1x.h:44:8: note: previous declaration of 'egg_asn1x_create_and_decode' was here -make[4]: *** [libegg_la-egg-asn1x.lo] Error 1 - - -Signed-off-by: Khem Raj - -Upstream-Status: Pending -Index: gnome-keyring-2.32.1/egg/egg-asn1x.h -=================================================================== ---- gnome-keyring-2.32.1.orig/egg/egg-asn1x.h 2010-10-18 19:11:38.000000000 -0700 -+++ gnome-keyring-2.32.1/egg/egg-asn1x.h 2013-06-11 15:15:00.675399263 -0700 -@@ -25,6 +25,7 @@ - #define EGG_ASN1X_H_ - - #include -+#include - - #ifndef HAVE_EGG_ALLOCATOR - typedef void* (*EggAllocator) (void* p, gsize); -@@ -35,13 +36,13 @@ - - struct static_struct_asn; - --GNode* egg_asn1x_create (const struct static_struct_asn *defs, -+GNode* egg_asn1x_create (const ASN1_ARRAY_TYPE *defs, - const gchar *type); - --GNode* egg_asn1x_create_quark (const struct static_struct_asn *defs, -+GNode* egg_asn1x_create_quark (const ASN1_ARRAY_TYPE *defs, - GQuark type); - --GNode* egg_asn1x_create_and_decode (const struct static_struct_asn *defs, -+GNode* egg_asn1x_create_and_decode (const ASN1_ARRAY_TYPE *defs, - const gchar *type, - gconstpointer data, - gsize n_data); diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb deleted file mode 100644 index fd6ca73a4..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "Password and keyring managing daemon" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://gcr/gcr.h;endline=22;md5=a272df1e633e27ecf35e74fb5576250e \ - file://egg/egg-dbus.h;endline=25;md5=eb6f531af37165dc53420c073d774e61 \ - file://gp11/gp11.h;endline=24;md5=bd8c7a8a21d6c28d40536d96a35e3469 \ - file://pkcs11/pkcs11i.h;endline=24;md5=e72cfbb718389b76a4dae838d1c1f439" - -SECTION = "x11/gnome" - -PR = "r12" - -inherit autotools gnome gtk-doc pkgconfig gsettings - -SRC_URI += "file://egg-asn1x.patch \ - file://musl.patch \ -" - -DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} intltool-native" -RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils" - -LDFLAGS += "-lgmodule-2.0" - -EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}" - -SRC_URI[archive.md5sum] = "9a8aa74e03361676f29d6e73155786fc" -SRC_URI[archive.sha256sum] = "31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9" -GNOME_COMPRESS_TYPE="bz2" - -FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr \ - ${base_libdir}/security/*${SOLIBSDEV} \ - " - -FILES_${PN}-dev += "${libdir}/${BPN}/devel/*.la \ - ${libdir}/${BPN}/devel/*${SOLIBSDEV} \ - ${libdir}/${BPN}/standalone/*.la \ - ${base_libdir}/security/*.la \ - " - -INSANE_SKIP_${PN}-dev += "dev-elf" - -FILES_${PN}-dbg += "${libdir}/${BPN}/standalone/.debug/ \ - ${libdir}/${BPN}/devel/.debug/ \ - ${base_libdir}/security/.debug/" - -# Make compatible with gcr version 3 or newer by removing -# org.gnome.crypto.pgp.*, which is the provider for this optional -# functionality. - -do_install_append() { - rm ${D}${datadir}/GConf/gsettings/org.gnome.crypto.pgp.convert - rm ${D}${datadir}/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml -} diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb new file mode 100644 index 000000000..55640625d --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb @@ -0,0 +1,42 @@ +SUMMARY = "Password and keyring managing daemon" +HOMEPAGE = "http://www.gnome.org/" +BUGTRACKER = "https://bugzilla.gnome.org/" +SECTION = "x11/gnome" + +LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ +" + +inherit distro_features_check gnomebase remove-libtool + +DEPENDS = " \ + intltool-native \ + glib-2.0-native \ + gtk+3 \ + gcr \ + libgcrypt \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ +" + +SRC_URI[archive.md5sum] = "e09efe8021944dae404736b5a2adb98e" +SRC_URI[archive.sha256sum] = "bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99" +SRC_URI += "file://musl.patch" + +REQUIRED_DISTRO_FEATURES = "x11" + +RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils" + +EXTRA_OECONF = " \ + --disable-doc \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)} \ +" + + +FILES_${PN} += " \ + ${datadir}/dbus-1/services \ + ${datadir}/p11-kit \ + ${base_libdir}/security/*${SOLIBSDEV} \ + ${libdir}/pkcs11/gnome-keyring-pkcs11.so \ +" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_2.32.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_2.32.0.bb deleted file mode 100644 index e24188232..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_2.32.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Compatibility library for accessing secrets" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0914b9d3ebaba41ef2e3e0ae16f296cf \ - file://library/gnome-keyring.h;endline=25;md5=68ea64f81c160d670c37da5f137be4fb \ - file://library/gnome-keyring.c;endline=26;md5=8d7a4fb674aaa012ea5a98e7c368b4a5 \ - file://egg/egg-dh.h;endline=22;md5=1626c16af2a8da1f88324cf3ced33f08" - -SECTION = "x11/gnome/libs" -PR = "r3" - -inherit gnomebase gtk-doc - -DEPENDS = "dbus libgcrypt glib-2.0 intltool-native" - -SRC_URI[archive.md5sum] = "c42b2ca66204835d901d3dbfc1fa5ae6" -SRC_URI[archive.sha256sum] = "56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c" -GNOME_COMPRESS_TYPE="bz2" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_3.12.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_3.12.0.bb new file mode 100644 index 000000000..82abe3349 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_3.12.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "Compatibility library for accessing secrets" +HOMEPAGE = "http://www.gnome.org/" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=0914b9d3ebaba41ef2e3e0ae16f296cf \ + file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ +" +SECTION = "x11/gnome/libs" + +inherit gnomebase gtk-doc gobject-introspection + +DEPENDS = "dbus libgcrypt glib-2.0 glib-2.0-native intltool-native" + +SRC_URI[archive.md5sum] = "6696e4f2e9aed4625cdc3af30bd8c238" +SRC_URI[archive.sha256sum] = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb index 01da347bd..647ae914f 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb @@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ DEPENDS = "python libxml2 gconf popt gtk+3 intltool-native gnome-common-native" -inherit gnomebase pkgconfig python-dir pythonnative gobject-introspection +inherit distro_features_check gnomebase pkgconfig python-dir pythonnative gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11" BPN = "gnome-menus" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-mime-data/gnome-mime-data/pkgconfig.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-mime-data/gnome-mime-data/pkgconfig.patch deleted file mode 100644 index 09034255d..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-mime-data/gnome-mime-data/pkgconfig.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: gnome-mime-data-2.18.0/Makefile.am -=================================================================== ---- gnome-mime-data-2.18.0.orig/Makefile.am 2009-06-11 17:27:48.000000000 +0100 -+++ gnome-mime-data-2.18.0/Makefile.am 2009-06-11 17:27:59.000000000 +0100 -@@ -1,6 +1,6 @@ - SUBDIRS = man po - --pkgconfigdir = $(datadir)/pkgconfig -+pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = gnome-mime-data-2.0.pc - - NULL= diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-mime-data/gnome-mime-data_2.18.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-mime-data/gnome-mime-data_2.18.0.bb deleted file mode 100644 index eeac1bb4a..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-mime-data/gnome-mime-data_2.18.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Base MIME and Application database for GNOME" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://check-mime.pl;endline=26;md5=a95b63c92c33d4ca1af61a315888f450" - -inherit gnomebase mime -PR = "r4" - -SRC_URI += "file://pkgconfig.patch" - -SRC_URI[archive.md5sum] = "541858188f80090d12a33b5a7c34d42c" -SRC_URI[archive.sha256sum] = "37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7" -GNOME_COMPRESS_TYPE="bz2" - -DEPENDS += "shared-mime-info intltool-native glib-2.0-native" -RDEPENDS_${PN} = "shared-mime-info" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-help-remove-YELP-macro.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-help-remove-YELP-macro.patch new file mode 100644 index 000000000..57b60a0d5 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-help-remove-YELP-macro.patch @@ -0,0 +1,28 @@ +From 4a3ee8b46d25b3d310448bfa4446e15a686fc685 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 23 Mar 2018 13:50:18 +0100 +Subject: [PATCH] help: remove YELP macro +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded-specific] + +Signed-off-by: Andreas Müller +--- + help/Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/help/Makefile.am b/help/Makefile.am +index c5cd0d3..4b83adf 100644 +--- a/help/Makefile.am ++++ b/help/Makefile.am +@@ -1,5 +1,3 @@ +-@YELP_HELP_RULES@ +- + HELP_ID = gnome-system-monitor + + HELP_FILES = \ +-- +2.14.3 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb new file mode 100644 index 000000000..9b6ce17ca --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb @@ -0,0 +1,34 @@ +SUMMARY = "Gnome system monitor" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = " \ + intltool-native \ + gnome-common-native \ + glib-2.0-native \ + gtkmm3 \ + libgtop \ + librsvg \ + libwnck3 \ +" + +inherit gnomebase distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.md5sum] = "fcd59867c07f8c4853b1e28d60cbc037" +SRC_URI[archive.sha256sum] = "f848a8c2ca5e164cf09d3a205dd49e4e4bf4b60d43b0969c10443eb519d0e6b3" +SRC_URI += "file://0001-help-remove-YELP-macro.patch" + +RRECOMMENDS_${PN} = "adwaita-icon-theme" + +FILES_${PN} += " \ + ${datadir}/icons \ + ${datadir}/dbus-1 \ + ${datadir}/gnome/autostart \ +" + +FILES_${PN}-doc += " \ + ${datadir}/omf \ + ${datadir}/gnome/help \ +" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch deleted file mode 100644 index 383329970..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 536e9b57cada4a9f92e073fdf01cdf1def435b6b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 7 May 2013 14:56:06 +0200 -Subject: [PATCH] multiple Makefile.am: remove -DG_DISABLE_DEPRECATED to fix - build with glib-2.36 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Andreas Müller ---- - daemon/Makefile.am | 1 - - libgnomevfs/Makefile.am | 1 - - 2 files changed, 0 insertions(+), 2 deletions(-) - -Index: gnome-vfs-2.24.4/daemon/Makefile.am -=================================================================== ---- gnome-vfs-2.24.4.orig/daemon/Makefile.am 2013-10-17 16:39:39.081024798 -0700 -+++ gnome-vfs-2.24.4/daemon/Makefile.am 2013-10-17 16:39:39.213024794 -0700 -@@ -8,7 +8,6 @@ - -D_LARGEFILE64_SOURCE \ - -D_POSIX_PTHREAD_SEMANTICS \ - -D_REENTRANT \ -- -DG_DISABLE_DEPRECATED \ - -DGNOME_VFS_PREFIX=\"$(prefix)\" \ - -DGNOME_VFS_DATADIR=\"$(datadir)\" \ - -DGNOME_VFS_LIBDIR=\"$(libdir)\" \ -Index: gnome-vfs-2.24.4/libgnomevfs/Makefile.am -=================================================================== ---- gnome-vfs-2.24.4.orig/libgnomevfs/Makefile.am 2013-10-17 16:39:39.081024798 -0700 -+++ gnome-vfs-2.24.4/libgnomevfs/Makefile.am 2013-10-17 16:39:39.213024794 -0700 -@@ -19,7 +19,6 @@ - -D_LARGEFILE64_SOURCE \ - -D_POSIX_PTHREAD_SEMANTICS \ - -D_REENTRANT \ -- -DG_DISABLE_DEPRECATED \ - -DGNOME_VFS_PREFIX=\"$(prefix)\" \ - -DGNOME_VFS_BINDIR=\"$(bindir)\" \ - -DGNOME_VFS_DATADIR=\"$(datadir)\" \ -Index: gnome-vfs-2.24.4/modules/Makefile.am -=================================================================== ---- gnome-vfs-2.24.4.orig/modules/Makefile.am 2013-10-17 16:39:39.081024798 -0700 -+++ gnome-vfs-2.24.4/modules/Makefile.am 2013-10-17 16:39:39.213024794 -0700 -@@ -18,7 +18,6 @@ - -D_POSIX_PTHREAD_SEMANTICS \ - -D_REENTRANT \ - -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" \ -- -DG_DISABLE_DEPRECATED \ - -DGNOME_VFS_PREFIX=\"$(prefix)\" \ - -DGNOME_VFS_DATADIR=\"$(datadir)\" \ - -DGNOME_VFS_LIBDIR=\"$(libdir)\" \ -Index: gnome-vfs-2.24.4/programs/Makefile.am -=================================================================== ---- gnome-vfs-2.24.4.orig/programs/Makefile.am 2013-10-17 16:39:39.081024798 -0700 -+++ gnome-vfs-2.24.4/programs/Makefile.am 2013-10-17 16:39:39.213024794 -0700 -@@ -4,8 +4,7 @@ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(TEST_CFLAGS) \ -- $(VFS_CFLAGS) \ -- -DG_DISABLE_DEPRECATED -+ $(VFS_CFLAGS) - - libraries = \ - $(top_builddir)/libgnomevfs/libgnomevfs-2.la \ -Index: gnome-vfs-2.24.4/test/Makefile.am -=================================================================== ---- gnome-vfs-2.24.4.orig/test/Makefile.am 2010-02-09 04:16:14.000000000 -0800 -+++ gnome-vfs-2.24.4/test/Makefile.am 2013-10-17 16:42:49.109019172 -0700 -@@ -6,7 +6,6 @@ - -I$(top_builddir)/libgnomevfs \ - $(TEST_CFLAGS) \ - $(VFS_CFLAGS) \ -- -DG_DISABLE_DEPRECATED \ - -DMODULES_PATH=\"$(libdir)/vfs/modules\" - - if OS_WIN32 diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch deleted file mode 100644 index 30ca29b10..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fixes errors with new autotools - -| automake: error: using '$(srcdir)' in TESTS is currently broken: '$(srcdir)/auto-test' -| autoreconf: automake failed with exit status: 1 -| ERROR: autoreconf execution failed. - -Upstream-Status: Not Submitted -Signed-off-by: Khem Raj - -Index: gnome-vfs-2.24.4/test/Makefile.am -=================================================================== ---- gnome-vfs-2.24.4.orig/test/Makefile.am 2013-10-17 16:43:36.677017764 -0700 -+++ gnome-vfs-2.24.4/test/Makefile.am 2013-10-17 16:48:47.369008566 -0700 -@@ -64,7 +64,7 @@ - test-async-cancel \ - test-escape \ - test-uri \ -- $(srcdir)/auto-test -+ auto-test - - libraries = \ - $(top_builddir)/libgnomevfs/libgnomevfs-2.la \ diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gconftool-lossage.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gconftool-lossage.patch deleted file mode 100644 index 0f52136e3..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gconftool-lossage.patch +++ /dev/null @@ -1,13 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000 -+++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100 -@@ -154,7 +154,7 @@ - AC_PATH_PROG(GCONFTOOL, gconftool-2, no) - - if test x"$GCONFTOOL" = xno; then -- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) -+ AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf]) - fi - - AM_GCONF_SOURCE_2 diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch deleted file mode 100644 index dabec32c6..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch +++ /dev/null @@ -1,53 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -removes kerberos completely to avoid conflicts with installed kerberos ---- configure.in.orig 2007-01-05 19:42:26.418541610 +0200 -+++ configure.in 2007-01-05 19:42:56.604261797 +0200 -@@ -436,47 +436,6 @@ - ]) - AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes) - AC_SUBST(CDDA_LIBS) -- --dnl GSSAPI --dnl Check for Kerberos installation --have_gssapi=no --AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin) -- --if test "x$KRB5_CONFIG" != "xnone"; then -- GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`" -- GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`" -- -- saved_CPPFLAGS="$CPPFLAGS" -- saved_LIBS="$LIBS" -- LIBS="$LIBS $GSSAPI_LIBS" -- CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS" -- # MIT and Heimdal put gssapi.h in different places -- AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [ -- AC_CHECK_FUNCS(gss_init_sec_context, [ -- AC_MSG_NOTICE([GSSAPI authentication support enabled]) -- AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled]) -- AC_CHECK_HEADERS(gssapi/gssapi_generic.h) -- have_gssapi=yes -- -- # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE -- AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],, -- [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name, -- [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise]) -- ], [ -- #ifdef HAVE_GSSAPI_GSSAPI_H -- #include -- #else -- #include -- #endif -- ]) -- ]) -- break -- ]) -- LIBS="$saved_LIBS" -- CPPFLAGS="$saved_CPPFLAGS" --fi --AC_SUBST(GSSAPI_LIBS) --AC_SUBST(GSSAPI_CFLAGS) - - dnl ****************************** - dnl http-method (neon checks) diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb deleted file mode 100644 index 3ec646697..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "a userspace virtual filesystem" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://libgnomevfs/gnome-vfs.h;endline=25;md5=17071e69707a8f42887d88413f2623cb \ - file://programs/gnomevfs-ls.c;endline=23;md5=678a2e8bedaef5818ccabe633840196b \ - file://daemon/vfs-daemon.c;endline=21;md5=5f2c61553fb16abb07fc9498ca03fe1f \ - file://modules/cdda-cddb.h;endline=22;md5=20ed324ca64907c366ecd7f22b8e0c54" - -DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib intltool-native gnome-common-native" -RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info" -# Some legacy packages will require gnome-mime-data to be installed, but use of -# it is deprecated. -PR = "r3" - -inherit gnome - -# This is to provide compatibility with the gnome-vfs DBus fork -RPROVIDES_${PN} = "gnome-vfs-plugin-dbus" - -SRC_URI += " \ - file://gconftool-lossage.patch \ - file://gnome-vfs-no-kerberos.patch;striplevel=0 \ - file://0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch \ - file://do-not-use-srcdir-variable.patch \ -" - -SRC_URI[archive.md5sum] = "a05fab03eeef10a47dd156b758982f2e" -SRC_URI[archive.sha256sum] = "62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa" -GNOME_COMPRESS_TYPE="bz2" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" -PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" -PACKAGECONFIG[fam] = "--enable-fam,--disable-fam,gamin" - -EXTRA_OECONF = " --disable-hal \ - --disable-openssl \ - --disable-samba \ - ac_cv_lib_acl_acl_get_file=no \ - ac_cv_lib_sec_acl=no \ - gvfs_cv_HAVE_SOLARIS_ACLS=no \ - gvfs_cv_HAVE_POSIX_ACLS=no \ -" - -FILES_${PN} += "${libdir}/vfs ${datadir}/dbus-1/services" -FILES_${PN}-dbg += "${libdir}/gnome-vfs-2.0/modules/.debug" -FILES_${PN}-dev += "${libdir}/gnome-vfs-2.0/include/* ${libdir}/gnome-vfs-2.0/modules/*.la" -FILES_${PN}-staticdev += "${libdir}/gnome-vfs-2.0/modules/*.a" -FILES_${PN}-doc += "${datadir}/gtk-doc" - -PACKAGES_DYNAMIC += "^gnome-vfs-plugin-.*" - -python populate_packages_prepend () { - plugindir = d.expand('${libdir}/gnome-vfs-2.0/modules/') - do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s') -} diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-cups-1.6.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-cups-1.6.patch deleted file mode 100644 index dba60ca69..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-cups-1.6.patch +++ /dev/null @@ -1,288 +0,0 @@ -Imported from gentoo: -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-1.6.patch - -From ae783efde4fa69578651994505462f02b8639220 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Tue, 7 Aug 2012 06:53:09 -0400 -Subject: [PATCH] Use CUPS-1.6 IPP API getter/setter functions - -CUPS 1.6 makes various structures private and introduces these ippGet -and ippSet functions for all of the fields in these structures. -http://www.cups.org/str.php?L3928 - -We define our own accessors when building against CUPS < 1.6. - -Based on work by Jiri Popelka at -https://bugzilla.gnome.org/show_bug.cgi?id=679759 ---- - libgnomecups/gnome-cups-printer.c | 48 +++++++++++++++++++++++++++++------- - libgnomecups/gnome-cups-queue.c | 43 +++++++++++++++++++++++++++------ - libgnomecups/gnome-cups-request.c | 44 ++++++++++++++++++++++++++++----- - 3 files changed, 110 insertions(+), 25 deletions(-) - -diff --git a/libgnomecups/gnome-cups-printer.c b/libgnomecups/gnome-cups-printer.c -index c924af0..f5e1ef7 100644 ---- a/libgnomecups/gnome-cups-printer.c -+++ b/libgnomecups/gnome-cups-printer.c -@@ -37,6 +37,34 @@ - - #define UPDATE_TIMEOUT 5000 - -+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) -+#define HAVE_CUPS_1_6 1 -+#endif -+ -+#ifndef HAVE_CUPS_1_6 -+#define ippGetCount(attr) attr->num_values -+#define ippGetName(attr) attr->name -+#define ippGetInteger(attr, element) attr->values[element].integer -+#define ippGetString(attr, element, language) attr->values[element].string.text -+ -+static ipp_attribute_t * -+ippFirstAttribute(ipp_t *ipp) -+{ -+ if (!ipp) -+ return (NULL); -+ return (ipp->current = ipp->attrs); -+} -+ -+static ipp_attribute_t * -+ippNextAttribute(ipp_t *ipp) -+{ -+ if (!ipp || !ipp->current) -+ return (NULL); -+ return (ipp->current = ipp->current->next); -+} -+#endif -+ -+ - struct _GnomeCupsPPDFile { - char name[1]; - }; -@@ -173,9 +201,9 @@ map_reasons (GnomeCupsPrinter *printer, - printer->details->state_reasons = NULL; - - /* cf. RFC2911 4.4.12 */ -- for (i = 0; i < attr->num_values; i++) { -+ for (i = 0; i < ippGetCount (attr); i++) { - const char *p; -- const char *keyword = attr->values [i].string.text; -+ const char *keyword = ippGetString (attr, i, NULL); - - reason = g_new (GnomeCupsPrinterReason, 1); - -@@ -224,8 +252,8 @@ gnome_cups_printer_get_info (GnomeCupsPrinter *printer) - return printer->details->info; - } - --#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if ((v) != attr->values[0].integer) { changed = TRUE; } (v) = attr->values[0].integer; }} --#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if (!v || strcmp (v, attr->values[0].string.text)) { g_free (v); changed = TRUE; (v) = g_strdup (attr->values[0].string.text); }}} -+#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if ((v) != ippGetInteger (attr, 0)) { changed = TRUE; } (v) = ippGetInteger (attr, 0); }} -+#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if (!v || strcmp (v, ippGetString (attr, 0, NULL))) { g_free (v); changed = TRUE; (v) = g_strdup (ippGetString (attr, 0, NULL)); }}} - - static void - attributes_update_cb (guint id, -@@ -243,14 +271,14 @@ attributes_update_cb (guint id, - changed = FALSE; - - if (!error && response) { -- for (attr = response->attrs; attr != NULL; attr = attr->next) { -- if (!attr->name) { -+ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) { -+ if (!ippGetName (attr)) { - continue; - } -- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !strcmp (attr->name, "attributes-charset")) { -+ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !strcmp (ippGetName (attr), "attributes-charset")) { - continue; - } -- if (!g_ascii_strcasecmp (attr->name, "printer-state-reasons")) { -+ if (!g_ascii_strcasecmp (ippGetName (attr), "printer-state-reasons")) { - map_reasons (printer, attr); - } - MAP_INT (printer->details->state, "printer-state"); -@@ -570,7 +598,7 @@ get_default (void) - - attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME); - if (attr) { -- name = g_strdup (attr->values[0].string.text); -+ name = g_strdup (ippGetString (attr, 0, NULL)); - } else { - name = NULL; - } -@@ -698,7 +726,7 @@ get_printer_names (void) - attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME); - while (attr) { - ret = g_list_prepend (ret, -- g_strdup (attr->values[0].string.text)); -+ g_strdup (ippGetString (attr, 0, NULL))); - - attr = ippFindNextAttribute (response, - "printer-name", -diff --git a/libgnomecups/gnome-cups-queue.c b/libgnomecups/gnome-cups-queue.c -index 9f98ed9..298db42 100644 ---- a/libgnomecups/gnome-cups-queue.c -+++ b/libgnomecups/gnome-cups-queue.c -@@ -15,6 +15,33 @@ - - #define UPDATE_TIMEOUT 3000 - -+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) -+#define HAVE_CUPS_1_6 1 -+#endif -+ -+#ifndef HAVE_CUPS_1_6 -+#define ippGetName(attr) attr->name -+#define ippGetInteger(attr, element) attr->values[element].integer -+#define ippGetString(attr, element, language) attr->values[element].string.text -+ -+static ipp_attribute_t * -+ippFirstAttribute(ipp_t *ipp) -+{ -+ if (!ipp) -+ return (NULL); -+ return (ipp->current = ipp->attrs); -+} -+ -+static ipp_attribute_t * -+ippNextAttribute(ipp_t *ipp) -+{ -+ if (!ipp || !ipp->current) -+ return (NULL); -+ return (ipp->current = ipp->current->next); -+} -+#endif -+ -+ - struct _GnomeCupsQueueDetails { - char *queue_name; - GList *jobs; -@@ -199,8 +226,8 @@ finish_job (GnomeCupsJob *job) - job->size = job->size * 1024; - } - --#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (attr->values[0].string.text);}} --#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { (dest) = attr->values[0].integer; } } -+#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (ippGetString (attr, 0, NULL));}} -+#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { (dest) = ippGetInteger (attr, 0); } } - - static void - get_jobs_cb (guint id, -@@ -231,8 +258,8 @@ get_jobs_cb (guint id, - - if (response) { - job = g_new0 (GnomeCupsJob, 1); -- for (attr = response->attrs; attr != NULL; attr = attr->next) { -- if (attr->name == NULL) { -+ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) { -+ if (ippGetName (attr) == NULL) { - if (job->name) { - finish_job (job); - jobs = g_list_prepend (jobs, job); -@@ -244,7 +271,7 @@ get_jobs_cb (guint id, - continue; - } - -- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) { -+ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) { - continue; - - } -@@ -355,8 +382,8 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue, - - if (response) { - job = g_new0 (GnomeCupsJob, 1); -- for (attr = response->attrs; attr != NULL; attr = attr->next) { -- if (attr->name == NULL) { -+ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) { -+ if (ippGetName (attr) == NULL) { - if (job->name) { - finish_job (job); - } else { -@@ -366,7 +393,7 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue, - break; - } - -- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) { -+ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) { - continue; - } - -diff --git a/libgnomecups/gnome-cups-request.c b/libgnomecups/gnome-cups-request.c -index c94f623..13f0948 100644 ---- a/libgnomecups/gnome-cups-request.c -+++ b/libgnomecups/gnome-cups-request.c -@@ -19,6 +19,36 @@ - #define STOP_UNUSED_THREADS_TIMEOUT 60 - #define CLOSE_UNUSED_CONNECTIONS_TIMEOUT 30 - -+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) -+#define HAVE_CUPS_1_6 1 -+#endif -+ -+#ifndef HAVE_CUPS_1_6 -+#define ippGetCount(attr) attr->num_values -+#define ippGetValueTag(attr) attr->value_tag -+#define ippGetName(attr) attr->name -+#define ippGetBoolean(attr, element) attr->values[element].boolean -+#define ippGetInteger(attr, element) attr->values[element].integer -+#define ippGetString(attr, element, language) attr->values[element].string.text -+ -+static ipp_attribute_t * -+ippFirstAttribute(ipp_t *ipp) -+{ -+ if (!ipp) -+ return (NULL); -+ return (ipp->current = ipp->attrs); -+} -+ -+static ipp_attribute_t * -+ippNextAttribute(ipp_t *ipp) -+{ -+ if (!ipp || !ipp->current) -+ return (NULL); -+ return (ipp->current = ipp->current->next); -+} -+#endif -+ -+ - typedef struct - { - GMutex *mutex; -@@ -276,14 +306,14 @@ dump_request (ipp_t const *req) - unsigned i; - ipp_attribute_t *attr; - -- for (attr = req->attrs; attr != NULL; attr = attr->next) { -- g_print ("%s", attr->name); -- for (i = 0 ; i < attr->num_values ; i++) { -+ for (attr = ippFirstAttribute (req); attr != NULL; attr = ippNextAttribute (req)) { -+ g_print ("%s", ippGetName (attr)); -+ for (i = 0 ; i < ippGetCount (attr) ; i++) { - g_print ("\t[%d] = ", i); -- switch (attr->value_tag & ~IPP_TAG_COPY) { -+ switch (ippGetValueTag (attr) & ~IPP_TAG_COPY) { - case IPP_TAG_INTEGER: - case IPP_TAG_ENUM: -- g_print ("%d\n", attr->values[i].integer); -+ g_print ("%d\n", ippGetInteger (attr, i)); - break; - - case IPP_TAG_STRING: -@@ -294,11 +324,11 @@ dump_request (ipp_t const *req) - case IPP_TAG_CHARSET: - case IPP_TAG_LANGUAGE: - case IPP_TAG_MIMETYPE: -- g_print ("'%s'\n", attr->values[i].string.text); -+ g_print ("'%s'\n", ippGetString (attr, i, NULL)); - break; - - case IPP_TAG_BOOLEAN: -- g_print ("%s\n", (int)attr->values[i].boolean ? "true" : "false"); -+ g_print ("%s\n", (int)ippGetBoolean (attr, i) ? "true" : "false"); - break; - - default: --- -1.7.8.6 - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-glib.h.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-glib.h.patch deleted file mode 100644 index c7b616578..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-glib.h.patch +++ /dev/null @@ -1,42 +0,0 @@ -Imported from gentoo: - -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-glib.h.patch - -From d84eee9450b3b6f6155074915efc61bedcc8d446 Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Sun, 27 Nov 2011 21:36:41 +0100 -Subject: [PATCH] Fix: Only glib.h can be included - ---- - libgnomecups/gnome-cups-i18n.c | 2 +- - libgnomecups/gnome-cups-init.h | 3 +-- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/libgnomecups/gnome-cups-i18n.c b/libgnomecups/gnome-cups-i18n.c -index 8987c5c..127756d 100644 ---- a/libgnomecups/gnome-cups-i18n.c -+++ b/libgnomecups/gnome-cups-i18n.c -@@ -1,5 +1,5 @@ - #include --#include -+#include - #include "gnome-cups-i18n.h" - - #ifdef ENABLE_NLS -diff --git a/libgnomecups/gnome-cups-init.h b/libgnomecups/gnome-cups-init.h -index 22b682a..c4600fc 100644 ---- a/libgnomecups/gnome-cups-init.h -+++ b/libgnomecups/gnome-cups-init.h -@@ -1,8 +1,7 @@ - #ifndef GNOME_CUPS_INIT - #define GNOME_CUPS_INIT - --#include --#include -+#include - - G_BEGIN_DECLS - --- -1.7.7 - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/glib-2.32.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/glib-2.32.patch deleted file mode 100644 index f0b878d37..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/glib-2.32.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 8d49a386f467cbf8e0842d2218126f643e50f834 Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Sun, 27 Nov 2011 14:24:57 +0000 -Subject: Fix build with glib 2.31: Only glib.h can be #include'd. Fixes bug #664914 - -Upstream-Status: Backport - ---- -diff --git a/engines/clearlooks/src/animation.c b/engines/clearlooks/src/animation.c -index 1f7a41f..56a9286 100644 ---- a/engines/clearlooks/src/animation.c -+++ b/engines/clearlooks/src/animation.c -@@ -28,7 +28,7 @@ - #include "animation.h" - - #ifdef HAVE_WORKING_ANIMATION --#include -+#include - - struct _AnimationInfo { - GTimer *timer; --- -cgit v0.9.0.2 diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/substitute-tests.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/substitute-tests.patch deleted file mode 100644 index 5c557ba68..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/substitute-tests.patch +++ /dev/null @@ -1,37 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Marko Lindqvist -diff -Nurd gtk-engines-2.20.2/configure.ac gtk-engines-2.20.2/configure.ac ---- gtk-engines-2.20.2/configure.ac 2010-10-01 15:42:37.000000000 +0300 -+++ gtk-engines-2.20.2/configure.ac 2013-08-20 02:50:27.930510565 +0300 -@@ -166,6 +166,9 @@ - - AC_SUBST(DEVELOPMENT_CFLAGS) - -+AC_SUBST([exported_symbols_tests], [[$(EXPORTED_SYMBOLS_TESTS)]]) -+AC_SUBST([torture_test_tests], [[$(TORTURE_TEST_TESTS)]]) -+ - AM_CONFIG_HEADER([engines/support/config.h]) - - AC_CONFIG_FILES([ -diff -Nurd gtk-engines-2.20.2/test/Makefile.am gtk-engines-2.20.2/test/Makefile.am ---- gtk-engines-2.20.2/test/Makefile.am 2010-09-19 18:18:21.000000000 +0300 -+++ gtk-engines-2.20.2/test/Makefile.am 2013-08-20 02:50:36.842510865 +0300 -@@ -66,7 +66,7 @@ - # Prefix with exported_ - EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES)) - --TESTS += $(EXPORTED_SYMBOLS_TESTS) -+TESTS += @exported_symbols_tests@ - - - ############################################################# -@@ -88,7 +88,7 @@ - TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES)) - - # Add TORTURE_TEST_ENGINES to list of tests --TESTS += $(TORTURE_TEST_TESTS) -+TESTS += @torture_test_tests@ - - # Possible other tests: - # - An extensive theme switch tests that loads/unloads the engine diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb deleted file mode 100644 index 83aa74968..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "GTK+ theme engines" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -SECTION = "x11/base" -DEPENDS = "intltool-native gtk+ gettext-native glib-2.0-native" - -PR = "r3" - -PACKAGES += "${PN}-schemas" -PACKAGES_DYNAMIC += "^gtk-engine-.* ^gtk-theme-.*" - -RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95" -RDEPENDS_gtk-theme-metal = "gtk-engine-metal" -RDEPENDS_gtk-theme-mist = "gtk-engine-mist" -RDEPENDS_gtk-theme-crux = "gtk-engine-crux-engine" -RDEPENDS_gtk-theme-lighthouseblue = "gtk-engine-lighthouseblue" -RDEPENDS_gtk-theme-thinice = "gtk-engine-thinice" -RDEPENDS_gtk-theme-industrial = "gtk-engine-industrial" -RDEPENDS_gtk-theme-clearlooks = "gtk-engine-clearlooks" - -FILES_${PN} = "" -FILES_${PN}-dev += "${libdir}/gtk-2.0/*/engines/*.la" -FILES_${PN}-schemas = "${datadir}/gtk-engines/*.xml" - -CFLAGS_prepend = "-DHAVE_ANIMATION " - -RDEPENDS_${PN}-dev = "" - -inherit gnomebase -GNOME_COMPRESS_TYPE="bz2" - -inherit distro_features_check -ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" - -# This picks stable releases in the 2.x series (but not 2.90 onwards, -# which were GNOME 3 betas). -UPSTREAM_CHECK_REGEX = "(?P2\.([0-8]*[02468])+(\.\d+)+)" - -python populate_packages_prepend() { - engines_root = os.path.join(d.getVar('libdir'), "gtk-2.0/2.10.0/engines") - themes_root = os.path.join(d.getVar('datadir'), "themes") - - do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='') - do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='') - # TODO: mark theme packages as arch all -} - -SRC_URI += "file://glib-2.32.patch \ - file://substitute-tests.patch" -SRC_URI[archive.md5sum] = "5deb287bc6075dc21812130604c7dc4f" -SRC_URI[archive.sha256sum] = "15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light/classic-light.xml b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light/classic-light.xml new file mode 100644 index 000000000..23b4b9a22 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light/classic-light.xml @@ -0,0 +1,131 @@ + + + + GtkSourceView team + <_description>Classic color scheme light + + + + + + + + + + + + + + + + + + + +