diff options
Diffstat (limited to 'meta')
1317 files changed, 30006 insertions, 31540 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 058ba63437..b598aa3ad6 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -146,9 +146,9 @@ python do_ar_original() { fetch.unpack(tmpdir, (url,)) os.chdir(tmpdir) - # We split on '+' to chuck any annoying AUTOINC+ in the revision. + # We eliminate any AUTOINC+ in the revision. try: - src_rev = bb.fetch2.get_srcrev(d).split('+')[-1][:10] + src_rev = bb.fetch2.get_srcrev(d).replace('AUTOINC+','') except: src_rev = 'NOREV' tarname = os.path.join(ar_outdir, basename + '.' + src_rev + '.tar.gz') diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 6b99bddd5d..bb129fb245 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -27,7 +27,7 @@ inherit siteinfo # Space separated list of shell scripts with variables defined to supply test # results for autoconf tests we cannot run at build time. -export CONFIG_SITE = "${@siteinfo_get_files(d)}" +export CONFIG_SITE = "${@siteinfo_get_files(d, False)}" acpaths = "default" EXTRA_AUTORECONF = "--exclude=autopoint" @@ -86,7 +86,7 @@ oe_runconf () { ${CACHED_CONFIGUREVARS} $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@" if [ "$?" != "0" ]; then echo "Configure failed. The contents of all config.log files follows to aid debugging" - find ${S} -name config.log -print -exec cat {} \; + find ${S} -ignore_readdir_race -name config.log -print -exec cat {} \; bbfatal "oe_runconf failed" fi set -e @@ -109,7 +109,12 @@ autotools_preconfigure() { else # At least remove the .la files since automake won't automatically # regenerate them even if CFLAGS/LDFLAGS are different - cd ${S}; find ${S} -name \*.la -delete + cd ${S} + if [ "${CLEANBROKEN}" != "1" -a \( -e Makefile -o -e makefile -o -e GNUmakefile \) ]; then + echo "Running \"${MAKE} clean\" in ${S}" + ${MAKE} clean + fi + find ${S} -name \*.la -delete fi fi fi @@ -182,6 +187,7 @@ python autotools_copy_aclocals () { #bb.warn(str(configuredeps2)) cp = [] + siteconf = [] for c in configuredeps: if c.endswith("-native"): manifest = d.expand("${SSTATE_MANIFESTS}/manifest-${BUILD_ARCH}-%s.populate_sysroot" % c) @@ -196,6 +202,8 @@ python autotools_copy_aclocals () { for l in f: if "/aclocal/" in l and l.strip().endswith(".m4"): cp.append(l.strip()) + elif "config_site.d/" in l: + cp.append(l.strip()) except: bb.warn("%s not found" % manifest) @@ -203,6 +211,8 @@ python autotools_copy_aclocals () { t = os.path.join(aclocaldir, os.path.basename(c)) if not os.path.exists(t): os.symlink(c, t) + + d.setVar("CONFIG_SITE", siteinfo_get_files(d, False)) } autotools_copy_aclocals[vardepsexclude] += "MACHINE SDK_ARCH BUILD_ARCH SDK_OS BB_TASKDEPDATA" diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index ff8c63394f..3d9235e1a6 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -94,9 +94,26 @@ def extra_path_elements(d): PATH_prepend = "${@extra_path_elements(d)}" +def get_lic_checksum_file_list(d): + filelist = [] + lic_files = d.getVar("LIC_FILES_CHKSUM", True) or '' + + urls = lic_files.split() + for url in urls: + # We only care about items that are absolute paths since + # any others should be covered by SRC_URI. + try: + path = bb.fetch.decodeurl(url)[2] + if path[0] == '/': + filelist.append(path + ":" + str(os.path.exists(path))) + except bb.fetch.MalformedUrl: + raise bb.build.FuncFailed(d.getVar('PN', True) + ": LIC_FILES_CHKSUM contains an invalid URL: " + url) + return " ".join(filelist) + addtask fetch do_fetch[dirs] = "${DL_DIR}" do_fetch[file-checksums] = "${@bb.fetch.get_checksum_file_list(d)}" +do_fetch[file-checksums] += " ${@get_lic_checksum_file_list(d)}" do_fetch[vardeps] += "SRCREV" python base_do_fetch() { @@ -113,7 +130,6 @@ python base_do_fetch() { addtask unpack after do_fetch do_unpack[dirs] = "${WORKDIR}" -do_unpack[cleandirs] = "${S}/patches" python base_do_unpack() { src_uri = (d.getVar('SRC_URI', True) or "").split() if len(src_uri) == 0: @@ -121,11 +137,21 @@ python base_do_unpack() { rootdir = d.getVar('WORKDIR', True) + # Ensure that we cleanup ${S}/patches + # TODO: Investigate if we can remove + # the entire ${S} in this case. + s_dir = d.getVar('S', True) + p_dir = os.path.join(s_dir, 'patches') + bb.utils.remove(p_dir, True) + try: fetcher = bb.fetch2.Fetch(src_uri, d) fetcher.unpack(rootdir) except bb.fetch2.BBFetchException as e: raise bb.build.FuncFailed(e) + + if not os.path.exists(s_dir): + bb.warn("%s ('S') doesn't exist, please set 'S' to a proper value" % s_dir) } def pkgarch_mapping(d): @@ -216,15 +242,29 @@ python base_eventhandler() { } +CONFIGURESTAMPFILE = "${WORKDIR}/configure.sstate" +CLEANBROKEN = "0" + addtask configure after do_patch -do_configure[dirs] = "${S} ${B}" +do_configure[dirs] = "${B}" do_configure[deptask] = "do_populate_sysroot" base_do_configure() { - : + if [ -n "${CONFIGURESTAMPFILE}" -a -e "${CONFIGURESTAMPFILE}" ]; then + if [ "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" ]; then + cd ${B} + if [ "${CLEANBROKEN}" != "1" -a \( -e Makefile -o -e makefile -o -e GNUmakefile \) ]; then + oe_runmake clean + fi + find ${B} -name \*.la -delete + fi + fi + if [ -n "${CONFIGURESTAMPFILE}" ]; then + echo ${BB_TASKHASH} > ${CONFIGURESTAMPFILE} + fi } addtask compile after do_configure -do_compile[dirs] = "${S} ${B}" +do_compile[dirs] = "${B}" base_do_compile() { if [ -e Makefile -o -e makefile -o -e GNUmakefile ]; then oe_runmake || die "make failed" @@ -234,7 +274,7 @@ base_do_compile() { } addtask install after do_compile -do_install[dirs] = "${D} ${S} ${B}" +do_install[dirs] = "${D} ${B}" # Remove and re-create ${D} so that is it guaranteed to be empty do_install[cleandirs] = "${D}" @@ -333,8 +373,6 @@ python () { extrardeps = [] extraconf = [] for flag, flagval in sorted(pkgconfigflags.items()): - if flag == "defaultval": - continue items = flagval.split(",") num = len(items) if num > 4: @@ -362,7 +400,7 @@ python () { # obsolete. Return a warning to the user. princ = d.getVar('PRINC', True) if princ and princ != "0": - bb.warn("Use of PRINC %s was detected in the recipe %s (or one of its .bbappends)\nUse of PRINC is deprecated. The PR server should be used to automatically increment the PR. See: https://wiki.yoctoproject.org/wiki/PR_Service." % (princ, d.getVar("FILE", True))) + bb.error("Use of PRINC %s was detected in the recipe %s (or one of its .bbappends)\nUse of PRINC is deprecated. The PR server should be used to automatically increment the PR. See: https://wiki.yoctoproject.org/wiki/PR_Service." % (princ, d.getVar("FILE", True))) pr = d.getVar('PR', True) pr_prefix = re.search("\D+",pr) prval = re.search("\d+",pr) @@ -378,6 +416,7 @@ python () { bb.fatal('This recipe does not have the LICENSE field set (%s)' % pn) if bb.data.inherits_class('license', d): + check_license_format(d) unmatched_license_flag = check_license_flags(d) if unmatched_license_flag: bb.debug(1, "Skipping %s because it has a restricted license not" @@ -431,7 +470,7 @@ python () { check_license = False if check_license and bad_licenses: - bad_licenses = map(lambda l: canonical_license(d, l), bad_licenses) + bad_licenses = expand_wildcard_licenses(d, bad_licenses) whitelist = [] for lic in bad_licenses: diff --git a/meta/classes/binconfig-disabled.bbclass b/meta/classes/binconfig-disabled.bbclass index 27f904eb42..595cd096f5 100644 --- a/meta/classes/binconfig-disabled.bbclass +++ b/meta/classes/binconfig-disabled.bbclass @@ -10,6 +10,19 @@ FILES_${PN}-dev += "${bindir}/*-config" do_install_append () { for x in ${BINCONFIG}; do echo "#!/bin/sh" > ${D}$x + # Make the disabled script emit invalid parameters for those configure + # scripts which call it without checking the return code. + echo "echo '--should-not-have-used-$x'" >> ${D}$x echo "exit 1" >> ${D}$x done } + +SYSROOT_PREPROCESS_FUNCS += "binconfig_disabled_sysroot_preprocess" + +binconfig_disabled_sysroot_preprocess () { + for x in ${BINCONFIG}; do + configname=`basename $x` + install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} + install ${D}$x ${SYSROOT_DESTDIR}${bindir_crossscripts} + done +} diff --git a/meta/classes/bluetooth.bbclass b/meta/classes/bluetooth.bbclass new file mode 100644 index 0000000000..f88b4ae5b8 --- /dev/null +++ b/meta/classes/bluetooth.bbclass @@ -0,0 +1,14 @@ +# Avoid code duplication in bluetooth-dependent recipes. + +# Define a variable that expands to the recipe (package) providing core +# bluetooth support on the platform: +# "" if bluetooth is not in DISTRO_FEATURES +# else "bluez5" if bluez5 is in DISTRO_FEATURES +# else "bluez4" + +# Use this with: +# inherit bluetooth +# PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} +# PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4" + +BLUEZ ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5', 'bluez4', d), '', d)}" diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass index 09da032049..44f738b02e 100644 --- a/meta/classes/boot-directdisk.bbclass +++ b/meta/classes/boot-directdisk.bbclass @@ -20,6 +20,7 @@ # ${ROOTFS} - the rootfs image to incorporate do_bootdirectdisk[depends] += "dosfstools-native:do_populate_sysroot \ + virtual/kernel:do_deploy \ syslinux:do_populate_sysroot \ syslinux-native:do_populate_sysroot \ parted-native:do_populate_sysroot \ @@ -69,7 +70,7 @@ boot_direct_populate() { install -d $dest # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use. - install -m 0644 ${STAGING_KERNEL_DIR}/bzImage $dest/vmlinuz + install -m 0644 ${DEPLOY_DIR_IMAGE}/bzImage $dest/vmlinuz # initrd is made of concatenation of multiple filesystem images if [ -n "${INITRD}" ]; then diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass index 859d517dbd..b1c03ba068 100644 --- a/meta/classes/bootimg.bbclass +++ b/meta/classes/bootimg.bbclass @@ -28,6 +28,7 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \ mtools-native:do_populate_sysroot \ cdrtools-native:do_populate_sysroot \ + virtual/kernel:do_deploy \ ${@oe.utils.ifelse(d.getVar('COMPRESSISO'),'zisofs-tools-native:do_populate_sysroot','')}" PACKAGES = " " @@ -66,7 +67,7 @@ populate() { install -d ${DEST} # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use. - install -m 0644 ${STAGING_KERNEL_DIR}/bzImage ${DEST}/vmlinuz + install -m 0644 ${DEPLOY_DIR_IMAGE}/bzImage ${DEST}/vmlinuz # initrd is made of concatenation of multiple filesystem images if [ -n "${INITRD}" ]; then diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 8b5d5c214c..211dcf18b5 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -155,7 +155,7 @@ python buildhistory_emit_pkghistory() { with open(os.path.join(pkgdata_dir, pn)) as f: for line in f.readlines(): if line.startswith('PACKAGES: '): - packages = squashspaces(line.split(': ', 1)[1]) + packages = oe.utils.squashspaces(line.split(': ', 1)[1]) break except IOError as e: if e.errno == errno.ENOENT: @@ -181,7 +181,7 @@ python buildhistory_emit_pkghistory() { rcpinfo.pe = pe rcpinfo.pv = pv rcpinfo.pr = pr - rcpinfo.depends = sortlist(squashspaces(d.getVar('DEPENDS', True) or "")) + rcpinfo.depends = sortlist(oe.utils.squashspaces(d.getVar('DEPENDS', True) or "")) rcpinfo.packages = packages write_recipehistory(rcpinfo, d) @@ -222,13 +222,13 @@ python buildhistory_emit_pkghistory() { pkginfo.pkge = pkge pkginfo.pkgv = pkgv pkginfo.pkgr = pkgr - pkginfo.rprovides = sortpkglist(squashspaces(pkgdata.get('RPROVIDES', ""))) - pkginfo.rdepends = sortpkglist(squashspaces(pkgdata.get('RDEPENDS', ""))) - pkginfo.rrecommends = sortpkglist(squashspaces(pkgdata.get('RRECOMMENDS', ""))) - pkginfo.rsuggests = sortpkglist(squashspaces(pkgdata.get('RSUGGESTS', ""))) - pkginfo.rreplaces = sortpkglist(squashspaces(pkgdata.get('RREPLACES', ""))) - pkginfo.rconflicts = sortpkglist(squashspaces(pkgdata.get('RCONFLICTS', ""))) - pkginfo.files = squashspaces(pkgdata.get('FILES', "")) + pkginfo.rprovides = sortpkglist(oe.utils.squashspaces(pkgdata.get('RPROVIDES', ""))) + pkginfo.rdepends = sortpkglist(oe.utils.squashspaces(pkgdata.get('RDEPENDS', ""))) + pkginfo.rrecommends = sortpkglist(oe.utils.squashspaces(pkgdata.get('RRECOMMENDS', ""))) + pkginfo.rsuggests = sortpkglist(oe.utils.squashspaces(pkgdata.get('RSUGGESTS', ""))) + pkginfo.rreplaces = sortpkglist(oe.utils.squashspaces(pkgdata.get('RREPLACES', ""))) + pkginfo.rconflicts = sortpkglist(oe.utils.squashspaces(pkgdata.get('RCONFLICTS', ""))) + pkginfo.files = oe.utils.squashspaces(pkgdata.get('FILES', "")) for filevar in pkginfo.filevars: pkginfo.filevars[filevar] = pkgdata.get(filevar, "") @@ -374,7 +374,7 @@ buildhistory_get_installed() { printf "" > $1/installed-package-sizes.tmp cat $pkgcache | while read pkg pkgfile pkgarch do - size=`oe-pkgdata-util read-value ${PKGDATA_DIR} "PKGSIZE" ${pkg}_${pkgarch}` + size=`oe-pkgdata-util -p ${PKGDATA_DIR} read-value "PKGSIZE" ${pkg}_${pkgarch}` if [ "$size" != "" ] ; then echo "$size $pkg" >> $1/installed-package-sizes.tmp fi @@ -484,8 +484,9 @@ END echo "SDKSIZE = $sdksize" >> ${BUILDHISTORY_DIR_SDK}/sdk-info.txt } -# By prepending we get in before the removal of packaging files -ROOTFS_POSTPROCESS_COMMAND =+ " buildhistory_list_installed_image ;\ +# By using ROOTFS_POSTUNINSTALL_COMMAND we get in after uninstallation of +# unneeded packages but before the removal of packaging files +ROOTFS_POSTUNINSTALL_COMMAND += " buildhistory_list_installed_image ;\ buildhistory_get_image_installed ; " IMAGE_POSTPROCESS_COMMAND += " buildhistory_get_imageinfo ; " @@ -525,11 +526,6 @@ def buildhistory_get_metadata_revs(d): for i in layers] return '\n'.join(medadata_revs) - -def squashspaces(string): - import re - return re.sub("\s+", " ", string).strip() - def outputvars(vars, listvars, d): vars = vars.split() listvars = listvars.split() @@ -538,7 +534,7 @@ def outputvars(vars, listvars, d): value = d.getVar(var, True) or "" if var in listvars: # Squash out spaces - value = squashspaces(value) + value = oe.utils.squashspaces(value) ret += "%s = %s\n" % (var, value) return ret.rstrip('\n') diff --git a/meta/classes/buildstats.bbclass b/meta/classes/buildstats.bbclass index 89ae72c679..48442641d4 100644 --- a/meta/classes/buildstats.bbclass +++ b/meta/classes/buildstats.bbclass @@ -52,8 +52,8 @@ def set_device(e): # If we end up hitting one of these fs, we'll just skip diskstats collection. ############################################################################ device=os.stat(tmpdir) - majordev=os.major(device.st_dev) - minordev=os.minor(device.st_dev) + majordev=os.major(long(device.st_dev)) + minordev=os.minor(long(device.st_dev)) ############################################################################ # Bug 1700: # Because tmpfs/encryptfs/ramfs etc inserts no entry in /proc/diskstats diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass index 77b19372ba..7a5d9602f5 100644 --- a/meta/classes/chrpath.bbclass +++ b/meta/classes/chrpath.bbclass @@ -10,6 +10,8 @@ def process_file_linux(cmd, fpath, rootdir, baseprefix, tmpdir, d): if p.returncode != 0: return + # Handle RUNPATH as well as RPATH + err = err.replace("RUNPATH=","RPATH=") # Throw away everything other than the rpath list curr_rpath = err.partition("RPATH=")[2] #bb.note("Current rpath for %s is %s" % (fpath, curr_rpath.strip())) diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index 995ddf1ea2..3549c38f15 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -13,6 +13,7 @@ inherit autotools # C/C++ Compiler (without cpu arch/tune arguments) OECMAKE_C_COMPILER ?= "`echo ${CC} | sed 's/^\([^ ]*\).*/\1/'`" OECMAKE_CXX_COMPILER ?= "`echo ${CXX} | sed 's/^\([^ ]*\).*/\1/'`" +OECMAKE_AR ?= "${AR}" # Compiler flags OECMAKE_C_FLAGS ?= "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${CFLAGS}" @@ -35,6 +36,7 @@ set( CMAKE_SYSTEM_PROCESSOR ${TARGET_ARCH} ) set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} ) set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} ) set( CMAKE_ASM_COMPILER ${OECMAKE_C_COMPILER} ) +set( CMAKE_AR ${OECMAKE_AR} CACHE FILEPATH "Archiver" ) set( CMAKE_C_FLAGS "${OECMAKE_C_FLAGS}" CACHE STRING "CFLAGS" ) set( CMAKE_CXX_FLAGS "${OECMAKE_CXX_FLAGS}" CACHE STRING "CXXFLAGS" ) set( CMAKE_ASM_FLAGS "${OECMAKE_C_FLAGS}" CACHE STRING "ASM FLAGS" ) @@ -79,6 +81,8 @@ cmake_do_configure() { rm -rf ${B} mkdir -p ${B} cd ${B} + else + find ${B} -name CMakeFiles -or -name Makefile -or -name cmake_install.cmake -or -name CMakeCache.txt -delete fi # Just like autotools cmake can use a site file to cache result that need generated binaries to run diff --git a/meta/classes/compress_doc.bbclass b/meta/classes/compress_doc.bbclass index 6edbaf531f..9b58d82ce5 100644 --- a/meta/classes/compress_doc.bbclass +++ b/meta/classes/compress_doc.bbclass @@ -136,11 +136,14 @@ def _is_info(file): return False def _is_man(file): + import re + # It refers MANSECT-var in man(1.6g)'s man.config - flags = '.1:.1p:.8:.2:.3:.3p:.4:.5:.6:.7:.9:.0p:.tcl:.n:.l:.p:.o'.split(':') - for flag in flags: - if os.path.basename(file).endswith(flag): - return True + # ".1:.1p:.8:.2:.3:.3p:.4:.5:.6:.7:.9:.0p:.tcl:.n:.l:.p:.o" + # Not start with '.', and contain the above colon-seperate element + p = re.compile(r'[^\.]+\.([1-9lnop]|0p|tcl)') + if p.search(file): + return True return False @@ -254,3 +257,4 @@ python compress_doc_updatealternatives () { if new_names: d.setVar('ALTERNATIVE_%s' % pkg, ' '.join(new_names)) } + diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index 62363fb334..a78f93405b 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -73,8 +73,5 @@ inherit image # Create /etc/timestamp during image construction to give a reasonably sane default time setting ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " -# Zap the root password if debug-tweaks feature is not enabled -ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "", "zap_empty_root_password ; ",d)}' - # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index fec6438c60..a8565e91e3 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -16,6 +16,7 @@ STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${S # PACKAGE_ARCH = "${SDK_ARCH}-${SDKPKGSUFFIX}" CANADIANEXTRAOS = "" +MODIFYTOS ??= "1" python () { archs = d.getVar('PACKAGE_ARCHS', True).split() sdkarchs = [] @@ -23,6 +24,9 @@ python () { sdkarchs.append(arch + '-${SDKPKGSUFFIX}') d.setVar('PACKAGE_ARCHS', " ".join(sdkarchs)) + # Allow the following code segment to be disabled, e.g. meta-environment + if d.getVar("MODIFYTOS", True) != "1": + return # PowerPC can build "linux" and "linux-gnuspe" tarch = d.getVar("TARGET_ARCH", True) if tarch == "powerpc": diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass index 41164a3f33..4451436473 100644 --- a/meta/classes/devshell.bbclass +++ b/meta/classes/devshell.bbclass @@ -17,7 +17,9 @@ python do_devshell () { addtask devshell after do_patch -do_devshell[dirs] = "${S}" +# The directory that the terminal starts in +DEVSHELL_STARTDIR ?= "${S}" +do_devshell[dirs] = "${DEVSHELL_STARTDIR}" do_devshell[nostamp] = "1" # devshell and fakeroot/pseudo need careful handling since only the final diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass index a890de7911..83aa381fe7 100644 --- a/meta/classes/distrodata.bbclass +++ b/meta/classes/distrodata.bbclass @@ -268,240 +268,6 @@ python do_checkpkg() { import tempfile import subprocess - """ - sanity check to ensure same name and type. Match as many patterns as possible - such as: - gnome-common-2.20.0.tar.gz (most common format) - gtk+-2.90.1.tar.gz - xf86-input-synaptics-12.6.9.tar.gz - dri2proto-2.3.tar.gz - blktool_4.orig.tar.gz - libid3tag-0.15.1b.tar.gz - unzip552.tar.gz - icu4c-3_6-src.tgz - genext2fs_1.3.orig.tar.gz - gst-fluendo-mp3 - """ - prefix1 = "[a-zA-Z][a-zA-Z0-9]*([\-_][a-zA-Z]\w+)*\+?[\-_]" # match most patterns which uses "-" as separator to version digits - prefix2 = "[a-zA-Z]+" # a loose pattern such as for unzip552.tar.gz - prefix3 = "[0-9]+[\-]?[a-zA-Z]+" # a loose pattern such as for 80325-quicky-0.4.tar.gz - prefix = "(%s|%s|%s)" % (prefix1, prefix2, prefix3) - ver_regex = "(([A-Z]*\d+[a-zA-Z]*[\.\-_]*)+)"#"((\d+[\.\-_[a-z]])+)" - # src.rpm extension was added only for rpm package. Can be removed if the rpm - # packaged will always be considered as having to be manually upgraded - suffix = "(tar\.gz|tgz|tar\.bz2|tar\.lz4|zip|xz|rpm|bz2|lz4|orig\.tar\.gz|tar\.xz|src\.tar\.gz|src\.tgz|svnr\d+\.tar\.bz2|stable\.tar\.gz|src\.rpm)" - - suffixtuple = ("tar.gz", "tgz", "zip", "tar.bz2", "tar.xz", "tar.lz4", "bz2", "lz4", "orig.tar.gz", "src.tar.gz", "src.rpm", "src.tgz", "svnr\d+.tar.bz2", "stable.tar.gz", "src.rpm") - sinterstr = "(?P<name>%s?)v?(?P<ver>%s)(\-source)?" % (prefix, ver_regex) - sdirstr = "(?P<name>%s)\.?v?(?P<ver>%s)(\-source)?[\.\-](?P<type>%s$)" % (prefix, ver_regex, suffix) - - def parse_inter(s): - m = re.search(sinterstr, s) - if not m: - return None - else: - return (m.group('name'), m.group('ver'), "") - - def parse_dir(s): - m = re.search(sdirstr, s) - if not m: - return None - else: - return (m.group('name'), m.group('ver'), m.group('type')) - - def modelate_version(version): - if version[0] in ['.', '-']: - if version[1].isdigit(): - version = version[1] + version[0] + version[2:len(version)] - else: - version = version[1:len(version)] - - version = re.sub('\-', '.', version) - version = re.sub('_', '.', version) - version = re.sub('(rc)+', '.-1.', version) - version = re.sub('(alpha)+', '.-3.', version) - version = re.sub('(beta)+', '.-2.', version) - if version[0] == 'v': - version = version[1:len(version)] - return version - - """ - Check whether 'new' is newer than 'old' version. We use existing vercmp() for the - purpose. PE is cleared in comparison as it's not for build, and PV is cleared too - for simplicity as it's somehow difficult to get from various upstream format - """ - def __vercmp(old, new): - (on, ov, ot) = old - (en, ev, et) = new - if on != en or (et and et not in suffixtuple): - return False - ov = modelate_version(ov) - ev = modelate_version(ev) - - result = bb.utils.vercmp(("0", ov, ""), ("0", ev, "")) - if result < 0: - return True - else: - return False - - """ - wrapper for fetch upstream directory info - 'url' - upstream link customized by regular expression - 'd' - database - 'tmpf' - tmpfile for fetcher output - We don't want to exit whole build due to one recipe error. So handle all exceptions - gracefully w/o leaking to outer. - """ - def internal_fetch_wget(url, ud, d, tmpf): - status = "ErrFetchUnknown" - - agent = "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.12) Gecko/20101027 Ubuntu/9.10 (karmic) Firefox/3.6.12" - fetchcmd = "/usr/bin/env wget -t 1 --passive-ftp -O %s --user-agent=\"%s\" '%s'" % (tmpf.name, agent, url) - try: - fetcher = bb.fetch2.wget.Wget(d) - fetcher._runwget(ud, d, fetchcmd, True) - status = "SUCC" - except bb.fetch2.BBFetchException, e: - status = "ErrFetch" - - return status - - """ - Check on middle version directory such as "2.4/" in "http://xxx/2.4/pkg-2.4.1.tar.gz", - 'url' - upstream link customized by regular expression - 'd' - database - 'curver' - current version - Return new version if success, or else error in "Errxxxx" style - """ - def check_new_dir(url, curver, ud, d): - pn = d.getVar('PN', True) - f = tempfile.NamedTemporaryFile(delete=False, prefix="%s-1-" % pn) - status = internal_fetch_wget(url, ud, d, f) - fhtml = f.read() - if status == "SUCC" and len(fhtml): - newver = parse_inter(curver) - - """ - match "*4.1/">*4.1/ where '*' matches chars - N.B. add package name, only match for digits - """ - regex = d.getVar('REGEX', True) - if regex == '': - regex = "^%s" %prefix - m = re.search("^%s" % regex, curver) - if m: - s = "%s[^\d\"]*?(\d+[\.\-_])+\d+/?" % m.group() - else: - s = "(\d+[\.\-_])+\d+/?" - - searchstr = "[hH][rR][eE][fF]=\"%s\">" % s - - reg = re.compile(searchstr) - valid = 0 - for line in fhtml.split("\n"): - if line.find(curver) >= 0: - valid = 1 - m = reg.search(line) - if m: - ver = m.group().split("\"")[1] - ver = ver.strip("/") - ver = parse_inter(ver) - if ver and __vercmp(newver, ver) == True: - newver = ver - - """Expect a match for curver in directory list, or else it indicates unknown format""" - if not valid: - status = "ErrParseInterDir" - else: - """rejoin the path name""" - status = newver[0] + newver[1] - elif not len(fhtml): - status = "ErrHostNoDir" - - f.close() - if status != "ErrHostNoDir" and re.match("Err", status): - logpath = d.getVar('LOG_DIR', True) - subprocess.call("cp %s %s/" % (f.name, logpath), shell=True) - os.unlink(f.name) - return status - - """ - Check on the last directory to search '2.4.1' in "http://xxx/2.4/pkg-2.4.1.tar.gz", - 'url' - upstream link customized by regular expression - 'd' - database - 'curname' - current package name - Return new version if success, or else error in "Errxxxx" style - """ - def check_new_version(url, curname, ud, d): - """possible to have no version in pkg name, such as spectrum-fw""" - if not re.search("\d+", curname): - return pcurver - pn = d.getVar('PN', True) - newver_regex = d.getVar('REGEX', True) - f = tempfile.NamedTemporaryFile(delete=False, prefix="%s-2-" % pn) - status = internal_fetch_wget(url, ud, d, f) - fhtml = f.read() - - if status == "SUCC" and len(fhtml): - newver = parse_dir(curname) - - if not newver_regex: - """this is the default matching pattern, if recipe does not """ - """provide a regex expression """ - """match "{PN}-5.21.1.tar.gz">{PN}-5.21.1.tar.gz """ - pn1 = re.search("^%s" % prefix, curname).group() - s = "[^\"]*%s[^\d\"]*?(\d+[\.\-_])+[^\"]*" % pn1 - searchstr = "[hH][rR][eE][fF]=\"%s\".*[>\"]" % s - reg = searchstr - else: - reg = newver_regex - valid = 0 - count = 0 - for line in fhtml.split("\n"): - if pn == 'kconfig-frontends': - m = re.findall(reg, line) - if m: - valid = 1 - for match in m: - (on, ov, oe) = newver - ver = (on, match[0], oe) - if ver and __vercmp(newver, ver) == True: - newver = ver - continue - count += 1 - m = re.search(reg, line) - if m: - valid = 1 - if not newver_regex: - ver = m.group().split("\"")[1].split("/")[-1] - if ver == "download": - ver = m.group().split("\"")[1].split("/")[-2] - ver = parse_dir(ver) - else: - """ we cheat a little here, but we assume that the - regular expression in the recipe will extract exacly - the version """ - (on, ov, oe) = newver - ver = (on, m.group('pver'), oe) - if ver and __vercmp(newver, ver) == True: - newver = ver - """Expect a match for curver in directory list, or else it indicates unknown format""" - if not valid: - status = "ErrParseDir" - else: - """newver still contains a full package name string""" - status = re.sub('_', '.', newver[1]) - elif not len(fhtml): - status = "ErrHostNoDir" - - f.close() - """if host hasn't directory information, no need to save tmp file""" - if status != "ErrHostNoDir" and re.match("Err", status): - logpath = d.getVar('LOG_DIR', True) - subprocess.call("cp %s %s/" % (f.name, logpath), shell=True) - os.unlink(f.name) - return status - """first check whether a uri is provided""" src_uri = d.getVar('SRC_URI', True) if not src_uri: @@ -543,9 +309,6 @@ python do_checkpkg() { localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True)) bb.data.update_data(localdata) - chk_uri = d.getVar('REGEX_URI', True) - if not chk_uri: - chk_uri = src_uri pdesc = localdata.getVar('DESCRIPTION', True) pgrp = localdata.getVar('SECTION', True) if localdata.getVar('PRSPV', True): @@ -562,232 +325,63 @@ python do_checkpkg() { psrcuri = localdata.getVar('SRC_URI', True) maintainer = localdata.getVar('RECIPE_MAINTAINER', True) + """ Get upstream version version """ + pupver = None + pstatus = "ErrUnknown" found = 0 + for uri in src_uri.split(): - m = re.compile('(?P<type>[^:]*)').match(uri) - if not m: - raise MalformedUrl(uri) - elif m.group('type') in ('http', 'https', 'ftp', 'cvs', 'svn', 'git'): - found = 1 - pproto = m.group('type') - break + m = re.compile('(?P<type>[^:]*)').match(uri) + if not m: + raise MalformedUrl(uri) + elif m.group('type') in ('http', 'https', 'ftp', 'cvs', 'svn', 'git'): + found = 1 + psrcuri = uri + pproto = m.group('type') + break if not found: pproto = "file" - pupver = "N/A" - pstatus = "ErrUnknown" - - (type, host, path, user, pswd, parm) = bb.fetch.decodeurl(uri) - if type in ['http', 'https', 'ftp']: - if d.getVar('PRSPV', True): - pcurver = d.getVar('PRSPV', True) - else: - pcurver = d.getVar('PV', True) - else: - if d.getVar('PRSPV', True): - pcurver = d.getVar('PRSPV', True) - else: - pcurver = d.getVar("SRCREV", True) - - - if type in ['http', 'https', 'ftp']: - ud = bb.fetch2.FetchData(uri, d) - newver = pcurver - altpath = path - dirver = "-" - curname = "-" - - """ - match version number amid the path, such as "5.7" in: - http://download.gnome.org/sources/${PN}/5.7/${PN}-${PV}.tar.gz - N.B. how about sth. like "../5.7/5.8/..."? Not find such example so far :-P - """ - m = re.search(r"[^/]*(\d+\.)+\d+([\-_]r\d+)*/", path) - if m: - altpath = path.split(m.group())[0] - dirver = m.group().strip("/") - - """use new path and remove param. for wget only param is md5sum""" - alturi = bb.fetch.encodeurl([type, host, altpath, user, pswd, {}]) - my_uri = d.getVar('REGEX_URI', True) - if my_uri: - if d.getVar('PRSPV', True): - newver = d.getVar('PRSPV', True) - else: - newver = d.getVar('PV', True) - else: - newver = check_new_dir(alturi, dirver, ud, d) - altpath = path - if not re.match("Err", newver) and dirver != newver: - altpath = altpath.replace(dirver, newver, True) - # For folder in folder cases - try to enter the folder again and then try parsing - """Now try to acquire all remote files in current directory""" - if not re.match("Err", newver): - curname = altpath.split("/")[-1] - - """get remote name by skipping pacakge name""" - m = re.search(r"/.*/", altpath) - if not m: - altpath = "/" - else: - altpath = m.group() - - chk_uri = d.getVar('REGEX_URI', True) - if not chk_uri: - alturi = bb.fetch.encodeurl([type, host, altpath, user, pswd, {}]) - else: - alturi = chk_uri - newver = check_new_version(alturi, curname, ud, d) - while(newver == "ErrHostNoDir"): - if alturi == "/download": - break - else: - alturi = "/".join(alturi.split("/")[0:-2]) + "/download" - newver = check_new_version(alturi, curname, ud, d) - if not re.match("Err", newver): - pupver = newver - if pupver != pcurver: - pstatus = "UPDATE" - else: - pstatus = "MATCH" - - if re.match("Err", newver): - pstatus = newver + ":" + altpath + ":" + dirver + ":" + curname - elif type == 'git': - if user: - gituser = user + '@' - else: - gituser = "" - - if 'protocol' in parm: - gitproto = parm['protocol'] - else: - gitproto = "git" - # Get all tags and HEAD - if d.getVar('GIT_REGEX', True): - gitcmd = "git ls-remote %s://%s%s%s %s 2>&1" % (gitproto, gituser, host, path, d.getVar('GIT_REGEX', True)) - else: - gitcmd = "git ls-remote %s://%s%s%s *tag* 2>&1" % (gitproto, gituser, host, path) - gitcmd2 = "git ls-remote %s://%s%s%s HEAD 2>&1" % (gitproto, gituser, host, path) - - tmp = os.popen(gitcmd).read() - if 'unable to connect' in tmp: - tmp = None - tmp2 = os.popen(gitcmd2).read() - if 'unable to connect' in tmp2: - tmp2 = None - #This is for those repos have tag like: refs/tags/1.2.2 - phash = pversion.rsplit("+")[-1] - if tmp: - tmpline = tmp.split("\n") - verflag = 0 - pupver = pversion - for line in tmpline: - if len(line)==0: - break; - puptag = line.split("/")[-1] - upstr_regex = d.getVar('REGEX', True) - if upstr_regex: - puptag = re.search(upstr_regex, puptag) - else: - puptag = re.search("(?P<pver>([0-9][\.|_]?)+)", puptag) - if puptag == None: - continue - puptag = puptag.group('pver') - puptag = re.sub("_",".",puptag) - plocaltag = pupver.split("+git")[0] - if "git" in plocaltag: - plocaltag = plocaltag.split("-")[0] - result = bb.utils.vercmp(("0", puptag, ""), ("0", plocaltag, "")) - - if result > 0: - verflag = 1 - pupver = puptag - elif verflag == 0 : - pupver = plocaltag - #This is for those no tag repo - elif tmp2: + if pproto in ['http', 'https', 'ftp', 'git']: + try: + ud = bb.fetch2.FetchData(psrcuri, d) + pupver = ud.method.latest_versionstring(ud, d) + if pproto == 'git': + if pupver == "": pupver = pversion.rsplit("+")[0] - phash = pupver - else: - pstatus = "ErrGitAccess" - if not ('ErrGitAccess' in pstatus): - - latest_head = tmp2.rsplit("\t")[0][:7] - tmp3 = re.search('(?P<git_ver>(\d+[\.-]?)+)(?P<git_prefix>(\+git[r|\-|]?)AUTOINC\+)(?P<head_md5>([\w|_]+))', pversion) - tmp4 = re.search('(?P<git_ver>(\d+[\.-]?)+)(?P<git_prefix>(\+git[r|\-|]?)AUTOINC\+)(?P<head_md5>([\w|_]+))', pupver) - if not tmp4: - tmp4 = re.search('(?P<git_ver>(\d+[\.-]?)+)', pupver) - - if tmp3: - # Get status of the package - MATCH/UPDATE - result = bb.utils.vercmp(("0", tmp3.group('git_ver'), ""), ("0",tmp3.group('git_ver') , "")) - # Get the latest tag - pstatus = 'MATCH' - if result < 0: - latest_pv = tmp3.group('git_ver') - else: - latest_pv = pupver - if not(tmp3.group('head_md5')[:7] in latest_head) or not(latest_head in tmp3.group('head_md5')[:7]): - pstatus = 'UPDATE' - - git_prefix = tmp3.group('git_prefix') - pupver = latest_pv + tmp3.group('git_prefix') + latest_head - else: - if not tmp3: - bb.plain("#DEBUG# Package %s: current version (%s) doesn't match the usual pattern" %(pname, pversion)) - elif type == 'svn': - ud = bb.fetch2.FetchData(uri, d) - - svnFetcher = bb.fetch2.svn.Svn(d) - svnFetcher.urldata_init(ud, d) - try: - pupver = svnFetcher.latest_revision(ud, d, ud.names[0]) - except bb.fetch2.FetchError: - pstatus = "ErrSvnAccess" - - if pupver: - if pupver in pversion: - pstatus = "MATCH" - else: - pstatus = "UPDATE" - else: - pstatus = "ErrSvnAccess" - - if 'rev' in ud.parm: - pcurver = ud.parm['rev'] - - if pstatus != "ErrSvnAccess": - tag = pversion.rsplit("+svn")[0] - svn_prefix = re.search('(\+svn[r|\-]?)', pversion) - if tag and svn_prefix: - pupver = tag + svn_prefix.group() + pupver - - elif type == 'cvs': - pupver = "HEAD" - pstatus = "UPDATE" - elif type == 'file': - """local file is always up-to-date""" - pupver = pcurver - pstatus = "MATCH" + if re.search(pversion, "gitrAUTOINC"): + pupver += "+gitrAUTOINC+" + else: + pupver += "+gitAUTOINC+" + latest_revision = ud.method.latest_revision(ud, d, ud.names[0]) + pupver += latest_revision[:10] + except Exception as inst: + bb.warn("%s: unexpected error: %s" % (pname, repr(inst))) + pstatus = "ErrAccess" + elif pproto == "file": + """Local files are always updated""" + pupver = pversion else: - pstatus = "ErrUnsupportedProto" + pstatus = "ErrUnsupportedProto" + bb.note("do_checkpkg, protocol %s isn't implemented" % pproto) - if re.match("Err", pstatus): - pstatus += ":%s%s" % (host, path) + if not pupver: + pupver = "N/A" + elif pupver == pversion: + pstatus = "MATCH" + else: + pstatus = "UPDATE" """Read from manual distro tracking fields as alternative""" pmver = d.getVar("RECIPE_UPSTREAM_VERSION", True) if not pmver: - pmver = "N/A" - pmstatus = "ErrNoRecipeData" + pmver = "N/A" + pmstatus = "ErrNoRecipeData" + elif pmver == pupver: + pmstatus = "MATCH" else: - if pmver == pcurver: - pmstatus = "MATCH" - else: - pmstatus = "UPDATE" + pmstatus = "UPDATE" - psrcuri = psrcuri.split()[0] pdepends = "".join(pdepends.split("\t")) pdesc = "".join(pdesc.split("\t")) no_upgr_reason = d.getVar('RECIPE_NO_UPDATE_REASON', True) diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass index 2ac62747a2..75bdb7a14d 100644 --- a/meta/classes/externalsrc.bbclass +++ b/meta/classes/externalsrc.bbclass @@ -35,7 +35,17 @@ python () { d.setVar('B', externalsrcbuild) else: d.setVar('B', '${WORKDIR}/${BPN}-${PV}/') - d.setVar('SRC_URI', '') + + srcuri = (d.getVar('SRC_URI', True) or '').split() + local_srcuri = [] + for uri in srcuri: + if uri.startswith('file://'): + local_srcuri.append(uri) + d.setVar('SRC_URI', ' '.join(local_srcuri)) + + if '{SRCPV}' in d.getVar('PV', False): + # Dummy value because the default function can't be called with blank SRC_URI + d.setVar('SRCPV', '999') tasks = filter(lambda k: d.getVarFlag(k, "task"), d.keys()) @@ -47,7 +57,36 @@ python () { # Since configure will likely touch ${S}, ensure only we lock so one task has access at a time d.appendVarFlag(task, "lockfiles", "${S}/singletask.lock") + # We do not want our source to be wiped out, ever (kernel.bbclass does this for do_clean) + cleandirs = d.getVarFlag(task, 'cleandirs', False) + if cleandirs: + cleandirs = cleandirs.split() + setvalue = False + if '${S}' in cleandirs: + cleandirs.remove('${S}') + setvalue = True + if externalsrcbuild == externalsrc and '${B}' in cleandirs: + cleandirs.remove('${B}') + setvalue = True + if setvalue: + d.setVarFlag(task, 'cleandirs', ' '.join(cleandirs)) + + fetch_tasks = ['do_fetch', 'do_unpack'] + # If we deltask do_patch, there's no dependency to ensure do_unpack gets run, so add one + d.appendVarFlag('do_configure', 'deps', ['do_unpack']) + for task in d.getVar("SRCTREECOVEREDTASKS", True).split(): + if local_srcuri and task in fetch_tasks: + continue bb.build.deltask(task, d) + + d.prependVarFlag('do_compile', 'prefuncs', "externalsrc_compile_prefunc ") + + # Ensure compilation happens every time + d.setVarFlag('do_compile', 'nostamp', '1') } +python externalsrc_compile_prefunc() { + # Make it obvious that this is happening, since forgetting about it could lead to much confusion + bb.warn('Compiling %s from external source %s' % (d.getVar('PN', True), d.getVar('EXTERNALSRC', True))) +} diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass index 2bf1e4bd1b..d122387ffd 100644 --- a/meta/classes/fontcache.bbclass +++ b/meta/classes/fontcache.bbclass @@ -8,11 +8,11 @@ inherit qemu FONT_PACKAGES ??= "${PN}" FONT_EXTRA_RDEPENDS ?= "fontconfig-utils" - +FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig" fontcache_common() { if [ "x$D" != "x" ] ; then $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} bindir=${bindir} \ - libdir=${libdir} base_libdir=${base_libdir} + libdir=${libdir} base_libdir=${base_libdir} fontconfigcachedir=${FONTCONFIG_CACHE_DIR} else fc-cache fi @@ -42,4 +42,4 @@ python add_fontcache_postinsts() { d.setVar('pkg_postrm_%s' % pkg, postrm) } -PACKAGEFUNCS += "add_fontcache_postinsts" +PACKAGEFUNCS =+ "add_fontcache_postinsts" diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 3ec8c0667d..2f9e3cf8ef 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -91,6 +91,10 @@ def create_path(compilers, bb, d): return staging def use_icc(bb,d): + if d.getVar('ICECC_DISABLED') == "1": + # don't even try it, when explicitly disabled + return "no" + # allarch recipes don't use compiler if icc_is_allarch(bb, d): return "no" @@ -133,8 +137,7 @@ def use_icc(bb,d): return "yes" def icc_is_allarch(bb, d): - return \ - bb.data.inherits_class("allarch", d); + return d.getVar("PACKAGE_ARCH") == "all" def icc_is_kernel(bb, d): return \ @@ -148,10 +151,6 @@ def icc_is_native(bb, d): # Don't pollute allarch signatures with TARGET_FPU icc_version[vardepsexclude] += "TARGET_FPU" def icc_version(bb, d): - if d.getVar('ICECC_DISABLED') == "1": - # don't even try it, when explicitly disabled - return "" - if use_icc(bb, d) == "no": return "" @@ -179,7 +178,7 @@ def icc_version(bb, d): return tar_file def icc_path(bb,d): - if d.getVar('ICECC_DISABLED') == "1": + if use_icc(bb, d) == "no": # don't create unnecessary directories when icecc is disabled return @@ -246,7 +245,7 @@ def set_icecc_env(): return set_icecc_env() { - if [ "${ICECC_DISABLED}" = "1" ] + if [ "${@use_icc(bb, d)}" = "no" ] then return fi diff --git a/meta/classes/image-buildinfo.bbclass b/meta/classes/image-buildinfo.bbclass new file mode 100644 index 0000000000..aa17cc8f9e --- /dev/null +++ b/meta/classes/image-buildinfo.bbclass @@ -0,0 +1,69 @@ +# +# Writes build information to target filesystem on /etc/build +# +# Copyright (C) 2014 Intel Corporation +# Author: Alejandro Enedino Hernandez Samaniego <alejandro.hernandez@intel.com> +# +# Licensed under the MIT license, see COPYING.MIT for details +# +# Usage: add INHERIT += "image-buildinfo" to your conf file +# + +# Desired variables to display +IMAGE_BUILDINFO_VARS ?= "DISTRO DISTRO_VERSION" + +# From buildhistory.bbclass +def image_buildinfo_outputvars(vars, listvars, d): + vars = vars.split() + listvars = listvars.split() + ret = "" + for var in vars: + value = d.getVar(var, True) or "" + if (d.getVarFlag(var, 'type') == "list"): + value = oe.utils.squashspaces(value) + ret += "%s = %s\n" % (var, value) + return ret.rstrip('\n') + +# Gets git branch's status (clean or dirty) +def get_layer_git_status(path): + f = os.popen("cd %s; git diff --stat 2>&1 | tail -n 1" % path) + data = f.read() + if f.close() is None: + if len(data) != 0: + return "-- modified" + return "" + +# Returns layer revisions along with their respective status +def get_layer_revs(d): + layers = (d.getVar("BBLAYERS", True) or "").split() + medadata_revs = ["%-17s = %s:%s %s" % (os.path.basename(i), \ + base_get_metadata_git_branch(i, None).strip(), \ + base_get_metadata_git_revision(i, None), \ + get_layer_git_status(i)) \ + for i in layers] + return '\n'.join(medadata_revs) + +def buildinfo_target(d): + # Get context + if d.getVar('BB_WORKERCONTEXT', True) != '1': + return "" + # Single and list variables to be read + vars = (d.getVar("IMAGE_BUILDINFO_VARS", True) or "") + listvars = (d.getVar("IMAGE_BUILDINFO_LVARS", True) or "") + return image_buildinfo_outputvars(vars, listvars, d) + +# Write build information to target filesystem +buildinfo () { +cat > ${IMAGE_ROOTFS}${sysconfdir}/build << END +----------------------- +Build Configuration: | +----------------------- +${@buildinfo_target(d)} +----------------------- +Layer Revisions: | +----------------------- +${@get_layer_revs(d)} +END +} + +IMAGE_PREPROCESS_COMMAND += "buildinfo;" diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 6bbfaf8208..dc9bd80165 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -1,6 +1,6 @@ inherit rootfs_${IMAGE_PKGTYPE} -inherit populate_sdk_base +inherit populate_sdk_ext TOOLCHAIN_TARGET_TASK += "${PACKAGE_INSTALL}" TOOLCHAIN_TARGET_TASK_ATTEMPTONLY += "${PACKAGE_INSTALL_ATTEMPTONLY}" @@ -22,7 +22,7 @@ inherit ${TESTIMAGECLASS} # IMAGE_FEATURES may contain any available package group IMAGE_FEATURES ?= "" IMAGE_FEATURES[type] = "list" -IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs" +IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs empty-root-password allow-empty-password post-install-logging" # rootfs bootstrap install ROOTFS_BOOTSTRAP_INSTALL = "${@bb.utils.contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)}" @@ -52,7 +52,10 @@ def check_image_features(d): features = set(oe.data.typed_value('IMAGE_FEATURES', d)) for feature in features: if feature not in valid_features: - bb.fatal("'%s' in IMAGE_FEATURES is not a valid image feature. Valid features: %s" % (feature, ' '.join(valid_features))) + if bb.utils.contains('EXTRA_IMAGE_FEATURES', feature, True, False, d): + raise bb.parse.SkipRecipe("'%s' in IMAGE_FEATURES (added via EXTRA_IMAGE_FEATURES) is not a valid image feature. Valid features: %s" % (feature, ' '.join(valid_features))) + else: + raise bb.parse.SkipRecipe("'%s' in IMAGE_FEATURES is not a valid image feature. Valid features: %s" % (feature, ' '.join(valid_features))) IMAGE_INSTALL ?= "" IMAGE_INSTALL[type] = "list" @@ -63,6 +66,7 @@ PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}" EXCLUDE_FROM_WORLD = "1" USE_DEVFS ?= "1" +USE_DEPMOD ?= "1" PID = "${@os.getpid()}" @@ -72,8 +76,17 @@ LDCONFIGDEPEND ?= "ldconfig-native:do_populate_sysroot" LDCONFIGDEPEND_libc-uclibc = "" LDCONFIGDEPEND_libc-musl = "" -do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND}" -do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot" +# This is needed to have depmod data in PKGDATA_DIR, +# but if you're building small initramfs image +# e.g. to include it in your kernel, you probably +# don't want this dependency, which is causing dependency loop +KERNELDEPMODDEPEND ?= "virtual/kernel:do_packagedata" + +do_rootfs[depends] += " \ + makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND} \ + virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot \ + ${KERNELDEPMODDEPEND} \ +" do_rootfs[recrdeptask] += "do_packagedata" def command_variables(d): @@ -94,8 +107,8 @@ def rootfs_variables(d): 'IMAGE_ROOTFS_MAXSIZE','IMAGE_NAME','IMAGE_LINK_NAME','IMAGE_MANIFEST','DEPLOY_DIR_IMAGE','RM_OLD_IMAGE','IMAGE_FSTYPES','IMAGE_INSTALL_COMPLEMENTARY','IMAGE_LINGUAS','SDK_OS', 'SDK_OUTPUT','SDKPATHNATIVE','SDKTARGETSYSROOT','SDK_DIR','SDK_VENDOR','SDKIMAGE_INSTALL_COMPLEMENTARY','SDK_PACKAGE_ARCHS','SDK_OUTPUT','SDKTARGETSYSROOT','MULTILIBRE_ALLOW_REP', 'MULTILIB_TEMP_ROOTFS','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS','PACKAGE_ARCHS', - 'PACKAGE_CLASSES','TARGET_VENDOR','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','BUILDNAME','USE_DEVFS', - 'STAGING_KERNEL_DIR','COMPRESSIONTYPES'] + 'PACKAGE_CLASSES','TARGET_VENDOR','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','USE_DEVFS', + 'COMPRESSIONTYPES'] variables.extend(command_variables(d)) variables.extend(variable_depends(d)) return " ".join(variables) @@ -156,20 +169,27 @@ IMAGE_CLASSES += "image_types" inherit ${IMAGE_CLASSES} IMAGE_POSTPROCESS_COMMAND ?= "" -MACHINE_POSTPROCESS_COMMAND ?= "" + +# Zap the root password if debug-tweaks feature is not enabled +ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'empty-root-password' ], "", "zap_empty_root_password ; ",d)}' + # Allow dropbear/openssh to accept logins from accounts with an empty password string if debug-tweaks is enabled -ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "ssh_allow_empty_password; ", "",d)}' +ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'allow-empty-password' ], "ssh_allow_empty_password; ", "",d)}' + # Enable postinst logging if debug-tweaks is enabled -ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "postinst_enable_logging; ", "",d)}' +ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' + # Write manifest IMAGE_MANIFEST = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest" -ROOTFS_POSTPROCESS_COMMAND =+ "write_image_manifest ; " +ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images SYSTEMD_DEFAULT_TARGET ?= '${@bb.utils.contains("IMAGE_FEATURES", "x11-base", "graphical.target", "multi-user.target", d)}' ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("DISTRO_FEATURES", "systemd", "set_systemd_default_target; ", "", d)}' +ROOTFS_POSTPROCESS_COMMAND += 'empty_var_volatile;' + # some default locales IMAGE_LINGUAS ?= "de-de fr-fr en-gb" @@ -188,18 +208,17 @@ do_rootfs[cleandirs] += "${S}" do_rootfs[umask] = "022" # A hook function to support read-only-rootfs IMAGE_FEATURES -# Currently, it only supports sysvinit system. read_only_rootfs_hook () { # Tweak the mount option and fs_passno for rootfs in fstab sed -i -e '/^[#[:space:]]*\/dev\/root/{s/defaults/ro/;s/\([[:space:]]*[[:digit:]]\)\([[:space:]]*\)[[:digit:]]$/\1\20/}' ${IMAGE_ROOTFS}/etc/fstab if ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "true", "false", d)}; then - # Change the value of ROOTFS_READ_ONLY in /etc/default/rcS to yes + # Change the value of ROOTFS_READ_ONLY in /etc/default/rcS to yes if [ -e ${IMAGE_ROOTFS}/etc/default/rcS ]; then sed -i 's/ROOTFS_READ_ONLY=no/ROOTFS_READ_ONLY=yes/' ${IMAGE_ROOTFS}/etc/default/rcS fi - # Run populate-volatile.sh at rootfs time to set up basic files - # and directories to support read-only rootfs. + # Run populate-volatile.sh at rootfs time to set up basic files + # and directories to support read-only rootfs. if [ -x ${IMAGE_ROOTFS}/etc/init.d/populate-volatile.sh ]; then ${IMAGE_ROOTFS}/etc/init.d/populate-volatile.sh fi @@ -216,6 +235,27 @@ read_only_rootfs_hook () { fi fi fi + + if ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "true", "false", d)}; then + # Update user database files so that services don't fail for a read-only systemd system + for conffile in ${IMAGE_ROOTFS}/usr/lib/sysusers.d/systemd.conf ${IMAGE_ROOTFS}/usr/lib/sysusers.d/systemd-remote.conf; do + [ -e $conffile ] || continue + grep -v "^#" $conffile | sed -e '/^$/d' | while read type name id comment; do + if [ "$type" = "u" ]; then + useradd_params="" + [ "$id" != "-" ] && useradd_params="$useradd_params --uid $id" + [ "$comment" != "-" ] && useradd_params="$useradd_params --comment $comment" + useradd_params="$useradd_params --system $name" + eval useradd --root ${IMAGE_ROOTFS} $useradd_params || true + elif [ "$type" = "g" ]; then + groupadd_params="" + [ "$id" != "-" ] && groupadd_params="$groupadd_params --gid $id" + groupadd_params="$groupadd_params --system $name" + eval groupadd --root ${IMAGE_ROOTFS} $groupadd_params || true + fi + done + done + fi } PACKAGE_EXCLUDE ??= "" @@ -346,6 +386,22 @@ set_systemd_default_target () { fi } +# If /var/volatile is not empty, we have seen problems where programs such as the +# journal make assumptions based on the contents of /var/volatile. The journal +# would then write to /var/volatile before it was mounted, thus hiding the +# items previously written. +# +# This change is to attempt to fix those types of issues in a way that doesn't +# affect users that may not be using /var/volatile. +empty_var_volatile () { + if [ -e ${IMAGE_ROOTFS}/etc/fstab ]; then + match=`awk '$1 !~ "#" && $2 ~ /\/var\/volatile/{print $2}' ${IMAGE_ROOTFS}/etc/fstab 2> /dev/null` + if [ -n "$match" ]; then + find ${IMAGE_ROOTFS}/var/volatile -mindepth 1 -delete + fi + fi +} + # Turn any symbolic /sbin/init link into a file remove_init_link () { if [ -h ${IMAGE_ROOTFS}/sbin/init ]; then @@ -365,12 +421,7 @@ python write_image_manifest () { from oe.rootfs import image_list_installed_packages with open(d.getVar('IMAGE_MANIFEST', True), 'w+') as image_manifest: image_manifest.write(image_list_installed_packages(d, 'ver')) -} - -# Make login manager(s) enable automatic login. -# Useful for devices where we do not want to log in at all (e.g. phones) -set_image_autologin () { - sed -i 's%^AUTOLOGIN=\"false"%AUTOLOGIN="true"%g' ${IMAGE_ROOTFS}/etc/sysconfig/gpelogin + image_manifest.write("\n") } # Can be use to create /etc/timestamp during image construction to give a reasonably @@ -410,6 +461,7 @@ do_compile[noexec] = "1" do_install[noexec] = "1" do_populate_sysroot[noexec] = "1" do_package[noexec] = "1" +do_package_qa[noexec] = "1" do_packagedata[noexec] = "1" do_package_write_ipk[noexec] = "1" do_package_write_deb[noexec] = "1" diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 6c3a89eefc..72c7337b6b 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -13,7 +13,7 @@ def imagetypes_getdepends(d): deps = [] ctypes = d.getVar('COMPRESSIONTYPES', True).split() for type in (d.getVar('IMAGE_FSTYPES', True) or "").split(): - if type == "vmdk" or type == "live" or type == "iso" or type == "hddimg": + if type in ["vmdk", "live", "iso", "hddimg"]: type = "ext3" basetype = type for ctype in ctypes: @@ -21,6 +21,8 @@ def imagetypes_getdepends(d): basetype = type[:-len("." + ctype)] adddep(d.getVar("COMPRESS_DEPENDS_%s" % ctype, True), deps) break + for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype, True) or "").split(): + adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends, True) , deps) adddep(d.getVar('IMAGE_DEPENDS_%s' % basetype, True) , deps) depstr = "" @@ -56,9 +58,14 @@ IMAGE_CMD_ext2 = "oe_mkext234fs ext2 ${EXTRA_IMAGECMD}" IMAGE_CMD_ext3 = "oe_mkext234fs ext3 ${EXTRA_IMAGECMD}" IMAGE_CMD_ext4 = "oe_mkext234fs ext4 ${EXTRA_IMAGECMD}" +MIN_BTRFS_SIZE ?= "16384" IMAGE_CMD_btrfs () { - touch ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.btrfs - mkfs.btrfs -b `expr ${ROOTFS_SIZE} \* 1024` ${EXTRA_IMAGECMD} -r ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.btrfs + if [ ${ROOTFS_SIZE} -gt ${MIN_BTRFS_SIZE} ]; then + dd if=/dev/zero of=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.btrfs count=${ROOTFS_SIZE} bs=1024 + mkfs.btrfs ${EXTRA_IMAGECMD} -r ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.btrfs + else + bbfatal "Rootfs is too small for BTRFS (Rootfs Actual Size: ${ROOTFS_SIZE}, BTRFS Minimum Size: ${MIN_BTRFS_SIZE})" + fi } IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" @@ -66,11 +73,15 @@ IMAGE_CMD_squashfs-xz = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_ IMAGE_CMD_squashfs-lzo = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzo ${EXTRA_IMAGECMD} -noappend -comp lzo" IMAGE_CMD_tar = "tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar -C ${IMAGE_ROOTFS} ." +do_rootfs[cleandirs] += "${WORKDIR}/cpio_append" IMAGE_CMD_cpio () { (cd ${IMAGE_ROOTFS} && find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) - if [ ! -e ${IMAGE_ROOTFS}/init ]; then - mkdir -p ${WORKDIR}/cpio_append - touch ${WORKDIR}/cpio_append/init + if [ ! -L ${IMAGE_ROOTFS}/init -a ! -e ${IMAGE_ROOTFS}/init ]; then + if [ -L ${IMAGE_ROOTFS}/sbin/init -o -e ${IMAGE_ROOTFS}/sbin/init ]; then + ln -sf /sbin/init ${WORKDIR}/cpio_append/init + else + touch ${WORKDIR}/cpio_append/init + fi (cd ${WORKDIR}/cpio_append && echo ./init | cpio -oA -H newc -F ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) fi } @@ -130,7 +141,22 @@ IMAGE_DEPENDS_ubi = "mtd-utils-native" IMAGE_DEPENDS_ubifs = "mtd-utils-native" # This variable is available to request which values are suitable for IMAGE_FSTYPES -IMAGE_TYPES = "jffs2 jffs2.sum cramfs ext2 ext2.gz ext2.bz2 ext3 ext3.gz ext2.lzma btrfs iso hddimg squashfs squashfs-xz squashfs-lzo ubi ubifs tar tar.gz tar.bz2 tar.xz tar.lz4 cpio cpio.gz cpio.xz cpio.lzma cpio.lz4 vmdk elf" +IMAGE_TYPES = " \ + jffs2 jffs2.sum \ + cramfs \ + ext2 ext2.gz ext2.bz2 ext2.lzma \ + ext3 ext3.gz \ + ext4 ext4.gz \ + btrfs \ + iso \ + hddimg \ + squashfs squashfs-xz squashfs-lzo \ + ubi ubifs \ + tar tar.gz tar.bz2 tar.xz tar.lz4 \ + cpio cpio.gz cpio.xz cpio.lzma cpio.lz4 \ + vmdk \ + elf \ +" COMPRESSIONTYPES = "gz bz2 lzma xz lz4 sum" COMPRESS_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}.rootfs.${type}" @@ -146,7 +172,7 @@ COMPRESS_DEPENDS_xz = "xz-native" COMPRESS_DEPENDS_lz4 = "lz4-native" COMPRESS_DEPENDS_sum = "mtd-utils-native" -RUNNABLE_IMAGE_TYPES ?= "ext2 ext3" +RUNNABLE_IMAGE_TYPES ?= "ext2 ext3 ext4" RUNNABLE_MACHINE_PATTERNS ?= "qemu" DEPLOYABLE_IMAGE_TYPES ?= "hddimg iso" diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index c6dea22618..ab7ca3b64b 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -30,11 +30,12 @@ WARN_QA ?= "ldflags useless-rpaths rpaths staticdev libdir xorg-driver-abi \ textrel already-stripped incompatible-license files-invalid \ installed-vs-shipped compile-host-path install-host-path \ pn-overrides infodir build-deps file-rdeps \ + unknown-configure-option \ " ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \ perms dep-cmp pkgvarcheck perm-config perm-line perm-link \ split-strip packages-list pkgv-undefined var-undefined \ - version-going-backwards \ + version-going-backwards expanded-d \ " ALL_QA = "${WARN_QA} ${ERROR_QA}" @@ -52,6 +53,13 @@ def package_qa_get_machine_dict(): "darwin9" : { "arm" : (40, 0, 0, True, 32), }, + "eabi" : { + "arm" : (40, 0, 0, True, 32), + }, + "elf" : { + "i586" : (3, 0, 0, True, 32), + "x86_64": (62, 0, 0, True, 64), + }, "linux" : { "aarch64" : (183, 0, 0, True, 64), "aarch64_be" :(183, 0, 0, False, 64), @@ -771,31 +779,32 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, taskdeps, packages, d): rdepends = bb.utils.explode_deps(localdata.getVar('RDEPENDS', True) or "") # Now do the sanity check!!! - for rdepend in rdepends: - if "-dbg" in rdepend and "debug-deps" not in skip: - error_msg = "%s rdepends on %s" % (pkg,rdepend) - sane = package_qa_handle_error("debug-deps", error_msg, d) - if (not "-dev" in pkg and not "-staticdev" in pkg) and rdepend.endswith("-dev") and "dev-deps" not in skip: - error_msg = "%s rdepends on %s" % (pkg, rdepend) - sane = package_qa_handle_error("dev-deps", error_msg, d) - if rdepend not in packages: - rdep_data = oe.packagedata.read_subpkgdata(rdepend, d) - if rdep_data and 'PN' in rdep_data and rdep_data['PN'] in taskdeps: - continue - if not rdep_data or not 'PN' in rdep_data: - pkgdata_dir = d.getVar("PKGDATA_DIR", True) - try: - possibles = os.listdir("%s/runtime-rprovides/%s/" % (pkgdata_dir, rdepend)) - except OSError: - possibles = [] - for p in possibles: - rdep_data = oe.packagedata.read_subpkgdata(p, d) - if rdep_data and 'PN' in rdep_data and rdep_data['PN'] in taskdeps: - break - if rdep_data and 'PN' in rdep_data and rdep_data['PN'] in taskdeps: - continue - error_msg = "%s rdepends on %s, but it isn't a build dependency?" % (pkg, rdepend) - sane = package_qa_handle_error("build-deps", error_msg, d) + if "build-deps" not in skip: + for rdepend in rdepends: + if "-dbg" in rdepend and "debug-deps" not in skip: + error_msg = "%s rdepends on %s" % (pkg,rdepend) + sane = package_qa_handle_error("debug-deps", error_msg, d) + if (not "-dev" in pkg and not "-staticdev" in pkg) and rdepend.endswith("-dev") and "dev-deps" not in skip: + error_msg = "%s rdepends on %s" % (pkg, rdepend) + sane = package_qa_handle_error("dev-deps", error_msg, d) + if rdepend not in packages: + rdep_data = oe.packagedata.read_subpkgdata(rdepend, d) + if rdep_data and 'PN' in rdep_data and rdep_data['PN'] in taskdeps: + continue + if not rdep_data or not 'PN' in rdep_data: + pkgdata_dir = d.getVar("PKGDATA_DIR", True) + try: + possibles = os.listdir("%s/runtime-rprovides/%s/" % (pkgdata_dir, rdepend)) + except OSError: + possibles = [] + for p in possibles: + rdep_data = oe.packagedata.read_subpkgdata(p, d) + if rdep_data and 'PN' in rdep_data and rdep_data['PN'] in taskdeps: + break + if rdep_data and 'PN' in rdep_data and rdep_data['PN'] in taskdeps: + continue + error_msg = "%s rdepends on %s, but it isn't a build dependency?" % (pkg, rdepend) + sane = package_qa_handle_error("build-deps", error_msg, d) if "file-rdeps" not in skip: ignored_file_rdeps = set(['/bin/sh', '/usr/bin/env', 'rtld(GNU_HASH)']) @@ -905,6 +914,33 @@ def package_qa_check_deps(pkg, pkgdest, skip, d): return sane +QAPATHTEST[expanded-d] = "package_qa_check_expanded_d" +def package_qa_check_expanded_d(path,name,d,elf,messages): + """ + Check for the expanded D (${D}) value in pkg_* and FILES + variables, warn the user to use it correctly. + """ + + sane = True + expanded_d = d.getVar('D',True) + + # Get packages for current recipe and iterate + packages = d.getVar('PACKAGES', True).split(" ") + for pak in packages: + # Go through all variables and check if expanded D is found, warn the user accordingly + for var in 'FILES','pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm': + bbvar = d.getVar(var + "_" + pak) + if bbvar: + # Bitbake expands ${D} within bbvar during the previous step, so we check for its expanded value + if expanded_d in bbvar: + if var == 'FILES': + messages["expanded-d"] = "FILES in %s recipe should not contain the ${D} variable as it references the local build directory not the target filesystem, best solution is to remove the ${D} reference" % pak + sane = False + else: + messages["expanded-d"] = "%s in %s recipe contains ${D}, it should be replaced by $D instead" % (var, pak) + sane = False + return sane + # The PACKAGE FUNC to scan each package python do_package_qa () { import subprocess @@ -1111,7 +1147,7 @@ do_configure[postfuncs] += "do_qa_configure " python () { tests = d.getVar('ALL_QA', True).split() if "desktop" in tests: - d.appendVar("PACKAGE_DEPENDS", "desktop-file-utils-native") + d.appendVar("PACKAGE_DEPENDS", " desktop-file-utils-native") ########################################################################### # Check various variables diff --git a/meta/classes/kernel-arch.bbclass b/meta/classes/kernel-arch.bbclass index bbcfa15b84..6a6ad91866 100644 --- a/meta/classes/kernel-arch.bbclass +++ b/meta/classes/kernel-arch.bbclass @@ -40,7 +40,6 @@ def map_uboot_arch(a, d): if re.match('p(pc|owerpc)(|64)', a): return 'ppc' elif re.match('i.86$', a): return 'x86' - elif re.match('arm64$', a): return 'arm' return a export UBOOT_ARCH = "${@map_uboot_arch(d.getVar('ARCH', True), d)}" diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass index 9a95b72744..e1a70e6215 100644 --- a/meta/classes/kernel-module-split.bbclass +++ b/meta/classes/kernel-module-split.bbclass @@ -70,12 +70,12 @@ python split_kernel_module_packages () { m = kerverrexp.match(kernelver) if m: kernelver_stripped = m.group(1) - staging_kernel_dir = d.getVar("STAGING_KERNEL_DIR", True) + staging_kernel_dir = d.getVar("STAGING_KERNEL_BUILDDIR", True) system_map_file = "%s/boot/System.map-%s" % (dvar, kernelver) if not os.path.exists(system_map_file): system_map_file = "%s/System.map-%s" % (staging_kernel_dir, kernelver) if not os.path.exists(system_map_file): - bb.fatal("System.map-%s does not exist in '%s/boot' nor STAGING_KERNEL_DIR '%s'" % (kernelver, dvar, staging_kernel_dir)) + bb.fatal("System.map-%s does not exist in '%s/boot' nor STAGING_KERNEL_BUILDDIR '%s'" % (kernelver, dvar, staging_kernel_dir)) cmd = "depmod -n -a -b %s -F %s %s" % (dvar, system_map_file, kernelver_stripped) f = os.popen(cmd, 'r') @@ -148,7 +148,7 @@ python split_kernel_module_packages () { postinst = d.getVar('pkg_postinst_%s' % pkg, True) if not postinst: bb.fatal("pkg_postinst_%s not defined" % pkg) - postinst += d.getVar('autoload_postinst_fragment', True) % autoload + postinst += d.getVar('autoload_postinst_fragment', True) % (autoload or basename) d.setVar('pkg_postinst_%s' % pkg, postinst) # Write out any modconf fragment @@ -176,6 +176,9 @@ python split_kernel_module_packages () { rdepends[dep] = [] d.setVar('RDEPENDS_' + pkg, bb.utils.join_deps(rdepends, commasep=False)) + # Avoid automatic -dev recommendations for modules ending with -dev. + d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1) + module_deps = parse_depmod() module_regex = '^(.*)\.k?o$' module_pattern = 'kernel-module-%s' diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index f42a5c2534..650ae5a473 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -1,7 +1,5 @@ -S = "${WORKDIR}/linux" - # remove tasks that modify the source tree in case externalsrc is inherited -SRCTREECOVEREDTASKS += "do_kernel_link_vmlinux do_kernel_configme do_validate_branches do_kernel_configcheck do_kernel_checkout do_patch" +SRCTREECOVEREDTASKS += "do_kernel_link_vmlinux do_kernel_configme do_validate_branches do_kernel_configcheck do_kernel_checkout do_shared_workdir do_fetch do_unpack do_patch" # returns local (absolute) path names for all valid patches in the # src_uri @@ -57,7 +55,8 @@ def get_machine_branch(d, default): return default -do_patch() { +do_kernel_metadata() { + set +e cd ${S} export KMETA=${KMETA} @@ -77,22 +76,56 @@ do_patch() { machine_srcrev="${SRCREV}" fi + # In a similar manner to the kernel itself: + # + # defconfig: $(obj)/conf + # ifeq ($(KBUILD_DEFCONFIG),) + # $< --defconfig $(Kconfig) + # else + # @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" + # $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) + # endif + # + # If a defconfig is specified via the KBUILD_DEFCONFIG variable, we copy it + # from the source tree, into a common location and normalized "defconfig" name, + # where the rest of the process will include and incoroporate it into the build + # + # If the fetcher has already placed a defconfig in WORKDIR (from the SRC_URI), + # we don't overwrite it, but instead warn the user that SRC_URI defconfigs take + # precendence. + # + if [ -n "${KBUILD_DEFCONFIG}" ]; then + if [ -f "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}" ]; then + if [ -f "${WORKDIR}/defconfig" ]; then + # If the two defconfigs are the same, leave the existing one in place + cmp "${WORKDIR}/defconfig" "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}" + if [ $? -ne 0 ]; then + bbnote "defconfig detected in WORKDIR. ${KBUILD_DEFCONFIG} skipped" + else + cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig + sccs="${WORKDIR}/defconfig" + fi + fi + else + bbfatal "A KBUILD_DECONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree" + fi + fi + # if we have a defined/set meta branch we should not be generating # any meta data. The passed branch has what we need. if [ -n "${KMETA}" ]; then createme_flags="--disable-meta-gen --meta ${KMETA}" fi - createme ${createme_flags} ${ARCH} ${machine_branch} + createme -v -v ${createme_flags} ${ARCH} ${machine_branch} if [ $? -ne 0 ]; then bbfatal "Could not create ${machine_branch}" fi - sccs="${@" ".join(find_sccs(d))}" + sccs="$sccs ${@" ".join(find_sccs(d))}" patches="${@" ".join(find_patches(d))}" feat_dirs="${@" ".join(find_kernel_feature_dirs(d))}" - set +e # add any explicitly referenced features onto the end of the feature # list that is passed to the kernel build scripts. if [ -n "${KERNEL_FEATURES}" ]; then @@ -120,6 +153,10 @@ do_patch() { if [ $? -ne 0 ]; then bbfatal "Could not update ${machine_branch}" fi +} + +do_patch() { + cd ${S} # executes and modifies the source tree as required patchme ${KMACHINE} @@ -131,7 +168,7 @@ do_patch() { # check to see if the specified SRCREV is reachable from the final branch. # if it wasn't something wrong has happened, and we should error. if [ "${machine_srcrev}" != "AUTOINC" ]; then - if ! [ "$(git rev-parse --verify ${machine_srcrev})" = "$(git merge-base ${machine_srcrev} HEAD)" ]; then + if ! [ "$(git rev-parse --verify ${machine_srcrev}~0)" = "$(git merge-base ${machine_srcrev} HEAD)" ]; then bberror "SRCREV ${machine_srcrev} was specified, but is not reachable" bbfatal "Check the BSP description for incorrect branch selection, or other errors." fi @@ -181,9 +218,11 @@ do_kernel_checkout() { bberror "S is not set to the linux source directory. Check " bbfatal "the recipe and set S to the proper extracted subdirectory" fi + rm -f .gitignore git init git add . git commit -q -m "baseline commit: creating repo for ${PN}-${PV}" + git clean -d -f fi # end debare @@ -211,7 +250,7 @@ do_kernel_checkout() { # Create a working tree copy of the kernel by checking out a branch machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}" git show-ref --quiet --verify -- "refs/heads/${machine_branch}" - if [ $? -eq 0 ]; then + if [ $? -ne 0 ]; then machine_branch="master" fi @@ -221,6 +260,8 @@ do_kernel_checkout() { do_kernel_checkout[dirs] = "${S}" addtask kernel_checkout before do_patch after do_unpack +addtask kernel_metadata after do_validate_branches before do_patch +do_kernel_metadata[depends] = "kern-tools-native:do_populate_sysroot" do_kernel_configme[dirs] += "${S} ${B}" do_kernel_configme() { @@ -248,13 +289,11 @@ do_kernel_configme() { echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config } -addtask kernel_configme after do_patch +addtask kernel_configme before do_configure after do_patch python do_kernel_configcheck() { import re, string, sys - bb.plain("NOTE: validating kernel config, see log.do_kernel_configcheck for details") - # if KMETA isn't set globally by a recipe using this routine, we need to # set the default to 'meta'. Otherwise, kconf_check is not passed a valid # meta-series for processing @@ -266,11 +305,33 @@ python do_kernel_configcheck() { cmd = d.expand("cd ${S}; kconf_check -config- %s/meta-series ${S} ${B}" % kmeta) ret, result = oe.utils.getstatusoutput("%s%s" % (pathprefix, cmd)) - config_check_visibility = d.getVar( "KCONF_AUDIT_LEVEL", True ) or 1 - if config_check_visibility == 1: - bb.debug( 1, "%s" % result ) - else: - bb.note( "%s" % result ) + config_check_visibility = int(d.getVar( "KCONF_AUDIT_LEVEL", True ) or 0) + bsp_check_visibility = int(d.getVar( "KCONF_BSP_AUDIT_LEVEL", True ) or 0) + + # if config check visibility is non-zero, report dropped configuration values + mismatch_file = "${S}/" + kmeta + "/" + "mismatch.cfg" + if os.path.exists(mismatch_file): + if config_check_visibility: + with open (mismatch_file, "r") as myfile: + results = myfile.read() + bb.warn( "[kernel config]: specified values did not make it into the kernel's final configuration:\n\n%s" % results) + + # if config check visibility is level 2 or higher, report non-hardware options + nonhw_file = "${S}/" + kmeta + "/" + "nonhw_report.cfg" + if os.path.exists(nonhw_file): + if config_check_visibility > 1: + with open (nonhw_file, "r") as myfile: + results = myfile.read() + bb.warn( "[kernel config]: BSP specified non-hw configuration:\n\n%s" % results) + + bsp_desc = "${S}/" + kmeta + "/" + "top_tgt" + if os.path.exists(bsp_desc) and bsp_check_visibility > 1: + with open (bsp_desc, "r") as myfile: + bsp_tgt = myfile.read() + m = re.match("^(.*)scratch.obj(.*)$", bsp_tgt) + if not m is None: + bb.warn( "[kernel]: An auto generated BSP description was used, this normally indicates a misconfiguration.\n" + + "Check that your machine (%s) has an associated kernel description." % "${MACHINE}" ) } # Ensure that the branches (BSP and meta) are on the locations specified by @@ -288,12 +349,14 @@ do_validate_branches() { # check and we can exit early if [ "${machine_srcrev}" = "AUTOINC" ]; then bbnote "SRCREV validation is not required for AUTOREV" - elif [ "${machine_srcrev}" = "" ] && [ "${SRCREV}" != "AUTOINC" ]; then - # SRCREV_machine_<MACHINE> was not set. This means that a custom recipe - # that doesn't use the SRCREV_FORMAT "machine_meta" is being built. In - # this case, we need to reset to the give SRCREV before heading to patching - bbnote "custom recipe is being built, forcing SRCREV to ${SRCREV}" - force_srcrev="${SRCREV}" + elif [ "${machine_srcrev}" = "" ]; then + if [ "${SRCREV}" != "AUTOINC" ] && [ "${SRCREV}" != "INVALID" ]; then + # SRCREV_machine_<MACHINE> was not set. This means that a custom recipe + # that doesn't use the SRCREV_FORMAT "machine_meta" is being built. In + # this case, we need to reset to the give SRCREV before heading to patching + bbnote "custom recipe is being built, forcing SRCREV to ${SRCREV}" + force_srcrev="${SRCREV}" + fi else git cat-file -t ${machine_srcrev} > /dev/null if [ $? -ne 0 ]; then @@ -350,8 +413,7 @@ do_kernel_link_vmlinux() { ln -sf ../../../vmlinux } -OE_TERMINAL_EXPORTS += "GUILT_BASE KBUILD_OUTPUT" -GUILT_BASE = "meta" +OE_TERMINAL_EXPORTS += "KBUILD_OUTPUT" KBUILD_OUTPUT = "${B}" python () { diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index fa06c3aae6..125ed88406 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -3,6 +3,11 @@ inherit linux-kernel-base kernel-module-split PROVIDES += "virtual/kernel" DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native depmodwrapper-cross bc-native" +S = "${STAGING_KERNEL_DIR}" +B = "${WORKDIR}/build" +KBUILD_OUTPUT = "${B}" +OE_TERMINAL_EXPORTS += "KBUILD_OUTPUT" + # we include gcc above, we dont need virtual/libc INHIBIT_DEFAULT_DEPS = "1" @@ -31,6 +36,26 @@ python __anonymous () { d.appendVarFlag('do_configure', 'depends', ' ${INITRAMFS_TASK}') } +# Old style kernels may set ${S} = ${WORKDIR}/git for example +# We need to move these over to STAGING_KERNEL_DIR. We can't just +# create the symlink in advance as the git fetcher can't cope with +# the symlink. +do_unpack[cleandirs] += " ${S} ${STAGING_KERNEL_DIR} ${B} ${STAGING_KERNEL_BUILDDIR}" +do_clean[cleandirs] += " ${S} ${STAGING_KERNEL_DIR} ${B} ${STAGING_KERNEL_BUILDDIR}" +base_do_unpack_append () { + s = d.getVar("S", True) + if s[-1] == '/': + # drop trailing slash, so that os.symlink(kernsrc, s) doesn't use s as directory name and fail + s=s[:-1] + kernsrc = d.getVar("STAGING_KERNEL_DIR", True) + if s != kernsrc: + bb.utils.mkdirhier(kernsrc) + bb.utils.remove(kernsrc, recurse=True) + import subprocess + subprocess.call(d.expand("mv ${S} ${STAGING_KERNEL_DIR}"), shell=True) + os.symlink(kernsrc, s) +} + inherit kernel-arch deploy PACKAGES_DYNAMIC += "^kernel-module-.*" @@ -55,7 +80,7 @@ KERNEL_IMAGEDEST = "boot" # export CMDLINE_CONSOLE = "console=${@d.getVar("KERNEL_CONSOLE",1) or "ttyS0"}" -KERNEL_VERSION = "${@get_kernelversion('${B}')}" +KERNEL_VERSION = "${@get_kernelversion_headers('${B}')}" KERNEL_LOCALVERSION ?= "" @@ -206,116 +231,70 @@ kernel_do_install() { [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} install -d ${D}${sysconfdir}/modules-load.d install -d ${D}${sysconfdir}/modprobe.d +} +do_install[prefuncs] += "package_get_auto_pr" - # - # Support for external module building - create a minimal copy of the - # kernel source tree. - # - kerneldir=${D}${KERNEL_SRC_PATH} - install -d $kerneldir - mkdir -p ${D}/lib/modules/${KERNEL_VERSION} - ln -sf ${KERNEL_SRC_PATH} "${D}/lib/modules/${KERNEL_VERSION}/build" - - # - # Store the kernel version in sysroots for module-base.bbclass - # - - echo "${KERNEL_VERSION}" > $kerneldir/kernel-abiversion +addtask shared_workdir after do_compile before do_install - # - # Store kernel image name to allow use during image generation - # +emit_depmod_pkgdata() { + # Stash data for depmod + install -d ${PKGDESTWORK}/kernel-depmod/ + echo "${KERNEL_VERSION}" > ${PKGDESTWORK}/kernel-depmod/kernel-abiversion + cp System.map ${PKGDESTWORK}/kernel-depmod/System.map-${KERNEL_VERSION} +} - echo "${KERNEL_IMAGE_BASE_NAME}" >$kerneldir/kernel-image-name +PACKAGEFUNCS += "emit_depmod_pkgdata" - # - # Copy the entire source tree. In case an external build directory is - # used, copy the build directory over first, then copy over the source - # dir. This ensures the original Makefiles are used and not the - # redirecting Makefiles in the build directory. - # - find . -depth -not -name "*.cmd" -not -name "*.o" -not -name "*.so.dbg" -not -name "*.so" -not -path "./Documentation*" -not -path "./source*" -not -path "./.*" -print0 | cpio --null -pdlu $kerneldir - cp .config $kerneldir - if [ "${S}" != "${B}" ]; then - pwd="$PWD" - cd "${S}" - find . -depth -not -path "./Documentation*" -not -path "./.*" -print0 | cpio --null -pdlu $kerneldir - cd "$pwd" - fi - - # Test to ensure that the output file and image type are not actually - # the same file. If hardlinking is used, they will be the same, and there's - # no need to install. - ! [ ${KERNEL_OUTPUT} -ef $kerneldir/${KERNEL_IMAGETYPE} ] && install -m 0644 ${KERNEL_OUTPUT} $kerneldir/${KERNEL_IMAGETYPE} - install -m 0644 System.map $kerneldir/System.map-${KERNEL_VERSION} +do_shared_workdir () { + cd ${B} - # Dummy Makefile so the clean below works - mkdir $kerneldir/Documentation - touch $kerneldir/Documentation/Makefile + kerneldir=${STAGING_KERNEL_BUILDDIR} + install -d $kerneldir # - # Clean and remove files not needed for building modules. - # Some distributions go through a lot more trouble to strip out - # unecessary headers, for now, we just prune the obvious bits. - # - # We don't want to leave host-arch binaries in /sysroots, so - # we clean the scripts dir while leaving the generated config - # and include files. + # Store the kernel version in sysroots for module-base.bbclass # - oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean _mrproper_scripts - # hide directories that shouldn't have their .c, s and S files deleted - for d in tools scripts lib; do - mv $kerneldir/$d $kerneldir/.$d - done - - # delete .c, .s and .S files, unless we hid a directory as .<dir>. This technique is - # much faster than find -prune and -exec - find $kerneldir -not -path '*/\.*' -type f -name "*.[csS]" -delete + echo "${KERNEL_VERSION}" > $kerneldir/kernel-abiversion - # put the hidden dirs back - for d in tools scripts lib; do - mv $kerneldir/.$d $kerneldir/$d - done + # Copy files required for module builds + cp System.map $kerneldir/System.map-${KERNEL_VERSION} + cp Module.symvers $kerneldir/ + cp .config $kerneldir/ + mkdir -p $kerneldir/include/config + cp include/config/kernel.release $kerneldir/include/config/kernel.release + + # We can also copy over all the generated files and avoid special cases + # like version.h, but we've opted to keep this small until file creep starts + # to happen + if [ -e include/linux/version.h ]; then + mkdir -p $kerneldir/include/linux + cp include/linux/version.h $kerneldir/include/linux/version.h + fi # As of Linux kernel version 3.0.1, the clean target removes # arch/powerpc/lib/crtsavres.o which is present in # KBUILD_LDFLAGS_MODULE, making it required to build external modules. if [ ${ARCH} = "powerpc" ]; then - cp -l arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o + mkdir -p $kerneldir/arch/powerpc/lib/ + cp arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o fi - # Necessary for building modules like compat-wireless. - if [ -f include/generated/bounds.h ]; then - cp -l include/generated/bounds.h $kerneldir/include/generated/bounds.h - fi + mkdir -p $kerneldir/include/generated/ + cp -fR include/generated/* $kerneldir/include/generated/ + if [ -d arch/${ARCH}/include/generated ]; then mkdir -p $kerneldir/arch/${ARCH}/include/generated/ - cp -flR arch/${ARCH}/include/generated/* $kerneldir/arch/${ARCH}/include/generated/ - fi - - # Remove the following binaries which cause strip or arch QA errors - # during do_package for cross-compiled platforms - bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \ - arch/powerpc/boot/mktree scripts/kconfig/zconf.tab.o \ - scripts/kconfig/conf.o scripts/kconfig/kxgettext.o" - for entry in $bin_files; do - rm -f $kerneldir/$entry - done - - # kernels <2.6.30 don't have $kerneldir/tools directory so we check if it exists before calling sed - if [ -f $kerneldir/tools/perf/Makefile ]; then - # Fix SLANG_INC for slang.h - sed -i 's#-I/usr/include/slang#-I=/usr/include/slang#g' $kerneldir/tools/perf/Makefile + cp -fR arch/${ARCH}/include/generated/* $kerneldir/arch/${ARCH}/include/generated/ fi } -do_install[prefuncs] += "package_get_auto_pr" -python sysroot_stage_all () { - oe.path.copyhardlinktree(d.expand("${D}${KERNEL_SRC_PATH}"), d.expand("${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}")) +# We don't need to stage anything, not the modules/firmware since those would clash with linux-firmware +sysroot_stage_all () { + : } -KERNEL_CONFIG_COMMAND ?= "oe_runmake_call oldnoconfig || yes '' | oe_runmake oldconfig" +KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} O=${B} oldnoconfig || yes '' | oe_runmake -C ${S} O=${B} oldconfig" kernel_do_configure() { # fixes extra + in /lib/modules/2.6.37+ @@ -324,6 +303,10 @@ kernel_do_configure() { # $ make kernelrelease => 2.6.37+ touch ${B}/.scmversion ${S}/.scmversion + if [ "${S}" != "${B}" ] && [ -f "${S}/.config" ] && [ ! -f "${B}/.config" ]; then + mv "${S}/.config" "${B}/.config" + fi + # Copy defconfig to .config if .config does not exist. This allows # recipes to manage the .config themselves in do_configure_prepend(). if [ -f "${WORKDIR}/defconfig" ] && [ ! -f "${B}/.config" ]; then @@ -391,7 +374,7 @@ python split_kernel_packages () { do_strip() { if [ -n "${KERNEL_IMAGE_STRIP_EXTRA_SECTIONS}" ]; then - if [[ "${KERNEL_IMAGETYPE}" != "vmlinux" ]]; then + if [ "${KERNEL_IMAGETYPE}" != "vmlinux" ]; then bbwarn "image type will not be stripped (not supported): ${KERNEL_IMAGETYPE}" return fi @@ -403,7 +386,7 @@ do_strip() { gawk '{print $1}'` for str in ${KERNEL_IMAGE_STRIP_EXTRA_SECTIONS}; do { - if [[ "$headers" != *"$str"* ]]; then + if [ "$headers" != *"$str"* ]; then bbwarn "Section not found: $str"; fi @@ -499,7 +482,7 @@ kernel_do_deploy() { do_deploy[dirs] = "${DEPLOYDIR} ${B}" do_deploy[prefuncs] += "package_get_auto_pr" -addtask deploy before do_build after do_install +addtask deploy after do_populate_sysroot EXPORT_FUNCTIONS do_deploy diff --git a/meta/classes/kernelsrc.bbclass b/meta/classes/kernelsrc.bbclass new file mode 100644 index 0000000000..9efd46a92d --- /dev/null +++ b/meta/classes/kernelsrc.bbclass @@ -0,0 +1,10 @@ +S = "${STAGING_KERNEL_DIR}" +do_fetch[noexec] = "1" +do_unpack[depends] += "virtual/kernel:do_patch" +do_unpack[noexec] = "1" +do_patch[noexec] = "1" +do_package[depends] += "virtual/kernel:do_populate_sysroot" +KERNEL_VERSION = "${@get_kernelversion_file("${STAGING_KERNEL_BUILDDIR}")}" + +inherit linux-kernel-base + diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index c1bc399c18..793936e10b 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -268,6 +268,7 @@ python package_do_split_gconvs () { locale_arch_options = { \ "arm": " --uint32-align=4 --little-endian ", \ "armeb": " --uint32-align=4 --big-endian ", \ + "aarch64": " --uint32-align=4 --little-endian ", \ "aarch64_be": " --uint32-align=4 --big-endian ", \ "sh4": " --uint32-align=4 --big-endian ", \ "powerpc": " --uint32-align=4 --big-endian ", \ @@ -298,9 +299,7 @@ python package_do_split_gconvs () { --inputfile=%s/i18n/locales/%s --charmap=%s %s" \ % (treedir, datadir, locale, encoding, name) - qemu_options = d.getVar("QEMU_OPTIONS_%s" % d.getVar('PACKAGE_ARCH', True), True) - if not qemu_options: - qemu_options = d.getVar('QEMU_OPTIONS', True) + qemu_options = d.getVar('QEMU_OPTIONS', True) cmd = "PSEUDO_RELOADED=YES PATH=\"%s\" I18NPATH=\"%s\" %s -L %s \ -E LD_LIBRARY_PATH=%s %s %s/bin/localedef %s" % \ diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 14d3107c4a..73a0e9727e 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -49,24 +49,33 @@ license_create_manifest() { pkged_pv="$(sed -n 's/^PV: //p' ${filename})" pkged_name="$(basename $(readlink ${filename}))" - pkged_lic="$(sed -n "/^LICENSE_${pkged_name}: /{ s/^LICENSE_${pkged_name}: //; s/[|&()*]/ /g; s/ */ /g; p }" ${filename})" - if [ -z ${pkged_lic} ]; then + pkged_lic="$(sed -n "/^LICENSE_${pkged_name}: /{ s/^LICENSE_${pkged_name}: //; p }" ${filename})" + pkged_size="$(sed -n "/^PKGSIZE_${pkged_name}: /{ s/^PKGSIZE_${pkged_name}: //; p }" ${filename})" + if [ -z "${pkged_lic}" ]; then # fallback checking value of LICENSE - pkged_lic="$(sed -n "/^LICENSE: /{ s/^LICENSE: //; s/[|&()*]/ /g; s/ */ /g; p }" ${filename})" + pkged_lic="$(sed -n "/^LICENSE: /{ s/^LICENSE: //; p }" ${filename})" fi echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_MANIFEST} echo "PACKAGE VERSION:" ${pkged_pv} >> ${LICENSE_MANIFEST} echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_MANIFEST} - printf "LICENSE:" >> ${LICENSE_MANIFEST} - for lic in ${pkged_lic}; do + echo "LICENSE:" ${pkged_lic} >> ${LICENSE_MANIFEST} + echo "" >> ${LICENSE_MANIFEST} + + # If the package doesn't contain any file, that is, its size is 0, the license + # isn't relevant as far as the final image is concerned. So doing license check + # doesn't make much sense, skip it. + if [ "$pkged_size" = "0" ]; then + continue + fi + + lics="$(echo ${pkged_lic} | sed "s/[|&()*]/ /g" | sed "s/ */ /g" )" + for lic in ${lics}; do # to reference a license file trim trailing + symbol if ! [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then bbwarn "The license listed ${lic} was not in the licenses collected for ${pkged_pn}" fi - printf " ${lic}" >> ${LICENSE_MANIFEST} done - printf "\n\n" >> ${LICENSE_MANIFEST} done # Two options here: @@ -79,7 +88,7 @@ license_create_manifest() { if [ "${COPY_LIC_DIRS}" = "1" ]; then for pkg in ${INSTALLED_PKGS}; do mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg} - pkged_pn="$(oe-pkgdata-util lookup-recipe ${PKGDATA_DIR} ${pkg})" + pkged_pn="$(oe-pkgdata-util -p ${PKGDATA_DIR} lookup-recipe ${pkg})" for lic in `ls ${LICENSE_DIRECTORY}/${pkged_pn}`; do # Really don't need to copy the generics as they're # represented in the manifest and in the actual pkg licenses @@ -149,12 +158,12 @@ def copy_license_files(lic_files_paths, destdir): dst = os.path.join(destdir, basename) if os.path.exists(dst): os.remove(dst) - if (os.stat(src).st_dev == os.stat(destdir).st_dev): + if os.access(src, os.W_OK) and (os.stat(src).st_dev == os.stat(destdir).st_dev): os.link(src, dst) else: shutil.copyfile(src, dst) except Exception as e: - bb.warn("Could not copy license file %s: %s" % (basename, e)) + bb.warn("Could not copy license file %s to %s: %s" % (src, dst, e)) def find_license_files(d): """ @@ -285,6 +294,31 @@ def canonical_license(d, license): lic += '+' return lic or license +def expand_wildcard_licenses(d, wildcard_licenses): + """ + Return actual spdx format license names if wildcard used. We expand + wildcards from SPDXLICENSEMAP flags and SRC_DISTRIBUTE_LICENSES values. + """ + import fnmatch + licenses = [] + spdxmapkeys = d.getVarFlags('SPDXLICENSEMAP').keys() + for wld_lic in wildcard_licenses: + spdxflags = fnmatch.filter(spdxmapkeys, wld_lic) + licenses += [d.getVarFlag('SPDXLICENSEMAP', flag) for flag in spdxflags] + + spdx_lics = (d.getVar('SRC_DISTRIBUTE_LICENSES') or '').split() + for wld_lic in wildcard_licenses: + licenses += fnmatch.filter(spdx_lics, wld_lic) + + licenses = list(set(licenses)) + return licenses + +def incompatible_license_contains(license, truevalue, falsevalue, d): + license = canonical_license(d, license) + bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE', True) or "").split() + bad_licenses = expand_wildcard_licenses(d, bad_licenses) + return truevalue if license in bad_licenses else falsevalue + def incompatible_license(d, dont_want_licenses, package=None): """ This function checks if a recipe has only incompatible licenses. It also @@ -383,12 +417,37 @@ def check_license_flags(d): return unmatched_flag return None +def check_license_format(d): + """ + This function checks if LICENSE is well defined, + Validate operators in LICENSES. + No spaces are allowed between LICENSES. + """ + pn = d.getVar('PN', True) + licenses = d.getVar('LICENSE', True) + from oe.license import license_operator, license_operator_chars, license_pattern + + elements = filter(lambda x: x.strip(), license_operator.split(licenses)) + for pos, element in enumerate(elements): + if license_pattern.match(element): + if pos > 0 and license_pattern.match(elements[pos - 1]): + bb.warn('%s: LICENSE value "%s" has an invalid format - license names ' \ + 'must be separated by the following characters to indicate ' \ + 'the license selection: %s' % + (pn, licenses, license_operator_chars)) + elif not license_operator.match(element): + bb.warn('%s: LICENSE value "%s" has an invalid separator "%s" that is not ' \ + 'in the valid list of separators (%s)' % + (pn, licenses, element, license_operator_chars)) + SSTATETASKS += "do_populate_lic" do_populate_lic[sstate-inputdirs] = "${LICSSTATEDIR}" do_populate_lic[sstate-outputdirs] = "${LICENSE_DIRECTORY}/" ROOTFS_POSTPROCESS_COMMAND_prepend = "write_package_manifest; license_create_manifest; " +do_populate_lic_setscene[dirs] = "${LICSSTATEDIR}/${PN}" +do_populate_lic_setscene[cleandirs] = "${LICSSTATEDIR}" python do_populate_lic_setscene () { sstate_setscene(d) } diff --git a/meta/classes/linux-kernel-base.bbclass b/meta/classes/linux-kernel-base.bbclass index 4f2b0a4a98..89ce71605c 100644 --- a/meta/classes/linux-kernel-base.bbclass +++ b/meta/classes/linux-kernel-base.bbclass @@ -1,5 +1,5 @@ # parse kernel ABI version out of <linux/version.h> -def get_kernelversion(p): +def get_kernelversion_headers(p): import re fn = p + '/include/linux/utsrelease.h' @@ -9,7 +9,6 @@ def get_kernelversion(p): if not os.path.isfile(fn): fn = p + '/include/linux/version.h' - import re try: f = open(fn, 'r') except IOError: @@ -24,6 +23,16 @@ def get_kernelversion(p): return m.group(1) return None + +def get_kernelversion_file(p): + fn = p + '/kernel-abiversion' + + try: + with open(fn, 'r') as f: + return f.readlines()[0].strip() + except IOError: + return None + def linux_module_packages(s, d): suffix = "" return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split())) diff --git a/meta/classes/module-base.bbclass b/meta/classes/module-base.bbclass index 9537ba9f43..3eb2e9226e 100644 --- a/meta/classes/module-base.bbclass +++ b/meta/classes/module-base.bbclass @@ -3,16 +3,24 @@ inherit kernel-arch export OS = "${TARGET_OS}" export CROSS_COMPILE = "${TARGET_PREFIX}" -export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}" +# This points to the build artefacts from the main kernel build +# such as .config and System.map +# Confusingly it is not the module build output (which is ${B}) but +# we didn't pick the name. +export KBUILD_OUTPUT = "${STAGING_KERNEL_BUILDDIR}" + +export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_BUILDDIR}/kernel-abiversion')}" KERNEL_OBJECT_SUFFIX = ".ko" # kernel modules are generally machine specific PACKAGE_ARCH = "${MACHINE_ARCH}" +do_configure[depends] += "virtual/kernel:do_shared_workdir" + # Function to ensure the kernel scripts are created. Expected to # be called before do_compile. See module.bbclass for an exmaple. do_make_scripts() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS make CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \ - -C ${STAGING_KERNEL_DIR} scripts + -C ${STAGING_KERNEL_DIR} O=${STAGING_KERNEL_BUILDDIR} scripts } diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass index ad6f7af1bb..a03cc74de4 100644 --- a/meta/classes/module.bbclass +++ b/meta/classes/module.bbclass @@ -6,21 +6,23 @@ addtask make_scripts after do_patch before do_compile do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock" do_make_scripts[deptask] = "do_populate_sysroot" +EXTRA_OEMAKE += "KERNEL_SRC=${STAGING_KERNEL_DIR}" + module_do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ - KERNEL_SRC=${STAGING_KERNEL_DIR} \ KERNEL_VERSION=${KERNEL_VERSION} \ CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ AR="${KERNEL_AR}" \ + O=${STAGING_KERNEL_BUILDDIR} \ ${MAKE_TARGETS} } module_do_install() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" \ - KERNEL_SRC=${STAGING_KERNEL_DIR} \ CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + O=${STAGING_KERNEL_BUILDDIR} \ modules_install } diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index dcd364b92c..5ca5c95b4d 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -61,16 +61,17 @@ PTEST_ENABLED = "0" export CONFIG_SITE = "${COREBASE}/meta/site/native" # set the compiler as well. It could have been set to something else -export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" -export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}" -export FC = "${CCACHE}${HOST_PREFIX}gfortran ${HOST_CC_ARCH}" -export CPP = "${HOST_PREFIX}gcc ${HOST_CC_ARCH} -E" -export LD = "${HOST_PREFIX}ld ${HOST_LD_ARCH} " -export CCLD = "${CC}" -export AR = "${HOST_PREFIX}ar" -export AS = "${HOST_PREFIX}as ${HOST_AS_ARCH}" -export RANLIB = "${HOST_PREFIX}ranlib" -export STRIP = "${HOST_PREFIX}strip" +export CC = "${BUILD_CC}" +export CXX = "${BUILD_CXX}" +export FC = "${BUILD_FC}" +export CPP = "${BUILD_CPP}" +export LD = "${BUILD_LD}" +export CCLD = "${BUILD_CCLD}" +export AR = "${BUILD_AR}" +export AS = "${BUILD_AS}" +export RANLIB = "${BUILD_RANLIB}" +export STRIP = "${BUILD_STRIP}" +export NM = "${BUILD_NM}" # Path prefixes base_prefix = "${STAGING_DIR_NATIVE}" @@ -131,7 +132,9 @@ python native_virtclass_handler () { deps = bb.utils.explode_deps(deps) newdeps = [] for dep in deps: - if "-cross-" in dep: + if dep == pn: + continue + elif "-cross-" in dep: newdeps.append(dep.replace("-cross", "-native")) elif not dep.endswith("-native"): newdeps.append(dep + "-native") diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index 5e78116ab8..30bcdfeb44 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass @@ -25,6 +25,7 @@ EXTRANATIVEPATH += "chrpath-native" STAGING_DIR_HOST = "${STAGING_DIR}/${MULTIMACH_HOST_SYS}" STAGING_DIR_TARGET = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}" +PKGDATA_DIR = "${STAGING_DIR_HOST}/pkgdata" HOST_ARCH = "${SDK_ARCH}" HOST_VENDOR = "${SDK_VENDOR}" diff --git a/meta/classes/oelint.bbclass b/meta/classes/oelint.bbclass index d00f468d9a..3e01503756 100644 --- a/meta/classes/oelint.bbclass +++ b/meta/classes/oelint.bbclass @@ -1,4 +1,4 @@ -addtask lint before do_fetch +addtask lint before do_build do_lint[nostamp] = "1" python do_lint() { pkgname = d.getVar("PN", True) @@ -54,6 +54,12 @@ python do_lint() { f.close() return ret + def checkPN(pkgname, varname, str): + if str.find("{PN}") != -1: + bb.warn("%s: should use BPN instead of PN in %s" % (pkgname, varname)) + if str.find("{P}") != -1: + bb.warn("%s: should use BP instead of P in %s" % (pkgname, varname)) + length = len("file://") for item in srcuri: if item.startswith("file://"): @@ -72,14 +78,7 @@ python do_lint() { # for s in srcuri: if not s.startswith("file://"): - if not s.find("{PN}") == -1: - bb.warn("%s: should use BPN instead of PN in SRC_URI" % pkgname) - if not s.find("{P}") == -1: - bb.warn("%s: should use BP instead of P in SRC_URI" % pkgname) + checkPN(pkgname, 'SRC_URI', s) - srcpath = d.getVar("S") - if not srcpath.find("{PN}") == -1: - bb.warn("%s: should use BPN instead of PN in S" % pkgname) - if not srcpath.find("{P}") == -1: - bb.warn("%s: should use BP instead of P in S" % pkgname) + checkPN(pkgname, 'S', d.getVar('S')) } diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 696d173ced..5558d0d100 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -208,16 +208,18 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst else: the_files.append(aux_files_pattern_verbatim % m.group(1)) d.setVar('FILES_' + pkg, " ".join(the_files)) - if extra_depends != '': - d.appendVar('RDEPENDS_' + pkg, ' ' + extra_depends) - d.setVar('DESCRIPTION_' + pkg, description % on) - d.setVar('SUMMARY_' + pkg, summary % on) - if postinst: - d.setVar('pkg_postinst_' + pkg, postinst) - if postrm: - d.setVar('pkg_postrm_' + pkg, postrm) else: d.setVar('FILES_' + pkg, oldfiles + " " + newfile) + if extra_depends != '': + d.appendVar('RDEPENDS_' + pkg, ' ' + extra_depends) + if not d.getVar('DESCRIPTION_' + pkg, True): + d.setVar('DESCRIPTION_' + pkg, description % on) + if not d.getVar('SUMMARY_' + pkg, True): + d.setVar('SUMMARY_' + pkg, summary % on) + if postinst: + d.setVar('pkg_postinst_' + pkg, postinst) + if postrm: + d.setVar('pkg_postrm_' + pkg, postrm) if callable(hook): hook(f, pkg, file_regex, output_pattern, m.group(1)) @@ -237,6 +239,66 @@ python () { d.appendVarFlag('do_package', 'deptask', " do_packagedata") } +# Get a list of files from file vars by searching files under current working directory +# The list contains symlinks, directories and normal files. +def files_from_filevars(filevars): + import os,glob + cpath = oe.cachedpath.CachedPath() + files = [] + for f in filevars: + if os.path.isabs(f): + f = '.' + f + if not f.startswith("./"): + f = './' + f + globbed = glob.glob(f) + if globbed: + if [ f ] != globbed: + files += globbed + continue + files.append(f) + + for f in files: + if not cpath.islink(f): + if cpath.isdir(f): + newfiles = [ os.path.join(f,x) for x in os.listdir(f) ] + if newfiles: + files += newfiles + + return files + +# Called in package_<rpm,ipk,deb>.bbclass to get the correct list of configuration files +def get_conffiles(pkg, d): + pkgdest = d.getVar('PKGDEST', True) + root = os.path.join(pkgdest, pkg) + cwd = os.getcwd() + os.chdir(root) + + conffiles = d.getVar('CONFFILES_%s' % pkg, True); + if conffiles == None: + conffiles = d.getVar('CONFFILES', True) + if conffiles == None: + conffiles = "" + conffiles = conffiles.split() + conf_orig_list = files_from_filevars(conffiles) + + # Remove links and directories from conf_orig_list to get conf_list which only contains normal files + conf_list = [] + for f in conf_orig_list: + if os.path.isdir(f): + continue + if os.path.islink(f): + continue + if not os.path.exists(f): + continue + conf_list.append(f) + + # Remove the leading './' + for i in range(0, len(conf_list)): + conf_list[i] = conf_list[i][1:] + + os.chdir(cwd) + return conf_list + def splitdebuginfo(file, debugfile, debugsrcdir, sourcefile, d): # Function to split a single file into two components, one is the stripped # target system binary, the other contains any debugging information. The @@ -392,28 +454,53 @@ def runtime_mapping_rename (varname, pkg, d): # python package_get_auto_pr() { - # per recipe PRSERV_HOST + import oe.prservice + import re + + # Support per recipe PRSERV_HOST pn = d.getVar('PN', True) host = d.getVar("PRSERV_HOST_" + pn, True) if not (host is None): d.setVar("PRSERV_HOST", host) - if d.getVar('PRSERV_HOST', True): - try: - auto_pr=prserv_get_pr_auto(d) - except Exception as e: - bb.fatal("Can NOT get PRAUTO, exception %s" % str(e)) - if auto_pr is None: - if d.getVar('PRSERV_LOCKDOWN', True): - bb.fatal("Can NOT get PRAUTO from lockdown exported file") - else: - bb.fatal("Can NOT get PRAUTO from remote PR service") - return - d.setVar('PRAUTO',str(auto_pr)) - else: - pkgv = d.getVar("PKGV", True) + pkgv = d.getVar("PKGV", True) + + # PR Server not active, handle AUTOINC + if not d.getVar('PRSERV_HOST', True): if 'AUTOINC' in pkgv: d.setVar("PKGV", pkgv.replace("AUTOINC", "0")) + return + + auto_pr = None + pv = d.getVar("PV", True) + version = d.getVar("PRAUTOINX", True) + pkgarch = d.getVar("PACKAGE_ARCH", True) + checksum = d.getVar("BB_TASKHASH", True) + + if d.getVar('PRSERV_LOCKDOWN', True): + auto_pr = d.getVar('PRAUTO_' + version + '_' + pkgarch, True) or d.getVar('PRAUTO_' + version, True) or None + if auto_pr is None: + bb.fatal("Can NOT get PRAUTO from lockdown exported file") + d.setVar('PRAUTO',str(auto_pr)) + return + + try: + conn = d.getVar("__PRSERV_CONN", True) + if conn is None: + conn = oe.prservice.prserv_make_conn(d) + if conn is not None: + if "AUTOINC" in pkgv: + srcpv = bb.fetch2.get_srcrev(d) + base_ver = "AUTOINC-%s" % version[:version.find(srcpv)] + value = conn.getPR(base_ver, pkgarch, srcpv) + d.setVar("PKGV", pkgv.replace("AUTOINC", str(value))) + + auto_pr = conn.getPR(version, pkgarch, checksum) + except Exception as e: + bb.fatal("Can NOT get PRAUTO, exception %s" % str(e)) + if auto_pr is None: + bb.fatal("Can NOT get PRAUTO from remote PR service") + d.setVar('PRAUTO',str(auto_pr)) } LOCALEBASEPN ??= "${PN}" @@ -982,26 +1069,9 @@ python populate_packages () { filesvar.replace("//", "/") origfiles = filesvar.split() - files = [] - for file in origfiles: - if os.path.isabs(file): - file = '.' + file - if not file.startswith("./"): - file = './' + file - globbed = glob.glob(file) - if globbed: - if [ file ] != globbed: - files += globbed - continue - files.append(file) + files = files_from_filevars(origfiles) for file in files: - if not cpath.islink(file): - if cpath.isdir(file): - newfiles = [ os.path.join(file,x) for x in os.listdir(file) ] - if newfiles: - files += newfiles - continue if (not cpath.islink(file)) and (not cpath.exists(file)): continue if file in seen: @@ -1365,32 +1435,11 @@ python package_do_shlibs() { pkgdest = d.getVar('PKGDEST', True) - shlibs_dirs = d.getVar('SHLIBSDIRS', True).split() shlibswork_dir = d.getVar('SHLIBSWORKDIR', True) # Take shared lock since we're only reading, not writing lf = bb.utils.lockfile(d.expand("${PACKAGELOCK}")) - def read_shlib_providers(): - list_re = re.compile('^(.*)\.list$') - # Go from least to most specific since the last one found wins - for dir in reversed(shlibs_dirs): - bb.debug(2, "Reading shlib providers in %s" % (dir)) - if not os.path.exists(dir): - continue - for file in os.listdir(dir): - m = list_re.match(file) - if m: - dep_pkg = m.group(1) - fd = open(os.path.join(dir, file)) - lines = fd.readlines() - fd.close() - for l in lines: - s = l.strip().split(":") - if s[0] not in shlib_provider: - shlib_provider[s[0]] = {} - shlib_provider[s[0]][s[1]] = (dep_pkg, s[2]) - def linux_so(file, needed, sonames, renames, pkgver): needs_ldconfig = False ldir = os.path.dirname(file).replace(pkgdest + "/" + pkg, '') @@ -1487,8 +1536,7 @@ python package_do_shlibs() { use_ldconfig = False needed = {} - shlib_provider = {} - read_shlib_providers() + shlib_provider = oe.package.read_shlib_providers(d) for pkg in packages.split(): private_libs = d.getVar('PRIVATE_LIBS_' + pkg, True) or d.getVar('PRIVATE_LIBS', True) or "" @@ -1570,7 +1618,7 @@ python package_do_shlibs() { # /opt/abc/lib/libfoo.so.1 and contains /usr/bin/abc depending on system library libfoo.so.1 # but skipping it is still better alternative than providing own # version and then adding runtime dependency for the same system library - if private_libs and n in private_libs: + if private_libs and n[0] in private_libs: bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % (pkg, n[0])) continue if n[0] in shlib_provider.keys(): @@ -1860,7 +1908,7 @@ python package_depchains() { # Since bitbake can't determine which variables are accessed during package # iteration, we need to list them here: -PACKAGEVARS = "FILES RDEPENDS RRECOMMENDS SUMMARY DESCRIPTION RSUGGESTS RPROVIDES RCONFLICTS PKG ALLOW_EMPTY pkg_postinst pkg_postrm INITSCRIPT_NAME INITSCRIPT_PARAMS DEBIAN_NOAUTONAME ALTERNATIVE PKGE PKGV PKGR USERADD_PARAM GROUPADD_PARAM CONFFILES" +PACKAGEVARS = "FILES RDEPENDS RRECOMMENDS SUMMARY DESCRIPTION RSUGGESTS RPROVIDES RCONFLICTS PKG ALLOW_EMPTY pkg_postinst pkg_postrm INITSCRIPT_NAME INITSCRIPT_PARAMS DEBIAN_NOAUTONAME ALTERNATIVE PKGE PKGV PKGR USERADD_PARAM GROUPADD_PARAM CONFFILES SYSTEMD_SERVICE" def gen_packagevar(d): ret = [] diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 5b5f7e2c9a..9d7c59ba53 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -262,7 +262,7 @@ python do_package_deb () { scriptfile.close() os.chmod(os.path.join(controldir, script), 0755) - conffiles_str = localdata.getVar("CONFFILES", True) + conffiles_str = ' '.join(get_conffiles(pkg, d)) if conffiles_str: try: conffiles = open(os.path.join(controldir, 'conffiles'), 'w') diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 44fd3eb29c..dba68042ac 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -226,7 +226,7 @@ python do_package_ipk () { scriptfile.close() os.chmod(os.path.join(controldir, script), 0755) - conffiles_str = localdata.getVar("CONFFILES", True) + conffiles_str = ' '.join(get_conffiles(pkg, d)) if conffiles_str: try: conffiles = open(os.path.join(controldir, 'conffiles'), 'w') diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 92ddf7a30f..e305e8b4ab 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -197,6 +197,16 @@ python write_specfile () { if path.endswith("DEBIAN") or path.endswith("CONTROL"): continue + # Treat all symlinks to directories as normal files. + # os.walk() lists them as directories. + def move_to_files(dir): + if os.path.islink(os.path.join(rootpath, dir)): + files.append(dir) + return True + else: + return False + dirs[:] = [dir for dir in dirs if not move_to_files(dir)] + # Directory handling can happen in two ways, either DIRFILES is not set at all # in which case we fall back to the older behaviour of packages owning all their # directories @@ -324,7 +334,7 @@ python write_specfile () { bb.data.update_data(localdata) - conffiles = (localdata.getVar('CONFFILES', True) or "").split() + conffiles = get_conffiles(pkg, d) dirfiles = localdata.getVar('DIRFILES', True) if dirfiles is not None: dirfiles = dirfiles.split() diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass index b8d75bd38c..9e6ecc8a53 100644 --- a/meta/classes/pixbufcache.bbclass +++ b/meta/classes/pixbufcache.bbclass @@ -67,6 +67,11 @@ pixbufcache_sstate_postinst() { # Packages that use this class should extend this variable with their runtime # dependencies. PIXBUFCACHE_SYSROOT_DEPS = "" -PIXBUFCACHE_SYSROOT_DEPS_class-native = "${@['gdk-pixbuf-native:do_populate_sysroot_setscene', '']['${BPN}' == 'gdk-pixbuf']} glib-2.0-native:do_populate_sysroot_setscene libffi-native:do_populate_sysroot_setscene libpng-native:do_populate_sysroot_setscene zlib-native:do_populate_sysroot_setscene" +PIXBUFCACHE_SYSROOT_DEPS_class-native = "\ + ${@['gdk-pixbuf-native:do_populate_sysroot_setscene', '']['${BPN}' == 'gdk-pixbuf']} \ + glib-2.0-native:do_populate_sysroot_setscene libffi-native:do_populate_sysroot_setscene \ + libpng-native:do_populate_sysroot_setscene zlib-native:do_populate_sysroot_setscene \ + harfbuzz-native:do_populate_sysroot_setscene \ + " do_populate_sysroot_setscene[depends] += "${PIXBUFCACHE_SYSROOT_DEPS}" do_populate_sysroot[depends] += "${@d.getVar('PIXBUFCACHE_SYSROOT_DEPS', True).replace('_setscene','')}" diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index de72e32ed8..5c0769373a 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -40,7 +40,7 @@ TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= "" TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}" SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" -SDK_DEPENDS = "virtual/fakeroot-native sed-native" +SDK_DEPENDS = "virtual/fakeroot-native" # We want the MULTIARCH_TARGET_SYS to point to the TUNE_PKGARCH, not PACKAGE_ARCH as it # could be set to the MACHINE_ARCH @@ -52,6 +52,7 @@ EXCLUDE_FROM_WORLD = "1" SDK_PACKAGING_FUNC ?= "create_shar" SDK_POST_INSTALL_COMMAND ?= "" +SDK_RELOCATE_AFTER_INSTALL ?= "1" SDK_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.manifest" python write_target_sdk_manifest () { @@ -116,9 +117,14 @@ fakeroot tar_sdk() { fakeroot create_shar() { # copy in the template shar extractor script - cp ${COREBASE}/meta/files/toolchain-shar-template.sh ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh + cp ${COREBASE}/meta/files/toolchain-shar-extract.sh ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh - cat << "EOF" > ${T}/post_install_command + rm -f ${T}/post_install_command + + if [ ${SDK_RELOCATE_AFTER_INSTALL} -eq 1 ] ; then + cp ${COREBASE}/meta/files/toolchain-shar-relocate.sh ${T}/post_install_command + fi + cat << "EOF" >> ${T}/post_install_command ${SDK_POST_INSTALL_COMMAND} EOF sed -i -e '/@SDK_POST_INSTALL_COMMAND@/r ${T}/post_install_command' ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh @@ -126,6 +132,7 @@ EOF # substitute variables sed -i -e 's#@SDK_ARCH@#${SDK_ARCH}#g' \ -e 's#@SDKPATH@#${SDKPATH}#g' \ + -e 's#@OLDEST_KERNEL@#${OLDEST_KERNEL}#g' \ -e 's#@REAL_MULTIMACH_TARGET_SYS@#${REAL_MULTIMACH_TARGET_SYS}#g' \ -e '/@SDK_POST_INSTALL_COMMAND@/d' \ ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass new file mode 100644 index 0000000000..22e0ffca28 --- /dev/null +++ b/meta/classes/populate_sdk_ext.bbclass @@ -0,0 +1,217 @@ +# Extensible SDK + +inherit populate_sdk_base + +# NOTE: normally you cannot use task overrides for this kind of thing - this +# only works because of get_sdk_ext_rdepends() + +TOOLCHAIN_HOST_TASK_task-populate-sdk-ext = " \ + meta-environment-extsdk-${MACHINE} \ + " + +TOOLCHAIN_TARGET_TASK_task-populate-sdk-ext = "" + +SDK_RDEPENDS_append_task-populate-sdk-ext = " ${SDK_TARGETS}" + +SDK_RELOCATE_AFTER_INSTALL_task-populate-sdk-ext = "0" + +SDK_META_CONF_WHITELIST ?= "MACHINE DISTRO PACKAGE_CLASSES" + +SDK_TARGETS ?= "${PN}" +OE_INIT_ENV_SCRIPT ?= "oe-init-build-env" + +# The files from COREBASE that you want preserved in the COREBASE copied +# into the sdk. This allows someone to have their own setup scripts in +# COREBASE be preserved as well as untracked files. +COREBASE_FILES ?= " \ + oe-init-build-env \ + oe-init-build-env-memres \ + scripts \ + LICENSE \ + .templateconf \ +" + +SDK_DIR_task-populate-sdk-ext = "${WORKDIR}/sdk-ext" +B_task-populate-sdk-ext = "${SDK_DIR}" +TOOLCHAIN_OUTPUTNAME_task-populate-sdk-ext = "${SDK_NAME}-toolchain-ext-${SDK_VERSION}" + +python copy_buildsystem () { + import re + import oe.copy_buildsystem + + oe_init_env_script = d.getVar('OE_INIT_ENV_SCRIPT', True) + + conf_bbpath = '' + conf_initpath = '' + core_meta_subdir = '' + + # Copy in all metadata layers + bitbake (as repositories) + buildsystem = oe.copy_buildsystem.BuildSystem(d) + baseoutpath = d.getVar('SDK_OUTPUT', True) + '/' + d.getVar('SDKPATH', True) + layers_copied = buildsystem.copy_bitbake_and_layers(baseoutpath + '/layers') + + sdkbblayers = [] + corebase = os.path.basename(d.getVar('COREBASE', True)) + for layer in layers_copied: + if corebase == os.path.basename(layer): + conf_bbpath = os.path.join('layers', layer, 'bitbake') + else: + sdkbblayers.append(layer) + + for path in os.listdir(baseoutpath + '/layers'): + relpath = os.path.join('layers', path, oe_init_env_script) + if os.path.exists(os.path.join(baseoutpath, relpath)): + conf_initpath = relpath + + relpath = os.path.join('layers', path, 'scripts', 'devtool') + if os.path.exists(os.path.join(baseoutpath, relpath)): + scriptrelpath = os.path.dirname(relpath) + + relpath = os.path.join('layers', path, 'meta') + if os.path.exists(os.path.join(baseoutpath, relpath, 'lib', 'oe')): + core_meta_subdir = relpath + + d.setVar('oe_init_build_env_path', conf_initpath) + d.setVar('scriptrelpath', scriptrelpath) + + # Write out config file for devtool + import ConfigParser + config = ConfigParser.SafeConfigParser() + config.add_section('General') + config.set('General', 'bitbake_subdir', conf_bbpath) + config.set('General', 'init_path', conf_initpath) + config.set('General', 'core_meta_subdir', core_meta_subdir) + bb.utils.mkdirhier(os.path.join(baseoutpath, 'conf')) + with open(os.path.join(baseoutpath, 'conf', 'devtool.conf'), 'w') as f: + config.write(f) + + # Create a layer for new recipes / appends + bb.process.run("devtool --basepath %s create-workspace --create-only %s" % (baseoutpath, os.path.join(baseoutpath, 'workspace'))) + + # Create bblayers.conf + bb.utils.mkdirhier(baseoutpath + '/conf') + with open(baseoutpath + '/conf/bblayers.conf', 'w') as f: + f.write('LCONF_VERSION = "%s"\n\n' % d.getVar('LCONF_VERSION')) + f.write('BBPATH = "$' + '{TOPDIR}"\n') + f.write('SDKBASEMETAPATH = "$' + '{TOPDIR}"\n') + f.write('BBLAYERS := " \\\n') + for layerrelpath in sdkbblayers: + f.write(' $' + '{SDKBASEMETAPATH}/layers/%s \\\n' % layerrelpath) + f.write(' $' + '{SDKBASEMETAPATH}/workspace \\\n') + f.write(' "\n') + + # Create local.conf + with open(baseoutpath + '/conf/local.conf', 'w') as f: + f.write('INHERIT += "%s"\n\n' % 'uninative') + f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION')) + + # This is a bit of a hack, but we really don't want these dependencies + # (we're including them in the SDK as nativesdk- versions instead) + f.write('POKYQEMUDEPS_forcevariable = ""\n\n') + f.write('EXTRA_IMAGEDEPENDS_remove = "qemu-native qemu-helper-native"\n\n') + + # Another hack, but we want the native part of sstate to be kept the same + # regardless of the host distro + fixedlsbstring = 'SDK-Fixed' + f.write('NATIVELSBSTRING_forcevariable = "%s"\n\n' % fixedlsbstring) + + # Ensure locked sstate cache objects are re-used without error + f.write('SIGGEN_LOCKEDSIGS_CHECK_LEVEL = "warn"\n\n') + + for varname in d.getVar('SDK_META_CONF_WHITELIST', True).split(): + f.write('%s = "%s"\n' % (varname, d.getVar(varname, True))) + f.write('require conf/locked-sigs.inc\n') + f.write('require conf/work-config.inc\n') + + sigfile = d.getVar('WORKDIR', True) + '/locked-sigs.inc' + oe.copy_buildsystem.generate_locked_sigs(sigfile, d) + + # Filter the locked signatures file to just the sstate tasks we are interested in + allowed_tasks = ['do_populate_lic', 'do_populate_sysroot', 'do_packagedata', 'do_package_write_ipk', 'do_package_write_rpm', 'do_package_write_deb', 'do_package_qa', 'do_deploy'] + excluded_targets = d.getVar('SDK_TARGETS', True) + lockedsigs_pruned = baseoutpath + '/conf/locked-sigs.inc' + oe.copy_buildsystem.prune_lockedsigs(allowed_tasks, + excluded_targets, + sigfile, + lockedsigs_pruned) + + sstate_out = baseoutpath + '/sstate-cache' + bb.utils.remove(sstate_out, True) + oe.copy_buildsystem.create_locked_sstate_cache(lockedsigs_pruned, + d.getVar('SSTATE_DIR', True), + sstate_out, d, + fixedlsbstring) + + # Create a dummy config file for additional settings + with open(baseoutpath + '/conf/work-config.inc', 'w') as f: + pass +} + +install_tools() { + install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk} + ln -sr ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath}/devtool ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/devtool + ln -sr ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath}/recipetool ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/recipetool + touch ${SDK_OUTPUT}/${SDKPATH}/.devtoolbase + + install ${SDK_DEPLOY}/${DISTRO}-${TCLIBC}-${SDK_ARCH}-buildtools-tarball-${TUNE_PKGARCH}-buildtools-nativesdk-standalone-${DISTRO_VERSION}.sh ${SDK_OUTPUT}/${SDKPATH} + + install ${SDK_DEPLOY}/${BUILD_ARCH}-nativesdk-libc.tar.bz2 ${SDK_OUTPUT}/${SDKPATH} +} + +# FIXME this preparation should be done as part of the SDK construction +sdk_ext_postinst() { + printf "\nExtracting buildtools...\n" + cd $target_sdk_dir + printf "buildtools\ny" | ./*buildtools-tarball* > /dev/null + + # Make sure when the user sets up the environment, they also get + # the buildtools-tarball tools in their path. + echo ". $target_sdk_dir/buildtools/environment-setup*" >> $target_sdk_dir/environment-setup* + + # Allow bitbake environment setup to be ran as part of this sdk. + echo "export OE_SKIP_SDK_CHECK=1" >> $target_sdk_dir/environment-setup* + + # A bit of another hack, but we need this in the path only for devtool + # so put it at the end of $PATH. + echo "export PATH=\$PATH:$target_sdk_dir/sysroots/${SDK_SYS}/${bindir_nativesdk}" >> $target_sdk_dir/environment-setup* + + # For now this is where uninative.bbclass expects the tarball + mv *-nativesdk-libc.tar.* $target_sdk_dir/`dirname ${oe_init_build_env_path}` + + printf "Preparing build system...\n" + # dash which is /bin/sh on Ubuntu will not preserve the + # current working directory when first ran, nor will it set $1 when + # sourcing a script. That is why this has to look so ugly. + sh -c ". buildtools/environment-setup* > preparing_build_system.log && cd $target_sdk_dir/`dirname ${oe_init_build_env_path}` && set $target_sdk_dir && . $target_sdk_dir/${oe_init_build_env_path} $target_sdk_dir >> preparing_build_system.log && bitbake ${SDK_TARGETS} >> preparing_build_system.log" || { echo "SDK preparation failed: see `pwd`/preparing_build_system.log" ; exit 1 ; } + echo done +} + +SDK_POST_INSTALL_COMMAND_task-populate-sdk-ext = "${sdk_ext_postinst}" + +SDK_POSTPROCESS_COMMAND_prepend_task-populate-sdk-ext = "copy_buildsystem; install_tools; " + +fakeroot python do_populate_sdk_ext() { + bb.build.exec_func("do_populate_sdk", d) +} + +def get_sdk_ext_rdepends(d): + localdata = d.createCopy() + localdata.appendVar('OVERRIDES', ':task-populate-sdk-ext') + bb.data.update_data(localdata) + return localdata.getVarFlag('do_populate_sdk', 'rdepends', True) + +do_populate_sdk_ext[dirs] = "${@d.getVarFlag('do_populate_sdk', 'dirs', False)}" +do_populate_sdk_ext[depends] += "${@d.getVarFlag('do_populate_sdk', 'depends', False)}" +do_populate_sdk_ext[rdepends] = "${@get_sdk_ext_rdepends(d)}" +do_populate_sdk_ext[recrdeptask] += "${@d.getVarFlag('do_populate_sdk', 'recrdeptask', False)}" + + +do_populate_sdk_ext[depends] += "buildtools-tarball:do_populate_sdk uninative-tarball:do_populate_sdk" + +do_populate_sdk_ext[rdepends] += "${@' '.join([x + ':do_build' for x in d.getVar('SDK_TARGETS', True).split()])}" +do_populate_sdk_ext[recrdeptask] += "do_populate_lic do_package_qa do_populate_sysroot do_deploy" + +# Make sure codes change in copy_buildsystem can result in rebuilt +do_populate_sdk_ext[vardeps] += "copy_buildsystem" + +addtask populate_sdk_ext diff --git a/meta/classes/prserv.bbclass b/meta/classes/prserv.bbclass index b440d863ef..139597f9cb 100644 --- a/meta/classes/prserv.bbclass +++ b/meta/classes/prserv.bbclass @@ -1,33 +1,2 @@ -def prserv_get_pr_auto(d): - import oe.prservice - import re - pv = d.getVar("PV", True) - if not d.getVar('PRSERV_HOST', True): - if 'AUTOINC' in pv: - d.setVar("PKGV", pv.replace("AUTOINC", "0")) - bb.warn("Not using network based PR service") - return None - version = d.getVar("PRAUTOINX", True) - pkgarch = d.getVar("PACKAGE_ARCH", True) - checksum = d.getVar("BB_TASKHASH", True) - - conn = d.getVar("__PRSERV_CONN", True) - if conn is None: - conn = oe.prservice.prserv_make_conn(d) - if conn is None: - return None - - if "AUTOINC" in pv: - srcpv = bb.fetch2.get_srcrev(d) - base_ver = "AUTOINC-%s" % version[:version.find(srcpv)] - value = conn.getPR(base_ver, pkgarch, srcpv) - d.setVar("PKGV", pv.replace("AUTOINC", str(value))) - - if d.getVar('PRSERV_LOCKDOWN', True): - auto_rev = d.getVar('PRAUTO_' + version + '_' + pkgarch, True) or d.getVar('PRAUTO_' + version, True) or None - else: - auto_rev = conn.getPR(version, pkgarch, checksum) - - return auto_rev diff --git a/meta/classes/pythonnative.bbclass b/meta/classes/pythonnative.bbclass index fdd22bbc86..97029dc525 100644 --- a/meta/classes/pythonnative.bbclass +++ b/meta/classes/pythonnative.bbclass @@ -2,5 +2,7 @@ inherit python-dir PYTHON="${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}" +# PYTHON_EXECUTABLE is used by cmake +PYTHON_EXECUTABLE="${PYTHON}" EXTRANATIVEPATH += "${PYTHON_PN}-native" DEPENDS += " ${PYTHON_PN}-native " diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass index b2cf85d628..601f587534 100644 --- a/meta/classes/qemu.bbclass +++ b/meta/classes/qemu.bbclass @@ -29,20 +29,23 @@ def qemu_run_binary(data, rootfs_path, binary): libdir = rootfs_path + data.getVar("libdir", False) base_libdir = rootfs_path + data.getVar("base_libdir", False) - oldest_kernel = data.getVar("OLDEST_KERNEL", True) + qemu_options = data.getVar("QEMU_OPTIONS", True) - return "PSEUDO_UNLOAD=1 " + qemu_binary + " -r " + oldest_kernel + " -L " + rootfs_path\ + return "PSEUDO_UNLOAD=1 " + qemu_binary + " " + qemu_options + " -L " + rootfs_path\ + " -E LD_LIBRARY_PATH=" + libdir + ":" + base_libdir + " "\ + rootfs_path + binary -QEMU_OPTIONS = "-r ${OLDEST_KERNEL}" -QEMU_OPTIONS_append_iwmmxt = " -cpu pxa270-c5" -QEMU_OPTIONS_append_armv6 = " -cpu arm1136" -QEMU_OPTIONS_append_armv7a = " -cpu cortex-a8" -QEMU_OPTIONS_append_e500v2 = " -cpu e500v2" -QEMU_OPTIONS_append_e500mc = " -cpu e500mc" -QEMU_OPTIONS_append_e5500 = " -cpu e5500" -QEMU_OPTIONS_append_e5500-64b = " -cpu e5500" -QEMU_OPTIONS_append_e6500 = " -cpu e6500" -QEMU_OPTIONS_append_e6500-64b = " -cpu e6500" -QEMU_OPTIONS_append_ppc7400 = " -cpu 7400" +# QEMU_EXTRAOPTIONS is not meant to be directly used, the extensions are +# PACKAGE_ARCH, not overrides and hence have to do this dance. Simply being arch +# specific isn't good enough. +QEMU_OPTIONS = "-r ${OLDEST_KERNEL} ${@d.getVar("QEMU_EXTRAOPTIONS_%s" % d.getVar('PACKAGE_ARCH', True), True) or ""}" +QEMU_EXTRAOPTIONS_iwmmxt = " -cpu pxa270-c5" +QEMU_EXTRAOPTIONS_armv6 = " -cpu arm1136" +QEMU_EXTRAOPTIONS_armv7a = " -cpu cortex-a8" +QEMU_EXTRAOPTIONS_e500v2 = " -cpu e500v2" +QEMU_EXTRAOPTIONS_e500mc = " -cpu e500mc" +QEMU_EXTRAOPTIONS_e5500 = " -cpu e5500" +QEMU_EXTRAOPTIONS_e5500-64b = " -cpu e5500" +QEMU_EXTRAOPTIONS_e6500 = " -cpu e6500" +QEMU_EXTRAOPTIONS_e6500-64b = " -cpu e6500" +QEMU_EXTRAOPTIONS_ppc7400 = " -cpu 7400" diff --git a/meta/classes/qmake_base.bbclass b/meta/classes/qmake_base.bbclass index 86bbede260..dc98713fd2 100644 --- a/meta/classes/qmake_base.bbclass +++ b/meta/classes/qmake_base.bbclass @@ -38,9 +38,9 @@ do_generate_qt_config_file() { [Paths] Prefix = Binaries = ${STAGING_BINDIR_NATIVE} -Headers = ${STAGING_INCDIR}/qt4 -Plugins = ${STAGING_LIBDIR}/qt4/plugins/ -Mkspecs = ${STAGING_DATADIR}/qt4/mkspecs/ +Headers = ${STAGING_INCDIR}/${QT_DIR_NAME} +Plugins = ${STAGING_LIBDIR}/${QT_DIR_NAME}/plugins/ +Mkspecs = ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/ EOF } diff --git a/meta/classes/qt4e.bbclass b/meta/classes/qt4e.bbclass index 850bb6a717..13b1050aac 100644 --- a/meta/classes/qt4e.bbclass +++ b/meta/classes/qt4e.bbclass @@ -19,6 +19,3 @@ EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=${QT_LIBINFIX} " # Qt4 uses atomic instructions not supported in thumb mode ARM_INSTRUCTION_SET = "arm" - -# Qt4 could NOT be built on MIPS64 with 64 bits userspace -COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32" diff --git a/meta/classes/qt4x11.bbclass b/meta/classes/qt4x11.bbclass index 65d196afc6..6f06d34755 100644 --- a/meta/classes/qt4x11.bbclass +++ b/meta/classes/qt4x11.bbclass @@ -1,7 +1,10 @@ QT4DEPENDS ?= "qt4-x11 " DEPENDS_prepend = "${QT4DEPENDS}" -inherit qmake2 +# depends on qt4-x11 +REQUIRED_DISTRO_FEATURES += "x11" + +inherit qmake2 distro_features_check QT_BASE_NAME = "qt4" QT_DIR_NAME = "qt4" @@ -9,6 +12,3 @@ QT_LIBINFIX = "" # Qt4 uses atomic instructions not supported in thumb mode ARM_INSTRUCTION_SET = "arm" - -# Qt4 could NOT be built on MIPS64 with 64 bits userspace -COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32" diff --git a/meta/classes/report-error.bbclass b/meta/classes/report-error.bbclass index 5fe2355842..9edf2ceb31 100644 --- a/meta/classes/report-error.bbclass +++ b/meta/classes/report-error.bbclass @@ -44,11 +44,18 @@ python errorreport_handler () { task = e.task taskdata={} log = e.data.getVar('BB_LOGFILE', True) - logFile = open(log, 'r') taskdata['package'] = e.data.expand("${PF}") taskdata['task'] = task - taskdata['log'] = logFile.read() - logFile.close() + if log: + try: + logFile = open(log, 'r') + taskdata['log'] = logFile.read().decode('utf-8') + logFile.close() + except: + taskdata['log'] = "Unable to read log file" + + else: + taskdata['log'] = "No Log" jsondata = json.loads(errorreport_getdata(e)) jsondata['failures'].append(taskdata) errorreport_savedata(e, jsondata, "error-report.txt") @@ -59,8 +66,8 @@ python errorreport_handler () { if(len(failures) > 0): filename = "error_report_" + e.data.getVar("BUILDNAME")+".txt" datafile = errorreport_savedata(e, jsondata, filename) - bb.note("The errors for this build are stored in %s\nYou can send the errors to an upstream server by running:\n send-error-report %s [server]" % (datafile, datafile)) - bb.note("The contents of these logs will be posted in public if you use the above command with the default server. If you need to do so, please ensure you remove any identifying or proprietary information before sending.") + bb.note("The errors for this build are stored in %s\nYou can send the errors to a reports server by running:\n send-error-report %s [-s server]" % (datafile, datafile)) + bb.note("The contents of these logs will be posted in public if you use the above command with the default server. Please ensure you remove any identifying or proprietary information when prompted before sending.") } addhandler errorreport_handler diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass index 7979a53a38..e68d02a783 100644 --- a/meta/classes/rm_work.bbclass +++ b/meta/classes/rm_work.bbclass @@ -109,3 +109,12 @@ rm_work_rootfs () { : } rm_work_rootfs[cleandirs] = "${WORKDIR}/rootfs" + +python () { + # If the recipe name is in the RM_WORK_EXCLUDE, skip the recipe. + excludes = (d.getVar("RM_WORK_EXCLUDE", True) or "").split() + pn = d.getVar("PN", True) + if pn in excludes: + d.delVarFlag('rm_work_rootfs', 'cleandirs') + d.delVarFlag('rm_work_populatesdk', 'cleandirs') +} diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index 6139cc7d59..dd144e49ef 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass @@ -6,7 +6,7 @@ # EXTRAOPKGCONFIG ?= "" -ROOTFS_PKGMANAGE = "opkg opkg-collateral ${EXTRAOPKGCONFIG}" +ROOTFS_PKGMANAGE = "opkg ${EXTRAOPKGCONFIG}" ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" do_rootfs[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot" diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 5be5efb8a4..cca39c9b52 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -70,6 +70,12 @@ python oecore_update_bblayers() { sanity_conf_update(bblayers_fn, lines, 'LCONF_VERSION', current_lconf) return + elif current_lconf == 5 and lconf_version > 5: + # Null update, to avoid issues with people switching between poky and other distros + current_lconf = 6 + sanity_conf_update(bblayers_fn, lines, 'LCONF_VERSION', current_lconf) + return + sys.exit() } @@ -470,7 +476,6 @@ def sanity_check_conffiles(status, d): if success: bb.note("Your conf/bblayers.conf has been automatically updated.") status.reparse = True - break if not status.reparse: status.addresult("Your version of bblayers.conf has the wrong LCONF_VERSION (has %s, expecting %s).\nPlease compare the your file against bblayers.conf.sample and merge any changes before continuing.\n\"meld conf/bblayers.conf ${COREBASE}/meta*/conf/bblayers.conf.sample\" is a good way to visualise the changes.\n" % (current_lconf, lconf_version)) @@ -519,6 +524,16 @@ def sanity_handle_abichanges(status, d): status.addresult("Your configuration is using stamp files including the sstate hash but your build directory was built with stamp files that do not include this.\nTo continue, either rebuild or switch back to the OEBasic signature handler with BB_SIGNATURE_HANDLER = 'OEBasic'.\n") elif (abi != current_abi and current_abi == "9"): status.addresult("The layout of the TMPDIR STAMPS directory has changed. Please clean out TMPDIR and rebuild (sstate will be still be valid and reused)\n") + elif (abi != current_abi and current_abi == "10" and (abi == "8" or abi == "9")): + bb.note("Converting staging layout from version 8/9 to layout version 10") + cmd = d.expand("grep -r -l sysroot-providers/virtual_kernel ${SSTATE_MANIFESTS}") + ret, result = oe.utils.getstatusoutput(cmd) + result = result.split() + for f in result: + bb.note("Uninstalling manifest file %s" % f) + sstate_clean_manifest(f, d) + with open(abifile, "w") as f: + f.write(current_abi) elif (abi != current_abi): # Code to convert from one ABI to another could go here if possible. status.addresult("Error, TMPDIR has changed its layout version number (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi)) @@ -804,6 +819,10 @@ def check_sanity_everybuild(status, d): with open(checkfile, "w") as f: f.write(tmpdir) + # Check vmdk and live can't be built together. + if 'vmdk' in d.getVar('IMAGE_FSTYPES', True) and 'live' in d.getVar('IMAGE_FSTYPES', True): + status.addresult("Error, IMAGE_FSTYPES vmdk and live can't be built together\n") + def check_sanity(sanity_data): import subprocess diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index e90632aeef..5fd99bf27a 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass @@ -18,10 +18,10 @@ def siteinfo_data(d): archinfo = { "allarch": "endian-little bit-32", # bogus, but better than special-casing the checks below for allarch - "aarch64": "endian-little bit-64 arm-common", - "aarch64_be": "endian-big bit-64 arm-common", - "arm": "endian-little bit-32 arm-common", - "armeb": "endian-big bit-32 arm-common", + "aarch64": "endian-little bit-64 arm-common arm-64", + "aarch64_be": "endian-big bit-64 arm-common arm-64", + "arm": "endian-little bit-32 arm-common arm-32", + "armeb": "endian-big bit-32 arm-common arm-32", "avr32": "endian-big bit-32 avr32-common", "bfin": "endian-little bit-32 bfin-common", "i386": "endian-little bit-32 ix86-common", @@ -95,6 +95,7 @@ def siteinfo_data(d): "x86_64-linux": "bit-64", "x86_64-linux-musl": "x86_64-linux bit-64", "x86_64-linux-uclibc": "bit-64", + "x86_64-elf": "bit-64", "x86_64-linux-gnu": "bit-64 x86_64-linux", "x86_64-linux-gnux32": "bit-32 ix86-common x32-linux", "x86_64-mingw32": "bit-64", @@ -150,9 +151,13 @@ def siteinfo_get_files(d, no_cache = False): if no_cache: return sitefiles # Now check for siteconfig cache files - path_siteconfig = d.getVar('SITECONFIG_SYSROOTCACHE', True) - if os.path.isdir(path_siteconfig): + # Use the files copied to the aclocal cache generated by autotools.bbclass + # to avoid races + path_siteconfig = d.getVar('ACLOCALDIR', True) + if path_siteconfig and os.path.isdir(path_siteconfig): for i in os.listdir(path_siteconfig): + if not i.endswith("_config"): + continue filename = os.path.join(path_siteconfig, i) sitefiles += filename + " " diff --git a/meta/classes/spdx.bbclass b/meta/classes/spdx.bbclass index bccc230d8c..454c53e96f 100644 --- a/meta/classes/spdx.bbclass +++ b/meta/classes/spdx.bbclass @@ -15,7 +15,6 @@ # SPDX file will be output to the path which is defined as[SPDX_MANIFEST_DIR] # in ./meta/conf/licenses.conf. -SPDXOUTPUTDIR = "${WORKDIR}/spdx_output_dir" SPDXSSTATEDIR = "${WORKDIR}/spdx_sstate_dir" # If ${S} isn't actually the top-level source directory, set SPDX_S to point at @@ -24,247 +23,283 @@ SPDX_S ?= "${S}" python do_spdx () { import os, sys - import json + import json, shutil info = {} - info['workdir'] = (d.getVar('WORKDIR', True) or "") - info['sourcedir'] = (d.getVar('SPDX_S', True) or "") - info['pn'] = (d.getVar( 'PN', True ) or "") - info['pv'] = (d.getVar( 'PV', True ) or "") - info['src_uri'] = (d.getVar( 'SRC_URI', True ) or "") - info['spdx_version'] = (d.getVar('SPDX_VERSION', True) or '') - info['data_license'] = (d.getVar('DATA_LICENSE', True) or '') - - spdx_sstate_dir = (d.getVar('SPDXSSTATEDIR', True) or "") - manifest_dir = (d.getVar('SPDX_MANIFEST_DIR', True) or "") + info['workdir'] = d.getVar('WORKDIR', True) + info['sourcedir'] = d.getVar('SPDX_S', True) + info['pn'] = d.getVar('PN', True) + info['pv'] = d.getVar('PV', True) + info['spdx_version'] = d.getVar('SPDX_VERSION', True) + info['data_license'] = d.getVar('DATA_LICENSE', True) + + sstatedir = d.getVar('SPDXSSTATEDIR', True) + sstatefile = os.path.join(sstatedir, info['pn'] + info['pv'] + ".spdx") + + manifest_dir = d.getVar('SPDX_MANIFEST_DIR', True) info['outfile'] = os.path.join(manifest_dir, info['pn'] + ".spdx" ) - sstatefile = os.path.join(spdx_sstate_dir, - info['pn'] + info['pv'] + ".spdx" ) - info['spdx_temp_dir'] = (d.getVar('SPDX_TEMP_DIR', True) or "") - info['tar_file'] = os.path.join( info['workdir'], info['pn'] + ".tar.gz" ) + info['spdx_temp_dir'] = d.getVar('SPDX_TEMP_DIR', True) + info['tar_file'] = os.path.join(info['workdir'], info['pn'] + ".tar.gz" ) + + # Make sure important dirs exist + try: + bb.utils.mkdirhier(manifest_dir) + bb.utils.mkdirhier(sstatedir) + bb.utils.mkdirhier(info['spdx_temp_dir']) + except OSError as e: + bb.error("SPDX: Could not set up required directories: " + str(e)) + return ## get everything from cache. use it to decide if ## something needs to be rerun - cur_ver_code = get_ver_code( info['sourcedir'] ) + cur_ver_code = get_ver_code(info['sourcedir']) cache_cur = False - if not os.path.exists( spdx_sstate_dir ): - bb.utils.mkdirhier( spdx_sstate_dir ) - if not os.path.exists( info['spdx_temp_dir'] ): - bb.utils.mkdirhier( info['spdx_temp_dir'] ) - if os.path.exists( sstatefile ): + if os.path.exists(sstatefile): ## cache for this package exists. read it in - cached_spdx = get_cached_spdx( sstatefile ) + cached_spdx = get_cached_spdx(sstatefile) if cached_spdx['PackageVerificationCode'] == cur_ver_code: - bb.warn(info['pn'] + "'s ver code same as cache's. do nothing") + bb.warn("SPDX: Verification code for " + info['pn'] + + "is same as cache's. do nothing") cache_cur = True else: - local_file_info = setup_foss_scan( info, - True, cached_spdx['Files'] ) + local_file_info = setup_foss_scan(info, True, cached_spdx['Files']) else: - local_file_info = setup_foss_scan( info, False, None ) + local_file_info = setup_foss_scan(info, False, None) if cache_cur: spdx_file_info = cached_spdx['Files'] + foss_package_info = cached_spdx['Package'] + foss_license_info = cached_spdx['Licenses'] else: ## setup fossology command - foss_server = (d.getVar('FOSS_SERVER', True) or "") - foss_flags = (d.getVar('FOSS_WGET_FLAGS', True) or "") + foss_server = d.getVar('FOSS_SERVER', True) + foss_flags = d.getVar('FOSS_WGET_FLAGS', True) + foss_full_spdx = d.getVar('FOSS_FULL_SPDX', True) == "true" or False foss_command = "wget %s --post-file=%s %s"\ - % (foss_flags,info['tar_file'],foss_server) + % (foss_flags, info['tar_file'], foss_server) - #bb.warn(info['pn'] + json.dumps(local_file_info)) - foss_file_info = run_fossology( foss_command ) - spdx_file_info = create_spdx_doc( local_file_info, foss_file_info ) - ## write to cache - write_cached_spdx(sstatefile,cur_ver_code,spdx_file_info) + foss_result = run_fossology(foss_command, foss_full_spdx) + if foss_result is not None: + (foss_package_info, foss_file_info, foss_license_info) = foss_result + spdx_file_info = create_spdx_doc(local_file_info, foss_file_info) + ## write to cache + write_cached_spdx(sstatefile, cur_ver_code, foss_package_info, + spdx_file_info, foss_license_info) + else: + bb.error("SPDX: Could not communicate with FOSSology server. Command was: " + foss_command) + return ## Get document and package level information - spdx_header_info = get_header_info(info, cur_ver_code, spdx_file_info) + spdx_header_info = get_header_info(info, cur_ver_code, foss_package_info) ## CREATE MANIFEST - create_manifest(info,spdx_header_info,spdx_file_info) + create_manifest(info, spdx_header_info, spdx_file_info, foss_license_info) ## clean up the temp stuff - remove_dir_tree( info['spdx_temp_dir'] ) + shutil.rmtree(info['spdx_temp_dir'], ignore_errors=True) if os.path.exists(info['tar_file']): - remove_file( info['tar_file'] ) + remove_file(info['tar_file']) } addtask spdx after do_patch before do_configure -def create_manifest(info,header,files): - with open(info['outfile'], 'w') as f: +def create_manifest(info, header, files, licenses): + import codecs + with codecs.open(info['outfile'], mode='w', encoding='utf-8') as f: + # Write header f.write(header + '\n') + + # Write file data for chksum, block in files.iteritems(): + f.write("FileName: " + block['FileName'] + '\n') for key, value in block.iteritems(): - f.write(key + ": " + value) - f.write('\n') + if not key == 'FileName': + f.write(key + ": " + value + '\n') f.write('\n') -def get_cached_spdx( sstatefile ): + # Write license data + for id, block in licenses.iteritems(): + f.write("LicenseID: " + id + '\n') + for key, value in block.iteritems(): + f.write(key + ": " + value + '\n') + f.write('\n') + +def get_cached_spdx(sstatefile): import json + import codecs cached_spdx_info = {} - with open( sstatefile, 'r' ) as f: + with codecs.open(sstatefile, mode='r', encoding='utf-8') as f: try: cached_spdx_info = json.load(f) except ValueError as e: cached_spdx_info = None return cached_spdx_info -def write_cached_spdx( sstatefile, ver_code, files ): +def write_cached_spdx(sstatefile, ver_code, package_info, files, license_info): import json + import codecs spdx_doc = {} spdx_doc['PackageVerificationCode'] = ver_code spdx_doc['Files'] = {} spdx_doc['Files'] = files - with open( sstatefile, 'w' ) as f: + spdx_doc['Package'] = {} + spdx_doc['Package'] = package_info + spdx_doc['Licenses'] = {} + spdx_doc['Licenses'] = license_info + with codecs.open(sstatefile, mode='w', encoding='utf-8') as f: f.write(json.dumps(spdx_doc)) -def setup_foss_scan( info, cache, cached_files ): +def setup_foss_scan(info, cache, cached_files): import errno, shutil import tarfile file_info = {} cache_dict = {} - for f_dir, f in list_files( info['sourcedir'] ): - full_path = os.path.join( f_dir, f ) + for f_dir, f in list_files(info['sourcedir']): + full_path = os.path.join(f_dir, f) abs_path = os.path.join(info['sourcedir'], full_path) - dest_dir = os.path.join( info['spdx_temp_dir'], f_dir ) - dest_path = os.path.join( info['spdx_temp_dir'], full_path ) - try: - stats = os.stat(abs_path) - except OSError as e: - bb.warn( "Stat failed" + str(e) + "\n") - continue - - checksum = hash_file( abs_path ) - mtime = time.asctime(time.localtime(stats.st_mtime)) - - ## retain cache information if it exists - file_info[checksum] = {} - if cache and checksum in cached_files: - file_info[checksum] = cached_files[checksum] - else: - file_info[checksum]['FileName'] = full_path - - try: - os.makedirs( dest_dir ) - except OSError as e: - if e.errno == errno.EEXIST and os.path.isdir(dest_dir): - pass + dest_dir = os.path.join(info['spdx_temp_dir'], f_dir) + dest_path = os.path.join(info['spdx_temp_dir'], full_path) + + checksum = hash_file(abs_path) + if not checksum is None: + file_info[checksum] = {} + ## retain cache information if it exists + if cache and checksum in cached_files: + file_info[checksum] = cached_files[checksum] + ## have the file included in what's sent to the FOSSology server else: - bb.warn( "mkdir failed " + str(e) + "\n" ) - continue - - if(cache and checksum not in cached_files) or not cache: - try: - shutil.copyfile( abs_path, dest_path ) - except shutil.Error as e: - bb.warn( str(e) + "\n" ) - except IOError as e: - bb.warn( str(e) + "\n" ) + file_info[checksum]['FileName'] = full_path + try: + bb.utils.mkdirhier(dest_dir) + shutil.copyfile(abs_path, dest_path) + except OSError as e: + bb.warn("SPDX: mkdirhier failed: " + str(e)) + except shutil.Error as e: + bb.warn("SPDX: copyfile failed: " + str(e)) + except IOError as e: + bb.warn("SPDX: copyfile failed: " + str(e)) + else: + bb.warn("SPDX: Could not get checksum for file: " + f) - with tarfile.open( info['tar_file'], "w:gz" ) as tar: - tar.add( info['spdx_temp_dir'], arcname=os.path.basename(info['spdx_temp_dir']) ) - tar.close() + with tarfile.open(info['tar_file'], "w:gz") as tar: + tar.add(info['spdx_temp_dir'], arcname=os.path.basename(info['spdx_temp_dir'])) return file_info - -def remove_dir_tree( dir_name ): - import shutil +def remove_file(file_name): try: - shutil.rmtree( dir_name ) - except: - pass - -def remove_file( file_name ): - try: - os.remove( file_name ) + os.remove(file_name) except OSError as e: pass -def list_files( dir ): - for root, subFolders, files in os.walk( dir ): +def list_files(dir): + for root, subFolders, files in os.walk(dir): for f in files: - rel_root = os.path.relpath( root, dir ) + rel_root = os.path.relpath(root, dir) yield rel_root, f return -def hash_file( file_name ): +def hash_file(file_name): try: - f = open( file_name, 'rb' ) - data_string = f.read() + with open(file_name, 'rb') as f: + data_string = f.read() + sha1 = hash_string(data_string) + return sha1 except: - return None - finally: - f.close() - sha1 = hash_string( data_string ) - return sha1 + return None -def hash_string( data ): +def hash_string(data): import hashlib sha1 = hashlib.sha1() - sha1.update( data ) + sha1.update(data) return sha1.hexdigest() -def run_fossology( foss_command ): +def run_fossology(foss_command, full_spdx): import string, re import subprocess p = subprocess.Popen(foss_command.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE) foss_output, foss_error = p.communicate() - - records = [] - records = re.findall('FileName:.*?</text>', foss_output, re.S) + if p.returncode != 0: + return None + + foss_output = unicode(foss_output, "utf-8") + foss_output = string.replace(foss_output, '\r', '') + + # Package info + package_info = {} + if full_spdx: + # All mandatory, only one occurance + package_info['PackageCopyrightText'] = re.findall('PackageCopyrightText: (.*?</text>)', foss_output, re.S)[0] + package_info['PackageLicenseDeclared'] = re.findall('PackageLicenseDeclared: (.*)', foss_output)[0] + package_info['PackageLicenseConcluded'] = re.findall('PackageLicenseConcluded: (.*)', foss_output)[0] + # These may be more than one + package_info['PackageLicenseInfoFromFiles'] = re.findall('PackageLicenseInfoFromFiles: (.*)', foss_output) + else: + DEFAULT = "NOASSERTION" + package_info['PackageCopyrightText'] = "<text>" + DEFAULT + "</text>" + package_info['PackageLicenseDeclared'] = DEFAULT + package_info['PackageLicenseConcluded'] = DEFAULT + package_info['PackageLicenseInfoFromFiles'] = [] + # File info file_info = {} + records = [] + # FileName is also in PackageFileName, so we match on FileType as well. + records = re.findall('FileName:.*?FileType:.*?</text>', foss_output, re.S) for rec in records: - rec = string.replace( rec, '\r', '' ) - chksum = re.findall( 'FileChecksum: SHA1: (.*)\n', rec)[0] + chksum = re.findall('FileChecksum: SHA1: (.*)\n', rec)[0] file_info[chksum] = {} - file_info[chksum]['FileCopyrightText'] = re.findall( 'FileCopyrightText: ' + file_info[chksum]['FileCopyrightText'] = re.findall('FileCopyrightText: ' + '(.*?</text>)', rec, re.S )[0] - fields = ['FileType','LicenseConcluded', - 'LicenseInfoInFile','FileName'] + fields = ['FileName', 'FileType', 'LicenseConcluded', 'LicenseInfoInFile'] for field in fields: file_info[chksum][field] = re.findall(field + ': (.*)', rec)[0] - return file_info + # Licenses + license_info = {} + licenses = [] + licenses = re.findall('LicenseID:.*?LicenseName:.*?\n', foss_output, re.S) + for lic in licenses: + license_id = re.findall('LicenseID: (.*)\n', lic)[0] + license_info[license_id] = {} + license_info[license_id]['ExtractedText'] = re.findall('ExtractedText: (.*?</text>)', lic, re.S)[0] + license_info[license_id]['LicenseName'] = re.findall('LicenseName: (.*)', lic)[0] + + return (package_info, file_info, license_info) -def create_spdx_doc( file_info, scanned_files ): +def create_spdx_doc(file_info, scanned_files): import json ## push foss changes back into cache for chksum, lic_info in scanned_files.iteritems(): if chksum in file_info: - file_info[chksum]['FileName'] = file_info[chksum]['FileName'] file_info[chksum]['FileType'] = lic_info['FileType'] file_info[chksum]['FileChecksum: SHA1'] = chksum file_info[chksum]['LicenseInfoInFile'] = lic_info['LicenseInfoInFile'] file_info[chksum]['LicenseConcluded'] = lic_info['LicenseConcluded'] file_info[chksum]['FileCopyrightText'] = lic_info['FileCopyrightText'] else: - bb.warn(lic_info['FileName'] + " : " + chksum + bb.warn("SPDX: " + lic_info['FileName'] + " : " + chksum + " : is not in the local file info: " - + json.dumps(lic_info,indent=1)) + + json.dumps(lic_info, indent=1)) return file_info -def get_ver_code( dirname ): +def get_ver_code(dirname): chksums = [] - for f_dir, f in list_files( dirname ): - try: - stats = os.stat(os.path.join(dirname,f_dir,f)) - except OSError as e: - bb.warn( "Stat failed" + str(e) + "\n") - continue - chksums.append(hash_file(os.path.join(dirname,f_dir,f))) - ver_code_string = ''.join( chksums ).lower() - ver_code = hash_string( ver_code_string ) + for f_dir, f in list_files(dirname): + hash = hash_file(os.path.join(dirname, f_dir, f)) + if not hash is None: + chksums.append(hash) + else: + bb.warn("SPDX: Could not hash file: " + path) + ver_code_string = ''.join(chksums).lower() + ver_code = hash_string(ver_code_string) return ver_code -def get_header_info( info, spdx_verification_code, spdx_files ): +def get_header_info(info, spdx_verification_code, package_info): """ Put together the header SPDX information. Eventually this needs to become a lot less @@ -275,14 +310,12 @@ def get_header_info( info, spdx_verification_code, spdx_files ): head = [] DEFAULT = "NOASSERTION" - #spdx_verification_code = get_ver_code( info['sourcedir'] ) - package_checksum = '' - if os.path.exists(info['tar_file']): - package_checksum = hash_file( info['tar_file'] ) - else: + package_checksum = hash_file(info['tar_file']) + if package_checksum is None: package_checksum = DEFAULT ## document level information + head.append("## SPDX Document Information") head.append("SPDXVersion: " + info['spdx_version']) head.append("DataLicense: " + info['data_license']) head.append("DocumentComment: <text>SPDX for " @@ -290,9 +323,11 @@ def get_header_info( info, spdx_verification_code, spdx_files ): head.append("") ## Creator information - now = datetime.now().strftime('%Y-%m-%dT%H:%M:%S') + ## Note that this does not give time in UTC. + now = datetime.now().strftime('%Y-%m-%dT%H:%M:%SZ') head.append("## Creation Information") - head.append("Creator: fossology-spdx") + ## Tools are supposed to have a version, but FOSSology+SPDX provides none. + head.append("Creator: Tool: FOSSology+SPDX") head.append("Created: " + now) head.append("CreatorComment: <text>UNO</text>") head.append("") @@ -301,21 +336,26 @@ def get_header_info( info, spdx_verification_code, spdx_files ): head.append("## Package Information") head.append("PackageName: " + info['pn']) head.append("PackageVersion: " + info['pv']) - head.append("PackageDownloadLocation: " + DEFAULT) - head.append("PackageSummary: <text></text>") head.append("PackageFileName: " + os.path.basename(info['tar_file'])) head.append("PackageSupplier: Person:" + DEFAULT) + head.append("PackageDownloadLocation: " + DEFAULT) + head.append("PackageSummary: <text></text>") head.append("PackageOriginator: Person:" + DEFAULT) head.append("PackageChecksum: SHA1: " + package_checksum) head.append("PackageVerificationCode: " + spdx_verification_code) head.append("PackageDescription: <text>" + info['pn'] + " version " + info['pv'] + "</text>") head.append("") - head.append("PackageCopyrightText: <text>" + DEFAULT + "</text>") + head.append("PackageCopyrightText: " + + package_info['PackageCopyrightText']) head.append("") - head.append("PackageLicenseDeclared: " + DEFAULT) - head.append("PackageLicenseConcluded: " + DEFAULT) - head.append("PackageLicenseInfoFromFiles: " + DEFAULT) + head.append("PackageLicenseDeclared: " + + package_info['PackageLicenseDeclared']) + head.append("PackageLicenseConcluded: " + + package_info['PackageLicenseConcluded']) + + for licref in package_info['PackageLicenseInfoFromFiles']: + head.append("PackageLicenseInfoFromFiles: " + licref) head.append("") ## header for file level diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index ace6bdb57a..2f0632af89 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -25,6 +25,8 @@ SSTATE_EXTRAPATH[vardepvalue] = "" SSTATE_DUPWHITELIST = "${DEPLOY_DIR_IMAGE}/ ${DEPLOY_DIR}/licenses/ ${DEPLOY_DIR_RPM}/all/" # Avoid docbook/sgml catalog warnings for now SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml" +# Archive the sources for many architectures in one deploy folder +SSTATE_DUPWHITELIST += "${DEPLOY_DIR_SRC}" SSTATE_SCAN_FILES ?= "*.la *-config *_config" SSTATE_SCAN_CMD ?= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES", True).split())}" \) -type f' diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index 1525317d27..eeca9dedd2 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass @@ -71,7 +71,7 @@ python toaster_layerinfo_dumpdata() { layer_url = 'http://layers.openembedded.org/layerindex/layer/{layer}/' layer_url_name = _get_url_map_name(layer_name) - layer_info['name'] = layer_name + layer_info['name'] = layer_url_name layer_info['local_path'] = layer_path layer_info['layer_index_url'] = layer_url.format(layer=layer_url_name) layer_info['version'] = _get_layer_version_information(layer_path) @@ -149,14 +149,26 @@ python toaster_image_dumpdata() { image_name = d.getVar('IMAGE_NAME', True); image_info_data = {} + artifact_info_data = {} + # collect all artifacts for dirpath, dirnames, filenames in os.walk(deploy_dir_image): for fn in filenames: - if fn.startswith(image_name): - image_output = os.path.join(dirpath, fn) - image_info_data[image_output] = os.stat(image_output).st_size + try: + if fn.startswith(image_name): + image_output = os.path.join(dirpath, fn) + image_info_data[image_output] = os.stat(image_output).st_size + else: + import stat + artifact_path = os.path.join(dirpath, fn) + filestat = os.stat(artifact_path) + if not os.path.islink(artifact_path): + artifact_info_data[artifact_path] = filestat.st_size + except OSError as e: + bb.event.fire(bb.event.MetadataEvent("OSErrorException", e), d) bb.event.fire(bb.event.MetadataEvent("ImageFileSize",image_info_data), d) + bb.event.fire(bb.event.MetadataEvent("ArtifactFileSize",artifact_info_data), d) } diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index d5b9675b7f..670e93b1de 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass @@ -7,6 +7,9 @@ REAL_MULTIMACH_TARGET_SYS ?= "${MULTIMACH_TARGET_SYS}" # This function creates an environment-setup-script for use in a deployable SDK toolchain_create_sdk_env_script () { # Create environment setup script + sdkpathnative=${7:-${SDKPATHNATIVE}} + prefix=${6:-${prefix_nativesdk}} + bindir=${5:-${bindir_nativesdk}} libdir=${4:-${libdir}} sysroot=${3:-${SDKTARGETSYSROOT}} multimach_target_sys=${2:-${REAL_MULTIMACH_TARGET_SYS}} @@ -16,16 +19,17 @@ toolchain_create_sdk_env_script () { echo 'export SDKTARGETSYSROOT='"$sysroot" >> $script EXTRAPATH="" for i in ${CANADIANEXTRAOS}; do - EXTRAPATH="$EXTRAPATH:${SDKPATHNATIVE}${bindir_nativesdk}/${TARGET_ARCH}${TARGET_VENDOR}-$i" + EXTRAPATH="$EXTRAPATH:$sdkpathnative$bindir/${TARGET_ARCH}${TARGET_VENDOR}-$i" done - echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${TARGET_SYS}'$EXTRAPATH':$PATH' >> $script + echo "export PATH=$sdkpathnative$bindir:$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH':$PATH' >> $script + echo 'export CCACHE_PATH=$sdkpathnative$bindir:$sdkpathnative$bindir/${TARGET_SYS}'$EXTRAPATH':$CCACHE_PATH' >> $script echo 'export PKG_CONFIG_SYSROOT_DIR=$SDKTARGETSYSROOT' >> $script echo 'export PKG_CONFIG_PATH=$SDKTARGETSYSROOT'"$libdir"'/pkgconfig' >> $script echo 'export CONFIG_SITE=${SDKPATH}/site-config-'"${multimach_target_sys}" >> $script - echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script + echo "export OECORE_NATIVE_SYSROOT=\"$sdkpathnative\"" >> $script echo 'export OECORE_TARGET_SYSROOT="$SDKTARGETSYSROOT"' >> $script - echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/aclocal"' >> $script - echo 'export PYTHONHOME=${SDKPATHNATIVE}${prefix_nativesdk}' >> $script + echo "export OECORE_ACLOCAL_OPTS=\"-I $sdkpathnative/usr/share/aclocal\"" >> $script + echo "export PYTHONHOME=$sdkpathnative$prefix" >> $script toolchain_shared_env_script } @@ -37,6 +41,7 @@ toolchain_create_tree_env_script () { rm -f $script touch $script echo 'export PATH=${STAGING_DIR_NATIVE}/usr/bin:${PATH}' >> $script + echo 'export CCACHE_PATH=${STAGING_DIR_NATIVE}/usr/bin:${CCACHE_PATH}' >> $script echo 'export PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR}' >> $script echo 'export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}' >> $script echo 'export CONFIG_SITE="${@siteinfo_get_files(d)}"' >> $script @@ -93,7 +98,7 @@ EOF #we get the cached site config in the runtime TOOLCHAIN_CONFIGSITE_NOCACHE = "${@siteinfo_get_files(d, True)}" TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${STAGING_DIR}/${MLPREFIX}${MACHINE}/${target_datadir}/${TARGET_SYS}_config_site.d" -TOOLCHAIN_NEED_CONFIGSITE_CACHE = "${TCLIBC} ncurses" +TOOLCHAIN_NEED_CONFIGSITE_CACHE ??= "${TCLIBC} ncurses" #This function create a site config file toolchain_create_sdk_siteconfig () { diff --git a/meta/classes/uboot-config.bbclass b/meta/classes/uboot-config.bbclass index 8ac1b71bc2..cb061af348 100644 --- a/meta/classes/uboot-config.bbclass +++ b/meta/classes/uboot-config.bbclass @@ -31,31 +31,19 @@ python () { return ubootconfig = (d.getVar('UBOOT_CONFIG', True) or "").split() - if len(ubootconfig) > 1: - raise bb.parse.SkipPackage('You can only have a single default for UBOOT_CONFIG.') + if len(ubootconfig) > 0: + for config in ubootconfig: + for f, v in ubootconfigflags.items(): + if config == f: + items = v.split(',') + if items[0] and len(items) > 2: + raise bb.parse.SkipPackage('Only config,images can be specified!') + d.appendVar('UBOOT_MACHINE', ' ' + items[0]) + # IMAGE_FSTYPES appending + if len(items) > 1 and items[1]: + bb.debug(1, "Appending '%s' to IMAGE_FSTYPES." % items[1]) + d.appendVar('IMAGE_FSTYPES', ' ' + items[1]) + break elif len(ubootconfig) == 0: - raise bb.parse.SkipPackage('You must set a default in UBOOT_CONFIG.') - ubootconfig = ubootconfig[0] - - for f, v in ubootconfigflags.items(): - if f == 'defaultval': - continue - - items = v.split(',') - if items[0] and len(items) > 2: - raise bb.parse.SkipPackage('Only config,images can be specified!') - - if ubootconfig == f: - bb.debug(1, "Setting UBOOT_MACHINE to %s." % items[0]) - d.setVar('UBOOT_MACHINE', items[0]) - - # IMAGE_FSTYPES appending - if len(items) > 1 and items[1]: - bb.debug(1, "Appending '%s' to IMAGE_FSTYPES." % items[1]) - d.appendVar('IMAGE_FSTYPES', ' ' + items[1]) - - # Go out as we found a match! - break - else: - raise bb.parse.SkipPackage("UBOOT_CONFIG %s is not supported" % ubootconfig) + raise bb.parse.SkipPackage('You must set a default in UBOOT_CONFIG.') } diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index 9f2c250d03..e6d78703a7 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -229,16 +229,16 @@ python populate_packages_updatealternatives () { #bb.note('adding runtime requirement for update-alternatives for %s' % pkg) d.appendVar('RDEPENDS_%s' % pkg, ' ' + d.getVar('MLPREFIX') + provider) - bb.note('adding update-alternatives calls to postinst/postrm for %s' % pkg) + bb.note('adding update-alternatives calls to postinst/prerm for %s' % pkg) bb.note('%s' % alt_setup_links) postinst = d.getVar('pkg_postinst_%s' % pkg, True) or '#!/bin/sh\n' postinst += alt_setup_links d.setVar('pkg_postinst_%s' % pkg, postinst) bb.note('%s' % alt_remove_links) - postrm = d.getVar('pkg_postrm_%s' % pkg, True) or '#!/bin/sh\n' - postrm += alt_remove_links - d.setVar('pkg_postrm_%s' % pkg, postrm) + prerm = d.getVar('pkg_prerm_%s' % pkg, True) or '#!/bin/sh\n' + prerm += alt_remove_links + d.setVar('pkg_prerm_%s' % pkg, prerm) } python package_do_filedeps_append () { diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index bc1aa7dad6..a9c0323f95 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass @@ -48,9 +48,9 @@ fi updatercd_postrm() { if type update-rc.d >/dev/null 2>/dev/null; then if [ -n "$D" ]; then - OPT="-r $D" + OPT="-f -r $D" else - OPT="" + OPT="-f" fi update-rc.d $OPT ${INITSCRIPT_NAME} remove fi diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 0b9a843b24..e443f845f7 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass @@ -24,6 +24,16 @@ if test "x$D" != "x"; then # Installing into a sysroot SYSROOT="$D" OPT="--root $D" + + # Make sure login.defs is there, this is to make debian package backend work + # correctly while doing rootfs. + # The problem here is that if /etc/login.defs is treated as a config file for + # shadow package, then while performing preinsts for packages that depend on + # shadow, there might only be /etc/login.def.dpkg-new there in root filesystem. + if [ ! -e $D${sysconfdir}/login.defs -a -e $D${sysconfdir}/login.defs.dpkg-new ]; then + cp $D${sysconfdir}/login.defs.dpkg-new $D${sysconfdir}/login.defs + fi + # user/group lookups should match useradd/groupadd --root export PSEUDO_PASSWD="$SYSROOT:${STAGING_DIR_NATIVE}" fi diff --git a/meta/classes/useradd_base.bbclass b/meta/classes/useradd_base.bbclass index c47b1eb810..4398a25154 100644 --- a/meta/classes/useradd_base.bbclass +++ b/meta/classes/useradd_base.bbclass @@ -29,7 +29,7 @@ perform_groupadd () { fi count=`expr $count + 1` if test $count = $retries; then - bbfatal "Tried running groupadd command $retries times without scucess, giving up" + bbfatal "Tried running groupadd command $retries times without success, giving up" fi sleep $count done @@ -57,7 +57,7 @@ perform_useradd () { fi count=`expr $count + 1` if test $count = $retries; then - bbfatal "Tried running useradd command $retries times without scucess, giving up" + bbfatal "Tried running useradd command $retries times without success, giving up" fi sleep $count done @@ -99,7 +99,7 @@ perform_groupmems () { rm -f $rootdir${sysconfdir}/gshadow rm -f $rootdir${sysconfdir}/gshadow- fi - bbfatal "Tried running groupmems command $retries times without scucess, giving up" + bbfatal "Tried running groupmems command $retries times without success, giving up" fi sleep $count done @@ -131,7 +131,7 @@ perform_groupdel () { fi count=`expr $count + 1` if test $count = $retries; then - bbfatal "Tried running groupdel command $retries times without scucess, giving up" + bbfatal "Tried running groupdel command $retries times without success, giving up" fi sleep $count done @@ -159,7 +159,7 @@ perform_userdel () { fi count=`expr $count + 1` if test $count = $retries; then - bbfatal "Tried running userdel command $retries times without scucess, giving up" + bbfatal "Tried running userdel command $retries times without success, giving up" fi sleep $count done @@ -189,7 +189,7 @@ perform_groupmod () { fi count=`expr $count + 1` if test $count = $retries; then - bbfatal "Tried running groupmod command $retries times without scucess, giving up" + bbfatal "Tried running groupmod command $retries times without success, giving up" fi sleep $count done @@ -219,7 +219,7 @@ perform_usermod () { fi count=`expr $count + 1` if test $count = $retries; then - bbfatal "Tried running usermod command $retries times without scucess, giving up" + bbfatal "Tried running usermod command $retries times without success, giving up" fi sleep $count done diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index 0f2a484091..80e90e8777 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass @@ -259,11 +259,11 @@ create_cmdline_wrapper () { echo "Generating wrapper script for $cmd" mv $cmd $cmd.real - cmdname=`basename $cmd`.real + cmdname=`basename $cmd` cat <<END >$cmd #!/bin/bash realpath=\`readlink -fn \$0\` -exec -a $cmd \`dirname \$realpath\`/$cmdname $@ "\$@" +exec -a \`dirname \$realpath\`/$cmdname \`dirname \$realpath\`/$cmdname.real $@ "\$@" END chmod +x $cmd } diff --git a/meta/classes/vala.bbclass b/meta/classes/vala.bbclass index 0b7803b251..9ff664ac41 100644 --- a/meta/classes/vala.bbclass +++ b/meta/classes/vala.bbclass @@ -1,6 +1,3 @@ -# Vala has problems with multiple concurrent invocations -PARALLEL_MAKE = "" - # Everyone needs vala-native and targets need vala, too, # because that is where target builds look for .vapi files. # diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf index e8cf9a3127..2867850688 100644 --- a/meta/conf/abi_version.conf +++ b/meta/conf/abi_version.conf @@ -4,4 +4,4 @@ # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -OELAYOUT_ABI = "9" +OELAYOUT_ABI = "10" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 74813a23bc..f3586da17c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -395,7 +395,8 @@ SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}" ################################################################## OLDEST_KERNEL = "2.6.32" -STAGING_KERNEL_DIR = "${STAGING_DIR_HOST}/usr/src/kernel" +STAGING_KERNEL_DIR = "${TMPDIR}/work-shared/${MACHINE}/kernel-source" +STAGING_KERNEL_BUILDDIR = "${TMPDIR}/work-shared/${MACHINE}/kernel-build-artifacts" ################################################################## # Specific image creation and rootfs population info. @@ -459,7 +460,7 @@ PYTHON = "${@sys.executable}" export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}" export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}" export BUILD_FC = "${CCACHE}${BUILD_PREFIX}gfortran ${BUILD_CC_ARCH}" -export BUILD_CPP = "${BUILD_PREFIX}cpp ${BUILD_CC_ARCH}" +export BUILD_CPP = "${BUILD_PREFIX}gcc ${BUILD_CC_ARCH} -E" export BUILD_LD = "${BUILD_PREFIX}ld ${BUILD_LD_ARCH}" export BUILD_CCLD = "${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}" export BUILD_AR = "${BUILD_PREFIX}ar" @@ -519,6 +520,8 @@ LINKER_HASH_STYLE_mips = "sysv" LINKER_HASH_STYLE_mipsel = "sysv" LINKER_HASH_STYLE_mips64 = "sysv" LINKER_HASH_STYLE_mips64el = "sysv" +LINKER_HASH_STYLE_mips64n32 = "sysv" +LINKER_HASH_STYLE_mips64eln32 = "sysv" TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][d.getVar('LINKER_HASH_STYLE', True) != 'gnu']}" export LDFLAGS = "${TARGET_LDFLAGS}" @@ -548,6 +551,12 @@ SELECTED_OPTIMIZATION[vardeps] += "FULL_OPTIMIZATION DEBUG_OPTIMIZATION" BUILD_OPTIMIZATION = "-O2 -pipe" ################################################################## +# Settings used by bitbake-layers. +################################################################## +BBLAYERS_LAYERINDEX_URL ??= "http://layers.openembedded.org/layerindex/" +BBLAYERS_FETCH_DIR ??= "${COREBASE}" + +################################################################## # Download locations and utilities. ################################################################## @@ -556,7 +565,7 @@ DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool" GENTOO_MIRROR = "http://distfiles.gentoo.org/distfiles" GNOME_GIT = "git://git.gnome.org" GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" -GNU_MIRROR = "ftp://ftp.gnu.org/gnu" +GNU_MIRROR = "http://ftp.gnu.org/gnu" GPE_MIRROR = "http://gpe.linuxtogo.org/download/source" KERNELORG_MIRROR = "http://kernel.org/pub" SOURCEFORGE_MIRROR = "http://downloads.sourceforge.net" @@ -771,11 +780,11 @@ BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR \ USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \ PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \ CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_DISABLE LICENSE_PATH SDKPKGSUFFIX \ - WARN_QA ERROR_QA WORKDIR STAMPCLEAN" + WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR" BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \ SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED" -BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc defaultval _append _prepend deps depends \ +BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc deps depends \ lockfiles type vardepsexclude vardeps vardepvalue vardepvalueexclude \ file-checksums python func task export unexport noexec nostamp dirs cleandirs \ sstate-lockfile-shared prefuncs postfuncs export_func deptask rdeptask \ diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 8d24d66fc1..04037c3399 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -25,7 +25,7 @@ IMAGE_FEATURES ?= "" # directly part of the distribution. HOSTTOOLS_WHITELIST_GPL-3.0 ?= "" WHITELIST_GPL-3.0 ?= "less" -LGPLv2_WHITELIST_GPL-3.0 ?= "libassuan gnutls libtasn1 libidn libgcc libgcc-initial gcc-runtime" +LGPLv2_WHITELIST_GPL-3.0 ?= "libassuan gnutls libtasn1 libidn gcc-source libgcc libgcc-initial gcc-runtime" COMMERCIAL_AUDIO_PLUGINS ?= "" # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 35509a7309..8d92c2e362 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -21,6 +21,7 @@ PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-opkg" VIRTUAL-RUNTIME_apm ?= "apm" VIRTUAL-RUNTIME_alsa-state ?= "alsa-state" +VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt" # # Default recipe providers @@ -42,7 +43,8 @@ PREFERRED_PROVIDER_make ?= "make" PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','udev',d)}" # There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details # on this rather strange entry. -PREFERRED_PROVIDER_bluez4 ?= "bluez4" -PREFERRED_PROVIDER_bluez-hcidump ?= "bluez-hcidump" +PREFERRED_PROVIDER_bluez4 ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez4',d)}" +PREFERRED_PROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}" # Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb PREFERRED_PROVIDER_ltp ?= "ltp" +PREFERRED_PROVIDER_getopt ?= "util-linux-getopt" diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc index 53ec2e7caf..573063edfb 100644 --- a/meta/conf/distro/include/default-versions.inc +++ b/meta/conf/distro/include/default-versions.inc @@ -4,8 +4,12 @@ # Force the python versions in one place PYTHON_BASEVERSION ?= "2.7" -PREFERRED_VERSION_python ?= "2.7.3" -PREFERRED_VERSION_python-native ?= "2.7.3" +PREFERRED_VERSION_python ?= "2.7.9" +PREFERRED_VERSION_python-native ?= "2.7.9" # Force the older version of liberation-fonts until we fix the fontforge issue PREFERRED_VERSION_liberation-fonts ?= "1.04" + +# Force db-native's version to keep sync with db while +# 'AGPL-3.0' in ${INCOMPATIBLE_LICENSE} blacklist +PREFERRED_VERSION_db-native = "${@incompatible_license_contains('AGPL-3.0', '5.%', '6.%', d)}" diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index 60156c0514..21e1a538c2 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -13,21 +13,26 @@ SECURITY_CFLAGS_pn-webkit-gtk_powerpc = "" # arm specific security flag issues SECURITY_CFLAGS_pn-lttng-tools_arm = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-elfutils_arm = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-aspell = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-beecrypt = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-blktrace = "${SECURITY_NO_PIE_CFLAGS}" # Curl seems to check for FORTIFY_SOURCE in CFLAGS, but even assigned # to CPPFLAGS it gets picked into CFLAGS in bitbake. #TARGET_CPPFLAGS_pn-curl += "-D_FORTIFY_SOURCE=2" -SECURITY_CFLAGS_pn-cups = "${SECURITY_NO_PIE_CLAGS}" +SECURITY_CFLAGS_pn-cups = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-curl = "-fstack-protector-all -pie -fpie" SECURITY_CFLAGS_pn-db = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-directfb = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-glibc = "" SECURITY_CFLAGS_pn-glibc-initial = "" SECURITY_CFLAGS_pn-enchant = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-expect = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-flac = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-flex = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gcc-runtime = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-gcc-sanitizers = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gdb = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gmp = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gnutls = "${SECURITY_NO_PIE_CFLAGS}" @@ -40,9 +45,11 @@ SECURITY_CFLAGS_pn-grub-efi-i586-native = "" SECURITY_CFLAGS_pn-grub-efi-x86-64-native = "" SECURITY_CFLAGS_pn-gst-plugins-bad = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gst-plugins-gl = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-gstreamer1.0-plugins-bad = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gstreamer1.0-plugins-good = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-harfbuzz = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-kexec-tools = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-libaio = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libcap = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libgcc = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libid3tag = "${SECURITY_NO_PIE_CFLAGS}" @@ -51,6 +58,7 @@ SECURITY_CFLAGS_pn-libglu = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libpcap = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libpcre = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libproxy = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-ltp = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-lttng-ust = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-mesa = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-mesa-gl = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta/conf/distro/include/tclibc-musl.inc b/meta/conf/distro/include/tclibc-musl.inc index d1272a39a0..7c1c91b6c8 100644 --- a/meta/conf/distro/include/tclibc-musl.inc +++ b/meta/conf/distro/include/tclibc-musl.inc @@ -10,7 +10,7 @@ OVERRIDES .= "${LIBCOVERRIDE}" PREFERRED_PROVIDER_virtual/libc ?= "musl" PREFERRED_PROVIDER_virtual/libiconv ?= "musl" -PREFERRED_PROVIDER_virtual/libintl ?= "gettext" +PREFERRED_PROVIDER_virtual/libintl ?= "musl" PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc" PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc" diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 26785e3375..a666510c17 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -25,9 +25,10 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "4.9%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.24" -GLIBCVERSION ?= "2.20" +GDBVERSION ?= "7.8%" +GLIBCVERSION ?= "2.21" UCLIBCVERSION ?= "0.9.33+git%" -LINUXLIBCVERSION ?= "3.16" +LINUXLIBCVERSION ?= "3.19" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" @@ -36,7 +37,10 @@ PREFERRED_VERSION_gcc-crosssdk-${SDK_ARCH} ?= "${SDKGCCVERSION}" PREFERRED_VERSION_gcc-crosssdk-initial-${SDK_ARCH} ?= "${SDKGCCVERSION}" PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-source ?= "${GCCVERSION}" PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}" +PREFERRED_VERSION_nativesdk-gcc-sanitizers ?= "${SDKGCCVERSION}" PREFERRED_VERSION_libgcc ?= "${GCCVERSION}" PREFERRED_VERSION_libgcc-initial ?= "${GCCVERSION}" PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}" @@ -46,6 +50,10 @@ PREFERRED_VERSION_binutils-native ?= "${BINUVERSION}" PREFERRED_VERSION_binutils-cross-${TARGET_ARCH} ?= "${BINUVERSION}" PREFERRED_VERSION_binutils-crosssdk-${SDK_ARCH} ?= "${BINUVERSION}" PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}" +PREFERRED_VERSION_gdb ?= "${GDBVERSION}" +PREFERRED_VERSION_gdb-cross-${TARGET_ARCH} ?= "${GDBVERSION}" +PREFERRED_VERSION_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GDBVERSION}" + PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}" PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${LINUXLIBCVERSION}" PREFERRED_VERSION_glibc ?= "${GLIBCVERSION}" @@ -58,7 +66,6 @@ PREFERRED_VERSION_nativesdk-glibc-initial ?= "${GLIBCVERSION}" PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}" PREFERRED_VERSION_uclibc ?= "${UCLIBCVERSION}" PREFERRED_VERSION_uclibc-initial ?= "${UCLIBCVERSION}" -PREFERRED_VERSION_elfutils ?= "0.148" # don't use version earlier than 1.4 for gzip-native, as it's necessary for # some packages using an archive format incompatible with earlier gzip PREFERRED_VERSION_gzip-native ?= "1.6" diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index 66ec093d44..3a918e8bbf 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf @@ -18,6 +18,7 @@ do_compile_ptest_base[doc] = "Compiles the runtime test suite included in the so do_configure[doc] = "Configures the source by enabling and disabling any build-time and configuration options for the software being built" do_configure_ptest_base[doc] = "Configures the runtime test suite included in the software being built" do_deploy[doc] = "Writes deployable output files to the deploy directory" +do_devpyshell[doc] = "Starts an interactive Python shell for development/debugging" do_devshell[doc] = "Starts a shell with the environment set up for development/debugging" do_diffconfig[doc] = "Compares the old and new config files after running do_menuconfig for the kernel" do_fetch[doc] = "Fetches the source code" @@ -33,6 +34,7 @@ do_listtasks[doc] = "Lists all defined tasks for a target" do_menuconfig[doc] = "Runs 'make menuconfig' for the kernel" do_package[doc] = "Analyzes the content of the holding area and splits it into subsets based on available packages and files" do_package_index[doc] = "Creates or updates the index in the Package Feed area" +do_package_qa[doc] = "Runs QA checks on packaged files" do_package_write_deb[doc] = "Creates the actual DEB packages and places them in the Package Feed area" do_package_write_ipk[doc] = "Creates the actual IPK packages and places them in the Package Feed area" do_package_write_rpm[doc] = "Creates the actual RPM packages and places them in the Package Feed area" @@ -51,6 +53,7 @@ do_spdx[doc] = "A build stage that takes the source code and scans it on a remot do_strip[doc] = "Strips unneeded sections out of the Linux kernel image" do_testimage[doc] = "Boots an image and performs runtime tests within the image" do_testimage_auto[doc] = "Boots an image and performs runtime tests within the image immediately after it has been built" +do_testsdk[doc] = "Installs an SDK and performs runtime tests on the tools installed by it" do_uboot_mkimage[doc] = "Creates a uImage file from the kernel for the U-Boot bootloader" do_unpack[doc] = "Unpacks the source code into a working directory" do_validate_branches[doc] = "Ensures that the source/meta branches are on the locations specified by their SRCREV values for a linux-yocto style kernel" @@ -74,7 +77,7 @@ AUTOREV[doc] = "When SRCREV is set to the value of this variable, it specifies t #B B[doc] = "The Build Directory. The OpenEmbedded build system places generated objects into the Build Directory during a recipe's build process." -BAD_RECOMMENDATIONS[doc] = "A list of packages not to install despite being recommended by a recipe. Support for this variable exists only when using the IPK packaging backend." +BAD_RECOMMENDATIONS[doc] = "A list of packages not to install despite being recommended by a recipe. Support for this variable exists only when using the IPK or RPM packaging backends." BB_DANGLINGAPPENDS_WARNONLY[doc] = "Defines how BitBake handles situations where an append file (.bbappend) has no corresponding recipe file (.bb)." BB_DISKMON_DIRS[doc] = "Monitors disk space and available inodes during the build and allows you to control the build based on these parameters." BB_DISKMON_WARNINTERVAL[doc] = "Defines the disk space and free inode warning intervals. To set these intervals, define the variable in the conf/local.conf file in the Build Directory." @@ -107,6 +110,7 @@ BUSYBOX_SPLIT_SUID[doc] = "For the BusyBox recipe, specifies whether to split th CACHE[doc] = "The directory holding the cache of the metadata." CFLAGS[doc] = "Flags passed to the C compiler for the target system. This variable evaluates to the same as TARGET_CFLAGS." CLASSOVERRIDE[doc] = "An internal variable specifying the special class override that should currently apply (e.g. "class-target", "class-native", and so forth)." +CLEANBROKEN[doc] = "Specifies if 'make clean' does not work for a recipe (and therefore the build system should not try to use it during do_configure)" COMBINED_FEATURES[doc] = "A set of features common between MACHINE_FEATURES and DISTRO_FEATURES." COMMON_LICENSE_DIR[doc] = "Points to meta/files/common-licenses in the Source Directory, which is where generic license files reside." COMPATIBLE_HOST[doc] = "A regular expression that resolves to one or more hosts (when the recipe is native) or one or more targets (when the recipe is non-native) with which a recipe is compatible." @@ -219,7 +223,7 @@ IMAGE_ROOTFS_EXTRA_SPACE[doc] = "Defines additional free disk space created in t IMAGE_ROOTFS_SIZE[doc] = "Defines the size in Kbytes for the generated image." IMAGE_TYPES[doc] = "Specifies the complete list of supported image types by default." INC_PR[doc] = "Helps define the recipe revision for recipes that share a common include file." -INCOMPATIBLE_LICENSE[doc] = "Specifies a space-separated list of license names (as they would appear in LICENSE) that should be excluded from the build." +INCOMPATIBLE_LICENSE[doc] = "Specifies a space-separated list of license names (as they would appear in LICENSE) that should be excluded from the build. Wildcard is supported, such as '*GPLv3'" INHIBIT_DEFAULT_DEPS[doc] = "Prevents the default dependencies, namely the C compiler and standard C library (libc), from being added to DEPENDS." INHIBIT_PACKAGE_STRIP[doc] = "If set to "1", causes the build to not strip binaries in resulting packages." INHERIT[doc] = "Causes the named class to be inherited at this point during parsing. The variable is only valid in configuration files." @@ -240,6 +244,8 @@ KBRANCH_DEFAULT[doc] = "Defines the Linux kernel source repository's default bra KERNEL_EXTRA_ARGS[doc] = "Specifies additional make command-line arguments the OpenEmbedded build system passes on when compiling the kernel." KERNEL_FEATURES[doc] = "Includes additional metadata from the Yocto Project kernel Git repository. The metadata you add through this variable includes config fragments and features descriptions." KERNEL_IMAGETYPE[doc] = "The type of kernel to build for a device, usually set by the machine configuration files and defaults to 'zImage'." +KERNEL_MODULE_AUTOLOAD[doc] = "Lists kernel modules that need to be auto-loaded during boot" +KERNEL_MODULE_PROBECONF[doc] = "Lists kernel modules for which the build system expects to find module_conf_* values that specify configuration for each of the modules" KERNEL_PATH[doc] = "The location of the kernel sources. This variable is set to the value of the STAGING_KERNEL_DIR within the module class (module.bbclass)." KERNEL_SRC[doc] = "The location of the kernel sources. This variable is set to the value of the STAGING_KERNEL_DIR within the module class (module.bbclass)." KFEATURE_DESCRIPTION[doc] = "Provides a short description of a configuration fragment. You use this variable in the .scc file that describes a configuration fragment file." @@ -412,6 +418,11 @@ TCMODE[doc] = "Enables an external toolchain (where provided by an additional la TEST_IMAGE[doc] = "Enables test booting of virtual machine images under the QEMU emulator after any root filesystems are created and runs tests against those images." TEST_QEMUBOOT_TIMEOUT[doc] = "The time in seconds allowed for an image to boot before automated runtime tests begin to run against an image." TEST_SUITES[doc] = "An ordered list of tests (modules) to run against an image when performing automated runtime testing." +TEST_POWERCONTROL_CMD[doc] = "For automated hardware testing, specifies the command to use to control the power of the target machine under test" +TEST_POWERCONTROL_EXTRA_ARGS[doc] = "For automated hardware testing, specifies additional arguments to pass through to the command specified in TEST_POWERCONTROL_CMD" +TEST_SERIALCONTROL_CMD[doc] = "For automated hardware testing, specifies the command to use to connect to the serial console of the target machine under test" +TEST_SERIALCONTROL_EXTRA_ARGS[doc] = "For automated hardware testing, specifies additional arguments to pass through to the command specified in TEST_SERIALCONTROL_CMD" +TEST_TARGET[doc] = "For automated runtime testing, specifies the method of deploying the image and running tests on the target machine" THISDIR[doc] = "The directory in which the file BitBake is currently parsing is located." TIME[doc] = "The time the build was started using HMS format." TMPDIR[doc] = "The temporary directory the OpenEmbedded build system uses when it does its work building images. By default, the TMPDIR variable is named tmp within the Build Directory." diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index de96548bd2..573579aca6 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -9,7 +9,9 @@ BBFILE_PRIORITY_core = "5" # This should only be incremented on significant changes that will # cause compatibility issues with other layers -LAYERVERSION_core = "4" +LAYERVERSION_core = "5" + +BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core" # Set a variable to get to the top of the metadata location COREBASE = '${@os.path.normpath("${LAYERDIR}/../")}' @@ -18,7 +20,7 @@ COREBASE = '${@os.path.normpath("${LAYERDIR}/../")}' SIGGEN_EXCLUDERECIPES_ABISAFE += " \ sysvinit-inittab \ shadow-securetty \ - opkg-config-base \ + opkg-arch-config \ netbase \ init-ifupdown \ connman-conf \ diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf index fe96066e4e..629916b6a5 100644 --- a/meta/conf/licenses.conf +++ b/meta/conf/licenses.conf @@ -143,7 +143,7 @@ DATA_LICENSE = "CC0-1.0" # information. # -FOSS_COPYRIGHT = "true" +FOSS_NO_COPYRIGHT = "true" # A option defined as[FOSS_RECURSIVE_UNPACK] in ./meta/conf/licenses.conf. is # used to control if FOSSology server need recursively unpack tar.gz file which @@ -159,12 +159,30 @@ FOSS_COPYRIGHT = "true" FOSS_RECURSIVE_UNPACK = "false" -# FOSSologySPDX instance server. +# An option defined as [FOSS_FULL_SPDX] in ./meta/conf/licenses.conf is used to +# control what kind of SPDX output to get from the FOSSology server. +# +# FOSS_FULL_SPDX = "true": +# Tell FOSSology server to return full SPDX output, like if the program was +# run from the command line. This is needed in order to get license refs for +# the full package rather than individual files only. +# +# FOSS_FULL_SPDX = "false": +# Tell FOSSology to only process license information for files. All package +# license tags in the report will be "NOASSERTION" +# + +FOSS_FULL_SPDX = "true" + +# FOSSologySPDX instance server. http://localhost/repo is the default +# installation location for FOSSology. +# # For more information on FOSSologySPDX commandline: # https://github.com/spdx-tools/fossology-spdx/wiki/Fossology-SPDX-Web-API # -FOSS_SERVER = "http://localhost//?mod=spdx_license_once&noCopyright=${FOSS_COPYRIGHT}&recursiveUnpack=${FOSS_RECURSIVE_UNPACK}" +FOSS_BASE_URL = "http://localhost/repo/?mod=spdx_license_once" +FOSS_SERVER = "${FOSS_BASE_URL}&fullSPDXFlag=${FOSS_FULL_SPDX}&noCopyright=${FOSS_NO_COPYRIGHT}&recursiveUnpack=${FOSS_RECURSIVE_UNPACK}" FOSS_WGET_FLAGS = "-qO - --no-check-certificate --timeout=0" diff --git a/meta/conf/machine/include/arm/arch-arm64.inc b/meta/conf/machine/include/arm/arch-arm64.inc new file mode 100644 index 0000000000..5376b87dd6 --- /dev/null +++ b/meta/conf/machine/include/arm/arch-arm64.inc @@ -0,0 +1,36 @@ +DEFAULTTUNE ?= "aarch64" + +require conf/machine/include/arm/arch-armv7a.inc + +TUNEVALID[aarch64] = "Enable instructions for aarch64" + +MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "aarch64", ":aarch64", "" ,d)}" + +# Little Endian base configs +AVAILTUNES += "aarch64 aarch64_be" +ARMPKGARCH_tune-aarch64 ?= "aarch64" +ARMPKGARCH_tune-aarch64_be ?= "aarch64_be" +TUNE_FEATURES_tune-aarch64 ?= "aarch64" +TUNE_FEATURES_tune-aarch64_be ?= "${TUNE_FEATURES_tune-aarch64} bigendian" +BASE_LIB_tune-aarch64 = "lib64" +BASE_LIB_tune-aarch64_be = "lib64" + +PACKAGE_EXTRA_ARCHS_tune-aarch64 = "aarch64" +PACKAGE_EXTRA_ARCHS_tune-aarch64_be = "aarch64_be" + +ARMPKGSFX_ENDIAN_64 = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "_be", "", d)}" +TUNE_ARCH_64 = "aarch64${ARMPKGSFX_ENDIAN_64}" +TUNE_PKGARCH_64 = "aarch64${ARMPKGSFX_ENDIAN_64}" +ABIEXTENSION_64 = "" +TARGET_FPU_64 = "" + +# Duplicated from arch-arm.inc +TUNE_ARCH_32 = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "armeb", "arm", d)}" +TUNE_PKGARCH_32 = "${ARMPKGARCH}${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU}" +ABIEXTENSION_32 = "eabi" +TARGET_FPU_32 = "${@d.getVar('ARMPKGSFX_FPU', True).strip('-') or 'soft'}" + +TUNE_ARCH = "${@bb.utils.contains("TUNE_FEATURES", "aarch64", "${TUNE_ARCH_64}", "${TUNE_ARCH_32}" ,d)}" +TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "aarch64", "${TUNE_PKGARCH_64}", "${TUNE_PKGARCH_32}" ,d)}" +ABIEXTENSION = "${@bb.utils.contains("TUNE_FEATURES", "aarch64", "${ABIEXTENSION_64}", "${ABIEXTENSION_32}" ,d)}" +TARGET_FPU = "${@bb.utils.contains("TUNE_FEATURES", "aarch64", "${TARGET_FPU_64}", "${TARGET_FPU_32}" ,d)}" diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc index f2c04a302e..39f5e2b2c7 100644 --- a/meta/conf/machine/include/arm/arch-armv7a.inc +++ b/meta/conf/machine/include/arm/arch-armv7a.inc @@ -42,7 +42,7 @@ PACKAGE_EXTRA_ARCHS_tune-armv7athf = "${PACKAGE_EXTRA_ARCHS_tune-armv6thf} armv7 PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf} armv7ahf-vfp-neon" PACKAGE_EXTRA_ARCHS_tune-armv7athf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf} armv7ahf-vfp-neon armv7at2hf-vfp-neon" PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon} armv7ahf-vfp-neon-vfpv4" -PACKAGE_EXTRA_ARCHS_tune-armv7athf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf-neon} armv7athf-vfp-neon-vfpv4" +PACKAGE_EXTRA_ARCHS_tune-armv7athf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf-neon} armv7ahf-vfp-neon-vfpv4 armv7at2hf-vfp-neon-vfpv4" # Big Endian AVAILTUNES += "armv7ab armv7atb armv7ab-neon armv7atb-neon" diff --git a/meta/conf/machine/include/arm/arch-armv8.inc b/meta/conf/machine/include/arm/arch-armv8.inc new file mode 100644 index 0000000000..5e832fae6d --- /dev/null +++ b/meta/conf/machine/include/arm/arch-armv8.inc @@ -0,0 +1 @@ +require conf/machine/include/arm/arch-arm64.inc diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc index a94386f577..9746c7bce7 100644 --- a/meta/conf/machine/include/arm/feature-arm-thumb.inc +++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc @@ -18,6 +18,8 @@ ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', 't2', '', d # some recipe explicitly sets ARM_INSTRUCTION_SET to "arm" ARM_M_OPT = "${@bb.utils.contains('TUNE_FEATURES', 'arm', '${ARM_THUMB_OPT}', 'thumb', d)}" python () { + if bb.utils.contains('TUNE_FEATURES', 'thumb', 'False', 'True', d): + return selected = d.getVar('ARM_INSTRUCTION_SET', True) if selected == None: return @@ -30,15 +32,18 @@ python () { TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ' -m${ARM_M_OPT}', '', d)}" OVERRIDES .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ':thumb', '', d)}" -ARMPKGSFX_THUMB .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '${ARM_THUMB_SUFFIX}', '', d)}" +# Add suffix from ARM_THUMB_SUFFIX only if after all this we still set ARM_M_OPT to thumb +ARMPKGSFX_THUMB .= "${@ d.getVar('ARM_THUMB_SUFFIX', True) if d.getVar('ARM_M_OPT', True) == 'thumb' else ''}" # Whether to compile with code to allow interworking between the two # instruction sets. This allows thumb code to be executed on a primarily # arm system and vice versa. It is strongly recommended that DISTROs not # turn this off - the actual cost is very small. TUNEVALID[no-thumb-interwork] = "Disable mixing of thumb and ARM functions" -TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'no-thumb-interwork', ' -mno-thumb-interwork', ' -mthumb-interwork', d)}" -OVERRIDES .= "${@bb.utils.contains('TUNE_FEATURES', 'no-thumb-interwork', ':thumb-interwork', '', d)}" +THUMB_TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'no-thumb-interwork', ' -mno-thumb-interwork', ' -mthumb-interwork', d)}" +THUMB_OVERRIDES .= "${@bb.utils.contains('TUNE_FEATURES', 'no-thumb-interwork', ':thumb-interwork', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ' ${THUMB_TUNE_CCARGS}', '', d)}" +OVERRIDES .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '${THUMB_OVERRIDES}', '', d)}" # what about armv7m devices which don't support -marm (e.g. Cortex-M3)? -TARGET_CC_KERNEL_ARCH += "-mno-thumb-interwork -marm" +TARGET_CC_KERNEL_ARCH += "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '-mno-thumb-interwork -marm', '', d)}" diff --git a/meta/conf/machine/include/mips/arch-mips.inc b/meta/conf/machine/include/mips/arch-mips.inc index 02626d300e..c41fa5e864 100644 --- a/meta/conf/machine/include/mips/arch-mips.inc +++ b/meta/conf/machine/include/mips/arch-mips.inc @@ -100,3 +100,7 @@ TUNE_FEATURES_tune-mips64el-nf = "n64" BASE_LIB_tune-mips64el-nf = "lib64" MIPSPKGSFX_VARIANT_tune-mips64el-nf = "${TUNE_ARCH}" PACKAGE_EXTRA_ARCHS_tune-mips64el-nf = "mips64el-nf" + +# On mips we need to redefine this to include the ABIEXTENSION +# we can avoid the python bit as there are no _ or - to translate +TRANSLATED_TARGET_ARCH = "${TARGET_ARCH}${ABIEXTENSION}" diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index a5fc88aa01..d5c0b376ce 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -15,7 +15,7 @@ MACHINE_FEATURES = "alsa bluetooth usbgadget screen" MACHINEOVERRIDES =. "qemuall:" -IMAGE_FSTYPES += "tar.bz2 ext3" +IMAGE_FSTYPES += "tar.bz2 ext4" # Don't include kernels in standard images RDEPENDS_kernel-base = "" diff --git a/meta/conf/machine/include/tune-arm920t.inc b/meta/conf/machine/include/tune-arm920t.inc index 5cadcc7dc3..0a2eae6cb8 100644 --- a/meta/conf/machine/include/tune-arm920t.inc +++ b/meta/conf/machine/include/tune-arm920t.inc @@ -8,4 +8,4 @@ TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "arm920t", " -mtune=arm920 AVAILTUNES += "arm920t" ARMPKGARCH_tune-arm920t = "arm920t" TUNE_FEATURES_tune-arm920t = "${TUNE_FEATURES_tune-armv4t} arm920t" -PACKAGE_EXTRA_ARCHS_tune-arm920t = "${PACKAGE_EXTRA_ARCHS_tune-armv4t} arm920tt" +PACKAGE_EXTRA_ARCHS_tune-arm920t = "${PACKAGE_EXTRA_ARCHS_tune-armv4t} arm920t arm920tt" diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf new file mode 100644 index 0000000000..20bcfbac99 --- /dev/null +++ b/meta/conf/machine/qemuarm64.conf @@ -0,0 +1,12 @@ +#@TYPE: Machine +#@NAME: generic armv8 machine +#@DESCRIPTION: Machine configuration for running a generic armv8 + +require conf/machine/include/arm/arch-armv8.inc +require conf/machine/include/qemu.inc + +MACHINE_FEATURES = "" + +KERNEL_IMAGETYPE = "Image" + +SERIAL_CONSOLE = "38400 ttyAMA0" diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index 733236d6bb..37e8481112 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf @@ -14,6 +14,6 @@ INHERIT += "multilib_global" BBCLASSEXTEND_append = " ${MULTILIBS}" -MULTILIB_GLOBAL_VARIANTS = "lib32 lib64 libx32" +MULTILIB_GLOBAL_VARIANTS ?= "lib32 lib64 libx32" OPKG_ARGS_append = " --force-maintainer --force-overwrite" diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf index a824c90934..669b8ba866 100644 --- a/meta/conf/sanity.conf +++ b/meta/conf/sanity.conf @@ -3,13 +3,13 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" -BB_MIN_VERSION = "1.23.2" +BB_MIN_VERSION = "1.25.0" SANITY_ABIFILE = "${TMPDIR}/abi_version" SANITY_VERSION ?= "1" LOCALCONF_VERSION ?= "1" -LAYER_CONF_VERSION ?= "5" +LAYER_CONF_VERSION ?= "6" SITE_CONF_VERSION ?= "1" INHERIT += "sanity" diff --git a/meta/conf/toasterconf.json b/meta/conf/toasterconf.json new file mode 100644 index 0000000000..c8e42efadd --- /dev/null +++ b/meta/conf/toasterconf.json @@ -0,0 +1,106 @@ +{ + "config": { + "MACHINE" : "qemux86", + "DISTRO" : "poky", + "IMAGE_FSTYPES": "ext3 jffs2 tar.bz2", + "IMAGE_INSTALL_append": "", + "PACKAGE_CLASSES": "package_rpm", + "SDKMACHINE" : "x86_64" + }, + "layersources": [ + { + "name": "Local OpenEmbedded", + "sourcetype": "local", + "apiurl": "../../", + "branches": ["HEAD", "master", "fido", "dizzy"], + "layers": [ + { + "name": "openembedded-core", + "local_path": "meta", + "vcs_url": "remote:origin", + "dirpath": "meta" + } + ] + }, + { + "name": "OpenEmbedded", + "sourcetype": "layerindex", + "apiurl": "http://layers.openembedded.org/layerindex/api/", + "branches": ["master", "fido", "dizzy"] + }, + { + "name": "Imported layers", + "sourcetype": "imported", + "apiurl": "", + "branches": ["master", "fido", "dizzy", "HEAD"] + + } + ], + "bitbake" : [ + { + "name": "master", + "giturl": "git://git.openembedded.org/bitbake", + "branch": "master", + "dirpath": "" + }, + { + "name": "fido", + "giturl": "git://git.openembedded.org/bitbake", + "branch": "1.26", + "dirpath": "" + }, + { + "name": "dizzy", + "giturl": "git://git.openembedded.org/bitbake", + "branch": "1.24", + "dirpath": "" + }, + { + "name": "HEAD", + "giturl": "git://git.openembedded.org/bitbake", + "branch": "HEAD", + "dirpath": "" + } + ], + + "defaultrelease": "master", + + "releases": [ + { + "name": "master", + "description": "OpenEmbedded master", + "bitbake": "master", + "branch": "master", + "defaultlayers": [ "openembedded-core" ], + "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, + "helptext": "Toaster will run your builds using the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/\">OpenEmbedded master</a> branch, where active development takes place. This is not a stable branch, so your builds might not work as expected." + }, + { + "name": "fido", + "description": "OpenEmbedded Fido", + "bitbake": "fido", + "branch": "fido", + "defaultlayers": [ "openembedded-core" ], + "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, + "helptext": "Toaster will run your builds with the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=fido\">OpenEmbedded \"Fido\"</a> branch" + }, + { + "name": "dizzy", + "description": "OpenEmbedded Dizzy", + "bitbake": "dizzy", + "branch": "dizzy", + "defaultlayers": [ "openembedded-core" ], + "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, + "helptext": "Toaster will run your builds with the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=dizzy\">OpenEmbedded \"Dizzy\"</a> branch" + }, + { + "name": "local", + "description": "Local OpenEmbedded", + "bitbake": "HEAD", + "branch": "HEAD", + "defaultlayers": [ "openembedded-core" ], + "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, + "helptext": "Toaster will run your builds with the version of OpenEmbedded that you have cloned or downloaded to your computer." + } + ] +} diff --git a/meta/files/common-licenses/SMAIL_GPL b/meta/files/common-licenses/SMAIL_GPL new file mode 100644 index 0000000000..dfc3fd16cf --- /dev/null +++ b/meta/files/common-licenses/SMAIL_GPL @@ -0,0 +1,164 @@ +This is the Debian GNU/Linux package debianutils. + +It is an original Debian package. Programs in it were maintained by +Guy Maor <maor@debian.org>, and are now maintained by Clint Adams +<schizo@debian.org>. + +All its programs except readlink, savelog, and which may be +redistributed under the terms of the GNU GPL, Version 2 or later, +found on Debian systems in the file /usr/share/common-licenses/GPL. + +which is in the public domain. + +readlink is Copyright (c) 1997 Kenneth Stailey, and may also be +distributed under the terms of the BSD copyright. + +savelog may be redistributed under the following terms: (The rest of +this file consists of savelog's distribution terms.) + +#ident "@(#)smail:RELEASE-3_2:COPYING,v 1.2 1996/06/14 18:59:10 woods Exp" + + SMAIL GENERAL PUBLIC LICENSE + (Clarified 11 Feb 1988) + + Copyright (C) 1988 Landon Curt Noll & Ronald S. Karr + Copyright (C) 1992 Ronald S. Karr + Copyleft (GNU) 1988 Landon Curt Noll & Ronald S. Karr + + Everyone is permitted to copy and distribute verbatim copies + of this license, but changing it is not allowed. You can also + use this wording to make the terms for other programs. + + The license agreements of most software companies keep you at the +mercy of those companies. By contrast, our general public license is +intended to give everyone the right to share SMAIL. To make sure that +you get the rights we want you to have, we need to make restrictions +that forbid anyone to deny you these rights or to ask you to surrender +the rights. Hence this license agreement. + + Specifically, we want to make sure that you have the right to give +away copies of SMAIL, that you receive source code or else can get it +if you want it, that you can change SMAIL or use pieces of it in new +free programs, and that you know you can do these things. + + To make sure that everyone has such rights, we have to forbid you to +deprive anyone else of these rights. For example, if you distribute +copies of SMAIL, you must give the recipients all the rights that you +have. You must make sure that they, too, receive or can get the +source code. And you must tell them their rights. + + Also, for our own protection, we must make certain that everyone +finds out that there is no warranty for SMAIL. If SMAIL is modified by +someone else and passed on, we want its recipients to know that what +they have is not what we distributed, so that any problems introduced +by others will not reflect on our reputation. + + Therefore we (Landon Curt Noll and Ronald S. Karr) make the following +terms which say what you must do to be allowed to distribute or change +SMAIL. + + + COPYING POLICIES + + 1. You may copy and distribute verbatim copies of SMAIL source code +as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy a valid copyright notice "Copyright +(C) 1988 Landon Curt Noll & Ronald S. Karr" (or with whatever year is +appropriate); keep intact the notices on all files that refer to this +License Agreement and to the absence of any warranty; and give any +other recipients of the SMAIL program a copy of this License +Agreement along with the program. You may charge a distribution fee +for the physical act of transferring a copy. + + 2. You may modify your copy or copies of SMAIL or any portion of it, +and copy and distribute such modifications under the terms of +Paragraph 1 above, provided that you also do the following: + + a) cause the modified files to carry prominent notices stating + that you changed the files and the date of any change; and + + b) cause the whole of any work that you distribute or publish, + that in whole or in part contains or is a derivative of SMAIL or + any part thereof, to be licensed at no charge to all third + parties on terms identical to those contained in this License + Agreement (except that you may choose to grant more extensive + warranty protection to some or all third parties, at your option). + + c) You may charge a distribution fee for the physical act of + transferring a copy, and you may at your option offer warranty + protection in exchange for a fee. + +Mere aggregation of another unrelated program with this program (or its +derivative) on a volume of a storage or distribution medium does not bring +the other program under the scope of these terms. + + 3. You may copy and distribute SMAIL (or a portion or derivative of it, +under Paragraph 2) in object code or executable form under the terms of +Paragraphs 1 and 2 above provided that you also do one of the following: + + a) accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of + Paragraphs 1 and 2 above; or, + + b) accompany it with a written offer, valid for at least three + years, to give any third party free (except for a nominal + shipping charge) a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of + Paragraphs 1 and 2 above; or, + + c) accompany it with the information you received as to where the + corresponding source code may be obtained. (This alternative is + allowed only for non-commercial distribution and only if you + received the program in object code or executable form alone.) + +For an executable file, complete source code means all the source code for +all modules it contains; but, as a special exception, it need not include +source code for modules which are standard libraries that accompany the +operating system on which the executable file runs. + + 4. You may not copy, sublicense, distribute or transfer SMAIL +except as expressly provided under this License Agreement. Any attempt +otherwise to copy, sublicense, distribute or transfer SMAIL is void and +your rights to use the program under this License agreement shall be +automatically terminated. However, parties who have received computer +software programs from you with this License Agreement will not have +their licenses terminated so long as such parties remain in full compliance. + + 5. If you wish to incorporate parts of SMAIL into other free +programs whose distribution conditions are different, write to Landon +Curt Noll & Ronald S. Karr via the Free Software Foundation at 51 +Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. We have not yet +worked out a simple rule that can be stated here, but we will often +permit this. We will be guided by the two goals of preserving the +free status of all derivatives of our free software and of promoting +the sharing and reuse of software. + +Your comments and suggestions about our licensing policies and our +software are welcome! This contract was based on the contract made by +the Free Software Foundation. Please contact the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, +USA, or call (617) 542-5942 for details on copylefted material in +general. + + NO WARRANTY + + BECAUSE SMAIL IS LICENSED FREE OF CHARGE, WE PROVIDE ABSOLUTELY NO +WARRANTY, TO THE EXTENT PERMITTED BY APPLICABLE STATE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING, LANDON CURT NOLL & RONALD S. KARR AND/OR +OTHER PARTIES PROVIDE SMAIL "AS IS" WITHOUT WARRANTY OF ANY KIND, +EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF SMAIL IS WITH +YOU. SHOULD SMAIL PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL +NECESSARY SERVICING, REPAIR OR CORRECTION. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW WILL LANDON CURT NOLL & +RONALD S. KARR AND/OR ANY OTHER PARTY WHO MAY MODIFY AND REDISTRIBUTE +SMAIL AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +LOST PROFITS, LOST MONIES, OR OTHER SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE +(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED +INACCURATE OR LOSSES SUSTAINED BY THIRD PARTIES OR A FAILURE OF THE +PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS) SMAIL, EVEN IF YOU HAVE +BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM BY +ANY OTHER PARTY. diff --git a/meta/files/toolchain-shar-template.sh b/meta/files/toolchain-shar-extract.sh index 0d679a66db..516aa3a142 100644 --- a/meta/files/toolchain-shar-template.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -3,6 +3,20 @@ INST_ARCH=$(uname -m | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/") SDK_ARCH=$(echo @SDK_ARCH@ | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/") +verlte () { + [ "$1" = "`printf "$1\n$2" | sort -V | head -n1`" ] +} + +verlt() { + [ "$1" = "$2" ] && return 1 || verlte $1 $2 +} + +verlt `uname -r` @OLDEST_KERNEL@ +if [ $? = 0 ]; then + echo "Error: The SDK needs a kernel > @OLDEST_KERNEL@" + exit 1 +fi + if [ "$INST_ARCH" != "$SDK_ARCH" ]; then # Allow for installation of ix86 SDK on x86_64 host if [ "$INST_ARCH" != x86_64 -o "$SDK_ARCH" != ix86 ]; then @@ -125,62 +139,12 @@ for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do $SUDO_EXEC sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" -i $env_setup_script done -# fix dynamic loader paths in all ELF SDK binaries -native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep 'OECORE_NATIVE_SYSROOT='|cut -d'=' -f2|tr -d '"') -dl_path=$($SUDO_EXEC find $native_sysroot/lib -name "ld-linux*") -if [ "$dl_path" = "" ] ; then - echo "SDK could not be set up. Relocate script unable to find ld-linux.so. Abort!" - exit 1 -fi -executable_files=$($SUDO_EXEC find $native_sysroot -type f \ - \( -perm -0100 -o -perm -0010 -o -perm -0001 \) -printf "'%h/%f' ") - -tdir=`mktemp -d` -if [ x$tdir = x ] ; then - echo "SDK relocate failed, could not create a temporary directory" - exit 1 -fi -echo "#!/bin/bash" > $tdir/relocate_sdk.sh -echo exec ${env_setup_script%/*}/relocate_sdk.py $target_sdk_dir $dl_path $executable_files >> $tdir/relocate_sdk.sh -$SUDO_EXEC mv $tdir/relocate_sdk.sh ${env_setup_script%/*}/relocate_sdk.sh -$SUDO_EXEC chmod 755 ${env_setup_script%/*}/relocate_sdk.sh -rm -rf $tdir -if [ $relocate = 1 ] ; then - $SUDO_EXEC ${env_setup_script%/*}/relocate_sdk.sh - if [ $? -ne 0 ]; then - echo "SDK could not be set up. Relocate script failed. Abort!" - exit 1 - fi -fi - -# replace @SDKPATH@ with the new prefix in all text files: configs/scripts/etc -for replace in "$target_sdk_dir -maxdepth 1" "$native_sysroot"; do - $SUDO_EXEC find $replace -type f -exec file '{}' \; | \ - grep ":.*\(ASCII\|script\|source\).*text" | \ - awk -F':' '{printf "\"%s\"\n", $1}' | \ - $SUDO_EXEC xargs -n32 sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" -done - -# change all symlinks pointing to @SDKPATH@ -for l in $($SUDO_EXEC find $native_sysroot -type l); do - $SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l -done - -# find out all perl scripts in $native_sysroot and modify them replacing the -# host perl with SDK perl. -for perl_script in $($SUDO_EXEC find $native_sysroot -type f -exec grep -l "^#!.*perl" '{}' \;); do - $SUDO_EXEC sed -i -e "s:^#! */usr/bin/perl.*:#! /usr/bin/env perl:g" -e \ - "s: /usr/bin/perl: /usr/bin/env perl:g" $perl_script -done - -echo done - @SDK_POST_INSTALL_COMMAND@ # delete the relocating script, so that user is forced to re-run the installer # if he/she wants another location for the sdk if [ $savescripts = 0 ] ; then - $SUDO_EXEC rm ${env_setup_script%/*}/relocate_sdk.py ${env_setup_script%/*}/relocate_sdk.sh + $SUDO_EXEC rm -f ${env_setup_script%/*}/relocate_sdk.py ${env_setup_script%/*}/relocate_sdk.sh fi echo "SDK has been successfully set up and is ready to be used." diff --git a/meta/files/toolchain-shar-relocate.sh b/meta/files/toolchain-shar-relocate.sh new file mode 100644 index 0000000000..dfb8e16d7c --- /dev/null +++ b/meta/files/toolchain-shar-relocate.sh @@ -0,0 +1,50 @@ +# fix dynamic loader paths in all ELF SDK binaries +native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep 'OECORE_NATIVE_SYSROOT='|cut -d'=' -f2|tr -d '"') +dl_path=$($SUDO_EXEC find $native_sysroot/lib -name "ld-linux*") +if [ "$dl_path" = "" ] ; then + echo "SDK could not be set up. Relocate script unable to find ld-linux.so. Abort!" + exit 1 +fi +executable_files=$($SUDO_EXEC find $native_sysroot -type f \ + \( -perm -0100 -o -perm -0010 -o -perm -0001 \) -printf "'%h/%f' ") + +tdir=`mktemp -d` +if [ x$tdir = x ] ; then + echo "SDK relocate failed, could not create a temporary directory" + exit 1 +fi +echo "#!/bin/bash" > $tdir/relocate_sdk.sh +echo exec ${env_setup_script%/*}/relocate_sdk.py $target_sdk_dir $dl_path $executable_files >> $tdir/relocate_sdk.sh +$SUDO_EXEC mv $tdir/relocate_sdk.sh ${env_setup_script%/*}/relocate_sdk.sh +$SUDO_EXEC chmod 755 ${env_setup_script%/*}/relocate_sdk.sh +rm -rf $tdir +if [ $relocate = 1 ] ; then + $SUDO_EXEC ${env_setup_script%/*}/relocate_sdk.sh + if [ $? -ne 0 ]; then + echo "SDK could not be set up. Relocate script failed. Abort!" + exit 1 + fi +fi + +# replace @SDKPATH@ with the new prefix in all text files: configs/scripts/etc +for replace in "$target_sdk_dir -maxdepth 1" "$native_sysroot"; do + $SUDO_EXEC find $replace -type f -exec file '{}' \; | \ + grep ":.*\(ASCII\|script\|source\).*text" | \ + awk -F':' '{printf "\"%s\"\n", $1}' | \ + grep -v "$target_sdk_dir/environment-setup-*" | \ + $SUDO_EXEC xargs -n32 sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" +done + +# change all symlinks pointing to @SDKPATH@ +for l in $($SUDO_EXEC find $native_sysroot -type l); do + $SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l +done + +# find out all perl scripts in $native_sysroot and modify them replacing the +# host perl with SDK perl. +for perl_script in $($SUDO_EXEC find $native_sysroot -type f -exec grep -l "^#!.*perl" '{}' \;); do + $SUDO_EXEC sed -i -e "s:^#! */usr/bin/perl.*:#! /usr/bin/env perl:g" -e \ + "s: /usr/bin/perl: /usr/bin/env perl:g" $perl_script +done + +echo done diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py new file mode 100644 index 0000000000..cf7fada7f0 --- /dev/null +++ b/meta/lib/oe/copy_buildsystem.py @@ -0,0 +1,102 @@ +# This class should provide easy access to the different aspects of the +# buildsystem such as layers, bitbake location, etc. +import stat +import shutil + +def _smart_copy(src, dest): + # smart_copy will choose the correct function depending on whether the + # source is a file or a directory. + mode = os.stat(src).st_mode + if stat.S_ISDIR(mode): + shutil.copytree(src, dest, symlinks=True) + else: + shutil.copyfile(src, dest) + shutil.copymode(src, dest) + +class BuildSystem(object): + def __init__(self, d): + self.d = d + self.layerdirs = d.getVar('BBLAYERS', True).split() + + def copy_bitbake_and_layers(self, destdir): + # Copy in all metadata layers + bitbake (as repositories) + layers_copied = [] + bb.utils.mkdirhier(destdir) + layers = list(self.layerdirs) + + corebase = self.d.getVar('COREBASE', True) + layers.append(corebase) + + corebase_files = self.d.getVar('COREBASE_FILES', True).split() + + # bitbake belongs in corebase so make sure it goes there + if "bitbake" not in corebase_files: + corebase_files.append("bitbake") + corebase_files = [corebase + '/' +x for x in corebase_files] + + for layer in layers: + layerconf = os.path.join(layer, 'conf', 'layer.conf') + if os.path.exists(layerconf): + with open(layerconf, 'r') as f: + if f.readline().startswith("# ### workspace layer auto-generated by devtool ###"): + bb.warn("Skipping local workspace layer %s" % layer) + continue + + # If the layer was already under corebase, leave it there + # since layers such as meta have issues when moved. + layerdestpath = destdir + if corebase == os.path.dirname(layer): + layerdestpath += '/' + os.path.basename(corebase) + layerdestpath += '/' + os.path.basename(layer) + + layer_relative = os.path.relpath(layerdestpath, + destdir) + layers_copied.append(layer_relative) + + # Treat corebase as special since it typically will contain + # build directories or other custom items. + if corebase == layer: + bb.utils.mkdirhier(layerdestpath) + for f in corebase_files: + f_basename = os.path.basename(f) + destname = os.path.join(layerdestpath, f_basename) + _smart_copy(f, destname) + else: + if os.path.exists(layerdestpath): + bb.note("Skipping layer %s, already handled" % layer) + else: + _smart_copy(layer, layerdestpath) + + return layers_copied + +def generate_locked_sigs(sigfile, d): + bb.utils.mkdirhier(os.path.dirname(sigfile)) + depd = d.getVar('BB_TASKDEPDATA', True) + tasks = ['%s.%s' % (v[2], v[1]) for v in depd.itervalues()] + bb.parse.siggen.dump_lockedsigs(sigfile, tasks) + +def prune_lockedsigs(allowed_tasks, excluded_targets, lockedsigs, pruned_output): + with open(lockedsigs, 'r') as infile: + bb.utils.mkdirhier(os.path.dirname(pruned_output)) + with open(pruned_output, 'w') as f: + invalue = False + for line in infile: + if invalue: + if line.endswith('\\\n'): + splitval = line.strip().split(':') + if splitval[1] in allowed_tasks and not splitval[0] in excluded_targets: + f.write(line) + else: + f.write(line) + invalue = False + elif line.startswith('SIGGEN_LOCKEDSIGS'): + invalue = True + f.write(line) + +def create_locked_sstate_cache(lockedsigs, input_sstate_cache, output_sstate_cache, d, fixedlsbstring=""): + bb.note('Generating sstate-cache...') + + bb.process.run("gen-lockedsig-cache %s %s %s" % (lockedsigs, input_sstate_cache, output_sstate_cache)) + if fixedlsbstring: + os.rename(output_sstate_cache + '/' + d.getVar('NATIVELSBSTRING', True), + output_sstate_cache + '/' + fixedlsbstring) diff --git a/meta/lib/oe/image.py b/meta/lib/oe/image.py index 7e080b00dd..0ce303d570 100644 --- a/meta/lib/oe/image.py +++ b/meta/lib/oe/image.py @@ -48,11 +48,13 @@ class ImageDepGraph(object): graph = dict() def add_node(node): + base_type = self._image_base_type(node) deps = (self.d.getVar('IMAGE_TYPEDEP_' + node, True) or "") - if deps != "": + base_deps = (self.d.getVar('IMAGE_TYPEDEP_' + base_type, True) or "") + if deps != "" or base_deps != "": graph[node] = deps - for dep in deps.split(): + for dep in deps.split() + base_deps.split(): if not dep in graph: add_node(dep) else: @@ -72,6 +74,18 @@ class ImageDepGraph(object): for item in remove_list: self.graph.pop(item, None) + def _image_base_type(self, type): + ctypes = self.d.getVar('COMPRESSIONTYPES', True).split() + if type in ["vmdk", "live", "iso", "hddimg"]: + type = "ext3" + basetype = type + for ctype in ctypes: + if type.endswith("." + ctype): + basetype = type[:-len("." + ctype)] + break + + return basetype + def _compute_dependencies(self): """ returns dict object of nodes with [no_of_depends_on, no_of_depended_by] @@ -282,7 +296,11 @@ class Image(ImageDepGraph): bb.data.update_data(localdata) localdata.setVar('type', type) - cmds.append("\t" + localdata.getVar("IMAGE_CMD", True)) + image_cmd = localdata.getVar("IMAGE_CMD", True) + if image_cmd: + cmds.append("\t" + image_cmd) + else: + bb.fatal("No IMAGE_CMD defined for IMAGE_FSTYPES entry '%s' - possibly invalid type name or missing support class" % type) cmds.append(localdata.expand("\tcd ${DEPLOY_DIR_IMAGE}")) if type in cimages: diff --git a/meta/lib/oe/license.py b/meta/lib/oe/license.py index 340da61102..31ca15b574 100644 --- a/meta/lib/oe/license.py +++ b/meta/lib/oe/license.py @@ -25,7 +25,8 @@ class InvalidLicense(LicenseError): def __str__(self): return "invalid characters in license '%s'" % self.license -license_operator = re.compile('([&|() ])') +license_operator_chars = '&|() ' +license_operator = re.compile('([' + license_operator_chars + '])') license_pattern = re.compile('[a-zA-Z0-9.+_\-]+$') class LicenseVisitor(ast.NodeVisitor): diff --git a/meta/lib/oe/lsb.py b/meta/lib/oe/lsb.py index b53f361035..ddfe71b6b5 100644 --- a/meta/lib/oe/lsb.py +++ b/meta/lib/oe/lsb.py @@ -9,6 +9,7 @@ def release_dict(): data = {} for line in output.splitlines(): + if line.startswith("-e"): line = line[3:] try: key, value = line.split(":\t", 1) except ValueError: @@ -36,14 +37,6 @@ def release_dict_file(): if match: data['DISTRIB_ID'] = match.group(1) data['DISTRIB_RELEASE'] = match.group(2) - elif os.path.exists('/etc/SuSE-release'): - data = {} - data['DISTRIB_ID'] = 'SUSE LINUX' - with open('/etc/SuSE-release') as f: - for line in f: - if line.startswith('VERSION = '): - data['DISTRIB_RELEASE'] = line[10:].rstrip() - break elif os.path.exists('/etc/os-release'): data = {} with open('/etc/os-release') as f: @@ -52,6 +45,15 @@ def release_dict_file(): data['DISTRIB_ID'] = line[5:].rstrip().strip('"') if line.startswith('VERSION_ID='): data['DISTRIB_RELEASE'] = line[11:].rstrip().strip('"') + elif os.path.exists('/etc/SuSE-release'): + data = {} + data['DISTRIB_ID'] = 'SUSE LINUX' + with open('/etc/SuSE-release') as f: + for line in f: + if line.startswith('VERSION = '): + data['DISTRIB_RELEASE'] = line[10:].rstrip() + break + except IOError: return None return data diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index f8b532220a..8bc56c6e88 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -30,7 +30,8 @@ def runstrip(arg): elif elftype & 8 or elftype & 4: extraflags = "--remove-section=.comment --remove-section=.note" - stripcmd = "'%s' %s '%s'" % (strip, extraflags, file) + # Use mv to break hardlinks + stripcmd = "'%s' %s '%s' -o '%s.tmp' && chown --reference='%s' '%s.tmp' && mv '%s.tmp' '%s'" % (strip, extraflags, file, file, file, file, file, file) bb.debug(1, "runstrip: %s" % stripcmd) ret = subprocess.call(stripcmd, shell=True) @@ -97,3 +98,29 @@ def filedeprunner(arg): raise e return (pkg, provides, requires) + + +def read_shlib_providers(d): + import re + + shlib_provider = {} + shlibs_dirs = d.getVar('SHLIBSDIRS', True).split() + list_re = re.compile('^(.*)\.list$') + # Go from least to most specific since the last one found wins + for dir in reversed(shlibs_dirs): + bb.debug(2, "Reading shlib providers in %s" % (dir)) + if not os.path.exists(dir): + continue + for file in os.listdir(dir): + m = list_re.match(file) + if m: + dep_pkg = m.group(1) + fd = open(os.path.join(dir, file)) + lines = fd.readlines() + fd.close() + for l in lines: + s = l.strip().split(":") + if s[0] not in shlib_provider: + shlib_provider[s[0]] = {} + shlib_provider[s[0]][s[1]] = (dep_pkg, s[2]) + return shlib_provider diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 8609156ca2..0460415699 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -111,11 +111,15 @@ class RpmIndexer(Indexer): index_cmds = [] rpm_dirs_found = False for arch in archs: + dbpath = os.path.join(self.d.getVar('WORKDIR', True), 'rpmdb', arch) + if os.path.exists(dbpath): + bb.utils.remove(dbpath, True) arch_dir = os.path.join(self.deploy_dir, arch) if not os.path.isdir(arch_dir): continue - index_cmds.append("%s --update -q %s" % (rpm_createrepo, arch_dir)) + index_cmds.append("%s --dbpath %s --update -q %s" % \ + (rpm_createrepo, dbpath, arch_dir)) rpm_dirs_found = True @@ -169,7 +173,35 @@ class OpkgIndexer(Indexer): class DpkgIndexer(Indexer): + def _create_configs(self): + bb.utils.mkdirhier(self.apt_conf_dir) + bb.utils.mkdirhier(os.path.join(self.apt_conf_dir, "lists", "partial")) + bb.utils.mkdirhier(os.path.join(self.apt_conf_dir, "apt.conf.d")) + bb.utils.mkdirhier(os.path.join(self.apt_conf_dir, "preferences.d")) + + with open(os.path.join(self.apt_conf_dir, "preferences"), + "w") as prefs_file: + pass + with open(os.path.join(self.apt_conf_dir, "sources.list"), + "w+") as sources_file: + pass + + with open(self.apt_conf_file, "w") as apt_conf: + with open(os.path.join(self.d.expand("${STAGING_ETCDIR_NATIVE}"), + "apt", "apt.conf.sample")) as apt_conf_sample: + for line in apt_conf_sample.read().split("\n"): + line = re.sub("#ROOTFS#", "/dev/null", line) + line = re.sub("#APTCONF#", self.apt_conf_dir, line) + apt_conf.write(line + "\n") + def write_index(self): + self.apt_conf_dir = os.path.join(self.d.expand("${APTCONF_TARGET}"), + "apt-ftparchive") + self.apt_conf_file = os.path.join(self.apt_conf_dir, "apt.conf") + self._create_configs() + + os.environ['APT_CONFIG'] = self.apt_conf_file + pkg_archs = self.d.getVar('PACKAGE_ARCHS', True) if pkg_archs is not None: arch_list = pkg_archs.split() @@ -529,8 +561,11 @@ class PackageManager(object): return cmd = [bb.utils.which(os.getenv('PATH'), "oe-pkgdata-util"), - "glob", self.d.getVar('PKGDATA_DIR', True), installed_pkgs_file, + "-p", self.d.getVar('PKGDATA_DIR', True), "glob", installed_pkgs_file, globs] + exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY', True) + if exclude: + cmd.extend(['-x', exclude]) try: bb.note("Installing complementary packages ...") complementary_pkgs = subprocess.check_output(cmd, stderr=subprocess.STDOUT) @@ -575,7 +610,8 @@ class RpmPM(PackageManager): self.fullpkglist = list() self.deploy_dir = self.d.getVar('DEPLOY_DIR_RPM', True) self.etcrpm_dir = os.path.join(self.target_rootfs, "etc/rpm") - self.install_dir = os.path.join(self.target_rootfs, "install") + self.install_dir_name = "oe_install" + self.install_dir_path = os.path.join(self.target_rootfs, self.install_dir_name) self.rpm_cmd = bb.utils.which(os.getenv('PATH'), "rpm") self.smart_cmd = bb.utils.which(os.getenv('PATH'), "smart") self.smart_opt = "--quiet --data-dir=" + os.path.join(target_rootfs, @@ -676,10 +712,10 @@ class RpmPM(PackageManager): def _search_pkg_name_in_feeds(self, pkg, feed_archs): for arch in feed_archs: arch = arch.replace('-', '_') + regex_match = re.compile(r"^%s-[^-]*-[^-]*@%s$" % \ + (re.escape(pkg), re.escape(arch))) for p in self.fullpkglist: - regex_match = r"^%s-[^-]*-[^-]*@%s$" % \ - (re.escape(pkg), re.escape(arch)) - if re.match(regex_match, p) is not None: + if regex_match.match(p) is not None: # First found is best match # bb.note('%s -> %s' % (pkg, pkg + '@' + arch)) return pkg + '@' + arch @@ -746,9 +782,9 @@ class RpmPM(PackageManager): bb.utils.mkdirhier(self.etcrpm_dir) # Setup temporary directory -- install... - if os.path.exists(self.install_dir): - bb.utils.remove(self.install_dir, True) - bb.utils.mkdirhier(os.path.join(self.install_dir, 'tmp')) + if os.path.exists(self.install_dir_path): + bb.utils.remove(self.install_dir_path, True) + bb.utils.mkdirhier(os.path.join(self.install_dir_path, 'tmp')) channel_priority = 5 platform_dir = os.path.join(self.etcrpm_dir, "platform") @@ -835,7 +871,7 @@ class RpmPM(PackageManager): self._invoke_smart('config --set rpm-dbpath=/var/lib/rpm') self._invoke_smart('config --set rpm-extra-macros._var=%s' % self.d.getVar('localstatedir', True)) - cmd = 'config --set rpm-extra-macros._tmppath=/install/tmp' + cmd = "config --set rpm-extra-macros._tmppath=/%s/tmp" % (self.install_dir_name) prefer_color = self.d.getVar('RPM_PREFER_ELF_ARCH', True) if prefer_color: @@ -853,6 +889,7 @@ class RpmPM(PackageManager): % prefer_color) self._invoke_smart(cmd) + self._invoke_smart('config --set rpm-ignoresize=1') # Write common configuration for host and target usage self._invoke_smart('config --set rpm-nolinktos=1') @@ -900,8 +937,10 @@ class RpmPM(PackageManager): # if self.rpm_version == 4: scriptletcmd = "$2 $3 $4\n" + scriptpath = "$3" else: scriptletcmd = "$2 $1/$3 $4\n" + scriptpath = "$1/$3" SCRIPTLET_FORMAT = "#!/bin/bash\n" \ "\n" \ @@ -919,10 +958,10 @@ class RpmPM(PackageManager): " mkdir -p $1/etc/rpm-postinsts\n" \ " num=100\n" \ " while [ -e $1/etc/rpm-postinsts/${num}-* ]; do num=$((num + 1)); done\n" \ - " name=`head -1 $1/$3 | cut -d\' \' -f 2`\n" \ + " name=`head -1 " + scriptpath + " | cut -d\' \' -f 2`\n" \ ' echo "#!$2" > $1/etc/rpm-postinsts/${num}-${name}\n' \ ' echo "# Arg: $4" >> $1/etc/rpm-postinsts/${num}-${name}\n' \ - " cat $1/$3 >> $1/etc/rpm-postinsts/${num}-${name}\n" \ + " cat " + scriptpath + " >> $1/etc/rpm-postinsts/${num}-${name}\n" \ " chmod +x $1/etc/rpm-postinsts/${num}-${name}\n" \ " else\n" \ ' echo "Error: pre/post remove scriptlet failed"\n' \ @@ -988,7 +1027,7 @@ class RpmPM(PackageManager): cmd += "--dbpath=/var/lib/rpm " cmd += "--define='_cross_scriptlet_wrapper %s' " % \ self.scriptlet_wrapper - cmd += "--define='_tmppath /install/tmp' %s" % ' '.join(pkgs) + cmd += "--define='_tmppath /%s/tmp' %s" % (self.install_dir_name, ' '.join(pkgs)) else: # for pkg in pkgs: # bb.note('Debug: What required: %s' % pkg) @@ -1023,7 +1062,7 @@ class RpmPM(PackageManager): bb.utils.remove(os.path.join(self.target_rootfs, 'var/lib/opkg'), True) # remove temp directory - bb.utils.remove(self.d.expand('${IMAGE_ROOTFS}/install'), True) + bb.utils.remove(self.install_dir_path, True) def backup_packaging_data(self): # Save the rpmlib for increment rpm image generation @@ -1627,10 +1666,10 @@ class DpkgPM(PackageManager): def remove(self, pkgs, with_dependencies=True): if with_dependencies: os.environ['APT_CONFIG'] = self.apt_conf_file - cmd = "%s remove %s" % (self.apt_get_cmd, ' '.join(pkgs)) + cmd = "%s purge %s" % (self.apt_get_cmd, ' '.join(pkgs)) else: cmd = "%s --admindir=%s/var/lib/dpkg --instdir=%s" \ - " -r --force-depends %s" % \ + " -P --force-depends %s" % \ (bb.utils.which(os.getenv('PATH'), "dpkg"), self.target_rootfs, self.target_rootfs, ' '.join(pkgs)) @@ -1722,9 +1761,12 @@ class DpkgPM(PackageManager): with open(self.d.expand("${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample")) as apt_conf_sample: for line in apt_conf_sample.read().split("\n"): match_arch = re.match(" Architecture \".*\";$", line) + architectures = "" if match_arch: for base_arch in base_arch_list: - apt_conf.write(" Architecture \"%s\";\n" % base_arch) + architectures += "\"%s\";" % base_arch + apt_conf.write(" Architectures {%s};\n" % architectures); + apt_conf.write(" Architecture \"%s\";\n" % base_archs) else: line = re.sub("#ROOTFS#", self.target_rootfs, line) line = re.sub("#APTCONF#", self.apt_conf_dir, line) diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index b085c9d6b5..f68d40f8c8 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -199,10 +199,108 @@ class PatchTree(PatchSet): self.Pop(all=True) class GitApplyTree(PatchTree): + patch_line_prefix = '%% original patch' + def __init__(self, dir, d): PatchTree.__init__(self, dir, d) + @staticmethod + def extractPatchHeader(patchfile): + """ + Extract just the header lines from the top of a patch file + """ + lines = [] + with open(patchfile, 'r') as f: + for line in f.readlines(): + if line.startswith('Index: ') or line.startswith('diff -') or line.startswith('---'): + break + lines.append(line) + return lines + + @staticmethod + def prepareCommit(patchfile): + """ + Prepare a git commit command line based on the header from a patch file + (typically this is useful for patches that cannot be applied with "git am" due to formatting) + """ + import tempfile + import re + author_re = re.compile('[\S ]+ <\S+@\S+\.\S+>') + # Process patch header and extract useful information + lines = GitApplyTree.extractPatchHeader(patchfile) + outlines = [] + author = None + date = None + for line in lines: + if line.startswith('Subject: '): + subject = line.split(':', 1)[1] + # Remove any [PATCH][oe-core] etc. + subject = re.sub(r'\[.+?\]\s*', '', subject) + outlines.insert(0, '%s\n\n' % subject.strip()) + continue + if line.startswith('From: ') or line.startswith('Author: '): + authorval = line.split(':', 1)[1].strip().replace('"', '') + # git is fussy about author formatting i.e. it must be Name <email@domain> + if author_re.match(authorval): + author = authorval + continue + if line.startswith('Date: '): + if date is None: + dateval = line.split(':', 1)[1].strip() + # Very crude check for date format, since git will blow up if it's not in the right + # format. Without e.g. a python-dateutils dependency we can't do a whole lot more + if len(dateval) > 12: + date = dateval + continue + if line.startswith('Signed-off-by: '): + authorval = line.split(':', 1)[1].strip().replace('"', '') + # git is fussy about author formatting i.e. it must be Name <email@domain> + if author_re.match(authorval): + author = authorval + outlines.append(line) + # Write out commit message to a file + with tempfile.NamedTemporaryFile('w', delete=False) as tf: + tmpfile = tf.name + for line in outlines: + tf.write(line) + # Prepare git command + cmd = ["git", "commit", "-F", tmpfile] + # git doesn't like plain email addresses as authors + if author and '<' in author: + cmd.append('--author="%s"' % author) + if date: + cmd.append('--date="%s"' % date) + return (tmpfile, cmd) + + @staticmethod + def extractPatches(tree, startcommit, outdir): + import tempfile + import shutil + tempdir = tempfile.mkdtemp(prefix='oepatch') + try: + shellcmd = ["git", "format-patch", startcommit, "-o", tempdir] + out = runcmd(["sh", "-c", " ".join(shellcmd)], tree) + if out: + for srcfile in out.split(): + patchlines = [] + outfile = None + with open(srcfile, 'r') as f: + for line in f: + if line.startswith(GitApplyTree.patch_line_prefix): + outfile = line.split()[-1].strip() + continue + patchlines.append(line) + if not outfile: + outfile = os.path.basename(srcfile) + with open(os.path.join(outdir, outfile), 'w') as of: + for line in patchlines: + of.write(line) + finally: + shutil.rmtree(tempdir) + def _applypatch(self, patch, force = False, reverse = False, run = True): + import shutil + def _applypatchhelper(shellcmd, patch, force = False, reverse = False, run = True): if reverse: shellcmd.append('-R') @@ -214,12 +312,65 @@ class GitApplyTree(PatchTree): return runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) + # Add hooks which add a pointer to the original patch file name in the commit message + reporoot = (runcmd("git rev-parse --show-toplevel".split(), self.dir) or '').strip() + if not reporoot: + raise Exception("Cannot get repository root for directory %s" % self.dir) + commithook = os.path.join(reporoot, '.git', 'hooks', 'commit-msg') + commithook_backup = commithook + '.devtool-orig' + applyhook = os.path.join(reporoot, '.git', 'hooks', 'applypatch-msg') + applyhook_backup = applyhook + '.devtool-orig' + if os.path.exists(commithook): + shutil.move(commithook, commithook_backup) + if os.path.exists(applyhook): + shutil.move(applyhook, applyhook_backup) + with open(commithook, 'w') as f: + # NOTE: the formatting here is significant; if you change it you'll also need to + # change other places which read it back + f.write('echo >> $1\n') + f.write('echo "%s: $PATCHFILE" >> $1\n' % GitApplyTree.patch_line_prefix) + os.chmod(commithook, 0755) + shutil.copy2(commithook, applyhook) try: - shellcmd = ["git", "--work-tree=.", "am", "-3", "-p%s" % patch['strippath']] - return _applypatchhelper(shellcmd, patch, force, reverse, run) - except CmdError: - shellcmd = ["git", "--git-dir=.", "apply", "-p%s" % patch['strippath']] - return _applypatchhelper(shellcmd, patch, force, reverse, run) + patchfilevar = 'PATCHFILE="%s"' % os.path.basename(patch['file']) + try: + shellcmd = [patchfilevar, "git", "--work-tree=.", "am", "-3", "--keep-cr", "-p%s" % patch['strippath']] + return _applypatchhelper(shellcmd, patch, force, reverse, run) + except CmdError: + # Need to abort the git am, or we'll still be within it at the end + try: + shellcmd = ["git", "--work-tree=.", "am", "--abort"] + runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) + except CmdError: + pass + # Fall back to git apply + shellcmd = ["git", "--git-dir=.", "apply", "-p%s" % patch['strippath']] + try: + output = _applypatchhelper(shellcmd, patch, force, reverse, run) + except CmdError: + # Fall back to patch + output = PatchTree._applypatch(self, patch, force, reverse, run) + # Add all files + shellcmd = ["git", "add", "-f", "."] + output += runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) + # Exclude the patches directory + shellcmd = ["git", "reset", "HEAD", self.patchdir] + output += runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) + # Commit the result + (tmpfile, shellcmd) = self.prepareCommit(patch['file']) + try: + shellcmd.insert(0, patchfilevar) + output += runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) + finally: + os.remove(tmpfile) + return output + finally: + os.remove(commithook) + os.remove(applyhook) + if os.path.exists(commithook_backup): + shutil.move(commithook_backup, commithook) + if os.path.exists(applyhook_backup): + shutil.move(applyhook_backup, applyhook) class QuiltTree(PatchSet): diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py new file mode 100644 index 0000000000..159a103719 --- /dev/null +++ b/meta/lib/oe/recipeutils.py @@ -0,0 +1,279 @@ +# Utility functions for reading and modifying recipes +# +# Some code borrowed from the OE layer index +# +# Copyright (C) 2013-2014 Intel Corporation +# + +import sys +import os +import os.path +import tempfile +import textwrap +import difflib +import utils +import shutil +import re +from collections import OrderedDict, defaultdict + + +# Help us to find places to insert values +recipe_progression = ['SUMMARY', 'DESCRIPTION', 'HOMEPAGE', 'BUGTRACKER', 'SECTION', 'LICENSE', 'LIC_FILES_CHKSUM', 'PROVIDES', 'DEPENDS', 'PR', 'PV', 'SRCREV', 'SRC_URI', 'S', 'do_fetch', 'do_unpack', 'do_patch', 'EXTRA_OECONF', 'do_configure', 'EXTRA_OEMAKE', 'do_compile', 'do_install', 'do_populate_sysroot', 'INITSCRIPT', 'USERADD', 'GROUPADD', 'PACKAGES', 'FILES', 'RDEPENDS', 'RRECOMMENDS', 'RSUGGESTS', 'RPROVIDES', 'RREPLACES', 'RCONFLICTS', 'ALLOW_EMPTY', 'do_package', 'do_deploy'] +# Variables that sometimes are a bit long but shouldn't be wrapped +nowrap_vars = ['SUMMARY', 'HOMEPAGE', 'BUGTRACKER'] +list_vars = ['SRC_URI', 'LIC_FILES_CHKSUM'] +meta_vars = ['SUMMARY', 'DESCRIPTION', 'HOMEPAGE', 'BUGTRACKER', 'SECTION'] + + +def pn_to_recipe(cooker, pn): + """Convert a recipe name (PN) to the path to the recipe file""" + import bb.providers + + if pn in cooker.recipecache.pkg_pn: + filenames = cooker.recipecache.pkg_pn[pn] + best = bb.providers.findBestProvider(pn, cooker.data, cooker.recipecache, cooker.recipecache.pkg_pn) + return best[3] + else: + return None + + +def get_unavailable_reasons(cooker, pn): + """If a recipe could not be found, find out why if possible""" + import bb.taskdata + taskdata = bb.taskdata.TaskData(None, skiplist=cooker.skiplist) + return taskdata.get_reasons(pn) + + +def parse_recipe(fn, d): + """Parse an individual recipe""" + import bb.cache + envdata = bb.cache.Cache.loadDataFull(fn, [], d) + return envdata + + +def get_var_files(fn, varlist, d): + """Find the file in which each of a list of variables is set. + Note: requires variable history to be enabled when parsing. + """ + envdata = parse_recipe(fn, d) + varfiles = {} + for v in varlist: + history = envdata.varhistory.variable(v) + files = [] + for event in history: + if 'file' in event and not 'flag' in event: + files.append(event['file']) + if files: + actualfile = files[-1] + else: + actualfile = None + varfiles[v] = actualfile + + return varfiles + + +def patch_recipe_file(fn, values, patch=False, relpath=''): + """Update or insert variable values into a recipe file (assuming you + have already identified the exact file you want to update.) + Note that some manual inspection/intervention may be required + since this cannot handle all situations. + """ + remainingnames = {} + for k in values.keys(): + remainingnames[k] = recipe_progression.index(k) if k in recipe_progression else -1 + remainingnames = OrderedDict(sorted(remainingnames.iteritems(), key=lambda x: x[1])) + + with tempfile.NamedTemporaryFile('w', delete=False) as tf: + def outputvalue(name): + rawtext = '%s = "%s"\n' % (name, values[name]) + if name in nowrap_vars: + tf.write(rawtext) + elif name in list_vars: + splitvalue = values[name].split() + if len(splitvalue) > 1: + linesplit = ' \\\n' + (' ' * (len(name) + 4)) + tf.write('%s = "%s%s"\n' % (name, linesplit.join(splitvalue), linesplit)) + else: + tf.write(rawtext) + else: + wrapped = textwrap.wrap(rawtext) + for wrapline in wrapped[:-1]: + tf.write('%s \\\n' % wrapline) + tf.write('%s\n' % wrapped[-1]) + + tfn = tf.name + with open(fn, 'r') as f: + # First runthrough - find existing names (so we know not to insert based on recipe_progression) + # Second runthrough - make the changes + existingnames = [] + for runthrough in [1, 2]: + currname = None + for line in f: + if not currname: + insert = False + for k in remainingnames.keys(): + for p in recipe_progression: + if re.match('^%s(_prepend|_append)*[ ?:=(]' % p, line): + if remainingnames[k] > -1 and recipe_progression.index(p) > remainingnames[k] and runthrough > 1 and not k in existingnames: + outputvalue(k) + del remainingnames[k] + break + for k in remainingnames.keys(): + if re.match('^%s[ ?:=]' % k, line): + currname = k + if runthrough == 1: + existingnames.append(k) + else: + del remainingnames[k] + break + if currname and runthrough > 1: + outputvalue(currname) + + if currname: + sline = line.rstrip() + if not sline.endswith('\\'): + currname = None + continue + if runthrough > 1: + tf.write(line) + f.seek(0) + if remainingnames: + tf.write('\n') + for k in remainingnames.keys(): + outputvalue(k) + + with open(tfn, 'U') as f: + tolines = f.readlines() + if patch: + with open(fn, 'U') as f: + fromlines = f.readlines() + relfn = os.path.relpath(fn, relpath) + diff = difflib.unified_diff(fromlines, tolines, 'a/%s' % relfn, 'b/%s' % relfn) + os.remove(tfn) + return diff + else: + with open(fn, 'w') as f: + f.writelines(tolines) + os.remove(tfn) + return None + +def localise_file_vars(fn, varfiles, varlist): + """Given a list of variables and variable history (fetched with get_var_files()) + find where each variable should be set/changed. This handles for example where a + recipe includes an inc file where variables might be changed - in most cases + we want to update the inc file when changing the variable value rather than adding + it to the recipe itself. + """ + fndir = os.path.dirname(fn) + os.sep + + first_meta_file = None + for v in meta_vars: + f = varfiles.get(v, None) + if f: + actualdir = os.path.dirname(f) + os.sep + if actualdir.startswith(fndir): + first_meta_file = f + break + + filevars = defaultdict(list) + for v in varlist: + f = varfiles[v] + # Only return files that are in the same directory as the recipe or in some directory below there + # (this excludes bbclass files and common inc files that wouldn't be appropriate to set the variable + # in if we were going to set a value specific to this recipe) + if f: + actualfile = f + else: + # Variable isn't in a file, if it's one of the "meta" vars, use the first file with a meta var in it + if first_meta_file: + actualfile = first_meta_file + else: + actualfile = fn + + actualdir = os.path.dirname(actualfile) + os.sep + if not actualdir.startswith(fndir): + actualfile = fn + filevars[actualfile].append(v) + + return filevars + +def patch_recipe(d, fn, varvalues, patch=False, relpath=''): + """Modify a list of variable values in the specified recipe. Handles inc files if + used by the recipe. + """ + varlist = varvalues.keys() + varfiles = get_var_files(fn, varlist, d) + locs = localise_file_vars(fn, varfiles, varlist) + patches = [] + for f,v in locs.iteritems(): + vals = {k: varvalues[k] for k in v} + patchdata = patch_recipe_file(f, vals, patch, relpath) + if patch: + patches.append(patchdata) + + if patch: + return patches + else: + return None + + + +def copy_recipe_files(d, tgt_dir, whole_dir=False, download=True): + """Copy (local) recipe files, including both files included via include/require, + and files referred to in the SRC_URI variable.""" + import bb.fetch2 + import oe.path + + # FIXME need a warning if the unexpanded SRC_URI value contains variable references + + uris = (d.getVar('SRC_URI', True) or "").split() + fetch = bb.fetch2.Fetch(uris, d) + if download: + fetch.download() + + # Copy local files to target directory and gather any remote files + bb_dir = os.path.dirname(d.getVar('FILE', True)) + os.sep + remotes = [] + includes = [path for path in d.getVar('BBINCLUDED', True).split() if + path.startswith(bb_dir) and os.path.exists(path)] + for path in fetch.localpaths() + includes: + # Only import files that are under the meta directory + if path.startswith(bb_dir): + if not whole_dir: + relpath = os.path.relpath(path, bb_dir) + subdir = os.path.join(tgt_dir, os.path.dirname(relpath)) + if not os.path.exists(subdir): + os.makedirs(subdir) + shutil.copy2(path, os.path.join(tgt_dir, relpath)) + else: + remotes.append(path) + # Simply copy whole meta dir, if requested + if whole_dir: + shutil.copytree(bb_dir, tgt_dir) + + return remotes + + +def get_recipe_patches(d): + """Get a list of the patches included in SRC_URI within a recipe.""" + patchfiles = [] + # Execute src_patches() defined in patch.bbclass - this works since that class + # is inherited globally + patches = bb.utils.exec_flat_python_func('src_patches', d) + for patch in patches: + _, _, local, _, _, parm = bb.fetch.decodeurl(patch) + patchfiles.append(local) + return patchfiles + + +def validate_pn(pn): + """Perform validation on a recipe name (PN) for a new recipe.""" + reserved_names = ['forcevariable', 'append', 'prepend', 'remove'] + if not re.match('[0-9a-z-]+', pn): + return 'Recipe name "%s" is invalid: only characters 0-9, a-z and - are allowed' % pn + elif pn in reserved_names: + return 'Recipe name "%s" is invalid: is a reserved keyword' % pn + elif pn.startswith('pn-'): + return 'Recipe name "%s" is invalid: names starting with "pn-" are reserved' % pn + return '' + diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index c4735f2755..6fb749f049 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -40,6 +40,43 @@ class Rootfs(object): def _log_check(self): pass + def _log_check_warn(self): + r = re.compile('^(warn|Warn|NOTE: warn|NOTE: Warn|WARNING:)') + log_path = self.d.expand("${T}/log.do_rootfs") + with open(log_path, 'r') as log: + for line in log.read().split('\n'): + if 'log_check' in line or 'NOTE:' in line: + continue + + m = r.search(line) + if m: + bb.warn('log_check: There is a warn message in the logfile') + bb.warn('log_check: Matched keyword: [%s]' % m.group()) + bb.warn('log_check: %s\n' % line) + + def _log_check_error(self): + r = re.compile(self.log_check_regex) + log_path = self.d.expand("${T}/log.do_rootfs") + with open(log_path, 'r') as log: + found_error = 0 + message = "\n" + for line in log.read().split('\n'): + if 'log_check' in line: + continue + + m = r.search(line) + if m: + found_error = 1 + bb.warn('log_check: There were error messages in the logfile') + bb.warn('log_check: Matched keyword: [%s]\n\n' % m.group()) + + if found_error >= 1 and found_error <= 5: + message += line + '\n' + found_error += 1 + + if found_error == 6: + bb.fatal(message) + def _insert_feed_uris(self): if bb.utils.contains("IMAGE_FEATURES", "package-management", True, False, self.d): @@ -118,17 +155,19 @@ class Rootfs(object): if self.d.getVar('USE_DEVFS', True) != "1": self._create_devfs() - self._uninstall_uneeded() + self._uninstall_unneeded() self._insert_feed_uris() self._run_ldconfig() - self._generate_kernel_module_deps() + if self.d.getVar('USE_DEPMOD', True) != "0": + self._generate_kernel_module_deps() self._cleanup() + self._log_check() - def _uninstall_uneeded(self): + def _uninstall_unneeded(self): # Remove unneeded init script symlinks delayed_postinsts = self._get_delayed_postinsts() if delayed_postinsts is None: @@ -137,34 +176,41 @@ class Rootfs(object): self.d.getVar('IMAGE_ROOTFS', True), "run-postinsts", "remove"]) - # Remove unneeded package-management related components - if bb.utils.contains("IMAGE_FEATURES", "package-management", - True, False, self.d): - return + runtime_pkgmanage = bb.utils.contains("IMAGE_FEATURES", "package-management", + True, False, self.d) + if not runtime_pkgmanage: + # Remove components that we don't need if we're not going to install + # additional packages at runtime + if delayed_postinsts is None: + installed_pkgs_dir = self.d.expand('${WORKDIR}/installed_pkgs.txt') + pkgs_to_remove = list() + with open(installed_pkgs_dir, "r+") as installed_pkgs: + pkgs_installed = installed_pkgs.read().split('\n') + for pkg_installed in pkgs_installed[:]: + pkg = pkg_installed.split()[0] + if pkg in ["update-rc.d", + "base-passwd", + "shadow", + "update-alternatives", + self.d.getVar("ROOTFS_BOOTSTRAP_INSTALL", True) + ]: + pkgs_to_remove.append(pkg) + pkgs_installed.remove(pkg_installed) + + if len(pkgs_to_remove) > 0: + self.pm.remove(pkgs_to_remove, False) + # Update installed_pkgs.txt + open(installed_pkgs_dir, "w+").write('\n'.join(pkgs_installed)) - if delayed_postinsts is None: - installed_pkgs_dir = self.d.expand('${WORKDIR}/installed_pkgs.txt') - pkgs_to_remove = list() - with open(installed_pkgs_dir, "r+") as installed_pkgs: - pkgs_installed = installed_pkgs.read().split('\n') - for pkg_installed in pkgs_installed[:]: - pkg = pkg_installed.split()[0] - if pkg in ["update-rc.d", - "base-passwd", - self.d.getVar("ROOTFS_BOOTSTRAP_INSTALL", True) - ]: - pkgs_to_remove.append(pkg) - pkgs_installed.remove(pkg_installed) - - if len(pkgs_to_remove) > 0: - self.pm.remove(pkgs_to_remove, False) - # Update installed_pkgs.txt - open(installed_pkgs_dir, "w+").write('\n'.join(pkgs_installed)) + else: + self._save_postinsts() - else: - self._save_postinsts() + post_uninstall_cmds = self.d.getVar("ROOTFS_POSTUNINSTALL_COMMAND", True) + execute_pre_post_process(self.d, post_uninstall_cmds) - self.pm.remove_packaging_data() + if not runtime_pkgmanage: + # Remove the package manager data files + self.pm.remove_packaging_data() def _run_intercepts(self): intercepts_dir = os.path.join(self.d.getVar('WORKDIR', True), @@ -209,16 +255,17 @@ class Rootfs(object): 'new', '-v']) def _generate_kernel_module_deps(self): - kernel_abi_ver_file = os.path.join(self.d.getVar('STAGING_KERNEL_DIR', True), + kernel_abi_ver_file = oe.path.join(self.d.getVar('PKGDATA_DIR', True), "kernel-depmod", 'kernel-abiversion') - if os.path.exists(kernel_abi_ver_file): - kernel_ver = open(kernel_abi_ver_file).read().strip(' \n') - modules_dir = os.path.join(self.image_rootfs, 'lib', 'modules', kernel_ver) + if not os.path.exists(kernel_abi_ver_file): + bb.fatal("No kernel-abiversion file found (%s), cannot run depmod, aborting" % kernel_abi_ver_file) - bb.utils.mkdirhier(modules_dir) + kernel_ver = open(kernel_abi_ver_file).read().strip(' \n') + modules_dir = os.path.join(self.image_rootfs, 'lib', 'modules', kernel_ver) - self._exec_shell_cmd(['depmodwrapper', '-a', '-b', self.image_rootfs, - kernel_ver]) + bb.utils.mkdirhier(modules_dir) + + self._exec_shell_cmd(['depmodwrapper', '-a', '-b', self.image_rootfs, kernel_ver]) """ Create devfs: @@ -248,7 +295,7 @@ class Rootfs(object): class RpmRootfs(Rootfs): def __init__(self, d, manifest_dir): super(RpmRootfs, self).__init__(d) - + self.log_check_regex = '(unpacking of archive failed|Cannot find package|exit 1|ERR|Fail)' self.manifest = RpmManifest(d, manifest_dir) self.pm = RpmPM(d, @@ -320,8 +367,6 @@ class RpmRootfs(Rootfs): self.pm.install_complementary() - self._log_check() - if self.inc_rpm_image_gen == "1": self.pm.backup_packaging_data() @@ -347,20 +392,6 @@ class RpmRootfs(Rootfs): # already saved in /etc/rpm-postinsts pass - def _log_check_warn(self): - r = re.compile('(warn|Warn)') - log_path = self.d.expand("${T}/log.do_rootfs") - with open(log_path, 'r') as log: - for line in log.read().split('\n'): - if 'log_check' in line: - continue - - m = r.search(line) - if m: - bb.warn('log_check: There is a warn message in the logfile') - bb.warn('log_check: Matched keyword: [%s]' % m.group()) - bb.warn('log_check: %s\n' % line) - def _log_check_error(self): r = re.compile('(unpacking of archive failed|Cannot find package|exit 1|ERR|Fail)') log_path = self.d.expand("${T}/log.do_rootfs") @@ -402,12 +433,16 @@ class RpmRootfs(Rootfs): # __db.00* (Berkeley DB files that hold locks, rpm specific environment # settings, etc.), that should not get into the final rootfs self.pm.unlock_rpm_db() - bb.utils.remove(self.image_rootfs + "/install", True) + if os.path.isdir(self.pm.install_dir_path + "/tmp") and not os.listdir(self.pm.install_dir_path + "/tmp"): + bb.utils.remove(self.pm.install_dir_path + "/tmp", True) + if os.path.isdir(self.pm.install_dir_path) and not os.listdir(self.pm.install_dir_path): + bb.utils.remove(self.pm.install_dir_path, True) class DpkgRootfs(Rootfs): def __init__(self, d, manifest_dir): super(DpkgRootfs, self).__init__(d) + self.log_check_regex = '^E:' bb.utils.remove(self.image_rootfs, True) bb.utils.remove(self.d.getVar('MULTILIB_TEMP_ROOTFS', True), True) @@ -479,7 +514,8 @@ class DpkgRootfs(Rootfs): self.pm.mark_packages("unpacked", registered_pkgs.split()) def _log_check(self): - pass + self._log_check_warn() + self._log_check_error() def _cleanup(self): pass @@ -488,6 +524,7 @@ class DpkgRootfs(Rootfs): class OpkgRootfs(Rootfs): def __init__(self, d, manifest_dir): super(OpkgRootfs, self).__init__(d) + self.log_check_regex = '(exit 1|Collected errors)' self.manifest = OpkgManifest(d, manifest_dir) self.opkg_conf = self.d.getVar("IPKGCONF_TARGET", True) @@ -749,7 +786,8 @@ class OpkgRootfs(Rootfs): self.pm.mark_packages("unpacked", registered_pkgs.split()) def _log_check(self): - pass + self._log_check_warn() + self._log_check_error() def _cleanup(self): pass diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index c57a441941..a6767412c7 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py @@ -269,6 +269,8 @@ class DpkgSdk(Sdk): bb.note("Installing TARGET packages") self._populate_sysroot(self.target_pm, self.target_manifest) + self.target_pm.install_complementary(self.d.getVar('SDKIMAGE_INSTALL_COMPLEMENTARY', True)) + execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_TARGET_COMMAND", True)) self._copy_apt_dir_to(os.path.join(self.sdk_target_sysroot, "etc", "apt")) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index af7617ee61..9d6d7c42fc 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -137,13 +137,16 @@ class SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash): return super(bb.siggen.SignatureGeneratorBasicHash, self).dump_sigtask(fn, task, stampbase, runtime) - def dump_lockedsigs(self, sigfile=None): + def dump_lockedsigs(self, sigfile=None, taskfilter=None): if not sigfile: sigfile = os.getcwd() + "/locked-sigs.inc" bb.plain("Writing locked sigs to %s" % sigfile) types = {} for k in self.runtaskdeps: + if taskfilter: + if not k in taskfilter: + continue fn = k.rsplit(".",1)[0] t = self.lockedhashfn[fn].split(" ")[1].split(":")[5] t = 't-' + t.replace('_', '-') @@ -203,9 +206,6 @@ def find_siginfo(pn, taskname, taskhashlist, d): if key.startswith('virtual:native:'): pn = pn + '-native' - if taskname in ['do_fetch', 'do_unpack', 'do_patch', 'do_populate_lic']: - pn.replace("-native", "") - filedates = {} # First search in stamps dir @@ -246,7 +246,10 @@ def find_siginfo(pn, taskname, taskhashlist, d): localdata.setVar('PV', '*') localdata.setVar('PR', '*') localdata.setVar('BB_TASKHASH', hashval) - if pn.endswith('-native') or "-cross-" in pn or "-crosssdk-" in pn: + swspec = localdata.getVar('SSTATE_SWSPEC', True) + if taskname in ['do_fetch', 'do_unpack', 'do_patch', 'do_populate_lic', 'do_preconfigure'] and swspec: + localdata.setVar('SSTATE_PKGSPEC', '${SSTATE_SWSPEC}') + elif pn.endswith('-native') or "-cross-" in pn or "-crosssdk-" in pn: localdata.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/") sstatename = taskname[3:] filespec = '%s_%s.*.siginfo' % (localdata.getVar('SSTATE_PKG', True), sstatename) diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py index 0a623c75b1..4f5c611615 100644 --- a/meta/lib/oe/terminal.py +++ b/meta/lib/oe/terminal.py @@ -2,6 +2,7 @@ import logging import oe.classutils import shlex from bb.process import Popen, ExecutionError +from distutils.version import LooseVersion logger = logging.getLogger('BitBake.OE.Terminal') @@ -52,9 +53,17 @@ class XTerminal(Terminal): raise UnsupportedTerminal(self.name) class Gnome(XTerminal): - command = 'gnome-terminal -t "{title}" -x {command}' + command = 'gnome-terminal -t "{title}" --disable-factory -x {command}' priority = 2 + def __init__(self, sh_cmd, title=None, env=None, d=None): + # Check version + vernum = check_terminal_version("gnome-terminal") + if vernum and LooseVersion(vernum) >= '3.10': + logger.debug(1, 'Gnome-Terminal 3.10 or later does not support --disable-factory') + self.command = 'gnome-terminal -t "{title}" -x {command}' + XTerminal.__init__(self, sh_cmd, title, env, d) + class Mate(XTerminal): command = 'mate-terminal -t "{title}" -x {command}' priority = 2 @@ -63,17 +72,20 @@ class Xfce(XTerminal): command = 'xfce4-terminal -T "{title}" -e "{command}"' priority = 2 +class Terminology(XTerminal): + command = 'terminology -T="{title}" -e {command}' + priority = 2 + class Konsole(XTerminal): - command = 'konsole -T "{title}" -e {command}' + command = 'konsole --nofork -p tabtitle="{title}" -e {command}' priority = 2 def __init__(self, sh_cmd, title=None, env=None, d=None): # Check version - vernum = check_konsole_version("konsole") - if vernum: - if vernum.split('.')[0] == "2": - logger.debug(1, 'Konsole from KDE 4.x will not work as devshell, skipping') - raise UnsupportedTerminal(self.name) + vernum = check_terminal_version("konsole") + if vernum and LooseVersion(vernum) < '2.0.0': + # Konsole from KDE 3.x + self.command = 'konsole -T "{title}" -e {command}' XTerminal.__init__(self, sh_cmd, title, env, d) class XTerm(XTerminal): @@ -112,6 +124,24 @@ class TmuxRunning(Terminal): if not os.getenv('TMUX'): raise UnsupportedTerminal('tmux is not running') + if not check_tmux_pane_size('tmux'): + raise UnsupportedTerminal('tmux pane too small') + + Terminal.__init__(self, sh_cmd, title, env, d) + +class TmuxNewWindow(Terminal): + """Open a new window in the current running tmux session""" + name = 'tmux-new-window' + command = 'tmux new-window -n "{title}" "{command}"' + priority = 2.70 + + def __init__(self, sh_cmd, title=None, env=None, d=None): + if not bb.utils.which(os.getenv('PATH'), 'tmux'): + raise UnsupportedTerminal('tmux is not installed') + + if not os.getenv('TMUX'): + raise UnsupportedTerminal('tmux is not running') + Terminal.__init__(self, sh_cmd, title, env, d) class Tmux(Terminal): @@ -180,10 +210,27 @@ def spawn(name, sh_cmd, title=None, env=None, d=None): if pipe.returncode != 0: raise ExecutionError(sh_cmd, pipe.returncode, output) -def check_konsole_version(konsole): +def check_tmux_pane_size(tmux): + import subprocess as sub + try: + p = sub.Popen('%s list-panes -F "#{?pane_active,#{pane_height},}"' % tmux, + shell=True,stdout=sub.PIPE,stderr=sub.PIPE) + out, err = p.communicate() + size = int(out.strip()) + except OSError as exc: + import errno + if exc.errno == errno.ENOENT: + return None + else: + raise + if size/2 >= 19: + return True + return False + +def check_terminal_version(terminalName): import subprocess as sub try: - p = sub.Popen(['sh', '-c', '%s --version' % konsole],stdout=sub.PIPE,stderr=sub.PIPE) + p = sub.Popen(['sh', '-c', '%s --version' % terminalName],stdout=sub.PIPE,stderr=sub.PIPE) out, err = p.communicate() ver_info = out.rstrip().split('\n') except OSError as exc: @@ -196,6 +243,8 @@ def check_konsole_version(konsole): for ver in ver_info: if ver.startswith('Konsole'): vernum = ver.split(' ')[-1] + if ver.startswith('GNOME Terminal'): + vernum = ver.split(' ')[-1] return vernum def distro_name(): diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 35442568e2..b8224de20b 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -42,8 +42,16 @@ def version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): return falsevalue def both_contain(variable1, variable2, checkvalue, d): - if d.getVar(variable1,1).find(checkvalue) != -1 and d.getVar(variable2,1).find(checkvalue) != -1: - return checkvalue + val1 = d.getVar(variable1, True) + val2 = d.getVar(variable2, True) + val1 = set(val1.split()) + val2 = set(val2.split()) + if isinstance(checkvalue, basestring): + checkvalue = set(checkvalue.split()) + else: + checkvalue = set(checkvalue) + if checkvalue.issubset(val1) and checkvalue.issubset(val2): + return " ".join(checkvalue) else: return "" @@ -180,3 +188,7 @@ def multiprocess_exec(commands, function): pool.terminate() pool.join() raise + +def squashspaces(string): + import re + return re.sub("\s+", " ", string).strip() diff --git a/meta/lib/oeqa/runtime/_ptest.py b/meta/lib/oeqa/runtime/_ptest.py index 4c58dc1d7f..81c9c43862 100644 --- a/meta/lib/oeqa/runtime/_ptest.py +++ b/meta/lib/oeqa/runtime/_ptest.py @@ -86,7 +86,7 @@ class PtestRunnerTest(oeRuntimeTest): installed_pkgs.write(self.pkgs_list.list("arch")) cmd = [bb.utils.which(os.getenv('PATH'), "oe-pkgdata-util"), - "glob", oeRuntimeTest.tc.d.getVar('PKGDATA_DIR', True), installed_pkgs_file, + "-p", oeRuntimeTest.tc.d.getVar('PKGDATA_DIR', True), "glob", installed_pkgs_file, globs] try: bb.note("Installing complementary packages ...") @@ -99,26 +99,27 @@ class PtestRunnerTest(oeRuntimeTest): return complementary_pkgs.split() def setUp(self): - self.buildhist_dir = oeRuntimeTest.tc.d.getVar("BUILDHISTORY_DIR_IMAGE", True) - self.assertTrue(os.path.exists(self.buildhist_dir)) self.ptest_log = os.path.join(oeRuntimeTest.tc.d.getVar("TEST_LOG_DIR",True), "ptest-%s.log" % oeRuntimeTest.tc.d.getVar('DATETIME', True)) @skipUnlessPassed('test_ssh') def test_ptestrunner(self): self.add_smart_channel() - cond = oeRuntimeTest.hasPackage("ptest-runner") and oeRuntimeTest.hasFeature("ptest") and oeRuntimeTest.hasPackage("-ptest") - if not cond: + (runnerstatus, result) = self.target.run('which ptest-runner', 0) + cond = oeRuntimeTest.hasPackage("ptest-runner") and oeRuntimeTest.hasFeature("ptest") and oeRuntimeTest.hasPackage("-ptest") and (runnerstatus != 0) + if cond: self.install_packages(self.install_complementary("*-ptest")) self.install_packages(['ptest-runner']) - self.target.run('/usr/bin/ptest-runner > /tmp/ptest.log 2>&1', 0) + (runnerstatus, result) = self.target.run('/usr/bin/ptest-runner > /tmp/ptest.log 2>&1', 0) + #exit code is !=0 even if ptest-runner executes because some ptest tests fail. + self.assertTrue(runnerstatus != 127, msg="Cannot execute ptest-runner!") self.target.copy_from('/tmp/ptest.log', self.ptest_log) - shutil.copyfile(self.ptest_log, os.path.join(self.buildhist_dir, "ptest.log")) + shutil.copyfile(self.ptest_log, "ptest.log") - result = self.parse_ptest(os.path.join(self.buildhist_dir, "ptest.log")) + result = self.parse_ptest("ptest.log") log_results_to_location = "./results" if os.path.exists(log_results_to_location): shutil.rmtree(log_results_to_location) os.makedirs(log_results_to_location) - result.log_as_files(log_results_to_location, test_status = ['fail']) + result.log_as_files(log_results_to_location, test_status = ['pass','fail']) diff --git a/meta/lib/oeqa/runtime/parselogs.py b/meta/lib/oeqa/runtime/parselogs.py index 42cb1b5e6f..7721912a23 100644 --- a/meta/lib/oeqa/runtime/parselogs.py +++ b/meta/lib/oeqa/runtime/parselogs.py @@ -7,10 +7,26 @@ from oeqa.utils.decorators import * errors = ["error", "cannot", "can\'t", "failed"] common_errors = [ - '(WW) warning, (EE) error, (NI) not implemented, (??) unknown.', - 'dma timeout', - 'can\'t add hid device:', - 'usbhid: probe of ', + "(WW) warning, (EE) error, (NI) not implemented, (??) unknown.", + "dma timeout", + "can\'t add hid device:", + "usbhid: probe of ", + "_OSC failed (AE_ERROR)", + "_OSC failed (AE_SUPPORT)", + "AE_ALREADY_EXISTS", + "ACPI _OSC request failed (AE_SUPPORT)", + "can\'t disable ASPM", + "Failed to load module \"vesa\"", + "Failed to load module vesa", + "Failed to load module \"modesetting\"", + "Failed to load module modesetting", + "Failed to load module \"glx\"", + "Failed to load module glx", + "[drm] Cannot find any crtc or sizes - going 1024x768", + "_OSC failed (AE_NOT_FOUND); disabling ASPM", + "Open ACPI failed (/var/run/acpid.socket) (No such file or directory)", + "NX (Execute Disable) protection cannot be enabled: non-PAE kernel!", + "hd.: possibly failed opcode" ] x86_common = [ @@ -22,11 +38,6 @@ x86_common = [ qemux86_common = [ 'Fast TSC calibration', - '_OSC failed (AE_NOT_FOUND); disabling ASPM', - 'Open ACPI failed (/var/run/acpid.socket) (No such file or directory)', - 'Failed to load module "vesa"', - 'Failed to load module "modesetting"', - 'Failed to load module "glx"', 'wrong ELF class', ] + common_errors @@ -39,9 +50,11 @@ ignore_errors = { 'qemux86-64' : qemux86_common, 'qemumips' : [ 'Failed to load module "glx"', + 'pci 0000:00:00.0: [Firmware Bug]: reg 0x..: invalid BAR (can\'t size)', ] + common_errors, 'qemuppc' : [ 'PCI 0000:00 Cannot reserve Legacy IO [io 0x0000-0x0fff]', + 'host side 80-wire cable detection failed, limiting max speed', 'mode "640x480" test failed', 'Failed to load module "glx"', ] + common_errors, @@ -54,6 +67,19 @@ ignore_errors = { 'crownbay' : x86_common, 'genericx86' : x86_common, 'genericx86-64' : x86_common, + 'edgerouter' : [ + 'Fatal server error:', + ] + common_errors, + 'minnow' : [ + 'netlink init failed', + 'NETLINK INITIALIZATION FAILED', + ] + common_errors, + 'jasperforest' : [ + 'Activated service \'org.bluez\' failed:', + 'Unable to find NFC netlink family', + 'netlink init failed', + 'NETLINK INITIALIZATION FAILED', + ] + common_errors, } log_locations = ["/var/log/","/var/log/dmesg", "/tmp/dmesg_output.log"] @@ -100,9 +126,10 @@ class ParseLogsTest(oeRuntimeTest): (status, output) = self.target.run("test -d "+str(location)) if (status == 0): (status, output) = self.target.run("find "+str(location)+"/*.log -maxdepth 1 -type f") - output = output.splitlines() - for logfile in output: - logs.append(os.path.join(location,str(logfile))) + if (status == 0): + output = output.splitlines() + for logfile in output: + logs.append(os.path.join(location,str(logfile))) return logs #build the grep command to be used with filters and exclusions diff --git a/meta/lib/oeqa/runtime/rpm.py b/meta/lib/oeqa/runtime/rpm.py index b17e8b46a8..0529992cbe 100644 --- a/meta/lib/oeqa/runtime/rpm.py +++ b/meta/lib/oeqa/runtime/rpm.py @@ -47,6 +47,16 @@ class RpmInstallRemoveTest(oeRuntimeTest): (status,output) = self.target.run('rpm -e rpm-doc') self.assertEqual(status, 0, msg="Failed to remove rpm-doc package: %s" % output) + @testcase(1096) + @skipUnlessPassed('test_ssh') + def test_rpm_query_nonroot(self): + (status, output) = self.target.run('useradd test1') + self.assertTrue(status == 0, msg="Failed to create new user") + (status, output) = self.target.run('sudo -u test1 id') + self.assertTrue('(test1)' in output, msg="Failed to execute as new user") + (status, output) = self.target.run('sudo -u test1 rpm -qa') + self.assertEqual(status, 0, msg="status: %s. Cannot run rpm -qa" % status) + @classmethod def tearDownClass(self): oeRuntimeTest.tc.target.run('rm -f /tmp/rpm-doc.rpm') diff --git a/meta/lib/oeqa/runtime/smart.py b/meta/lib/oeqa/runtime/smart.py index 3b49314df7..dba3bd60d7 100644 --- a/meta/lib/oeqa/runtime/smart.py +++ b/meta/lib/oeqa/runtime/smart.py @@ -53,12 +53,15 @@ class SmartRepoTest(SmartTest): @classmethod def setUpClass(self): + self.repolist = [] self.repo_server = HTTPService(oeRuntimeTest.tc.d.getVar('DEPLOY_DIR', True), oeRuntimeTest.tc.target.server_ip) self.repo_server.start() @classmethod def tearDownClass(self): self.repo_server.stop() + for i in self.repolist: + oeRuntimeTest.tc.target.run('smart channel -y --remove '+str(i)) def test_smart_channel(self): self.smart('channel', 1) @@ -71,6 +74,7 @@ class SmartRepoTest(SmartTest): for arch in os.listdir('%s/%s' % (self.repo_server.root_dir, image_pkgtype)): if arch in pkgarchs: self.smart('channel -y --add {a} type=rpm-md baseurl={u}/{a}'.format(a=arch, u=deploy_url)) + self.repolist.append(arch) self.smart('update') def test_smart_channel_help(self): @@ -119,3 +123,47 @@ class SmartRepoTest(SmartTest): @skipUnlessPassed('test_smart_install') def test_smart_reinstall(self): self.smart('reinstall -y psplash-default') + + @testcase(727) + @skipUnlessPassed('test_smart_channel_add') + def test_smart_remote_repo(self): + self.smart('update') + self.smart('install -y psplash') + self.smart('remove -y psplash') + + @testcase(726) + def test_smart_local_dir(self): + self.target.run('mkdir /tmp/myrpmdir') + self.smart('channel --add myrpmdir type=rpm-dir path=/tmp/myrpmdir -y') + self.target.run('cd /tmp/myrpmdir') + self.smart('download psplash') + output = self.smart('channel --list') + for i in output.split("\n"): + if ("rpmsys" != str(i)) and ("myrpmdir" != str(i)): + self.smart('channel --disable '+str(i)) + self.target.run('cd /home/root') + self.smart('install psplash') + for i in output.split("\n"): + if ("rpmsys" != str(i)) and ("myrpmdir" != str(i)): + self.smart('channel --enable '+str(i)) + self.smart('channel --remove myrpmdir -y') + self.target.run("rm -rf /tmp/myrpmdir") + + @testcase(718) + def test_smart_add_rpmdir(self): + self.target.run('mkdir /tmp/myrpmdir') + self.smart('channel --add myrpmdir type=rpm-dir path=/tmp/myrpmdir -y') + self.smart('channel --disable myrpmdir -y') + output = self.smart('channel --show myrpmdir') + self.assertTrue("disabled = yes" in output, msg="Failed to disable rpm dir") + self.smart('channel --enable myrpmdir -y') + output = self.smart('channel --show myrpmdir') + self.assertFalse("disabled = yes" in output, msg="Failed to enable rpm dir") + self.smart('channel --remove myrpmdir -y') + self.target.run("rm -rf /tmp/myrpmdir") + + @testcase(731) + @skipUnlessPassed('test_smart_channel_add') + def test_smart_remove_package(self): + self.smart('install -y psplash') + self.smart('remove -y psplash')
\ No newline at end of file diff --git a/meta/lib/oeqa/runtime/systemd.py b/meta/lib/oeqa/runtime/systemd.py index 1451698bb3..5935edd549 100644 --- a/meta/lib/oeqa/runtime/systemd.py +++ b/meta/lib/oeqa/runtime/systemd.py @@ -86,3 +86,9 @@ class SystemdServiceTests(SystemdTest): self.systemctl('is-enabled', 'avahi-daemon.service', expected=1) self.systemctl('enable', 'avahi-daemon.service') self.systemctl('is-enabled', 'avahi-daemon.service') + +class SystemdJournalTests(SystemdTest): + @skipUnlessPassed('test_ssh') + def test_systemd_journal(self): + (status, output) = self.target.run('journalctl') + self.assertEqual(status, 0, output) diff --git a/meta/lib/oeqa/selftest/_toaster.py b/meta/lib/oeqa/selftest/_toaster.py index 1cf28a0144..2ed08d24e6 100644 --- a/meta/lib/oeqa/selftest/_toaster.py +++ b/meta/lib/oeqa/selftest/_toaster.py @@ -19,89 +19,89 @@ from oeqa.utils.decorators import testcase class ToasterSetup(oeSelfTest): def recipe_parse(self, file_path, var): - for line in open(file_path,'r'): - if line.find(var) > -1: - val = line.split(" = ")[1].replace("\"", "").strip() - return val + for line in open(file_path,'r'): + if line.find(var) > -1: + val = line.split(" = ")[1].replace("\"", "").strip() + return val def fix_file_path(self, file_path): - if ":" in file_path: - file_path=file_path.split(":")[2] - return file_path + if ":" in file_path: + file_path=file_path.split(":")[2] + return file_path class Toaster_DB_Tests(ToasterSetup): # Check if build name is unique - tc_id=795 @testcase(795) def test_Build_Unique_Name(self): - all_builds = Build.objects.all().count() - distinct_builds = Build.objects.values('id').distinct().count() - self.assertEqual(distinct_builds, all_builds, msg = 'Build name is not unique') + all_builds = Build.objects.all().count() + distinct_builds = Build.objects.values('id').distinct().count() + self.assertEqual(distinct_builds, all_builds, msg = 'Build name is not unique') # Check if build coocker log path is unique - tc_id=819 @testcase(819) def test_Build_Unique_Cooker_Log_Path(self): - distinct_path = Build.objects.values('cooker_log_path').distinct().count() - total_builds = Build.objects.values('id').count() - self.assertEqual(distinct_path, total_builds, msg = 'Build coocker log path is not unique') + distinct_path = Build.objects.values('cooker_log_path').distinct().count() + total_builds = Build.objects.values('id').count() + self.assertEqual(distinct_path, total_builds, msg = 'Build coocker log path is not unique') # Check if the number of errors matches the number of orm_logmessage.level entries with value 2 - tc_id=820 @testcase(820) def test_Build_Errors_No(self): - builds = Build.objects.values('id', 'errors_no') - cnt_err = [] - for build in builds: - log_mess_err_no = LogMessage.objects.filter(build = build['id'], level = 2).count() - if (build['errors_no'] != log_mess_err_no): - cnt_err.append(build['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' % cnt_err) + builds = Build.objects.values('id', 'errors_no') + cnt_err = [] + for build in builds: + log_mess_err_no = LogMessage.objects.filter(build = build['id'], level = 2).count() + if (build['errors_no'] != log_mess_err_no): + cnt_err.append(build['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' % cnt_err) # Check if the number of warnings matches the number of orm_logmessage.level entries with value 1 - tc=821 @testcase(821) def test_Build_Warnings_No(self): - builds = Build.objects.values('id', 'warnings_no') - cnt_err = [] - for build in builds: - log_mess_warn_no = LogMessage.objects.filter(build = build['id'], level = 1).count() - if (build['warnings_no'] != log_mess_warn_no): - cnt_err.append(build['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' % cnt_err) + builds = Build.objects.values('id', 'warnings_no') + cnt_err = [] + for build in builds: + log_mess_warn_no = LogMessage.objects.filter(build = build['id'], level = 1).count() + if (build['warnings_no'] != log_mess_warn_no): + cnt_err.append(build['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' % cnt_err) # Check if the build succeeded then the errors_no is 0 - tc_id=822 @testcase(822) def test_Build_Suceeded_Errors_No(self): - builds = Build.objects.filter(outcome = 0).values('id', 'errors_no') - cnt_err = [] - for build in builds: - if (build['errors_no'] != 0): - cnt_err.append(build['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' % cnt_err) + builds = Build.objects.filter(outcome = 0).values('id', 'errors_no') + cnt_err = [] + for build in builds: + if (build['errors_no'] != 0): + cnt_err.append(build['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' % cnt_err) # Check if task order is unique for one build - tc=824 - @testcase(824) + @testcase(824) def test_Task_Unique_Order(self): - builds = Build.objects.values('id') - cnt_err = [] - for build in builds: - total_task_order = Task.objects.filter(build = build['id']).values('order').count() - distinct_task_order = Task.objects.filter(build = build['id']).values('order').distinct().count() - if (total_task_order != distinct_task_order): - cnt_err.append(build['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' % cnt_err) + builds = Build.objects.values('id') + cnt_err = [] + for build in builds: + total_task_order = Task.objects.filter(build = build['id']).values('order').count() + distinct_task_order = Task.objects.filter(build = build['id']).values('order').distinct().count() + if (total_task_order != distinct_task_order): + cnt_err.append(build['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' % cnt_err) # Check task order sequence for one build - tc=825 @testcase(825) def test_Task_Order_Sequence(self): - builds = builds = Build.objects.values('id') - cnt_err = [] - for build in builds: - tasks = Task.objects.filter(Q(build = build['id']), ~Q(order = None), ~Q(task_name__contains = '_setscene')).values('id', 'order').order_by("order") - cnt_tasks = 0 - for task in tasks: - cnt_tasks += 1 - if (task['order'] != cnt_tasks): - cnt_err.append(task['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err) + builds = builds = Build.objects.values('id') + cnt_err = [] + for build in builds: + tasks = Task.objects.filter(Q(build = build['id']), ~Q(order = None), ~Q(task_name__contains = '_setscene')).values('id', 'order').order_by("order") + cnt_tasks = 0 + for task in tasks: + cnt_tasks += 1 + if (task['order'] != cnt_tasks): + cnt_err.append(task['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err) # Check if disk_io matches the difference between EndTimeIO and StartTimeIO in build stats - tc=828 ### this needs to be updated ### @@ -110,336 +110,336 @@ class Toaster_DB_Tests(ToasterSetup): # Check if outcome = 2 (SSTATE) then sstate_result must be 3 (RESTORED) - tc=832 @testcase(832) def test_Task_If_Outcome_2_Sstate_Result_Must_Be_3(self): - tasks = Task.objects.filter(outcome = 2).values('id', 'sstate_result') - cnt_err = [] - for task in tasks: - if (row['sstate_result'] != 3): - cnt_err.append(task['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err) + tasks = Task.objects.filter(outcome = 2).values('id', 'sstate_result') + cnt_err = [] + for task in tasks: + if (row['sstate_result'] != 3): + cnt_err.append(task['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err) # Check if outcome = 1 (COVERED) or 3 (EXISTING) then sstate_result must be 0 (SSTATE_NA) - tc=833 @testcase(833) def test_Task_If_Outcome_1_3_Sstate_Result_Must_Be_0(self): - tasks = Task.objects.filter(outcome__in = (1, 3)).values('id', 'sstate_result') - cnt_err = [] - for task in tasks: - if (task['sstate_result'] != 0): - cnt_err.append(task['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err) + tasks = Task.objects.filter(outcome__in = (1, 3)).values('id', 'sstate_result') + cnt_err = [] + for task in tasks: + if (task['sstate_result'] != 0): + cnt_err.append(task['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err) # Check if outcome is 0 (SUCCESS) or 4 (FAILED) then sstate_result must be 0 (NA), 1 (MISS) or 2 (FAILED) - tc=834 @testcase(834) def test_Task_If_Outcome_0_4_Sstate_Result_Must_Be_0_1_2(self): - tasks = Task.objects.filter(outcome__in = (0, 4)).values('id', 'sstate_result') - cnt_err = [] - for task in tasks: - if (task['sstate_result'] not in [0, 1, 2]): - cnt_err.append(task['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err) + tasks = Task.objects.filter(outcome__in = (0, 4)).values('id', 'sstate_result') + cnt_err = [] + for task in tasks: + if (task['sstate_result'] not in [0, 1, 2]): + cnt_err.append(task['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err) # Check if task_executed = TRUE (1), script_type must be 0 (CODING_NA), 2 (CODING_PYTHON), 3 (CODING_SHELL) - tc=891 @testcase(891) def test_Task_If_Task_Executed_True_Script_Type_0_2_3(self): - tasks = Task.objects.filter(task_executed = 1).values('id', 'script_type') - cnt_err = [] - for task in tasks: - if (task['script_type'] not in [0, 2, 3]): - cnt_err.append(task['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err) + tasks = Task.objects.filter(task_executed = 1).values('id', 'script_type') + cnt_err = [] + for task in tasks: + if (task['script_type'] not in [0, 2, 3]): + cnt_err.append(task['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err) # Check if task_executed = TRUE (1), outcome must be 0 (SUCCESS) or 4 (FAILED) - tc=836 @testcase(836) def test_Task_If_Task_Executed_True_Outcome_0_4(self): - tasks = Task.objects.filter(task_executed = 1).values('id', 'outcome') - cnt_err = [] - for task in tasks: - if (task['outcome'] not in [0, 4]): - cnt_err.append(task['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err) + tasks = Task.objects.filter(task_executed = 1).values('id', 'outcome') + cnt_err = [] + for task in tasks: + if (task['outcome'] not in [0, 4]): + cnt_err.append(task['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err) # Check if task_executed = FALSE (0), script_type must be 0 - tc=890 @testcase(890) def test_Task_If_Task_Executed_False_Script_Type_0(self): - tasks = Task.objects.filter(task_executed = 0).values('id', 'script_type') - cnt_err = [] - for task in tasks: - if (task['script_type'] != 0): - cnt_err.append(task['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err) + tasks = Task.objects.filter(task_executed = 0).values('id', 'script_type') + cnt_err = [] + for task in tasks: + if (task['script_type'] != 0): + cnt_err.append(task['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err) # Check if task_executed = FALSE (0) and build outcome = SUCCEEDED (0), task outcome must be 1 (COVERED), 2 (CACHED), 3 (PREBUILT), 5 (EMPTY) - tc=837 @testcase(837) def test_Task_If_Task_Executed_False_Outcome_1_2_3_5(self): - builds = Build.objects.filter(outcome = 0).values('id') - cnt_err = [] - for build in builds: - tasks = Task.objects.filter(build = build['id'], task_executed = 0).values('id', 'outcome') - for task in tasks: - if (task['outcome'] not in [1, 2, 3, 5]): - cnt_err.append(task['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err) + builds = Build.objects.filter(outcome = 0).values('id') + cnt_err = [] + for build in builds: + tasks = Task.objects.filter(build = build['id'], task_executed = 0).values('id', 'outcome') + for task in tasks: + if (task['outcome'] not in [1, 2, 3, 5]): + cnt_err.append(task['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' % cnt_err) # Key verification - tc=888 @testcase(888) def test_Target_Installed_Package(self): - rows = Target_Installed_Package.objects.values('id', 'target_id', 'package_id') - cnt_err = [] - for row in rows: - target = Target.objects.filter(id = row['target_id']).values('id') - package = Package.objects.filter(id = row['package_id']).values('id') - if (not target or not package): - cnt_err.append(row['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for target installed package id: %s' % cnt_err) + rows = Target_Installed_Package.objects.values('id', 'target_id', 'package_id') + cnt_err = [] + for row in rows: + target = Target.objects.filter(id = row['target_id']).values('id') + package = Package.objects.filter(id = row['package_id']).values('id') + if (not target or not package): + cnt_err.append(row['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for target installed package id: %s' % cnt_err) # Key verification - tc=889 @testcase(889) def test_Task_Dependency(self): - rows = Task_Dependency.objects.values('id', 'task_id', 'depends_on_id') - cnt_err = [] - for row in rows: - task_id = Task.objects.filter(id = row['task_id']).values('id') - depends_on_id = Task.objects.filter(id = row['depends_on_id']).values('id') - if (not task_id or not depends_on_id): - cnt_err.append(row['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for task dependency id: %s' % cnt_err) + rows = Task_Dependency.objects.values('id', 'task_id', 'depends_on_id') + cnt_err = [] + for row in rows: + task_id = Task.objects.filter(id = row['task_id']).values('id') + depends_on_id = Task.objects.filter(id = row['depends_on_id']).values('id') + if (not task_id or not depends_on_id): + cnt_err.append(row['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for task dependency id: %s' % cnt_err) # Check if build target file_name is populated only if is_image=true AND orm_build.outcome=0 then if the file exists and its size matches the file_size value ### Need to add the tc in the test run @testcase(1037) def test_Target_File_Name_Populated(self): - builds = Build.objects.filter(outcome = 0).values('id') - for build in builds: - targets = Target.objects.filter(build_id = build['id'], is_image = 1).values('id') - for target in targets: - target_files = Target_Image_File.objects.filter(target_id = target['id']).values('id', 'file_name', 'file_size') - cnt_err = [] - for file_info in target_files: - target_id = file_info['id'] - target_file_name = file_info['file_name'] - target_file_size = file_info['file_size'] - if (not target_file_name or not target_file_size): - cnt_err.append(target_id) - else: - if (not os.path.exists(target_file_name)): - cnt_err.append(target_id) - else: - if (os.path.getsize(target_file_name) != target_file_size): - cnt_err.append(target_id) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for target image file id: %s' % cnt_err) + builds = Build.objects.filter(outcome = 0).values('id') + for build in builds: + targets = Target.objects.filter(build_id = build['id'], is_image = 1).values('id') + for target in targets: + target_files = Target_Image_File.objects.filter(target_id = target['id']).values('id', 'file_name', 'file_size') + cnt_err = [] + for file_info in target_files: + target_id = file_info['id'] + target_file_name = file_info['file_name'] + target_file_size = file_info['file_size'] + if (not target_file_name or not target_file_size): + cnt_err.append(target_id) + else: + if (not os.path.exists(target_file_name)): + cnt_err.append(target_id) + else: + if (os.path.getsize(target_file_name) != target_file_size): + cnt_err.append(target_id) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for target image file id: %s' % cnt_err) # Key verification - tc=884 @testcase(884) def test_Package_Dependency(self): - cnt_err = [] - deps = Package_Dependency.objects.values('id', 'package_id', 'depends_on_id') - for dep in deps: - if (dep['package_id'] == dep['depends_on_id']): - cnt_err.append(dep['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for package dependency id: %s' % cnt_err) + cnt_err = [] + deps = Package_Dependency.objects.values('id', 'package_id', 'depends_on_id') + for dep in deps: + if (dep['package_id'] == dep['depends_on_id']): + cnt_err.append(dep['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for package dependency id: %s' % cnt_err) # Check if recipe name does not start with a number (0-9) - tc=838 @testcase(838) def test_Recipe_Name(self): - recipes = Recipe.objects.values('id', 'name') - cnt_err = [] - for recipe in recipes: - if (recipe['name'][0].isdigit() is True): - cnt_err.append(recipe['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err) + recipes = Recipe.objects.values('id', 'name') + cnt_err = [] + for recipe in recipes: + if (recipe['name'][0].isdigit() is True): + cnt_err.append(recipe['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err) # Check if recipe section matches the content of the SECTION variable (if set) in file_path - tc=839 @testcase(839) def test_Recipe_DB_Section_Match_Recipe_File_Section(self): - recipes = Recipe.objects.values('id', 'section', 'file_path') - cnt_err = [] - for recipe in recipes: - file_path = self.fix_file_path(recipe['file_path']) - file_exists = os.path.isfile(file_path) - if (not file_path or (file_exists is False)): - cnt_err.append(recipe['id']) - else: - file_section = self.recipe_parse(file_path, "SECTION = ") - db_section = recipe['section'] - if file_section: - if (db_section != file_section): - cnt_err.append(recipe['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err) + recipes = Recipe.objects.values('id', 'section', 'file_path') + cnt_err = [] + for recipe in recipes: + file_path = self.fix_file_path(recipe['file_path']) + file_exists = os.path.isfile(file_path) + if (not file_path or (file_exists is False)): + cnt_err.append(recipe['id']) + else: + file_section = self.recipe_parse(file_path, "SECTION = ") + db_section = recipe['section'] + if file_section: + if (db_section != file_section): + cnt_err.append(recipe['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err) # Check if recipe license matches the content of the LICENSE variable (if set) in file_path - tc=840 @testcase(840) def test_Recipe_DB_License_Match_Recipe_File_License(self): - recipes = Recipe.objects.values('id', 'license', 'file_path') - cnt_err = [] - for recipe in recipes: - file_path = self.fix_file_path(recipe['file_path']) - file_exists = os.path.isfile(file_path) - if (not file_path or (file_exists is False)): - cnt_err.append(recipe['id']) - else: - file_license = self.recipe_parse(file_path, "LICENSE = ") - db_license = recipe['license'] - if file_license: - if (db_license != file_license): - cnt_err.append(recipe['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err) + recipes = Recipe.objects.values('id', 'license', 'file_path') + cnt_err = [] + for recipe in recipes: + file_path = self.fix_file_path(recipe['file_path']) + file_exists = os.path.isfile(file_path) + if (not file_path or (file_exists is False)): + cnt_err.append(recipe['id']) + else: + file_license = self.recipe_parse(file_path, "LICENSE = ") + db_license = recipe['license'] + if file_license: + if (db_license != file_license): + cnt_err.append(recipe['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err) # Check if recipe homepage matches the content of the HOMEPAGE variable (if set) in file_path - tc=841 @testcase(841) def test_Recipe_DB_Homepage_Match_Recipe_File_Homepage(self): - recipes = Recipe.objects.values('id', 'homepage', 'file_path') - cnt_err = [] - for recipe in recipes: - file_path = self.fix_file_path(recipe['file_path']) - file_exists = os.path.isfile(file_path) - if (not file_path or (file_exists is False)): - cnt_err.append(recipe['id']) - else: - file_homepage = self.recipe_parse(file_path, "HOMEPAGE = ") - db_homepage = recipe['homepage'] - if file_homepage: - if (db_homepage != file_homepage): - cnt_err.append(recipe['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err) + recipes = Recipe.objects.values('id', 'homepage', 'file_path') + cnt_err = [] + for recipe in recipes: + file_path = self.fix_file_path(recipe['file_path']) + file_exists = os.path.isfile(file_path) + if (not file_path or (file_exists is False)): + cnt_err.append(recipe['id']) + else: + file_homepage = self.recipe_parse(file_path, "HOMEPAGE = ") + db_homepage = recipe['homepage'] + if file_homepage: + if (db_homepage != file_homepage): + cnt_err.append(recipe['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err) # Check if recipe bugtracker matches the content of the BUGTRACKER variable (if set) in file_path - tc=842 @testcase(842) def test_Recipe_DB_Bugtracker_Match_Recipe_File_Bugtracker(self): - recipes = Recipe.objects.values('id', 'bugtracker', 'file_path') - cnt_err = [] - for recipe in recipes: - file_path = self.fix_file_path(recipe['file_path']) - file_exists = os.path.isfile(file_path) - if (not file_path or (file_exists is False)): - cnt_err.append(recipe['id']) - else: - file_bugtracker = self.recipe_parse(file_path, "BUGTRACKER = ") - db_bugtracker = recipe['bugtracker'] - if file_bugtracker: - if (db_bugtracker != file_bugtracker): - cnt_err.append(recipe['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err) + recipes = Recipe.objects.values('id', 'bugtracker', 'file_path') + cnt_err = [] + for recipe in recipes: + file_path = self.fix_file_path(recipe['file_path']) + file_exists = os.path.isfile(file_path) + if (not file_path or (file_exists is False)): + cnt_err.append(recipe['id']) + else: + file_bugtracker = self.recipe_parse(file_path, "BUGTRACKER = ") + db_bugtracker = recipe['bugtracker'] + if file_bugtracker: + if (db_bugtracker != file_bugtracker): + cnt_err.append(recipe['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe id: %s' % cnt_err) # Recipe key verification, recipe name does not depends on a recipe having the same name - tc=883 @testcase(883) def test_Recipe_Dependency(self): - deps = Recipe_Dependency.objects.values('id', 'recipe_id', 'depends_on_id') - cnt_err = [] - for dep in deps: - if (not dep['recipe_id'] or not dep['depends_on_id']): - cnt_err.append(dep['id']) - else: - name = Recipe.objects.filter(id = dep['recipe_id']).values('name') - dep_name = Recipe.objects.filter(id = dep['depends_on_id']).values('name') - if (name == dep_name): - cnt_err.append(dep['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe dependency id: %s' % cnt_err) + deps = Recipe_Dependency.objects.values('id', 'recipe_id', 'depends_on_id') + cnt_err = [] + for dep in deps: + if (not dep['recipe_id'] or not dep['depends_on_id']): + cnt_err.append(dep['id']) + else: + name = Recipe.objects.filter(id = dep['recipe_id']).values('name') + dep_name = Recipe.objects.filter(id = dep['depends_on_id']).values('name') + if (name == dep_name): + cnt_err.append(dep['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for recipe dependency id: %s' % cnt_err) # Check if package name does not start with a number (0-9) - tc=846 @testcase(846) def test_Package_Name_For_Number(self): - packages = Package.objects.filter(~Q(size = -1)).values('id', 'name') - cnt_err = [] - for package in packages: - if (package['name'][0].isdigit() is True): - cnt_err.append(package['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err) + packages = Package.objects.filter(~Q(size = -1)).values('id', 'name') + cnt_err = [] + for package in packages: + if (package['name'][0].isdigit() is True): + cnt_err.append(package['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err) # Check if package version starts with a number (0-9) - tc=847 @testcase(847) def test_Package_Version_Starts_With_Number(self): - packages = Package.objects.filter(~Q(size = -1)).values('id', 'version') - cnt_err = [] - for package in packages: - if (package['version'][0].isdigit() is False): - cnt_err.append(package['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err) + packages = Package.objects.filter(~Q(size = -1)).values('id', 'version') + cnt_err = [] + for package in packages: + if (package['version'][0].isdigit() is False): + cnt_err.append(package['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err) # Check if package revision starts with 'r' - tc=848 @testcase(848) def test_Package_Revision_Starts_With_r(self): - packages = Package.objects.filter(~Q(size = -1)).values('id', 'revision') - cnt_err = [] - for package in packages: - if (package['revision'][0].startswith("r") is False): - cnt_err.append(package['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err) + packages = Package.objects.filter(~Q(size = -1)).values('id', 'revision') + cnt_err = [] + for package in packages: + if (package['revision'][0].startswith("r") is False): + cnt_err.append(package['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err) # Check the validity of the package build_id ### TC must be added in test run @testcase(1038) def test_Package_Build_Id(self): - packages = Package.objects.filter(~Q(size = -1)).values('id', 'build_id') - cnt_err = [] - for package in packages: - build_id = Build.objects.filter(id = package['build_id']).values('id') - if (not build_id): - cnt_err.append(package['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err) + packages = Package.objects.filter(~Q(size = -1)).values('id', 'build_id') + cnt_err = [] + for package in packages: + build_id = Build.objects.filter(id = package['build_id']).values('id') + if (not build_id): + cnt_err.append(package['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err) # Check the validity of package recipe_id ### TC must be added in test run @testcase(1039) def test_Package_Recipe_Id(self): - packages = Package.objects.filter(~Q(size = -1)).values('id', 'recipe_id') - cnt_err = [] - for package in packages: - recipe_id = Recipe.objects.filter(id = package['recipe_id']).values('id') - if (not recipe_id): - cnt_err.append(package['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err) + packages = Package.objects.filter(~Q(size = -1)).values('id', 'recipe_id') + cnt_err = [] + for package in packages: + recipe_id = Recipe.objects.filter(id = package['recipe_id']).values('id') + if (not recipe_id): + cnt_err.append(package['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err) # Check if package installed_size field is not null ### TC must be aded in test run @testcase(1040) def test_Package_Installed_Size_Not_NULL(self): - packages = Package.objects.filter(installed_size__isnull = True).values('id') - cnt_err = [] - for package in packages: - cnt_err.append(package['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err) + packages = Package.objects.filter(installed_size__isnull = True).values('id') + cnt_err = [] + for package in packages: + cnt_err.append(package['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for package id: %s' % cnt_err) # Check if all layers requests return exit code is 200 - tc=843 @testcase(843) def test_Layers_Requests_Exit_Code(self): - layers = Layer.objects.values('id', 'layer_index_url') - cnt_err = [] - for layer in layers: - resp = urllib.urlopen(layer['layer_index_url']) - if (resp.getcode() != 200): - cnt_err.append(layer['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for layer id: %s' % cnt_err) + layers = Layer.objects.values('id', 'layer_index_url') + cnt_err = [] + for layer in layers: + resp = urllib.urlopen(layer['layer_index_url']) + if (resp.getcode() != 200): + cnt_err.append(layer['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for layer id: %s' % cnt_err) # Check if the output of bitbake-layers show_layers matches the info from database - tc=895 @testcase(895) def test_Layers_Show_Layers(self): - layers = Layer.objects.values('id', 'name', 'local_path') - cmd = commands.getoutput('bitbake-layers show_layers') - cnt_err = [] - for layer in layers: - if (layer['name'] or layer['local_path']) not in cmd: - cnt_err.append(layer['id']) - self.assertEqual(len(cnt_err), 0, msg = 'Errors for layer id: %s' % cnt_err) + layers = Layer.objects.values('id', 'name', 'local_path') + cmd = commands.getoutput('bitbake-layers show_layers') + cnt_err = [] + for layer in layers: + if (layer['name'] or layer['local_path']) not in cmd: + cnt_err.append(layer['id']) + self.assertEqual(len(cnt_err), 0, msg = 'Errors for layer id: %s' % cnt_err) # Check if django server starts regardless of the timezone set on the machine - tc=905 @testcase(905) def test_Start_Django_Timezone(self): current_path = os.getcwd() - zonefilelist = [] + zonefilelist = [] ZONEINFOPATH = '/usr/share/zoneinfo/' - os.chdir("../bitbake/lib/toaster/") - cnt_err = 0 - for filename in os.listdir(ZONEINFOPATH): - if os.path.isfile(os.path.join(ZONEINFOPATH, filename)): - zonefilelist.append(filename) - for k in range(len(zonefilelist)): - if k <= 5: - files = zonefilelist[k] - os.system("export TZ="+str(files)+"; python manage.py runserver > /dev/null 2>&1 &") - time.sleep(3) - pid = subprocess.check_output("ps aux | grep '[/u]sr/bin/python manage.py runserver' | awk '{print $2}'", shell = True) - if pid: - os.system("kill -9 "+str(pid)) - else: - cnt_err.append(zonefilelist[k]) - self.assertEqual(cnt_err, 0, msg = 'Errors django server does not start with timezone: %s' % cnt_err) + os.chdir("../bitbake/lib/toaster/") + cnt_err = 0 + for filename in os.listdir(ZONEINFOPATH): + if os.path.isfile(os.path.join(ZONEINFOPATH, filename)): + zonefilelist.append(filename) + for k in range(len(zonefilelist)): + if k <= 5: + files = zonefilelist[k] + os.system("export TZ="+str(files)+"; python manage.py runserver > /dev/null 2>&1 &") + time.sleep(3) + pid = subprocess.check_output("ps aux | grep '[/u]sr/bin/python manage.py runserver' | awk '{print $2}'", shell = True) + if pid: + os.system("kill -9 "+str(pid)) + else: + cnt_err.append(zonefilelist[k]) + self.assertEqual(cnt_err, 0, msg = 'Errors django server does not start with timezone: %s' % cnt_err) os.chdir(current_path) diff --git a/meta/lib/oeqa/selftest/bblayers.py b/meta/lib/oeqa/selftest/bblayers.py index 1ead8e8671..5b046d06e1 100644 --- a/meta/lib/oeqa/selftest/bblayers.py +++ b/meta/lib/oeqa/selftest/bblayers.py @@ -18,26 +18,43 @@ class BitbakeLayers(oeSelfTest): @testcase(83) def test_bitbakelayers_showlayers(self): - result = runCmd('bitbake-layers show_layers') + result = runCmd('bitbake-layers show-layers') self.assertTrue('meta-selftest' in result.output) @testcase(93) def test_bitbakelayers_showappends(self): - result = runCmd('bitbake-layers show_appends') + result = runCmd('bitbake-layers show-appends') self.assertTrue('xcursor-transparent-theme_0.1.1.bbappend' in result.output, msg='xcursor-transparent-theme_0.1.1.bbappend file was not recognised') @testcase(90) def test_bitbakelayers_showoverlayed(self): - result = runCmd('bitbake-layers show_overlayed') - self.assertTrue('aspell' in result.output, msg='xcursor-transparent-theme_0.1.1.bbappend file was not recognised') + result = runCmd('bitbake-layers show-overlayed') + self.assertTrue('aspell' in result.output, msg='aspell overlayed recipe was not recognised') @testcase(95) def test_bitbakelayers_flatten(self): - self.assertFalse(os.path.isdir(os.path.join(self.builddir, 'test'))) - result = runCmd('bitbake-layers flatten test') - bb_file = os.path.join(self.builddir, 'test/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb') + testoutdir = os.path.join(self.builddir, 'test_bitbakelayers_flatten') + self.assertFalse(os.path.isdir(testoutdir)) + self.track_for_cleanup(testoutdir) + result = runCmd('bitbake-layers flatten %s' % testoutdir) + bb_file = os.path.join(testoutdir, 'recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb') self.assertTrue(os.path.isfile(bb_file)) contents = ftools.read_file(bb_file) find_in_contents = re.search("##### bbappended from meta-selftest #####\n(.*\n)*include test_recipe.inc", contents) - shutil.rmtree(os.path.join(self.builddir, 'test')) self.assertTrue(find_in_contents) + + def test_bitbakelayers_add_remove(self): + result = runCmd('bitbake-layers show-layers') + self.assertNotIn('meta-skeleton', result.output, 'This test cannot run with meta-skeleton in bblayers.conf') + result = runCmd('bitbake-layers add-layer ../meta-skeleton') + result = runCmd('bitbake-layers show-layers') + self.assertIn('meta-skeleton', result.output) + result = runCmd('bitbake-layers remove-layer ../meta-skeleton') + result = runCmd('bitbake-layers show-layers') + self.assertNotIn('meta-skeleton', result.output) + result = runCmd('bitbake-layers add-layer ../meta-skeleton') + result = runCmd('bitbake-layers show-layers') + self.assertIn('meta-skeleton', result.output) + result = runCmd('bitbake-layers remove-layer */meta-skeleton') + result = runCmd('bitbake-layers show-layers') + self.assertNotIn('meta-skeleton', result.output) diff --git a/meta/lib/oeqa/selftest/bbtests.py b/meta/lib/oeqa/selftest/bbtests.py index 68f97bd8e3..b301d8f819 100644 --- a/meta/lib/oeqa/selftest/bbtests.py +++ b/meta/lib/oeqa/selftest/bbtests.py @@ -27,7 +27,7 @@ class BitbakeTests(oeSelfTest): def test_event_handler(self): self.write_config("INHERIT += \"test_events\"") result = bitbake('m4-native') - find_build_started = re.search("NOTE: Test for bb\.event\.BuildStarted(\n.*)*NOTE: Preparing runqueue", result.output) + find_build_started = re.search("NOTE: Test for bb\.event\.BuildStarted(\n.*)*NOTE: Preparing RunQueue", result.output) find_build_completed = re.search("Tasks Summary:.*(\n.*)*NOTE: Test for bb\.event\.BuildCompleted", result.output) self.assertTrue(find_build_started, msg = "Match failed in:\n%s" % result.output) self.assertTrue(find_build_completed, msg = "Match failed in:\n%s" % result.output) @@ -71,6 +71,7 @@ class BitbakeTests(oeSelfTest): @testcase(163) def test_force_task(self): bitbake('m4-native') + self.add_command_to_tearDown('bitbake -c clean m4-native') result = bitbake('-C compile m4-native') look_for_tasks = ['do_compile', 'do_install', 'do_populate_sysroot'] for task in look_for_tasks: @@ -119,60 +120,71 @@ class BitbakeTests(oeSelfTest): @testcase(1028) def test_environment(self): - self.append_config("TEST_ENV=\"localconf\"") - result = runCmd('bitbake -e | grep TEST_ENV=') - self.assertTrue('localconf' in result.output) - self.remove_config("TEST_ENV=\"localconf\"") + self.append_config("TEST_ENV=\"localconf\"") + result = runCmd('bitbake -e | grep TEST_ENV=') + self.assertTrue('localconf' in result.output) + self.remove_config("TEST_ENV=\"localconf\"") @testcase(1029) def test_dry_run(self): - result = runCmd('bitbake -n m4-native') - self.assertEqual(0, result.status) + result = runCmd('bitbake -n m4-native') + self.assertEqual(0, result.status) @testcase(1030) def test_just_parse(self): - result = runCmd('bitbake -p') - self.assertEqual(0, result.status) + result = runCmd('bitbake -p') + self.assertEqual(0, result.status) @testcase(1031) def test_version(self): - result = runCmd('bitbake -s | grep wget') - find = re.search("wget *:([0-9a-zA-Z\.\-]+)", result.output) - self.assertTrue(find) + result = runCmd('bitbake -s | grep wget') + find = re.search("wget *:([0-9a-zA-Z\.\-]+)", result.output) + self.assertTrue(find) @testcase(1032) def test_prefile(self): - preconf = os.path.join(self.builddir, 'conf/prefile.conf') - self.track_for_cleanup(preconf) - ftools.write_file(preconf ,"TEST_PREFILE=\"prefile\"") - result = runCmd('bitbake -r conf/prefile.conf -e | grep TEST_PREFILE=') - self.assertTrue('prefile' in result.output) - self.append_config("TEST_PREFILE=\"localconf\"") - result = runCmd('bitbake -r conf/prefile.conf -e | grep TEST_PREFILE=') - self.assertTrue('localconf' in result.output) - self.remove_config("TEST_PREFILE=\"localconf\"") + preconf = os.path.join(self.builddir, 'conf/prefile.conf') + self.track_for_cleanup(preconf) + ftools.write_file(preconf ,"TEST_PREFILE=\"prefile\"") + result = runCmd('bitbake -r conf/prefile.conf -e | grep TEST_PREFILE=') + self.assertTrue('prefile' in result.output) + self.append_config("TEST_PREFILE=\"localconf\"") + result = runCmd('bitbake -r conf/prefile.conf -e | grep TEST_PREFILE=') + self.assertTrue('localconf' in result.output) + self.remove_config("TEST_PREFILE=\"localconf\"") @testcase(1033) def test_postfile(self): - postconf = os.path.join(self.builddir, 'conf/postfile.conf') - self.track_for_cleanup(postconf) - ftools.write_file(postconf , "TEST_POSTFILE=\"postfile\"") - self.append_config("TEST_POSTFILE=\"localconf\"") - result = runCmd('bitbake -R conf/postfile.conf -e | grep TEST_POSTFILE=') - self.assertTrue('postfile' in result.output) - self.remove_config("TEST_POSTFILE=\"localconf\"") + postconf = os.path.join(self.builddir, 'conf/postfile.conf') + self.track_for_cleanup(postconf) + ftools.write_file(postconf , "TEST_POSTFILE=\"postfile\"") + self.append_config("TEST_POSTFILE=\"localconf\"") + result = runCmd('bitbake -R conf/postfile.conf -e | grep TEST_POSTFILE=') + self.assertTrue('postfile' in result.output) + self.remove_config("TEST_POSTFILE=\"localconf\"") @testcase(1034) def test_checkuri(self): - result = runCmd('bitbake -c checkuri m4') - self.assertEqual(0, result.status) + result = runCmd('bitbake -c checkuri m4') + self.assertEqual(0, result.status) @testcase(1035) def test_continue(self): - self.write_recipeinc('man',"\ndo_fail_task () {\nexit 1 \n}\n\naddtask do_fail_task before do_fetch\n" ) - runCmd('bitbake -c cleanall man xcursor-transparent-theme') - result = runCmd('bitbake man xcursor-transparent-theme -k', ignore_status=True) - errorpos = result.output.find('ERROR: Function failed: do_fail_task') - manver = re.search("NOTE: recipe xcursor-transparent-theme-(.*?): task do_unpack: Started", result.output) - continuepos = result.output.find('NOTE: recipe xcursor-transparent-theme-%s: task do_unpack: Started' % manver.group(1)) - self.assertLess(errorpos,continuepos) + self.write_recipeinc('man',"\ndo_fail_task () {\nexit 1 \n}\n\naddtask do_fail_task before do_fetch\n" ) + runCmd('bitbake -c cleanall man xcursor-transparent-theme') + result = runCmd('bitbake man xcursor-transparent-theme -k', ignore_status=True) + errorpos = result.output.find('ERROR: Function failed: do_fail_task') + manver = re.search("NOTE: recipe xcursor-transparent-theme-(.*?): task do_unpack: Started", result.output) + continuepos = result.output.find('NOTE: recipe xcursor-transparent-theme-%s: task do_unpack: Started' % manver.group(1)) + self.assertLess(errorpos,continuepos) + + @testcase(1119) + def test_non_gplv3(self): + data = 'INCOMPATIBLE_LICENSE = "GPLv3"' + conf = os.path.join(self.builddir, 'conf/local.conf') + ftools.append_file(conf ,data) + result = bitbake('readline', ignore_status=True) + self.assertEqual(result.status, 0) + self.assertFalse(os.path.isfile(os.path.join(self.builddir, 'tmp/deploy/licenses/readline/generic_GPLv3'))) + self.assertTrue(os.path.isfile(os.path.join(self.builddir, 'tmp/deploy/licenses/readline/generic_GPLv2'))) + ftools.remove_from_file(conf ,data)
\ No newline at end of file diff --git a/meta/lib/oeqa/selftest/buildoptions.py b/meta/lib/oeqa/selftest/buildoptions.py index a250cae0e1..926ffe9993 100644 --- a/meta/lib/oeqa/selftest/buildoptions.py +++ b/meta/lib/oeqa/selftest/buildoptions.py @@ -13,16 +13,22 @@ class ImageOptionsTests(oeSelfTest): @testcase(761) def test_incremental_image_generation(self): + image_pkgtype = get_bb_var("IMAGE_PKGTYPE") + if image_pkgtype != 'rpm': + self.skipTest('Not using RPM as main package format') bitbake("-c cleanall core-image-minimal") self.write_config('INC_RPM_IMAGE_GEN = "1"') self.append_config('IMAGE_FEATURES += "ssh-server-openssh"') bitbake("core-image-minimal") - res = runCmd("grep 'Installing openssh-sshd' %s" % (os.path.join(get_bb_var("WORKDIR", "core-image-minimal"), "temp/log.do_rootfs")), ignore_status=True) + log_data_file = os.path.join(get_bb_var("WORKDIR", "core-image-minimal"), "temp/log.do_rootfs") + log_data_created = ftools.read_file(log_data_file) + incremental_created = re.search("NOTE: load old install solution for incremental install\nNOTE: old install solution not exist\nNOTE: creating new install solution for incremental install(\n.*)*NOTE: Installing the following packages:.*packagegroup-core-ssh-openssh", log_data_created) self.remove_config('IMAGE_FEATURES += "ssh-server-openssh"') - self.assertEqual(0, res.status, msg="No match for openssh-sshd in log.do_rootfs") + self.assertTrue(incremental_created, msg = "Match failed in:\n%s" % log_data_created) bitbake("core-image-minimal") - res = runCmd("grep 'Removing openssh-sshd' %s" %(os.path.join(get_bb_var("WORKDIR", "core-image-minimal"), "temp/log.do_rootfs")),ignore_status=True) - self.assertEqual(0, res.status, msg="openssh-sshd was not removed from image") + log_data_removed = ftools.read_file(log_data_file) + incremental_removed = re.search("NOTE: load old install solution for incremental install\nNOTE: creating new install solution for incremental install(\n.*)*NOTE: incremental removed:.*openssh-sshd-.*", log_data_removed) + self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed) @testcase(925) def test_rm_old_image(self): diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py new file mode 100644 index 0000000000..dc1cf21064 --- /dev/null +++ b/meta/lib/oeqa/selftest/devtool.py @@ -0,0 +1,527 @@ +import unittest +import os +import logging +import re +import shutil +import tempfile +import glob + +import oeqa.utils.ftools as ftools +from oeqa.selftest.base import oeSelfTest +from oeqa.utils.commands import runCmd, bitbake, get_bb_var +from oeqa.utils.decorators import testcase + +class DevtoolTests(oeSelfTest): + + def test_create_workspace(self): + # Check preconditions + workspacedir = os.path.join(self.builddir, 'workspace') + self.assertTrue(not os.path.exists(workspacedir), 'This test cannot be run with a workspace directory under the build directory') + result = runCmd('bitbake-layers show-layers') + self.assertTrue('/workspace' not in result.output, 'This test cannot be run with a workspace layer in bblayers.conf') + # Try creating a workspace layer with a specific path + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + result = runCmd('devtool create-workspace %s' % tempdir) + self.assertTrue(os.path.isfile(os.path.join(tempdir, 'conf', 'layer.conf'))) + result = runCmd('bitbake-layers show-layers') + self.assertIn(tempdir, result.output) + # Try creating a workspace layer with the default path + self.track_for_cleanup(workspacedir) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + result = runCmd('devtool create-workspace') + self.assertTrue(os.path.isfile(os.path.join(workspacedir, 'conf', 'layer.conf'))) + result = runCmd('bitbake-layers show-layers') + self.assertNotIn(tempdir, result.output) + self.assertIn(workspacedir, result.output) + + def test_recipetool_create(self): + # Try adding a recipe + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + tempsrc = os.path.join(tempdir, 'srctree') + os.makedirs(tempsrc) + recipefile = os.path.join(tempdir, 'logrotate_3.8.7.bb') + srcuri = 'https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.8.7.tar.gz' + result = runCmd('recipetool create -o %s %s -x %s' % (recipefile, srcuri, tempsrc)) + self.assertTrue(os.path.isfile(recipefile)) + checkvars = {} + checkvars['LICENSE'] = 'GPLv2' + checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=18810669f13b87348459e611d31ab760' + checkvars['SRC_URI'] = 'https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.gz' + checkvars['SRC_URI[md5sum]'] = '99e08503ef24c3e2e3ff74cc5f3be213' + checkvars['SRC_URI[sha256sum]'] = 'f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64' + with open(recipefile, 'r') as f: + for line in f: + if '=' in line: + splitline = line.split('=', 1) + var = splitline[0].rstrip() + value = splitline[1].strip().strip('"') + if var in checkvars: + needvalue = checkvars.pop(var) + self.assertEqual(value, needvalue) + if line.startswith('inherit '): + inherits = line.split()[1:] + + self.assertEqual(checkvars, {}, 'Some variables not found') + + def test_recipetool_create_git(self): + # Ensure we have the right data in shlibs/pkgdata + bitbake('libpng pango libx11 libxext jpeg') + # Try adding a recipe + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + tempsrc = os.path.join(tempdir, 'srctree') + os.makedirs(tempsrc) + recipefile = os.path.join(tempdir, 'libmatchbox.bb') + srcuri = 'git://git.yoctoproject.org/libmatchbox' + result = runCmd('recipetool create -o %s %s -x %s' % (recipefile, srcuri, tempsrc)) + self.assertTrue(os.path.isfile(recipefile), 'recipetool did not create recipe file; output:\n%s' % result.output) + checkvars = {} + checkvars['LICENSE'] = 'LGPLv2.1' + checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34' + checkvars['S'] = '${WORKDIR}/git' + checkvars['PV'] = '1.0+git${SRCPV}' + checkvars['SRC_URI'] = srcuri + checkvars['DEPENDS'] = 'libpng pango libx11 libxext jpeg' + inherits = [] + with open(recipefile, 'r') as f: + for line in f: + if '=' in line: + splitline = line.split('=', 1) + var = splitline[0].rstrip() + value = splitline[1].strip().strip('"') + if var in checkvars: + needvalue = checkvars.pop(var) + self.assertEqual(value, needvalue) + if line.startswith('inherit '): + inherits = line.split()[1:] + + self.assertEqual(checkvars, {}, 'Some variables not found') + + self.assertIn('autotools', inherits, 'Missing inherit of autotools') + self.assertIn('pkgconfig', inherits, 'Missing inherit of pkgconfig') + + def test_devtool_add(self): + # Check preconditions + workspacedir = os.path.join(self.builddir, 'workspace') + self.assertTrue(not os.path.exists(workspacedir), 'This test cannot be run with a workspace directory under the build directory') + # Fetch source + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + url = 'http://www.ivarch.com/programs/sources/pv-1.5.3.tar.bz2' + result = runCmd('wget %s' % url, cwd=tempdir) + result = runCmd('tar xfv pv-1.5.3.tar.bz2', cwd=tempdir) + srcdir = os.path.join(tempdir, 'pv-1.5.3') + self.assertTrue(os.path.isfile(os.path.join(srcdir, 'configure')), 'Unable to find configure script in source directory') + # Test devtool add + self.track_for_cleanup(workspacedir) + self.add_command_to_tearDown('bitbake -c cleansstate pv') + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + result = runCmd('devtool add pv %s' % srcdir) + self.assertTrue(os.path.exists(os.path.join(workspacedir, 'conf', 'layer.conf')), 'Workspace directory not created') + # Test devtool status + result = runCmd('devtool status') + self.assertIn('pv', result.output) + self.assertIn(srcdir, result.output) + # Clean up anything in the workdir/sysroot/sstate cache (have to do this *after* devtool add since the recipe only exists then) + bitbake('pv -c cleansstate') + # Test devtool build + result = runCmd('devtool build pv') + installdir = get_bb_var('D', 'pv') + self.assertTrue(installdir, 'Could not query installdir variable') + bindir = get_bb_var('bindir', 'pv') + self.assertTrue(bindir, 'Could not query bindir variable') + if bindir[0] == '/': + bindir = bindir[1:] + self.assertTrue(os.path.isfile(os.path.join(installdir, bindir, 'pv')), 'pv binary not found in D') + + def test_devtool_add_library(self): + # Check preconditions + workspacedir = os.path.join(self.builddir, 'workspace') + self.assertTrue(not os.path.exists(workspacedir), 'This test cannot be run with a workspace directory under the build directory') + # We don't have the ability to pick up this dependency automatically yet... + bitbake('libusb1') + # Fetch source + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + url = 'http://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.1.tar.bz2' + result = runCmd('wget %s' % url, cwd=tempdir) + result = runCmd('tar xfv libftdi1-1.1.tar.bz2', cwd=tempdir) + srcdir = os.path.join(tempdir, 'libftdi1-1.1') + self.assertTrue(os.path.isfile(os.path.join(srcdir, 'CMakeLists.txt')), 'Unable to find CMakeLists.txt in source directory') + # Test devtool add + self.track_for_cleanup(workspacedir) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + result = runCmd('devtool add libftdi %s' % srcdir) + self.assertTrue(os.path.exists(os.path.join(workspacedir, 'conf', 'layer.conf')), 'Workspace directory not created') + # Test devtool status + result = runCmd('devtool status') + self.assertIn('libftdi', result.output) + self.assertIn(srcdir, result.output) + # Clean up anything in the workdir/sysroot/sstate cache (have to do this *after* devtool add since the recipe only exists then) + bitbake('libftdi -c cleansstate') + # Test devtool build + result = runCmd('devtool build libftdi') + staging_libdir = get_bb_var('STAGING_LIBDIR', 'libftdi') + self.assertTrue(staging_libdir, 'Could not query STAGING_LIBDIR variable') + self.assertTrue(os.path.isfile(os.path.join(staging_libdir, 'libftdi1.so.2.1.0')), 'libftdi binary not found in STAGING_LIBDIR') + # Test devtool reset + stampprefix = get_bb_var('STAMP', 'libftdi') + result = runCmd('devtool reset libftdi') + result = runCmd('devtool status') + self.assertNotIn('libftdi', result.output) + self.assertTrue(stampprefix, 'Unable to get STAMP value for recipe libftdi') + matches = glob.glob(stampprefix + '*') + self.assertFalse(matches, 'Stamp files exist for recipe libftdi that should have been cleaned') + self.assertFalse(os.path.isfile(os.path.join(staging_libdir, 'libftdi1.so.2.1.0')), 'libftdi binary still found in STAGING_LIBDIR after cleaning') + + def test_devtool_modify(self): + # Check preconditions + workspacedir = os.path.join(self.builddir, 'workspace') + self.assertTrue(not os.path.exists(workspacedir), 'This test cannot be run with a workspace directory under the build directory') + # Clean up anything in the workdir/sysroot/sstate cache + bitbake('mdadm -c cleansstate') + # Try modifying a recipe + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + self.track_for_cleanup(workspacedir) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + self.add_command_to_tearDown('bitbake -c clean mdadm') + result = runCmd('devtool modify mdadm -x %s' % tempdir) + self.assertTrue(os.path.exists(os.path.join(tempdir, 'Makefile')), 'Extracted source could not be found') + self.assertTrue(os.path.isdir(os.path.join(tempdir, '.git')), 'git repository for external source tree not found') + self.assertTrue(os.path.exists(os.path.join(workspacedir, 'conf', 'layer.conf')), 'Workspace directory not created') + matches = glob.glob(os.path.join(workspacedir, 'appends', 'mdadm_*.bbappend')) + self.assertTrue(matches, 'bbappend not created') + # Test devtool status + result = runCmd('devtool status') + self.assertIn('mdadm', result.output) + self.assertIn(tempdir, result.output) + # Check git repo + result = runCmd('git status --porcelain', cwd=tempdir) + self.assertEqual(result.output.strip(), "", 'Created git repo is not clean') + result = runCmd('git symbolic-ref HEAD', cwd=tempdir) + self.assertEqual(result.output.strip(), "refs/heads/devtool", 'Wrong branch in git repo') + # Try building + bitbake('mdadm') + # Try making (minor) modifications to the source + result = runCmd("sed -i 's!^\.TH.*!.TH MDADM 8 \"\" v9.999-custom!' %s" % os.path.join(tempdir, 'mdadm.8.in')) + bitbake('mdadm -c package') + pkgd = get_bb_var('PKGD', 'mdadm') + self.assertTrue(pkgd, 'Could not query PKGD variable') + mandir = get_bb_var('mandir', 'mdadm') + self.assertTrue(mandir, 'Could not query mandir variable') + if mandir[0] == '/': + mandir = mandir[1:] + with open(os.path.join(pkgd, mandir, 'man8', 'mdadm.8'), 'r') as f: + for line in f: + if line.startswith('.TH'): + self.assertEqual(line.rstrip(), '.TH MDADM 8 "" v9.999-custom', 'man file not modified') + # Test devtool reset + stampprefix = get_bb_var('STAMP', 'mdadm') + result = runCmd('devtool reset mdadm') + result = runCmd('devtool status') + self.assertNotIn('mdadm', result.output) + self.assertTrue(stampprefix, 'Unable to get STAMP value for recipe mdadm') + matches = glob.glob(stampprefix + '*') + self.assertFalse(matches, 'Stamp files exist for recipe mdadm that should have been cleaned') + + def test_devtool_modify_invalid(self): + # Check preconditions + workspacedir = os.path.join(self.builddir, 'workspace') + self.assertTrue(not os.path.exists(workspacedir), 'This test cannot be run with a workspace directory under the build directory') + # Try modifying some recipes + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + self.track_for_cleanup(workspacedir) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + + testrecipes = 'perf gcc-source kernel-devsrc package-index core-image-minimal meta-toolchain packagegroup-core-sdk meta-ide-support'.split() + for testrecipe in testrecipes: + # Check it's a valid recipe + bitbake('%s -e' % testrecipe) + # devtool extract should fail + result = runCmd('devtool extract %s %s' % (testrecipe, os.path.join(tempdir, testrecipe)), ignore_status=True) + self.assertNotEqual(result.status, 0, 'devtool extract on %s should have failed' % testrecipe) + self.assertNotIn('Fetching ', result.output, 'devtool extract on %s should have errored out before trying to fetch' % testrecipe) + self.assertIn('ERROR: ', result.output, 'devtool extract on %s should have given an ERROR' % testrecipe) + # devtool modify should fail + result = runCmd('devtool modify %s -x %s' % (testrecipe, os.path.join(tempdir, testrecipe)), ignore_status=True) + self.assertNotEqual(result.status, 0, 'devtool modify on %s should have failed' % testrecipe) + self.assertIn('ERROR: ', result.output, 'devtool modify on %s should have given an ERROR' % testrecipe) + + def test_devtool_modify_git(self): + # Check preconditions + workspacedir = os.path.join(self.builddir, 'workspace') + self.assertTrue(not os.path.exists(workspacedir), 'This test cannot be run with a workspace directory under the build directory') + testrecipe = 'mkelfimage' + src_uri = get_bb_var('SRC_URI', testrecipe) + self.assertIn('git://', src_uri, 'This test expects the %s recipe to be a git recipe' % testrecipe) + # Clean up anything in the workdir/sysroot/sstate cache + bitbake('%s -c cleansstate' % testrecipe) + # Try modifying a recipe + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + self.track_for_cleanup(workspacedir) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + self.add_command_to_tearDown('bitbake -c clean %s' % testrecipe) + result = runCmd('devtool modify %s -x %s' % (testrecipe, tempdir)) + self.assertTrue(os.path.exists(os.path.join(tempdir, 'Makefile')), 'Extracted source could not be found') + self.assertTrue(os.path.isdir(os.path.join(tempdir, '.git')), 'git repository for external source tree not found') + self.assertTrue(os.path.exists(os.path.join(workspacedir, 'conf', 'layer.conf')), 'Workspace directory not created') + matches = glob.glob(os.path.join(workspacedir, 'appends', 'mkelfimage_*.bbappend')) + self.assertTrue(matches, 'bbappend not created') + # Test devtool status + result = runCmd('devtool status') + self.assertIn(testrecipe, result.output) + self.assertIn(tempdir, result.output) + # Check git repo + result = runCmd('git status --porcelain', cwd=tempdir) + self.assertEqual(result.output.strip(), "", 'Created git repo is not clean') + result = runCmd('git symbolic-ref HEAD', cwd=tempdir) + self.assertEqual(result.output.strip(), "refs/heads/devtool", 'Wrong branch in git repo') + # Try building + bitbake(testrecipe) + + def test_devtool_modify_localfiles(self): + # Check preconditions + workspacedir = os.path.join(self.builddir, 'workspace') + self.assertTrue(not os.path.exists(workspacedir), 'This test cannot be run with a workspace directory under the build directory') + testrecipe = 'lighttpd' + src_uri = (get_bb_var('SRC_URI', testrecipe) or '').split() + foundlocal = False + for item in src_uri: + if item.startswith('file://') and '.patch' not in item: + foundlocal = True + break + self.assertTrue(foundlocal, 'This test expects the %s recipe to fetch local files and it seems that it no longer does' % testrecipe) + # Clean up anything in the workdir/sysroot/sstate cache + bitbake('%s -c cleansstate' % testrecipe) + # Try modifying a recipe + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + self.track_for_cleanup(workspacedir) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + self.add_command_to_tearDown('bitbake -c clean %s' % testrecipe) + result = runCmd('devtool modify %s -x %s' % (testrecipe, tempdir)) + self.assertTrue(os.path.exists(os.path.join(tempdir, 'configure.ac')), 'Extracted source could not be found') + self.assertTrue(os.path.exists(os.path.join(workspacedir, 'conf', 'layer.conf')), 'Workspace directory not created') + matches = glob.glob(os.path.join(workspacedir, 'appends', '%s_*.bbappend' % testrecipe)) + self.assertTrue(matches, 'bbappend not created') + # Test devtool status + result = runCmd('devtool status') + self.assertIn(testrecipe, result.output) + self.assertIn(tempdir, result.output) + # Try building + bitbake(testrecipe) + + def test_devtool_update_recipe(self): + # Check preconditions + workspacedir = os.path.join(self.builddir, 'workspace') + self.assertTrue(not os.path.exists(workspacedir), 'This test cannot be run with a workspace directory under the build directory') + testrecipe = 'minicom' + recipefile = get_bb_var('FILE', testrecipe) + src_uri = get_bb_var('SRC_URI', testrecipe) + self.assertNotIn('git://', src_uri, 'This test expects the %s recipe to NOT be a git recipe' % testrecipe) + result = runCmd('git status . --porcelain', cwd=os.path.dirname(recipefile)) + self.assertEqual(result.output.strip(), "", '%s recipe is not clean' % testrecipe) + # First, modify a recipe + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + self.track_for_cleanup(workspacedir) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + # (don't bother with cleaning the recipe on teardown, we won't be building it) + result = runCmd('devtool modify %s -x %s' % (testrecipe, tempdir)) + # Check git repo + self.assertTrue(os.path.isdir(os.path.join(tempdir, '.git')), 'git repository for external source tree not found') + result = runCmd('git status --porcelain', cwd=tempdir) + self.assertEqual(result.output.strip(), "", 'Created git repo is not clean') + result = runCmd('git symbolic-ref HEAD', cwd=tempdir) + self.assertEqual(result.output.strip(), "refs/heads/devtool", 'Wrong branch in git repo') + # Add a couple of commits + # FIXME: this only tests adding, need to also test update and remove + result = runCmd('echo "Additional line" >> README', cwd=tempdir) + result = runCmd('git commit -a -m "Change the README"', cwd=tempdir) + result = runCmd('echo "A new file" > devtool-new-file', cwd=tempdir) + result = runCmd('git add devtool-new-file', cwd=tempdir) + result = runCmd('git commit -m "Add a new file"', cwd=tempdir) + self.add_command_to_tearDown('cd %s; rm %s/*.patch; git checkout %s %s' % (os.path.dirname(recipefile), testrecipe, testrecipe, os.path.basename(recipefile))) + result = runCmd('devtool update-recipe %s' % testrecipe) + result = runCmd('git status . --porcelain', cwd=os.path.dirname(recipefile)) + self.assertNotEqual(result.output.strip(), "", '%s recipe should be modified' % testrecipe) + status = result.output.splitlines() + self.assertEqual(len(status), 3, 'Less/more files modified than expected. Entire status:\n%s' % result.output) + for line in status: + if line.endswith('0001-Change-the-README.patch'): + self.assertEqual(line[:3], '?? ', 'Unexpected status in line: %s' % line) + elif line.endswith('0002-Add-a-new-file.patch'): + self.assertEqual(line[:3], '?? ', 'Unexpected status in line: %s' % line) + elif re.search('%s_[^_]*.bb$' % testrecipe, line): + self.assertEqual(line[:3], ' M ', 'Unexpected status in line: %s' % line) + else: + raise AssertionError('Unexpected modified file in status: %s' % line) + + def test_devtool_update_recipe_git(self): + # Check preconditions + workspacedir = os.path.join(self.builddir, 'workspace') + self.assertTrue(not os.path.exists(workspacedir), 'This test cannot be run with a workspace directory under the build directory') + testrecipe = 'mtd-utils' + recipefile = get_bb_var('FILE', testrecipe) + src_uri = get_bb_var('SRC_URI', testrecipe) + self.assertIn('git://', src_uri, 'This test expects the %s recipe to be a git recipe' % testrecipe) + result = runCmd('git status . --porcelain', cwd=os.path.dirname(recipefile)) + self.assertEqual(result.output.strip(), "", '%s recipe is not clean' % testrecipe) + # First, modify a recipe + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + self.track_for_cleanup(workspacedir) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + # (don't bother with cleaning the recipe on teardown, we won't be building it) + result = runCmd('devtool modify %s -x %s' % (testrecipe, tempdir)) + # Check git repo + self.assertTrue(os.path.isdir(os.path.join(tempdir, '.git')), 'git repository for external source tree not found') + result = runCmd('git status --porcelain', cwd=tempdir) + self.assertEqual(result.output.strip(), "", 'Created git repo is not clean') + result = runCmd('git symbolic-ref HEAD', cwd=tempdir) + self.assertEqual(result.output.strip(), "refs/heads/devtool", 'Wrong branch in git repo') + # Add a couple of commits + # FIXME: this only tests adding, need to also test update and remove + result = runCmd('echo "# Additional line" >> Makefile', cwd=tempdir) + result = runCmd('git commit -a -m "Change the Makefile"', cwd=tempdir) + result = runCmd('echo "A new file" > devtool-new-file', cwd=tempdir) + result = runCmd('git add devtool-new-file', cwd=tempdir) + result = runCmd('git commit -m "Add a new file"', cwd=tempdir) + self.add_command_to_tearDown('cd %s; git checkout %s %s' % (os.path.dirname(recipefile), testrecipe, os.path.basename(recipefile))) + result = runCmd('devtool update-recipe %s' % testrecipe) + result = runCmd('git status . --porcelain', cwd=os.path.dirname(recipefile)) + self.assertNotEqual(result.output.strip(), "", '%s recipe should be modified' % testrecipe) + status = result.output.splitlines() + self.assertEqual(len(status), 3, 'Less/more files modified than expected. Entire status:\n%s' % result.output) + for line in status: + if line.endswith('add-exclusion-to-mkfs-jffs2-git-2.patch'): + self.assertEqual(line[:3], ' D ', 'Unexpected status in line: %s' % line) + elif line.endswith('fix-armv7-neon-alignment.patch'): + self.assertEqual(line[:3], ' D ', 'Unexpected status in line: %s' % line) + elif re.search('%s_[^_]*.bb$' % testrecipe, line): + self.assertEqual(line[:3], ' M ', 'Unexpected status in line: %s' % line) + else: + raise AssertionError('Unexpected modified file in status: %s' % line) + result = runCmd('git diff %s' % os.path.basename(recipefile), cwd=os.path.dirname(recipefile)) + addlines = ['SRCREV = ".*"', 'SRC_URI = "git://git.infradead.org/mtd-utils.git"'] + removelines = ['SRCREV = ".*"', 'SRC_URI = "git://git.infradead.org/mtd-utils.git \\\\', 'file://add-exclusion-to-mkfs-jffs2-git-2.patch \\\\', 'file://fix-armv7-neon-alignment.patch \\\\', '"'] + for line in result.output.splitlines(): + if line.startswith('+++') or line.startswith('---'): + continue + elif line.startswith('+'): + matched = False + for item in addlines: + if re.match(item, line[1:].strip()): + matched = True + break + self.assertTrue(matched, 'Unexpected diff add line: %s' % line) + elif line.startswith('-'): + matched = False + for item in removelines: + if re.match(item, line[1:].strip()): + matched = True + break + self.assertTrue(matched, 'Unexpected diff remove line: %s' % line) + + def test_devtool_extract(self): + # Check preconditions + workspacedir = os.path.join(self.builddir, 'workspace') + self.assertTrue(not os.path.exists(workspacedir), 'This test cannot be run with a workspace directory under the build directory') + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + # Try devtool extract + self.track_for_cleanup(tempdir) + self.track_for_cleanup(workspacedir) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + result = runCmd('devtool extract remake %s' % tempdir) + self.assertTrue(os.path.exists(os.path.join(tempdir, 'Makefile.am')), 'Extracted source could not be found') + self.assertTrue(os.path.isdir(os.path.join(tempdir, '.git')), 'git repository for external source tree not found') + + def test_devtool_reset_all(self): + # Check preconditions + workspacedir = os.path.join(self.builddir, 'workspace') + self.assertTrue(not os.path.exists(workspacedir), 'This test cannot be run with a workspace directory under the build directory') + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + self.track_for_cleanup(workspacedir) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + testrecipe1 = 'mdadm' + testrecipe2 = 'cronie' + result = runCmd('devtool modify -x %s %s' % (testrecipe1, os.path.join(tempdir, testrecipe1))) + result = runCmd('devtool modify -x %s %s' % (testrecipe2, os.path.join(tempdir, testrecipe2))) + result = runCmd('devtool build %s' % testrecipe1) + result = runCmd('devtool build %s' % testrecipe2) + stampprefix1 = get_bb_var('STAMP', testrecipe1) + self.assertTrue(stampprefix1, 'Unable to get STAMP value for recipe %s' % testrecipe1) + stampprefix2 = get_bb_var('STAMP', testrecipe2) + self.assertTrue(stampprefix2, 'Unable to get STAMP value for recipe %s' % testrecipe2) + result = runCmd('devtool reset -a') + self.assertIn(testrecipe1, result.output) + self.assertIn(testrecipe2, result.output) + result = runCmd('devtool status') + self.assertNotIn(testrecipe1, result.output) + self.assertNotIn(testrecipe2, result.output) + matches1 = glob.glob(stampprefix1 + '*') + self.assertFalse(matches1, 'Stamp files exist for recipe %s that should have been cleaned' % testrecipe1) + matches2 = glob.glob(stampprefix2 + '*') + self.assertFalse(matches2, 'Stamp files exist for recipe %s that should have been cleaned' % testrecipe2) + + def test_devtool_deploy_target(self): + # NOTE: Whilst this test would seemingly be better placed as a runtime test, + # unfortunately the runtime tests run under bitbake and you can't run + # devtool within bitbake (since devtool needs to run bitbake itself). + # Additionally we are testing build-time functionality as well, so + # really this has to be done as an oe-selftest test. + # + # Check preconditions + machine = get_bb_var('MACHINE') + if not machine.startswith('qemu'): + self.skipTest('This test only works with qemu machines') + if not os.path.exists('/etc/runqemu-nosudo'): + self.skipTest('You must set up tap devices with scripts/runqemu-gen-tapdevs before running this test') + workspacedir = os.path.join(self.builddir, 'workspace') + self.assertTrue(not os.path.exists(workspacedir), 'This test cannot be run with a workspace directory under the build directory') + import pexpect + # Definitions + testrecipe = 'mdadm' + testfile = '/sbin/mdadm' + testimage = 'oe-selftest-image' + testhost = '192.168.7.2' + testcommand = '/sbin/mdadm --help' + # Build an image to run + bitbake("%s qemu-native qemu-helper-native" % testimage) + deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') + self.add_command_to_tearDown('bitbake -c clean %s' % testimage) + self.add_command_to_tearDown('rm -f %s/%s*' % (deploy_dir_image, testimage)) + # Clean recipe so the first deploy will fail + bitbake("%s -c clean" % testrecipe) + # Try devtool modify + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + self.track_for_cleanup(workspacedir) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + self.add_command_to_tearDown('bitbake -c clean %s' % testrecipe) + result = runCmd('devtool modify %s -x %s' % (testrecipe, tempdir)) + # Test that deploy-target at this point fails (properly) + result = runCmd('devtool deploy-target -n %s root@%s' % (testrecipe, testhost), ignore_status=True) + self.assertNotEqual(result.output, 0, 'devtool deploy-target should have failed, output: %s' % result.output) + self.assertNotIn(result.output, 'Traceback', 'devtool deploy-target should have failed with a proper error not a traceback, output: %s' % result.output) + result = runCmd('devtool build %s' % testrecipe) + # First try a dry-run of deploy-target + result = runCmd('devtool deploy-target -n %s root@%s' % (testrecipe, testhost)) + self.assertIn(' %s' % testfile, result.output) + # Boot the image + console = pexpect.spawn('runqemu %s %s qemuparams="-snapshot" nographic' % (machine, testimage)) + console.expect("login:", timeout=120) + # Now really test deploy-target + result = runCmd('devtool deploy-target -c %s root@%s' % (testrecipe, testhost)) + result = runCmd('ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@%s %s' % (testhost, testcommand)) + # Test undeploy-target + result = runCmd('devtool undeploy-target -c %s root@%s' % (testrecipe, testhost)) + result = runCmd('ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@%s %s' % (testhost, testcommand), ignore_status=True) + self.assertNotEqual(result, 0, 'undeploy-target did not remove command as it should have') + console.close() diff --git a/meta/lib/oeqa/selftest/lic-checksum.py b/meta/lib/oeqa/selftest/lic-checksum.py new file mode 100644 index 0000000000..92fc3a84f1 --- /dev/null +++ b/meta/lib/oeqa/selftest/lic-checksum.py @@ -0,0 +1,29 @@ +import os +import tempfile + +from oeqa.selftest.base import oeSelfTest +from oeqa.utils.commands import bitbake +from oeqa.utils import CommandError + +class LicenseTests(oeSelfTest): + + # Verify that changing a license file that has an absolute path causes + # the license qa to fail due to a mismatched md5sum. + def test_nonmatching_checksum(self): + bitbake_cmd = '-c configure emptytest' + error_msg = 'ERROR: emptytest: The new md5 checksum is 8d777f385d3dfec8815d20f7496026dc' + + lic_file, lic_path = tempfile.mkstemp() + os.close(lic_file) + self.track_for_cleanup(lic_path) + + self.write_recipeinc('emptytest', 'INHIBIT_DEFAULT_DEPS = "1"') + self.append_recipeinc('emptytest', 'LIC_FILES_CHKSUM = "file://%s;md5=d41d8cd98f00b204e9800998ecf8427e"' % lic_path) + result = bitbake(bitbake_cmd) + + with open(lic_path, "w") as f: + f.write("data") + + result = bitbake(bitbake_cmd, ignore_status=True) + if error_msg not in result.output: + raise AssertionError(result.output) diff --git a/meta/lib/oeqa/selftest/pkgdata.py b/meta/lib/oeqa/selftest/pkgdata.py new file mode 100644 index 0000000000..34eea468e8 --- /dev/null +++ b/meta/lib/oeqa/selftest/pkgdata.py @@ -0,0 +1,218 @@ +import unittest +import os +import tempfile +import logging +import fnmatch + +import oeqa.utils.ftools as ftools +from oeqa.selftest.base import oeSelfTest +from oeqa.utils.commands import runCmd, bitbake, get_bb_var +from oeqa.utils.decorators import testcase + +class OePkgdataUtilTests(oeSelfTest): + + @classmethod + def setUpClass(cls): + # Ensure we have the right data in pkgdata + logger = logging.getLogger("selftest") + logger.info('Running bitbake to generate pkgdata') + bitbake('glibc busybox zlib bash') + + def test_lookup_pkg(self): + # Forward tests + result = runCmd('oe-pkgdata-util lookup-pkg "glibc busybox"') + self.assertEqual(result.output, 'libc6\nbusybox') + result = runCmd('oe-pkgdata-util lookup-pkg zlib-dev') + self.assertEqual(result.output, 'libz-dev') + result = runCmd('oe-pkgdata-util lookup-pkg nonexistentpkg', ignore_status=True) + self.assertEqual(result.status, 1) + self.assertEqual(result.output, 'ERROR: The following packages could not be found: nonexistentpkg') + # Reverse tests + result = runCmd('oe-pkgdata-util lookup-pkg -r "libc6 busybox"') + self.assertEqual(result.output, 'glibc\nbusybox') + result = runCmd('oe-pkgdata-util lookup-pkg -r libz-dev') + self.assertEqual(result.output, 'zlib-dev') + result = runCmd('oe-pkgdata-util lookup-pkg -r nonexistentpkg', ignore_status=True) + self.assertEqual(result.status, 1) + self.assertEqual(result.output, 'ERROR: The following packages could not be found: nonexistentpkg') + + def test_read_value(self): + result = runCmd('oe-pkgdata-util read-value PN libz1') + self.assertEqual(result.output, 'zlib') + result = runCmd('oe-pkgdata-util read-value PKGSIZE bash') + pkgsize = int(result.output.strip()) + self.assertGreater(pkgsize, 1) + + def test_find_path(self): + result = runCmd('oe-pkgdata-util find-path /lib/libc.so.6') + self.assertEqual(result.output, 'glibc: /lib/libc.so.6') + result = runCmd('oe-pkgdata-util find-path /bin/bash') + self.assertEqual(result.output, 'bash: /bin/bash') + result = runCmd('oe-pkgdata-util find-path /not/exist', ignore_status=True) + self.assertEqual(result.status, 1) + self.assertEqual(result.output, 'ERROR: Unable to find any package producing path /not/exist') + + def test_lookup_recipe(self): + result = runCmd('oe-pkgdata-util lookup-recipe "libc6-staticdev busybox"') + self.assertEqual(result.output, 'glibc\nbusybox') + result = runCmd('oe-pkgdata-util lookup-recipe libz-dbg') + self.assertEqual(result.output, 'zlib') + result = runCmd('oe-pkgdata-util lookup-recipe nonexistentpkg', ignore_status=True) + self.assertEqual(result.status, 1) + self.assertEqual(result.output, 'ERROR: The following packages could not be found: nonexistentpkg') + + def test_list_pkgs(self): + # No arguments + result = runCmd('oe-pkgdata-util list-pkgs') + pkglist = result.output.split() + self.assertIn('glibc-utils', pkglist) + self.assertIn('zlib-dev', pkglist) + # No pkgspec, runtime + result = runCmd('oe-pkgdata-util list-pkgs -r') + pkglist = result.output.split() + self.assertIn('libc6-utils', pkglist) + self.assertIn('libz-dev', pkglist) + # With recipe specified + result = runCmd('oe-pkgdata-util list-pkgs -p zlib') + pkglist = sorted(result.output.split()) + try: + pkglist.remove('zlib-ptest') # in case ptest is disabled + except ValueError: + pass + self.assertEqual(pkglist, ['zlib', 'zlib-dbg', 'zlib-dev', 'zlib-doc', 'zlib-staticdev']) + # With recipe specified, runtime + result = runCmd('oe-pkgdata-util list-pkgs -p zlib -r') + pkglist = sorted(result.output.split()) + try: + pkglist.remove('libz-ptest') # in case ptest is disabled + except ValueError: + pass + self.assertEqual(pkglist, ['libz-dbg', 'libz-dev', 'libz-doc', 'libz-staticdev', 'libz1']) + # With recipe specified and unpackaged + result = runCmd('oe-pkgdata-util list-pkgs -p zlib -u') + pkglist = sorted(result.output.split()) + self.assertIn('zlib-locale', pkglist) + # With recipe specified and unpackaged, runtime + result = runCmd('oe-pkgdata-util list-pkgs -p zlib -u -r') + pkglist = sorted(result.output.split()) + self.assertIn('libz-locale', pkglist) + # With recipe specified and pkgspec + result = runCmd('oe-pkgdata-util list-pkgs -p zlib "*-d*"') + pkglist = sorted(result.output.split()) + self.assertEqual(pkglist, ['zlib-dbg', 'zlib-dev', 'zlib-doc']) + # With recipe specified and pkgspec, runtime + result = runCmd('oe-pkgdata-util list-pkgs -p zlib -r "*-d*"') + pkglist = sorted(result.output.split()) + self.assertEqual(pkglist, ['libz-dbg', 'libz-dev', 'libz-doc']) + + def test_list_pkg_files(self): + def splitoutput(output): + files = {} + curpkg = None + for line in output.splitlines(): + if line.startswith('\t'): + self.assertTrue(curpkg, 'Unexpected non-package line:\n%s' % line) + files[curpkg].append(line.strip()) + else: + self.assertTrue(line.rstrip().endswith(':'), 'Invalid package line in output:\n%s' % line) + curpkg = line.split(':')[0] + files[curpkg] = [] + return files + base_libdir = get_bb_var('base_libdir') + libdir = get_bb_var('libdir') + includedir = get_bb_var('includedir') + mandir = get_bb_var('mandir') + # Test recipe-space package name + result = runCmd('oe-pkgdata-util list-pkg-files zlib-dev zlib-doc') + files = splitoutput(result.output) + self.assertIn('zlib-dev', files.keys()) + self.assertIn('zlib-doc', files.keys()) + self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev']) + self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc']) + # Test runtime package name + result = runCmd('oe-pkgdata-util list-pkg-files -r libz1 libz-dev') + files = splitoutput(result.output) + self.assertIn('libz1', files.keys()) + self.assertIn('libz-dev', files.keys()) + self.assertGreater(len(files['libz1']), 1) + libspec = os.path.join(base_libdir, 'libz.so.1.*') + found = False + for fileitem in files['libz1']: + if fnmatch.fnmatchcase(fileitem, libspec): + found = True + break + self.assertTrue(found, 'Could not find zlib library file %s in libz1 package file list: %s' % (libspec, files['libz1'])) + self.assertIn(os.path.join(includedir, 'zlib.h'), files['libz-dev']) + # Test recipe + result = runCmd('oe-pkgdata-util list-pkg-files -p zlib') + files = splitoutput(result.output) + self.assertIn('zlib-dbg', files.keys()) + self.assertIn('zlib-doc', files.keys()) + self.assertIn('zlib-dev', files.keys()) + self.assertIn('zlib-staticdev', files.keys()) + self.assertIn('zlib', files.keys()) + self.assertNotIn('zlib-locale', files.keys()) + # (ignore ptest, might not be there depending on config) + self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev']) + self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc']) + self.assertIn(os.path.join(libdir, 'libz.a'), files['zlib-staticdev']) + # Test recipe, runtime + result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -r') + files = splitoutput(result.output) + self.assertIn('libz-dbg', files.keys()) + self.assertIn('libz-doc', files.keys()) + self.assertIn('libz-dev', files.keys()) + self.assertIn('libz-staticdev', files.keys()) + self.assertIn('libz1', files.keys()) + self.assertNotIn('libz-locale', files.keys()) + self.assertIn(os.path.join(includedir, 'zlib.h'), files['libz-dev']) + self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['libz-doc']) + self.assertIn(os.path.join(libdir, 'libz.a'), files['libz-staticdev']) + # Test recipe, unpackaged + result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -u') + files = splitoutput(result.output) + self.assertIn('zlib-dbg', files.keys()) + self.assertIn('zlib-doc', files.keys()) + self.assertIn('zlib-dev', files.keys()) + self.assertIn('zlib-staticdev', files.keys()) + self.assertIn('zlib', files.keys()) + self.assertIn('zlib-locale', files.keys()) # this is the key one + self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev']) + self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc']) + self.assertIn(os.path.join(libdir, 'libz.a'), files['zlib-staticdev']) + # Test recipe, runtime, unpackaged + result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -r -u') + files = splitoutput(result.output) + self.assertIn('libz-dbg', files.keys()) + self.assertIn('libz-doc', files.keys()) + self.assertIn('libz-dev', files.keys()) + self.assertIn('libz-staticdev', files.keys()) + self.assertIn('libz1', files.keys()) + self.assertIn('libz-locale', files.keys()) # this is the key one + self.assertIn(os.path.join(includedir, 'zlib.h'), files['libz-dev']) + self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['libz-doc']) + self.assertIn(os.path.join(libdir, 'libz.a'), files['libz-staticdev']) + + def test_glob(self): + tempdir = tempfile.mkdtemp(prefix='pkgdataqa') + self.track_for_cleanup(tempdir) + pkglistfile = os.path.join(tempdir, 'pkglist') + with open(pkglistfile, 'w') as f: + f.write('libc6\n') + f.write('libz1\n') + f.write('busybox\n') + result = runCmd('oe-pkgdata-util glob %s "*-dev"' % pkglistfile) + desiredresult = ['libc6-dev', 'libz-dev', 'busybox-dev'] + self.assertEqual(sorted(result.output.split()), sorted(desiredresult)) + # The following should not error (because when we use this during rootfs construction, sometimes the complementary package won't exist) + result = runCmd('oe-pkgdata-util glob %s "*-nonexistent"' % pkglistfile) + self.assertEqual(result.output, '') + # Test exclude option + result = runCmd('oe-pkgdata-util glob %s "*-dev *-dbg" -x "^libz"' % pkglistfile) + resultlist = result.output.split() + self.assertNotIn('libz-dev', resultlist) + self.assertNotIn('libz-dbg', resultlist) + + def test_specify_pkgdatadir(self): + result = runCmd('oe-pkgdata-util -p %s lookup-pkg glibc' % get_bb_var('PKGDATA_DIR')) + self.assertEqual(result.output, 'libc6') diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py index cc582dd1ad..1f4770f94e 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py @@ -110,7 +110,7 @@ class BaseTarget(object): class QemuTarget(BaseTarget): - supported_image_fstypes = ['ext3'] + supported_image_fstypes = ['ext3', 'ext4'] def __init__(self, d): diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py index 802bc2f208..e8a467f4cd 100644 --- a/meta/lib/oeqa/utils/commands.py +++ b/meta/lib/oeqa/utils/commands.py @@ -110,11 +110,11 @@ def runCmd(command, ignore_status=False, timeout=None, assert_error=True, **opti def bitbake(command, ignore_status=False, timeout=None, postconfig=None, **options): if postconfig: - postconfig_file = os.path.join(os.environ.get('BUILDDIR'), 'oeqa-post.conf') - ftools.write_file(postconfig_file, postconfig) - extra_args = "-R %s" % postconfig_file + postconfig_file = os.path.join(os.environ.get('BUILDDIR'), 'oeqa-post.conf') + ftools.write_file(postconfig_file, postconfig) + extra_args = "-R %s" % postconfig_file else: - extra_args = "" + extra_args = "" if isinstance(command, basestring): cmd = "bitbake " + extra_args + " " + command @@ -122,7 +122,7 @@ def bitbake(command, ignore_status=False, timeout=None, postconfig=None, **optio cmd = [ "bitbake" ] + [a for a in (command + extra_args.split(" ")) if a not in [""]] try: - return runCmd(cmd, ignore_status, timeout, **options) + return runCmd(cmd, ignore_status, timeout, **options) finally: if postconfig: os.remove(postconfig_file) @@ -137,11 +137,18 @@ def get_bb_env(target=None, postconfig=None): def get_bb_var(var, target=None, postconfig=None): val = None bbenv = get_bb_env(target, postconfig=postconfig) + lastline = None for line in bbenv.splitlines(): - if line.startswith(var + "="): + if line.startswith(var + "=") or line.startswith("export " + var + "="): val = line.split('=')[1] - val = val.replace('\"','') + val = val.strip('\"') break + elif line.startswith("unset " + var): + # Handle [unexport] variables + if lastline.startswith('# "'): + val = lastline.split('\"')[1] + break + lastline = line return val def get_test_layer(): diff --git a/meta/lib/oeqa/utils/decorators.py b/meta/lib/oeqa/utils/decorators.py index 7f845dbb4b..ff5f278bc1 100644 --- a/meta/lib/oeqa/utils/decorators.py +++ b/meta/lib/oeqa/utils/decorators.py @@ -18,14 +18,21 @@ class getResults(object): upperf = sys._current_frames().values()[0] while (upperf.f_globals['__name__'] != 'unittest.case'): upperf = upperf.f_back - self.faillist = [ seq[0]._testMethodName for seq in upperf.f_locals['result'].failures ] - self.errorlist = [ seq[0]._testMethodName for seq in upperf.f_locals['result'].errors ] - #ignore the _ErrorHolder objects from the skipped tests list - self.skiplist = [] - for seq in upperf.f_locals['result'].skipped: - try: - self.skiplist.append(seq[0]._testMethodName) - except: pass + + def handleList(items): + ret = [] + # items is a list of tuples, (test, failure) or (_ErrorHandler(), Exception()) + for i in items: + s = i[0].id() + #Handle the _ErrorHolder objects from skipModule failures + if "setUpModule (" in s: + ret.append(s.replace("setUpModule (", "").replace(")","")) + else: + ret.append(s) + return ret + self.faillist = handleList(upperf.f_locals['result'].failures) + self.errorlist = handleList(upperf.f_locals['result'].errors) + self.skiplist = handleList(upperf.f_locals['result'].skipped) def getFailList(self): return self.faillist @@ -86,14 +93,15 @@ class testcase(object): self.test_case = test_case def __call__(self, func): - def wrapped_f(*args): - return func(*args) - wrapped_f.test_case = self.test_case - return wrapped_f + def wrapped_f(*args): + return func(*args) + wrapped_f.test_case = self.test_case + wrapped_f.__name__ = func.__name__ + return wrapped_f class NoParsingFilter(logging.Filter): def filter(self, record): - return record.levelno == 100 + return record.levelno == 100 def LogResults(original_class): orig_method = original_class.run @@ -101,51 +109,51 @@ def LogResults(original_class): #rewrite the run method of unittest.TestCase to add testcase logging def run(self, result, *args, **kws): orig_method(self, result, *args, **kws) - passed = True - testMethod = getattr(self, self._testMethodName) - - #if test case is decorated then use it's number, else use it's name - try: - test_case = testMethod.test_case - except AttributeError: - test_case = self._testMethodName - - #create custom logging level for filtering. - custom_log_level = 100 - logging.addLevelName(custom_log_level, 'RESULTS') - caller = os.path.basename(sys.argv[0]) - - def results(self, message, *args, **kws): - if self.isEnabledFor(custom_log_level): - self.log(custom_log_level, message, *args, **kws) - logging.Logger.results = results - - logging.basicConfig(filename=os.path.join(os.getcwd(),'results-'+caller+'.log'), + passed = True + testMethod = getattr(self, self._testMethodName) + + #if test case is decorated then use it's number, else use it's name + try: + test_case = testMethod.test_case + except AttributeError: + test_case = self._testMethodName + + #create custom logging level for filtering. + custom_log_level = 100 + logging.addLevelName(custom_log_level, 'RESULTS') + caller = os.path.basename(sys.argv[0]) + + def results(self, message, *args, **kws): + if self.isEnabledFor(custom_log_level): + self.log(custom_log_level, message, *args, **kws) + logging.Logger.results = results + + logging.basicConfig(filename=os.path.join(os.getcwd(),'results-'+caller+'.log'), filemode='w', format='%(asctime)s - %(name)s - %(levelname)s - %(message)s', datefmt='%H:%M:%S', level=custom_log_level) - for handler in logging.root.handlers: - handler.addFilter(NoParsingFilter()) - local_log = logging.getLogger(caller) + for handler in logging.root.handlers: + handler.addFilter(NoParsingFilter()) + local_log = logging.getLogger(caller) - #check status of tests and record it + #check status of tests and record it for (name, msg) in result.errors: - if self._testMethodName == str(name).split(' ')[0]: - local_log.results("Testcase "+str(test_case)+": ERROR") - local_log.results("Testcase "+str(test_case)+":\n"+msg) - passed = False + if self._testMethodName == str(name).split(' ')[0]: + local_log.results("Testcase "+str(test_case)+": ERROR") + local_log.results("Testcase "+str(test_case)+":\n"+msg) + passed = False for (name, msg) in result.failures: - if self._testMethodName == str(name).split(' ')[0]: - local_log.results("Testcase "+str(test_case)+": FAILED") - local_log.results("Testcase "+str(test_case)+":\n"+msg) - passed = False + if self._testMethodName == str(name).split(' ')[0]: + local_log.results("Testcase "+str(test_case)+": FAILED") + local_log.results("Testcase "+str(test_case)+":\n"+msg) + passed = False for (name, msg) in result.skipped: - if self._testMethodName == str(name).split(' ')[0]: - local_log.results("Testcase "+str(test_case)+": SKIPPED") - passed = False - if passed: - local_log.results("Testcase "+str(test_case)+": PASSED") + if self._testMethodName == str(name).split(' ')[0]: + local_log.results("Testcase "+str(test_case)+": SKIPPED") + passed = False + if passed: + local_log.results("Testcase "+str(test_case)+": PASSED") original_class.run = run return original_class diff --git a/meta/recipes-bsp/acpid/acpid_2.0.22.bb b/meta/recipes-bsp/acpid/acpid_2.0.23.bb index 603fc2be9f..a5317a4daa 100644 --- a/meta/recipes-bsp/acpid/acpid_2.0.22.bb +++ b/meta/recipes-bsp/acpid/acpid_2.0.23.bb @@ -3,5 +3,5 @@ require acpid.inc LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ file://acpid.h;endline=24;md5=324a9cf225ae69ddaad1bf9d942115b5" -SRC_URI[md5sum] = "c8ba756030d1b21fc973ec3d640f27f1" -SRC_URI[sha256sum] = "3d11454f4283c8f771d8dbd5eb6b5f2bbd9d94d9f77d68bab89e35d98b67ab31" +SRC_URI[md5sum] = "d7bcdcdefcd53b03730e50ba842554ea" +SRC_URI[sha256sum] = "4396aaec13510c3a1faa941a15a4b5335b6ae4fbec8438b9249b88c3b66187ee" diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb b/meta/recipes-bsp/alsa-state/alsa-state.bb index 17c2d002d5..d0f7bb3305 100644 --- a/meta/recipes-bsp/alsa-state/alsa-state.bb +++ b/meta/recipes-bsp/alsa-state/alsa-state.bb @@ -18,6 +18,8 @@ SRC_URI = "\ file://alsa-state-init \ " +S = "${WORKDIR}" + # As the recipe doesn't inherit systemd.bbclass, we need to set this variable # manually to avoid unnecessary postinst/preinst generated. python __anonymous() { diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make.patch deleted file mode 100644 index 27c94e8a74..0000000000 --- a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix parallel make failure - -Upstream-Status: Submitted [Maintainer directly] - -Add a missing dependency which resulted in a race leading to failure -on larger values of -j. - -Signed-off-by: Darren Hart <dvhart@linux.intel.com> - -Index: gnu-efi-3.0/Makefile -=================================================================== ---- gnu-efi-3.0.orig/Makefile -+++ gnu-efi-3.0/Makefile -@@ -42,6 +42,8 @@ include $(SRCDIR)/Make.defaults - - SUBDIRS = lib gnuefi inc apps - -+gnuefi: lib -+ - all: check_gcc $(SUBDIRS) - - $(SUBDIRS): diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.1.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.1.bb new file mode 100644 index 0000000000..ad7f2e368a --- /dev/null +++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.1.bb @@ -0,0 +1,40 @@ +SUMMARY = "Libraries for producing EFI binaries" +HOMEPAGE = "http://sourceforge.net/projects/gnu-efi/" +SECTION = "devel" +LICENSE = "GPLv2+ | BSD-2-Clause" +LIC_FILES_CHKSUM = "file://gnuefi/crt0-efi-arm.S;beginline=4;endline=9;md5=2240d7bbdf0928294c2f4a68b14d6591 \ + file://gnuefi/crt0-efi-aarch64.S;beginline=4;endline=16;md5=e582764a4776e60c95bf9ab617343d36 \ + file://inc/efishellintf.h;beginline=13;endline=20;md5=202766b79d708eff3cc70fce15fb80c7 \ + file://inc/efishellparm.h;beginline=4;endline=11;md5=468b1231b05bbc84bae3a0d5774e3bb5 \ + file://lib/arm/div64.S;beginline=6;endline=12;md5=a96c84f5ad12b4f011f98b5d039242f2 \ + file://lib/arm/math.c;beginline=4;endline=10;md5=64dd1987cee1dcf59d11aa572cfa644e \ + file://lib/arm/initplat.c;beginline=4;endline=10;md5=64dd1987cee1dcf59d11aa572cfa644e \ + file://lib/arm/lib1funcs.S;beginline=9;endline=33;md5=f56d5ebbc87136bc66cfe24db82bcf01 \ + file://lib/aarch64/math.c;beginline=9;endline=33;md5=cfade4c560e033a7bb02dab282872c7d \ + file://lib/aarch64/initplat.c;beginline=9;endline=33;md5=900cb1ffbe3e1ded344102be921830f1 \ + " + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ + file://parallel-make-archives.patch \ + " +SRC_URI[md5sum] = "c4099c443b6b0c2b04dedc33e7814ec0" +SRC_URI[sha256sum] = "e2e8d5940347eebfb00eaaeef107a8ba59e7838e40bc716c74d9a36fff648f1f" + +COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" + +def gnu_efi_arch(d): + import re + tarch = d.getVar("TARGET_ARCH", True) + if re.match("i[3456789]86", tarch): + return "ia32" + return tarch + +EXTRA_OEMAKE = "'ARCH=${@gnu_efi_arch(d)}' 'CC=${CC}' 'AS=${AS}' 'LD=${LD}' 'AR=${AR}' \ + 'RANLIB=${RANLIB}' 'OBJCOPY=${OBJCOPY}' 'PREFIX=${prefix}' 'LIBDIR=${libdir}' \ + " + +do_install() { + oe_runmake install INSTALLROOT="${D}" +} + +FILES_${PN} += "${libdir}/*.lds" diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0u.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0u.bb deleted file mode 100644 index dbf2a07a8a..0000000000 --- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0u.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Libraries for producing EFI binaries" -HOMEPAGE = "http://sourceforge.net/projects/gnu-efi/" -SECTION = "devel" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=5fb358a180f484b285b0d99acdc29666" - -SRC_URI = "http://downloads.sourceforge.net/gnu-efi/gnu-efi_3.0u.orig.tar.gz \ - file://parallel-make.patch \ - file://parallel-make-archives.patch \ - " -SRC_URI[md5sum] = "d15d3c700e79a1e2938544d73edc572d" -SRC_URI[sha256sum] = "3c0d450d5829204ca05dcb3b2aae772e52c379b7c7e09146759c6315606f934e" - -COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux" - -S = "${WORKDIR}/gnu-efi-3.0" - -def gnu_efi_arch(d): - import re - tarch = d.getVar("TARGET_ARCH", True) - if re.match("i[3456789]86", tarch): - return "ia32" - return tarch - -EXTRA_OEMAKE = "'ARCH=${@gnu_efi_arch(d)}' 'CC=${CC}' 'AS=${AS}' 'LD=${LD}' 'AR=${AR}' \ - 'RANLIB=${RANLIB}' 'OBJCOPY=${OBJCOPY}' 'PREFIX=${prefix}' 'LIBDIR=${libdir}' \ - " - -do_install() { - oe_runmake install INSTALLROOT="${D}" -} - -FILES_${PN} += "${libdir}/*.lds" diff --git a/meta/recipes-bsp/grub/files/cfg b/meta/recipes-bsp/grub/files/cfg index ffffe47638..8ca53d24d7 100644 --- a/meta/recipes-bsp/grub/files/cfg +++ b/meta/recipes-bsp/grub/files/cfg @@ -1,2 +1,2 @@ -search.file /EFI/BOOT/grub.cfg root +search.file ($cmdpath)/EFI/BOOT/grub.cfg root set prefix=($root)/EFI/BOOT diff --git a/meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch b/meta/recipes-bsp/grub/files/fix-endianness-problem.patch index 079992afba..079992afba 100644 --- a/meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch +++ b/meta/recipes-bsp/grub/files/fix-endianness-problem.patch diff --git a/meta/recipes-bsp/grub/files/grub-2.00-ignore-gnulib-gets-stupidity.patch b/meta/recipes-bsp/grub/files/grub-2.00-ignore-gnulib-gets-stupidity.patch deleted file mode 100644 index 70f60015c2..0000000000 --- a/meta/recipes-bsp/grub/files/grub-2.00-ignore-gnulib-gets-stupidity.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f66d54b934710f54999debb72e8b7c620edece1d Mon Sep 17 00:00:00 2001 -From: Peter Jones <pjones@redhat.com> -Date: Fri, 25 May 2012 15:28:19 -0400 -Subject: [PATCH] gnulib accused in build breaking shocker. - -Upstream-Status: pending [Fedora will push this] - ---- - grub-core/gnulib/stdio.in.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/grub-core/gnulib/stdio.in.h b/grub-core/gnulib/stdio.in.h -index 80b9dbf..69932d9 100644 ---- a/grub-core/gnulib/stdio.in.h -+++ b/grub-core/gnulib/stdio.in.h -@@ -141,7 +141,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ - #undef gets -+#if 0 - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+#endif - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ --- -1.7.10.1 - diff --git a/meta/recipes-bsp/grub/grub-2.00/grub-install.in.patch b/meta/recipes-bsp/grub/files/grub-install.in.patch index 326951df44..326951df44 100644 --- a/meta/recipes-bsp/grub/grub-2.00/grub-install.in.patch +++ b/meta/recipes-bsp/grub/files/grub-install.in.patch diff --git a/meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch b/meta/recipes-bsp/grub/files/grub2-remove-sparc64-setup-from-x86-builds.patch index 6259a1abe3..6259a1abe3 100644 --- a/meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch +++ b/meta/recipes-bsp/grub/files/grub2-remove-sparc64-setup-from-x86-builds.patch diff --git a/meta/recipes-bsp/grub/grub-2.00/remove-gets.patch b/meta/recipes-bsp/grub/files/remove-gets.patch index 463f7847ad..463f7847ad 100644 --- a/meta/recipes-bsp/grub/grub-2.00/remove-gets.patch +++ b/meta/recipes-bsp/grub/files/remove-gets.patch diff --git a/meta/recipes-bsp/grub/grub-efi_2.00.bb b/meta/recipes-bsp/grub/grub-efi_2.00.bb index d213f31a20..7b44eab8d1 100644 --- a/meta/recipes-bsp/grub/grub-efi_2.00.bb +++ b/meta/recipes-bsp/grub/grub-efi_2.00.bb @@ -1,39 +1,12 @@ -SUMMARY = "GRUB2 is the next-generation GRand Unified Bootloader" +require grub2.inc -DESCRIPTION = "GRUB2 is the next generaion of a GPLed bootloader \ -intended to unify bootloading across x86 operating systems. In \ -addition to loading the Linux kernel, it implements the Multiboot \ -standard, which allows for flexible loading of multiple boot images. \ -This recipe builds an EFI binary for the target. It does not install \ -or package anything, it only deploys a target-arch GRUB EFI image." - -HOMEPAGE = "http://www.gnu.org/software/grub/" -SECTION = "bootloaders" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -# FIXME: We should be able to optionally drop freetype as a dependency -DEPENDS = "autogen-native flex-native bison-native" DEPENDS_class-target = "grub-efi-native" -PR = "r2" +RDEPENDS_${PN}_class-target = "diffutils freetype" +PR = "r3" -SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ +SRC_URI += " \ file://cfg \ - file://grub-2.00-fpmath-sse-387-fix.patch \ - file://grub-2.00-fix-enable_execute_stack-check.patch \ - file://check-if-liblzma-is-disabled.patch \ - file://grub-no-unused-result.patch \ - file://grub-2.00-ignore-gnulib-gets-stupidity.patch \ - file://fix-issue-with-flex-2.5.37.patch \ - file://grub-efi-allow-a-compilation-without-mcmodel-large.patch \ - file://grub-2.00-add-oe-kernel.patch \ - file://grub-efi-fix-with-glibc-2.20.patch \ " -SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" -SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" - -COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' S = "${WORKDIR}/grub-${PV}" @@ -53,17 +26,13 @@ python __anonymous () { d.setVar("GRUB_IMAGE", grubimage) } -inherit autotools-brokensep gettext texinfo deploy +inherit deploy CACHED_CONFIGUREVARS += "ac_cv_path_HELP2MAN=" EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \ --enable-efiemu=no --program-prefix='' \ --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" -do_install_class-target() { - : -} - do_install_class-native() { install -d ${D}${bindir} install -m 755 grub-mkimage ${D}${bindir} @@ -86,7 +55,12 @@ do_deploy_class-native() { addtask deploy after do_install before do_build -FILES_${PN}-dbg += "${libdir}/${BPN}/${GRUB_TARGET}-efi/.debug" +FILES_${PN}-dbg += "${libdir}/grub/${GRUB_TARGET}-efi/.debug \ + /boot/efi/EFI/BOOT/${GRUB_TARGET}-efi/.debug \ + " +FILES_${PN} += "${libdir}/grub/${GRUB_TARGET}-efi \ + ${datadir}/grub \ + " BBCLASSEXTEND = "native" -ALLOW_EMPTY_${PN} = "1" + diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc new file mode 100644 index 0000000000..39469576cc --- /dev/null +++ b/meta/recipes-bsp/grub/grub2.inc @@ -0,0 +1,44 @@ +SUMMARY = "GRUB2 is the next-generation GRand Unified Bootloader" + +DESCRIPTION = "GRUB2 is the next generaion of a GPLed bootloader \ +intended to unify bootloading across x86 operating systems. In \ +addition to loading the Linux kernel, it implements the Multiboot \ +standard, which allows for flexible loading of multiple boot images." + +HOMEPAGE = "http://www.gnu.org/software/grub/" +SECTION = "bootloaders" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ + file://grub-2.00-fpmath-sse-387-fix.patch \ + file://check-if-liblzma-is-disabled.patch \ + file://fix-issue-with-flex-2.5.37.patch \ + file://grub-2.00-add-oe-kernel.patch \ + file://grub-install.in.patch \ + file://remove-gets.patch \ + file://fix-endianness-problem.patch \ + file://grub2-remove-sparc64-setup-from-x86-builds.patch \ + file://grub-2.00-fix-enable_execute_stack-check.patch \ + file://grub-no-unused-result.patch \ + file://grub-efi-allow-a-compilation-without-mcmodel-large.patch \ + file://grub-efi-fix-with-glibc-2.20.patch \ + " + +DEPENDS = "flex-native bison-native xz" + +SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" +SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" + +COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' + +inherit autotools gettext texinfo + +# grub and grub-efi's sysroot/${datadir}/grub/grub-mkconfig_lib are +# conflicted, remove it since no one uses it. +SYSROOT_PREPROCESS_FUNCS_class-target += "remove_sysroot_mkconfig_lib" +remove_sysroot_mkconfig_lib() { + rm -r "${SYSROOT_DESTDIR}${datadir}/grub/grub-mkconfig_lib" +} + diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/meta/recipes-bsp/grub/grub_2.00.bb index e2fcbb98f5..a11e960fe5 100644 --- a/meta/recipes-bsp/grub/grub_2.00.bb +++ b/meta/recipes-bsp/grub/grub_2.00.bb @@ -1,41 +1,11 @@ -SUMMARY = "GRUB2 is the next-generation GRand Unified Bootloader" +require grub2.inc -DESCRIPTION = "GRUB2 is the next generaion of a GPLed bootloader \ -intended to unify bootloading across x86 operating systems. In \ -addition to loading the Linux kernel, it implements the Multiboot \ -standard, which allows for flexible loading of multiple boot images." - -HOMEPAGE = "http://www.gnu.org/software/grub/" -SECTION = "bootloaders" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = "autogen-native flex-native bison-native xz" RDEPENDS_${PN} = "diffutils freetype" PR = "r1" -SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ - file://grub-install.in.patch \ - file://grub-2.00-fpmath-sse-387-fix.patch \ - file://remove-gets.patch \ - file://check-if-liblzma-is-disabled.patch \ - file://fix-issue-with-flex-2.5.37.patch \ - file://grub-2.00-add-oe-kernel.patch \ - file://fix-endianness-problem.patch \ - file://grub2-remove-sparc64-setup-from-x86-builds.patch \ - " - -SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" -SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" - -COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' - FILES_${PN}-dbg += "${libdir}/${BPN}/i386-pc/.debug" -inherit autotools gettext texinfo - PACKAGECONFIG ??= "" PACKAGECONFIG[grub-mount] = "--enable-grub-mount,--disable-grub-mount,fuse" PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,lvm2" diff --git a/meta/recipes-bsp/grub/grub_git.bb b/meta/recipes-bsp/grub/grub_git.bb index 2a6392b82e..3ab675b298 100644 --- a/meta/recipes-bsp/grub/grub_git.bb +++ b/meta/recipes-bsp/grub/grub_git.bb @@ -1,17 +1,6 @@ -SUMMARY = "GRUB2 is the next-generation GRand Unified Bootloader" +require grub2.inc -DESCRIPTION = "GRUB2 is the next generaion of a GPLed bootloader \ -intended to unify bootloading across x86 operating systems. In \ -addition to loading the Linux kernel, it implements the Multiboot \ -standard, which allows for flexible loading of multiple boot images." - -HOMEPAGE = "http://www.gnu.org/software/grub/" -SECTION = "bootloaders" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = "autogen-native flex-native bison-native xz freetype" +DEPENDS += "autogen-native" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_arm = "1" @@ -19,6 +8,7 @@ DEFAULT_PREFERENCE_arm = "1" PV = "2.00+${SRCPV}" SRCREV = "87de66d9d83446ecddb29cfbdf7369102c8e209e" SRC_URI = "git://git.savannah.gnu.org/grub.git \ + file://grub-2.00-fpmath-sse-387-fix.patch \ file://autogen.sh-exclude-pc.patch \ file://grub-2.00-add-oe-kernel.patch \ file://0001-Fix-build-with-glibc-2.20.patch \ diff --git a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb index e2c7cc0344..e1d4c5477c 100644 --- a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb +++ b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb @@ -10,6 +10,8 @@ SRC_URI = "file://hostap_cs.modalias \ inherit allarch +S = "${WORKDIR}" + do_compile() { } diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb b/meta/recipes-bsp/keymaps/keymaps_1.0.bb index 925161b5d2..5793a76529 100644 --- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb +++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb @@ -26,6 +26,8 @@ SRC_URI = "file://keymap.sh \ INITSCRIPT_NAME = "keymap.sh" INITSCRIPT_PARAMS = "start 01 S ." +S = "${WORKDIR}" + do_install () { # Only install the script if 'sysvinit' is in DISTRO_FEATURES # THe ulitity this script provides could be achieved by systemd-vconsole-setup.service diff --git a/meta/recipes-bsp/pciutils/pciutils/lib-build-fix.patch b/meta/recipes-bsp/pciutils/pciutils/lib-build-fix.patch deleted file mode 100644 index 413ef0e1e5..0000000000 --- a/meta/recipes-bsp/pciutils/pciutils/lib-build-fix.patch +++ /dev/null @@ -1,92 +0,0 @@ -Link directly to lib/libpci.so.3.1.5 will hard code this versioned -string into lspci and other utilities, which is not desirable and -won't work. In the other hand, linking to a symbolic link lib/libpci.so -doesn't have this issue. - -Upstream-Status: Pending - -7/30/2010 - created by Qing He <qing.he@intel.com> - -diff --git a/Makefile b/Makefile -index 74c570a..31337e0 100644 ---- a/Makefile -+++ b/Makefile -@@ -56,9 +56,9 @@ PCIINC_INS=lib/config.h lib/header.h lib/pci.h lib/types.h - - export - --all: lib/$(PCILIB) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS) -+all: lib/$(PCILIB_DEV) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS) - --lib/$(PCILIB): $(PCIINC) force -+lib/$(PCILIB) lib/$(PCILIB_DEV): $(PCIINC) force - $(MAKE) -C lib all - - force: -@@ -66,8 +66,8 @@ force: - lib/config.h lib/config.mk: - cd lib && ./configure - --lspci: lspci.o ls-vpd.o ls-caps.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o common.o lib/$(PCILIB) --setpci: setpci.o common.o lib/$(PCILIB) -+lspci: lspci.o ls-vpd.o ls-caps.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o common.o lib/$(PCILIB_DEV) -+setpci: setpci.o common.o lib/$(PCILIB_DEV) - - LSPCIINC=lspci.h pciutils.h $(PCIINC) - lspci.o: lspci.c $(LSPCIINC) -@@ -89,7 +89,7 @@ update-pciids: update-pciids.sh - chmod +x $@ - - # The example of use of libpci --example: example.o lib/$(PCILIB) -+example: example.o lib/$(PCILIB_DEV) - example.o: example.c $(PCIINC) - - %: %.o -diff --git a/lib/Makefile b/lib/Makefile -index 1eb06a5..a8dab56 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -42,7 +42,7 @@ ifdef PCI_HAVE_PM_NBSD_LIBPCI - OBJS += nbsd-libpci - endif - --all: $(PCILIB) $(PCILIBPC) -+all: $(PCILIB_DEV) $(PCILIBPC) - - ifeq ($(SHARED),no) - $(PCILIB): $(addsuffix .o,$(OBJS)) -@@ -53,6 +53,9 @@ else - CFLAGS += -fPIC -fvisibility=hidden - $(PCILIB): $(addsuffix .o,$(OBJS)) - $(CC) -shared $(LDFLAGS) $(SONAME) -Wl,--version-script=libpci.ver -o $@ $^ $(LIB_LDLIBS) -+ -+$(PCILIB_DEV): $(PCILIB) -+ ln -s $< $@ - endif - - $(PCILIBPC): libpci.pc.in -diff --git a/lib/configure b/lib/configure -index 27388bc..6c508cf 100755 ---- a/lib/configure -+++ b/lib/configure -@@ -216,16 +216,18 @@ fi - echo "Checking whether to build a shared library... $SHARED (set manually)" - if [ "$SHARED" = no ] ; then - echo >>$m 'PCILIB=$(LIBNAME).a' -+ echo >>$m 'PCILIB_DEV=$(LIBNAME).a' - echo >>$m 'LDLIBS=$(WITH_LIBS)' - echo >>$m 'LIB_LDLIBS=' - else - echo >>$m 'PCILIB=$(LIBNAME).so.$(VERSION)' -+ echo >>$m 'PCILIB_DEV=$(LIBNAME).so' - # We link the dependencies _to_ the library, so we do not need explicit deps in .pc - echo >>$m 'LDLIBS=' - echo >>$m 'LIB_LDLIBS=$(WITH_LIBS)' - echo >>$c '#define PCI_SHARED_LIB' - if [ "$SHARED" = yes ] ; then -- echo >>$m 'SONAME=-Wl,-soname,$(LIBNAME).so$(ABI_VERSION)' -+ echo >>$m 'SONAME=-Wl,-soname -Wl,$(LIBNAME).so$(ABI_VERSION)' - fi - fi - echo >>$m 'PCILIBPC=$(LIBNAME).pc' diff --git a/meta/recipes-bsp/pciutils/pciutils_3.2.1.bb b/meta/recipes-bsp/pciutils/pciutils_3.3.0.bb index 6e29953210..b713512dc6 100644 --- a/meta/recipes-bsp/pciutils/pciutils_3.2.1.bb +++ b/meta/recipes-bsp/pciutils/pciutils_3.3.0.bb @@ -8,18 +8,18 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "zlib kmod" -SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ file://configure.patch \ - file://lib-build-fix.patch \ file://guess-fix.patch \ file://makefile.patch" -SRC_URI[md5sum] = "425b1acad6854cc2bbb06ac8e48e76fc" -SRC_URI[sha256sum] = "12d52b19042e2fd058af12e7d877bbbce72213cb3a0b5ec7ff0703ac09e3dcde" +SRC_URI[md5sum] = "3c19adf32a8457983b71ff376ef7dafe" +SRC_URI[sha256sum] = "413395d4bdc66fdedd6c993ed9083d1dd73812bf2a679d320f73de35c7801301" inherit multilib_header -PARALLEL_MAKE = "" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'hwdb', '', d)}" +PACKAGECONFIG[hwdb] = "HWDB=yes,HWDB=no,udev" PCI_CONF_FLAG = "ZLIB=yes DNS=yes SHARED=yes" @@ -27,15 +27,12 @@ PCI_CONF_FLAG = "ZLIB=yes DNS=yes SHARED=yes" do_configure () { ( cd lib && \ - ${PCI_CONF_FLAG} ./configure ${PV} ${datadir} ${TARGET_OS} ${TARGET_ARCH} + # EXTRA_OECONF for this recipe could only possibly contain 'HWDB=yes/no', so we put it + # before ./configure + ${PCI_CONF_FLAG} ${EXTRA_OECONF} ./configure ${PV} ${datadir} ${TARGET_OS} ${TARGET_ARCH} ) } -do_compile_prepend () { - # Avoid this error: ln: failed to create symbolic link `libpci.so': File exists - rm -f ${S}/lib/libpci.so -} - export PREFIX = "${prefix}" export SBINDIR = "${sbindir}" export SHAREDIR = "${datadir}" diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch new file mode 100644 index 0000000000..c9a7ada408 --- /dev/null +++ b/meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch @@ -0,0 +1,41 @@ +From 1b8ad348f8c712c8e0c16c49cc1c8e577e4d6d3e Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 5 Feb 2015 01:16:30 -0800 +Subject: [PATCH] Makefile: fix for parallel build + +Fixed: +| src/lex_config.c:34:25: fatal error: yacc_config.h: No such file or directory +| +| #include "yacc_config.h" +| ^ +| compilation terminated. + +And: +Compiling lex_config.c. + src/lex_config.l:34:25: fatal error: yacc_config.h: No such file or directory + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index d45fdc3..d4ffd7e 100644 +--- a/Makefile ++++ b/Makefile +@@ -246,7 +246,9 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/startup.o src/yacc_config.o src/lex_config + $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS) + $(QUIET) $(STRIPCMD) $@ + +-yacc_config.o lex_config.o: %.o: %.c ++lex_config.o: yacc_config.h ++ ++yacc_config.o lex_config.o: %.o: %.c: %.h + $(CC) -c -MD -O -pipe $(CPPFLAGS) $< + + debugtools: ccdv $(CBDUMP) $(CISDUMP) +-- +1.7.9.5 + diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils.inc b/meta/recipes-bsp/pcmciautils/pcmciautils.inc index eafe82045c..9d1c55bbad 100644 --- a/meta/recipes-bsp/pcmciautils/pcmciautils.inc +++ b/meta/recipes-bsp/pcmciautils/pcmciautils.inc @@ -1,5 +1,5 @@ SUMMARY = "Linux kernel userland utilities for the PCMCIA subsystem" -HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" +HOMEPAGE = "https://www.kernel.org/pub/linux/utils/kernel/pcmcia/" SECTION = "kernel/userland" LICENSE = "GPLv2" @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "udev sysfsutils flex-native" RDEPENDS_${PN} = "udev module-init-tools" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" +SRC_URI = "http://mirror.linux.org.au/linux/utils/kernel/pcmcia/${BP}.tar.bz2" S = "${WORKDIR}/pcmciautils-${PV}" @@ -23,7 +23,6 @@ LD = "${CC}" CFLAGS =+ "-I${S}/src" CFLAGS =+ "-DPCMCIAUTILS_VERSION=\\"${PV}\\"" -PARALLEL_MAKE = "" EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs' 'LEX=flex'" do_install () { diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb index 50629b4b14..fc76c44626 100644 --- a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb +++ b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb @@ -1,6 +1,8 @@ require pcmciautils.inc -SRC_URI += "file://makefile_fix.patch" +SRC_URI += "file://makefile_fix.patch \ + file://Makefile-fix-for-parallel-build.patch \ +" SRC_URI[md5sum] = "5d85669b3440baa4532363da6caaf1b4" SRC_URI[sha256sum] = "79e6ae441278e178c07501d492394ed2c0326fdb66894f6d040ec811b0dc8ed5" diff --git a/meta/recipes-bsp/u-boot/files/0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch b/meta/recipes-bsp/u-boot/files/0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch deleted file mode 100644 index 77e35bbc7c..0000000000 --- a/meta/recipes-bsp/u-boot/files/0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 5701384cea4a829b772bf7a96a74825b58c22385 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <denys@ti.com> -Date: Thu, 17 Apr 2014 12:25:40 -0400 -Subject: [PATCH] am335x_evm.h: Add, use DEFAULT_LINUX_BOOT_ENV environment - string - -Modified version of the patch currently being reviewed for mainline: -http://patchwork.ozlabs.org/patch/334861/ - -To deal with a reoccurring problem properly we need to specify addresses -for the Linux kernel, Flatted Device Tree and ramdisk that obey the -constraints within the kernel's Documentation/arm/Booting file but also -make sure that we relocate things within a valid address range. - -Signed-off-by: Denys Dmytriyenko <denys@ti.com> -Signed-off-by: Tom Rini <trini@ti.com> - -Upstream-Status: Pending ---- - include/configs/am335x_evm.h | 31 ++++++++++++++++++++++++++----- - 1 file changed, 26 insertions(+), 5 deletions(-) - -diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h -index c5a6d4b..01e32b3 100644 ---- a/include/configs/am335x_evm.h -+++ b/include/configs/am335x_evm.h -@@ -54,10 +54,7 @@ - #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - #ifndef CONFIG_SPL_BUILD - #define CONFIG_EXTRA_ENV_SETTINGS \ -- "loadaddr=0x80200000\0" \ -- "fdtaddr=0x80F80000\0" \ -- "fdt_high=0xffffffff\0" \ -- "rdaddr=0x81000000\0" \ -+ DEFAULT_LINUX_BOOT_ENV \ - "bootdir=/boot\0" \ - "bootfile=uImage\0" \ - "fdtfile=undefined\0" \ -@@ -197,7 +194,31 @@ - #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START \ - + (8 * 1024 * 1024)) - --#define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */ -+/* -+ * Our DDR memory always starts at 0x80000000 and U-Boot shall have -+ * relocated itself to higher in memory by the time this value is used. -+ * However, set this to a 32MB offset to allow for easier Linux kernel -+ * booting as the default is often used as the kernel load address. -+ */ -+#define CONFIG_SYS_LOAD_ADDR 0x82000000 /* Default load address */ -+ -+/* -+ * We setup defaults based on constraints from the Linux kernel, which should -+ * also be safe elsewhere. We have the default load at 32MB into DDR (for -+ * the kernel), FDT above 128MB (the maximum location for the end of the -+ * kernel), and the ramdisk 512KB above that (allowing for hopefully never -+ * seen large trees). We say all of this must be within the first 256MB -+ * as that will normally be within the kernel lowmem and thus visible via -+ * bootm_size and we only run on platforms with 256MB or more of memory. -+ */ -+#define DEFAULT_LINUX_BOOT_ENV \ -+ "loadaddr=0x82000000\0" \ -+ "kernel_addr_r=0x82000000\0" \ -+ "fdtaddr=0x88000000\0" \ -+ "fdt_addr_r=0x88000000\0" \ -+ "rdaddr=0x88080000\0" \ -+ "ramdisk_addr_r=0x88080000\0" \ -+ "bootm_size=0x10000000\0" - - #define CONFIG_MMC - #define CONFIG_GENERIC_MMC --- -1.9.2 - diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb deleted file mode 100644 index d686b33621..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" -SECTION = "bootloader" -DEPENDS = "mtd-utils" - -# This revision corresponds to the tag "v2013.07" -# We use the revision in order to avoid having to fetch it from the -# repo during parse -SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c" - -PV = "v2013.07+git${SRCPV}" - -SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" - -S = "${WORKDIR}/git" - -inherit uboot-config cross - -EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"' - -do_compile () { - oe_runmake ${UBOOT_MACHINE} - oe_runmake env -} - -do_install () { - install -d ${D}${bindir_cross} - install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv - install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv -} - -SYSROOT_PREPROCESS_FUNCS = "uboot_fw_utils_cross" -uboot_fw_utils_cross() { - sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross} -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch b/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch new file mode 100644 index 0000000000..381b505d1e --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch @@ -0,0 +1,36 @@ +From ee2d75513452aa6d5306fd380104adc8a2f6d8f2 Mon Sep 17 00:00:00 2001 +From: Masahiro Yamada <yamada.m@jp.panasonic.com> +Date: Wed, 3 Dec 2014 10:22:50 +0900 +Subject: [PATCH] tools: env: fix build error + +Since CONFIG_SYS_ARCH, CONFIG_SYS_CPU, ... were moved to Kconfig, +tools/env/fw_printenv fails to build if CONFIG_ENV_VARS_UBOOT_CONFIG +is defined. +(I do not think this is the right way to fix the problem, but +for now I do not have enough time to take a close look.) + +Upstream-Status: Submitted [http://patchwork.ozlabs.org/patch/417192/] + +Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> +Reported-by: Denys Dmytriyenko <denys@ti.com> +--- + tools/env/fw_env.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c +index 1173eea..698fe51 100644 +--- a/tools/env/fw_env.c ++++ b/tools/env/fw_env.c +@@ -8,6 +8,9 @@ + * SPDX-License-Identifier: GPL-2.0+ + */ + ++/* FIXME: Do not include this */ ++#include <linux/kconfig.h> ++ + #include <errno.h> + #include <env_flags.h> + #include <fcntl.h> +-- +2.2.0 + diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb deleted file mode 100644 index 8bab432a76..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" -SECTION = "bootloader" -DEPENDS = "mtd-utils" - -# This revision corresponds to the tag "v2013.07" -# We use the revision in order to avoid having to fetch it from the -# repo during parse -SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c" - -PV = "v2013.07+git${SRCPV}" - -SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" - -S = "${WORKDIR}/git" - -EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTSTRIP="true"' - -inherit uboot-config - -do_compile () { - oe_runmake ${UBOOT_MACHINE} - oe_runmake env -} - -do_install () { - install -d ${D}${base_sbindir} - install -d ${D}${sysconfdir} - install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv - install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv - install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.01.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.01.bb new file mode 100644 index 0000000000..b310b0d0aa --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.01.bb @@ -0,0 +1,50 @@ +SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" +SECTION = "bootloader" +DEPENDS = "mtd-utils" + +# This revision corresponds to the tag "v2015.01" +# We use the revision in order to avoid having to fetch it from the +# repo during parse +SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368" + +PV = "v2015.01+git${SRCPV}" + +SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ + file://0001-tools-env-fix-build-error.patch" + +S = "${WORKDIR}/git" + +INSANE_SKIP_${PN} = "already-stripped" +EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' +EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' + +inherit uboot-config + +do_compile () { + oe_runmake ${UBOOT_MACHINE} + oe_runmake env +} + +do_install () { + install -d ${D}${base_sbindir} + install -d ${D}${sysconfdir} + install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv + install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config +} + +do_install_class-cross () { + install -d ${D}${bindir_cross} + install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv +} + +SYSROOT_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross" +uboot_fw_utils_cross() { + sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross} +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" +BBCLASSEXTEND = "cross" diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb deleted file mode 100644 index 3173b0ac73..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "U-Boot bootloader image creation tool" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" -SECTION = "bootloader" - -# This revision corresponds to the tag "v2013.07" -# We use the revision in order to avoid having to fetch it from the -# repo during parse -SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c" - -PV = "v2013.07+git${SRCPV}" - -SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" - -S = "${WORKDIR}/git" - -EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTLD="${LD}" HOSTLDFLAGS="${LDFLAGS}" HOSTSTRIP=true' - -do_compile () { - # Make sure the recompile is OK - rm -f ${B}/tools/.depend - - oe_runmake tools -} - -do_install () { - install -d ${D}${bindir} - install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage - ln -sf uboot-mkimage ${D}${bindir}/mkimage -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb new file mode 100644 index 0000000000..076dff8863 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb @@ -0,0 +1,32 @@ +SUMMARY = "U-Boot bootloader image creation tool" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" +SECTION = "bootloader" + +DEPENDS = "openssl" + +# This revision corresponds to the tag "v2015.01" +# We use the revision in order to avoid having to fetch it from the +# repo during parse +SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368" + +PV = "v2015.01+git${SRCPV}" + +SRC_URI = "git://git.denx.de/u-boot.git;branch=master" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1' + +do_compile () { + oe_runmake sandbox_defconfig + oe_runmake cross_tools NO_SDL=1 +} + +do_install () { + install -d ${D}${bindir} + install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage + ln -sf uboot-mkimage ${D}${bindir}/mkimage +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 602b71f39d..7053a56786 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -4,8 +4,7 @@ SECTION = "bootloaders" PROVIDES = "virtual/bootloader" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ - file://README;beginline=1;endline=22;md5=78b195c11cb6ef63e6985140db7d7bab" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" SRC_URI = "git://git.denx.de/u-boot.git;branch=master" @@ -15,7 +14,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit uboot-config deploy -EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"' +EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" V=1' # Allow setting an additional version string that will be picked up by the # u-boot build system and appended to the u-boot version. If the .scmversion @@ -24,7 +23,7 @@ UBOOT_LOCALVERSION ?= "" # Some versions of u-boot use .bin and others use .img. By default use .bin # but enable individual recipes to change this value. -UBOOT_SUFFIX ?= "bin" +UBOOT_SUFFIX ??= "bin" UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" UBOOT_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_SUFFIX}" @@ -63,15 +62,50 @@ do_compile () { echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion fi + + if [ "x${UBOOT_CONFIG}" != "x" ] + then + for config in ${UBOOT_MACHINE}; do + i=`expr $i + 1`; + for type in ${UBOOT_CONFIG}; do + j=`expr $j + 1`; + if [ $j -eq $i ] + then + oe_runmake O=${config} ${config} + oe_runmake O=${config} ${UBOOT_MAKE_TARGET} + cp ${S}/${config}/${UBOOT_BINARY} ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} + fi + done + unset j + done + else + oe_runmake ${UBOOT_MACHINE} + oe_runmake ${UBOOT_MAKE_TARGET} + fi - oe_runmake ${UBOOT_MACHINE} - oe_runmake ${UBOOT_MAKE_TARGET} } do_install () { - install -d ${D}/boot - install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} + if [ "x${UBOOT_CONFIG}" != "x" ] + then + for config in ${UBOOT_MACHINE}; do + i=`expr $i + 1`; + for type in ${UBOOT_CONFIG}; do + j=`expr $j + 1`; + if [ $j -eq $i ] + then + install -d ${D}/boot + install ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY} + fi + done + unset j + done + else + install -d ${D}/boot + install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} + ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} + fi if [ -e ${WORKDIR}/fw_env.config ] ; then install -d ${D}${sysconfdir} @@ -80,8 +114,25 @@ do_install () { if [ "x${SPL_BINARY}" != "x" ] then - install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} - ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARY} + if [ "x${UBOOT_CONFIG}" != "x" ] + then + for config in ${UBOOT_MACHINE}; do + i=`expr $i + 1`; + for type in ${UBOOT_CONFIG}; do + j=`expr $j + 1`; + if [ $j -eq $i ] + then + install ${S}/${config}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}-${type}-${PV}-${PR} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARY}-${type} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARY} + fi + done + unset j + done + else + install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} + ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARY} + fi fi if [ "x${UBOOT_ENV}" != "x" ] @@ -94,21 +145,62 @@ do_install () { FILES_${PN} = "/boot ${sysconfdir}" do_deploy () { - install -d ${DEPLOYDIR} - install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - - cd ${DEPLOYDIR} - rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY} - - if [ "x${SPL_BINARY}" != "x" ] + if [ "x${UBOOT_CONFIG}" != "x" ] then - install ${S}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE} - rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK} - ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARY} - ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK} - fi + for config in ${UBOOT_MACHINE}; do + i=`expr $i + 1`; + for type in ${UBOOT_CONFIG}; do + j=`expr $j + 1`; + if [ $j -eq $i ] + then + install -d ${DEPLOYDIR} + install ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} + cd ${DEPLOYDIR} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY} + fi + done + unset j + done + else + install -d ${DEPLOYDIR} + install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} + cd ${DEPLOYDIR} + rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK} + ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} + ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY} + fi + + + + if [ "x${SPL_BINARY}" != "x" ] + then + if [ "x${UBOOT_CONFIG}" != "x" ] + then + for config in ${UBOOT_MACHINE}; do + i=`expr $i + 1`; + for type in ${UBOOT_CONFIG}; do + j=`expr $j + 1`; + if [ $j -eq $i ] + then + install ${S}/${config}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}-${type}-${PV}-${PR} + rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_BINARY}-${type} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_BINARY} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK} + fi + done + unset j + done + else + install ${S}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE} + rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK} + ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARY} + ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK} + fi + fi + if [ "x${UBOOT_ENV}" != "x" ] then diff --git a/meta/recipes-bsp/u-boot/u-boot_2013.07.bb b/meta/recipes-bsp/u-boot/u-boot_2013.07.bb deleted file mode 100644 index f07fd7c567..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot_2013.07.bb +++ /dev/null @@ -1,9 +0,0 @@ -require u-boot.inc - -# This revision corresponds to the tag "v2013.07" -# We use the revision in order to avoid having to fetch it from the repo during parse -SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c" - -PV = "v2013.07+git${SRCPV}" - -SRC_URI += "file://0001-am335x_evm.h-Add-use-DEFAULT_LINUX_BOOT_ENV-environm.patch" diff --git a/meta/recipes-bsp/u-boot/u-boot_2015.01.bb b/meta/recipes-bsp/u-boot/u-boot_2015.01.bb new file mode 100644 index 0000000000..6feac3107d --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot_2015.01.bb @@ -0,0 +1,9 @@ +require u-boot.inc + +DEPENDS += "dtc-native" + +# This revision corresponds to the tag "v2015.01" +# We use the revision in order to avoid having to fetch it from the repo during parse +SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368" + +PV = "v2015.01+git${SRCPV}" diff --git a/meta/recipes-bsp/usbutils/usbutils-008/iconv.patch b/meta/recipes-bsp/usbutils/usbutils-008/iconv.patch new file mode 100644 index 0000000000..6455567174 --- /dev/null +++ b/meta/recipes-bsp/usbutils/usbutils-008/iconv.patch @@ -0,0 +1,41 @@ +This patch adds support for detecting iconv support using autotools +uclibc does not have iconv implementation inside libc like glibc, therefore +the existing checks were not sufficient, it worked for glibc but not for +uclibc. The new patch portably detects the iconv support and adds the +libiconv to linker cmdline + +This patch should be submitted upstream too + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: usbutils-008/configure.ac +=================================================================== +--- usbutils-008.orig/configure.ac ++++ usbutils-008/configure.ac +@@ -10,7 +10,9 @@ AC_USE_SYSTEM_EXTENSIONS + AC_SYS_LARGEFILE + + AC_CHECK_HEADERS([byteswap.h]) +-AC_CHECK_FUNCS([nl_langinfo iconv]) ++ ++AM_GNU_GETTEXT ++AM_ICONV + + PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.0) + +Index: usbutils-008/Makefile.am +=================================================================== +--- usbutils-008.orig/Makefile.am ++++ usbutils-008/Makefile.am +@@ -29,7 +29,8 @@ lsusb_CPPFLAGS = \ + + lsusb_LDADD = \ + $(LIBUSB_LIBS) \ +- $(UDEV_LIBS) ++ $(UDEV_LIBS) \ ++ $(LIBICONV) + + man_MANS = \ + lsusb.8 \ diff --git a/meta/recipes-bsp/usbutils/usbutils_008.bb b/meta/recipes-bsp/usbutils/usbutils_008.bb new file mode 100644 index 0000000000..0f2d8d47c4 --- /dev/null +++ b/meta/recipes-bsp/usbutils/usbutils_008.bb @@ -0,0 +1,28 @@ +SUMMARY = "Host side USB console utilities" +DESCRIPTION = "Contains the lsusb utility for inspecting the devices connected to the USB bus." +HOMEPAGE = "http://www.linux-usb.org" +SECTION = "base" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "libusb zlib virtual/libiconv systemd" + +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ + file://usb-devices-avoid-dependency-on-bash.patch \ + file://Fix-NULL-pointer-crash.patch \ + file://iconv.patch \ + " + +SRC_URI[md5sum] = "cb20148c2e784577e924a7b4c560c8fb" +SRC_URI[sha256sum] = "6d5f16c2961df37e22e492c736a3e162a8fde24480f23a40d85f79af80d3fe95" + +inherit autotools gettext pkgconfig distro_features_check +# This version of usbutils relies on the udev from systemd, so unless +# we can decouple udev from system, we require systemd for now. +REQUIRED_DISTRO_FEATURES = "systemd" + +FILES_${PN}-dev += "${datadir}/pkgconfig" + +RDEPENDS_${PN} = "libudev" +RDEPENDS_${PN}-ptest = "libboost-system libboost-thread" diff --git a/meta/recipes-connectivity/bind/bind/bind-add-crosscripts-search-path-for-xml2-config.patch b/meta/recipes-connectivity/bind/bind/bind-add-crosscripts-search-path-for-xml2-config.patch new file mode 100644 index 0000000000..4f1a3f8e89 --- /dev/null +++ b/meta/recipes-connectivity/bind/bind/bind-add-crosscripts-search-path-for-xml2-config.patch @@ -0,0 +1,35 @@ +From 8fa549fe5390875d56f75e20d364394cd5ccf388 Mon Sep 17 00:00:00 2001 +From: Joe MacDonald <joe_macdonald@mentor.com> +Date: Mon, 3 Nov 2014 21:52:02 -0500 +Subject: [PATCH] bind: add crosscripts search path for xml2-config + +The configure script was testing xml2-config from bin but in openembedded +bin folder is not copied to sysroot so the test was failing. Added another +condition to test libxml-2.0.pc which is present in lib folder. Used pkg-config +to get libs and cflags information. + +Upstream-Status: Inappropriate [ openembedded specific ] + +Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> +Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com> +--- + configure.in | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.in b/configure.in +index 3d04f4c..6032f67 100644 +--- a/configure.in ++++ b/configure.in +@@ -1433,6 +1433,9 @@ case "$use_libxml2" in + if test -f "$use_libxml2/bin/xml2-config" ; then + libxml2_libs=`$use_libxml2/bin/xml2-config --libs` + libxml2_cflags=`$use_libxml2/bin/xml2-config --cflags` ++ elif test -f "$use_libxml2/lib/pkgconfig/libxml-2.0.pc" ; then ++ libxml2_libs=`pkg-config libxml-2.0 --libs` ++ libxml2_cflags=`pkg-config libxml-2.0 --cflags` + fi + ;; + esac +-- +1.9.1 + diff --git a/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch b/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch new file mode 100644 index 0000000000..096d5d84fc --- /dev/null +++ b/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch @@ -0,0 +1,44 @@ +From 9b40619ff6fddfef2758ba797789f8487f412df3 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Mon, 16 Feb 2015 00:50:01 -0800 +Subject: [PATCH] confgen: don't build unix.o twice + +Fixed: +unix/os.o: file not recognized: File truncated +collect2: error: ld returned 1 exit status + +This is because os.o was built twice: +* The implicity rule (depends on unix/os.o) +* The "make all" in unix subdir (depends on unix/os.o) + +Depend on subdirs which is unix only rather than unix/os.o will fix the +problem. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + bin/confgen/Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in +index 8b3e5aa..4868a24 100644 +--- a/bin/confgen/Makefile.in ++++ b/bin/confgen/Makefile.in +@@ -74,11 +74,11 @@ rndc-confgen.@O@: rndc-confgen.c + ddns-confgen.@O@: ddns-confgen.c + ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c ${srcdir}/ddns-confgen.c + +-rndc-confgen@EXEEXT@: rndc-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS} ${CONFDEPLIBS} ++rndc-confgen@EXEEXT@: rndc-confgen.@O@ util.@O@ keygen.@O@ ${CONFDEPLIBS} $(SUBDIRS) + export BASEOBJS="rndc-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS}"; \ + ${FINALBUILDCMD} + +-ddns-confgen@EXEEXT@: ddns-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS} ${CONFDEPLIBS} ++ddns-confgen@EXEEXT@: ddns-confgen.@O@ util.@O@ keygen.@O@ ${CONFDEPLIBS} $(SUBDIRS) + export BASEOBJS="ddns-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS}"; \ + ${FINALBUILDCMD} + +-- +1.7.9.5 + diff --git a/meta/recipes-connectivity/bind/bind/bind-subdirs-run-serially.patch b/meta/recipes-connectivity/bind/bind/bind-subdirs-run-serially.patch new file mode 100644 index 0000000000..9db7a1786f --- /dev/null +++ b/meta/recipes-connectivity/bind/bind/bind-subdirs-run-serially.patch @@ -0,0 +1,35 @@ +From b24468b6fe1f136bfd854773bc0e117aca0012d5 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Wed, 28 Jan 2015 01:23:09 -0800 +Subject: [PATCH] lib/export/isc/Makefile.in: let SUBDIRS run serially + +Fix parallel issue:: +make[2]: *** No rule to make target `nls/msgcat.o', needed by `libisc.a'. Stop. +make[2]: *** Waiting for unfinished jobs.... +make[3]: Leaving directory `bind-9.9.5/lib/export/isc/unix' + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + lib/export/isc/Makefile.in | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/lib/export/isc/Makefile.in b/lib/export/isc/Makefile.in +index a92f66f..27dabcb 100644 +--- a/lib/export/isc/Makefile.in ++++ b/lib/export/isc/Makefile.in +@@ -103,6 +103,10 @@ SRCS = @ISC_EXTRA_SRCS@ \ + + LIBS = @LIBS@ + ++# Note: the order of SUBDIRS is important. ++# Attempt to disable parallel processing. ++.NOTPARALLEL: ++.NO_PARALLEL: + SUBDIRS = include unix nls @ISC_THREAD_DIR@ + TARGETS = timestamp + +-- +1.7.9.5 + diff --git a/meta/recipes-connectivity/bind/bind/bind9_9_5-CVE-2014-8500.patch b/meta/recipes-connectivity/bind/bind/bind9_9_5-CVE-2014-8500.patch new file mode 100644 index 0000000000..62142d2313 --- /dev/null +++ b/meta/recipes-connectivity/bind/bind/bind9_9_5-CVE-2014-8500.patch @@ -0,0 +1,990 @@ +From 603a0e2637b35a2da820bc807f69bcf09c682dce Mon Sep 17 00:00:00 2001 +From: Evan Hunt <each@isc.org> +Date: Mon, 17 Nov 2014 23:49:07 -0800 +Subject: [PATCH] [v9_9] limit recursion depth and iterative queries + +4006. [security] A flaw in delegation handling could be exploited + to put named into an infinite loop. This has + been addressed by placing limits on the number + of levels of recursion named will allow (default 7), + and the number of iterative queries that it will + send (default 50) before terminating a recursive + query (CVE-2014-8500). + + The recursion depth limit is configured via the + "max-recursion-depth" option. [RT #35780] + +Upstream-Status: Backport + +Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> +--- + bin/named/config.c | 3 +- + bin/named/include/named/query.h | 2 - + bin/named/query.c | 7 ++- + bin/named/server.c | 5 ++ + bin/tests/system/many/clean.sh | 7 +++ + bin/tests/system/many/ns1/named.conf | 33 +++++++++++++ + bin/tests/system/many/ns2/named.conf | 30 ++++++++++++ + bin/tests/system/many/ns3/named.conf | 32 +++++++++++++ + bin/tests/system/many/ns4/named.conf | 30 ++++++++++++ + bin/tests/system/many/ns5/hints.db | 2 + + bin/tests/system/many/ns5/named.conf | 29 ++++++++++++ + bin/tests/system/many/setup.sh | 75 ++++++++++++++++++++++++++++++ + bin/tests/system/many/tests.sh | 48 +++++++++++++++++++ + doc/arm/Bv9ARM-book.xml | 12 +++++ + lib/dns/adb.c | 58 ++++++++++++++++------- + lib/dns/include/dns/adb.h | 8 ++++ + lib/dns/include/dns/resolver.h | 25 ++++++++++ + lib/dns/resolver.c | 90 ++++++++++++++++++++++++++++++------ + lib/isccfg/namedconf.c | 1 + + 20 files changed, 471 insertions(+), 37 deletions(-) + create mode 100644 bin/tests/system/many/clean.sh + create mode 100644 bin/tests/system/many/ns1/named.conf + create mode 100644 bin/tests/system/many/ns2/named.conf + create mode 100644 bin/tests/system/many/ns3/named.conf + create mode 100644 bin/tests/system/many/ns4/named.conf + create mode 100644 bin/tests/system/many/ns5/hints.db + create mode 100644 bin/tests/system/many/ns5/named.conf + create mode 100644 bin/tests/system/many/setup.sh + create mode 100644 bin/tests/system/many/tests.sh + +diff --git a/bin/named/config.c b/bin/named/config.c +index 2782720..5ee8c4e 100644 +--- a/bin/named/config.c ++++ b/bin/named/config.c +@@ -15,8 +15,6 @@ + * PERFORMANCE OF THIS SOFTWARE. + */ + +-/* $Id: config.c,v 1.123 2012/01/06 23:46:41 tbox Exp $ */ +- + /*! \file */ + + #include <config.h> +@@ -160,6 +158,7 @@ options {\n\ + dnssec-accept-expired no;\n\ + clients-per-query 10;\n\ + max-clients-per-query 100;\n\ ++ max-recursion-depth 7;\n\ + zero-no-soa-ttl-cache no;\n\ + nsec3-test-zone no;\n\ + allow-new-zones no;\n\ +diff --git a/bin/named/include/named/query.h b/bin/named/include/named/query.h +index 3beabb8..b5e3900 100644 +--- a/bin/named/include/named/query.h ++++ b/bin/named/include/named/query.h +@@ -15,8 +15,6 @@ + * PERFORMANCE OF THIS SOFTWARE. + */ + +-/* $Id: query.h,v 1.45 2011/01/13 04:59:24 tbox Exp $ */ +- + #ifndef NAMED_QUERY_H + #define NAMED_QUERY_H 1 + +diff --git a/bin/named/query.c b/bin/named/query.c +index 982f76d..47bfc6a 100644 +--- a/bin/named/query.c ++++ b/bin/named/query.c +@@ -3877,12 +3877,11 @@ query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qname, + peeraddr = &client->peeraddr; + else + peeraddr = NULL; +- result = dns_resolver_createfetch2(client->view->resolver, ++ result = dns_resolver_createfetch3(client->view->resolver, + qname, qtype, qdomain, nameservers, + NULL, peeraddr, client->message->id, +- client->query.fetchoptions, +- client->task, +- query_resume, client, ++ client->query.fetchoptions, 0, ++ client->task, query_resume, client, + rdataset, sigrdataset, + &client->query.fetch); + +diff --git a/bin/named/server.c b/bin/named/server.c +index ac015a4..0559977 100644 +--- a/bin/named/server.c ++++ b/bin/named/server.c +@@ -3161,6 +3161,11 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, + cfg_obj_asuint32(obj), + max_clients_per_query); + ++ obj = NULL; ++ result = ns_config_get(maps, "max-recursion-depth", &obj); ++ INSIST(result == ISC_R_SUCCESS); ++ dns_resolver_setmaxdepth(view->resolver, cfg_obj_asuint32(obj)); ++ + #ifdef ALLOW_FILTER_AAAA_ON_V4 + obj = NULL; + result = ns_config_get(maps, "filter-aaaa-on-v4", &obj); +diff --git a/bin/tests/system/many/clean.sh b/bin/tests/system/many/clean.sh +new file mode 100644 +index 0000000..119b1f5 +--- /dev/null ++++ b/bin/tests/system/many/clean.sh +@@ -0,0 +1,7 @@ ++rm -f ns1/[1-9]*example.tld?.db ++rm -f ns2/[1-9]*example.tld?.db ++rm -f ns1/zones.conf ++rm -f ns2/zones.conf ++rm -f */root.db ++rm -f ns3/tld1.db ++rm -f ns4/tld2.db +diff --git a/bin/tests/system/many/ns1/named.conf b/bin/tests/system/many/ns1/named.conf +new file mode 100644 +index 0000000..abc9dca +--- /dev/null ++++ b/bin/tests/system/many/ns1/named.conf +@@ -0,0 +1,33 @@ ++/* ++ * Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH ++ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY ++ * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, ++ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM ++ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE ++ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++controls { /* empty */ }; ++ ++options { ++ query-source address 10.53.0.1; ++ notify-source 10.53.0.1; ++ transfer-source 10.53.0.1; ++ port 5300; ++ pid-file "named.pid"; ++ listen-on { 10.53.0.1; }; ++ listen-on-v6 { none; }; ++ recursion no; ++}; ++ ++include "zones.conf"; ++ ++// zone "tld1" { type master; file "tld1.db"; }; ++// zone "tld2" { type master; file "tld2.db"; }; +diff --git a/bin/tests/system/many/ns2/named.conf b/bin/tests/system/many/ns2/named.conf +new file mode 100644 +index 0000000..16266e2 +--- /dev/null ++++ b/bin/tests/system/many/ns2/named.conf +@@ -0,0 +1,30 @@ ++/* ++ * Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH ++ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY ++ * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, ++ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM ++ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE ++ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++controls { /* empty */ }; ++ ++options { ++ query-source address 10.53.0.2; ++ notify-source 10.53.0.2; ++ transfer-source 10.53.0.2; ++ port 5300; ++ pid-file "named.pid"; ++ listen-on { 10.53.0.2; }; ++ listen-on-v6 { none; }; ++ recursion no; ++}; ++ ++include "zones.conf"; +diff --git a/bin/tests/system/many/ns3/named.conf b/bin/tests/system/many/ns3/named.conf +new file mode 100644 +index 0000000..b950afe +--- /dev/null ++++ b/bin/tests/system/many/ns3/named.conf +@@ -0,0 +1,32 @@ ++/* ++ * Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH ++ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY ++ * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, ++ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM ++ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE ++ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++controls { /* empty */ }; ++ ++options { ++ query-source address 10.53.0.3; ++ notify-source 10.53.0.3; ++ transfer-source 10.53.0.3; ++ port 5300; ++ pid-file "named.pid"; ++ listen-on { 10.53.0.3; }; ++ listen-on-v6 { none; }; ++ recursion no; ++}; ++ ++zone "." { type master; file "root.db"; }; ++ ++zone "tld1" { type master; file "tld1.db"; }; +diff --git a/bin/tests/system/many/ns4/named.conf b/bin/tests/system/many/ns4/named.conf +new file mode 100644 +index 0000000..ca9aa6a +--- /dev/null ++++ b/bin/tests/system/many/ns4/named.conf +@@ -0,0 +1,30 @@ ++/* ++ * Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH ++ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY ++ * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, ++ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM ++ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE ++ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++controls { /* empty */ }; ++ ++options { ++ query-source address 10.53.0.4; ++ notify-source 10.53.0.4; ++ transfer-source 10.53.0.4; ++ port 5300; ++ pid-file "named.pid"; ++ listen-on { 10.53.0.4; }; ++ listen-on-v6 { none; }; ++ recursion no; ++}; ++ ++zone "tld2" { type master; file "tld2.db"; }; +diff --git a/bin/tests/system/many/ns5/hints.db b/bin/tests/system/many/ns5/hints.db +new file mode 100644 +index 0000000..c05809b +--- /dev/null ++++ b/bin/tests/system/many/ns5/hints.db +@@ -0,0 +1,2 @@ ++. 60 in ns ns.nil. ++ns.nil. 60 in A 10.53.0.3 +diff --git a/bin/tests/system/many/ns5/named.conf b/bin/tests/system/many/ns5/named.conf +new file mode 100644 +index 0000000..fce7d59 +--- /dev/null ++++ b/bin/tests/system/many/ns5/named.conf +@@ -0,0 +1,29 @@ ++/* ++ * Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH ++ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY ++ * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, ++ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM ++ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE ++ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++controls { /* empty */ }; ++ ++options { ++ query-source address 10.53.0.5; ++ notify-source 10.53.0.5; ++ transfer-source 10.53.0.5; ++ port 5300; ++ pid-file "named.pid"; ++ listen-on { 10.53.0.5; }; ++ listen-on-v6 { none; }; ++}; ++ ++zone "." { type hint; file "hints.db"; }; +diff --git a/bin/tests/system/many/setup.sh b/bin/tests/system/many/setup.sh +new file mode 100644 +index 0000000..80695b5 +--- /dev/null ++++ b/bin/tests/system/many/setup.sh +@@ -0,0 +1,75 @@ ++i=1 ++ ++cat > ns3/root.db << EOF ++. 60 in soa ns.nil. hostmaster.ns.nil. 1 0 0 0 0 ++. 60 in ns ns.nil. ++ns.nil. 60 in a 10.53.0.3 ++tld1. 60 in ns ns.tld1. ++ns.tld1. 60 in a 10.53.0.3 ++tld2. 60 in ns ns.tld2. ++ns.tld2. 60 in a 10.53.0.4 ++EOF ++ ++cat > ns3/tld1.db << EOF ++tld1. 60 in soa ns.tld1. hostmaster.ns.tld1. 1 0 0 0 0 ++tld1. 60 in ns ns.tld1. ++ns.tld1. 60 in a 10.53.0.1 ++EOF ++ ++cat > ns4/tld2.db << EOF ++tld2. 60 in soa ns.tld2. hostmaster.ns.tld4. 1 0 0 0 0 ++tld2. 60 in ns ns.tld2. ++ns.tld2. 60 in a 10.53.0.1 ++EOF ++ ++: > ns1/zones.conf ++: > ns2/zones.conf ++ ++while [ $i -lt 1000 ] ++do ++j=`expr $i + 1` ++s=`expr $j % 2 + 1` ++n=`expr $i % 2 + 1` ++t=`expr $s + 2` ++ ++# i=1 j=2 s=1 n=2 ++# i=2 j=3 s=1 n=2 ++# i=3 j=4 s=1 n=2 ++ ++cat > ns1/${i}example.tld${s}.db << EOF ++${i}example.tld${s}. 60 in soa ns.${j}example.tld${n}. hostmaster 1 0 0 0 0 ++${i}example.tld${s}. 60 in ns ns.${j}example.tld${n}. ++ns.${i}example.tld${s}. 60 in a 10.53.0.1 ++EOF ++ ++cat >> ns1/zones.conf << EOF ++zone "${i}example.tld${s}" { type master; file "${i}example.tld${s}.db"; }; ++EOF ++ ++cat >> ns${t}/tld${s}.db << EOF ++${i}example.tld${s}. 60 in ns ns.${j}example.tld${n}. ++EOF ++ ++i=$j ++ ++done ++ ++j=`expr $i + 1` ++s=`expr $j % 2 + 1` ++n=`expr $s % 2 + 1` ++t=`expr $s + 2` ++ ++cat > ns1/${i}example.tld${s}.db << EOF ++${i}example.tld${s}. 60 in soa ns.${i}example.tld${s}. hostmaster 1 0 0 0 0 ++${i}example.tld${s}. 60 in ns ns.${i}example.tld${s}. ++ns.${i}example.tld${s}. 60 in a 10.53.0.1 ++EOF ++ ++cat >> ns1/zones.conf << EOF ++zone "${i}example.tld${s}" { type master; file "${i}example.tld${s}.db"; }; ++EOF ++ ++cat >> ns${t}/tld${s}.db << EOF ++${i}example.tld${s}. 60 in ns ns.${i}example.tld${s}. ++ns.${i}example.tld${s}. 60 in a 10.53.0.1 ++EOF +diff --git a/bin/tests/system/many/tests.sh b/bin/tests/system/many/tests.sh +new file mode 100644 +index 0000000..37964e2 +--- /dev/null ++++ b/bin/tests/system/many/tests.sh +@@ -0,0 +1,48 @@ ++#!/bin/sh ++# ++# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") ++# ++# Permission to use, copy, modify, and/or distribute this software for any ++# purpose with or without fee is hereby granted, provided that the above ++# copyright notice and this permission notice appear in all copies. ++# ++# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH ++# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY ++# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, ++# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM ++# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE ++# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++# PERFORMANCE OF THIS SOFTWARE. ++ ++SYSTEMTESTTOP=.. ++. $SYSTEMTESTTOP/conf.sh ++ ++status=0 ++n=0 ++ ++n=`expr $n + 1` ++echo "I: attempt lookup 1example.tld2 soa ($n)" ++ret=0 ++$DIG +tcp 1example.tld1 soa @10.53.0.5 -p 5300 > dig.out.test$n ++grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1 ++if [ $ret != 0 ]; then echo "I:failed"; fi ++status=`expr $status + $ret` ++ ++n=`expr $n + 1` ++echo "I: attempt lookup 992example.tld2 soa ($n)" ++ret=0 ++$DIG +tcp 992example.tld2 soa @10.53.0.5 -p 5300 > dig.out.test$n ++grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1 ++if [ $ret != 0 ]; then echo "I:failed"; fi ++status=`expr $status + $ret` ++ ++n=`expr $n + 1` ++echo "I: attempt lookup 993example.tld1 soa ($n)" ++ret=0 ++$DIG +tcp 993example.tld1 soa @10.53.0.5 -p 5300 > dig.out.test$n ++grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1 ++if [ $ret != 0 ]; then echo "I:failed"; fi ++status=`expr $status + $ret` ++ ++echo "I:exit status: $status" ++exit $status +diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml +index 9f7bd38..fff4249 100644 +--- a/doc/arm/Bv9ARM-book.xml ++++ b/doc/arm/Bv9ARM-book.xml +@@ -4861,6 +4861,7 @@ badresp:1,adberr:0,findfail:0,valfail:0] + <optional> max-acache-size <replaceable>size_spec</replaceable> ; </optional> + <optional> clients-per-query <replaceable>number</replaceable> ; </optional> + <optional> max-clients-per-query <replaceable>number</replaceable> ; </optional> ++ <optional> max-recursion-depth <replaceable>number</replaceable> ; </optional> + <optional> masterfile-format (<constant>text</constant>|<constant>raw</constant>) ; </optional> + <optional> empty-server <replaceable>name</replaceable> ; </optional> + <optional> empty-contact <replaceable>name</replaceable> ; </optional> +@@ -8680,6 +8681,17 @@ avoid-v6-udp-ports { 40000; range 50000 60000; }; + </listitem> + </varlistentry> + ++ <varlistentry id="max-recursion-depth"> ++ <term><command>max-recursion-depth</command></term> ++ <listitem> ++ <para> ++ Sets the maximum number of levels of recursion ++ permitted at any one time while resolving a name. ++ The default is 7. ++ </para> ++ </listitem> ++ </varlistentry> ++ + <varlistentry> + <term><command>notify-delay</command></term> + <listitem> +diff --git a/lib/dns/adb.c b/lib/dns/adb.c +index 2ccb51e..fe9b3f7 100644 +--- a/lib/dns/adb.c ++++ b/lib/dns/adb.c +@@ -199,6 +199,7 @@ struct dns_adbfetch { + unsigned int magic; + dns_fetch_t *fetch; + dns_rdataset_t rdataset; ++ unsigned int depth; + }; + + /*% +@@ -300,7 +301,7 @@ static inline void violate_locking_hierarchy(isc_mutex_t *, isc_mutex_t *); + static isc_boolean_t clean_namehooks(dns_adb_t *, dns_adbnamehooklist_t *); + static void clean_target(dns_adb_t *, dns_name_t *); + static void clean_finds_at_name(dns_adbname_t *, isc_eventtype_t, +- unsigned int); ++ isc_uint32_t, unsigned int); + static isc_boolean_t check_expire_namehooks(dns_adbname_t *, isc_stdtime_t); + static isc_boolean_t check_expire_entry(dns_adb_t *, dns_adbentry_t **, + isc_stdtime_t); +@@ -308,7 +309,7 @@ static void cancel_fetches_at_name(dns_adbname_t *); + static isc_result_t dbfind_name(dns_adbname_t *, isc_stdtime_t, + dns_rdatatype_t); + static isc_result_t fetch_name(dns_adbname_t *, isc_boolean_t, +- dns_rdatatype_t); ++ unsigned int, dns_rdatatype_t); + static inline void check_exit(dns_adb_t *); + static void destroy(dns_adb_t *); + static isc_boolean_t shutdown_names(dns_adb_t *); +@@ -984,7 +985,7 @@ kill_name(dns_adbname_t **n, isc_eventtype_t ev) { + * Clean up the name's various lists. These two are destructive + * in that they will always empty the list. + */ +- clean_finds_at_name(name, ev, DNS_ADBFIND_ADDRESSMASK); ++ clean_finds_at_name(name, ev, 0, DNS_ADBFIND_ADDRESSMASK); + result4 = clean_namehooks(adb, &name->v4); + result6 = clean_namehooks(adb, &name->v6); + clean_target(adb, &name->target); +@@ -1409,7 +1410,7 @@ event_free(isc_event_t *event) { + */ + static void + clean_finds_at_name(dns_adbname_t *name, isc_eventtype_t evtype, +- unsigned int addrs) ++ isc_uint32_t qtotal, unsigned int addrs) + { + isc_event_t *ev; + isc_task_t *task; +@@ -1469,6 +1470,7 @@ clean_finds_at_name(dns_adbname_t *name, isc_eventtype_t evtype, + ev->ev_sender = find; + find->result_v4 = find_err_map[name->fetch_err]; + find->result_v6 = find_err_map[name->fetch6_err]; ++ find->qtotal += qtotal; + ev->ev_type = evtype; + ev->ev_destroy = event_free; + ev->ev_destroy_arg = find; +@@ -1827,6 +1829,7 @@ new_adbfind(dns_adb_t *adb) { + h->flags = 0; + h->result_v4 = ISC_R_UNEXPECTED; + h->result_v6 = ISC_R_UNEXPECTED; ++ h->qtotal = 0; + ISC_LINK_INIT(h, publink); + ISC_LINK_INIT(h, plink); + ISC_LIST_INIT(h->list); +@@ -2799,6 +2802,19 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, + isc_stdtime_t now, dns_name_t *target, + in_port_t port, dns_adbfind_t **findp) + { ++ return (dns_adb_createfind2(adb, task, action, arg, name, ++ qname, qtype, options, now, ++ target, port, 0, findp)); ++} ++ ++isc_result_t ++dns_adb_createfind2(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, ++ void *arg, dns_name_t *name, dns_name_t *qname, ++ dns_rdatatype_t qtype, unsigned int options, ++ isc_stdtime_t now, dns_name_t *target, ++ in_port_t port, unsigned int depth, ++ dns_adbfind_t **findp) ++{ + dns_adbfind_t *find; + dns_adbname_t *adbname; + int bucket; +@@ -3029,7 +3045,7 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, + * Start V4. + */ + if (WANT_INET(wanted_fetches) && +- fetch_name(adbname, start_at_zone, ++ fetch_name(adbname, start_at_zone, depth, + dns_rdatatype_a) == ISC_R_SUCCESS) { + DP(DEF_LEVEL, + "dns_adb_createfind: started A fetch for name %p", +@@ -3040,7 +3056,7 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, + * Start V6. + */ + if (WANT_INET6(wanted_fetches) && +- fetch_name(adbname, start_at_zone, ++ fetch_name(adbname, start_at_zone, depth, + dns_rdatatype_aaaa) == ISC_R_SUCCESS) { + DP(DEF_LEVEL, + "dns_adb_createfind: " +@@ -3656,6 +3672,7 @@ fetch_callback(isc_task_t *task, isc_event_t *ev) { + isc_result_t result; + unsigned int address_type; + isc_boolean_t want_check_exit = ISC_FALSE; ++ isc_uint32_t qtotal = 0; + + UNUSED(task); + +@@ -3666,6 +3683,8 @@ fetch_callback(isc_task_t *task, isc_event_t *ev) { + adb = name->adb; + INSIST(DNS_ADB_VALID(adb)); + ++ qtotal = dev->qtotal; ++ + bucket = name->lock_bucket; + LOCK(&adb->namelocks[bucket]); + +@@ -3783,6 +3802,12 @@ fetch_callback(isc_task_t *task, isc_event_t *ev) { + DP(DEF_LEVEL, "adb: fetch of '%s' %s failed: %s", + buf, address_type == DNS_ADBFIND_INET ? "A" : "AAAA", + dns_result_totext(dev->result)); ++ /* ++ * Don't record a failure unless this is the initial ++ * fetch of a chain. ++ */ ++ if (fetch->depth > 1) ++ goto out; + /* XXXMLG Don't pound on bad servers. */ + if (address_type == DNS_ADBFIND_INET) { + name->expire_v4 = ISC_MIN(name->expire_v4, now + 300); +@@ -3814,15 +3839,14 @@ fetch_callback(isc_task_t *task, isc_event_t *ev) { + free_adbfetch(adb, &fetch); + isc_event_free(&ev); + +- clean_finds_at_name(name, ev_status, address_type); ++ clean_finds_at_name(name, ev_status, qtotal, address_type); + + UNLOCK(&adb->namelocks[bucket]); + } + + static isc_result_t +-fetch_name(dns_adbname_t *adbname, +- isc_boolean_t start_at_zone, +- dns_rdatatype_t type) ++fetch_name(dns_adbname_t *adbname, isc_boolean_t start_at_zone, ++ unsigned int depth, dns_rdatatype_t type) + { + isc_result_t result; + dns_adbfetch_t *fetch = NULL; +@@ -3867,12 +3891,14 @@ fetch_name(dns_adbname_t *adbname, + result = ISC_R_NOMEMORY; + goto cleanup; + } +- +- result = dns_resolver_createfetch(adb->view->resolver, &adbname->name, +- type, name, nameservers, NULL, +- options, adb->task, fetch_callback, +- adbname, &fetch->rdataset, NULL, +- &fetch->fetch); ++ fetch->depth = depth; ++ ++ result = dns_resolver_createfetch3(adb->view->resolver, &adbname->name, ++ type, name, nameservers, NULL, ++ NULL, 0, options, depth, adb->task, ++ fetch_callback, adbname, ++ &fetch->rdataset, NULL, ++ &fetch->fetch); + if (result != ISC_R_SUCCESS) + goto cleanup; + +diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h +index 35350ff..7501f01 100644 +--- a/lib/dns/include/dns/adb.h ++++ b/lib/dns/include/dns/adb.h +@@ -118,6 +118,8 @@ struct dns_adbfind { + isc_result_t result_v6; /*%< RO: v6 result */ + ISC_LINK(dns_adbfind_t) publink; /*%< RW: client use */ + ++ isc_uint32_t qtotal; ++ + /* Private */ + isc_mutex_t lock; /* locks all below */ + in_port_t port; +@@ -334,6 +336,12 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, + dns_rdatatype_t qtype, unsigned int options, + isc_stdtime_t now, dns_name_t *target, + in_port_t port, dns_adbfind_t **find); ++isc_result_t ++dns_adb_createfind2(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, ++ void *arg, dns_name_t *name, dns_name_t *qname, ++ dns_rdatatype_t qtype, unsigned int options, ++ isc_stdtime_t now, dns_name_t *target, in_port_t port, ++ unsigned int depth, dns_adbfind_t **find); + /*%< + * Main interface for clients. The adb will look up the name given in + * "name" and will build up a list of found addresses, and perhaps start +diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h +index 4e20eb6..c256049 100644 +--- a/lib/dns/include/dns/resolver.h ++++ b/lib/dns/include/dns/resolver.h +@@ -82,6 +82,7 @@ typedef struct dns_fetchevent { + isc_sockaddr_t * client; + dns_messageid_t id; + isc_result_t vresult; ++ isc_uint32_t qtotal; + } dns_fetchevent_t; + + /* +@@ -275,6 +276,18 @@ dns_resolver_createfetch2(dns_resolver_t *res, dns_name_t *name, + dns_rdataset_t *rdataset, + dns_rdataset_t *sigrdataset, + dns_fetch_t **fetchp); ++isc_result_t ++dns_resolver_createfetch3(dns_resolver_t *res, dns_name_t *name, ++ dns_rdatatype_t type, ++ dns_name_t *domain, dns_rdataset_t *nameservers, ++ dns_forwarders_t *forwarders, ++ isc_sockaddr_t *client, isc_uint16_t id, ++ unsigned int options, unsigned int depth, ++ isc_task_t *task, ++ isc_taskaction_t action, void *arg, ++ dns_rdataset_t *rdataset, ++ dns_rdataset_t *sigrdataset, ++ dns_fetch_t **fetchp); + /*%< + * Recurse to answer a question. + * +@@ -576,6 +589,18 @@ dns_resolver_printbadcache(dns_resolver_t *resolver, FILE *fp); + * \li resolver to be valid. + */ + ++void ++dns_resolver_setmaxdepth(dns_resolver_t *resolver, unsigned int maxdepth); ++unsigned int ++dns_resolver_getmaxdepth(dns_resolver_t *resolver); ++/*% ++ * Get and set how many NS indirections will be followed when looking for ++ * nameserver addresses. ++ * ++ * Requires: ++ * \li resolver to be valid. ++ */ ++ + ISC_LANG_ENDDECLS + + #endif /* DNS_RESOLVER_H */ +diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c +index e517dad..6a635b2 100644 +--- a/lib/dns/resolver.c ++++ b/lib/dns/resolver.c +@@ -131,6 +131,16 @@ + #define MAXIMUM_QUERY_TIMEOUT 30 /* The maximum time in seconds for the whole query to live. */ + #endif + ++/* The default maximum number of recursions to follow before giving up. */ ++#ifndef DEFAULT_RECURSION_DEPTH ++#define DEFAULT_RECURSION_DEPTH 7 ++#endif ++ ++/* The default maximum number of iterative queries to allow before giving up. */ ++#ifndef DEFAULT_MAX_QUERIES ++#define DEFAULT_MAX_QUERIES 50 ++#endif ++ + /*% + * Maximum EDNS0 input packet size. + */ +@@ -297,6 +307,7 @@ struct fetchctx { + isc_uint64_t duration; + isc_boolean_t logged; + unsigned int querysent; ++ unsigned int totalqueries; + unsigned int referrals; + unsigned int lamecount; + unsigned int neterr; +@@ -307,6 +318,7 @@ struct fetchctx { + isc_boolean_t timeout; + dns_adbaddrinfo_t *addrinfo; + isc_sockaddr_t *client; ++ unsigned int depth; + }; + + #define FCTX_MAGIC ISC_MAGIC('F', '!', '!', '!') +@@ -419,6 +431,7 @@ struct dns_resolver { + isc_timer_t * spillattimer; + isc_boolean_t zero_no_soa_ttl; + unsigned int query_timeout; ++ unsigned int maxdepth; + + /* Locked by lock. */ + unsigned int references; +@@ -1097,6 +1110,7 @@ fctx_sendevents(fetchctx_t *fctx, isc_result_t result, int line) { + event->result == DNS_R_NCACHENXRRSET); + } + ++ event->qtotal = fctx->totalqueries; + isc_task_sendanddetach(&task, ISC_EVENT_PTR(&event)); + count++; + } +@@ -1537,7 +1551,9 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, + if (result != ISC_R_SUCCESS) + goto cleanup_dispatch; + } ++ + fctx->querysent++; ++ fctx->totalqueries++; + + ISC_LIST_APPEND(fctx->queries, query, link); + query->fctx->nqueries++; +@@ -2194,9 +2210,10 @@ fctx_finddone(isc_task_t *task, isc_event_t *event) { + */ + INSIST(!SHUTTINGDOWN(fctx)); + fctx->attributes &= ~FCTX_ATTR_ADDRWAIT; +- if (event->ev_type == DNS_EVENT_ADBMOREADDRESSES) ++ if (event->ev_type == DNS_EVENT_ADBMOREADDRESSES) { + want_try = ISC_TRUE; +- else { ++ fctx->totalqueries += find->qtotal; ++ } else { + fctx->findfail++; + if (fctx->pending == 0) { + /* +@@ -2479,12 +2496,13 @@ findname(fetchctx_t *fctx, dns_name_t *name, in_port_t port, + * See what we know about this address. + */ + find = NULL; +- result = dns_adb_createfind(fctx->adb, +- res->buckets[fctx->bucketnum].task, +- fctx_finddone, fctx, name, +- &fctx->name, fctx->type, +- options, now, NULL, +- res->view->dstport, &find); ++ result = dns_adb_createfind2(fctx->adb, ++ res->buckets[fctx->bucketnum].task, ++ fctx_finddone, fctx, name, ++ &fctx->name, fctx->type, ++ options, now, NULL, ++ res->view->dstport, ++ fctx->depth + 1, &find); + if (result != ISC_R_SUCCESS) { + if (result == DNS_R_ALIAS) { + /* +@@ -2592,6 +2610,11 @@ fctx_getaddresses(fetchctx_t *fctx, isc_boolean_t badcache) { + + res = fctx->res; + ++ if (fctx->depth > res->maxdepth) { ++ FCTXTRACE("too much NS indirection"); ++ return (DNS_R_SERVFAIL); ++ } ++ + /* + * Forwarders. + */ +@@ -3030,6 +3053,9 @@ fctx_try(fetchctx_t *fctx, isc_boolean_t retrying, isc_boolean_t badcache) { + + REQUIRE(!ADDRWAIT(fctx)); + ++ if (fctx->totalqueries > DEFAULT_MAX_QUERIES) ++ fctx_done(fctx, DNS_R_SERVFAIL, __LINE__); ++ + addrinfo = fctx_nextaddress(fctx); + if (addrinfo == NULL) { + /* +@@ -3388,6 +3414,7 @@ fctx_start(isc_task_t *task, isc_event_t *event) { + * Normal fctx startup. + */ + fctx->state = fetchstate_active; ++ fctx->totalqueries = 0; + /* + * Reset the control event for later use in shutting down + * the fctx. +@@ -3457,6 +3484,7 @@ fctx_join(fetchctx_t *fctx, isc_task_t *task, isc_sockaddr_t *client, + event->fetch = fetch; + event->client = client; + event->id = id; ++ event->qtotal = 0; + dns_fixedname_init(&event->foundname); + + /* +@@ -3493,7 +3521,8 @@ log_ns_ttl(fetchctx_t *fctx, const char *where) { + static isc_result_t + fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type, + dns_name_t *domain, dns_rdataset_t *nameservers, +- unsigned int options, unsigned int bucketnum, fetchctx_t **fctxp) ++ unsigned int options, unsigned int bucketnum, unsigned int depth, ++ fetchctx_t **fctxp) + { + fetchctx_t *fctx; + isc_result_t result; +@@ -3545,6 +3574,7 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type, + fctx->state = fetchstate_init; + fctx->want_shutdown = ISC_FALSE; + fctx->cloned = ISC_FALSE; ++ fctx->depth = depth; + ISC_LIST_INIT(fctx->queries); + ISC_LIST_INIT(fctx->finds); + ISC_LIST_INIT(fctx->altfinds); +@@ -3563,6 +3593,7 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type, + fctx->pending = 0; + fctx->restarts = 0; + fctx->querysent = 0; ++ fctx->totalqueries = 0; + fctx->referrals = 0; + TIME_NOW(&fctx->start); + fctx->timeouts = 0; +@@ -7781,6 +7812,7 @@ dns_resolver_create(dns_view_t *view, + res->spillattimer = NULL; + res->zero_no_soa_ttl = ISC_FALSE; + res->query_timeout = DEFAULT_QUERY_TIMEOUT; ++ res->maxdepth = DEFAULT_RECURSION_DEPTH; + res->nbuckets = ntasks; + res->activebuckets = ntasks; + res->buckets = isc_mem_get(view->mctx, +@@ -8219,9 +8251,9 @@ dns_resolver_createfetch(dns_resolver_t *res, dns_name_t *name, + dns_rdataset_t *sigrdataset, + dns_fetch_t **fetchp) + { +- return (dns_resolver_createfetch2(res, name, type, domain, ++ return (dns_resolver_createfetch3(res, name, type, domain, + nameservers, forwarders, NULL, 0, +- options, task, action, arg, ++ options, 0, task, action, arg, + rdataset, sigrdataset, fetchp)); + } + +@@ -8237,6 +8269,25 @@ dns_resolver_createfetch2(dns_resolver_t *res, dns_name_t *name, + dns_rdataset_t *sigrdataset, + dns_fetch_t **fetchp) + { ++ return (dns_resolver_createfetch3(res, name, type, domain, ++ nameservers, forwarders, client, id, ++ options, 0, task, action, arg, ++ rdataset, sigrdataset, fetchp)); ++} ++ ++isc_result_t ++dns_resolver_createfetch3(dns_resolver_t *res, dns_name_t *name, ++ dns_rdatatype_t type, ++ dns_name_t *domain, dns_rdataset_t *nameservers, ++ dns_forwarders_t *forwarders, ++ isc_sockaddr_t *client, dns_messageid_t id, ++ unsigned int options, unsigned int depth, ++ isc_task_t *task, ++ isc_taskaction_t action, void *arg, ++ dns_rdataset_t *rdataset, ++ dns_rdataset_t *sigrdataset, ++ dns_fetch_t **fetchp) ++{ + dns_fetch_t *fetch; + fetchctx_t *fctx = NULL; + isc_result_t result = ISC_R_SUCCESS; +@@ -8325,11 +8376,12 @@ dns_resolver_createfetch2(dns_resolver_t *res, dns_name_t *name, + + if (fctx == NULL) { + result = fctx_create(res, name, type, domain, nameservers, +- options, bucketnum, &fctx); ++ options, bucketnum, depth, &fctx); + if (result != ISC_R_SUCCESS) + goto unlock; + new_fctx = ISC_TRUE; +- } ++ } else if (fctx->depth > depth) ++ fctx->depth = depth; + + result = fctx_join(fctx, task, client, id, action, arg, + rdataset, sigrdataset, fetch); +@@ -9101,3 +9153,15 @@ dns_resolver_settimeout(dns_resolver_t *resolver, unsigned int seconds) { + + resolver->query_timeout = seconds; + } ++ ++void ++dns_resolver_setmaxdepth(dns_resolver_t *resolver, unsigned int maxdepth) { ++ REQUIRE(VALID_RESOLVER(resolver)); ++ resolver->maxdepth = maxdepth; ++} ++ ++unsigned int ++dns_resolver_getmaxdepth(dns_resolver_t *resolver) { ++ REQUIRE(VALID_RESOLVER(resolver)); ++ return (resolver->maxdepth); ++} +diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c +index bfd4bab..5f8b037 100644 +--- a/lib/isccfg/namedconf.c ++++ b/lib/isccfg/namedconf.c +@@ -1393,6 +1393,7 @@ view_clauses[] = { + { "max-cache-ttl", &cfg_type_uint32, 0 }, + { "max-clients-per-query", &cfg_type_uint32, 0 }, + { "max-ncache-ttl", &cfg_type_uint32, 0 }, ++ { "max-recursion-depth", &cfg_type_uint32, 0 }, + { "max-udp-size", &cfg_type_uint32, 0 }, + { "min-roots", &cfg_type_uint32, CFG_CLAUSEFLAG_NOTIMP }, + { "minimal-responses", &cfg_type_boolean, 0 }, +-- +1.9.1 + diff --git a/meta/recipes-connectivity/bind/bind/conf.patch b/meta/recipes-connectivity/bind/bind/conf.patch index 2785c6a22f..aad345f9fc 100644 --- a/meta/recipes-connectivity/bind/bind/conf.patch +++ b/meta/recipes-connectivity/bind/bind/conf.patch @@ -55,6 +55,22 @@ diff -urN bind-9.3.1.orig/conf/db.empty bind-9.3.1/conf/db.empty + 86400 ) ; Negative Cache TTL +; +@ IN NS localhost. +diff -urN bind-9.3.1.orig/conf/db.255 bind-9.3.1/conf/db.255 +--- bind-9.3.1.orig/conf/db.255 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/db.255 2005-07-10 22:14:00.000000000 +0200 +@@ -0,0 +1,12 @@ ++; ++; BIND reserve data file for broadcast zone ++; ++$TTL 604800 ++@ IN SOA localhost. root.localhost. ( ++ 1 ; Serial ++ 604800 ; Refresh ++ 86400 ; Retry ++ 2419200 ; Expire ++ 604800 ) ; Negative Cache TTL ++; ++@ IN NS localhost. diff -urN bind-9.3.1.orig/conf/db.local bind-9.3.1/conf/db.local --- bind-9.3.1.orig/conf/db.local 1970-01-01 01:00:00.000000000 +0100 +++ bind-9.3.1/conf/db.local 2005-07-10 22:14:00.000000000 +0200 @@ -261,7 +277,7 @@ diff -urN bind-9.3.1.orig/init.d bind-9.3.1/init.d + modprobe capability >/dev/null 2>&1 || true + if [ ! -f /etc/bind/rndc.key ]; then + /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom -+ chown 0640 /etc/bind/rndc.key ++ chmod 0640 /etc/bind/rndc.key + fi + if [ -f /var/run/named/named.pid ]; then + ps `cat /var/run/named/named.pid` > /dev/null && exit 1 diff --git a/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh b/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh index c2e88bf127..db201270fa 100644 --- a/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh +++ b/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh @@ -3,5 +3,5 @@ if [ ! -s /etc/bind/rndc.key ]; then echo -n "Generating /etc/bind/rndc.key:" /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom - chown 0640 /etc/bind/rndc.key + chmod 0640 /etc/bind/rndc.key fi diff --git a/meta/recipes-connectivity/bind/bind_9.9.5.bb b/meta/recipes-connectivity/bind/bind_9.9.5.bb index 635d27732b..e34cdedde7 100644 --- a/meta/recipes-connectivity/bind/bind_9.9.5.bb +++ b/meta/recipes-connectivity/bind/bind_9.9.5.bb @@ -17,6 +17,10 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ file://named.service \ file://bind9 \ file://init.d-add-support-for-read-only-rootfs.patch \ + file://bind9_9_5-CVE-2014-8500.patch \ + file://bind-add-crosscripts-search-path-for-xml2-config.patch \ + file://bind-subdirs-run-serially.patch \ + file://bind-confgen-build-unix.o-once.patch \ " SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e" @@ -28,10 +32,14 @@ EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \ --disable-devpoll --disable-epoll --with-gost=no \ --with-gssapi=no --with-ecdsa=yes \ --sysconfdir=${sysconfdir}/bind \ - --with-openssl=${STAGING_LIBDIR}/.. --with-libxml2=${STAGING_LIBDIR}/.. \ + --with-openssl=${STAGING_LIBDIR}/.. \ --enable-exportlib --with-export-includedir=${includedir} --with-export-libdir=${libdir} \ " -inherit autotools-brokensep update-rc.d systemd useradd +inherit autotools-brokensep update-rc.d systemd useradd pkgconfig + +PACKAGECONFIG ?= "libxml2" + +PACKAGECONFIG[libxml2] = "--with-libxml2=${STAGING_LIBDIR}/..,--with-libxml2=no,libxml2" USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system --home /var/cache/bind --no-create-home \ diff --git a/meta/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch b/meta/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch new file mode 100644 index 0000000000..1bc390f35a --- /dev/null +++ b/meta/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch @@ -0,0 +1,110 @@ +Avoid namepspace collision with encrypt function from libc + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Index: bluez-4.101/test/l2test.c +=================================================================== +--- bluez-4.101.orig/test/l2test.c ++++ bluez-4.101/test/l2test.c +@@ -107,7 +107,7 @@ static char *filename = NULL; + static int rfcmode = 0; + static int master = 0; + static int auth = 0; +-static int encrypt = 0; ++static int encryption_request = 0; + static int secure = 0; + static int socktype = SOCK_SEQPACKET; + static int linger = 0; +@@ -340,7 +340,7 @@ static int do_connect(char *svr) + opt |= L2CAP_LM_MASTER; + if (auth) + opt |= L2CAP_LM_AUTH; +- if (encrypt) ++ if (encryption_request) + opt |= L2CAP_LM_ENCRYPT; + if (secure) + opt |= L2CAP_LM_SECURE; +@@ -475,7 +475,7 @@ static void do_listen(void (*handler)(in + opt |= L2CAP_LM_MASTER; + if (auth) + opt |= L2CAP_LM_AUTH; +- if (encrypt) ++ if (encryption_request) + opt |= L2CAP_LM_ENCRYPT; + if (secure) + opt |= L2CAP_LM_SECURE; +@@ -1407,7 +1407,7 @@ int main(int argc, char *argv[]) + break; + + case 'E': +- encrypt = 1; ++ encryption_request = 1; + break; + + case 'S': +Index: bluez-4.101/test/rctest.c +=================================================================== +--- bluez-4.101.orig/test/rctest.c ++++ bluez-4.101/test/rctest.c +@@ -79,7 +79,7 @@ static char *filename = NULL; + + static int master = 0; + static int auth = 0; +-static int encrypt = 0; ++static int encryption_request = 0; + static int secure = 0; + static int socktype = SOCK_STREAM; + static int linger = 0; +@@ -200,7 +200,7 @@ static int do_connect(const char *svr) + opt |= RFCOMM_LM_MASTER; + if (auth) + opt |= RFCOMM_LM_AUTH; +- if (encrypt) ++ if (encryption_request) + opt |= RFCOMM_LM_ENCRYPT; + if (secure) + opt |= RFCOMM_LM_SECURE; +@@ -291,7 +291,7 @@ static void do_listen(void (*handler)(in + opt |= RFCOMM_LM_MASTER; + if (auth) + opt |= RFCOMM_LM_AUTH; +- if (encrypt) ++ if (encryption_request) + opt |= RFCOMM_LM_ENCRYPT; + if (secure) + opt |= RFCOMM_LM_SECURE; +@@ -701,7 +701,7 @@ int main(int argc, char *argv[]) + break; + + case 'E': +- encrypt = 1; ++ encryption_request = 1; + break; + + case 'S': +Index: bluez-4.101/src/textfile.h +=================================================================== +--- bluez-4.101.orig/src/textfile.h ++++ bluez-4.101/src/textfile.h +@@ -24,6 +24,8 @@ + #ifndef __TEXTFILE_H + #define __TEXTFILE_H + ++#include <sys/types.h> ++ + int create_dirs(const char *filename, const mode_t mode); + int create_file(const char *filename, const mode_t mode); + int create_name(char *buf, size_t size, const char *path, +Index: bluez-4.101/test/attest.c +=================================================================== +--- bluez-4.101.orig/test/attest.c ++++ bluez-4.101/test/attest.c +@@ -34,6 +34,7 @@ + #include <termios.h> + #include <sys/ioctl.h> + #include <sys/socket.h> ++#include <sys/select.h> + + #include <bluetooth/bluetooth.h> + #include <bluetooth/rfcomm.h> diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb index 28a94ed127..f900c7c7b0 100644 --- a/meta/recipes-connectivity/bluez/bluez4_4.101.bb +++ b/meta/recipes-connectivity/bluez/bluez4_4.101.bb @@ -9,6 +9,7 @@ SRC_URI += "file://bluetooth.conf \ file://network-fix-network-Connect-method-parameters.patch \ file://install-test-script.patch \ file://use-legacy-pygobject-instead-ofgobject-introspection.patch \ + file://fix_encrypt_collision.patch \ " SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad" diff --git a/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb b/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb index f2dc0da06c..c71d61253a 100644 --- a/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb +++ b/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb @@ -25,6 +25,7 @@ do_install_append() { rm -rf ${D}${libdir}/alsa-lib rm -rf ${D}${datadir} rm -rf ${D}${includedir} + rm -rf ${D}${nonarch_base_libdir} } FILES_${PN} = "${libdir}/gstreamer-0.10/lib*.so" diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index b385a916ef..67aafbbd6f 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -14,6 +14,7 @@ RCONFLICTS_${PN} = "bluez4" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} obex-profiles" PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" +PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental," SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ @@ -28,10 +29,19 @@ EXTRA_OECONF = "\ --disable-cups \ --enable-test \ --enable-datafiles \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--disable-systemd', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd', '--disable-systemd', d)} \ --enable-library \ " +# bluez5 builds a large number of useful utilities but does not +# install them. Specify which ones we want put into ${PN}-noinst-tools. +NOINST_TOOLS_READLINE ??= "" +NOINST_TOOLS_EXPERIMENTAL ??= "" +NOINST_TOOLS = " \ + ${NOINST_TOOLS_READLINE} \ + ${@bb.utils.contains('PACKAGECONFIG', 'experimental', '${NOINST_TOOLS_EXPERIMENTAL}', '', d)} \ +" + do_install_append() { install -d ${D}${sysconfdir}/bluetooth/ if [ -f ${S}/profiles/audio/audio.conf ]; then @@ -45,10 +55,15 @@ do_install_append() { fi # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/ + + # Install desired tools that upstream leaves in build area + for f in ${NOINST_TOOLS} ; do + install -m 755 ${B}/$f ${D}/${bindir} + done } ALLOW_EMPTY_libasound-module-bluez = "1" -PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex" +PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex ${PN}-noinst-tools" FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1" @@ -65,6 +80,16 @@ SYSTEMD_SERVICE_${PN}-obex = "obex.service" FILES_${PN}-testtools = "${libdir}/bluez/test/*" +def get_noinst_tools_paths (d, bb, tools): + s = list() + bindir = d.getVar("bindir", True) + for bdp in tools.split(): + f = os.path.basename(bdp) + s.append("%s/%s" % (bindir, f)) + return "\n".join(s) + +FILES_${PN}-noinst-tools = "${@get_noinst_tools_paths(d, bb, d.getVar('NOINST_TOOLS', True))}" + FILES_${PN}-dbg += "\ ${libdir}/${BPN}/bluetooth/.debug \ ${libdir}/bluetooth/plugins/.debug \ diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.22.bb b/meta/recipes-connectivity/bluez5/bluez5_5.22.bb deleted file mode 100644 index 04116ed9d0..0000000000 --- a/meta/recipes-connectivity/bluez5/bluez5_5.22.bb +++ /dev/null @@ -1,3 +0,0 @@ -require bluez5.inc -SRC_URI[md5sum] = "fd0783c8bc524bc9b26514aad1f85814" -SRC_URI[sha256sum] = "e8b866515a18116c7048a55081be9238a51447c9448ed20997b0432b13ba0882" diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.28.bb b/meta/recipes-connectivity/bluez5/bluez5_5.28.bb new file mode 100644 index 0000000000..e816998b63 --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5_5.28.bb @@ -0,0 +1,52 @@ +require bluez5.inc +SRC_URI[md5sum] = "bc20a8285530758c68f6a60e4ca62a15" +SRC_URI[sha256sum] = "85bab48f4b47a158739028682c1e09cf30099c8ea9dfe63360055f8e06fc18a9" + +# noinst programs in Makefile.tools that are conditional on READLINE +# support +NOINST_TOOLS_READLINE ?= " \ + attrib/gatttool \ + tools/obex-client-tool \ + tools/obex-server-tool \ + tools/bluetooth-player \ + tools/obexctl \ +" + +# noinst programs in Makefile.tools that are conditional on EXPERIMENTAL +# support +NOINST_TOOLS_EXPERIMENTAL ?= " \ + emulator/btvirt \ + emulator/b1ee \ + emulator/hfp \ + tools/3dsp \ + tools/mgmt-tester \ + tools/gap-tester \ + tools/l2cap-tester \ + tools/sco-tester \ + tools/smp-tester \ + tools/hci-tester \ + tools/rfcomm-tester \ + tools/bdaddr \ + tools/avinfo \ + tools/avtest \ + tools/scotest \ + tools/amptest \ + tools/hwdb \ + tools/hcieventmask \ + tools/hcisecfilter \ + tools/btmgmt \ + tools/btinfo \ + tools/btattach \ + tools/btsnoop \ + tools/btproxy \ + tools/btiotest \ + tools/mcaptest \ + tools/cltest \ + tools/oobtest \ + tools/seq2bseq \ + tools/ibeacon \ + tools/btgatt-client \ + tools/btgatt-server \ + tools/gatt-service \ + profiles/iap/iapd \ +" diff --git a/meta/recipes-connectivity/connman/connman-conf.bb b/meta/recipes-connectivity/connman/connman-conf.bb index af726401e2..2358d9df09 100644 --- a/meta/recipes-connectivity/connman/connman-conf.bb +++ b/meta/recipes-connectivity/connman/connman-conf.bb @@ -9,6 +9,8 @@ SRC_URI_append_qemuall = "file://wired.config \ " PR = "r2" +S = "${WORKDIR}" + PACKAGE_ARCH = "${MACHINE_ARCH}" FILES_${PN} = "${localstatedir}/* ${libdir}/*" diff --git a/meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch b/meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch index 0be516f054..f4049fa3e2 100644 --- a/meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch +++ b/meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch @@ -21,110 +21,110 @@ index c55e25c..9d818b2 100644 --- a/common/connman-client.c +++ b/common/connman-client.c @@ -289,7 +289,7 @@ gboolean connman_client_set_ipv4(ConnmanClient *client, const gchar *device, - - g_value_init(&value, DBUS_TYPE_G_DICTIONARY); - g_value_set_boxed(&value, ipv4); + + g_value_init(&value, DBUS_TYPE_G_DICTIONARY); + g_value_set_boxed(&value, ipv4); - ret = connman_set_property(proxy, "IPv4.Configuration", &value, NULL); + ret = net_connman_set_property(proxy, "IPv4.Configuration", &value, NULL); - - g_object_unref(proxy); - + + g_object_unref(proxy); + @@ -317,7 +317,7 @@ void connman_client_set_powered(ConnmanClient *client, const gchar *device, - g_value_set_boolean(&value, powered); - - error = NULL; + g_value_set_boolean(&value, powered); + + error = NULL; - connman_set_property(proxy, "Powered", &value, &error); + net_connman_set_property(proxy, "Powered", &value, &error); - if( error ) - fprintf (stderr, "error: %s\n", error->message); - + if( error ) + fprintf (stderr, "error: %s\n", error->message); + @@ -325,7 +325,7 @@ void connman_client_set_powered(ConnmanClient *client, const gchar *device, } - + void connman_client_scan(ConnmanClient *client, const gchar *device, - connman_scan_reply callback, gpointer user_data) + net_connman_scan_reply callback, gpointer user_data) { - ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client); - DBusGProxy *proxy; + ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client); + DBusGProxy *proxy; @@ -339,7 +339,7 @@ void connman_client_scan(ConnmanClient *client, const gchar *device, - if (proxy == NULL) - return; - + if (proxy == NULL) + return; + - connman_scan_async(proxy, callback, user_data); + net_connman_scan_async(proxy, callback, user_data); - - g_object_unref(proxy); + + g_object_unref(proxy); } @@ -353,7 +353,7 @@ gboolean connman_client_get_offline_status(ConnmanClient *client) - - DBG("client %p", client); - + + DBG("client %p", client); + - ret = connman_get_properties(priv->manager, &hash, NULL); + ret = net_connman_get_properties(priv->manager, &hash, NULL); - - if (ret == FALSE) - goto done; + + if (ret == FALSE) + goto done; @@ -375,7 +375,7 @@ void connman_client_set_offlinemode(ConnmanClient *client, gboolean status) - g_value_init(&value, G_TYPE_BOOLEAN); - g_value_set_boolean(&value, status); - + g_value_init(&value, G_TYPE_BOOLEAN); + g_value_set_boolean(&value, status); + - connman_set_property(priv->manager, "OfflineMode", &value, NULL); + net_connman_set_property(priv->manager, "OfflineMode", &value, NULL); } - + static gboolean network_disconnect(GtkTreeModel *model, GtkTreePath *path, @@ -398,7 +398,7 @@ static gboolean network_disconnect(GtkTreeModel *model, GtkTreePath *path, - return TRUE; - - if (type == CONNMAN_TYPE_WIFI) + return TRUE; + + if (type == CONNMAN_TYPE_WIFI) - connman_disconnect(proxy, NULL); + net_connman_disconnect(proxy, NULL); - - g_object_unref(proxy); - + + g_object_unref(proxy); + @@ -422,13 +422,13 @@ void connman_client_connect(ConnmanClient *client, const gchar *network) - if (proxy == NULL) - return; - + if (proxy == NULL) + return; + - connman_connect(proxy, NULL); + net_connman_connect(proxy, NULL); - - g_object_unref(proxy); + + g_object_unref(proxy); } - + void connman_client_connect_async(ConnmanClient *client, const gchar *network, - connman_connect_reply callback, gpointer userdata) + net_connman_connect_reply callback, gpointer userdata) { - ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client); - DBusGProxy *proxy; + ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client); + DBusGProxy *proxy; @@ -446,7 +446,7 @@ void connman_client_connect_async(ConnmanClient *client, const gchar *network, - if (proxy == NULL) - goto done; - + if (proxy == NULL) + goto done; + - connman_connect_async(proxy, callback, userdata); + net_connman_connect_async(proxy, callback, userdata); - + done: - return; + return; @@ -476,7 +476,7 @@ void connman_client_disconnect(ConnmanClient *client, const gchar *network) - if (proxy == NULL) - return; - + if (proxy == NULL) + return; + - connman_disconnect(proxy, NULL); + net_connman_disconnect(proxy, NULL); - - g_object_unref(proxy); + + g_object_unref(proxy); } @@ -532,7 +532,7 @@ void connman_client_remove(ConnmanClient *client, const gchar *network) - if (proxy == NULL) - return; - + if (proxy == NULL) + return; + - connman_remove(proxy, NULL); + net_connman_remove(proxy, NULL); - - g_object_unref(proxy); + + g_object_unref(proxy); } diff --git a/common/connman-client.h b/common/connman-client.h index 9e2e6d5..98241de 100644 @@ -132,11 +132,11 @@ index 9e2e6d5..98241de 100644 +++ b/common/connman-client.h @@ -70,13 +70,13 @@ void connman_client_set_powered(ConnmanClient *client, const gchar *device, gboolean connman_client_set_ipv4(ConnmanClient *client, const gchar *device, - struct ipv4_config *ipv4_config); + struct ipv4_config *ipv4_config); void connman_client_scan(ConnmanClient *client, const gchar *device, - connman_scan_reply callback, gpointer user_data); + net_connman_scan_reply callback, gpointer user_data); - + void connman_client_connect(ConnmanClient *client, const gchar *network); void connman_client_disconnect(ConnmanClient *client, const gchar *network); gchar *connman_client_get_security(ConnmanClient *client, const gchar *network); @@ -144,30 +144,30 @@ index 9e2e6d5..98241de 100644 - connman_connect_reply callback, gpointer userdata); + net_connman_connect_reply callback, gpointer userdata); void connman_client_set_remember(ConnmanClient *client, const gchar *network, - gboolean remember); - + gboolean remember); + diff --git a/common/connman-dbus.c b/common/connman-dbus.c index b82b3e1..543eb43 100644 --- a/common/connman-dbus.c +++ b/common/connman-dbus.c @@ -655,15 +655,15 @@ DBusGProxy *connman_dbus_create_manager(DBusGConnection *conn, - - DBG("getting manager properties"); - + + DBG("getting manager properties"); + - connman_get_properties_async(proxy, manager_properties, store); + net_connman_get_properties_async(proxy, manager_properties, store); - - DBG("getting technologies"); - + + DBG("getting technologies"); + - connman_get_technologies_async(proxy, manager_technologies, store); + net_connman_get_technologies_async(proxy, manager_technologies, store); - - DBG("getting services"); - + + DBG("getting services"); + - connman_get_services_async(proxy, manager_services, store); + net_connman_get_services_async(proxy, manager_services, store); - - return proxy; + + return proxy; } diff --git a/common/connman-dbus.xml b/common/connman-dbus.xml index 56b9582..0199d52 100644 @@ -175,12 +175,13 @@ index 56b9582..0199d52 100644 +++ b/common/connman-dbus.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> - + <node name="/"> - <interface name="connman"> + <interface name="net.connman"> <method name="GetProperties"> <arg type="a{sv}" direction="out"/> </method> --- +-- 1.9.1 + diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index f121a81f1e..d068ba894a 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -13,6 +13,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36" +inherit bluetooth + DEPENDS = "dbus glib-2.0 ppp iptables" INC_PR = "r20" @@ -27,12 +29,12 @@ EXTRA_OECONF += "\ --enable-test \ --disable-polkit \ --enable-client \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \ " PACKAGECONFIG ??= "wispr \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd','systemd', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','bluetooth', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', '3g','3g', '', d)} \ " @@ -40,8 +42,9 @@ PACKAGECONFIG ??= "wispr \ # local.conf or distro config # PACKAGECONFIG_append_pn-connman = " openvpn vpnc l2tp pptp" +PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant" -PACKAGECONFIG[bluetooth] = "--enable-bluetooth, --disable-bluetooth, bluez4" +PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}" PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono" PACKAGECONFIG[tist] = "--enable-tist,--disable-tist," PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn" @@ -66,18 +69,16 @@ SYSTEMD_SERVICE_${PN} = "connman.service" SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" -inherit autotools-brokensep pkgconfig systemd update-rc.d - -do_configure_append () { - sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service -} +inherit autotools pkgconfig systemd update-rc.d # This allows *everyone* to access ConnMan over DBus, without any access # control. Really the at_console flag should work, which would mean that # both this and the xuser patch can be dropped. do_compile_append() { - sed -i -e s:deny:allow:g src/connman-dbus.conf - sed -i -e s:deny:allow:g vpn/vpn-dbus.conf + sed -i -e s:deny:allow:g ${S}/src/connman-dbus.conf + sed -i -e s:deny:allow:g ${S}/vpn/vpn-dbus.conf + + sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${B}/src/connman.service } do_install_append() { @@ -88,9 +89,9 @@ do_install_append() { fi install -d ${D}${bindir} - install -m 0755 ${S}/tools/*-test ${D}${bindir} - if [ -e ${S}/tools/wispr ]; then - install -m 0755 ${S}/tools/wispr ${D}${bindir} + install -m 0755 ${B}/tools/*-test ${D}${bindir} + if [ -e ${B}/tools/wispr ]; then + install -m 0755 ${B}/tools/wispr ${D}${bindir} fi install -m 0755 ${B}/client/connmanctl ${D}${bindir} @@ -113,10 +114,10 @@ RPROVIDES_${PN} = "\ RDEPENDS_${PN} = "\ dbus \ - ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', 'bluez4', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', '${BLUEZ}', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', '3g','ofono', '', d)} \ - xuser-account \ + ${@base_conditional('ROOTLESS_X', '1', 'xuser-account', '', d)} \ " PACKAGES_DYNAMIC += "^${PN}-plugin-.*" diff --git a/meta/recipes-connectivity/connman/connman_1.25.bb b/meta/recipes-connectivity/connman/connman_1.28.bb index 1758c95ee1..53e71fa000 100644 --- a/meta/recipes-connectivity/connman/connman_1.25.bb +++ b/meta/recipes-connectivity/connman/connman_1.28.bb @@ -5,7 +5,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ file://add_xuser_dbus_permission.patch \ file://connman \ " -SRC_URI[md5sum] = "a449d2e49871494506e48765747e6624" -SRC_URI[sha256sum] = "c1d266d6be18d2f66231f3537a7ed17b57637ca43c27328bc13c508cbeacce6e" +SRC_URI[md5sum] = "6e07c93877f80bb73c9d4dbfc697f3fc" +SRC_URI[sha256sum] = "b1d5e7dd2652725906e220a8b0206477e97080e835272971e3b2fd10943c5c94" RRECOMMENDS_${PN} = "connman-conf" + diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc index 4949e0201e..6ced77500a 100644 --- a/meta/recipes-connectivity/dhcp/dhcp.inc +++ b/meta/recipes-connectivity/dhcp/dhcp.inc @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=c5c64d696107f84b56fe337d14da1 DEPENDS = "openssl bind" SRC_URI = "ftp://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \ - file://site.h \ + file://define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch \ file://init-relay file://default-relay \ file://init-server file://default-server \ file://dhclient.conf file://dhcpd.conf \ @@ -36,10 +36,6 @@ EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \ --with-libbind=${STAGING_LIBDIR}/ \ " -do_compile_prepend () { - cp -f ${WORKDIR}/site.h ${S}/includes -} - do_install_append () { install -d ${D}${sysconfdir}/init.d install -d ${D}${sysconfdir}/default diff --git a/meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch b/meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch new file mode 100644 index 0000000000..12d3c9bdbd --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch @@ -0,0 +1,26 @@ +define macro _PATH_DHCPD_CONF and _PATH_DHCLIENT_CONF + +Upstream-Status: inappropriate <oe specific> + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + includes/site.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/includes/site.h b/includes/site.h +index d87b309..17bc40d 100644 +--- a/includes/site.h ++++ b/includes/site.h +@@ -139,7 +139,8 @@ + /* Define this if you want the dhcpd.conf file to go somewhere other than + the default location. By default, it goes in /etc/dhcpd.conf. */ + +-/* #define _PATH_DHCPD_CONF "/etc/dhcpd.conf" */ ++#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf" ++#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf" + + /* Network API definitions. You do not need to choose one of these - if + you don't choose, one will be chosen for you in your system's config +-- +1.9.1 + diff --git a/meta/recipes-connectivity/dhcp/dhcp/dhcp-xen-checksum.patch b/meta/recipes-connectivity/dhcp/dhcp/dhcp-xen-checksum.patch new file mode 100644 index 0000000000..62c279db12 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp/dhcp-xen-checksum.patch @@ -0,0 +1,307 @@ +dhcp-client: Ignore partial checksums + +dhclient will fail to get an IP address if run inside a guest when traffic is +flowing over a virtual network interface. The user will see the error +message: + + 5 bad udp checksums in 5 packets + No DHCPOFFERS received. + Unable to obtain a lease on first try. Exiting. + Failed to bring up eth0. + +This is because Linux only uses partial checksums for packets that go over +virtual network interfaces and dhclient does not like this. + + See linux kernel commit 78ea85f17b15390e30d8b47488ec7b6cf0790663 + ("net: skbuff: improve comment on checksumming") + +An application can detect this behaviour by checking for the +TP_STATUS_CSUMNOTREADY flag in the tp_status field. + + See linux kernel commit 8dc4194474159660d7f37c495e3fc3f10d0db8cc + ("Add optional checksum computation for recvmsg") + +An extra parameter is added to decode_udp_ip_header() in dhclient to indicate +whether or not dhclient should ignore partial checksums. This is used +when the TP_STATUS_CSUMNOTREADY bit is set by the guest kernel. + +This fix has been included in Fedora and Ubuntu, however it has not yet been +accepted by ISC upstream. Likely because it is specific to behaviour in Linux +and other UNIX variants do not seem to be affected. + +The patch was imported from the dhcp source RPM in Fedora 21 + (http://pkgs.fedoraproject.org/cgit/dhcp.git/tree/dhcp-xen-checksum.patch?h=f21) + +Originally contributed to fedora-cvs-commit by David Cantrell on Jan 30 2007 + (https://www.redhat.com/archives/fedora-cvs-commits/2007-January/msg01442.html) + +Submitted to dhcp-bugs@isc.org - [ISC-Bugs #22806] - by Michael S. Tsirkin + (http://comments.gmane.org/gmane.comp.emulators.kvm.devel/65236) + (https://lists.isc.org/pipermail/dhcp-hackers/2010-April/001835.html) + +Upstream-Status: Submitted [dhcp-bugs@isc.org] +Signed-off-by: Rob Woolley <rob.woolley@windriver.com> +-- + common/bpf.c | 2 - + common/dlpi.c | 2 - + common/lpf.c | 83 +++++++++++++++++++++++++++++++++++++++++-------------- + common/nit.c | 2 - + common/packet.c | 4 +- + common/upf.c | 2 - + includes/dhcpd.h | 2 - + 7 files changed, 70 insertions(+), 27 deletions(-) + +diff --git a/common/bpf.c b/common/bpf.c +--- a/common/bpf.c ++++ b/common/bpf.c +@@ -481,7 +481,7 @@ ssize_t receive_packet (interface, buf, + /* Decode the IP and UDP headers... */ + offset = decode_udp_ip_header(interface, interface->rbuf, + interface->rbuf_offset, +- from, hdr.bh_caplen, &paylen); ++ from, hdr.bh_caplen, &paylen, 0); + + /* If the IP or UDP checksum was bad, skip the packet... */ + if (offset < 0) { +diff --git a/common/dlpi.c b/common/dlpi.c +--- a/common/dlpi.c ++++ b/common/dlpi.c +@@ -691,7 +691,7 @@ ssize_t receive_packet (interface, buf, + length -= offset; + #endif + offset = decode_udp_ip_header (interface, dbuf, bufix, +- from, length, &paylen); ++ from, length, &paylen, 0); + + /* + * If the IP or UDP checksum was bad, skip the packet... +diff --git a/common/lpf.c b/common/lpf.c +--- a/common/lpf.c ++++ b/common/lpf.c +@@ -29,14 +29,15 @@ + + #include "dhcpd.h" + #if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE) ++#include <sys/socket.h> + #include <sys/uio.h> + #include <errno.h> + + #include <asm/types.h> + #include <linux/filter.h> + #include <linux/if_ether.h> ++#include <linux/if_packet.h> + #include <netinet/in_systm.h> +-#include <net/if_packet.h> + #include "includes/netinet/ip.h" + #include "includes/netinet/udp.h" + #include "includes/netinet/if_ether.h" +@@ -51,6 +52,19 @@ + /* Reinitializes the specified interface after an address change. This + is not required for packet-filter APIs. */ + ++#ifndef PACKET_AUXDATA ++#define PACKET_AUXDATA 8 ++ ++struct tpacket_auxdata ++{ ++ __u32 tp_status; ++ __u32 tp_len; ++ __u32 tp_snaplen; ++ __u16 tp_mac; ++ __u16 tp_net; ++}; ++#endif ++ + #ifdef USE_LPF_SEND + void if_reinitialize_send (info) + struct interface_info *info; +@@ -73,10 +87,14 @@ int if_register_lpf (info) + struct interface_info *info; + { + int sock; +- struct sockaddr sa; ++ union { ++ struct sockaddr_ll ll; ++ struct sockaddr common; ++ } sa; ++ struct ifreq ifr; + + /* Make an LPF socket. */ +- if ((sock = socket(PF_PACKET, SOCK_PACKET, ++ if ((sock = socket(PF_PACKET, SOCK_RAW, + htons((short)ETH_P_ALL))) < 0) { + if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT || + errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT || +@@ -91,11 +109,17 @@ int if_register_lpf (info) + log_fatal ("Open a socket for LPF: %m"); + } + ++ memset (&ifr, 0, sizeof ifr); ++ strncpy (ifr.ifr_name, (const char *)info -> ifp, sizeof ifr.ifr_name); ++ ifr.ifr_name[IFNAMSIZ-1] = '\0'; ++ if (ioctl (sock, SIOCGIFINDEX, &ifr)) ++ log_fatal ("Failed to get interface index: %m"); ++ + /* Bind to the interface name */ + memset (&sa, 0, sizeof sa); +- sa.sa_family = AF_PACKET; +- strncpy (sa.sa_data, (const char *)info -> ifp, sizeof sa.sa_data); +- if (bind (sock, &sa, sizeof sa)) { ++ sa.ll.sll_family = AF_PACKET; ++ sa.ll.sll_ifindex = ifr.ifr_ifindex; ++ if (bind (sock, &sa.common, sizeof sa)) { + if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT || + errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT || + errno == EAFNOSUPPORT || errno == EINVAL) { +@@ -177,9 +201,18 @@ static void lpf_gen_filter_setup (struct + void if_register_receive (info) + struct interface_info *info; + { ++ int val; ++ + /* Open a LPF device and hang it on this interface... */ + info -> rfdesc = if_register_lpf (info); + ++ val = 1; ++ if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val, ++ sizeof val) < 0) { ++ if (errno != ENOPROTOOPT) ++ log_fatal ("Failed to set auxiliary packet data: %m"); ++ } ++ + #if defined (HAVE_TR_SUPPORT) + if (info -> hw_address.hbuf [0] == HTYPE_IEEE802) + lpf_tr_filter_setup (info); +@@ -301,7 +334,6 @@ ssize_t send_packet (interface, packet, + double hh [16]; + double ih [1536 / sizeof (double)]; + unsigned char *buf = (unsigned char *)ih; +- struct sockaddr_pkt sa; + int result; + int fudge; + +@@ -322,17 +354,7 @@ ssize_t send_packet (interface, packet, + (unsigned char *)raw, len); + memcpy (buf + ibufp, raw, len); + +- /* For some reason, SOCK_PACKET sockets can't be connected, +- so we have to do a sentdo every time. */ +- memset (&sa, 0, sizeof sa); +- sa.spkt_family = AF_PACKET; +- strncpy ((char *)sa.spkt_device, +- (const char *)interface -> ifp, sizeof sa.spkt_device); +- sa.spkt_protocol = htons(ETH_P_IP); +- +- result = sendto (interface -> wfdesc, +- buf + fudge, ibufp + len - fudge, 0, +- (const struct sockaddr *)&sa, sizeof sa); ++ result = write (interface -> wfdesc, buf + fudge, ibufp + len - fudge); + if (result < 0) + log_error ("send_packet: %m"); + return result; +@@ -349,14 +371,35 @@ ssize_t receive_packet (interface, buf, + { + int length = 0; + int offset = 0; ++ int nocsum = 0; + unsigned char ibuf [1536]; + unsigned bufix = 0; + unsigned paylen; ++ unsigned char cmsgbuf[CMSG_LEN(sizeof(struct tpacket_auxdata))]; ++ struct iovec iov = { ++ .iov_base = ibuf, ++ .iov_len = sizeof ibuf, ++ }; ++ struct msghdr msg = { ++ .msg_iov = &iov, ++ .msg_iovlen = 1, ++ .msg_control = cmsgbuf, ++ .msg_controllen = sizeof(cmsgbuf), ++ }; ++ struct cmsghdr *cmsg; + +- length = read (interface -> rfdesc, ibuf, sizeof ibuf); ++ length = recvmsg (interface -> rfdesc, &msg, 0); + if (length <= 0) + return length; + ++ for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { ++ if (cmsg->cmsg_level == SOL_PACKET && ++ cmsg->cmsg_type == PACKET_AUXDATA) { ++ struct tpacket_auxdata *aux = (void *)CMSG_DATA(cmsg); ++ nocsum = aux->tp_status & TP_STATUS_CSUMNOTREADY; ++ } ++ } ++ + bufix = 0; + /* Decode the physical header... */ + offset = decode_hw_header (interface, ibuf, bufix, hfrom); +@@ -373,7 +416,7 @@ ssize_t receive_packet (interface, buf, + + /* Decode the IP and UDP headers... */ + offset = decode_udp_ip_header (interface, ibuf, bufix, from, +- (unsigned)length, &paylen); ++ (unsigned)length, &paylen, nocsum); + + /* If the IP or UDP checksum was bad, skip the packet... */ + if (offset < 0) +diff --git a/common/nit.c b/common/nit.c +--- a/common/nit.c ++++ b/common/nit.c +@@ -363,7 +363,7 @@ ssize_t receive_packet (interface, buf, + + /* Decode the IP and UDP headers... */ + offset = decode_udp_ip_header (interface, ibuf, bufix, +- from, length, &paylen); ++ from, length, &paylen, 0); + + /* If the IP or UDP checksum was bad, skip the packet... */ + if (offset < 0) +diff --git a/common/packet.c b/common/packet.c +--- a/common/packet.c ++++ b/common/packet.c +@@ -226,7 +226,7 @@ ssize_t + decode_udp_ip_header(struct interface_info *interface, + unsigned char *buf, unsigned bufix, + struct sockaddr_in *from, unsigned buflen, +- unsigned *rbuflen) ++ unsigned *rbuflen, int nocsum) + { + unsigned char *data; + struct ip ip; +@@ -337,7 +337,7 @@ decode_udp_ip_header(struct interface_in + 8, IPPROTO_UDP + ulen)))); + + udp_packets_seen++; +- if (usum && usum != sum) { ++ if (!nocsum && usum && usum != sum) { + udp_packets_bad_checksum++; + if (udp_packets_seen > 4 && + (udp_packets_seen / udp_packets_bad_checksum) < 2) { +diff --git a/common/upf.c b/common/upf.c +--- a/common/upf.c ++++ b/common/upf.c +@@ -314,7 +314,7 @@ ssize_t receive_packet (interface, buf, + + /* Decode the IP and UDP headers... */ + offset = decode_udp_ip_header (interface, ibuf, bufix, +- from, length, &paylen); ++ from, length, &paylen, 0); + + /* If the IP or UDP checksum was bad, skip the packet... */ + if (offset < 0) +diff --git a/includes/dhcpd.h b/includes/dhcpd.h +--- a/includes/dhcpd.h ++++ b/includes/dhcpd.h +@@ -2857,7 +2857,7 @@ ssize_t decode_hw_header (struct interfa + unsigned, struct hardware *); + ssize_t decode_udp_ip_header (struct interface_info *, unsigned char *, + unsigned, struct sockaddr_in *, +- unsigned, unsigned *); ++ unsigned, unsigned *, int); + + /* ethernet.c */ + void assemble_ethernet_header (struct interface_info *, unsigned char *, +-- +1.8.1.2 + diff --git a/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch b/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch index e686afd2d2..14e75a37ea 100644 --- a/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch +++ b/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch @@ -4,47 +4,32 @@ Upstream-Status: Pending RP 2013/03/21 -Index: dhcp-4.2.5/common/Makefile.am -=================================================================== ---- dhcp-4.2.5.orig/common/Makefile.am 2013-03-21 12:54:11.345063519 +0000 -+++ dhcp-4.2.5/common/Makefile.am 2013-03-21 12:54:11.805063510 +0000 -@@ -1,4 +1,4 @@ --AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' -+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' - AM_CFLAGS = $(LDAP_CFLAGS) - - noinst_LIBRARIES = libdhcp.a -Index: dhcp-4.2.5/dst/Makefile.am -=================================================================== ---- dhcp-4.2.5.orig/dst/Makefile.am 2013-03-21 12:54:11.345063519 +0000 -+++ dhcp-4.2.5/dst/Makefile.am 2013-03-21 12:54:11.805063510 +0000 -@@ -1,4 +1,4 @@ --AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 -+AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 -I$(top_srcdir)/includes - - lib_LIBRARIES = libdst.a - -Index: dhcp-4.2.5/omapip/Makefile.am -=================================================================== ---- dhcp-4.2.5.orig/omapip/Makefile.am 2013-03-21 12:54:11.677063511 +0000 -+++ dhcp-4.2.5/omapip/Makefile.am 2013-03-21 12:54:11.809063510 +0000 -@@ -1,3 +1,5 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/includes -+ - lib_LIBRARIES = libomapi.a - noinst_PROGRAMS = svtest +Rebase to 4.3.1 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + client/Makefile.am | 6 ++++-- + common/Makefile.am | 2 +- + dhcpctl/Makefile.am | 2 ++ + dst/Makefile.am | 2 +- + omapip/Makefile.am | 2 ++ + relay/Makefile.am | 2 +- + server/Makefile.am | 2 +- + 7 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/client/Makefile.am b/client/Makefile.am +index 8411960..1740f72 100644 +--- a/client/Makefile.am ++++ b/client/Makefile.am +@@ -4,6 +4,8 @@ + # production code. Sadly, we are not there yet. + SUBDIRS = . tests -Index: dhcp-4.2.5/client/Makefile.am -=================================================================== ---- dhcp-4.2.5.orig/client/Makefile.am 2013-03-21 12:54:11.677063511 +0000 -+++ dhcp-4.2.5/client/Makefile.am 2013-03-21 12:54:11.809063510 +0000 -@@ -1,3 +1,5 @@ +AM_CPPFLAGS = -I$(top_srcdir)/includes + dist_sysconf_DATA = dhclient.conf.example sbin_PROGRAMS = dhclient dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ -@@ -11,8 +13,8 @@ +@@ -17,8 +19,8 @@ EXTRA_DIST = $(man_MANS) dhclient.o: dhclient.c $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ @@ -55,30 +40,60 @@ Index: dhcp-4.2.5/client/Makefile.am $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ - -DLOCALSTATEDIR='"$(localstatedir)"' -c dhc6.c + -DLOCALSTATEDIR='"$(localstatedir)"' -c $(srcdir)/dhc6.c -Index: dhcp-4.2.5/dhcpctl/Makefile.am -=================================================================== ---- dhcp-4.2.5.orig/dhcpctl/Makefile.am 2013-03-21 12:54:11.677063511 +0000 -+++ dhcp-4.2.5/dhcpctl/Makefile.am 2013-03-21 12:54:11.809063510 +0000 +diff --git a/common/Makefile.am b/common/Makefile.am +index eddef05..5ce045f 100644 +--- a/common/Makefile.am ++++ b/common/Makefile.am +@@ -1,4 +1,4 @@ +-AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' ++AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' + AM_CFLAGS = $(LDAP_CFLAGS) + + noinst_LIBRARIES = libdhcp.a +diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am +index 2987a53..cd72d75 100644 +--- a/dhcpctl/Makefile.am ++++ b/dhcpctl/Makefile.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) + bin_PROGRAMS = omshell lib_LIBRARIES = libdhcpctl.a noinst_PROGRAMS = cltest -Index: dhcp-4.2.5/relay/Makefile.am -=================================================================== ---- dhcp-4.2.5.orig/relay/Makefile.am 2013-03-21 12:54:11.677063511 +0000 -+++ dhcp-4.2.5/relay/Makefile.am 2013-03-21 12:54:11.809063510 +0000 +diff --git a/dst/Makefile.am b/dst/Makefile.am +index 8937fe8..a14798b 100644 +--- a/dst/Makefile.am ++++ b/dst/Makefile.am +@@ -1,4 +1,4 @@ +-AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 ++AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 -I$(top_srcdir)/includes + + lib_LIBRARIES = libdst.a + +diff --git a/omapip/Makefile.am b/omapip/Makefile.am +index 5074479..9c0fab3 100644 +--- a/omapip/Makefile.am ++++ b/omapip/Makefile.am +@@ -1,3 +1,5 @@ ++AM_CPPFLAGS = -I$(top_srcdir)/includes ++ + lib_LIBRARIES = libomapi.a + noinst_PROGRAMS = svtest + +diff --git a/relay/Makefile.am b/relay/Makefile.am +index ec72a31..f842071 100644 +--- a/relay/Makefile.am ++++ b/relay/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' +AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes sbin_PROGRAMS = dhcrelay dhcrelay_SOURCES = dhcrelay.c -Index: dhcp-4.2.5/server/Makefile.am -=================================================================== ---- dhcp-4.2.5.orig/server/Makefile.am 2013-03-21 12:54:11.677063511 +0000 -+++ dhcp-4.2.5/server/Makefile.am 2013-03-21 12:55:01.509062081 +0000 +diff --git a/server/Makefile.am b/server/Makefile.am +index a446f0b..d0b873a 100644 +--- a/server/Makefile.am ++++ b/server/Makefile.am @@ -4,7 +4,7 @@ # production code. Sadly, we are not there yet. SUBDIRS = . tests @@ -88,3 +103,6 @@ Index: dhcp-4.2.5/server/Makefile.am dist_sysconf_DATA = dhcpd.conf.example sbin_PROGRAMS = dhcpd +-- +1.9.1 + diff --git a/meta/recipes-connectivity/dhcp/dhcp/site.h b/meta/recipes-connectivity/dhcp/dhcp/site.h deleted file mode 100644 index 2289554ef3..0000000000 --- a/meta/recipes-connectivity/dhcp/dhcp/site.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * define config file location in ${S}/includes/site.h - * still need to take care of installation path (${sysconfdir}/dhcpd.conf) - * - * 7/22/2010 - qhe - */ - -/* Define this if you want DNS update functionality to be available. */ - -#define NSUPDATE - -/* Define this if you aren't debugging and you want to save memory - (potentially a _lot_ of memory) by allocating leases in chunks rather - than one at a time. */ - -#define COMPACT_LEASES - - -/* local */ -#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf" -#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf" diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.3.0.bb b/meta/recipes-connectivity/dhcp/dhcp_4.3.1.bb index 13bcceb5a8..d4414cc347 100644 --- a/meta/recipes-connectivity/dhcp/dhcp_4.3.0.bb +++ b/meta/recipes-connectivity/dhcp/dhcp_4.3.1.bb @@ -6,7 +6,8 @@ SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \ file://fixsepbuild.patch \ file://dhclient-script-drop-resolv.conf.dhclient.patch \ file://replace-ifconfig-route.patch \ + file://dhcp-xen-checksum.patch \ " -SRC_URI[md5sum] = "1020d77e1a4c1f01b76279caff9beb80" -SRC_URI[sha256sum] = "a7b6517d5cf32c5e49d2323a63de00efe5391df7cb0045dfa0ec8f6ee46ebe8a" +SRC_URI[md5sum] = "b3a42ece3c7f2cd2e74a3e12ca881d20" +SRC_URI[sha256sum] = "266cbca8a7a6bb8f9ccc5765da0d2b04099329314a54a4fc1022d510ad3e9af0" diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-ip-link-Remove-unnecessary-device-checking.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-ip-link-Remove-unnecessary-device-checking.patch deleted file mode 100644 index 640accefb0..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2/0001-ip-link-Remove-unnecessary-device-checking.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 38790ccf7bd0e6eab78024ec381fd98d7c6a2782 Mon Sep 17 00:00:00 2001 -From: vadimk <vadim4j@gmail.com> -Date: Sat, 30 Aug 2014 15:06:00 +0300 -Subject: [PATCH] ip link: Remove unnecessary device checking - -The real checking is performed later in iplink_modify(..) func which -checks device existence if NLM_F_CREATE flag is set. - -Also it fixes the case when impossible to add veth link which was -caused by 9a02651a87 (ip: check for missing dev arg when doing VF rate) -because these devices are not exist yet. - -Signed-off-by: Vadim Kochan <vadim4j@gmail.com> -Acked-by: Oliver Hartkopp <socketcan@hartkopp.net> -Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> ---- - ip/iplink.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/ip/iplink.c b/ip/iplink.c -index 1a907d9..ea06871 100644 ---- a/ip/iplink.c -+++ b/ip/iplink.c -@@ -593,8 +593,6 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, - duparg2("dev", *argv); - *dev = *argv; - dev_index = ll_name_to_index(*dev); -- if (dev_index == 0) -- invarg("Unknown device", *argv); - } - argc--; argv++; - } --- -1.7.10.4 diff --git a/meta/recipes-connectivity/iproute2/iproute2_3.16.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.17.0.bb index 39fe9c83b8..d12b33fbd1 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_3.16.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_3.17.0.bb @@ -3,10 +3,9 @@ require iproute2.inc SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://configure-cross.patch \ file://0001-iproute2-de-bash-scripts.patch \ - file://0001-ip-link-Remove-unnecessary-device-checking.patch \ " -SRC_URI[md5sum] = "6c823b40fdcfa7b8120743349a52ac18" -SRC_URI[sha256sum] = "1f0a8a6c0e872166f75433f5cbf9766f3002b5c2f13501b3bb8c51846a127b79" +SRC_URI[md5sum] = "b741a02c6dda5818d18011d572874493" +SRC_URI[sha256sum] = "09e406636e7598e46d5d4f7b928bf5db57049d65dbeb9a496005957ee16f6000" # CFLAGS are computed in Makefile and reference CCOPTS # diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc index a12eb16615..6f2c9854b7 100644 --- a/meta/recipes-connectivity/libpcap/libpcap.inc +++ b/meta/recipes-connectivity/libpcap/libpcap.inc @@ -10,8 +10,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 \ file://pcap.h;beginline=1;endline=32;md5=39af3510e011f34b8872f120b1dc31d2" DEPENDS = "flex-native bison-native" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}" -PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4" +inherit bluetooth pkgconfig + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}" +PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4" PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb" PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl" @@ -26,7 +28,6 @@ inherit autotools binconfig-disabled EXTRA_OECONF = "--with-pcap=linux" PACKAGECONFIG ??= "" -PACKAGECONFIG[libnl1] = "--with-libnl,--without-libnl,libnl1,libnl1" PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" CPPFLAGS_prepend = "-I${S} " diff --git a/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch b/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch new file mode 100644 index 0000000000..9cfb9df880 --- /dev/null +++ b/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch @@ -0,0 +1,71 @@ +From 8887132e85892a72a84ca3878e60f254ad2ce939 Mon Sep 17 00:00:00 2001 +From: Joe MacDonald <joe_macdonald@mentor.com> +Date: Tue, 24 Feb 2015 15:56:06 -0500 +Subject: [PATCH] libpcap: pkgconfig support + +Adding basic structure to support pkg-config. + +Upstream-status: Inappropriate [embedded specific] + +Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> +--- + Makefile.in | 5 +++++ + configure.in | 1 + + libpcap.pc.in | 10 ++++++++++ + 3 files changed, 16 insertions(+) + create mode 100644 libpcap.pc.in + +diff --git a/Makefile.in b/Makefile.in +index 1c2d745..1f25faf 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -60,6 +60,10 @@ V_RPATH_OPT = @V_RPATH_OPT@ + DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@ + PROG=libpcap + ++# pkgconfig support ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = libpcap.pc ++ + # Standard CFLAGS + FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS) + +@@ -275,6 +279,7 @@ EXTRA_DIST = \ + lbl/os-solaris2.h \ + lbl/os-sunos4.h \ + lbl/os-ultrix4.h \ ++ libpcap.pc \ + missing/snprintf.c \ + mkdep \ + msdos/bin2c.c \ +diff --git a/configure.in b/configure.in +index 8f5c86b..fb51b35 100644 +--- a/configure.in ++++ b/configure.in +@@ -1700,6 +1700,7 @@ esac + AC_PROG_INSTALL + + AC_CONFIG_HEADER(config.h) ++AC_CONFIG_FILES([libpcap.pc]) + + AC_OUTPUT_COMMANDS([if test -f .devel; then + echo timestamp > stamp-h +diff --git a/libpcap.pc.in b/libpcap.pc.in +new file mode 100644 +index 0000000..4f78ad8 +--- /dev/null ++++ b/libpcap.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: libpcap ++Description: System-independent interface for user-level packet capture. ++Version: @VERSION@ ++Libs: -L${libdir} -lpcap ++Cflags: -I${includedir} +-- +1.9.1 + diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.6.1.bb b/meta/recipes-connectivity/libpcap/libpcap_1.6.2.bb index f570ebba95..611543e42c 100644 --- a/meta/recipes-connectivity/libpcap/libpcap_1.6.1.bb +++ b/meta/recipes-connectivity/libpcap/libpcap_1.6.2.bb @@ -1,8 +1,10 @@ require libpcap.inc -SRC_URI += "file://aclocal.patch" -SRC_URI[md5sum] = "5eb05edf6b6c6e63d536d1c9fbfb2f7c" -SRC_URI[sha256sum] = "116cbb3ac9e96d5dd7b39638a2f894a67fa3dcf06d794e6dae2b9a942ad13476" +SRC_URI += "file://aclocal.patch \ + file://libpcap-pkgconfig-support.patch \ + " +SRC_URI[md5sum] = "5f14191c1a684a75532c739c2c4059fa" +SRC_URI[sha256sum] = "5db3e2998f1eeba2c76da55da5d474248fe19c44f49e15cac8a796a2c7e19690" # # make install doesn't cover the shared lib @@ -19,4 +21,6 @@ do_install_prepend () { install -d ${D}${bindir} oe_runmake install-shared DESTDIR=${D} oe_libinstall -a -so libpcap ${D}${libdir} + sed "s|@VERSION@|${PV}|" -i ${B}/libpcap.pc + install -D -m 0644 libpcap.pc ${D}${libdir}/pkgconfig/libpcap.pc } diff --git a/meta/recipes-connectivity/neard/neard.inc b/meta/recipes-connectivity/neard/neard.inc index e714cadc2b..4042a69b98 100644 --- a/meta/recipes-connectivity/neard/neard.inc +++ b/meta/recipes-connectivity/neard/neard.inc @@ -9,7 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ " -inherit autotools-brokensep pkgconfig systemd update-rc.d +inherit autotools pkgconfig systemd update-rc.d bluetooth + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" + +PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-systemduserunitdir=${systemd_unitdir}/user/,--disable-systemd" EXTRA_OECONF += "--enable-tools" @@ -21,21 +25,15 @@ do_install() { do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d/ - sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.in \ + sed "s:@installpath@:${libexecdir}/nfc:" ${WORKDIR}/neard.in \ > ${D}${sysconfdir}/init.d/neard chmod 0755 ${D}${sysconfdir}/init.d/neard fi - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_unitdir}/system - sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.service.in \ - > ${D}${systemd_unitdir}/system/neard.service - fi - # Install the tests for neard-tests install -d ${D}${libdir}/neard install -m 0755 ${S}/test/* ${D}${libdir}/${BPN}/ - install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/ + install -m 0755 ${B}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/ } PACKAGES =+ "${PN}-tests" @@ -47,7 +45,7 @@ RDEPENDS_${PN} = "dbus python python-dbus python-pygobject" # Bluez & Wifi are not mandatory except for handover RRECOMMENDS_${PN} = "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ " diff --git a/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch b/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch new file mode 100644 index 0000000000..16875e0543 --- /dev/null +++ b/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch @@ -0,0 +1,36 @@ +From bfd32d68cfc9f1e31dab88e07446d1c02bc80b5e Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 12 Feb 2015 00:39:29 -0800 +Subject: [PATCH] Makefile.am: do not ship version.h + +The HEADERS' name has been changed to pkginclude_HEADERS, so use +nodist_pkginclude_HEADERS, otherwise version.h would be shipped. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 3334790..69cd58f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -10,11 +10,11 @@ pkginclude_HEADERS = include/types.h include/log.h include/plugin.h \ + include/tlv.h include/setting.h include/device.h \ + include/nfc_copy.h include/snep.h + +-nodist_include_HEADERS = include/version.h ++nodist_pkginclude_HEADERS = include/version.h + + noinst_HEADERS = include/dbus.h + +-local_headers = $(foreach file,$(pkginclude_HEADERS) $(nodist_include_HEADERS) \ ++local_headers = $(foreach file,$(pkginclude_HEADERS) $(nodist_pkginclude_HEADERS) \ + $(noinst_HEADERS), include/near/$(notdir $(file))) + + gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/watch.c \ +-- +1.7.9.5 + diff --git a/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch b/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch new file mode 100644 index 0000000000..466067693d --- /dev/null +++ b/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch @@ -0,0 +1,33 @@ +From 43acc56d5506c7e318f717fb3634bc16e3438913 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 15 Jan 2015 18:12:07 -0800 +Subject: [PATCH] Makefile.am: fix parallel issue + +There might be no src dir if src/builtin.h runs earlier, create it to +fix the race issue: + +src/genbuiltin nfctype1 nfctype2 nfctype3 nfctype4 p2p > src/builtin.h +/bin/sh: src/builtin.h: No such file or directory + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index 3241311..a43eaa2 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -164,6 +164,7 @@ MAINTAINERCLEANFILES = Makefile.in \ + src/plugin.$(OBJEXT): src/builtin.h + + src/builtin.h: src/genbuiltin $(builtin_sources) ++ $(AM_V_at)$(MKDIR_P) src + $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@ + + $(src_neard_OBJECTS) \ +-- +1.7.9.5 + diff --git a/meta/recipes-connectivity/neard/neard/parallel-build.patch b/meta/recipes-connectivity/neard/neard/parallel-build.patch deleted file mode 100644 index 56247495e5..0000000000 --- a/meta/recipes-connectivity/neard/neard/parallel-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 488e898300f7a4ab9ba73307967ae9e02b7a6511 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Fri, 13 Jun 2014 17:49:45 +0100 -Subject: [PATCH] Makefile: add missing binaries to dependency on - local_headers - -seeld and snap_send were missing from the rule that generates the header symlink -farm, resulting in headers not being available in highly parallel builds. - -Signed-off-by: Ross Burton <ross.burton@intel.com> ---- - Makefile.am | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index c51351f..8e58ac1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -254,7 +254,14 @@ se/plugin.$(OBJEXT): se/builtin.h - se/builtin.h: src/genbuiltin $(builtin_se_sources) - $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_se_modules) > $@ - --$(src_neard_OBJECTS) $(tools_nfctool_nfctool_OBJECTS) $(plugin_objects): $(local_headers) -+$(src_neard_OBJECTS) \ -+$(tools_nfctool_nfctool_OBJECTS) \ -+$(plugin_objects) \ -+$(se_seeld_OBJECTS) \ -+$(unit_test_ndef_parse_OBJECTS) \ -+$(unit_test_ndef_build_OBJECTS) \ -+$(unit_test_snep_read_OBJECTS) \ -+$(tools_snep_send_OBJECTS): $(local_headers) - - include/near/version.h: include/version.h - $(AM_V_at)$(MKDIR_P) include/near --- -1.7.10.4 - diff --git a/meta/recipes-connectivity/neard/neard_0.14.bb b/meta/recipes-connectivity/neard/neard_0.14.bb deleted file mode 100644 index daf3a4b7d1..0000000000 --- a/meta/recipes-connectivity/neard/neard_0.14.bb +++ /dev/null @@ -1,10 +0,0 @@ -require neard.inc - -SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BPN}-${PV}.tar.xz \ - file://parallel-build.patch \ - file://neard.in \ - file://neard.service.in \ - " -SRC_URI[md5sum] = "692ba2653d60155255244c87396c486b" -SRC_URI[sha256sum] = "6ea724b443d39d679168fc7776a965d1f64727c3735391df2c01469ee7cd8cca" - diff --git a/meta/recipes-connectivity/neard/neard_0.15.bb b/meta/recipes-connectivity/neard/neard_0.15.bb new file mode 100644 index 0000000000..508c622801 --- /dev/null +++ b/meta/recipes-connectivity/neard/neard_0.15.bb @@ -0,0 +1,10 @@ +require neard.inc + +SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BP}.tar.xz \ + file://neard.in \ + file://Makefile.am-fix-parallel-issue.patch \ + file://Makefile.am-do-not-ship-version.h.patch \ + " +SRC_URI[md5sum] = "b746ce62eeef88e8de90765e00a75a1c" +SRC_URI[sha256sum] = "651f6513d32cdaf8a426255d03aff38a6620a89b0567ec2b36606c6330a93353" + diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-statd-fixed-the-with-statdpath-flag.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-statd-fixed-the-with-statdpath-flag.patch deleted file mode 100644 index 2ce824cf9e..0000000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-statd-fixed-the-with-statdpath-flag.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 3b1457d219ceb1058d44bacc657581f13437ae40 Mon Sep 17 00:00:00 2001 -From: Steve Dickson <steved@redhat.com> -Date: Tue, 17 Jun 2014 13:28:53 -0400 -Subject: [PATCH] statd: fixed the --with-statdpath= flag - -Create the given path set with --with-statdpath - -Signed-off-by: chendt.fnst@cn.fujitsu.com -Reported-by: yaoxp@cn.fujitsu.com -Signed-off-by: Steve Dickson <steved@redhat.com> -Upstream-Status: Backport ---- - Makefile.am | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index ae7cd16..5824adc 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -54,13 +54,13 @@ install-data-hook: - touch $(DESTDIR)$(statedir)/xtab; chmod 644 $(DESTDIR)$(statedir)/xtab - touch $(DESTDIR)$(statedir)/etab; chmod 644 $(DESTDIR)$(statedir)/etab - touch $(DESTDIR)$(statedir)/rmtab; chmod 644 $(DESTDIR)$(statedir)/rmtab -- mkdir -p $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak -- touch $(DESTDIR)$(statedir)/state -- chmod go-rwx $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state -- -chown $(statduser) $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state -+ mkdir -p $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak -+ touch $(DESTDIR)$(statdpath)/state -+ chmod go-rwx $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak $(DESTDIR)$(statdpath)/state -+ -chown $(statduser) $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak $(DESTDIR)$(statdpath)/state - - uninstall-hook: - rm $(DESTDIR)$(statedir)/xtab - rm $(DESTDIR)$(statedir)/etab - rm $(DESTDIR)$(statedir)/rmtab -- rm $(DESTDIR)$(statedir)/state -+ rm $(DESTDIR)$(statdpath)/state --- -1.8.4.2 - diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch deleted file mode 100644 index c3442380e1..0000000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch +++ /dev/null @@ -1,27 +0,0 @@ -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Inappropriate [embedded specific] - -Index: nfs-utils-1.2.6/support/nfs/svc_socket.c -=================================================================== ---- nfs-utils-1.2.6.orig/support/nfs/svc_socket.c 2012-05-14 07:40:52.000000000 -0700 -+++ nfs-utils-1.2.6/support/nfs/svc_socket.c 2012-10-28 02:42:50.179222457 -0700 -@@ -40,8 +40,9 @@ - char rpcdata[1024], servdata[1024]; - struct rpcent rpcbuf, *rpcp; - struct servent servbuf, *servp = NULL; -- int ret; -+ int ret = 0; - -+#ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */ - ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof rpcdata, - &rpcp); - if (ret == 0 && rpcp != NULL) { -@@ -60,6 +61,7 @@ - } - } - } -+#endif /* __UCLIBC__ */ - - if (ret == 0 && servp != NULL) - return ntohs(servp->s_port); diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb index 6e6d09bf42..6f64e9d001 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb @@ -21,7 +21,6 @@ USERADD_PARAM_${PN}-client = "--system --home-dir /var/lib/nfs \ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.xz \ file://0001-configure-Allow-to-explicitly-disable-nfsidmap.patch \ - file://nfs-utils-1.0.6-uclibc.patch \ file://nfs-utils-1.2.3-sm-notify-res_init.patch \ file://nfsserver \ file://nfscommon \ @@ -30,13 +29,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://nfs-mountd.service \ file://nfs-statd.service \ file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \ - file://0001-statd-fixed-the-with-statdpath-flag.patch \ " -SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8" -SRC_URI[sha256sum] = "ab8384d0e487ed6a18c5380d5df28015f7dd98680bf08f3247c97d9f7d99e56f" - -PARALLEL_MAKE = "" +SRC_URI[md5sum] = "8de676b9ff34b8f9addc1d0800fabdf8" +SRC_URI[sha256sum] = "ff79d70b7b58b2c8f9b798c58721127e82bb96022adc04a5c4cb251630e696b8" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies. @@ -72,11 +68,19 @@ PACKAGECONFIG[nfsidmap] = "--enable-nfsidmap,--disable-nfsidmap,keyutils" INHIBIT_AUTO_STAGE = "1" PACKAGES =+ "${PN}-client ${PN}-stats" + +CONFFILES_${PN}-client += "${localstatedir}/lib/nfs/etab \ + ${localstatedir}/lib/nfs/rmtab \ + ${localstatedir}/lib/nfs/xtab \ + ${localstatedir}/lib/nfs/statd/state \ + ${sysconfdir}/nfsmount.conf" + FILES_${PN}-client = "${base_sbindir}/*mount.nfs* ${sbindir}/*statd \ ${sbindir}/rpc.idmapd ${sbindir}/sm-notify \ ${sbindir}/showmount ${sbindir}/nfsstat \ ${localstatedir}/lib/nfs \ ${sysconfdir}/nfs-utils.conf \ + ${sysconfdir}/nfsmount.conf \ ${sysconfdir}/init.d/nfscommon \ ${systemd_unitdir}/system/nfs-statd.service" FILES_${PN}-stats = "${sbindir}/mountstats ${sbindir}/nfsiostat" @@ -94,6 +98,8 @@ do_install_append () { install -m 0755 ${WORKDIR}/nfscommon ${D}${sysconfdir}/init.d/nfscommon install -m 0755 ${WORKDIR}/nfs-utils.conf ${D}${sysconfdir} + install -m 0755 ${S}/utils/mount/nfsmount.conf ${D}${sysconfdir} + install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/nfs-server.service ${D}${systemd_unitdir}/system/ install -m 0644 ${WORKDIR}/nfs-mountd.service ${D}${systemd_unitdir}/system/ diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc index 9f65f4f144..c415a39981 100644 --- a/meta/recipes-connectivity/ofono/ofono.inc +++ b/meta/recipes-connectivity/ofono/ofono.inc @@ -5,18 +5,22 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://src/ofono.h;beginline=1;endline=20;md5=3ce17d5978ef3445def265b98899c2ee" -inherit autotools pkgconfig update-rc.d systemd +inherit autotools pkgconfig update-rc.d systemd bluetooth -DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)}" +DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info" INITSCRIPT_NAME = "ofono" INITSCRIPT_PARAMS = "defaults 22" -EXTRA_OECONF += "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \ - --enable-test \ -" +PACKAGECONFIG ??= "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" +PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}" + +EXTRA_OECONF += "--enable-test" + SYSTEMD_SERVICE_${PN} = "ofono.service" do_install_append() { diff --git a/meta/recipes-connectivity/ofono/ofono_1.15.bb b/meta/recipes-connectivity/ofono/ofono_1.16.bb index bee2b4745c..712fc5c805 100644 --- a/meta/recipes-connectivity/ofono/ofono_1.15.bb +++ b/meta/recipes-connectivity/ofono/ofono_1.16.bb @@ -5,8 +5,7 @@ SRC_URI = "\ file://ofono \ file://Revert-test-Convert-to-Python-3.patch \ " - -SRC_URI[md5sum] = "4d03de85239d8100dc7721bf0dad2bd2" -SRC_URI[sha256sum] = "978807a05e8904eb4e57d6533ed71e75676a55fa3819a39fe2c878f45dbf7af6" +SRC_URI[md5sum] = "c31b5b55a1d68354bff771d3edf02829" +SRC_URI[sha256sum] = "403b98dadece8bc804c0bd16b96d3db5a3bb0f84af64b3d67924da2d1a754b07" CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" diff --git a/meta/recipes-connectivity/openssh/openssh/nostrip.patch b/meta/recipes-connectivity/openssh/openssh/nostrip.patch deleted file mode 100644 index 33111f5494..0000000000 --- a/meta/recipes-connectivity/openssh/openssh/nostrip.patch +++ /dev/null @@ -1,20 +0,0 @@ -Disable stripping binaries during make install. - -Upstream-Status: Inappropriate [configuration] - -Build system specific. - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - -diff -ur openssh-5.6p1.orig/Makefile.in openssh-5.6p1/Makefile.in ---- openssh-5.6p1.orig/Makefile.in 2010-05-11 23:51:39.000000000 -0700 -+++ openssh-5.6p1/Makefile.in 2010-08-30 16:49:54.000000000 -0700 -@@ -29,7 +29,7 @@ - RAND_HELPER=$(libexecdir)/ssh-rand-helper - PRIVSEP_PATH=@PRIVSEP_PATH@ - SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@ --STRIP_OPT=@STRIP_OPT@ -+STRIP_OPT= - - PATHS= -DSSHDIR=\"$(sysconfdir)\" \ - -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \ diff --git a/meta/recipes-connectivity/openssh/openssh/openssh-CVE-2011-4327.patch b/meta/recipes-connectivity/openssh/openssh/openssh-CVE-2011-4327.patch deleted file mode 100644 index 30c11cf432..0000000000 --- a/meta/recipes-connectivity/openssh/openssh/openssh-CVE-2011-4327.patch +++ /dev/null @@ -1,29 +0,0 @@ -openssh-CVE-2011-4327 - -A security flaw was found in the way ssh-keysign, -a ssh helper program for host based authentication, -attempted to retrieve enough entropy information on configurations that -lacked a built-in entropy pool in OpenSSL (a ssh-rand-helper program would -be executed to retrieve the entropy from the system environment). -A local attacker could use this flaw to obtain unauthorized access to host keys -via ptrace(2) process trace attached to the 'ssh-rand-helper' program. - -https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2011-4327 -http://www.openssh.com/txt/portable-keysign-rand-helper.adv - -Upstream-Status: Pending - -Signed-off-by: Li Wang <li.wang@windriver.com> ---- a/ssh-keysign.c -+++ b/ssh-keysign.c -@@ -170,6 +170,10 @@ - key_fd[i++] = open(_PATH_HOST_DSA_KEY_FILE, O_RDONLY); - key_fd[i++] = open(_PATH_HOST_ECDSA_KEY_FILE, O_RDONLY); - key_fd[i++] = open(_PATH_HOST_RSA_KEY_FILE, O_RDONLY); -+ if (fcntl(key_fd[0], F_SETFD, FD_CLOEXEC) != 0 || -+ fcntl(key_fd[1], F_SETFD, FD_CLOEXEC) != 0 || -+ fcntl(key_fd[2], F_SETFD, FD_CLOEXEC) != 0) -+ fatal("fcntl failed"); - - original_real_uid = getuid(); /* XXX readconf.c needs this */ - if ((pw = getpwuid(original_real_uid)) == NULL) diff --git a/meta/recipes-connectivity/openssh/openssh/openssh-CVE-2014-2532.patch b/meta/recipes-connectivity/openssh/openssh/openssh-CVE-2014-2532.patch deleted file mode 100644 index 3deaf3f0e9..0000000000 --- a/meta/recipes-connectivity/openssh/openssh/openssh-CVE-2014-2532.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Backport - -Fix for CVE-2014-2532 - -Backported from openssh-6.6p1.tar.gz - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- ---- a/session.c -+++ b/session.c -@@ -955,6 +955,11 @@ - u_int envsize; - u_int i, namelen; - -+ if (strchr(name, '=') != NULL) { -+ error("Invalid environment variable \"%.100s\"", name); -+ return; -+ } -+ - /* - * If we're passed an uninitialized list, allocate a single null - * entry before continuing. diff --git a/meta/recipes-connectivity/openssh/openssh/openssh-CVE-2014-2653.patch b/meta/recipes-connectivity/openssh/openssh/openssh-CVE-2014-2653.patch deleted file mode 100644 index 674d186044..0000000000 --- a/meta/recipes-connectivity/openssh/openssh/openssh-CVE-2014-2653.patch +++ /dev/null @@ -1,114 +0,0 @@ -Upstream-Status: Backport - -This CVE could be removed if openssh is upgrade to 6.6 or higher. -Below are some details. - -Attempt SSHFP lookup even if server presents a certificate - -Reference: -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=742513 - -If an ssh server presents a certificate to the client, then the client -does not check the DNS for SSHFP records. This means that a malicious -server can essentially disable DNS-host-key-checking, which means the -client will fall back to asking the user (who will just say "yes" to -the fingerprint, sadly). - -This patch means that the ssh client will, if necessary, extract the -server key from the proffered certificate, and attempt to verify it -against the DNS. The patch was written by Mark Wooding -<mdw@distorted.org.uk>. I modified it to add one debug2 call, reviewed -it, and tested it. - -Signed-off-by: Matthew Vernon <matthew@debian.org> -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- ---- a/sshconnect.c -+++ b/sshconnect.c -@@ -1210,36 +1210,63 @@ fail: - return -1; - } - -+static int -+check_host_key_sshfp(char *host, struct sockaddr *hostaddr, Key *host_key) -+{ -+ int rc = -1; -+ int flags = 0; -+ Key *raw_key = NULL; -+ -+ if (!options.verify_host_key_dns) -+ goto done; -+ -+ /* XXX certs are not yet supported for DNS; try looking the raw key -+ * up in the DNS anyway. -+ */ -+ if (key_is_cert(host_key)) { -+ debug2("Extracting key from cert for SSHFP lookup"); -+ raw_key = key_from_private(host_key); -+ if (key_drop_cert(raw_key)) -+ fatal("Couldn't drop certificate"); -+ host_key = raw_key; -+ } -+ -+ if (verify_host_key_dns(host, hostaddr, host_key, &flags)) -+ goto done; -+ -+ if (flags & DNS_VERIFY_FOUND) { -+ -+ if (options.verify_host_key_dns == 1 && -+ flags & DNS_VERIFY_MATCH && -+ flags & DNS_VERIFY_SECURE) { -+ rc = 0; -+ } else if (flags & DNS_VERIFY_MATCH) { -+ matching_host_key_dns = 1; -+ } else { -+ warn_changed_key(host_key); -+ error("Update the SSHFP RR in DNS with the new " -+ "host key to get rid of this message."); -+ } -+ } -+ -+done: -+ if (raw_key) -+ key_free(raw_key); -+ return rc; -+} -+ - /* returns 0 if key verifies or -1 if key does NOT verify */ - int - verify_host_key(char *host, struct sockaddr *hostaddr, Key *host_key) - { -- int flags = 0; - char *fp; - - fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX); - debug("Server host key: %s %s", key_type(host_key), fp); - free(fp); - -- /* XXX certs are not yet supported for DNS */ -- if (!key_is_cert(host_key) && options.verify_host_key_dns && -- verify_host_key_dns(host, hostaddr, host_key, &flags) == 0) { -- if (flags & DNS_VERIFY_FOUND) { -- -- if (options.verify_host_key_dns == 1 && -- flags & DNS_VERIFY_MATCH && -- flags & DNS_VERIFY_SECURE) -- return 0; -- -- if (flags & DNS_VERIFY_MATCH) { -- matching_host_key_dns = 1; -- } else { -- warn_changed_key(host_key); -- error("Update the SSHFP RR in DNS with the new " -- "host key to get rid of this message."); -- } -- } -- } -+ if (check_host_key_sshfp(host, hostaddr, host_key) == 0) -+ return 0; - - return check_host_key(host, hostaddr, options.port, host_key, RDRW, - options.user_hostfiles, options.num_user_hostfiles, --- -1.7.9.5 - diff --git a/meta/recipes-connectivity/openssh/openssh/ssh_config b/meta/recipes-connectivity/openssh/openssh/ssh_config index 4a4a649ba8..9e919156d3 100644 --- a/meta/recipes-connectivity/openssh/openssh/ssh_config +++ b/meta/recipes-connectivity/openssh/openssh/ssh_config @@ -1,4 +1,4 @@ -# $OpenBSD: ssh_config,v 1.25 2009/02/17 01:28:32 djm Exp $ +# $OpenBSD: ssh_config,v 1.28 2013/09/16 11:35:43 sthen Exp $ # This is the ssh client system-wide configuration file. See # ssh_config(5) for more information. This file provides defaults for @@ -44,3 +44,5 @@ Host * # TunnelDevice any:any # PermitLocalCommand no # VisualHostKey no +# ProxyCommand ssh -q -W %h:%p gateway.example.com +# RekeyLimit 1G 1h diff --git a/meta/recipes-connectivity/openssh/openssh/sshd_config b/meta/recipes-connectivity/openssh/openssh/sshd_config index 4f9b626fbd..3553669aa0 100644 --- a/meta/recipes-connectivity/openssh/openssh/sshd_config +++ b/meta/recipes-connectivity/openssh/openssh/sshd_config @@ -15,9 +15,7 @@ #ListenAddress 0.0.0.0 #ListenAddress :: -# Disable legacy (protocol version 1) support in the server for new -# installations. In future the default will change to require explicit -# activation of protocol 1 +# The default requires explicit activation of protocol 1 Protocol 2 # HostKey for protocol version 1 @@ -25,11 +23,16 @@ Protocol 2 # HostKeys for protocol version 2 #HostKey /etc/ssh/ssh_host_rsa_key #HostKey /etc/ssh/ssh_host_dsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key +#HostKey /etc/ssh/ssh_host_ed25519_key # Lifetime and size of ephemeral version 1 server key #KeyRegenerationInterval 1h #ServerKeyBits 1024 +# Ciphers and keying +#RekeyLimit default none + # Logging # obsoletes QuietMode and FascistLogging #SyslogFacility AUTH @@ -45,7 +48,15 @@ Protocol 2 #RSAAuthentication yes #PubkeyAuthentication yes -#AuthorizedKeysFile .ssh/authorized_keys + +# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +# but this is overridden so installations will only check .ssh/authorized_keys +AuthorizedKeysFile .ssh/authorized_keys + +#AuthorizedPrincipalsFile none + +#AuthorizedKeysCommand none +#AuthorizedKeysCommandUser nobody # For this to work you will also need host keys in /etc/ssh/ssh_known_hosts #RhostsRSAAuthentication no @@ -74,8 +85,8 @@ Protocol 2 #GSSAPIAuthentication no #GSSAPICleanupCredentials yes -# Set this to 'yes' to enable PAM authentication, account processing, -# and session processing. If this is enabled, PAM authentication will +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will # be allowed through the ChallengeResponseAuthentication and # PasswordAuthentication. Depending on your PAM configuration, # PAM authentication via ChallengeResponseAuthentication may bypass @@ -91,20 +102,22 @@ Protocol 2 #X11Forwarding no #X11DisplayOffset 10 #X11UseLocalhost yes +#PermitTTY yes #PrintMotd yes #PrintLastLog yes #TCPKeepAlive yes #UseLogin no -UsePrivilegeSeparation yes +UsePrivilegeSeparation sandbox # Default for new installations. #PermitUserEnvironment no Compression no ClientAliveInterval 15 ClientAliveCountMax 4 #UseDNS yes #PidFile /var/run/sshd.pid -#MaxStartups 10 +#MaxStartups 10:30:100 #PermitTunnel no #ChrootDirectory none +#VersionAddendum none # no default banner path #Banner none @@ -116,4 +129,5 @@ Subsystem sftp /usr/libexec/sftp-server #Match User anoncvs # X11Forwarding no # AllowTcpForwarding no +# PermitTTY no # ForceCommand cvs server diff --git a/meta/recipes-connectivity/openssh/openssh/sshdgenkeys.service b/meta/recipes-connectivity/openssh/openssh/sshdgenkeys.service index c21d70baf0..d65086fc8a 100644 --- a/meta/recipes-connectivity/openssh/openssh/sshdgenkeys.service +++ b/meta/recipes-connectivity/openssh/openssh/sshdgenkeys.service @@ -3,6 +3,7 @@ Description=OpenSSH Key Generation ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key [Service] ExecStart=@BINDIR@/ssh-keygen -A diff --git a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb b/meta/recipes-connectivity/openssh/openssh_6.7p1.bb index e4468c17c3..a2726291fe 100644 --- a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.7p1.bb @@ -11,11 +11,9 @@ DEPENDS = "zlib openssl" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ - file://nostrip.patch \ file://sshd_config \ file://ssh_config \ file://init \ - file://openssh-CVE-2011-4327.patch \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ file://sshd.socket \ file://sshd@.service \ @@ -23,14 +21,12 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar. file://volatiles.99_sshd \ file://add-test-support-for-busybox.patch \ file://run-ptest \ - file://openssh-CVE-2014-2532.patch \ - file://openssh-CVE-2014-2653.patch \ file://auth2-none.c-avoid-authenticate-empty-passwords-to-m.patch" PAM_SRC_URI = "file://sshd" -SRC_URI[md5sum] = "3e9800e6bca1fbac0eea4d41baa7f239" -SRC_URI[sha256sum] = "48c1f0664b4534875038004cc4f3555b8329c2a81c1df48db5c517800de203bb" +SRC_URI[md5sum] = "3246aa79317b1d23cae783a3bf8275d6" +SRC_URI[sha256sum] = "b2f8394eae858dabbdef7dac10b99aec00c95462753e80342e530bbb6f725507" inherit useradd update-rc.d update-alternatives systemd @@ -43,14 +39,10 @@ INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9" SYSTEMD_PACKAGES = "${PN}-sshd" SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket" -PACKAGECONFIG ??= "tcp-wrappers" -PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,,tcp-wrappers" - inherit autotools-brokensep ptest # LFS support: CFLAGS += "-D__FILE_OFFSET_BITS=64" -export LD = "${CC}" # login path is hardcoded in sshd EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \ @@ -58,7 +50,9 @@ EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \ --without-zlib-version-check \ --with-privsep-path=/var/run/sshd \ --sysconfdir=${sysconfdir}/ssh \ - --with-xauth=/usr/bin/xauth" + --with-xauth=/usr/bin/xauth \ + --disable-strip \ + " # Since we do not depend on libbsd, we do not want configure to use it # just because it finds libutil.h. But, specifying --disable-libutil @@ -68,6 +62,9 @@ CACHED_CONFIGUREVARS += "ac_cv_header_bsd_libutil_h=no ac_cv_header_libutil_h=no # passwd path is hardcoded in sshd CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd" +# We don't want to depend on libblockfile +CACHED_CONFIGUREVARS += "ac_cv_header_maillock_h=no" + # This is a workaround for uclibc because including stdio.h # pulls in pthreads.h and causes conflicts in function prototypes. # This results in compilation failure, so unless this is fixed, @@ -75,6 +72,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd" EXTRA_OECONF_append_libc-uclibc=" --without-pam" do_configure_prepend () { + export LD="${CC}" install -m 0644 ${WORKDIR}/sshd_config ${B}/ install -m 0644 ${WORKDIR}/ssh_config ${B}/ if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then @@ -94,6 +92,7 @@ do_install_append () { rmdir ${D}${localstatedir}/run/sshd ${D}${localstatedir}/run ${D}${localstatedir} install -d ${D}/${sysconfdir}/default/volatiles install -m 644 ${WORKDIR}/volatiles.99_sshd ${D}/${sysconfdir}/default/volatiles/99_sshd + install -m 0755 ${S}/contrib/ssh-copy-id ${D}${bindir} # Create config files for read-only rootfs install -d ${D}${sysconfdir}/ssh diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index 9ec884f332..ba9bca6af4 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -50,6 +50,10 @@ CONFFILES_openssl-conf = "${libdir}/ssl/openssl.cnf" RRECOMMENDS_libcrypto += "openssl-conf" RDEPENDS_${PN}-ptest += "${PN}-misc make perl perl-module-filehandle bc" +# Remove this to enable SSLv3. SSLv3 is defaulted to disabled due to the POODLE +# vulnerability +EXTRA_OECONF = " -no-ssl3" + do_configure_prepend_darwin () { sed -i -e '/version-script=openssl\.ld/d' Configure } @@ -114,6 +118,9 @@ do_configure () { linux-*-mips64) target=linux-mips ;; + linux-microblaze*) + target=linux-generic32 + ;; linux-powerpc) target=linux-ppc ;; @@ -152,6 +159,9 @@ do_compile_ptest () { } do_install () { + # Create ${D}/${prefix} to fix parallel issues + mkdir -p ${D}/${prefix}/ + oe_runmake INSTALL_PREFIX="${D}" MANDIR="${mandir}" install oe_libinstall -so libcrypto ${D}${libdir} @@ -193,5 +203,12 @@ do_install_ptest () { install util/shlib_wrap.sh ${D}${PTEST_PATH}/util } -BBCLASSEXTEND = "native nativesdk" +do_install_append_virtclass-native() { + create_wrapper ${D}${bindir}/openssl \ + OPENSSL_CONF=${libdir}/ssl/openssl.cnf \ + SSL_CERT_DIR=${libdir}/ssl/certs \ + SSL_CERT_FILE=${libdir}/ssl/cert.pem \ + OPENSSL_ENGINES=${libdir}/ssl/engines +} +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-connectivity/openssl/openssl/Makefiles-ptest.patch b/meta/recipes-connectivity/openssl/openssl/Makefiles-ptest.patch index ac53a9142b..249446a5bd 100644 --- a/meta/recipes-connectivity/openssl/openssl/Makefiles-ptest.patch +++ b/meta/recipes-connectivity/openssl/openssl/Makefiles-ptest.patch @@ -5,10 +5,11 @@ Signed-off-by: Anders Roxell <anders.roxell@enea.com> Signed-off-by: Maxin B. John <maxin.john@enea.com> Upstream-Status: Pending --- -diff -uNr a/Makefile b/Makefile ---- a/Makefile.org 2012-05-10 17:06:02.000000000 +0200 -+++ b/Makefile.org 2012-10-27 00:05:55.359424024 +0200 -@@ -411,8 +411,16 @@ +Index: openssl-1.0.2/Makefile.org +=================================================================== +--- openssl-1.0.2.orig/Makefile.org ++++ openssl-1.0.2/Makefile.org +@@ -451,8 +451,16 @@ rehash.time: certs apps test: tests tests: rehash @@ -26,11 +27,11 @@ diff -uNr a/Makefile b/Makefile OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a report: -diff --git a/test/Makefile b/test/Makefile -index 3912f82..1696767 100644 ---- a/test/Makefile -+++ b/test/Makefile -@@ -128,7 +128,7 @@ tests: exe apps $(TESTS) +Index: openssl-1.0.2/test/Makefile +=================================================================== +--- openssl-1.0.2.orig/test/Makefile ++++ openssl-1.0.2/test/Makefile +@@ -137,7 +137,7 @@ tests: exe apps $(TESTS) apps: @(cd ..; $(MAKE) DIRS=apps all) @@ -39,28 +40,28 @@ index 3912f82..1696767 100644 test_des test_idea test_sha test_md4 test_md5 test_hmac \ test_md2 test_mdc2 test_wp \ test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_aes \ -@@ -138,6 +138,11 @@ alltests: \ - test_ss test_ca test_engine test_evp test_ssl test_tsa test_ige \ - test_jpake test_cms +@@ -148,6 +148,11 @@ alltests: \ + test_jpake test_srp test_cms test_ocsp test_v3name test_heartbeat \ + test_constant_time +alltests: + @(for i in $(all-tests); do \ + ( $(MAKE) $$i && echo "PASS: $$i" ) || echo "FAIL: $$i"; \ + done) + - test_evp: + test_evp: $(EVPTEST)$(EXE_EXT) evptests.txt ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt -@@ -203,7 +208,7 @@ test_x509: +@@ -213,7 +218,7 @@ test_x509: ../apps/openssl$(EXE_EXT) tx5 echo test second x509v3 certificate sh ./tx509 v3-cert2.pem 2>/dev/null --test_rsa: $(RSATEST)$(EXE_EXT) -+test_rsa: +-test_rsa: $(RSATEST)$(EXE_EXT) ../apps/openssl$(EXE_EXT) trsa testrsa.pem ++test_rsa: ../apps/openssl$(EXE_EXT) trsa testrsa.pem @sh ./trsa 2>/dev/null ../util/shlib_wrap.sh ./$(RSATEST) -@@ -298,11 +303,11 @@ test_tsa: +@@ -313,11 +318,11 @@ test_tsa: ../apps/openssl$(EXE_EXT) test sh ./testtsa; \ fi @@ -73,3 +74,4 @@ index 3912f82..1696767 100644 +test_jpake: @echo "Test JPAKE" ../util/shlib_wrap.sh ./$(JPAKETEST) + diff --git a/meta/recipes-connectivity/openssl/openssl/configure-targets.patch b/meta/recipes-connectivity/openssl/openssl/configure-targets.patch index c1f3d0878e..691e74afbd 100644 --- a/meta/recipes-connectivity/openssl/openssl/configure-targets.patch +++ b/meta/recipes-connectivity/openssl/openssl/configure-targets.patch @@ -7,28 +7,31 @@ The number of colons are important :) Configure | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) ---- a/Configure -+++ b/Configure -@@ -403,6 +403,22 @@ my %table=( - "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", - "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", +Index: openssl-1.0.2a/Configure +=================================================================== +--- openssl-1.0.2a.orig/Configure ++++ openssl-1.0.2a/Configure +@@ -443,6 +443,23 @@ my %table=( + "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", + "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", -+ # Linux on ARM -+"linux-elf-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-elf-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-gnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-uclibceabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-uclibceabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++ ++# Linux on ARM ++"linux-elf-arm","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-elf-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-gnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-uclibceabi-arm","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-uclibceabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + -+"linux-avr32","$ENV{'CC'}:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).", ++"linux-avr32","$ENV{'CC'}:-O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).", + +#### Linux on MIPS/MIPS64 -+"linux-mips","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-mips64","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -mabi=64 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-mips64el","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -mabi=64 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-mipsel","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-mips","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-mips64","$ENV{'CC'}:-DB_ENDIAN -mabi=64 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-mips64el","$ENV{'CC'}:-DL_ENDIAN -mabi=64 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-mipsel","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + - # Android: linux-* but without -DTERMIO and pointers to headers and libs. + # Android: linux-* but without pointers to headers and libs. "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "android-x86","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:".eval{my $asm=${x86_elf_asm};$asm=~s/:elf/:android/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", diff --git a/meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch b/meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch index ac1b19b943..3943e2c2e7 100644 --- a/meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch +++ b/meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch @@ -1,38 +1,58 @@ -Upstream-Status: Backport [debian] - From 83f318d68bbdab1ca898c94576a838cc97df4700 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <ludwig.nussel@suse.de> Date: Wed, 21 Apr 2010 15:52:10 +0200 Subject: [PATCH] also create old hash for compatibility +Upstream-Status: Backport [debian] + --- tools/c_rehash.in | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) -Index: openssl-1.0.0d/tools/c_rehash.in +Index: openssl-1.0.2~beta3/tools/c_rehash.in =================================================================== ---- openssl-1.0.0d.orig/tools/c_rehash.in 2011-04-13 20:41:28.000000000 +0000 -+++ openssl-1.0.0d/tools/c_rehash.in 2011-04-13 20:41:28.000000000 +0000 -@@ -86,6 +86,7 @@ - } +--- openssl-1.0.2~beta3.orig/tools/c_rehash.in ++++ openssl-1.0.2~beta3/tools/c_rehash.in +@@ -8,8 +8,6 @@ my $prefix; + + my $openssl = $ENV{OPENSSL} || "openssl"; + my $pwd; +-my $x509hash = "-subject_hash"; +-my $crlhash = "-hash"; + my $verbose = 0; + my $symlink_exists=eval {symlink("",""); 1}; + my $removelinks = 1; +@@ -18,10 +16,7 @@ my $removelinks = 1; + while ( $ARGV[0] =~ '-.*' ) { + my $flag = shift @ARGV; + last if ( $flag eq '--'); +- if ( $flag =~ /-old/) { +- $x509hash = "-subject_hash_old"; +- $crlhash = "-hash_old"; +- } elsif ( $flag =~ /-h/) { ++ if ( $flag =~ /-h/) { + help(); + } elsif ( $flag eq '-n' ) { + $removelinks = 0; +@@ -113,7 +108,9 @@ sub hash_dir { + next; } link_hash_cert($fname) if($cert); + link_hash_cert_old($fname) if($cert); link_hash_crl($fname) if($crl); ++ link_hash_crl_old($fname) if($crl); } } -@@ -119,8 +120,9 @@ + +@@ -146,6 +143,7 @@ sub check_file { sub link_hash_cert { my $fname = $_[0]; -+ my $hashopt = $_[1] || '-subject_hash'; ++ my $x509hash = $_[1] || '-subject_hash'; $fname =~ s/'/'\\''/g; -- my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in "$fname"`; -+ my ($hash, $fprint) = `"$openssl" x509 $hashopt -fingerprint -noout -in "$fname"`; + my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`; chomp $hash; - chomp $fprint; - $fprint =~ s/^.*=//; -@@ -150,6 +152,10 @@ +@@ -177,10 +175,20 @@ sub link_hash_cert { $hashlist{$hash} = $fprint; } @@ -40,6 +60,16 @@ Index: openssl-1.0.0d/tools/c_rehash.in + link_hash_cert($_[0], '-subject_hash_old'); +} + ++sub link_hash_crl_old { ++ link_hash_crl($_[0], '-hash_old'); ++} ++ ++ # Same as above except for a CRL. CRL links are of the form <hash>.r<n> sub link_hash_crl { + my $fname = $_[0]; ++ my $crlhash = $_[1] || "-hash"; + $fname =~ s/'/'\\''/g; + my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fname'`; + chomp $hash; diff --git a/meta/recipes-connectivity/openssl/openssl/debian/debian-targets.patch b/meta/recipes-connectivity/openssl/openssl/debian/debian-targets.patch index 8101edf0b0..39d4328184 100644 --- a/meta/recipes-connectivity/openssl/openssl/debian/debian-targets.patch +++ b/meta/recipes-connectivity/openssl/openssl/debian/debian-targets.patch @@ -1,12 +1,12 @@ Upstream-Status: Backport [debian] -Index: openssl-1.0.1/Configure +Index: openssl-1.0.2/Configure =================================================================== ---- openssl-1.0.1.orig/Configure 2012-03-17 15:37:54.000000000 +0000 -+++ openssl-1.0.1/Configure 2012-03-17 16:13:49.000000000 +0000 -@@ -105,6 +105,10 @@ +--- openssl-1.0.2.orig/Configure ++++ openssl-1.0.2/Configure +@@ -107,6 +107,10 @@ my $gcc_devteam_warn = "-Wall -pedantic - my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED"; + my $clang_disabled_warnings = "-Wno-language-extension-token -Wno-extended-offsetof -Wno-padded -Wno-shorten-64-to-32 -Wno-format-nonliteral -Wno-missing-noreturn -Wno-unused-parameter -Wno-sign-conversion -Wno-unreachable-code -Wno-conversion -Wno-documentation -Wno-missing-variable-declarations -Wno-cast-align -Wno-incompatible-pointer-types-discards-qualifiers -Wno-missing-variable-declarations -Wno-missing-field-initializers -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-conditional-uninitialized -Wno-switch-enum"; +# There are no separate CFLAGS/CPPFLAGS/LDFLAGS, set everything in CFLAGS +my $debian_cflags = `dpkg-buildflags --get CFLAGS` . `dpkg-buildflags --get CPPFLAGS` . `dpkg-buildflags --get LDFLAGS` . "-Wa,--noexecstack -Wall"; @@ -15,7 +15,7 @@ Index: openssl-1.0.1/Configure my $strict_warnings = 0; my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL"; -@@ -338,6 +342,48 @@ +@@ -343,6 +347,55 @@ my %table=( "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so", "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so", @@ -23,9 +23,9 @@ Index: openssl-1.0.1/Configure +"debian-alpha","gcc:-DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-alpha-ev4","gcc:-DTERMIO ${debian_cflags} -mcpu=ev4::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-alpha-ev5","gcc:-DTERMIO ${debian_cflags} -mcpu=ev5::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-armeb","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-armel","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-armhf","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-arm64","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-armel","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-armhf","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::", +"debian-avr32", "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags} -fomit-frame-pointer::-D_REENTRANT::-ldl:BN_LLONG_BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -40,15 +40,21 @@ Index: openssl-1.0.1/Configure +"debian-m68k","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-mips", "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-mipsel", "gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-mipsn32", "mips64-linux-gnuabin32-gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-mipsn32el", "mips64el-linux-gnuabin32-gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-mips64", "mips64-linux-gnuabi64-gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-mips64el", "mips64el-linux-gnuabi64-gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-netbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS ${debian_cflags} -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-netbsd-m68k", "gcc:-DB_ENDIAN -DTERMIOS ${debian_cflags}::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-netbsd-sparc", "gcc:-DB_ENDIAN -DTERMIOS ${debian_cflags} -mv8::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-openbsd-alpha","gcc:-DTERMIOS ${debian_cflags}::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-openbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS ${debian_cflags} -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-openbsd-mips","gcc:-DL_ENDIAN ${debian_cflags}::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-or1k", "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-powerpc","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-powerpcspe","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-ppc64","gcc:-m64 -DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-ppc64el","gcc:-m64 -DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64le:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-s390","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-s390x","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-sh3", "gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -60,6 +66,7 @@ Index: openssl-1.0.1/Configure +"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags} -mcpu=v8 -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags} -mcpu=v9 -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-sparc64","gcc:-m64 -DB_ENDIAN -DTERMIO ${debian_cflags} -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-x32","gcc:-mx32 -DL_ENDIAN -DTERMIO ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32", + #### #### Variety of LINUX:-) diff --git a/meta/recipes-connectivity/openssl/openssl/debian/version-script.patch b/meta/recipes-connectivity/openssl/openssl/debian/version-script.patch index ece8b9b46c..a24918000a 100644 --- a/meta/recipes-connectivity/openssl/openssl/debian/version-script.patch +++ b/meta/recipes-connectivity/openssl/openssl/debian/version-script.patch @@ -1,10 +1,8 @@ -Upstream-Status: Backport [debian] - -Index: openssl-1.0.1d/Configure +Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/Configure =================================================================== ---- openssl-1.0.1d.orig/Configure 2013-02-06 19:41:43.000000000 +0100 -+++ openssl-1.0.1d/Configure 2013-02-06 19:41:43.000000000 +0100 -@@ -1621,6 +1621,8 @@ +--- openssl-1.0.2~beta1.obsolete.0.0498436515490575.orig/Configure 2014-02-24 21:02:30.000000000 +0100 ++++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/Configure 2014-02-24 21:02:30.000000000 +0100 +@@ -1651,6 +1651,8 @@ } } @@ -13,11 +11,11 @@ Index: openssl-1.0.1d/Configure open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n"; unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new"; open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n"; -Index: openssl-1.0.1d/openssl.ld +Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ openssl-1.0.1d/openssl.ld 2013-02-06 19:44:25.000000000 +0100 -@@ -0,0 +1,4620 @@ ++++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld 2014-02-24 22:19:08.601827266 +0100 +@@ -0,0 +1,4615 @@ +OPENSSL_1.0.0 { + global: + BIO_f_ssl; @@ -2229,20 +2227,16 @@ Index: openssl-1.0.1d/openssl.ld + ERR_load_COMP_strings; + PKCS12_item_decrypt_d2i; + ASN1_UTF8STRING_it; -+ ASN1_UTF8STRING_it; + ENGINE_unregister_ciphers; + ENGINE_get_ciphers; + d2i_OCSP_BASICRESP; + KRB5_CHECKSUM_it; -+ KRB5_CHECKSUM_it; + EC_POINT_add; + ASN1_item_ex_i2d; + OCSP_CERTID_it; -+ OCSP_CERTID_it; + d2i_OCSP_RESPBYTES; + X509V3_add1_i2d; + PKCS7_ENVELOPE_it; -+ PKCS7_ENVELOPE_it; + UI_add_input_boolean; + ENGINE_unregister_RSA; + X509V3_EXT_nconf; @@ -2254,19 +2248,15 @@ Index: openssl-1.0.1d/openssl.ld + ENGINE_register_all_RAND; + ENGINE_load_dynamic; + PBKDF2PARAM_it; -+ PBKDF2PARAM_it; + EXTENDED_KEY_USAGE_new; + EC_GROUP_clear_free; + OCSP_sendreq_bio; + ASN1_item_digest; + OCSP_BASICRESP_delete_ext; + OCSP_SIGNATURE_it; -+ OCSP_SIGNATURE_it; -+ X509_CRL_it; + X509_CRL_it; + OCSP_BASICRESP_add_ext; + KRB5_ENCKEY_it; -+ KRB5_ENCKEY_it; + UI_method_set_closer; + X509_STORE_set_purpose; + i2d_ASN1_GENERALSTRING; @@ -2277,7 +2267,6 @@ Index: openssl-1.0.1d/openssl.ld + OCSP_REQUEST_get_ext_by_OBJ; + _ossl_old_des_random_key; + ASN1_T61STRING_it; -+ ASN1_T61STRING_it; + EC_GROUP_method_of; + i2d_KRB5_APREQ; + _ossl_old_des_encrypt; @@ -2293,7 +2282,6 @@ Index: openssl-1.0.1d/openssl.ld + OCSP_SINGLERESP_get_ext_count; + UI_ctrl; + _shadow_DES_rw_mode; -+ _shadow_DES_rw_mode; + asn1_do_adb; + ASN1_template_i2d; + ENGINE_register_DH; @@ -2307,8 +2295,6 @@ Index: openssl-1.0.1d/openssl.ld + KRB5_ENCKEY_free; + OCSP_resp_get0; + GENERAL_NAME_it; -+ GENERAL_NAME_it; -+ ASN1_GENERALIZEDTIME_it; + ASN1_GENERALIZEDTIME_it; + X509_STORE_set_flags; + EC_POINT_set_compressed_coordinates_GFp; @@ -2330,21 +2316,18 @@ Index: openssl-1.0.1d/openssl.ld + EC_POINT_set_affine_coords_GFp; + _ossl_old_des_options; + SXNET_it; -+ SXNET_it; + UI_dup_input_boolean; + PKCS12_add_CSPName_asc; + EC_POINT_is_at_infinity; + ENGINE_load_cryptodev; + DSO_convert_filename; + POLICYQUALINFO_it; -+ POLICYQUALINFO_it; + ENGINE_register_ciphers; + BN_mod_lshift_quick; + DSO_set_filename; + ASN1_item_free; + KRB5_TKTBODY_free; + AUTHORITY_KEYID_it; -+ AUTHORITY_KEYID_it; + KRB5_APREQBODY_new; + X509V3_EXT_REQ_add_nconf; + ENGINE_ctrl_cmd_string; @@ -2352,19 +2335,15 @@ Index: openssl-1.0.1d/openssl.ld + EVP_MD_CTX_init; + EXTENDED_KEY_USAGE_free; + PKCS7_ATTR_SIGN_it; -+ PKCS7_ATTR_SIGN_it; + UI_add_error_string; + KRB5_CHECKSUM_free; + OCSP_REQUEST_get_ext; + ENGINE_load_ubsec; + ENGINE_register_all_digests; + PKEY_USAGE_PERIOD_it; -+ PKEY_USAGE_PERIOD_it; + PKCS12_unpack_authsafes; + ASN1_item_unpack; + NETSCAPE_SPKAC_it; -+ NETSCAPE_SPKAC_it; -+ X509_REVOKED_it; + X509_REVOKED_it; + ASN1_STRING_encode; + EVP_aes_128_ecb; @@ -2376,7 +2355,6 @@ Index: openssl-1.0.1d/openssl.ld + UI_dup_info_string; + _ossl_old_des_xwhite_in2out; + PKCS12_it; -+ PKCS12_it; + OCSP_SINGLERESP_get_ext_by_critical; + OCSP_SINGLERESP_get_ext_by_crit; + OCSP_CERTSTATUS_free; @@ -2395,10 +2373,8 @@ Index: openssl-1.0.1d/openssl.ld + ENGINE_unregister_DSA; + _ossl_old_des_key_sched; + X509_EXTENSION_it; -+ X509_EXTENSION_it; + i2d_KRB5_AUTHENT; + SXNETID_it; -+ SXNETID_it; + d2i_OCSP_SINGLERESP; + EDIPARTYNAME_new; + PKCS12_certbag2x509; @@ -2409,10 +2385,8 @@ Index: openssl-1.0.1d/openssl.ld + d2i_KRB5_APREQBODY; + UI_method_get_flusher; + X509_PUBKEY_it; -+ X509_PUBKEY_it; + _ossl_old_des_enc_read; + PKCS7_ENCRYPT_it; -+ PKCS7_ENCRYPT_it; + i2d_OCSP_RESPONSE; + EC_GROUP_get_cofactor; + PKCS12_unpack_p7data; @@ -2430,10 +2404,8 @@ Index: openssl-1.0.1d/openssl.ld + PKCS12_item_i2d_encrypt; + X509_add1_ext_i2d; + PKCS7_SIGNER_INFO_it; -+ PKCS7_SIGNER_INFO_it; + KRB5_PRINCNAME_new; + PKCS12_SAFEBAG_it; -+ PKCS12_SAFEBAG_it; + EC_GROUP_get_order; + d2i_OCSP_RESPID; + OCSP_request_verify; @@ -2448,42 +2420,32 @@ Index: openssl-1.0.1d/openssl.ld + EVP_MD_CTX_create; + OCSP_resp_find_status; + X509_ALGOR_it; -+ X509_ALGOR_it; -+ ASN1_TIME_it; + ASN1_TIME_it; + OCSP_request_set1_name; + OCSP_ONEREQ_get_ext_count; + UI_get0_result; + PKCS12_AUTHSAFES_it; -+ PKCS12_AUTHSAFES_it; + EVP_aes_256_ecb; + PKCS12_pack_authsafes; + ASN1_IA5STRING_it; -+ ASN1_IA5STRING_it; + UI_get_input_flags; + EC_GROUP_set_generator; + _ossl_old_des_string_to_2keys; + OCSP_CERTID_free; + X509_CERT_AUX_it; -+ X509_CERT_AUX_it; -+ CERTIFICATEPOLICIES_it; + CERTIFICATEPOLICIES_it; + _ossl_old_des_ede3_cbc_encrypt; + RAND_set_rand_engine; + DSO_get_loaded_filename; + X509_ATTRIBUTE_it; -+ X509_ATTRIBUTE_it; + OCSP_ONEREQ_get_ext_by_NID; + PKCS12_decrypt_skey; + KRB5_AUTHENT_it; -+ KRB5_AUTHENT_it; + UI_dup_error_string; + RSAPublicKey_it; -+ RSAPublicKey_it; + i2d_OCSP_REQUEST; + PKCS12_x509crl2certbag; + OCSP_SERVICELOC_it; -+ OCSP_SERVICELOC_it; + ASN1_item_sign; + X509_CRL_set_issuer_name; + OBJ_NAME_do_all_sorted; @@ -2494,30 +2456,23 @@ Index: openssl-1.0.1d/openssl.ld + ENGINE_get_digest; + OCSP_RESPONSE_print; + KRB5_TKTBODY_it; -+ KRB5_TKTBODY_it; + ACCESS_DESCRIPTION_it; -+ ACCESS_DESCRIPTION_it; -+ PKCS7_ISSUER_AND_SERIAL_it; + PKCS7_ISSUER_AND_SERIAL_it; + PBE2PARAM_it; -+ PBE2PARAM_it; + PKCS12_certbag2x509crl; + PKCS7_SIGNED_it; -+ PKCS7_SIGNED_it; + ENGINE_get_cipher; + i2d_OCSP_CRLID; + OCSP_SINGLERESP_new; + ENGINE_cmd_is_executable; + RSA_up_ref; + ASN1_GENERALSTRING_it; -+ ASN1_GENERALSTRING_it; + ENGINE_register_DSA; + X509V3_EXT_add_nconf_sk; + ENGINE_set_load_pubkey_function; + PKCS8_decrypt; + PEM_bytes_read_bio; + DIRECTORYSTRING_it; -+ DIRECTORYSTRING_it; + d2i_OCSP_CRLID; + EC_POINT_is_on_curve; + CRYPTO_set_locked_mem_ex_functions; @@ -2525,7 +2480,6 @@ Index: openssl-1.0.1d/openssl.ld + d2i_KRB5_CHECKSUM; + ASN1_item_dup; + X509_it; -+ X509_it; + BN_mod_add; + KRB5_AUTHDATA_free; + _ossl_old_des_cbc_cksum; @@ -2534,7 +2488,6 @@ Index: openssl-1.0.1d/openssl.ld + EC_POINT_get_Jprojective_coordinates_GFp; + EC_POINT_get_Jproj_coords_GFp; + ZLONG_it; -+ ZLONG_it; + CRYPTO_get_locked_mem_ex_functions; + CRYPTO_get_locked_mem_ex_funcs; + ASN1_TIME_check; @@ -2544,41 +2497,30 @@ Index: openssl-1.0.1d/openssl.ld + _ossl_old_des_ede3_cfb64_encrypt; + _ossl_odes_ede3_cfb64_encrypt; + ASN1_BMPSTRING_it; -+ ASN1_BMPSTRING_it; + ASN1_tag2bit; + UI_method_set_flusher; + X509_ocspid_print; + KRB5_ENCDATA_it; -+ KRB5_ENCDATA_it; + ENGINE_get_load_pubkey_function; + UI_add_user_data; + OCSP_REQUEST_delete_ext; + UI_get_method; + OCSP_ONEREQ_free; + ASN1_PRINTABLESTRING_it; -+ ASN1_PRINTABLESTRING_it; + X509_CRL_set_nextUpdate; + OCSP_REQUEST_it; -+ OCSP_REQUEST_it; -+ OCSP_BASICRESP_it; + OCSP_BASICRESP_it; + AES_ecb_encrypt; + BN_mod_sqr; + NETSCAPE_CERT_SEQUENCE_it; -+ NETSCAPE_CERT_SEQUENCE_it; -+ GENERAL_NAMES_it; + GENERAL_NAMES_it; + AUTHORITY_INFO_ACCESS_it; -+ AUTHORITY_INFO_ACCESS_it; -+ ASN1_FBOOLEAN_it; + ASN1_FBOOLEAN_it; + UI_set_ex_data; + _ossl_old_des_string_to_key; + ENGINE_register_all_RSA; + d2i_KRB5_PRINCNAME; + OCSP_RESPBYTES_it; -+ OCSP_RESPBYTES_it; -+ X509_CINF_it; + X509_CINF_it; + ENGINE_unregister_digests; + d2i_EDIPARTYNAME; @@ -2588,7 +2530,6 @@ Index: openssl-1.0.1d/openssl.ld + OCSP_RESPDATA_free; + d2i_KRB5_TICKET; + OTHERNAME_it; -+ OTHERNAME_it; + EVP_MD_CTX_cleanup; + d2i_ASN1_GENERALSTRING; + X509_CRL_set_version; @@ -2598,7 +2539,6 @@ Index: openssl-1.0.1d/openssl.ld + OCSP_REQUEST_free; + OCSP_REQUEST_add1_ext_i2d; + X509_VAL_it; -+ X509_VAL_it; + EC_POINTs_make_affine; + EC_POINT_mul; + X509V3_EXT_add_nconf; @@ -2606,7 +2546,6 @@ Index: openssl-1.0.1d/openssl.ld + X509_CRL_add1_ext_i2d; + _ossl_old_des_fcrypt; + DISPLAYTEXT_it; -+ DISPLAYTEXT_it; + X509_CRL_set_lastUpdate; + OCSP_BASICRESP_free; + OCSP_BASICRESP_add1_ext_i2d; @@ -2619,7 +2558,6 @@ Index: openssl-1.0.1d/openssl.ld + UI_get0_result_string; + ASN1_GENERALSTRING_new; + X509_SIG_it; -+ X509_SIG_it; + ERR_set_implementation; + ERR_load_EC_strings; + UI_get0_action_string; @@ -2634,35 +2572,27 @@ Index: openssl-1.0.1d/openssl.ld + OCSP_ONEREQ_get_ext_by_OBJ; + ASN1_primitive_new; + ASN1_PRINTABLE_it; -+ ASN1_PRINTABLE_it; + EVP_aes_192_ecb; + OCSP_SIGNATURE_new; + LONG_it; -+ LONG_it; -+ ASN1_VISIBLESTRING_it; + ASN1_VISIBLESTRING_it; + OCSP_SINGLERESP_add1_ext_i2d; + d2i_OCSP_CERTID; + ASN1_item_d2i_fp; + CRL_DIST_POINTS_it; -+ CRL_DIST_POINTS_it; + GENERAL_NAME_print; + OCSP_SINGLERESP_delete_ext; + PKCS12_SAFEBAGS_it; -+ PKCS12_SAFEBAGS_it; + d2i_OCSP_SIGNATURE; + OCSP_request_add1_nonce; + ENGINE_set_cmd_defns; + OCSP_SERVICELOC_free; + EC_GROUP_free; + ASN1_BIT_STRING_it; -+ ASN1_BIT_STRING_it; -+ X509_REQ_it; + X509_REQ_it; + _ossl_old_des_cbc_encrypt; + ERR_unload_strings; + PKCS7_SIGN_ENVELOPE_it; -+ PKCS7_SIGN_ENVELOPE_it; + EDIPARTYNAME_free; + OCSP_REQINFO_free; + EC_GROUP_new_curve_GFp; @@ -2687,7 +2617,6 @@ Index: openssl-1.0.1d/openssl.ld + OCSP_CRLID_free; + OCSP_BASICRESP_get1_ext_d2i; + RSAPrivateKey_it; -+ RSAPrivateKey_it; + ENGINE_register_all_DH; + i2d_EDIPARTYNAME; + EC_POINT_get_affine_coordinates_GFp; @@ -2695,10 +2624,8 @@ Index: openssl-1.0.1d/openssl.ld + OCSP_CRLID_new; + ENGINE_get_flags; + OCSP_ONEREQ_it; -+ OCSP_ONEREQ_it; + UI_process; + ASN1_INTEGER_it; -+ ASN1_INTEGER_it; + EVP_CipherInit_ex; + UI_get_string_type; + ENGINE_unregister_DH; @@ -2707,7 +2634,6 @@ Index: openssl-1.0.1d/openssl.ld + bn_dup_expand; + OCSP_cert_id_new; + BASIC_CONSTRAINTS_it; -+ BASIC_CONSTRAINTS_it; + BN_mod_add_quick; + EC_POINT_new; + EVP_MD_CTX_destroy; @@ -2717,7 +2643,6 @@ Index: openssl-1.0.1d/openssl.ld + EC_POINT_free; + DH_up_ref; + X509_NAME_ENTRY_it; -+ X509_NAME_ENTRY_it; + UI_get_ex_new_index; + BN_mod_sub_quick; + OCSP_ONEREQ_add_ext; @@ -2730,7 +2655,6 @@ Index: openssl-1.0.1d/openssl.ld + ENGINE_register_complete; + X509V3_EXT_nconf_nid; + ASN1_SEQUENCE_it; -+ ASN1_SEQUENCE_it; + UI_set_default_method; + RAND_query_egd_bytes; + UI_method_get_writer; @@ -2738,8 +2662,6 @@ Index: openssl-1.0.1d/openssl.ld + PEM_def_callback; + ENGINE_cleanup; + DIST_POINT_it; -+ DIST_POINT_it; -+ OCSP_SINGLERESP_it; + OCSP_SINGLERESP_it; + d2i_KRB5_TKTBODY; + EC_POINT_cmp; @@ -2758,24 +2680,20 @@ Index: openssl-1.0.1d/openssl.ld + OCSP_cert_to_id; + OCSP_RESPID_new; + OCSP_RESPDATA_it; -+ OCSP_RESPDATA_it; + d2i_OCSP_RESPDATA; + ENGINE_register_all_complete; + OCSP_check_validity; + PKCS12_BAGS_it; -+ PKCS12_BAGS_it; + OCSP_url_svcloc_new; + ASN1_template_free; + OCSP_SINGLERESP_add_ext; + KRB5_AUTHENTBODY_it; -+ KRB5_AUTHENTBODY_it; + X509_supported_extension; + i2d_KRB5_AUTHDATA; + UI_method_get_opener; + ENGINE_set_ex_data; + OCSP_REQUEST_print; + CBIGNUM_it; -+ CBIGNUM_it; + KRB5_TICKET_new; + KRB5_APREQ_new; + EC_GROUP_get_curve_GFp; @@ -2785,27 +2703,20 @@ Index: openssl-1.0.1d/openssl.ld + OCSP_single_get0_status; + BN_swap; + POLICYINFO_it; -+ POLICYINFO_it; + ENGINE_set_destroy_function; + asn1_enc_free; + OCSP_RESPID_it; -+ OCSP_RESPID_it; + EC_GROUP_new; + EVP_aes_256_cbc; + i2d_KRB5_PRINCNAME; + _ossl_old_des_encrypt2; + _ossl_old_des_encrypt3; + PKCS8_PRIV_KEY_INFO_it; -+ PKCS8_PRIV_KEY_INFO_it; -+ OCSP_REQINFO_it; + OCSP_REQINFO_it; + PBEPARAM_it; -+ PBEPARAM_it; + KRB5_AUTHENTBODY_new; + X509_CRL_add0_revoked; + EDIPARTYNAME_it; -+ EDIPARTYNAME_it; -+ NETSCAPE_SPKI_it; + NETSCAPE_SPKI_it; + UI_get0_test_string; + ENGINE_get_cipher_engine; @@ -2817,14 +2728,12 @@ Index: openssl-1.0.1d/openssl.ld + UI_method_get_reader; + OCSP_BASICRESP_get_ext_count; + ASN1_ENUMERATED_it; -+ ASN1_ENUMERATED_it; + UI_set_result; + i2d_KRB5_TICKET; + X509_print_ex_fp; + EVP_CIPHER_CTX_set_padding; + d2i_OCSP_RESPONSE; + ASN1_UTCTIME_it; -+ ASN1_UTCTIME_it; + _ossl_old_des_enc_write; + OCSP_RESPONSE_new; + AES_set_encrypt_key; @@ -2834,14 +2743,11 @@ Index: openssl-1.0.1d/openssl.ld + OCSP_onereq_get0_id; + ENGINE_set_default_ciphers; + NOTICEREF_it; -+ NOTICEREF_it; + X509V3_EXT_CRL_add_nconf; + OCSP_REVOKEDINFO_it; -+ OCSP_REVOKEDINFO_it; + AES_encrypt; + OCSP_REQUEST_new; + ASN1_ANY_it; -+ ASN1_ANY_it; + CRYPTO_ex_data_new_class; + _ossl_old_des_ncbc_encrypt; + i2d_KRB5_TKTBODY; @@ -2864,19 +2770,15 @@ Index: openssl-1.0.1d/openssl.ld + ENGINE_load_nuron; + _ossl_old_des_pcbc_encrypt; + PKCS12_MAC_DATA_it; -+ PKCS12_MAC_DATA_it; + OCSP_accept_responses_new; + asn1_do_lock; + PKCS7_ATTR_VERIFY_it; -+ PKCS7_ATTR_VERIFY_it; -+ KRB5_APREQBODY_it; + KRB5_APREQBODY_it; + i2d_OCSP_SINGLERESP; + ASN1_item_ex_new; + UI_add_verify_string; + _ossl_old_des_set_key; + KRB5_PRINCNAME_it; -+ KRB5_PRINCNAME_it; + EVP_DecryptInit_ex; + i2d_OCSP_CERTID; + ASN1_item_d2i_bio; @@ -2890,20 +2792,17 @@ Index: openssl-1.0.1d/openssl.ld + OCSP_BASICRESP_new; + OCSP_REQUEST_get_ext_by_NID; + KRB5_APREQ_it; -+ KRB5_APREQ_it; + ENGINE_get_destroy_function; + CONF_set_nconf; + ASN1_PRINTABLE_free; + OCSP_BASICRESP_get_ext_by_NID; + DIST_POINT_NAME_it; -+ DIST_POINT_NAME_it; + X509V3_extensions_print; + _ossl_old_des_cfb64_encrypt; + X509_REVOKED_add1_ext_i2d; + _ossl_old_des_ofb_encrypt; + KRB5_TKTBODY_new; + ASN1_OCTET_STRING_it; -+ ASN1_OCTET_STRING_it; + ERR_load_UI_strings; + i2d_KRB5_ENCKEY; + ASN1_template_new; @@ -2911,8 +2810,6 @@ Index: openssl-1.0.1d/openssl.ld + ASN1_item_i2d_fp; + KRB5_PRINCNAME_free; + PKCS7_RECIP_INFO_it; -+ PKCS7_RECIP_INFO_it; -+ EXTENDED_KEY_USAGE_it; + EXTENDED_KEY_USAGE_it; + EC_GFp_simple_method; + EC_GROUP_precompute_mult; @@ -2920,42 +2817,33 @@ Index: openssl-1.0.1d/openssl.ld + UI_method_set_writer; + KRB5_AUTHENT_new; + X509_CRL_INFO_it; -+ X509_CRL_INFO_it; + DSO_set_name_converter; + AES_set_decrypt_key; + PKCS7_DIGEST_it; -+ PKCS7_DIGEST_it; + PKCS12_x5092certbag; + EVP_DigestInit_ex; + i2a_ACCESS_DESCRIPTION; + OCSP_RESPONSE_it; -+ OCSP_RESPONSE_it; -+ PKCS7_ENC_CONTENT_it; + PKCS7_ENC_CONTENT_it; + OCSP_request_add0_id; + EC_POINT_make_affine; + DSO_get_filename; + OCSP_CERTSTATUS_it; -+ OCSP_CERTSTATUS_it; + OCSP_request_add1_cert; + UI_get0_output_string; + UI_dup_verify_string; + BN_mod_lshift; + KRB5_AUTHDATA_it; -+ KRB5_AUTHDATA_it; + asn1_set_choice_selector; + OCSP_basic_add1_status; + OCSP_RESPID_free; + asn1_get_field_ptr; + UI_add_input_string; + OCSP_CRLID_it; -+ OCSP_CRLID_it; + i2d_KRB5_AUTHENTBODY; + OCSP_REQUEST_get_ext_count; + ENGINE_load_atalla; + X509_NAME_it; -+ X509_NAME_it; -+ USERNOTICE_it; + USERNOTICE_it; + OCSP_REQINFO_new; + OCSP_BASICRESP_get_ext; @@ -2965,33 +2853,27 @@ Index: openssl-1.0.1d/openssl.ld + i2d_KRB5_ENCDATA; + X509_PURPOSE_set; + X509_REQ_INFO_it; -+ X509_REQ_INFO_it; + UI_method_set_opener; + ASN1_item_ex_free; + ASN1_BOOLEAN_it; -+ ASN1_BOOLEAN_it; + ENGINE_get_table_flags; + UI_create_method; + OCSP_ONEREQ_add1_ext_i2d; + _shadow_DES_check_key; -+ _shadow_DES_check_key; + d2i_OCSP_REQINFO; + UI_add_info_string; + UI_get_result_minsize; + ASN1_NULL_it; -+ ASN1_NULL_it; + BN_mod_lshift1; + d2i_OCSP_ONEREQ; + OCSP_ONEREQ_new; + KRB5_TICKET_it; -+ KRB5_TICKET_it; + EVP_aes_192_cbc; + KRB5_TICKET_free; + UI_new; + OCSP_response_create; + _ossl_old_des_xcbc_encrypt; + PKCS7_it; -+ PKCS7_it; + OCSP_REQUEST_get_ext_by_critical; + OCSP_REQUEST_get_ext_by_crit; + ENGINE_set_flags; @@ -3000,11 +2882,9 @@ Index: openssl-1.0.1d/openssl.ld + EVP_Digest; + OCSP_ONEREQ_delete_ext; + ASN1_TBOOLEAN_it; -+ ASN1_TBOOLEAN_it; + ASN1_item_new; + ASN1_TIME_to_generalizedtime; + BIGNUM_it; -+ BIGNUM_it; + AES_cbc_encrypt; + ENGINE_get_load_privkey_function; + ENGINE_get_load_privkey_fn; @@ -3016,7 +2896,6 @@ Index: openssl-1.0.1d/openssl.ld + EC_POINT_point2oct; + KRB5_APREQ_free; + ASN1_OBJECT_it; -+ ASN1_OBJECT_it; + OCSP_crlID_new; + OCSP_crlID2_new; + CONF_modules_load_file; @@ -3074,7 +2953,6 @@ Index: openssl-1.0.1d/openssl.ld + i2d_ASN1_UNIVERSALSTRING; + ASN1_UNIVERSALSTRING_free; + ASN1_UNIVERSALSTRING_it; -+ ASN1_UNIVERSALSTRING_it; + d2i_ASN1_UNIVERSALSTRING; + EVP_des_ede3_ecb; + X509_REQ_print_ex; @@ -3130,14 +3008,12 @@ Index: openssl-1.0.1d/openssl.ld + HMAC_CTX_set_flags; + d2i_PROXY_CERT_INFO_EXTENSION; + PROXY_POLICY_it; -+ PROXY_POLICY_it; + i2d_PROXY_POLICY; + i2d_PROXY_CERT_INFO_EXTENSION; + d2i_PROXY_POLICY; + PROXY_CERT_INFO_EXTENSION_new; + PROXY_CERT_INFO_EXTENSION_free; + PROXY_CERT_INFO_EXTENSION_it; -+ PROXY_CERT_INFO_EXTENSION_it; + PROXY_POLICY_free; + PROXY_POLICY_new; + BN_MONT_CTX_set_locked; @@ -3174,7 +3050,6 @@ Index: openssl-1.0.1d/openssl.ld + BN_BLINDING_get_thread_id; + X509_STORE_CTX_set0_param; + POLICY_MAPPING_it; -+ POLICY_MAPPING_it; + STORE_parse_attrs_start; + POLICY_CONSTRAINTS_free; + EVP_PKEY_add1_attr_by_NID; @@ -3183,7 +3058,6 @@ Index: openssl-1.0.1d/openssl.ld + STORE_set_method; + GENERAL_SUBTREE_free; + NAME_CONSTRAINTS_it; -+ NAME_CONSTRAINTS_it; + ECDH_get_default_method; + PKCS12_add_safe; + EC_KEY_new_by_curve_name; @@ -3226,7 +3100,6 @@ Index: openssl-1.0.1d/openssl.ld + ENGINE_get_default_ECDH; + EC_KEY_get_conv_form; + ASN1_OCTET_STRING_NDEF_it; -+ ASN1_OCTET_STRING_NDEF_it; + STORE_delete_public_key; + STORE_get_public_key; + STORE_modify_arbitrary; @@ -3383,7 +3256,6 @@ Index: openssl-1.0.1d/openssl.ld + ENGINE_load_padlock; + EC_GROUP_set_curve_name; + X509_CERT_PAIR_it; -+ X509_CERT_PAIR_it; + STORE_meth_get_revoke_fn; + STORE_method_get_revoke_function; + STORE_method_set_get_function; @@ -3510,7 +3382,6 @@ Index: openssl-1.0.1d/openssl.ld + pqueue_pop; + STORE_ATTR_INFO_get0_cstr; + POLICY_CONSTRAINTS_it; -+ POLICY_CONSTRAINTS_it; + STORE_get_ex_new_index; + EVP_PKEY_get_attr_by_OBJ; + X509_VERIFY_PARAM_add0_policy; @@ -3558,8 +3429,6 @@ Index: openssl-1.0.1d/openssl.ld + STORE_modify_crl; + STORE_list_private_key_start; + POLICY_MAPPINGS_it; -+ POLICY_MAPPINGS_it; -+ GENERAL_SUBTREE_it; + GENERAL_SUBTREE_it; + EC_GROUP_get_curve_name; + PEM_write_X509_CERT_PAIR; @@ -3692,15 +3561,12 @@ Index: openssl-1.0.1d/openssl.ld + BIO_set_callback_arg; + v3_addr_add_prefix; + IPAddressOrRange_it; -+ IPAddressOrRange_it; + BIO_set_flags; + ASIdentifiers_it; -+ ASIdentifiers_it; + v3_addr_get_range; + BIO_method_type; + v3_addr_inherits; + IPAddressChoice_it; -+ IPAddressChoice_it; + AES_ige_encrypt; + v3_addr_add_range; + EVP_CIPHER_CTX_nid; @@ -3721,7 +3587,6 @@ Index: openssl-1.0.1d/openssl.ld + BIO_clear_flags; + i2d_ASRange; + IPAddressRange_it; -+ IPAddressRange_it; + IPAddressChoice_new; + ASIdentifierChoice_new; + ASRange_free; @@ -3742,7 +3607,6 @@ Index: openssl-1.0.1d/openssl.ld + BIO_test_flags; + i2d_ASIdentifierChoice; + ASRange_it; -+ ASRange_it; + d2i_ASIdentifiers; + ASRange_new; + d2i_IPAddressChoice; @@ -3751,7 +3615,6 @@ Index: openssl-1.0.1d/openssl.ld + EVP_Cipher; + i2d_IPAddressOrRange; + ASIdOrRange_it; -+ ASIdOrRange_it; + EVP_CIPHER_nid; + i2d_IPAddressChoice; + EVP_CIPHER_CTX_block_size; @@ -3762,7 +3625,6 @@ Index: openssl-1.0.1d/openssl.ld + v3_addr_is_canonical; + i2d_IPAddressRange; + IPAddressFamily_it; -+ IPAddressFamily_it; + v3_asid_inherits; + EVP_CIPHER_CTX_cipher; + EVP_CIPHER_CTX_get_app_data; @@ -3772,7 +3634,6 @@ Index: openssl-1.0.1d/openssl.ld + d2i_IPAddressOrRange; + v3_addr_canonize; + ASIdentifierChoice_it; -+ ASIdentifierChoice_it; + EVP_MD_CTX_md; + d2i_ASIdentifierChoice; + BIO_method_name; @@ -3795,7 +3656,6 @@ Index: openssl-1.0.1d/openssl.ld + SEED_set_key; + EVP_seed_cfb128; + X509_EXTENSIONS_it; -+ X509_EXTENSIONS_it; + X509_get1_ocsp; + OCSP_REQ_CTX_free; + i2d_X509_EXTENSIONS; @@ -3803,7 +3663,6 @@ Index: openssl-1.0.1d/openssl.ld + OCSP_sendreq_new; + d2i_X509_EXTENSIONS; + X509_ALGORS_it; -+ X509_ALGORS_it; + X509_ALGOR_get0; + X509_ALGOR_set0; + AES_unwrap_key; @@ -3848,7 +3707,6 @@ Index: openssl-1.0.1d/openssl.ld + CMS_SignerInfo_verify; + CMS_data; + CMS_ContentInfo_it; -+ CMS_ContentInfo_it; + d2i_CMS_ReceiptRequest; + CMS_compress; + CMS_digest_create; @@ -3893,7 +3751,6 @@ Index: openssl-1.0.1d/openssl.ld + CMS_RecipientInfo_kekri_get0_id; + CMS_verify_receipt; + CMS_ReceiptRequest_it; -+ CMS_ReceiptRequest_it; + PEM_read_bio_CMS; + CMS_get1_crls; + CMS_add0_recipient_key; @@ -4032,7 +3889,6 @@ Index: openssl-1.0.1d/openssl.ld + TS_REQ_dup; + GENERAL_NAME_dup; + ASN1_SEQUENCE_ANY_it; -+ ASN1_SEQUENCE_ANY_it; + WHIRLPOOL; + X509_STORE_get1_crls; + ENGINE_get_pkey_asn1_meth; @@ -4103,7 +3959,6 @@ Index: openssl-1.0.1d/openssl.ld + DIST_POINT_set_dpname; + i2d_ISSUING_DIST_POINT; + ASN1_SET_ANY_it; -+ ASN1_SET_ANY_it; + EVP_PKEY_CTX_get_data; + TS_STATUS_INFO_print_bio; + EVP_PKEY_derive_init; @@ -4263,7 +4118,6 @@ Index: openssl-1.0.1d/openssl.ld + EVP_DigestSignFinal; + TS_RESP_CTX_set_def_policy; + NETSCAPE_X509_it; -+ NETSCAPE_X509_it; + TS_RESP_create_response; + PKCS7_SIGNER_INFO_get0_algs; + TS_TST_INFO_get_nonce; @@ -4322,7 +4176,6 @@ Index: openssl-1.0.1d/openssl.ld + EVP_CIPHER_do_all_sorted; + EVP_PKEY_CTX_free; + ISSUING_DIST_POINT_it; -+ ISSUING_DIST_POINT_it; + d2i_TS_MSG_IMPRINT_fp; + X509_STORE_get1_certs; + EVP_PKEY_CTX_get_operation; @@ -4615,7 +4468,6 @@ Index: openssl-1.0.1d/openssl.ld + X509_signature_dump; + d2i_RSA_PSS_PARAMS; + RSA_PSS_PARAMS_it; -+ RSA_PSS_PARAMS_it; + RSA_PSS_PARAMS_free; + X509_sign_ctx; + i2d_RSA_PSS_PARAMS; @@ -4638,10 +4490,151 @@ Index: openssl-1.0.1d/openssl.ld + CRYPTO_memcmp; +} OPENSSL_1.0.1; + -Index: openssl-1.0.1d/engines/openssl.ld ++OPENSSL_1.0.2 { ++ global: ++ SSL_CTX_set_alpn_protos; ++ SSL_set_alpn_protos; ++ SSL_CTX_set_alpn_select_cb; ++ SSL_get0_alpn_selected; ++ SSL_CTX_set_custom_cli_ext; ++ SSL_CTX_set_custom_srv_ext; ++ SSL_CTX_set_srv_supp_data; ++ SSL_CTX_set_cli_supp_data; ++ SSL_set_cert_cb; ++ SSL_CTX_use_serverinfo; ++ SSL_CTX_use_serverinfo_file; ++ SSL_CTX_set_cert_cb; ++ SSL_CTX_get0_param; ++ SSL_get0_param; ++ SSL_certs_clear; ++ DTLSv1_2_method; ++ DTLSv1_2_server_method; ++ DTLSv1_2_client_method; ++ DTLS_method; ++ DTLS_server_method; ++ DTLS_client_method; ++ SSL_CTX_get_ssl_method; ++ SSL_CTX_get0_certificate; ++ SSL_CTX_get0_privatekey; ++ SSL_COMP_set0_compression_methods; ++ SSL_COMP_free_compression_methods; ++ SSL_CIPHER_find; ++ SSL_is_server; ++ SSL_CONF_CTX_new; ++ SSL_CONF_CTX_finish; ++ SSL_CONF_CTX_free; ++ SSL_CONF_CTX_set_flags; ++ SSL_CONF_CTX_clear_flags; ++ SSL_CONF_CTX_set1_prefix; ++ SSL_CONF_CTX_set_ssl; ++ SSL_CONF_CTX_set_ssl_ctx; ++ SSL_CONF_cmd; ++ SSL_CONF_cmd_argv; ++ SSL_CONF_cmd_value_type; ++ SSL_trace; ++ SSL_CIPHER_standard_name; ++ SSL_get_tlsa_record_byname; ++ ASN1_TIME_diff; ++ BIO_hex_string; ++ CMS_RecipientInfo_get0_pkey_ctx; ++ CMS_RecipientInfo_encrypt; ++ CMS_SignerInfo_get0_pkey_ctx; ++ CMS_SignerInfo_get0_md_ctx; ++ CMS_SignerInfo_get0_signature; ++ CMS_RecipientInfo_kari_get0_alg; ++ CMS_RecipientInfo_kari_get0_reks; ++ CMS_RecipientInfo_kari_get0_orig_id; ++ CMS_RecipientInfo_kari_orig_id_cmp; ++ CMS_RecipientEncryptedKey_get0_id; ++ CMS_RecipientEncryptedKey_cert_cmp; ++ CMS_RecipientInfo_kari_set0_pkey; ++ CMS_RecipientInfo_kari_get0_ctx; ++ CMS_RecipientInfo_kari_decrypt; ++ CMS_SharedInfo_encode; ++ DH_compute_key_padded; ++ d2i_DHxparams; ++ i2d_DHxparams; ++ DH_get_1024_160; ++ DH_get_2048_224; ++ DH_get_2048_256; ++ DH_KDF_X9_42; ++ ECDH_KDF_X9_62; ++ ECDSA_METHOD_new; ++ ECDSA_METHOD_free; ++ ECDSA_METHOD_set_app_data; ++ ECDSA_METHOD_get_app_data; ++ ECDSA_METHOD_set_sign; ++ ECDSA_METHOD_set_sign_setup; ++ ECDSA_METHOD_set_verify; ++ ECDSA_METHOD_set_flags; ++ ECDSA_METHOD_set_name; ++ EVP_des_ede3_wrap; ++ EVP_aes_128_wrap; ++ EVP_aes_192_wrap; ++ EVP_aes_256_wrap; ++ EVP_aes_128_cbc_hmac_sha256; ++ EVP_aes_256_cbc_hmac_sha256; ++ CRYPTO_128_wrap; ++ CRYPTO_128_unwrap; ++ OCSP_REQ_CTX_nbio; ++ OCSP_REQ_CTX_new; ++ OCSP_set_max_response_length; ++ OCSP_REQ_CTX_i2d; ++ OCSP_REQ_CTX_nbio_d2i; ++ OCSP_REQ_CTX_get0_mem_bio; ++ OCSP_REQ_CTX_http; ++ RSA_padding_add_PKCS1_OAEP_mgf1; ++ RSA_padding_check_PKCS1_OAEP_mgf1; ++ RSA_OAEP_PARAMS_free; ++ RSA_OAEP_PARAMS_it; ++ RSA_OAEP_PARAMS_new; ++ SSL_get_sigalgs; ++ SSL_get_shared_sigalgs; ++ SSL_check_chain; ++ X509_chain_up_ref; ++ X509_http_nbio; ++ X509_CRL_http_nbio; ++ X509_REVOKED_dup; ++ i2d_re_X509_tbs; ++ X509_get0_signature; ++ X509_get_signature_nid; ++ X509_CRL_diff; ++ X509_chain_check_suiteb; ++ X509_CRL_check_suiteb; ++ X509_check_host; ++ X509_check_email; ++ X509_check_ip; ++ X509_check_ip_asc; ++ X509_STORE_set_lookup_crls_cb; ++ X509_STORE_CTX_get0_store; ++ X509_VERIFY_PARAM_set1_host; ++ X509_VERIFY_PARAM_add1_host; ++ X509_VERIFY_PARAM_set_hostflags; ++ X509_VERIFY_PARAM_get0_peername; ++ X509_VERIFY_PARAM_set1_email; ++ X509_VERIFY_PARAM_set1_ip; ++ X509_VERIFY_PARAM_set1_ip_asc; ++ X509_VERIFY_PARAM_get0_name; ++ X509_VERIFY_PARAM_get_count; ++ X509_VERIFY_PARAM_get0; ++ X509V3_EXT_free; ++ EC_GROUP_get_mont_data; ++ EC_curve_nid2nist; ++ EC_curve_nist2nid; ++ PEM_write_bio_DHxparams; ++ PEM_write_DHxparams; ++ SSL_CTX_add_client_custom_ext; ++ SSL_CTX_add_server_custom_ext; ++ SSL_extension_supported; ++ BUF_strnlen; ++ sk_deep_copy; ++ SSL_test_functions; ++} OPENSSL_1.0.1d; ++ +Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ openssl-1.0.1d/engines/openssl.ld 2013-02-06 19:41:43.000000000 +0100 ++++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld 2014-02-24 21:02:30.000000000 +0100 @@ -0,0 +1,10 @@ +OPENSSL_1.0.0 { + global: @@ -4653,10 +4646,10 @@ Index: openssl-1.0.1d/engines/openssl.ld + *; +}; + -Index: openssl-1.0.1d/engines/ccgost/openssl.ld +Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ openssl-1.0.1d/engines/ccgost/openssl.ld 2013-02-06 19:41:43.000000000 +0100 ++++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld 2014-02-24 21:02:30.000000000 +0100 @@ -0,0 +1,10 @@ +OPENSSL_1.0.0 { + global: diff --git a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_digicert_malaysia.patch b/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_digicert_malaysia.patch new file mode 100644 index 0000000000..c43bcd1c77 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_digicert_malaysia.patch @@ -0,0 +1,29 @@ +From: Raphael Geissert <geissert@debian.org> +Description: make X509_verify_cert indicate that any certificate whose + name contains "Digicert Sdn. Bhd." (from Malaysia) is revoked. +Forwarded: not-needed +Origin: vendor +Last-Update: 2011-11-05 + +Upstream-Status: Backport [debian] + + +Index: openssl-1.0.2~beta1/crypto/x509/x509_vfy.c +=================================================================== +--- openssl-1.0.2~beta1.orig/crypto/x509/x509_vfy.c 2014-02-25 00:16:12.488028844 +0100 ++++ openssl-1.0.2~beta1/crypto/x509/x509_vfy.c 2014-02-25 00:16:12.484028929 +0100 +@@ -964,10 +964,11 @@ + for (i = sk_X509_num(ctx->chain) - 1; i >= 0; i--) + { + x = sk_X509_value(ctx->chain, i); +- /* Mark DigiNotar certificates as revoked, no matter +- * where in the chain they are. ++ /* Mark certificates containing the following names as ++ * revoked, no matter where in the chain they are. + */ +- if (x->name && strstr(x->name, "DigiNotar")) ++ if (x->name && (strstr(x->name, "DigiNotar") || ++ strstr(x->name, "Digicert Sdn. Bhd."))) + { + ctx->error = X509_V_ERR_CERT_REVOKED; + ctx->error_depth = i; diff --git a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_diginotar.patch b/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_diginotar.patch new file mode 100644 index 0000000000..0c1a0b651f --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_diginotar.patch @@ -0,0 +1,67 @@ +From: Raphael Geissert <geissert@debian.org> +Description: make X509_verify_cert indicate that any certificate whose + name contains "DigiNotar" is revoked. +Forwarded: not-needed +Origin: vendor +Last-Update: 2011-09-08 +Bug: http://bugs.debian.org/639744 +Reviewed-by: Kurt Roeckx <kurt@roeckx.be> +Reviewed-by: Dr Stephen N Henson <shenson@drh-consultancy.co.uk> + +This is not meant as final patch. + +Upstream-Status: Backport [debian] + + +Index: openssl-1.0.2/crypto/x509/x509_vfy.c +=================================================================== +--- openssl-1.0.2.orig/crypto/x509/x509_vfy.c ++++ openssl-1.0.2/crypto/x509/x509_vfy.c +@@ -119,6 +119,7 @@ static int check_trust(X509_STORE_CTX *c + static int check_revocation(X509_STORE_CTX *ctx); + static int check_cert(X509_STORE_CTX *ctx); + static int check_policy(X509_STORE_CTX *ctx); ++static int check_ca_blacklist(X509_STORE_CTX *ctx); + + static int get_crl_score(X509_STORE_CTX *ctx, X509 **pissuer, + unsigned int *preasons, X509_CRL *crl, X509 *x); +@@ -438,6 +439,9 @@ int X509_verify_cert(X509_STORE_CTX *ctx + if (!ok) + goto end; + ++ ok = check_ca_blacklist(ctx); ++ if(!ok) goto end; ++ + #ifndef OPENSSL_NO_RFC3779 + /* RFC 3779 path validation, now that CRL check has been done */ + ok = v3_asid_validate_path(ctx); +@@ -938,6 +942,29 @@ static int check_crl_time(X509_STORE_CTX + return 1; + } + ++static int check_ca_blacklist(X509_STORE_CTX *ctx) ++ { ++ X509 *x; ++ int i; ++ /* Check all certificates against the blacklist */ ++ for (i = sk_X509_num(ctx->chain) - 1; i >= 0; i--) ++ { ++ x = sk_X509_value(ctx->chain, i); ++ /* Mark DigiNotar certificates as revoked, no matter ++ * where in the chain they are. ++ */ ++ if (x->name && strstr(x->name, "DigiNotar")) ++ { ++ ctx->error = X509_V_ERR_CERT_REVOKED; ++ ctx->error_depth = i; ++ ctx->current_cert = x; ++ if (!ctx->verify_cb(0,ctx)) ++ return 0; ++ } ++ } ++ return 1; ++ } ++ + static int get_crl_sk(X509_STORE_CTX *ctx, X509_CRL **pcrl, X509_CRL **pdcrl, + X509 **pissuer, int *pscore, unsigned int *preasons, + STACK_OF(X509_CRL) *crls) diff --git a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/padlock_conf.patch b/meta/recipes-connectivity/openssl/openssl/debian1.0.2/padlock_conf.patch new file mode 100644 index 0000000000..61dcf457fe --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/debian1.0.2/padlock_conf.patch @@ -0,0 +1,31 @@ + +Upstream-Status: Backport [debian] + +--- openssl/apps/openssl.cnf.orig 2012-06-06 00:45:56.000000000 +0200 ++++ openssl/apps/openssl.cnf 2012-06-06 00:46:46.000000000 +0200 +@@ -19,6 +19,8 @@ + # (Alternatively, use a configuration file that has only + # X.509v3 extensions in its main [= default] section.) + ++openssl_conf = openssl_def ++ + [ new_oids ] + + # We can add new OIDs in here for use by 'ca', 'req' and 'ts'. +@@ -348,3 +350,16 @@ + # (optional, default: no) + ess_cert_id_chain = no # Must the ESS cert id chain be included? + # (optional, default: no) ++ ++[openssl_def] ++engines = engine_section ++ ++[engine_section] ++padlock = padlock_section ++ ++[padlock_section] ++soft_load=1 ++init=1 ++default_algorithms = ALL ++dynamic_path=padlock ++ diff --git a/meta/recipes-connectivity/openssl/openssl/engines-install-in-libdir-ssl.patch b/meta/recipes-connectivity/openssl/openssl/engines-install-in-libdir-ssl.patch index d8a6f1a23c..a5746483e6 100644 --- a/meta/recipes-connectivity/openssl/openssl/engines-install-in-libdir-ssl.patch +++ b/meta/recipes-connectivity/openssl/openssl/engines-install-in-libdir-ssl.patch @@ -1,11 +1,11 @@ Upstream-Status: Inappropriate [configuration] -Index: openssl-1.0.0/engines/Makefile +Index: openssl-1.0.2/engines/Makefile =================================================================== ---- openssl-1.0.0.orig/engines/Makefile -+++ openssl-1.0.0/engines/Makefile -@@ -107,7 +107,7 @@ +--- openssl-1.0.2.orig/engines/Makefile ++++ openssl-1.0.2/engines/Makefile +@@ -107,13 +107,13 @@ install: @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... @if [ -n "$(SHARED_LIBS)" ]; then \ set -e; \ @@ -14,16 +14,19 @@ Index: openssl-1.0.0/engines/Makefile for l in $(LIBNAMES); do \ ( echo installing $$l; \ pfx=lib; \ -@@ -119,13 +119,13 @@ + if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \ + sfx=".so"; \ +- cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ ++ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new; \ + else \ + case "$(CFLAGS)" in \ + *DSO_BEOS*) sfx=".so";; \ +@@ -122,10 +122,10 @@ install: *DSO_WIN32*) sfx="eay32.dll"; pfx=;; \ *) sfx=".bad";; \ esac; \ - cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ + cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new; \ - else \ - sfx=".so"; \ -- cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ -+ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new; \ fi; \ - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ @@ -32,20 +35,25 @@ Index: openssl-1.0.0/engines/Makefile done; \ fi @target=install; $(RECURSIVE_MAKE) -Index: openssl-1.0.0/engines/ccgost/Makefile +Index: openssl-1.0.2/engines/ccgost/Makefile =================================================================== ---- openssl-1.0.0.orig/engines/ccgost/Makefile -+++ openssl-1.0.0/engines/ccgost/Makefile -@@ -53,13 +53,13 @@ +--- openssl-1.0.2.orig/engines/ccgost/Makefile ++++ openssl-1.0.2/engines/ccgost/Makefile +@@ -47,7 +47,7 @@ install: + pfx=lib; \ + if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \ + sfx=".so"; \ +- cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ ++ cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new; \ + else \ + case "$(CFLAGS)" in \ + *DSO_BEOS*) sfx=".so";; \ +@@ -56,10 +56,10 @@ install: *DSO_WIN32*) sfx="eay32.dll"; pfx=;; \ *) sfx=".bad";; \ esac; \ - cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ + cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new; \ - else \ - sfx=".so"; \ -- cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ -+ cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new; \ fi; \ - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \ diff --git a/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch b/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch index f0e177840f..06d1ea69d3 100644 --- a/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch +++ b/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch @@ -6,17 +6,16 @@ http://rt.openssl.org/Ticket/Display.html?id=2867 Signed-Off-By: Muhammad Shakeel <muhammad_shakeel@mentor.com> -diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c -index 3232cfe..df84922 100644 +Index: openssl-1.0.2/crypto/evp/e_des3.c =================================================================== ---- a/crypto/evp/e_des3.c -+++ b/crypto/evp/e_des3.c -@@ -173,7 +173,7 @@ static int des_ede3_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, +--- openssl-1.0.2.orig/crypto/evp/e_des3.c ++++ openssl-1.0.2/crypto/evp/e_des3.c +@@ -211,7 +211,7 @@ static int des_ede3_cfb1_cipher(EVP_CIPH size_t n; - unsigned char c[1],d[1]; + unsigned char c[1], d[1]; -- for(n=0 ; n < inl ; ++n) -+ for(n=0 ; n < inl*8 ; ++n) - { - c[0]=(in[n/8]&(1 << (7-n%8))) ? 0x80 : 0; - DES_ede3_cfb_encrypt(c,d,1,1, +- for (n = 0; n < inl; ++n) { ++ for (n = 0; n * 8 < inl; ++n) { + c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0; + DES_ede3_cfb_encrypt(c, d, 1, 1, + &data(ctx)->ks1, &data(ctx)->ks2, diff --git a/meta/recipes-connectivity/openssl/openssl/initial-aarch64-bits.patch b/meta/recipes-connectivity/openssl/openssl/initial-aarch64-bits.patch deleted file mode 100644 index 770097db78..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/initial-aarch64-bits.patch +++ /dev/null @@ -1,120 +0,0 @@ -From: Andy Polyakov <appro@openssl.org> -Date: Sun, 13 Oct 2013 17:15:15 +0000 (+0200) -Subject: Initial aarch64 bits. -X-Git-Url: http://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=039081b80977e2a5de84e1f88f8b4d025b559956 - -Initial aarch64 bits. -Upstream-Status: backport (will be included in 1.0.2) ---- - crypto/bn/bn_lcl.h | 9 +++++++++ - crypto/md32_common.h | 18 ++++++++++++++++++ - crypto/modes/modes_lcl.h | 8 ++++++++ - crypto/sha/sha512.c | 13 +++++++++++++ - 4 files changed, 48 insertions(+) - -Index: openssl-1.0.1f/crypto/bn/bn_lcl.h -=================================================================== ---- openssl-1.0.1f.orig/crypto/bn/bn_lcl.h 2014-01-06 15:47:42.000000000 +0200 -+++ openssl-1.0.1f/crypto/bn/bn_lcl.h 2014-02-28 10:37:55.495979037 +0200 -@@ -300,6 +300,15 @@ - : "r"(a), "r"(b)); - # endif - # endif -+# elif defined(__aarch64__) && defined(SIXTY_FOUR_BIT_LONG) -+# if defined(__GNUC__) && __GNUC__>=2 -+# define BN_UMULT_HIGH(a,b) ({ \ -+ register BN_ULONG ret; \ -+ asm ("umulh %0,%1,%2" \ -+ : "=r"(ret) \ -+ : "r"(a), "r"(b)); \ -+ ret; }) -+# endif - # endif /* cpu */ - #endif /* OPENSSL_NO_ASM */ - -Index: openssl-1.0.1f/crypto/md32_common.h -=================================================================== ---- openssl-1.0.1f.orig/crypto/md32_common.h 2014-01-06 15:47:42.000000000 +0200 -+++ openssl-1.0.1f/crypto/md32_common.h 2014-02-28 10:39:21.751979107 +0200 -@@ -213,6 +213,24 @@ - asm ("bswapl %0":"=r"(r):"0"(r)); \ - *((unsigned int *)(c))=r; (c)+=4; r; }) - # endif -+# elif defined(__aarch64__) -+# if defined(__BYTE_ORDER__) -+# if defined(__ORDER_LITTLE_ENDIAN__) && __BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__ -+# define HOST_c2l(c,l) ({ unsigned int r; \ -+ asm ("rev %w0,%w1" \ -+ :"=r"(r) \ -+ :"r"(*((const unsigned int *)(c))));\ -+ (c)+=4; (l)=r; }) -+# define HOST_l2c(l,c) ({ unsigned int r; \ -+ asm ("rev %w0,%w1" \ -+ :"=r"(r) \ -+ :"r"((unsigned int)(l)));\ -+ *((unsigned int *)(c))=r; (c)+=4; r; }) -+# elif defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__==__ORDER_BIG_ENDIAN__ -+# define HOST_c2l(c,l) ((l)=*((const unsigned int *)(c)), (c)+=4, (l)) -+# define HOST_l2c(l,c) (*((unsigned int *)(c))=(l), (c)+=4, (l)) -+# endif -+# endif - # endif - # endif - #endif -Index: openssl-1.0.1f/crypto/modes/modes_lcl.h -=================================================================== ---- openssl-1.0.1f.orig/crypto/modes/modes_lcl.h 2014-02-28 10:47:48.731979011 +0200 -+++ openssl-1.0.1f/crypto/modes/modes_lcl.h 2014-02-28 10:48:49.707978919 +0200 -@@ -29,6 +29,7 @@ - #if defined(__i386) || defined(__i386__) || \ - defined(__x86_64) || defined(__x86_64__) || \ - defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || \ -+ defined(__aarch64__) || \ - defined(__s390__) || defined(__s390x__) - # undef STRICT_ALIGNMENT - #endif -@@ -50,6 +51,13 @@ - # define BSWAP4(x) ({ u32 ret=(x); \ - asm ("bswapl %0" \ - : "+r"(ret)); ret; }) -+# elif defined(__aarch64__) -+# define BSWAP8(x) ({ u64 ret; \ -+ asm ("rev %0,%1" \ -+ : "=r"(ret) : "r"(x)); ret; }) -+# define BSWAP4(x) ({ u32 ret; \ -+ asm ("rev %w0,%w1" \ -+ : "=r"(ret) : "r"(x)); ret; }) - # elif (defined(__arm__) || defined(__arm)) && !defined(STRICT_ALIGNMENT) - # define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \ - asm ("rev %0,%0; rev %1,%1" \ -Index: openssl-1.0.1f/crypto/sha/sha512.c -=================================================================== ---- openssl-1.0.1f.orig/crypto/sha/sha512.c 2014-01-06 15:47:42.000000000 +0200 -+++ openssl-1.0.1f/crypto/sha/sha512.c 2014-02-28 10:52:14.579978981 +0200 -@@ -55,6 +55,7 @@ - #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ - defined(__x86_64) || defined(_M_AMD64) || defined(_M_X64) || \ - defined(__s390__) || defined(__s390x__) || \ -+ defined(__aarch64__) || \ - defined(SHA512_ASM) - #define SHA512_BLOCK_CAN_MANAGE_UNALIGNED_DATA - #endif -@@ -347,6 +348,18 @@ - asm ("rotrdi %0,%1,%2" \ - : "=r"(ret) \ - : "r"(a),"K"(n)); ret; }) -+# elif defined(__aarch64__) -+# define ROTR(a,n) ({ SHA_LONG64 ret; \ -+ asm ("ror %0,%1,%2" \ -+ : "=r"(ret) \ -+ : "r"(a),"I"(n)); ret; }) -+# if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ -+ __BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__ -+# define PULL64(x) ({ SHA_LONG64 ret; \ -+ asm ("rev %0,%1" \ -+ : "=r"(ret) \ -+ : "r"(*((const SHA_LONG64 *)(&(x))))); ret; }) -+# endif - # endif - # elif defined(_MSC_VER) - # if defined(_WIN64) /* applies to both IA-64 and AMD64 */ diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch b/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch index c161e62f62..cebc8cf0d0 100644 --- a/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch +++ b/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch @@ -8,14 +8,16 @@ http://www.mail-archive.com/openssl-dev@openssl.org/msg32860.html Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com> --- ---- a/crypto/evp/digest.c -+++ b/crypto/evp/digest.c -@@ -199,7 +199,7 @@ - return 0; - } +Index: openssl-1.0.2/crypto/evp/digest.c +=================================================================== +--- openssl-1.0.2.orig/crypto/evp/digest.c ++++ openssl-1.0.2/crypto/evp/digest.c +@@ -208,7 +208,7 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, c + return 0; + } #endif -- if (ctx->digest != type) -+ if (type && (ctx->digest != type)) - { - if (ctx->digest && ctx->digest->ctx_size) - OPENSSL_free(ctx->md_data); +- if (ctx->digest != type) { ++ if (type && (ctx->digest != type)) { + if (ctx->digest && ctx->digest->ctx_size) + OPENSSL_free(ctx->md_data); + ctx->digest = type; diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch b/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch index 3e93fe4e22..d7047bbaac 100644 --- a/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch +++ b/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch @@ -8,32 +8,19 @@ http://www.mail-archive.com/openssl-dev@openssl.org/msg32859.html Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com> --- ---- a/crypto/dh/dh_ameth.c -+++ b/crypto/dh/dh_ameth.c -@@ -139,6 +139,12 @@ - dh=pkey->pkey.dh; +Index: openssl-1.0.2/crypto/dh/dh_ameth.c +=================================================================== +--- openssl-1.0.2.orig/crypto/dh/dh_ameth.c ++++ openssl-1.0.2/crypto/dh/dh_ameth.c +@@ -161,6 +161,11 @@ static int dh_pub_encode(X509_PUBKEY *pk + dh = pkey->pkey.dh; - str = ASN1_STRING_new(); -+ if (!str) -+ { -+ DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE); -+ goto err; -+ } + str = ASN1_STRING_new(); ++ if (!str) { ++ DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE); ++ goto err; ++ } + - str->length = i2d_DHparams(dh, &str->data); - if (str->length <= 0) - { ---- a/crypto/dsa/dsa_ameth.c -+++ b/crypto/dsa/dsa_ameth.c -@@ -148,6 +148,11 @@ - { - ASN1_STRING *str; - str = ASN1_STRING_new(); -+ if (!str) -+ { -+ DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE); -+ goto err; -+ } - str->length = i2d_DSAparams(dsa, &str->data); - if (str->length <= 0) - { + str->length = i2d_dhp(pkey, dh, &str->data); + if (str->length <= 0) { + DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE); diff --git a/meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch b/meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch index 93ce0343cc..cbce32c89b 100644 --- a/meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch +++ b/meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch @@ -6,64 +6,13 @@ Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/07/13 ported the patch to the 1.0.0e version Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01 -Index: openssl-1.0.1e/Configure +Index: openssl-1.0.2/crypto/bn/bn.h =================================================================== ---- openssl-1.0.1e.orig/Configure -+++ openssl-1.0.1e/Configure -@@ -402,6 +402,7 @@ my %table=( - "linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", -+"linux-x32", "gcc:-mx32 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32", - "linux64-s390x", "gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", - #### So called "highgprs" target for z/Architecture CPUs - # "Highgprs" is kernel feature first implemented in Linux 2.6.32, see -Index: openssl-1.0.1e/crypto/bn/asm/x86_64-gcc.c -=================================================================== ---- openssl-1.0.1e.orig/crypto/bn/asm/x86_64-gcc.c -+++ openssl-1.0.1e/crypto/bn/asm/x86_64-gcc.c -@@ -55,7 +55,7 @@ - * machine. - */ - --#ifdef _WIN64 -+#if defined _WIN64 || !defined __LP64__ - #define BN_ULONG unsigned long long - #else - #define BN_ULONG unsigned long -@@ -192,9 +192,9 @@ BN_ULONG bn_add_words (BN_ULONG *rp, con - asm ( - " subq %2,%2 \n" - ".p2align 4 \n" -- "1: movq (%4,%2,8),%0 \n" -- " adcq (%5,%2,8),%0 \n" -- " movq %0,(%3,%2,8) \n" -+ "1: movq (%q4,%2,8),%0 \n" -+ " adcq (%q5,%2,8),%0 \n" -+ " movq %0,(%q3,%2,8) \n" - " leaq 1(%2),%2 \n" - " loop 1b \n" - " sbbq %0,%0 \n" -@@ -215,9 +215,9 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, con - asm ( - " subq %2,%2 \n" - ".p2align 4 \n" -- "1: movq (%4,%2,8),%0 \n" -- " sbbq (%5,%2,8),%0 \n" -- " movq %0,(%3,%2,8) \n" -+ "1: movq (%q4,%2,8),%0 \n" -+ " sbbq (%q5,%2,8),%0 \n" -+ " movq %0,(%q3,%2,8) \n" - " leaq 1(%2),%2 \n" - " loop 1b \n" - " sbbq %0,%0 \n" -Index: openssl-1.0.1e/crypto/bn/bn.h -=================================================================== ---- openssl-1.0.1e.orig/crypto/bn/bn.h -+++ openssl-1.0.1e/crypto/bn/bn.h -@@ -172,6 +172,13 @@ extern "C" { +--- openssl-1.0.2.orig/crypto/bn/bn.h ++++ openssl-1.0.2/crypto/bn/bn.h +@@ -173,6 +173,13 @@ extern "C" { + # endif # endif - #endif +/* Address type. */ +#ifdef _WIN64 @@ -72,19 +21,19 @@ Index: openssl-1.0.1e/crypto/bn/bn.h +#define BN_ADDR unsigned long +#endif + - /* assuming long is 64bit - this is the DEC Alpha - * unsigned long long is only 64 bits :-(, don't define - * BN_LLONG for the DEC Alpha */ -Index: openssl-1.0.1e/crypto/bn/bn_exp.c + /* + * assuming long is 64bit - this is the DEC Alpha unsigned long long is only + * 64 bits :-(, don't define BN_LLONG for the DEC Alpha +Index: openssl-1.0.2/crypto/bn/bn_exp.c =================================================================== ---- openssl-1.0.1e.orig/crypto/bn/bn_exp.c -+++ openssl-1.0.1e/crypto/bn/bn_exp.c -@@ -567,7 +567,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBU - - /* Given a pointer value, compute the next address that is a cache line multiple. */ +--- openssl-1.0.2.orig/crypto/bn/bn_exp.c ++++ openssl-1.0.2/crypto/bn/bn_exp.c +@@ -638,7 +638,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBU + * multiple. + */ #define MOD_EXP_CTIME_ALIGN(x_) \ -- ((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((size_t)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK)))) +- ((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((size_t)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK)))) + ((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((BN_ADDR)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK)))) - /* This variant of BN_mod_exp_mont() uses fixed windows and the special - * precomputation memory layout to limit data-dependency to a minimum + /* + * This variant of BN_mod_exp_mont() uses fixed windows and the special diff --git a/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch b/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch index 527e10c53b..ef6d17934d 100644 --- a/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch +++ b/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch @@ -10,11 +10,11 @@ Upstream-Status: Inappropriate [config] Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> -diff --git a/test/Makefile b/test/Makefile -index e6fcfb4..5ae043b 100644 ---- a/test/Makefile -+++ b/test/Makefile -@@ -322,11 +322,11 @@ test_cms: +Index: openssl-1.0.2/test/Makefile +=================================================================== +--- openssl-1.0.2.orig/test/Makefile ++++ openssl-1.0.2/test/Makefile +@@ -330,7 +330,7 @@ test_cms: ../apps/openssl$(EXE_EXT) cms- @echo "CMS consistency test" $(PERL) cms-test.pl @@ -23,8 +23,12 @@ index e6fcfb4..5ae043b 100644 @echo "Test SRP" ../util/shlib_wrap.sh ./srptest +@@ -342,7 +342,7 @@ test_v3name: $(V3NAMETEST)$(EXE_EXT) + @echo "Test X509v3_check_*" + ../util/shlib_wrap.sh ./$(V3NAMETEST) + -test_heartbeat: $(HEARTBEATTEST)$(EXE_EXT) +test_heartbeat: ../util/shlib_wrap.sh ./$(HEARTBEATTEST) - lint: + test_constant_time: $(CONSTTIMETEST)$(EXE_EXT) diff --git a/meta/recipes-connectivity/openssl/openssl/update-version-script-for-1.0.2.patch b/meta/recipes-connectivity/openssl/openssl/update-version-script-for-1.0.2.patch new file mode 100644 index 0000000000..fcfccfadb3 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/update-version-script-for-1.0.2.patch @@ -0,0 +1,66 @@ +Index: openssl-1.0.2/openssl.ld +=================================================================== +--- openssl-1.0.2.orig/openssl.ld ++++ openssl-1.0.2/openssl.ld +@@ -4618,3 +4618,61 @@ OPENSSL_1.0.1d { + CRYPTO_memcmp; + } OPENSSL_1.0.1; + ++OPENSSL_1.0.2 { ++ global: ++ ASN1_TIME_diff; ++ CMS_RecipientInfo_get0_pkey_ctx; ++ CMS_RecipientInfo_kari_get0_ctx; ++ CMS_SignerInfo_get0_pkey_ctx; ++ DH_get_1024_160; ++ DH_get_2048_224; ++ DH_get_2048_256; ++ DTLS_client_method; ++ DTLS_server_method; ++ DTLSv1_2_client_method; ++ DTLSv1_2_server_method; ++ EC_curve_nid2nist; ++ EC_curve_nist2nid; ++ EVP_aes_128_cbc_hmac_sha256; ++ EVP_aes_128_wrap; ++ EVP_aes_192_wrap; ++ EVP_aes_256_cbc_hmac_sha256; ++ EVP_aes_256_wrap; ++ EVP_des_ede3_wrap; ++ OCSP_REQ_CTX_http; ++ OCSP_REQ_CTX_new; ++ PEM_write_bio_DHxparams; ++ SSL_CIPHER_find; ++ SSL_CONF_CTX_finish; ++ SSL_CONF_CTX_free; ++ SSL_CONF_CTX_new; ++ SSL_CONF_CTX_set_flags; ++ SSL_CONF_CTX_set_ssl_ctx; ++ SSL_CONF_cmd; ++ SSL_CONF_cmd_argv; ++ SSL_CTX_add_client_custom_ext; ++ SSL_CTX_add_server_custom_ext; ++ SSL_CTX_set_alpn_protos; ++ SSL_CTX_set_alpn_select_cb; ++ SSL_CTX_set_cert_cb; ++ SSL_CTX_use_serverinfo_file; ++ SSL_certs_clear; ++ SSL_check_chain; ++ SSL_get0_alpn_selected; ++ SSL_get_shared_sigalgs; ++ SSL_get_sigalgs; ++ SSL_is_server; ++ X509_CRL_diff; ++ X509_CRL_http_nbio; ++ X509_STORE_set_lookup_crls_cb; ++ X509_VERIFY_PARAM_set1_email; ++ X509_VERIFY_PARAM_set1_host; ++ X509_VERIFY_PARAM_set1_ip_asc; ++ X509_chain_check_suiteb; ++ X509_chain_up_ref; ++ X509_check_email; ++ X509_check_host; ++ X509_check_ip_asc; ++ X509_get_signature_nid; ++ X509_http_nbio; ++} OPENSSL_1.0.1d; diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1j.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb index 2da18aead7..74d69389c9 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.1j.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb @@ -16,21 +16,21 @@ SRC_URI += "file://configure-targets.patch \ file://oe-ldflags.patch \ file://engines-install-in-libdir-ssl.patch \ file://openssl-fix-link.patch \ - file://debian/version-script.patch \ - file://debian/pic.patch \ - file://debian/c_rehash-compat.patch \ + file://debian1.0.2/block_diginotar.patch \ + file://debian1.0.2/block_digicert_malaysia.patch \ + file://debian1.0.2/padlock_conf.patch \ file://debian/ca.patch \ - file://debian/make-targets.patch \ - file://debian/no-rpath.patch \ + file://debian/c_rehash-compat.patch \ + file://debian/debian-targets.patch \ file://debian/man-dir.patch \ file://debian/man-section.patch \ + file://debian/no-rpath.patch \ file://debian/no-symbolic.patch \ - file://debian/debian-targets.patch \ + file://debian/pic.patch \ + file://debian/version-script.patch \ file://openssl_fix_for_x32.patch \ file://fix-cipher-des-ede3-cfb1.patch \ file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \ - file://openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \ - file://initial-aarch64-bits.patch \ file://find.pl \ file://openssl-fix-des.pod-error.patch \ file://Makefiles-ptest.patch \ @@ -38,8 +38,8 @@ SRC_URI += "file://configure-targets.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "f7175c9cd3c39bb1907ac8bba9df8ed3" -SRC_URI[sha256sum] = "1b60ca8789ba6f03e8ef20da2293b8dc131c39d83814e775069f02d26354edf3" +SRC_URI[md5sum] = "a06c547dac9044161a477211049f60ef" +SRC_URI[sha256sum] = "15b6393c20030aab02c8e2fe0243cb1d1d18062f6c095d67bca91871dc7f324a" PACKAGES =+ " \ ${PN}-engines \ diff --git a/meta/recipes-connectivity/portmap/portmap.inc b/meta/recipes-connectivity/portmap/portmap.inc index f5f7fde8be..338af33a38 100644 --- a/meta/recipes-connectivity/portmap/portmap.inc +++ b/meta/recipes-connectivity/portmap/portmap.inc @@ -4,14 +4,6 @@ SECTION = "console/network" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://portmap.c;beginline=2;endline=31;md5=51ff67e66ec84b2009b017b1f94afbf4 \ file://from_local.c;beginline=9;endline=35;md5=1bec938a2268b8b423c58801ace3adc1" -DEPENDS = "virtual/fakeroot-native" - -SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \ - ${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz \ - file://portmap.init \ - file://make.patch;apply=yes" - -S = "${WORKDIR}/portmap_5beta" INITSCRIPT_NAME = "portmap" INITSCRIPT_PARAMS = "start 10 2 3 4 5 . stop 32 0 1 6 ." @@ -20,15 +12,6 @@ inherit update-rc.d systemd SYSTEMD_SERVICE_${PN} = "portmap.service" -sbindir = "/sbin" - -fakeroot do_install() { - install -d ${D}${sysconfdir}/init.d - install -d ${D}${base_sbindir} - install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap - oe_runmake 'docdir=${docdir}/portmap' 'DESTDIR=${D}' install -} - PACKAGES =+ "portmap-utils" -FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump" +FILES_portmap-utils = "${base_sbindir}/pmap_set ${base_sbindir}/pmap_dump" FILES_${PN}-doc += "${docdir}" diff --git a/meta/recipes-connectivity/portmap/portmap-6.0/destdir-no-strip.patch b/meta/recipes-connectivity/portmap/portmap/destdir-no-strip.patch index 2fbf784b73..2fbf784b73 100644 --- a/meta/recipes-connectivity/portmap/portmap-6.0/destdir-no-strip.patch +++ b/meta/recipes-connectivity/portmap/portmap/destdir-no-strip.patch diff --git a/meta/recipes-connectivity/portmap/portmap-6.0/tcpd-config.patch b/meta/recipes-connectivity/portmap/portmap/tcpd-config.patch index 2f25058095..2f25058095 100644 --- a/meta/recipes-connectivity/portmap/portmap-6.0/tcpd-config.patch +++ b/meta/recipes-connectivity/portmap/portmap/tcpd-config.patch diff --git a/meta/recipes-connectivity/portmap/portmap_6.0.bb b/meta/recipes-connectivity/portmap/portmap_6.0.bb index 8b65a03346..e727fe3cb9 100644 --- a/meta/recipes-connectivity/portmap/portmap_6.0.bb +++ b/meta/recipes-connectivity/portmap/portmap_6.0.bb @@ -20,7 +20,7 @@ CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS -DHOSTS_ACCESS" CFLAGS += "-Wall -Wstrict-prototypes -fPIC" EXTRA_OEMAKE += "'NO_TCP_WRAPPER=${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', '', '1', d)}'" -fakeroot do_install() { +do_install() { install -d ${D}${mandir}/man8/ ${D}${base_sbindir} ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap oe_runmake install DESTDIR=${D} diff --git a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb index 68b83d00f1..51a76b4299 100644 --- a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb +++ b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb @@ -12,6 +12,8 @@ SRC_URI = "file://host-peer \ inherit allarch useradd +S = "${WORKDIR}" + do_install() { install -d ${D}${sysconfdir}/ppp/peers install -m 0644 ${WORKDIR}/host-peer ${D}${sysconfdir}/ppp/peers/host diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.6.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb index 8bc3672600..4219d45591 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.6.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb @@ -31,8 +31,8 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ file://ppp@.service \ " -SRC_URI[md5sum] = "3434d2cc9327167a0723aaaa8670083b" -SRC_URI[sha256sum] = "1b33181a03962c8a092c055fb9980e9722728a8d98a4bb7ec7acda17c1b1b49d" +SRC_URI[md5sum] = "78818f40e6d33a1d1de68a1551f6595a" +SRC_URI[sha256sum] = "02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30" inherit autotools-brokensep systemd @@ -43,7 +43,11 @@ EXTRA_OECONF = "--disable-strip" # Package Makefile computes CFLAGS, referencing COPTS. # Typically hard-coded to '-O2 -g' in the Makefile's. # -EXTRA_OEMAKE += ' COPTS="${CFLAGS}"' +EXTRA_OEMAKE += ' COPTS="${CFLAGS} -I${S}/include"' + +do_configure () { + oe_runconf +} do_install_append () { make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp diff --git a/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch b/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch index fc4605e94d..1aead07869 100644 --- a/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch +++ b/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch @@ -11,9 +11,10 @@ Index: resolvconf-1.76/etc/resolvconf/update.d/libc +++ resolvconf-1.76/etc/resolvconf/update.d/libc @@ -16,7 +16,7 @@ # - + set -e -PATH=/sbin:/bin +PATH=/sbin:/bin:/usr/bin - + [ -x /lib/resolvconf/list-records ] || exit 1 + diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.75.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb index ee171c065e..797e9b09c7 100644 --- a/meta/recipes-connectivity/resolvconf/resolvconf_1.75.bb +++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb @@ -11,14 +11,13 @@ AUTHOR = "Thomas Hood" HOMEPAGE = "http://packages.debian.org/resolvconf" RDEPENDS_${PN} = "bash" -SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.xz \ +SRC_URI = "http://snapshot.debian.org/archive/debian/20141013T184415Z/pool/main/r/${BPN}/${BPN}_1.76.tar.xz \ file://fix-path-for-busybox.patch \ file://99_resolvconf \ " - -SRC_URI[md5sum] = "4b8bc86a3cf070e3fd0e9aff7eaaba56" -SRC_URI[sha256sum] = "16167f37a77ef4bc4596dcbefece269b6a10d10fa448594ec55ed3303193086e" +SRC_URI[md5sum] = "d78ce30ea068999cd3e0523300b27255" +SRC_URI[sha256sum] = "c9f40f7405b37399ddbf29ca4205b4911ee35cb9ffd9be7671faa2385b1fa573" inherit allarch diff --git a/meta/recipes-connectivity/socat/socat/socat-1.7.2.4-linux-3.17.patch b/meta/recipes-connectivity/socat/socat/socat-1.7.2.4-linux-3.17.patch new file mode 100644 index 0000000000..9152df533f --- /dev/null +++ b/meta/recipes-connectivity/socat/socat/socat-1.7.2.4-linux-3.17.patch @@ -0,0 +1,29 @@ +socat: fix compile erorr against 3.17+ kernel headers + +With the linux 3.17 kernel socat's configure detects the wrong include for errqueue.h +which results in a compilation error. + +By backporting the gentoo patch from: + + http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-misc/socat/files/socat-1.7.2.4-linux-3.17.patch + +Fixes the build issue + +Upstream-status: backport + +Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> + +--- a/configure.in ++++ b/configure.in +@@ -80,7 +80,10 @@ + AC_CHECK_HEADERS(termios.h linux/if_tun.h) + AC_CHECK_HEADERS(net/if_dl.h) + AC_CHECK_HEADERS(linux/types.h) +-AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [#include <linux/types.h>]) ++AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [AC_INCLUDES_DEFAULT ++ #if HAVE_LINUX_TYPES_H ++ #include <linux/types.h> ++ #endif]) + AC_CHECK_HEADERS(sys/utsname.h sys/select.h sys/file.h) + AC_CHECK_HEADERS(util.h bsd/libutil.h libutil.h sys/stropts.h regex.h) + AC_CHECK_HEADERS(linux/fs.h linux/ext2_fs.h) diff --git a/meta/recipes-connectivity/socat/socat_1.7.2.4.bb b/meta/recipes-connectivity/socat/socat_1.7.2.4.bb index efa3b91c16..9e43e160e3 100644 --- a/meta/recipes-connectivity/socat/socat_1.7.2.4.bb +++ b/meta/recipes-connectivity/socat/socat_1.7.2.4.bb @@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ file://fix-cross-compiling-failed.patch \ + file://socat-1.7.2.4-linux-3.17.patch \ " SRC_URI[md5sum] = "69b8155dd442a6f24e28ef5407d868eb" @@ -26,6 +27,7 @@ EXTRA_AUTORECONF += "--exclude=autoheader" EXTRA_OECONF += "ac_cv_have_z_modifier=yes sc_cv_sys_crdly_shift=9 \ sc_cv_sys_tabdly_shift=11 sc_cv_sys_csize_shift=4 \ ac_cv_ispeed_offset=13 \ + ac_cv_header_bsd_libutil_h=no \ " PACKAGECONFIG ??= "tcp-wrappers" diff --git a/meta/recipes-connectivity/telepathy/libtelepathy/doublefix.patch b/meta/recipes-connectivity/telepathy/libtelepathy/doublefix.patch deleted file mode 100644 index a7737fbf03..0000000000 --- a/meta/recipes-connectivity/telepathy/libtelepathy/doublefix.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix double reference to this file to work with recent autoconf+automake - -RP 1/2/10 - -Upstream-Status: Inappropriate [configuration] - -Index: libtelepathy-0.3.3/src/Makefile.am -=================================================================== ---- libtelepathy-0.3.3.orig/src/Makefile.am 2010-02-01 13:13:50.869038984 +0000 -+++ libtelepathy-0.3.3/src/Makefile.am 2010-02-01 13:14:23.267789456 +0000 -@@ -27,7 +27,6 @@ - tp-chan-type-text-gen.h \ - tp-chan-type-tubes-gen.h \ - tp-conn-iface-aliasing-gen.h \ -- tp-conn-iface-avatars-gen.h \ - tp-conn-iface-capabilities-gen.h \ - tp-conn-iface-contact-info-gen.h \ - tp-conn-iface-forwarding-gen.h \ diff --git a/meta/recipes-connectivity/telepathy/libtelepathy/prefer_python_2.5.patch b/meta/recipes-connectivity/telepathy/libtelepathy/prefer_python_2.5.patch deleted file mode 100644 index 37679ab761..0000000000 --- a/meta/recipes-connectivity/telepathy/libtelepathy/prefer_python_2.5.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: libtelepathy-0.3.1/configure.ac -=================================================================== ---- libtelepathy-0.3.1.orig/configure.ac 2007-11-22 19:05:56.000000000 +0000 -+++ libtelepathy-0.3.1/configure.ac 2008-01-04 12:07:28.000000000 +0000 -@@ -51,7 +51,7 @@ - AC_MSG_ERROR([xsltproc (from the libxslt source package) is required]) - fi - --AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python]) -+AC_CHECK_PROGS([PYTHON], [python2.5 python2.4 python2.3 python]) - if test -z "$PYTHON"; then - AC_MSG_ERROR([Python is required to compile this package]) - fi diff --git a/meta/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb b/meta/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb deleted file mode 100644 index f13e7093c8..0000000000 --- a/meta/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Telepathy framework" -DESCRIPTION = "Telepathy is a D-Bus framework for unifying real time \ -communication, including instant messaging, voice calls and video calls. It \ -abstracts differences between protocols to provide a unified interface for \ -applications." -HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" -DEPENDS = "glib-2.0 dbus dbus-glib telepathy-glib libxslt-native" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ - file://src/tp-conn.c;beginline=1;endline=19;md5=4c58069f77d601cc59200bce5396c7cb" -PR = "r5" - -SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \ - file://prefer_python_2.5.patch \ - file://doublefix.patch" - -SRC_URI[md5sum] = "490ca1a0c614d4466394b72d43bf7370" -SRC_URI[sha256sum] = "e0d230be855125163579743418203c6f6be2f10f98c4f065735c1dc9ed115878" - -inherit autotools pkgconfig pythonnative - -FILES_${PN} += "${datadir}/telepathy \ - ${datadir}/dbus-1" diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb b/meta/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb deleted file mode 100644 index 6b8c20c381..0000000000 --- a/meta/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Telepathy Framework glib-base helper library" -DESCRIPTION = "Telepathy Framework: GLib-based helper library for connection managers" -HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" -DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib libxslt-native" -LICENSE = "LGPLv2.1+" - -SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BP}.tar.gz" -SRC_URI[md5sum] = "93c429e37750b25dcf8de86bb514664f" -SRC_URI[sha256sum] = "ae0002134991217f42e503c43dea7817853afc18863b913744d51ffa029818cf" - -LIC_FILES_CHKSUM = "file://COPYING;md5=e413d83db6ee8f2c8e6055719096a48e" - -inherit autotools pkgconfig gettext - -FILES_${PN} += "${datadir}/telepathy \ - ${datadir}/dbus-1" diff --git a/meta/recipes-connectivity/telepathy/telepathy-idle/fix-svc-gtk-doc.h-target.patch b/meta/recipes-connectivity/telepathy/telepathy-idle/fix-svc-gtk-doc.h-target.patch deleted file mode 100644 index 2cd2c78c31..0000000000 --- a/meta/recipes-connectivity/telepathy/telepathy-idle/fix-svc-gtk-doc.h-target.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Constantin Musca <constantinx.musca@intel.com> ---- a/extensions/Makefile.am -+++ b/extensions/Makefile.am -@@ -37,8 +37,8 @@ _gen/all.xml: all.xml $(wildcard $(srcdi - --xinclude $(tools_dir)/identity.xsl \ - $< > $@ - --extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl -+extensions.html _gen/svc-gtk-doc.h: _gen/all.xml $(tools_dir)/doc-generator.xsl - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \ - $(tools_dir)/doc-generator.xsl \ - $< > $@ - diff --git a/meta/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb b/meta/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb deleted file mode 100644 index ca09f6daf3..0000000000 --- a/meta/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Telepathy IRC connection manager" -DESCRIPTION = "Telepathy implementation of the Internet Relay Chat protocols." -HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" -DEPENDS = "glib-2.0 dbus telepathy-glib openssl libxslt-native" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://src/idle.c;beginline=1;endline=19;md5=b06b1e2594423111a1a7910b0eefc7f9" - -SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ - file://fix-svc-gtk-doc.h-target.patch" -SRC_URI[md5sum] = "92a2de5198284cbd3c430b0d1a971a86" -SRC_URI[sha256sum] = "3013ad4b38d14ee630b8cc8ada5e95ccaa849b9a6fe15d2eaf6d0717d76f2fab" - -inherit autotools pkgconfig pythonnative - -FILES_${PN} += "${datadir}/telepathy \ - ${datadir}/dbus-1" diff --git a/meta/recipes-connectivity/telepathy/telepathy-mission-control/tmc-Makefile-fix-race.patch b/meta/recipes-connectivity/telepathy/telepathy-mission-control/tmc-Makefile-fix-race.patch deleted file mode 100644 index ece1da6bc3..0000000000 --- a/meta/recipes-connectivity/telepathy/telepathy-mission-control/tmc-Makefile-fix-race.patch +++ /dev/null @@ -1,76 +0,0 @@ -From: Robert Yang <liezhi.yang@windriver.com> -Date: Sun, 22 Sep 2013 23:21:01 -0400 -Subject: [PATCH] src/Makefile.am: fix race issue for _gen/gtypes.h and _gen/gtypes-body.h - -There might be an error when parallel build: - -[snip] -Traceback (most recent call last): - File "/path/to/tools/glib-gtypes-generator.py", line 304, in <module> - GTypesGenerator(dom, argv[1], argv[2])() - File "/path/to/tools/glib-gtypes-generator.py", line 295, in __call__ - file_set_contents(self.output + '.h', ''.join(self.header)) - File "/path/to/tools/libtpcodegen.py", line 42, in file_set_contents - os.rename(filename + '.tmp', filename) -OSError: [Errno 2] No such file or directory -[snip] - -This is a race issue, the _gen/gtypes.h and _gen/gtypes-body.h may -write(remove/rename) _gen/gtypes.tmp at the same time, then there would -be the error. - -There was a similar bug in telepathy-glib which was already fixed, we use the -similar patch to fix it. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - src/Makefile.am | 18 +++++++++++++++--- - 1 file changed, 15 insertions(+), 3 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -288,7 +288,11 @@ _gen/interfaces-body.h: _gen/mcd.xml \ - $(tools_dir)/glib-interfaces-body-generator.xsl \ - $< > $@ - --_gen/gtypes.h _gen/gtypes-body.h: _gen/mcd.xml \ -+# do nothing, output as a side-effect -+_gen/gtypes.h: _gen/gtypes-body.h -+ @: -+ -+_gen/gtypes-body.h: _gen/mcd.xml \ - $(top_srcdir)/tools/glib-gtypes-generator.py - $(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \ - $< _gen/gtypes mc -@@ -309,7 +313,11 @@ _gen/%.xml: %.xml $(wildcard $(top_srcdir)/xml/*.xml) Makefile.am - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \ - $< > $@ - --_gen/cli-%-body.h _gen/cli-%.h: _gen/%.xml \ -+# do nothing, output as a side-effect -+_gen/cli-%.h: _gen/cli-%-body.h -+ @: -+ -+_gen/cli-%-body.h: _gen/%.xml \ - $(tools_dir)/glib-client-gen.py Makefile.am - $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \ - --group=`echo $* | tr x- x_` \ -@@ -317,7 +325,11 @@ _gen/cli-%-body.h _gen/cli-%.h: _gen/%.xml \ - --tp-proxy-api=0.7.6 \ - $< Mc_Cli _gen/cli-$* - --_gen/svc-%.c _gen/svc-%.h: _gen/%.xml \ -+# do nothing, output as a side-effect -+_gen/svc-%.h: _gen/svc-%.c -+ @: -+ -+_gen/svc-%.c: _gen/%.xml \ - $(tools_dir)/glib-ginterface-gen.py Makefile.am - $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \ - --filename=_gen/svc-$* \ --- -1.7.10.4 - diff --git a/meta/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb b/meta/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb deleted file mode 100644 index 9ae68ddea9..0000000000 --- a/meta/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "Central control for Telepathy IM connection managers" -HOMEPAGE = "http://telepathy.freedesktop.org/wiki/Mission_Control/" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ - file://src/request.h;beginline=1;endline=21;md5=f80534d9af1c33291b3b79609f196eb2" -SECTION = "libs" -DEPENDS = "libtelepathy dbus-glib gconf libxslt-native" - -SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-mission-control/${BP}.tar.gz \ - file://tmc-Makefile-fix-race.patch \ - " -SRC_URI[md5sum] = "421115a35b9e427807326877f86e7f43" -SRC_URI[sha256sum] = "14ceb7d53535b43d44b8271ad11319d1d0fe6d193d154636b9e62b42799b9723" - -inherit autotools-brokensep pkgconfig pythonnative - -PACKAGECONFIG ??= "" -PACKAGECONFIG[upower] = "--enable-upower,--disable-upower,upower" - -# to select connman or nm you need to use "connectivity" and "connman" or "nm", default is to disable both -PACKAGECONFIG[connectivity] = ",--with-connectivity=no" -PACKAGECONFIG[connman] = "--with-connectivity=connman,,connman" -PACKAGECONFIG[nm] = "--with-connectivity=nm,,networkmanager" - -PACKAGES =+ " \ - libmissioncontrol \ - libmissioncontrol-config \ - libmissioncontrol-server \ - libmissioncontrol-dev \ - libmissioncontrol-config-dev \ - libmissioncontrol-server-dev \ - libmissioncontrol-dbg \ - libmissioncontrol-config-dbg \ - libmissioncontrol-server-dbg \ -" - -FILES_${PN} += "${datadir}/dbus* ${datadir}/glib-2.0/schemas" - -FILES_libmissioncontrol = "${libdir}/libmissioncontrol.so.*" -FILES_libmissioncontrol-config = "${libdir}/libmissioncontrol-config.so.*" -FILES_libmissioncontrol-server = "${libdir}/libmissioncontrol-server.so.*" - -FILES_libmissioncontrol-dev = "${libdir}/libmissioncontrol.* \ - ${includedir}/libmissioncontrol/ \ - ${libdir}/pkgconfig/libmissioncontrol.pc" -FILES_libmissioncontrol-config-dev = "${libdir}/libmissioncontrol-config.*" -FILES_libmissioncontrol-server-dev = "${libdir}/libmissioncontrol-server.*" - -FILES_libmissioncontrol-dbg = "${libdir}/.debug/libmissioncontrol.so.*" -FILES_libmissioncontrol-config-dbg = "${libdir}/.debug/libmissioncontrol-config.so.*" -FILES_libmissioncontrol-server-dbg = "${libdir}/.debug/libmissioncontrol-server.so.*" diff --git a/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch b/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch deleted file mode 100644 index 248824606e..0000000000 --- a/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch +++ /dev/null @@ -1,43 +0,0 @@ -Add dependency of __init__.py - -Tasks must be done after exec of __init__, which creates the -src/_generated directory that tasks are based on. - -Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> - -Upstream-Status: Submitted -(However it seems that this project is out of maintanence.) - -diff -ruN telepathy-python-0.15.19-orig/src/Makefile.am telepathy-python-0.15.19/src/Makefile.am ---- telepathy-python-0.15.19-orig/src/Makefile.am 2011-03-10 08:51:49.000000000 +0800 -+++ telepathy-python-0.15.19/src/Makefile.am 2011-03-10 08:54:45.000000000 +0800 -@@ -39,17 +39,17 @@ - XSLTPROC_OPTS = --nonet --novalid --xinclude - tools_dir = $(top_srcdir)/tools - --_generated/interfaces.py: $(tools_dir)/python-interfaces-generator.xsl $(wildcard $(spec_dir)/*.xml) -+_generated/interfaces.py: _generated/__init__.py $(tools_dir)/python-interfaces-generator.xsl $(wildcard $(spec_dir)/*.xml) - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \ - $(tools_dir)/python-interfaces-generator.xsl \ - $(spec_dir)/all.xml - --_generated/constants.py: $(tools_dir)/python-constants-generator.xsl $(wildcard $(spec_dir)/*.xml) -+_generated/constants.py: _generated/__init__.py $(tools_dir)/python-constants-generator.xsl $(wildcard $(spec_dir)/*.xml) - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \ - $(tools_dir)/python-constants-generator.xsl \ - $(spec_dir)/all.xml - --_generated/errors.py: $(tools_dir)/python-errors-generator.xsl $(wildcard $(spec_dir)/*.xml) -+_generated/errors.py: _generated/__init__.py $(tools_dir)/python-errors-generator.xsl $(wildcard $(spec_dir)/*.xml) - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \ - $(tools_dir)/python-errors-generator.xsl \ - $(spec_dir)/all.xml -@@ -58,7 +58,7 @@ - $(AM_V_GEN)$(mkdir_p) $(dir $@) - @echo "# Placeholder for package" > $@ - --_generated/%.py: $(tools_dir)/spec-to-python.xsl $(spec_dir)/%.xml -+_generated/%.py: _generated/__init__.py $(tools_dir)/spec-to-python.xsl $(spec_dir)/%.xml - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \ - $(tools_dir)/spec-to-python.xsl \ - $(spec_dir)/$*.xml diff --git a/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch b/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch deleted file mode 100644 index df95a4c138..0000000000 --- a/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit f6c67662145de889055a86a6b3b12c70a45fc8d5 -Author: Dongxiao Xu <dongxiao.xu@intel.com> -Date: Wed Sep 7 16:02:20 2011 +0800 - - Avoid duplicated installation of errors.py - - newer version of autotools don't seem to like listing files to install - twice. Remove one errors.py from the installation list. - - Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> - - Upstream-Status: Inappropirate [upstream inactive] - -diff --git a/src/Makefile.am b/src/Makefile.am -index 5c27dfe..7536e43 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -11,7 +11,7 @@ telepathy_PYTHON = \ - - # telepathy._generated.* auto-generated modules - spec_dir = $(top_srcdir)/spec --spec_files := $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml)) -+spec_files := $(filter-out _generated/errors.py, $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml))) - - BUILT_SOURCES = \ - _generated/interfaces.py \ diff --git a/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch b/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch deleted file mode 100644 index f613fdce4d..0000000000 --- a/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch +++ /dev/null @@ -1,26 +0,0 @@ -Upstream-Status: Pending - -automake 1.12 has deprecated use of mkdir_p, and it recommends -use of MKDIR_P instead. Changed the code to avoid these kind -of warning-errors. - -| make[1]: _generated/: Command not found -| make[1]: *** [_generated/__init__.py] Error 127 -| make[1]: Leaving directory `/srv/home/nitin/builds2/build0/tmp/work/i586-poky-linux/telepathy-python-0.15.19-r4/telepathy-python-0.15.19/src' -| make: *** [all-recursive] Error 1 - -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> -2012/07/10 -Index: telepathy-python-0.15.19/src/Makefile.am -=================================================================== ---- telepathy-python-0.15.19.orig/src/Makefile.am -+++ telepathy-python-0.15.19/src/Makefile.am -@@ -55,7 +55,7 @@ _generated/errors.py: _generated/__init_ - $(spec_dir)/all.xml - - _generated/__init__.py: -- $(AM_V_GEN)$(mkdir_p) $(dir $@) -+ $(AM_V_GEN)$(MKDIR_P) $(dir $@) - @echo "# Placeholder for package" > $@ - - _generated/%.py: _generated/__init__.py $(tools_dir)/spec-to-python.xsl $(spec_dir)/%.xml diff --git a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb deleted file mode 100644 index 17167022b9..0000000000 --- a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Telepathy IM framework - Python package" -HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://src/utils.py;beginline=1;endline=17;md5=9a07d1a9791a7429a14e7b25c6c86822" - -DEPENDS = "libxslt-native" -RDEPENDS_${PN} += "python-dbus" - -SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ - file://parallel_make.patch \ - file://remove_duplicate_install.patch \ - file://telepathy-python_fix_for_automake_1.12.patch" - -PR = "r6" - -inherit autotools pythonnative - -SRC_URI[md5sum] = "f7ca25ab3c88874015b7e9728f7f3017" -SRC_URI[sha256sum] = "244c0e1bf4bbd78ae298ea659fe10bf3a73738db550156767cc2477aedf72376" - -FILES_${PN} += "\ - ${libdir}/python*/site-packages/telepathy/*.py \ - ${libdir}/python*/site-packages/telepathy/*/*.py \ - " - -do_install_append () { - rm -f ${D}${libdir}/python*/site-packages/telepathy/*.pyc - rm -f ${D}${libdir}/python*/site-packages/telepathy/*.pyo - rm -f ${D}${libdir}/python*/site-packages/telepathy/*/*.pyc - rm -f ${D}${libdir}/python*/site-packages/telepathy/*/*.pyo -} diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc index 7923bb94a3..f95e91c999 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc @@ -26,8 +26,8 @@ SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://99_wpa_supplicant \ file://fix-libnl3-host-contamination.patch \ " -SRC_URI[md5sum] = "238e8e888bbd558e1a57e3eb28d1dd07" -SRC_URI[sha256sum] = "e0d8b8fd68a659636eaba246bb2caacbf53d22d53b2b6b90eb4b4fef0993c8ed" +SRC_URI[md5sum] = "f2ed8fef72cf63d8d446a2d0a6da630a" +SRC_URI[sha256sum] = "eaaa5bf3055270e521b2dff64f2d203ec8040f71958b8588269a82c00c9d7b6a" S = "${WORKDIR}/wpa_supplicant-${PV}" @@ -38,8 +38,10 @@ FILES_${PN} += "${datadir}/dbus-1/system-services/*" CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf" do_configure () { + ${MAKE} -C wpa_supplicant clean install -m 0755 ${WORKDIR}/defconfig wpa_supplicant/.config echo "CFLAGS +=\"-I${STAGING_INCDIR}/libnl3\"" >> wpa_supplicant/.config + echo "DRV_CFLAGS +=\"-I${STAGING_INCDIR}/libnl3\"" >> wpa_supplicant/.config if echo "${PACKAGECONFIG}" | grep -qw "openssl"; then ssl=openssl @@ -84,12 +86,13 @@ do_install () { cd ${D}${sysconfdir}/network/ && \ ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant - install -d ${D}/${sysconfdir}/dbus-1/system.d - install -m 644 ${S}/wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d install -d ${D}/${datadir}/dbus-1/system-services install -m 644 ${S}/wpa_supplicant/dbus/*.service ${D}/${datadir}/dbus-1/system-services if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}/${sysconfdir}/dbus-1/system.d + install -m 644 ${S}/wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d + install -d ${D}/${systemd_unitdir}/system install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}/${systemd_unitdir}/system fi diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contamination.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contamination.patch index eb8036f50c..e899c1655d 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contamination.patch +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contamination.patch @@ -15,15 +15,15 @@ diff --git a/src/drivers/drivers.mak b/src/drivers/drivers.mak index 68ff910..1f38f57 100644 --- a/src/drivers/drivers.mak +++ b/src/drivers/drivers.mak -@@ -30,7 +30,7 @@ NEED_RFKILL=y +@@ -35,7 +35,7 @@ NEED_RFKILL=y ifdef CONFIG_LIBNL32 DRV_LIBS += -lnl-3 DRV_LIBS += -lnl-genl-3 - DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3 + DRV_CFLAGS += -DCONFIG_LIBNL20 - else - ifdef CONFIG_LIBNL_TINY - DRV_LIBS += -lnl-tiny + ifdef CONFIG_LIBNL3_ROUTE + DRV_LIBS += -lnl-route-3 + DRV_CFLAGS += -DCONFIG_LIBNL3_ROUTE diff --git a/src/drivers/drivers.mk b/src/drivers/drivers.mk index db8561a..c93e88d 100644 --- a/src/drivers/drivers.mk @@ -34,9 +34,9 @@ index db8561a..c93e88d 100644 DRV_LIBS += -lnl-genl-3 - DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3 + DRV_CFLAGS += -DCONFIG_LIBNL20 - else - ifdef CONFIG_LIBNL_TINY - DRV_LIBS += -lnl-tiny + ifdef CONFIG_LIBNL3_ROUTE + DRV_LIBS += -lnl-route-3 + DRV_CFLAGS += -DCONFIG_LIBNL3_ROUTE -- 1.7.10.4 diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.2.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.3.bb index afd0654016..afd0654016 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.2.bb +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.3.bb diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index 88ab8d877b..53c2680409 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile @@ -2,7 +2,7 @@ # and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). PATH="/usr/local/bin:/usr/bin:/bin" -EDITOR="/bin/vi" # needed for packages like cron +EDITOR="vi" # needed for packages like cron, git-commit test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. if [ ! -e /etc/localtime -a ! -e /etc/TZ ]; then diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index 07f5c54c97..e16fe722b8 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -59,13 +59,39 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \ ${sysconfdir}/default" +# By default the hostname is the machine name. If the hostname is unset then a +# /etc/hostname file isn't written, suitable for environments with dynamic +# hostnames. # -# set standard hostname, might be a candidate for a DISTRO variable? :M: -# -hostname = "openembedded" +# The hostname can be changed outside of this recipe by using +# hostname_pn-base-files = "my-host-name". +hostname = "${MACHINE}" BASEFILESISSUEINSTALL ?= "do_install_basefilesissue" +# In previous versions of base-files, /run was a softlink to /var/run and the +# directory was located in /var/volatlie/run. Also, /var/lock was a softlink +# to /var/volatile/lock which is where the real directory was located. Now, +# /run and /run/lock are the real directories. If we are upgrading, we may +# need to remove the symbolic links first before we create the directories. +# Otherwise the directory creation will fail and we will have circular symbolic +# links. +# +pkg_preinst_${PN} () { + #!/bin/sh -e + if [ x"$D" = "x" ]; then + if [ -h "/var/lock" ]; then + # Remove the symbolic link + rm -f /var/lock + fi + + if [ -h "/run" ]; then + # Remove the symbolic link + rm -f /run + fi + fi +} + do_install () { for d in ${dirs755}; do install -m 0755 -d ${D}$d @@ -79,6 +105,7 @@ do_install () { for d in ${volatiles}; do ln -sf volatile/$d ${D}${localstatedir}/$d done + ln -snf ../run ${D}${localstatedir}/run ln -snf ../run/lock ${D}${localstatedir}/lock @@ -111,15 +138,11 @@ do_install () { DISTRO_VERSION[vardepsexclude] += "DATE" do_install_basefilesissue () { - if [ "${hostname}" != "" ]; then - if [ -n "${MACHINE}" -a "${hostname}" = "openembedded" ]; then - echo ${MACHINE} > ${D}${sysconfdir}/hostname - else - echo ${hostname} > ${D}${sysconfdir}/hostname - fi + if [ "${hostname}" ]; then + echo ${hostname} > ${D}${sysconfdir}/hostname fi - install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir} + install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir} if [ -n "${DISTRO_NAME}" ]; then printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue.net @@ -151,4 +174,5 @@ FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses" PACKAGE_ARCH = "${MACHINE_ARCH}" CONFFILES_${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname'][(d.getVar('hostname', True) != '')]} ${sysconfdir}/shells" +CONFFILES_${PN} += "${sysconfdir}/motd ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile" diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb index ec8f2afb22..a8bd7c4e3f 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb @@ -4,7 +4,7 @@ SECTION = "base" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" -SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \ +SRC_URI = "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar.gz \ file://add_shutdown.patch \ file://nobash.patch \ file://noshadow.patch \ @@ -75,11 +75,11 @@ python populate_packages_prepend() { preinst = """#!/bin/sh mkdir -p $D${sysconfdir} if [ ! -e $D${sysconfdir}/passwd ]; then -\tcat << EOF > $D${sysconfdir}/passwd +\tcat << 'EOF' > $D${sysconfdir}/passwd """ + passwd + """EOF fi if [ ! -e $D${sysconfdir}/group ]; then -\tcat << EOF > $D${sysconfdir}/group +\tcat << 'EOF' > $D${sysconfdir}/group """ + group + """EOF fi """ diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index bd66e4f148..0769d92c50 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -23,7 +23,7 @@ PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN} FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${sysconfdir}/syslog.conf* ${systemd_unitdir}/system/syslog.service ${sysconfdir}/default/busybox-syslog" -FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf" +FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf ${sysconfdir}/mdev/*" FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc" FILES_${PN}-hwclock = "${sysconfdir}/init.d/hwclock.sh" @@ -268,6 +268,9 @@ do_install () { install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf + install -d ${D}${sysconfdir}/mdev + install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev + install -m 0755 ${WORKDIR}/mdev-mount.sh ${D}${sysconfdir}/mdev fi fi diff --git a/meta/recipes-core/busybox/busybox/0001-build-system-Specify-nostldlib-when-linking-to-.o-fi.patch b/meta/recipes-core/busybox/busybox/0001-build-system-Specify-nostldlib-when-linking-to-.o-fi.patch deleted file mode 100644 index 3da38bb4ca..0000000000 --- a/meta/recipes-core/busybox/busybox/0001-build-system-Specify-nostldlib-when-linking-to-.o-fi.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 28389e59701c2408e87e886c358f8e1766c677f7 Mon Sep 17 00:00:00 2001 -From: Drew Moseley <drew_moseley@mentor.com> -Date: Sat, 29 Mar 2014 11:13:16 -0400 -Subject: [PATCH] build system: Specify '-nostldlib' when linking to .o files. - -For certain cross build scenarios the LD variable is overridden -to use the gcc executive to ensure all the target tuning parameters -are used. In these cases, the executive errors out as shown below -but since this step is only linking to a .o file the standard libs -are not needed. - - $ make LD=gcc applets/built-in.o - LD applets/built-in.o - /usr/bin/ld: cannot find -lgcc_s - /usr/bin/ld: cannot find -lgcc_s - collect2: ld returned 1 exit status - make[1]: *** [applets/built-in.o] Error 1 - make: *** [applets_dir] Error 2 - -Signed-off-by: Drew Moseley <drew_moseley@mentor.com> ---- - scripts/Makefile.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/Makefile.build b/scripts/Makefile.build -index 5685b5b..eba69f6 100644 ---- a/scripts/Makefile.build -+++ b/scripts/Makefile.build -@@ -256,7 +256,7 @@ ifdef builtin-target - quiet_cmd_link_o_target = LD $@ - # If the list of objects to link is empty, just create an empty built-in.o - cmd_link_o_target = $(if $(strip $(obj-y)),\ -- $(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\ -+ $(LD) -nostdlib $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\ - rm -f $@; $(AR) rcs $@) - - $(builtin-target): $(obj-y) FORCE --- -1.7.9.5 - diff --git a/meta/recipes-core/busybox/busybox/CVE-2014-9645_busybox_reject_module_names_with_slashes.patch b/meta/recipes-core/busybox/busybox/CVE-2014-9645_busybox_reject_module_names_with_slashes.patch new file mode 100644 index 0000000000..4e76067b3c --- /dev/null +++ b/meta/recipes-core/busybox/busybox/CVE-2014-9645_busybox_reject_module_names_with_slashes.patch @@ -0,0 +1,41 @@ +Upstream-status: Backport +http://git.busybox.net/busybox/commit/?id=4e314faa0aecb66717418e9a47a4451aec59262b + +CVE-2014-9645 fix. + +[YOCTO #7257] + +Signed-off-by: Armin Kuster <akuster@mvista.com> + +From 4e314faa0aecb66717418e9a47a4451aec59262b Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko <vda.linux@googlemail.com> +Date: Thu, 20 Nov 2014 17:24:33 +0000 +Subject: modprobe,rmmod: reject module names with slashes + +function old new delta +add_probe 86 113 +27 + +Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> +--- +Index: busybox-1.22.1/modutils/modprobe.c +=================================================================== +--- busybox-1.22.1.orig/modutils/modprobe.c ++++ busybox-1.22.1/modutils/modprobe.c +@@ -238,6 +238,17 @@ static void add_probe(const char *name) + { + struct module_entry *m; + ++ /* ++ * get_or_add_modentry() strips path from name and works ++ * on remaining basename. ++ * This would make "rmmod dir/name" and "modprobe dir/name" ++ * to work like "rmmod name" and "modprobe name", ++ * which is wrong, and can be abused via implicit modprobing: ++ * "ifconfig /usbserial up" tries to modprobe netdev-/usbserial. ++ */ ++ if (strchr(name, '/')) ++ bb_error_msg_and_die("malformed module name '%s'", name); ++ + m = get_or_add_modentry(name); + if (!(option_mask32 & (OPT_REMOVE | OPT_SHOW_DEPS)) + && (m->flags & MODULE_FLAG_LOADED) diff --git a/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch b/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch index fc7b778be1..781f5af14a 100644 --- a/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch +++ b/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch @@ -2,7 +2,7 @@ From: Jason Wessel <jason.wessel@windriver.com> Date: Sun, 3 Mar 2013 12:31:40 -0600 Subject: [PATCH] menuconfig,check-lxdiaglog.sh: Allow specification of ncurses location -Upstream-status: Submitted +Upstream-status: Submitted [ based on: https://lkml.org/lkml/2013/3/3/103 ] @@ -44,9 +44,9 @@ cc: linux-kbuild@vger.kernel.org + echo "$CROSS_CURSES_LIB" + exit + fi - for ext in so a dylib ; do - for lib in ncursesw ncurses curses ; do - $cc -print-file-name=lib${lib}.${ext} | grep -q / + for ext in so a dylib ; do + for lib in ncursesw ncurses curses ; do + $cc -print-file-name=lib${lib}.${ext} | grep -q / @@ -19,6 +23,10 @@ ldflags() # Where is ncurses.h? ccflags() @@ -55,17 +55,17 @@ cc: linux-kbuild@vger.kernel.org + echo "$CROSS_CURSES_INC" + exit + fi - if [ -f /usr/include/ncursesw/ncurses.h ]; then - echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncurses.h>"' - elif [ -f /usr/include/ncursesw/curses.h ]; then + if [ -f /usr/include/ncursesw/ncurses.h ]; then + echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncurses.h>"' + elif [ -f /usr/include/ncursesw/curses.h ]; then --- a/scripts/kconfig/lxdialog/Makefile +++ b/scripts/kconfig/lxdialog/Makefile @@ -5,7 +5,7 @@ check-lxdialog := $(srctree)/$(src)/che - + # Use reursively expanded variables so we do not call gcc unless # we really need to do so. (Do not call gcc as part of make mrproper) -HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) +HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) - + HOST_EXTRACFLAGS += -DLOCALE diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig index 8394067bed..c200ee074d 100644 --- a/meta/recipes-core/busybox/busybox/defconfig +++ b/meta/recipes-core/busybox/busybox/defconfig @@ -441,7 +441,7 @@ CONFIG_FEATURE_KILL_DELAY=0 # CONFIG_FEATURE_INIT_COREDUMPS is not set # CONFIG_FEATURE_INITRD is not set CONFIG_INIT_TERMINAL_TYPE="" -# CONFIG_MESG is not set +CONFIG_MESG=y # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set # diff --git a/meta/recipes-core/busybox/busybox_1.22.1.bb b/meta/recipes-core/busybox/busybox_1.23.1.bb index 8879e52962..1742390ed9 100644 --- a/meta/recipes-core/busybox/busybox_1.22.1.bb +++ b/meta/recipes-core/busybox/busybox_1.23.1.bb @@ -1,7 +1,5 @@ require busybox.inc -PR = "r32" - SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://get_header_tar.patch \ file://busybox-appletlib-dependency.patch \ @@ -20,6 +18,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://busybox-syslog.default \ file://mdev \ file://mdev.conf \ + file://mdev-mount.sh \ file://umount.busybox \ file://defconfig \ file://busybox-syslog.service.in \ @@ -29,13 +28,13 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://inetd.conf \ file://inetd \ file://login-utilities.cfg \ - file://0001-build-system-Specify-nostldlib-when-linking-to-.o-fi.patch \ file://recognize_connmand.patch \ file://busybox-cross-menuconfig.patch \ + file://CVE-2014-9645_busybox_reject_module_names_with_slashes.patch \ " -SRC_URI[tarball.md5sum] = "337d1a15ab1cb1d4ed423168b1eb7d7e" -SRC_URI[tarball.sha256sum] = "ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b" +SRC_URI[tarball.md5sum] = "5c94d6301a964cd91619bd4d74605245" +SRC_URI[tarball.sha256sum] = "300f1db0a7ca4ecee8f8d8027aba250b903372e8339b7d9123d37c1e900473bf" EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y" diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb index f2cc119400..529ed5b318 100644 --- a/meta/recipes-core/busybox/busybox_git.bb +++ b/meta/recipes-core/busybox/busybox_git.bb @@ -1,8 +1,8 @@ require busybox.inc -SRCREV = "d9e0c438e10e2155513e5d26498af472c5137d65" +SRCREV = "1ecfe811fe2f70380170ef7d820e8150054e88ca" # Lookout for PV bump too when SRCREV is changed -PV = "1.22.1+git${SRCPV}" +PV = "1.23.1+git${SRCPV}" S = "${WORKDIR}/git" @@ -24,6 +24,7 @@ SRC_URI = "git://busybox.net/busybox.git \ file://busybox-syslog.default \ file://mdev \ file://mdev.conf \ + file://mdev-mount.sh \ file://umount.busybox \ file://defconfig \ file://busybox-syslog.service.in \ diff --git a/meta/recipes-core/busybox/files/find-touchscreen.sh b/meta/recipes-core/busybox/files/find-touchscreen.sh index 1582ea891c..52c5e7a096 100644 --- a/meta/recipes-core/busybox/files/find-touchscreen.sh +++ b/meta/recipes-core/busybox/files/find-touchscreen.sh @@ -1,9 +1,6 @@ #!/bin/sh -if [ `egrep "input:.*-e0.*,3,.*a0,1,.*18,.*" /sys/class/input/$MDEV/device/modalias|wc -l` -gt 0 ]; then - ln -sf /dev/input/$MDEV /dev/input/touchscreen0 +if grep -q "input:.*-e0.*,3,.*a0,1,\|ads7846" /sys/class/$MDEV/device/modalias ; then + ln -sf /dev/$MDEV /dev/input/touchscreen0 fi -if [ `egrep "ads7846" /sys/class/input/$MDEV/device/modalias|wc -l` -gt 0 ]; then - ln -sf /dev/input/$MDEV /dev/input/touchscreen0 -fi diff --git a/meta/recipes-core/busybox/files/mdev-mount.sh b/meta/recipes-core/busybox/files/mdev-mount.sh new file mode 100644 index 0000000000..d5d66d66fb --- /dev/null +++ b/meta/recipes-core/busybox/files/mdev-mount.sh @@ -0,0 +1,63 @@ +#!/bin/sh +MDEV_AUTOMOUNT=y +MDEV_AUTOMOUNT_ROOT=/run/media +[ -f /etc/default/mdev ] && . /etc/default/mdev +if [ "${MDEV_AUTOMOUNT}" = "n" ] ; then + exit 0 +fi + +case "$ACTION" in + add|"") + ACTION="add" + # check if already mounted + if grep -q "^/dev/${MDEV} " /proc/mounts ; then + # Already mounted + exit 0 + fi + DEVBASE=`expr substr $MDEV 1 3` + if [ "${DEVBASE}" == "mmc" ] ; then + DEVBASE=`expr substr $MDEV 1 7` + fi + # check for "please don't mount it" file + if [ -f "/dev/nomount.${DEVBASE}" ] ; then + # blocked + exit 0 + fi + # check for full-disk partition + if [ "${DEVBASE}" == "${MDEV}" ] ; then + if [ -d /sys/block/${DEVBASE}/${DEVBASE}*1 ] ; then + # Partition detected, just quit + exit 0 + fi + if [ ! -f /sys/block/${DEVBASE}/size ] ; then + # No size at all + exit 0 + fi + if [ `cat /sys/block/${DEVBASE}/size` == 0 ] ; then + # empty device, bail out + exit 0 + fi + fi + # first allow fstab to determine the mountpoint + if ! mount /dev/$MDEV > /dev/null 2>&1 + then + MOUNTPOINT="${MDEV_AUTOMOUNT_ROOT}/$MDEV" + mkdir "$MOUNTPOINT" + mount -t auto /dev/$MDEV "$MOUNTPOINT" + fi + ;; + remove) + MOUNTPOINT=`grep "^/dev/$MDEV\s" /proc/mounts | cut -d' ' -f 2` + if [ ! -z "$MOUNTPOINT" ] + then + umount "$MOUNTPOINT" + rmdir "$MOUNTPOINT" + else + umount /dev/$MDEV + fi + ;; + *) + # Unexpected keyword + exit 1 + ;; +esac diff --git a/meta/recipes-core/busybox/files/mdev.conf b/meta/recipes-core/busybox/files/mdev.conf index e688911ff1..17e93da7c3 100644 --- a/meta/recipes-core/busybox/files/mdev.conf +++ b/meta/recipes-core/busybox/files/mdev.conf @@ -1,3 +1,5 @@ +$MODALIAS=.* 0:0 660 @modprobe "$MODALIAS" + console 0:0 0600 cpu_dma_latency 0:0 0660 fb0:0 44 0660 @@ -35,3 +37,6 @@ input/mice 0:0 0660 input/mouse.* 0:0 0660 tun[0-9]* 0:0 0660 =net/ + +[hs]d[a-z][0-9]? 0:0 660 */etc/mdev/mdev-mount.sh +mmcblk[0-9].* 0:0 660 */etc/mdev/mdev-mount.sh diff --git a/meta/recipes-core/busybox/files/simple.script b/meta/recipes-core/busybox/files/simple.script index 757e487b97..22168b07e6 100644 --- a/meta/recipes-core/busybox/files/simple.script +++ b/meta/recipes-core/busybox/files/simple.script @@ -46,7 +46,7 @@ case "$1" in if [ -n "$router" ] ; then if ! root_is_nfs ; then if [ $have_bin_ip -eq 1 ]; then - while ip route del default 2>/dev/null ; do + while ip route del default dev $interface 2>/dev/null ; do : done else @@ -56,7 +56,7 @@ case "$1" in fi fi - metric=0 + metric=10 for i in $router ; do if [ $have_bin_ip -eq 1 ]; then ip route add default via $i metric $metric diff --git a/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch b/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch deleted file mode 100644 index 4757f52aa0..0000000000 --- a/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd coreutils-8.21/man/local.mk coreutils-8.21/man/local.mk ---- coreutils-8.21/man/local.mk 2013-02-05 16:01:21.000000000 +0200 -+++ coreutils-8.21/man/local.mk 2013-03-23 09:12:53.360470192 +0200 -@@ -19,11 +19,11 @@ - EXTRA_DIST += man/help2man man/dummy-man - - ## Graceful degradation for systems lacking perl. --if HAVE_PERL --run_help2man = $(PERL) -- $(srcdir)/man/help2man --else -+#if HAVE_PERL -+#run_help2man = $(PERL) -- $(srcdir)/man/help2man -+#else - run_help2man = $(SHELL) $(srcdir)/man/dummy-man --endif -+#endif - - man1_MANS = @man1_MANS@ - EXTRA_DIST += $(man1_MANS:.1=.x) diff --git a/meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch b/meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch deleted file mode 100644 index b7e82609bd..0000000000 --- a/meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status: Pending - -coreutils: fix for dummy-man usage - -The options should be before the final argument, otherwise, the following error -would appear when compiling. - -"dummy-man: too many non-option arguments" - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - man/local.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/man/local.mk b/man/local.mk -index 7cef5e3..dc0865f 100644 ---- a/man/local.mk -+++ b/man/local.mk -@@ -189,8 +189,8 @@ man/yes.1: src/yes - && $(run_help2man) \ - --source='$(PACKAGE_STRING)' \ - --include=$(srcdir)/man/$$name.x \ -- --output=$$t/$$name.1 $$t/$$name \ - --info-page='coreutils \(aq'$$name' invocation\(aq' \ -+ --output=$$t/$$name.1 $$t/$$name \ - && sed \ - -e 's|$*\.td/||g' \ - -e '/For complete documentation/d' \ --- -1.7.9.5 - diff --git a/meta/recipes-core/coreutils/coreutils-8.22/fix-selinux-flask.patch b/meta/recipes-core/coreutils/coreutils-8.23/fix-selinux-flask.patch index 9d1ae55d47..9d1ae55d47 100644 --- a/meta/recipes-core/coreutils/coreutils-8.22/fix-selinux-flask.patch +++ b/meta/recipes-core/coreutils/coreutils-8.23/fix-selinux-flask.patch diff --git a/meta/recipes-core/coreutils/coreutils-8.23/man-decouple-manpages-from-build.patch b/meta/recipes-core/coreutils/coreutils-8.23/man-decouple-manpages-from-build.patch new file mode 100644 index 0000000000..3c896a11bf --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.23/man-decouple-manpages-from-build.patch @@ -0,0 +1,27 @@ +From b4d258629f090066783c3b4c91b40f63b9d0a296 Mon Sep 17 00:00:00 2001 +From: Paul Gortmaker <paul.gortmaker@windriver.com> +Date: Sun, 8 Feb 2015 16:51:57 -0500 +Subject: [PATCH] man: decouple manpages from build + +The use of "help2man" doesn't work at all for cross compile, in +addition to the extra requirement of perl it adds. + +Just decouple the manpages from the build in order to pave the way for +importing prebuilt manpages that can be used in a cross build situation. + +Upstream-Status: Inappropriate [upstream doesn't care about x-compile case.] +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> + +diff --git a/Makefile.am b/Makefile.am +index fb4af27..7576b2c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -214,5 +214,4 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib -Isrc -I$(top_srcdir)/src + include $(top_srcdir)/lib/local.mk + include $(top_srcdir)/src/local.mk + include $(top_srcdir)/doc/local.mk +-include $(top_srcdir)/man/local.mk + include $(top_srcdir)/tests/local.mk +-- +2.2.2 + diff --git a/meta/recipes-core/coreutils/coreutils-8.22/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils-8.23/remove-usr-local-lib-from-m4.patch index 2ef8a548ac..2ef8a548ac 100644 --- a/meta/recipes-core/coreutils/coreutils-8.22/remove-usr-local-lib-from-m4.patch +++ b/meta/recipes-core/coreutils/coreutils-8.23/remove-usr-local-lib-from-m4.patch diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb index debd2a123b..9189426315 100644 --- a/meta/recipes-core/coreutils/coreutils_6.9.bb +++ b/meta/recipes-core/coreutils/coreutils_6.9.bb @@ -9,11 +9,10 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://src/ls.c;beginline=4;endline=16;md5=15ed60f67b1db5fedd5dbc37cf8a9543" PR = "r5" -DEPENDS_class-native = "gettext-native" inherit autotools gettext texinfo -SRC_URI_BASE = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \ +SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \ file://gnulib_m4.patch \ file://futimens.patch \ file://coreutils-ls-x.patch \ @@ -25,23 +24,20 @@ SRC_URI_BASE = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \ file://coreutils_fix_for_automake-1.12.patch \ file://coreutils-build-with-acl.patch \ file://coreutils-fix-texinfo.patch \ + file://fix_for_manpage_building.patch \ " -SRC_URI = "${SRC_URI_BASE} file://fix_for_manpage_building.patch" -SRC_URI_class-native = "${SRC_URI_BASE}" - SRC_URI[md5sum] = "c9607d8495f16e98906e7ed2d9751a06" SRC_URI[sha256sum] = "89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0" # acl is not a default feature # -PACKAGECONFIG_class-target ??= "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" -PACKAGECONFIG_class-native ??= "" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" # with, without, depends, rdepends # -PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," +PACKAGECONFIG[acl] = "ac_cv_header_sys_acl_h=yes,ac_cv_header_sys_acl_h=no,acl," # [ gets a special treatment and is not included in this @@ -102,5 +98,3 @@ python __anonymous() { for prog in d.getVar('sbindir_progs', True).split(): d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir', True), prog)) } - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-core/coreutils/coreutils_8.22.bb b/meta/recipes-core/coreutils/coreutils_8.23.bb index f85bacabd3..63df75e7ba 100644 --- a/meta/recipes-core/coreutils/coreutils_8.22.bb +++ b/meta/recipes-core/coreutils/coreutils_8.23.bb @@ -12,15 +12,17 @@ DEPENDS_class-native = "" inherit autotools gettext texinfo -SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ +SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz;name=tarball \ + http://distfiles.gentoo.org/distfiles/${BP}-man.tar.xz;name=manpages \ + file://man-decouple-manpages-from-build.patch \ file://remove-usr-local-lib-from-m4.patch \ - file://dummy_help2man.patch \ - file://fix-for-dummy-man-usage.patch \ file://fix-selinux-flask.patch \ " -SRC_URI[md5sum] = "8fb0ae2267aa6e728958adc38f8163a2" -SRC_URI[sha256sum] = "5b3e94998152c017e6c75d56b9b994188eb71bf46d4038a642cb9141f6ff1212" +SRC_URI[tarball.md5sum] = "abed135279f87ad6762ce57ff6d89c41" +SRC_URI[tarball.sha256sum] = "ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d" +SRC_URI[manpages.md5sum] = "ce49bc8360e16afe67581d136606efc7" +SRC_URI[manpages.sha256sum] = "d1b16e74b3dba4f313aeebae2c69da205f7d2e6e1c2aa8d39026c860d314ecca" EXTRA_OECONF_class-native = "--without-gmp" EXTRA_OECONF_class-target = "--enable-install-program=arch --libexecdir=${libdir}" @@ -72,6 +74,13 @@ do_install_append() { # in update-alternatives to fail, therefore use lbracket - the name used # for the actual source file. mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${BPN} + + # prebuilt man pages + install -d ${D}/${mandir}/man1 + install -t ${D}/${mandir}/man1 ${S}/man/*.1 + # prebuilt man pages don't do a separate man page for [ vs test. + # see comment above r.e. sed and update-alternatives + cp -a ${D}${mandir}/man1/test.1 ${D}${mandir}/man1/lbracket.1.${BPN} } do_install_append_class-native(){ @@ -83,18 +92,23 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 mktemp df" +ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 lbracket.1" ALTERNATIVE_LINK_NAME[base64] = "${base_bindir}/base64" ALTERNATIVE_TARGET[base64] = "${bindir}/base64.${BPN}" +ALTERNATIVE_LINK_NAME[base64.1] = "${mandir}/man1/base64.1" ALTERNATIVE_LINK_NAME[mktemp] = "${base_bindir}/mktemp" ALTERNATIVE_TARGET[mktemp] = "${bindir}/mktemp.${BPN}" +ALTERNATIVE_LINK_NAME[mktemp.1] = "${mandir}/man1/mktemp.1" ALTERNATIVE_LINK_NAME[df] = "${base_bindir}/df" ALTERNATIVE_TARGET[df] = "${bindir}/df.${BPN}" +ALTERNATIVE_LINK_NAME[df.1] = "${mandir}/man1/df.1" ALTERNATIVE_LINK_NAME[lbracket] = "${bindir}/[" ALTERNATIVE_TARGET[lbracket] = "${bindir}/lbracket.${BPN}" +ALTERNATIVE_LINK_NAME[lbracket.1] = "${mandir}/man1/lbracket.1" python __anonymous() { for prog in d.getVar('base_bindir_progs', True).split(): diff --git a/meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch b/meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch deleted file mode 100644 index 40e3b12b5d..0000000000 --- a/meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=59003] - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd dbus-glib-0.100/configure.ac dbus-glib-0.100/configure.ac ---- dbus-glib-0.100/configure.ac 2012-06-25 19:26:39.000000000 +0300 -+++ dbus-glib-0.100/configure.ac 2013-01-03 04:53:22.314976758 +0200 -@@ -8,7 +8,7 @@ - - AM_INIT_AUTOMAKE([1.9]) - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - # Honor aclocal flags - ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc index 6c60d9e408..abd013247c 100644 --- a/meta/recipes-core/dbus/dbus-glib.inc +++ b/meta/recipes-core/dbus/dbus-glib.inc @@ -13,7 +13,6 @@ DEPENDS_class-native = "glib-2.0-native dbus-native" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ file://no-examples.patch \ file://test-install-makefile.patch \ - file://obsolete_automake_macros.patch \ " inherit autotools pkgconfig gettext diff --git a/meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch b/meta/recipes-core/dbus/dbus-glib/no-examples.patch index fbb4967828..fbb4967828 100644 --- a/meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch +++ b/meta/recipes-core/dbus/dbus-glib/no-examples.patch diff --git a/meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch b/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch index 2e8e178bb7..027c82b27e 100644 --- a/meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch +++ b/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch @@ -3,26 +3,46 @@ Change Makefile.am to install regression tests for test package purpose. Upstream-Status: Inappropriate [test not install is for purpose from upstream] Signed-off-by: Yao Zhao <yao.zhao@windriver.com> +Signed-off-by: Chong Lu <Chong.Lu@windriver.com> +--- + test/Makefile.am | 3 ++- + test/core/Makefile.am | 3 ++- + test/interfaces/Makefile.am | 3 ++- + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am -index 7ba11a8..249f0e7 100644 +index 379c8c3..6580927 100644 --- a/test/Makefile.am +++ b/test/Makefile.am -@@ -13,7 +13,8 @@ else - TEST_BINARIES= - endif +@@ -48,7 +48,8 @@ TESTS = \ + $(test_scripts) \ + $(NULL) --noinst_PROGRAMS= $(TEST_BINARIES) +-noinst_PROGRAMS = \ +testdir = $(datadir)/@PACKAGE@/tests -+test_PROGRAMS= $(TEST_BINARIES) ++test_PROGRAMS = \ + $(test_programs) \ + $(test_related_programs) \ + $(NULL) +diff --git a/test/core/Makefile.am b/test/core/Makefile.am +index e4bceb4..54b077d 100644 +--- a/test/core/Makefile.am ++++ b/test/core/Makefile.am +@@ -64,7 +64,8 @@ endif - test_service_SOURCES= \ - test-service.c + ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we + ## build even when not doing "make check" +-noinst_PROGRAMS = \ ++testdir = $(datadir)/@PACKAGE@/tests/core ++test_PROGRAMS = \ + test-dbus-glib \ + test-error-mapping \ + test-service-glib \ diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am -index 3cb2c39..e6de67d 100644 +index a94d08d..707dcac 100644 --- a/test/interfaces/Makefile.am +++ b/test/interfaces/Makefile.am -@@ -39,7 +39,8 @@ if DBUS_BUILD_TESTS +@@ -57,7 +57,8 @@ if DBUS_BUILD_TESTS ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we ## build even when not doing "make check" @@ -32,17 +52,6 @@ index 3cb2c39..e6de67d 100644 test_service_SOURCES = \ test-interfaces.c \ -diff --git a/test/core/Makefile.am b/test/core/Makefile.am -index ef6cb26..9786c3a 100644 ---- a/test/core/Makefile.am -+++ b/test/core/Makefile.am -@@ -46,7 +46,8 @@ endif - - ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we - ## build even when not doing "make check" --noinst_PROGRAMS = \ -+testdir = $(datadir)/@PACKAGE@/tests/core -+test_PROGRAMS = \ - test-dbus-glib \ - test-service-glib \ - $(THREAD_APPS) \ +-- +1.9.1 + diff --git a/meta/recipes-core/dbus/dbus-glib_0.100.2.bb b/meta/recipes-core/dbus/dbus-glib_0.100.2.bb deleted file mode 100644 index c1bb06a1b4..0000000000 --- a/meta/recipes-core/dbus/dbus-glib_0.100.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require dbus-glib.inc - - -SRC_URI[md5sum] = "ad0920c7e3aad669163bb59171cf138e" -SRC_URI[sha256sum] = "a5bb42da921f51c28161e0e54a5a8241d94a1c0499a14007150e9ce743da6ac5" diff --git a/meta/recipes-core/dbus/dbus-glib_0.102.bb b/meta/recipes-core/dbus/dbus-glib_0.102.bb new file mode 100644 index 0000000000..d798ebfac0 --- /dev/null +++ b/meta/recipes-core/dbus/dbus-glib_0.102.bb @@ -0,0 +1,5 @@ +require dbus-glib.inc + + +SRC_URI[md5sum] = "f76b8558fd575d0106c3a556eaa49184" +SRC_URI[sha256sum] = "6964ed585bb8149a14ab744b5ded5e77cf71ec5446e6dcc5fcf5eebcc52df29c" diff --git a/meta/recipes-core/dbus/dbus-test_1.8.2.bb b/meta/recipes-core/dbus/dbus-test_1.8.10.bb index e19d2e9d1e..719c1f9621 100644 --- a/meta/recipes-core/dbus/dbus-test_1.8.2.bb +++ b/meta/recipes-core/dbus/dbus-test_1.8.10.bb @@ -18,8 +18,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ " -SRC_URI[md5sum] = "d6f709bbec0a022a1847c7caec9d6068" -SRC_URI[sha256sum] = "5689f7411165adc953f37974e276a3028db94447c76e8dd92efe910c6d3bae08" +SRC_URI[md5sum] = "6be5ef99ae784de9d04589eb067fe038" +SRC_URI[sha256sum] = "10bf87fdb68815edd01d53885101dbcdd80dacad7198912cca61a4fa22dfaf8e" S="${WORKDIR}/dbus-${PV}" FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" @@ -44,6 +44,7 @@ EXTRA_OECONF = "--enable-tests \ ${EXTRA_OECONF_X}" do_install() { + : } do_install_ptest() { diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index d38ba7e1d2..fb5d017856 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ DEPENDS = "expat virtual/libintl" RDEPENDS_dbus_class-native = "" RDEPENDS_dbus_class-nativesdk = "" -PACKAGES += "${@bb.utils.contains('PTEST_ENABLED', '1', 'dbus-ptest', '', d)}" +PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" ALLOW_EMPTY_dbus-ptest = "1" RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest" diff --git a/meta/recipes-core/dbus/dbus_1.8.10.bb b/meta/recipes-core/dbus/dbus_1.8.10.bb new file mode 100644 index 0000000000..250ea21ddc --- /dev/null +++ b/meta/recipes-core/dbus/dbus_1.8.10.bb @@ -0,0 +1,4 @@ +include dbus.inc + +SRC_URI[md5sum] = "6be5ef99ae784de9d04589eb067fe038" +SRC_URI[sha256sum] = "10bf87fdb68815edd01d53885101dbcdd80dacad7198912cca61a4fa22dfaf8e" diff --git a/meta/recipes-core/dbus/dbus_1.8.2.bb b/meta/recipes-core/dbus/dbus_1.8.2.bb deleted file mode 100644 index 37ebed2bd6..0000000000 --- a/meta/recipes-core/dbus/dbus_1.8.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -include dbus.inc - -SRC_URI[md5sum] = "d6f709bbec0a022a1847c7caec9d6068" -SRC_URI[sha256sum] = "5689f7411165adc953f37974e276a3028db94447c76e8dd92efe910c6d3bae08" diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index 947a491679..e187d04339 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc @@ -5,7 +5,7 @@ SECTION = "console/network" # some files are from other projects and have others license terms: # public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY LICENSE = "MIT & BSD-3-Clause & BSD-2-Clause & PD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4d290ce0ac102c828dfc9ce836784688" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3a1b9604afd1648b28b0c6f1709e9f4" DEPENDS = "zlib" RPROVIDES_${PN} = "ssh sshd" diff --git a/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch b/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch index 71a4666b5c..dc9d5782e8 100644 --- a/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch +++ b/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch @@ -13,7 +13,7 @@ index 7d06322..71a21c2 100644 /* The command to invoke for xauth when using X11 forwarding. * "-q" for quiet */ #ifndef XAUTH_COMMAND --#define XAUTH_COMMAND "/usr/bin/X11/xauth -q" +-#define XAUTH_COMMAND "/usr/bin/xauth -q" +#define XAUTH_COMMAND "xauth -q" #endif diff --git a/meta/recipes-core/dropbear/dropbear_2014.63.bb b/meta/recipes-core/dropbear/dropbear_2014.63.bb deleted file mode 100644 index bb7e6178bc..0000000000 --- a/meta/recipes-core/dropbear/dropbear_2014.63.bb +++ /dev/null @@ -1,4 +0,0 @@ -require dropbear.inc - -SRC_URI[md5sum] = "7066bb9a2da708f3ed06314fdc9c47fd" -SRC_URI[sha256sum] = "595992de432ba586a0e7e191bbb1ad587727678bb3e345b018c395b8c55b57ae" diff --git a/meta/recipes-core/dropbear/dropbear_2014.66.bb b/meta/recipes-core/dropbear/dropbear_2014.66.bb new file mode 100644 index 0000000000..8931eb75b2 --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear_2014.66.bb @@ -0,0 +1,4 @@ +require dropbear.inc + +SRC_URI[md5sum] = "c21a01111aa5015db038c6efdb85717d" +SRC_URI[sha256sum] = "ab3fe2670a517cc0bbe398ff5d15e9ca12cd14f2fc18930a8111ae2baa64ab76" diff --git a/meta/recipes-core/feed-config/poky-feed-config-opkg_1.0.bb b/meta/recipes-core/feed-config/poky-feed-config-opkg_1.0.bb deleted file mode 100644 index fb312f8151..0000000000 --- a/meta/recipes-core/feed-config/poky-feed-config-opkg_1.0.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Poky example feed configuration" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r2" -PACKAGE_ARCH = "${MACHINE_ARCH}" -INHIBIT_DEFAULT_DEPS = "1" - -#FEEDNAMEPREFIX ?= "INVALID" -#FEEDURIPREFIX ?= "INVALID" - -do_compile() { - mkdir -p ${S}/${sysconfdir}/opkg/ - - archconf=${S}/${sysconfdir}/opkg/arch.conf - - rm -f $archconf - ipkgarchs="${ALL_MULTILIB_PACKAGE_ARCHS}" - priority=1 - for arch in $ipkgarchs; do - echo "arch $arch $priority" >> $archconf - priority=$(expr $priority + 5) - done - - basefeedconf=${S}/${sysconfdir}/opkg/base-feeds.conf - - rm -f $basefeedconf - touch $basefeedconf - - #for arch in $ipkgarchs; do - # echo "src/gz ${FEEDNAMEPREFIX}-$arch http://pokylinux.org/${FEEDURIPREFIX}$arch" >> $basefeedconf - #done -} - - -do_install () { - install -d ${D}${sysconfdir}/opkg - install -m 0644 ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/ -} - -FILES_${PN} = "${sysconfdir}/opkg/ " - -CONFFILES_${PN} += "${sysconfdir}/opkg/base-feeds.conf \ - ${sysconfdir}/opkg/arch.conf" - diff --git a/meta/recipes-core/gettext/gettext-0.18.3.2/parallel.patch b/meta/recipes-core/gettext/gettext-0.19.4/parallel.patch index f2c567d188..c8e2c94af0 100644 --- a/meta/recipes-core/gettext/gettext-0.18.3.2/parallel.patch +++ b/meta/recipes-core/gettext/gettext-0.19.4/parallel.patch @@ -21,16 +21,3 @@ Signed-off-by: Joe Slater <jslater@windriver.com> # Which classes to export from the shared library. MOOPPFLAGS += --dllexport=styled_ostream ---- a/gettext-tools/src/Makefile.am -+++ b/gettext-tools/src/Makefile.am -@@ -229,8 +229,8 @@ libgettextsrc_la_LDFLAGS += -Wl,--export - endif - - # No need to install libgettextsrc.a, except on AIX. --install-exec-local: install-libLTLIBRARIES install-exec-clean --install-exec-clean: -+install-exec-local: install-exec-clean -+install-exec-clean: install-libLTLIBRARIES - case "@host_os@" in \ - aix*) ;; \ - *) $(RM) $(DESTDIR)$(libdir)/libgettextsrc.a ;; \ diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/Makevars.template b/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/Makevars.template deleted file mode 100644 index 4a9ff7d231..0000000000 --- a/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/Makevars.template +++ /dev/null @@ -1,53 +0,0 @@ -# Makefile variables for PO directory in any package using GNU gettext. - -# Usually the message domain is the same as the package name. -DOMAIN = $(PACKAGE) - -# These two variables depend on the location of this directory. -subdir = po -top_builddir = .. - -# These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ - -# This is the copyright holder that gets inserted into the header of the -# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding -# package. (Note that the msgstr strings, extracted from the package's -# sources, belong to the copyright holder of the package.) Translators are -# expected to transfer the copyright for their translations to this person -# or entity, or to disclaim their copyright. The empty string stands for -# the public domain; in this case the translators are expected to disclaim -# their copyright. -COPYRIGHT_HOLDER = Free Software Foundation, Inc. - -# This is the email address or URL to which the translators shall report -# bugs in the untranslated strings: -# - Strings which are not entire sentences, see the maintainer guidelines -# in the GNU gettext documentation, section 'Preparing Strings'. -# - Strings which use unclear terms or require additional context to be -# understood. -# - Strings which make invalid assumptions about notation of date, time or -# money. -# - Pluralisation problems. -# - Incorrect English spelling. -# - Incorrect formatting. -# It can be your email address, or a mailing list address where translators -# can write to without being subscribed, or the URL of a web page through -# which the translators can contact you. -MSGID_BUGS_ADDRESS = - -# This is the list of locale categories, beyond LC_MESSAGES, for which the -# message catalogs shall be used. It is usually empty. -EXTRA_LOCALE_CATEGORIES = - -# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' -# context. Possible values are "yes" and "no". Set this to yes if the -# package uses functions taking also a message context, like pgettext(), or -# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. -USE_MSGCTXT = no - -# These options get passed to msgmerge. -# Useful options are in particular: -# --previous to keep previous msgids of translated messages, -# --quiet to reduce the verbosity. -MSGMERGE_OPTIONS = diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/aclocal.tgz b/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/aclocal.tgz Binary files differdeleted file mode 100644 index e0335a3d1c..0000000000 --- a/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/aclocal.tgz +++ /dev/null diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/iconv-m4-remove-the-test-to-convert-euc-jp.patch b/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/iconv-m4-remove-the-test-to-convert-euc-jp.patch deleted file mode 100644 index d453a74b51..0000000000 --- a/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/iconv-m4-remove-the-test-to-convert-euc-jp.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0bfade685783ccd193b2e1b94d0e4ef5ce449432 Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Wed, 20 Nov 2013 17:52:50 +0800 -Subject: [PATCH] remove the test to convert euc-jp - -Remove the test "Test against HP-UX 11.11 bug: -No converter from EUC-JP to UTF-8 is provided" -since we don't support HP-UX and it causes -guile-native compile failure if the euc-jp is not -installed on the host - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - iconv.m4 | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/iconv.m4 b/iconv.m4 -index a503646..dbe7ca1 100644 ---- a/iconv.m4 -+++ b/iconv.m4 -@@ -159,17 +159,6 @@ int main () - } - } - #endif -- /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is -- provided. */ -- if (/* Try standardized names. */ -- iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) -- /* Try IRIX, OSF/1 names. */ -- && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) -- /* Try AIX names. */ -- && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) -- /* Try HP-UX names. */ -- && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) -- result |= 16; - return result; - }]])], - [am_cv_func_iconv_works=yes], --- -1.8.3 - diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/COPYING b/meta/recipes-core/gettext/gettext-minimal-0.19.4/COPYING index 3485c5a2cb..8d11d1d8e9 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/COPYING +++ b/meta/recipes-core/gettext/gettext-minimal-0.19.4/COPYING @@ -1,4 +1,4 @@ -dnl Copyright (C) 1997-2010 Free Software Foundation, Inc. +dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/Makefile.in.in b/meta/recipes-core/gettext/gettext-minimal-0.19.4/Makefile.in.in index fabdc76c9c..65184f65c7 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/Makefile.in.in +++ b/meta/recipes-core/gettext/gettext-minimal-0.19.4/Makefile.in.in @@ -8,8 +8,8 @@ # Please note that the actual code of GNU gettext is covered by the GNU # General Public License and is *not* in the public domain. # -# Origin: gettext-0.18.3 -GETTEXT_MACRO_VERSION = 0.18 +# Origin: gettext-0.19 +GETTEXT_MACRO_VERSION = 0.19 PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -77,6 +77,16 @@ POTFILES = \ CATALOGS = @CATALOGS@ +POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot +POFILESDEPS_yes = $(POFILESDEPS_) +POFILESDEPS_no = +POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT)) + +DISTFILESDEPS_ = update-po +DISTFILESDEPS_yes = $(DISTFILESDEPS_) +DISTFILESDEPS_no = +DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO)) + # Makevars gets inserted here. (Don't remove this line!) .SUFFIXES: @@ -143,15 +153,25 @@ stamp-po: $(srcdir)/$(DOMAIN).pot # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed - if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ - LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \ - else \ - LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ - fi; \ - } | grep -v 'libtool:' >/dev/null; then \ - package_gnu='GNU '; \ + package_gnu="$(PACKAGE_GNU)"; \ + test -n "$$package_gnu" || { \ + if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ + LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \ + -size -10000000c -exec grep 'GNU @PACKAGE@' \ + /dev/null '{}' ';' 2>/dev/null; \ + else \ + LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ + fi; \ + } | grep -v 'libtool:' >/dev/null; then \ + package_gnu=yes; \ + else \ + package_gnu=no; \ + fi; \ + }; \ + if test "$$package_gnu" = "yes"; then \ + package_prefix='GNU '; \ else \ - package_gnu=''; \ + package_prefix=''; \ fi; \ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ @@ -171,7 +191,7 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ - --package-name="$${package_gnu}@PACKAGE@" \ + --package-name="$${package_prefix}@PACKAGE@" \ --package-version='@VERSION@' \ --msgid-bugs-address="$$msgid_bugs_address" \ ;; \ @@ -199,9 +219,10 @@ $(srcdir)/$(DOMAIN).pot: # This target rebuilds a PO file if $(DOMAIN).pot has changed. # Note that a PO file is not touched if it doesn't need to be changed. -$(POFILES): $(srcdir)/$(DOMAIN).pot +$(POFILES): $(POFILESDEPS) @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ + test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ cd $(srcdir) \ @@ -362,7 +383,7 @@ maintainer-clean: distclean distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: - $(MAKE) update-po + test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS) @$(MAKE) dist2 # This is a separate target because 'update-po' must be executed before. dist2: stamp-po $(DISTFILES) diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.4/aclocal.tgz b/meta/recipes-core/gettext/gettext-minimal-0.19.4/aclocal.tgz Binary files differnew file mode 100644 index 0000000000..b04ba55032 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-minimal-0.19.4/aclocal.tgz diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/config.rpath b/meta/recipes-core/gettext/gettext-minimal-0.19.4/config.rpath index c38b914d6b..b625621fac 100755 --- a/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/config.rpath +++ b/meta/recipes-core/gettext/gettext-minimal-0.19.4/config.rpath @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2013 Free Software Foundation, Inc. +# Copyright 1996-2014 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # @@ -367,11 +367,7 @@ else dgux*) hardcode_libdir_flag_spec='-L$libdir' ;; - freebsd2.2*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - freebsd2*) + freebsd2.[01]*) hardcode_direct=yes hardcode_minus_L=yes ;; @@ -548,13 +544,11 @@ case "$host_os" in dgux*) library_names_spec='$libname$shrext' ;; + freebsd[23].*) + library_names_spec='$libname$shrext$versuffix' + ;; freebsd* | dragonfly*) - case "$host_os" in - freebsd[123]*) - library_names_spec='$libname$shrext$versuffix' ;; - *) - library_names_spec='$libname$shrext' ;; - esac + library_names_spec='$libname$shrext' ;; gnu*) library_names_spec='$libname$shrext' diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/remove-potcdate.sin b/meta/recipes-core/gettext/gettext-minimal-0.19.4/remove-potcdate.sin index 2436c49e78..2436c49e78 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/remove-potcdate.sin +++ b/meta/recipes-core/gettext/gettext-minimal-0.19.4/remove-potcdate.sin diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.18.3.2.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb index 2b43b97022..ca97315a85 100644 --- a/meta/recipes-core/gettext/gettext-minimal-native_0.18.3.2.bb +++ b/meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb @@ -8,14 +8,13 @@ SRC_URI = "file://aclocal.tgz \ file://Makefile.in.in \ file://remove-potcdate.sin \ file://COPYING \ - file://iconv-m4-remove-the-test-to-convert-euc-jp.patch \ " INHIBIT_DEFAULT_DEPS = "1" INHIBIT_AUTOTOOLS_DEPS = "1" LICENSE = "FSF-Unlimited" -LIC_FILES_CHKSUM = "file://COPYING;md5=0854da868a929923087141d9d7aba7d5" +LIC_FILES_CHKSUM = "file://COPYING;md5=1b20675cd5158442f6007d022f46b35b" inherit native diff --git a/meta/recipes-core/gettext/gettext_0.18.3.2.bb b/meta/recipes-core/gettext/gettext_0.19.4.bb index 65d4103a97..cebf6c78c6 100644 --- a/meta/recipes-core/gettext/gettext_0.18.3.2.bb +++ b/meta/recipes-core/gettext/gettext_0.19.4.bb @@ -18,8 +18,8 @@ PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,-- LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread " -SRC_URI[md5sum] = "241aba309d07aa428252c74b40a818ef" -SRC_URI[sha256sum] = "d1a4e452d60eb407ab0305976529a45c18124bd518d976971ac6dc7aa8b4c5d7" +SRC_URI[md5sum] = "d3511af1e604a3478900d2c2b4a4a48e" +SRC_URI[sha256sum] = "8ac9f1ed1a5f8c4e656a2f37f5ba6b9ee04c4df79a575e876b0b6946aa417f3f" inherit autotools texinfo diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.42.1.bb index 4b1bcf85c5..69b3ef8e37 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.42.1.bb @@ -18,5 +18,5 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" -SRC_URI[md5sum] = "05fb7cb17eacbc718e90366a1eae60d9" -SRC_URI[sha256sum] = "0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5" +SRC_URI[md5sum] = "89c4119e50e767d3532158605ee9121a" +SRC_URI[sha256sum] = "8f3f0865280e45b8ce840e176ef83bcfd511148918cc8d39df2ee89b67dcf89a" diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 2d81afc8f2..072f790111 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -1,5 +1,7 @@ SUMMARY = "A general-purpose utility library" DESCRIPTION = "GLib is a general-purpose utility library, which provides many useful data types, macros, type conversions, string utilities, file utilities, a main loop abstraction, and so on." +HOMEPAGE = "https://developer.gnome.org/glib/" + # pcre is under BSD; # docs/reference/COPYING is with a 'public domai'-like license! LICENSE = "LGPLv2+ & BSD & PD" diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.20.bb b/meta/recipes-core/glibc/cross-localedef-native_2.21.bb index ccf56a9415..4e15f02140 100644 --- a/meta/recipes-core/glibc/cross-localedef-native_2.20.bb +++ b/meta/recipes-core/glibc/cross-localedef-native_2.21.bb @@ -14,11 +14,11 @@ inherit autotools FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:" -PV = "2.20" +BRANCH = "release/${PV}/master" -SRC_URI = "git://sourceware.org/git/glibc.git;branch=release/${PV}/master;name=glibc \ +SRC_URI = "git://sourceware.org/git/glibc.git;branch=${BRANCH};name=glibc \ git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \ - file://fix_for_centos_5.8.patch \ + file://fix_for_centos_5.8.patch \ ${EGLIBCPATCHES} \ " EGLIBCPATCHES = "\ @@ -33,13 +33,17 @@ EGLIBCPATCHES = "\ file://eglibc-use-option-groups.patch \ " -SRCREV_glibc = "b8079dd0d360648e4e8de48656c5c38972621072" +SRCREV_glibc = "4e42b5b8f89f0e288e68be7ad70f9525aebc2cff" SRCREV_localedef = "c833367348d39dad7ba018990bfdaffaec8e9ed3" +# Makes for a rather long rev (22 characters), but... +# +SRCREV_FORMAT = "glibc_localedef" + S = "${WORKDIR}/git" EXTRA_OECONF = "--with-glibc=${S}" -CFLAGS += "-DNOT_IN_libc=1" +CFLAGS += "-fgnu89-inline -std=gnu99 -DIS_IN\(x\)='0'" do_configure () { ${S}/localedef/configure ${EXTRA_OECONF} @@ -47,6 +51,6 @@ do_configure () { do_install() { - install -d ${D}${bindir} + install -d ${D}${bindir} install -m 0755 ${B}/localedef ${D}${bindir}/cross-localedef } diff --git a/meta/recipes-core/glibc/glibc-collateral.inc b/meta/recipes-core/glibc/glibc-collateral.inc index 85e06da816..f82db06cb9 100644 --- a/meta/recipes-core/glibc/glibc-collateral.inc +++ b/meta/recipes-core/glibc/glibc-collateral.inc @@ -1,7 +1,14 @@ INHIBIT_DEFAULT_DEPS = "1" LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ + file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" HOMEPAGE = "http://www.gnu.org/software/libc/index.html" +# This needs to match with glibc.inc, otherwise glibc-scripts and glibc-locale +# will fail to find main glibc, for details see +# http://lists.openembedded.org/pipermail/openembedded-core/2015-January/100679.html +ARM_INSTRUCTION_SET = "arm" + do_fetch[noexec] = "1" do_unpack[noexec] = "1" do_patch[noexec] = "1" diff --git a/meta/recipes-core/glibc/glibc-initial_2.20.bb b/meta/recipes-core/glibc/glibc-initial_2.21.bb index 8ab01dc79d..8ab01dc79d 100644 --- a/meta/recipes-core/glibc/glibc-initial_2.20.bb +++ b/meta/recipes-core/glibc/glibc-initial_2.21.bb diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc index d472605842..df6d073436 100644 --- a/meta/recipes-core/glibc/glibc-locale.inc +++ b/meta/recipes-core/glibc/glibc-locale.inc @@ -23,7 +23,7 @@ ENABLE_BINARY_LOCALE_GENERATION_pn-nativesdk-glibc-locale = "0" #enable locale generation on these arches # BINARY_LOCALE_ARCHES is a space separated list of regular expressions -BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips mips64" +BINARY_LOCALE_ARCHES ?= "arm.* aarch64 i[3-6]86 x86_64 powerpc mips mips64" # set "1" to use cross-localedef for locale generation # set "0" for qemu emulation of native localedef for locale generation diff --git a/meta/recipes-core/glibc/glibc-locale_2.20.bb b/meta/recipes-core/glibc/glibc-locale_2.21.bb index f7702e0358..f7702e0358 100644 --- a/meta/recipes-core/glibc/glibc-locale_2.20.bb +++ b/meta/recipes-core/glibc/glibc-locale_2.21.bb diff --git a/meta/recipes-core/glibc/glibc-mtrace_2.20.bb b/meta/recipes-core/glibc/glibc-mtrace_2.21.bb index 0b69bad46a..0b69bad46a 100644 --- a/meta/recipes-core/glibc/glibc-mtrace_2.20.bb +++ b/meta/recipes-core/glibc/glibc-mtrace_2.21.bb diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 6212e5b38e..984362e3ce 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -32,6 +32,8 @@ RPROVIDES_glibc-thread-db = "eglibc-thread-db" RPROVIDES_${PN}-pcprofile = "eglibc-pcprofile" RPROVIDES_${PN}-dbg = "eglibc-dbg" libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" +libc_baselibs_append_aarch64 = " /lib/ld-linux-aarch64*.so.1" +INSANE_SKIP_glibc_append_aarch64 = " libdir" FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}" FILES_ldd = "${bindir}/ldd" @@ -103,6 +105,20 @@ do_install_append () { fi } +do_install_append_aarch64 () { + if [ "${base_libdir}" != "/lib" ] ; then + # The aarch64 ABI says the dynamic linker -must- be /lib/ld-linux-aarch64[_be].so.1 + install -d ${D}/lib + if [ -e ${D}${base_libdir}/ld-linux-aarch64.so.1 ]; then + ln -s ${@base_path_relative('/lib', '${base_libdir}')}/ld-linux-aarch64.so.1 \ + ${D}/lib/ld-linux-aarch64.so.1 + elif [ -e ${D}${base_libdir}/ld-linux-aarch64_be.so.1 ]; then + ln -s ${@base_path_relative('/lib', '${base_libdir}')}/ld-linux-aarch64_be.so.1 \ + ${D}/lib/ld-linux-aarch64_be.so.1 + fi + fi +} + do_install_locale () { dest=${D}/${includedir}/glibc-locale-internal-${MULTIMACH_TARGET_SYS} install -d ${dest}${base_libdir} ${dest}${bindir} ${dest}${libdir} ${dest}${datadir} diff --git a/meta/recipes-core/glibc/glibc-scripts_2.20.bb b/meta/recipes-core/glibc/glibc-scripts_2.21.bb index 5a89bd8022..5a89bd8022 100644 --- a/meta/recipes-core/glibc/glibc-scripts_2.20.bb +++ b/meta/recipes-core/glibc/glibc-scripts_2.21.bb diff --git a/meta/recipes-core/glibc/glibc-testing.inc b/meta/recipes-core/glibc/glibc-testing.inc index ec16fe1fde..fd1af39922 100644 --- a/meta/recipes-core/glibc/glibc-testing.inc +++ b/meta/recipes-core/glibc/glibc-testing.inc @@ -65,9 +65,26 @@ then fi echo "# we test using cross compiler from real sysroot therefore override the" > ${B}/configparms echo "# definitions that come from ${B}/config.make" >> ${B}/configparms - fgrep tcbootstrap ${B}/config.make > ${B}/configparms sed -i -e "s/\-tcbootstrap//g" ${B}/configparms + +# g++ uses flag -nostdinc, so the locations of system include headers must be explicitly specified +# If the locations are not already specified in config.make, then we provide the following locations: +# <sysroot>/usr/include/c++/<g++ version> +# <sysroot>/usr/include/c++/<g++ version>/<machine> + +cxxincludes=\`cat ${B}/config.make | gawk '\$1 == "c++-sysincludes"' | gawk -F"=" '{print \$2}' | sed "s/[ \t]\?//g"\` + +if [ -z "\$cxxincludes" ]; then + sysroot=\`cat ${B}/configparms | sed -n "/CXX/p" | sed -e "s/^.*--sysroot=//"\` + cxx=\`cat ${B}/configparms | gawk '\$1 ~ /^CXX/' | gawk -F"=" '{print \$2}' | gawk '{print \$1}'\` + cxxmachine=\`\$cxx -dumpmachine\` + cxxversion=\`\$cxx -dumpversion\` + # pass the new value of c++-sysincludes via configparms + echo "# c++-sysincludes added:" >> ${B}/configparms + echo "c++-sysincludes = -isystem \$sysroot/usr/include/c++/\$cxxversion -isystem \$sysroot/usr/include/c++/\$cxxversion/\$cxxmachine" >> ${B}/configparms +fi + wrapper="${S}/scripts/cross-test-ssh.sh \$target" localedef="${STAGING_BINDIR_NATIVE}/cross-localedef --little-endian --uint32-align=4" make tests-clean diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index 8aa78dfb34..da56bc90a1 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc @@ -15,12 +15,15 @@ def get_optimization(d): if bb.utils.contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x": bb.note("glibc can't be built with -O0, -O2 will be used instead.") return selected_optimization.replace("-O0", "-O2") + elif bb.utils.contains("SELECTED_OPTIMIZATION", "-Os", "x", "", d) == "x": + bb.note("glibc can't be built with -Os, -Os -Wno-error will be used instead.") + return selected_optimization.replace("-Os", "-Os -Wno-error") return selected_optimization SELECTED_OPTIMIZATION := "${@get_optimization(d)}" # siteconfig.bbclass runs configure which needs a working compiler -# For the compiler to work we need a working libc yet libc isn't +# For the compiler to work we need a working libc yet libc isn't # in the sysroots directory at this point. This means the libc.so # linker script won't work as the --sysroot setting isn't correct. # Here we create a hacked up libc linker script and pass in the right @@ -61,6 +64,9 @@ GLIBC_EXTRA_OECONF ?= "" GLIBC_EXTRA_OECONF_class-nativesdk = "" INHIBIT_DEFAULT_DEPS = "1" +# This needs to match with glibc-collateral.inc, otherwise glibc-scripts and glibc-locale +# will fail to find main glibc, for details see +# http://lists.openembedded.org/pipermail/openembedded-core/2015-January/100679.html ARM_INSTRUCTION_SET = "arm" # glibc uses PARALLELMFLAGS variable to pass parallel build info so transfer @@ -71,7 +77,7 @@ EXTRA_OEMAKE += "${EGLIBCPARALLELISM}" PARALLEL_MAKE = "" # glibc make-syscalls.sh has a number of issues with /bin/dash and -# it's output which make calls via the SHELL also has issues, so +# it's output which make calls via the SHELL also has issues, so # ensure make uses /bin/bash EXTRA_OEMAKE += "SHELL=/bin/bash" @@ -82,7 +88,7 @@ do_configure_prepend() { } do_configure_append() { - oe_runmake config + yes '' | oe_runmake config # Remove quotation marks from OPTION_EGLIBC_NSSWITCH_FIXED_*. This will # avoid install error. diff --git a/meta/recipes-core/glibc/glibc/0001-Add-unused-attribute.patch b/meta/recipes-core/glibc/glibc/0001-Add-unused-attribute.patch new file mode 100644 index 0000000000..f51a0ccb22 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/0001-Add-unused-attribute.patch @@ -0,0 +1,36 @@ +2015-02-18 Khem Raj <raj.khem@gmail.com>> + + * iconv/gconv_charset.h (strip): + Add unused attribute. + +From 9c4a91cb331ff1e8cde2314dadee74559d8cb0dd Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 18 Feb 2015 19:45:31 +0000 +Subject: [PATCH] Add unused attribute + +Helps in avoiding gcc warning when header is is included in +a source file which does not use both functions + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Pending +--- + iconv/gconv_charset.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/iconv/gconv_charset.h b/iconv/gconv_charset.h +index 80290bc..7890a8e 100644 +--- a/iconv/gconv_charset.h ++++ b/iconv/gconv_charset.h +@@ -21,7 +21,7 @@ + #include <locale.h> + + +-static void ++static void __attribute__ ((unused)) + strip (char *wp, const char *s) + { + int slash_count = 0; +-- +2.1.4 + diff --git a/meta/recipes-core/glibc/glibc/0001-When-disabling-SSE-also-make-sure-that-fpmath-is-not.patch b/meta/recipes-core/glibc/glibc/0001-When-disabling-SSE-also-make-sure-that-fpmath-is-not.patch new file mode 100644 index 0000000000..a6395b77bc --- /dev/null +++ b/meta/recipes-core/glibc/glibc/0001-When-disabling-SSE-also-make-sure-that-fpmath-is-not.patch @@ -0,0 +1,32 @@ +From 6f5639f6405ff9a42e4f71e7b0f18bddb68d992a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 19 Feb 2015 03:23:45 +0000 +Subject: [PATCH] When disabling SSE also make sure that fpmath is not set to + use SSE as well + +This fixes errors when we inject sse options through CFLAGS and now +that we have -Werror turned on by default this warning turns to become +error on x86 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Pending +--- + sysdeps/x86/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile +index 19f5eca..827ea71 100644 +--- a/sysdeps/x86/Makefile ++++ b/sysdeps/x86/Makefile +@@ -1,6 +1,6 @@ + ifeq ($(subdir),elf) + CFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\ +- -mno-sse -mno-mmx) ++ -mno-sse -mno-mmx -mfpmath=387) + + tests-special += $(objpfx)tst-ld-sse-use.out + $(objpfx)tst-ld-sse-use.out: ../sysdeps/x86/tst-ld-sse-use.sh $(objpfx)ld.so +-- +2.1.4 + diff --git a/meta/recipes-core/glibc/glibc/0001-yes-within-the-path-sets-wrong-config-variables.patch b/meta/recipes-core/glibc/glibc/0001-yes-within-the-path-sets-wrong-config-variables.patch new file mode 100644 index 0000000000..827e980332 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/0001-yes-within-the-path-sets-wrong-config-variables.patch @@ -0,0 +1,245 @@ +'yes' within the path sets wrong config variables + +It seems that the 'AC_EGREP_CPP(yes...' example is quite popular +but being such a short word to grep it is likely to produce +false-positive matches with the path it is configured into. + +The change is to use a more elaborated string to grep for. + +Upstream-Status: Submitted [libc-alpha@sourceware.org] + +Signed-off-by: Benjamin Esquivel <benjamin.esquivel@linux.intel.com> +--- +diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure +index 5bd355a..3bc5537 100644 +--- a/sysdeps/aarch64/configure ++++ b/sysdeps/aarch64/configure +@@ -148,12 +148,12 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __AARCH64EB__ +- yes ++ is_aarch64_be + #endif + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then : ++ $EGREP "is_aarch64_be" >/dev/null 2>&1; then : + libc_cv_aarch64_be=yes + else + libc_cv_aarch64_be=no +diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac +index 7851dd4..6e92381 100644 +--- a/sysdeps/aarch64/configure.ac ++++ b/sysdeps/aarch64/configure.ac +@@ -10,8 +10,8 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. + # the dynamic linker via %ifdef. + AC_CACHE_CHECK([for big endian], + [libc_cv_aarch64_be], +- [AC_EGREP_CPP(yes,[#ifdef __AARCH64EB__ +- yes ++ [AC_EGREP_CPP(is_aarch64_be,[#ifdef __AARCH64EB__ ++ is_aarch64_be + #endif + ], libc_cv_aarch64_be=yes, libc_cv_aarch64_be=no)]) + if test $libc_cv_aarch64_be = yes; then +diff --git a/sysdeps/arm/configure b/sysdeps/arm/configure +index 45667cc..0b2ef11 100644 +--- a/sysdeps/arm/configure ++++ b/sysdeps/arm/configure +@@ -150,12 +150,12 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __ARM_PCS_VFP +- yes ++ use_arm_pcs_vfp + #endif + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then : ++ $EGREP "use_arm_pcs_vfp" >/dev/null 2>&1; then : + libc_cv_arm_pcs_vfp=yes + else + libc_cv_arm_pcs_vfp=no +diff --git a/sysdeps/arm/configure.ac b/sysdeps/arm/configure.ac +index 002b8ef..e1746a7 100644 +--- a/sysdeps/arm/configure.ac ++++ b/sysdeps/arm/configure.ac +@@ -16,8 +16,8 @@ dnl it. Until we do, don't define it. + # the dynamic linker via %ifdef. + AC_CACHE_CHECK([whether the compiler is using the ARM hard-float ABI], + [libc_cv_arm_pcs_vfp], +- [AC_EGREP_CPP(yes,[#ifdef __ARM_PCS_VFP +- yes ++ [AC_EGREP_CPP(use_arm_pcs_vfp,[#ifdef __ARM_PCS_VFP ++ use_arm_pcs_vfp + #endif + ], libc_cv_arm_pcs_vfp=yes, libc_cv_arm_pcs_vfp=no)]) + if test $libc_cv_arm_pcs_vfp = yes; then +diff --git a/sysdeps/mips/configure b/sysdeps/mips/configure +index 4e13248..f14af95 100644 +--- a/sysdeps/mips/configure ++++ b/sysdeps/mips/configure +@@ -143,11 +143,11 @@ else + /* end confdefs.h. */ + dnl + #ifdef __mips_nan2008 +-yes ++use_mips_nan2008 + #endif + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then : ++ $EGREP "use_mips_nan2008" >/dev/null 2>&1; then : + libc_cv_mips_nan2008=yes + else + libc_cv_mips_nan2008=no +diff --git a/sysdeps/mips/configure.ac b/sysdeps/mips/configure.ac +index bcbdaff..ad3057f 100644 +--- a/sysdeps/mips/configure.ac ++++ b/sysdeps/mips/configure.ac +@@ -6,9 +6,9 @@ dnl position independent way. + dnl AC_DEFINE(PI_STATIC_AND_HIDDEN) + + AC_CACHE_CHECK([whether the compiler is using the 2008 NaN encoding], +- libc_cv_mips_nan2008, [AC_EGREP_CPP(yes, [dnl ++ libc_cv_mips_nan2008, [AC_EGREP_CPP(use_mips_nan2008, [dnl + #ifdef __mips_nan2008 +-yes ++use_mips_nan2008 + #endif], libc_cv_mips_nan2008=yes, libc_cv_mips_nan2008=no)]) + if test x$libc_cv_mips_nan2008 = xyes; then + AC_DEFINE(HAVE_MIPS_NAN2008) +diff --git a/sysdeps/nios2/configure b/sysdeps/nios2/configure +index 14c8a3a..dde3814 100644 +--- a/sysdeps/nios2/configure ++++ b/sysdeps/nios2/configure +@@ -142,12 +142,12 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __nios2_big_endian__ +- yes ++ is_nios2_be + #endif + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then : ++ $EGREP "is_nios2_be" >/dev/null 2>&1; then : + libc_cv_nios2_be=yes + else + libc_cv_nios2_be=no +diff --git a/sysdeps/nios2/configure.ac b/sysdeps/nios2/configure.ac +index f05f438..dc86399 100644 +--- a/sysdeps/nios2/configure.ac ++++ b/sysdeps/nios2/configure.ac +@@ -4,8 +4,8 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. + # Nios II big endian is not yet supported. + AC_CACHE_CHECK([for big endian], + [libc_cv_nios2_be], +- [AC_EGREP_CPP(yes,[#ifdef __nios2_big_endian__ +- yes ++ [AC_EGREP_CPP(is_nios2_be,[#ifdef __nios2_big_endian__ ++ is_nios2_be + #endif + ], libc_cv_nios2_be=yes, libc_cv_nios2_be=no)]) + if test $libc_cv_nios2_be = yes; then +diff --git a/sysdeps/unix/sysv/linux/mips/configure b/sysdeps/unix/sysv/linux/mips/configure +index 83f8b13..2b6cbee 100644 +--- a/sysdeps/unix/sysv/linux/mips/configure ++++ b/sysdeps/unix/sysv/linux/mips/configure +@@ -387,11 +387,11 @@ else + /* end confdefs.h. */ + dnl + #ifdef __mips_nan2008 +-yes ++use_mips_nan2008 + #endif + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then : ++ $EGREP "use_mips_nan2008" >/dev/null 2>&1; then : + libc_cv_mips_nan2008=yes + else + libc_cv_mips_nan2008=no +diff --git a/sysdeps/unix/sysv/linux/mips/configure.ac b/sysdeps/unix/sysv/linux/mips/configure.ac +index 5039ec9..1035f76 100644 +--- a/sysdeps/unix/sysv/linux/mips/configure.ac ++++ b/sysdeps/unix/sysv/linux/mips/configure.ac +@@ -98,9 +98,9 @@ AC_COMPILE_IFELSE( + LIBC_CONFIG_VAR([mips-mode-switch],[${libc_mips_mode_switch}]) + + AC_CACHE_CHECK([whether the compiler is using the 2008 NaN encoding], +- libc_cv_mips_nan2008, [AC_EGREP_CPP(yes, [dnl ++ libc_cv_mips_nan2008, [AC_EGREP_CPP(use_mips_nan2008, [dnl + #ifdef __mips_nan2008 +-yes ++use_mips_nan2008 + #endif], libc_cv_mips_nan2008=yes, libc_cv_mips_nan2008=no)]) + + libc_mips_nan= +diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure +index 70bb18a..ffd9e3e 100644 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure +@@ -155,12 +155,12 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #if _CALL_ELF == 2 +- yes ++ use_ppc_elfv2_abi + #endif + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then : ++ $EGREP "use_ppc_elfv2_abi" >/dev/null 2>&1; then : + libc_cv_ppc64_elfv2_abi=yes + else + libc_cv_ppc64_elfv2_abi=no +@@ -188,12 +188,12 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef _CALL_ELF +- yes ++ is_def_call_elf + #endif + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then : ++ $EGREP "is_def_call_elf" >/dev/null 2>&1; then : + libc_cv_ppc64_def_call_elf=yes + else + libc_cv_ppc64_def_call_elf=no +diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac +index 0822915..9a32fdd 100644 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac +@@ -6,8 +6,8 @@ LIBC_SLIBDIR_RTLDDIR([lib64], [lib64]) + # Define default-abi according to compiler flags. + AC_CACHE_CHECK([whether the compiler is using the PowerPC64 ELFv2 ABI], + [libc_cv_ppc64_elfv2_abi], +- [AC_EGREP_CPP(yes,[#if _CALL_ELF == 2 +- yes ++ [AC_EGREP_CPP(use_ppc_elfv2_abi,[#if _CALL_ELF == 2 ++ use_ppc_elfv2_abi + #endif + ], libc_cv_ppc64_elfv2_abi=yes, libc_cv_ppc64_elfv2_abi=no)]) + if test $libc_cv_ppc64_elfv2_abi = yes; then +@@ -19,8 +19,8 @@ else + # Compiler that do not support ELFv2 ABI does not define _CALL_ELF + AC_CACHE_CHECK([whether the compiler defines _CALL_ELF], + [libc_cv_ppc64_def_call_elf], +- [AC_EGREP_CPP(yes,[#ifdef _CALL_ELF +- yes ++ [AC_EGREP_CPP(is_def_call_elf,[#ifdef _CALL_ELF ++ is_def_call_elf + #endif + ], libc_cv_ppc64_def_call_elf=yes, libc_cv_ppc64_def_call_elf=no)]) + if test $libc_cv_ppc64_def_call_elf = no; then +-- +1.8.4.5 + diff --git a/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch b/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch index 7136253c8b..439b4a95f6 100644 --- a/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch +++ b/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch @@ -4,8 +4,8 @@ Upstream-Status: Pending Index: git/argp/argp-fmtstream.c =================================================================== ---- git.orig/argp/argp-fmtstream.c 2014-08-29 20:00:42.976070587 -0700 -+++ git/argp/argp-fmtstream.c 2014-08-29 20:01:15.188070587 -0700 +--- git.orig/argp/argp-fmtstream.c ++++ git/argp/argp-fmtstream.c @@ -42,6 +42,7 @@ #ifdef _LIBC # include <wchar.h> @@ -14,7 +14,7 @@ Index: git/argp/argp-fmtstream.c # define __vsnprintf(s, l, f, a) _IO_vsnprintf (s, l, f, a) #endif -@@ -100,7 +101,11 @@ +@@ -100,7 +101,11 @@ __argp_fmtstream_free (argp_fmtstream_t __argp_fmtstream_update (fs); if (fs->p > fs->buf) { @@ -26,7 +26,7 @@ Index: git/argp/argp-fmtstream.c } free (fs->buf); free (fs); -@@ -145,9 +150,17 @@ +@@ -145,9 +150,17 @@ __argp_fmtstream_update (argp_fmtstream_ size_t i; for (i = 0; i < pad; i++) { @@ -45,7 +45,7 @@ Index: git/argp/argp-fmtstream.c putc_unlocked (' ', fs->stream); } } -@@ -308,9 +321,17 @@ +@@ -308,9 +321,17 @@ __argp_fmtstream_update (argp_fmtstream_ *nl++ = ' '; else for (i = 0; i < fs->wmargin; ++i) @@ -66,9 +66,9 @@ Index: git/argp/argp-fmtstream.c /* Copy the tail of the original buffer into the current buffer Index: git/argp/argp-help.c =================================================================== ---- git.orig/argp/argp-help.c 2014-08-29 20:00:42.976070587 -0700 -+++ git/argp/argp-help.c 2014-08-29 20:01:15.188070587 -0700 -@@ -51,6 +51,7 @@ +--- git.orig/argp/argp-help.c ++++ git/argp/argp-help.c +@@ -51,6 +51,7 @@ char *alloca (); #ifdef _LIBC # include <../libio/libioP.h> # include <wchar.h> @@ -76,7 +76,7 @@ Index: git/argp/argp-help.c #endif #ifndef _ -@@ -1702,7 +1703,7 @@ +@@ -1702,7 +1703,7 @@ char *__argp_basename (char *name) } char * @@ -85,7 +85,7 @@ Index: git/argp/argp-help.c { # if HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME return program_invocation_short_name; -@@ -1873,9 +1874,17 @@ +@@ -1873,9 +1874,17 @@ __argp_failure (const struct argp_state #endif } @@ -106,8 +106,8 @@ Index: git/argp/argp-help.c #if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE) Index: git/argp/argp-namefrob.h =================================================================== ---- git.orig/argp/argp-namefrob.h 2014-08-29 20:00:42.976070587 -0700 -+++ git/argp/argp-namefrob.h 2014-08-29 20:01:15.192070587 -0700 +--- git.orig/argp/argp-namefrob.h ++++ git/argp/argp-namefrob.h @@ -76,10 +76,12 @@ #undef __argp_fmtstream_wmargin #define __argp_fmtstream_wmargin argp_fmtstream_wmargin @@ -123,8 +123,8 @@ Index: git/argp/argp-namefrob.h #undef __flockfile Index: git/argp/Makefile =================================================================== ---- git.orig/argp/Makefile 2014-08-29 20:00:42.976070587 -0700 -+++ git/argp/Makefile 2014-08-29 20:01:15.192070587 -0700 +--- git.orig/argp/Makefile ++++ git/argp/Makefile @@ -18,6 +18,8 @@ # # Makefile for argp. @@ -136,9 +136,9 @@ Index: git/argp/Makefile include ../Makeconfig Index: git/catgets/Makefile =================================================================== ---- git.orig/catgets/Makefile 2014-08-29 20:00:43.008070587 -0700 -+++ git/catgets/Makefile 2014-08-29 20:01:15.192070587 -0700 -@@ -22,20 +22,23 @@ +--- git.orig/catgets/Makefile ++++ git/catgets/Makefile +@@ -22,20 +22,23 @@ subdir := catgets include ../Makeconfig @@ -171,8 +171,8 @@ Index: git/catgets/Makefile # To find xmalloc.c Index: git/crypt/crypt-entry.c =================================================================== ---- git.orig/crypt/crypt-entry.c 2014-08-29 20:00:43.028070587 -0700 -+++ git/crypt/crypt-entry.c 2014-08-29 20:01:15.192070587 -0700 +--- git.orig/crypt/crypt-entry.c ++++ git/crypt/crypt-entry.c @@ -27,6 +27,7 @@ #include <stdio.h> #endif @@ -181,7 +181,7 @@ Index: git/crypt/crypt-entry.c #include <errno.h> #include <fips-private.h> -@@ -76,9 +77,11 @@ +@@ -76,9 +77,11 @@ __crypt_r (key, salt, data) const char *salt; struct crypt_data * __restrict data; { @@ -193,7 +193,7 @@ Index: git/crypt/crypt-entry.c #ifdef _LIBC /* Try to find out whether we have to use MD5 encryption replacement. */ -@@ -105,6 +108,7 @@ +@@ -105,6 +108,7 @@ __crypt_r (key, salt, data) sizeof (struct crypt_data)); #endif @@ -201,7 +201,7 @@ Index: git/crypt/crypt-entry.c /* * Hack DES tables according to salt */ -@@ -144,6 +148,10 @@ +@@ -144,6 +148,10 @@ __crypt_r (key, salt, data) */ _ufc_output_conversion_r (res[0], res[1], salt, data); return data->crypt_3_buf; @@ -212,7 +212,7 @@ Index: git/crypt/crypt-entry.c } weak_alias (__crypt_r, crypt_r) -@@ -168,7 +176,12 @@ +@@ -168,7 +176,12 @@ crypt (key, salt) return __sha512_crypt (key, salt); #endif @@ -227,8 +227,8 @@ Index: git/crypt/crypt-entry.c Index: git/crypt/Makefile =================================================================== ---- git.orig/crypt/Makefile 2014-08-29 20:00:43.024070587 -0700 -+++ git/crypt/Makefile 2014-08-29 20:01:15.192070587 -0700 +--- git.orig/crypt/Makefile ++++ git/crypt/Makefile @@ -18,21 +18,25 @@ # # Sub-makefile for crypt() portion of the library. @@ -261,7 +261,7 @@ Index: git/crypt/Makefile routines += $(libcrypt-routines) endif -@@ -44,7 +48,7 @@ +@@ -44,7 +48,7 @@ LDLIBS-crypt.so = -lfreebl3 else libcrypt-routines += md5 sha256 sha512 @@ -270,7 +270,7 @@ Index: git/crypt/Makefile # The test md5test-giant uses up to 400 MB of RSS and runs on a fast # machine over a minute. -@@ -64,8 +68,10 @@ +@@ -64,8 +68,10 @@ $(objpfx)sha256test: $(patsubst %, $(obj $(objpfx)sha512test: $(patsubst %, $(objpfx)%.o,$(sha512-routines)) endif @@ -283,8 +283,8 @@ Index: git/crypt/Makefile +endif # eglibc: OPTION_EGLIBC_CRYPT Index: git/csu/Makefile =================================================================== ---- git.orig/csu/Makefile 2014-08-29 20:00:43.032070587 -0700 -+++ git/csu/Makefile 2014-08-29 20:01:15.192070587 -0700 +--- git.orig/csu/Makefile ++++ git/csu/Makefile @@ -22,6 +22,8 @@ # crtn.o, special "initializer" and "finalizer" files used in the link # to make the .init and .fini sections work right. @@ -296,8 +296,8 @@ Index: git/csu/Makefile include ../Makeconfig Index: git/debug/Makefile =================================================================== ---- git.orig/debug/Makefile 2014-08-29 20:00:43.036070587 -0700 -+++ git/debug/Makefile 2014-08-29 20:01:15.192070587 -0700 +--- git.orig/debug/Makefile ++++ git/debug/Makefile @@ -18,6 +18,8 @@ # # Sub-makefile for debug portion of the library. @@ -307,7 +307,7 @@ Index: git/debug/Makefile subdir := debug include ../Makeconfig -@@ -27,7 +29,7 @@ +@@ -27,7 +29,7 @@ headers := execinfo.h # Note that ptsname_r_chk and getlogin_r are not here, but in # login/Makefile instead. If that subdir is omitted from the # build, its _FORTIFY_SOURCE support will be too. @@ -316,7 +316,7 @@ Index: git/debug/Makefile memcpy_chk memmove_chk mempcpy_chk memset_chk stpcpy_chk \ strcat_chk strcpy_chk strncat_chk strncpy_chk stpncpy_chk \ sprintf_chk vsprintf_chk snprintf_chk vsnprintf_chk \ -@@ -36,20 +38,27 @@ +@@ -36,20 +38,27 @@ routines = backtrace backtracesyms back read_chk pread_chk pread64_chk recv_chk recvfrom_chk \ readlink_chk readlinkat_chk getwd_chk getcwd_chk \ realpath_chk fread_chk fread_u_chk \ @@ -352,7 +352,7 @@ Index: git/debug/Makefile static-only-routines := warning-nop stack_chk_fail_local CFLAGS-backtrace.c = -fno-omit-frame-pointer -@@ -129,11 +138,15 @@ +@@ -131,11 +140,15 @@ LDFLAGS-tst-backtrace4 = -rdynamic LDFLAGS-tst-backtrace5 = -rdynamic LDFLAGS-tst-backtrace6 = -rdynamic @@ -371,12 +371,12 @@ Index: git/debug/Makefile +tests += tst-chk4 tst-chk5 tst-chk6 tst-lfschk4 tst-lfschk5 tst-lfschk6 +endif - tests-ifunc := $(stpcpy_chk strcpy_chk:%=test-%-ifunc) - tests += $(tests-ifunc) + extra-libs = libSegFault libpcprofile + extra-libs-others = $(extra-libs) Index: git/debug/segfault.c =================================================================== ---- git.orig/debug/segfault.c 2014-08-29 20:00:46.280070587 -0700 -+++ git/debug/segfault.c 2014-08-29 20:01:15.192070587 -0700 +--- git.orig/debug/segfault.c ++++ git/debug/segfault.c @@ -30,6 +30,7 @@ #include <unistd.h> #include <_itoa.h> @@ -385,7 +385,24 @@ Index: git/debug/segfault.c /* This file defines macros to access the content of the sigcontext element passed up by the signal handler. */ -@@ -91,6 +92,7 @@ +@@ -68,11 +69,13 @@ write_strsignal (int fd, int signal) + static void + catch_segfault (int signal, SIGCONTEXT ctx) + { +- int fd, cnt, i; +- void **arr; ++ int fd; + struct sigaction sa; ++#if __OPTION_EGLIBC_BACKTRACE ++ int cnt, i; ++ void **arr; + uintptr_t pc; +- ++#endif + /* This is the name of the file we are writing to. If none is given + or we cannot write to this file write to stderr. */ + fd = 2; +@@ -91,6 +94,7 @@ catch_segfault (int signal, SIGCONTEXT c REGISTER_DUMP; #endif @@ -393,7 +410,7 @@ Index: git/debug/segfault.c WRITE_STRING ("\nBacktrace:\n"); /* Get the backtrace. */ -@@ -113,6 +115,7 @@ +@@ -113,6 +117,7 @@ catch_segfault (int signal, SIGCONTEXT c /* Now generate nicely formatted output. */ __backtrace_symbols_fd (arr + i, cnt - i, fd); @@ -403,8 +420,8 @@ Index: git/debug/segfault.c /* Now the link map. */ Index: git/debug/tst-chk1.c =================================================================== ---- git.orig/debug/tst-chk1.c 2014-08-29 20:00:46.288070587 -0700 -+++ git/debug/tst-chk1.c 2014-08-29 20:01:15.192070587 -0700 +--- git.orig/debug/tst-chk1.c ++++ git/debug/tst-chk1.c @@ -31,6 +31,7 @@ #include <sys/select.h> #include <sys/socket.h> @@ -413,7 +430,7 @@ Index: git/debug/tst-chk1.c #define obstack_chunk_alloc malloc -@@ -307,6 +308,7 @@ +@@ -307,6 +308,7 @@ do_test (void) snprintf (buf + 8, l0 + 3, "%d", num2); CHK_FAIL_END @@ -421,7 +438,7 @@ Index: git/debug/tst-chk1.c CHK_FAIL_START swprintf (wbuf + 8, 3, L"%d", num1); CHK_FAIL_END -@@ -314,6 +316,7 @@ +@@ -314,6 +316,7 @@ do_test (void) CHK_FAIL_START swprintf (wbuf + 8, l0 + 3, L"%d", num1); CHK_FAIL_END @@ -429,7 +446,7 @@ Index: git/debug/tst-chk1.c # endif memcpy (buf, str1 + 2, l0 + 9); -@@ -381,6 +384,7 @@ +@@ -381,6 +384,7 @@ do_test (void) CHK_FAIL_END #endif @@ -437,7 +454,7 @@ Index: git/debug/tst-chk1.c /* These ops can be done without runtime checking of object size. */ wmemcpy (wbuf, L"abcdefghij", 10); -@@ -605,6 +609,7 @@ +@@ -605,6 +609,7 @@ do_test (void) CHK_FAIL_END #endif @@ -445,7 +462,7 @@ Index: git/debug/tst-chk1.c /* Now checks for %n protection. */ -@@ -1192,6 +1197,7 @@ +@@ -1192,6 +1197,7 @@ do_test (void) # endif #endif @@ -453,7 +470,7 @@ Index: git/debug/tst-chk1.c if (setlocale (LC_ALL, "de_DE.UTF-8") != NULL) { assert (MB_CUR_MAX <= 10); -@@ -1348,6 +1354,7 @@ +@@ -1348,6 +1354,7 @@ do_test (void) puts ("cannot set locale"); ret = 1; } @@ -463,8 +480,8 @@ Index: git/debug/tst-chk1.c if (fd != -1) Index: git/dlfcn/Makefile =================================================================== ---- git.orig/dlfcn/Makefile 2014-08-29 20:00:46.312070587 -0700 -+++ git/dlfcn/Makefile 2014-08-29 20:01:15.192070587 -0700 +--- git.orig/dlfcn/Makefile ++++ git/dlfcn/Makefile @@ -15,6 +15,8 @@ # License along with the GNU C Library; if not, see # <http://www.gnu.org/licenses/>. @@ -474,21 +491,23 @@ Index: git/dlfcn/Makefile subdir := dlfcn include ../Makeconfig -@@ -36,7 +38,9 @@ +@@ -36,8 +38,11 @@ endif ifeq (yes,$(build-shared)) tests = glrefmain failtest tst-dladdr default errmsg1 tstcxaatexit \ bug-dlopen1 bug-dlsym1 tst-dlinfo bug-atexit1 bug-atexit2 \ -- bug-atexit3 tstatexit bug-dl-leaf -+ tstatexit bug-dl-leaf +- bug-atexit3 tstatexit bug-dl-leaf tst-rec-dlopen ++ tstatexit bug-dl-leaf tst-rec-dlopen + endif + +tests-$(OPTION_EGLIBC_CXX_TESTS) += bug-atexit3 - endif ++ modules-names = glreflib1 glreflib2 glreflib3 failtestmod defaultmod1 \ defaultmod2 errmsg1mod modatexit modcxaatexit \ + bug-dlsym1-lib1 bug-dlsym1-lib2 bug-atexit1-lib \ Index: git/elf/dl-support.c =================================================================== ---- git.orig/elf/dl-support.c 2014-08-29 20:00:46.384070587 -0700 -+++ git/elf/dl-support.c 2014-08-29 20:01:15.192070587 -0700 +--- git.orig/elf/dl-support.c ++++ git/elf/dl-support.c @@ -19,6 +19,7 @@ /* This file defines some things that for the dynamic linker are defined in rtld.c and dl-sysdep.c in ways appropriate to bootstrap dynamic linking. */ @@ -497,7 +516,7 @@ Index: git/elf/dl-support.c #include <errno.h> #include <libintl.h> #include <stdlib.h> -@@ -42,7 +43,9 @@ +@@ -42,7 +43,9 @@ char **_dl_argv = &__progname; /* This i const char *_dl_platform; size_t _dl_platformlen; @@ -509,8 +528,8 @@ Index: git/elf/dl-support.c int _dl_dynamic_weak; Index: git/elf/rtld.c =================================================================== ---- git.orig/elf/rtld.c 2014-08-29 20:01:14.708070587 -0700 -+++ git/elf/rtld.c 2014-08-29 20:01:15.196070587 -0700 +--- git.orig/elf/rtld.c ++++ git/elf/rtld.c @@ -16,6 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ @@ -519,7 +538,7 @@ Index: git/elf/rtld.c #include <errno.h> #include <dlfcn.h> #include <fcntl.h> -@@ -2200,6 +2201,7 @@ +@@ -2200,6 +2201,7 @@ print_missing_version (int errcode __att objname, errstring); } @@ -527,7 +546,7 @@ Index: git/elf/rtld.c /* Nonzero if any of the debugging options is enabled. */ static int any_debug attribute_relro; -@@ -2309,6 +2311,7 @@ +@@ -2309,6 +2311,7 @@ a filename can be specified using the LD _exit (0); } } @@ -535,7 +554,18 @@ Index: git/elf/rtld.c static void process_dl_audit (char *str) -@@ -2376,12 +2379,14 @@ +@@ -2348,8 +2351,9 @@ process_envvars (enum mode *modep) + char **runp = _environ; + char *envline; + enum mode mode = normal; ++#if __OPTION_EGLIBC_RTLD_DEBUG + char *debug_output = NULL; +- ++#endif + /* This is the default place for profiling data file. */ + GLRO(dl_profile_output) + = &"/var/tmp\0/var/profile"[__libc_enable_secure ? 9 : 0]; +@@ -2376,12 +2380,14 @@ process_envvars (enum mode *modep) break; case 5: @@ -550,7 +580,23 @@ Index: git/elf/rtld.c if (memcmp (envline, "AUDIT", 5) == 0) process_dl_audit (&envline[6]); break; -@@ -2490,7 +2495,9 @@ +@@ -2447,13 +2453,14 @@ process_envvars (enum mode *modep) + break; + } + ++#if __OPTION_EGLIBC_RTLD_DEBUG + /* Where to place the profiling data file. */ + if (memcmp (envline, "DEBUG_OUTPUT", 12) == 0) + { + debug_output = &envline[13]; + break; + } +- ++#endif + if (!__libc_enable_secure + && memcmp (envline, "DYNAMIC_WEAK", 12) == 0) + GLRO(dl_dynamic_weak) = 1; +@@ -2490,7 +2497,9 @@ process_envvars (enum mode *modep) { mode = trace; GLRO(dl_verbose) = 1; @@ -560,7 +606,7 @@ Index: git/elf/rtld.c GLRO(dl_trace_prelink) = &envline[17]; } break; -@@ -2537,12 +2544,15 @@ +@@ -2537,12 +2546,15 @@ process_envvars (enum mode *modep) if (__access ("/etc/suid-debug", F_OK) != 0) { unsetenv ("MALLOC_CHECK_"); @@ -576,7 +622,7 @@ Index: git/elf/rtld.c /* If we have to run the dynamic linker in debugging mode and the LD_DEBUG_OUTPUT environment variable is given, we write the debug messages to this file. */ -@@ -2567,6 +2577,7 @@ +@@ -2567,6 +2579,7 @@ process_envvars (enum mode *modep) /* We use standard output if opening the file failed. */ GLRO(dl_debug_fd) = STDOUT_FILENO; } @@ -586,9 +632,9 @@ Index: git/elf/rtld.c Index: git/extra-lib.mk =================================================================== ---- git.orig/extra-lib.mk 2014-08-29 20:00:46.544070587 -0700 -+++ git/extra-lib.mk 2014-08-29 20:01:15.196070587 -0700 -@@ -25,7 +25,9 @@ +--- git.orig/extra-lib.mk ++++ git/extra-lib.mk +@@ -25,7 +25,9 @@ install-lib := $(install-lib) extra-objs := $(extra-objs) # The modules that go in $(lib). @@ -599,7 +645,7 @@ Index: git/extra-lib.mk # Add each flavor of library to the lists of things to build and install. install-lib += $(foreach o,$(object-suffixes-$(lib)),$(lib:lib%=$(libtype$o))) -@@ -101,7 +103,7 @@ +@@ -101,7 +103,7 @@ endif endif # This will define `libof-ROUTINE := LIB' for each of the routines. @@ -610,8 +656,8 @@ Index: git/extra-lib.mk endif Index: git/grp/Makefile =================================================================== ---- git.orig/grp/Makefile 2014-08-29 20:00:46.556070587 -0700 -+++ git/grp/Makefile 2014-08-29 20:01:15.196070587 -0700 +--- git.orig/grp/Makefile ++++ git/grp/Makefile @@ -18,6 +18,8 @@ # # Sub-makefile for grp portion of the library. @@ -621,7 +667,7 @@ Index: git/grp/Makefile subdir := grp include ../Makeconfig -@@ -29,6 +31,9 @@ +@@ -29,6 +31,9 @@ routines := fgetgrent initgroups setgrou getgrent_r getgrgid_r getgrnam_r fgetgrent_r tests := testgrp @@ -633,8 +679,8 @@ Index: git/grp/Makefile test-srcs := tst_fgetgrent Index: git/hesiod/Makefile =================================================================== ---- git.orig/hesiod/Makefile 2014-08-29 20:00:46.580070587 -0700 -+++ git/hesiod/Makefile 2014-08-29 20:01:15.196070587 -0700 +--- git.orig/hesiod/Makefile ++++ git/hesiod/Makefile @@ -18,12 +18,14 @@ # # Sub-makefile for hesiod portion of the library. @@ -654,8 +700,8 @@ Index: git/hesiod/Makefile vpath %.c nss_hesiod Index: git/iconv/gconv_db.c =================================================================== ---- git.orig/iconv/gconv_db.c 2014-08-29 20:00:46.604070587 -0700 -+++ git/iconv/gconv_db.c 2014-08-29 20:01:15.196070587 -0700 +--- git.orig/iconv/gconv_db.c ++++ git/iconv/gconv_db.c @@ -25,6 +25,7 @@ #include <sys/param.h> #include <bits/libc-lock.h> @@ -664,7 +710,7 @@ Index: git/iconv/gconv_db.c #include <dlfcn.h> #include <gconv_int.h> -@@ -828,9 +829,11 @@ +@@ -828,9 +829,11 @@ free_modules_db (struct gconv_module *no /* Free all resources if necessary. */ libc_freeres_fn (free_mem) { @@ -678,8 +724,8 @@ Index: git/iconv/gconv_db.c extern void _nl_finddomain_subfreeres (void) attribute_hidden; Index: git/iconv/gconv_trans.c =================================================================== ---- git.orig/iconv/gconv_trans.c 2014-08-29 20:00:46.612070587 -0700 -+++ git/iconv/gconv_trans.c 2014-08-29 20:01:15.196070587 -0700 +--- git.orig/iconv/gconv_trans.c ++++ git/iconv/gconv_trans.c @@ -23,6 +23,7 @@ #include <stdint.h> #include <string.h> @@ -688,7 +734,27 @@ Index: git/iconv/gconv_trans.c #include <bits/libc-lock.h> #include "gconv_int.h" -@@ -59,6 +60,7 @@ +@@ -38,15 +39,19 @@ __gconv_transliterate (struct __gconv_st + unsigned char **outbufstart, size_t *irreversible) + { + /* Find out about the locale's transliteration. */ ++#if __OPTION_EGLIBC_LOCALE_CODE + uint_fast32_t size; + const uint32_t *from_idx; + const uint32_t *from_tbl; + const uint32_t *to_idx; + const uint32_t *to_tbl; ++#endif + const uint32_t *winbuf; + const uint32_t *winbufend; ++#if __OPTION_EGLIBC_LOCALE_CODE + uint_fast32_t low; + uint_fast32_t high; ++#endif + + /* The input buffer. There are actually 4-byte values. */ + winbuf = (const uint32_t *) *inbufp; +@@ -58,6 +63,7 @@ __gconv_transliterate (struct __gconv_st PTR_DEMANGLE (fct); #endif @@ -696,7 +762,7 @@ Index: git/iconv/gconv_trans.c /* If there is no transliteration information in the locale don't do anything and return the error. */ size = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_TRANSLIT_TAB_SIZE); -@@ -194,6 +196,7 @@ +@@ -193,6 +199,7 @@ __gconv_transliterate (struct __gconv_st sorted. */ break; } @@ -706,8 +772,8 @@ Index: git/iconv/gconv_trans.c if (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_TRANSLIT_DEFAULT_MISSING_LEN) != 0) Index: git/iconv/iconv_prog.c =================================================================== ---- git.orig/iconv/iconv_prog.c 2014-08-29 20:00:46.612070587 -0700 -+++ git/iconv/iconv_prog.c 2014-08-29 20:01:15.196070587 -0700 +--- git.orig/iconv/iconv_prog.c ++++ git/iconv/iconv_prog.c @@ -35,6 +35,7 @@ #ifdef _POSIX_MAPPED_FILES # include <sys/mman.h> @@ -716,7 +782,7 @@ Index: git/iconv/iconv_prog.c #include <charmap.h> #include <gconv_int.h> #include "iconv_prog.h" -@@ -221,10 +222,17 @@ +@@ -221,10 +222,17 @@ main (int argc, char *argv[]) bool to_wrong = (iconv_open (to_code, "UTF-8") == (iconv_t) -1 && errno == EINVAL); @@ -736,8 +802,8 @@ Index: git/iconv/iconv_prog.c { Index: git/iconv/Makefile =================================================================== ---- git.orig/iconv/Makefile 2014-08-29 20:00:46.600070587 -0700 -+++ git/iconv/Makefile 2014-08-29 20:01:15.196070587 -0700 +--- git.orig/iconv/Makefile ++++ git/iconv/Makefile @@ -18,6 +18,8 @@ # # Makefile for iconv. @@ -747,20 +813,22 @@ Index: git/iconv/Makefile subdir := iconv include ../Makeconfig -@@ -57,6 +59,9 @@ - CPPFLAGS-strtab = -DNOT_IN_libc - CPPFLAGS-charmap = -DNOT_IN_libc - CPPFLAGS-charmap-dir = -DNOT_IN_libc +@@ -39,6 +41,11 @@ CFLAGS-iconv_charmap.c = -I../locale/pro + CFLAGS-dummy-repertoire.c = -I../locale/programs + CFLAGS-charmap.c = -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \ + -DDEFAULT_CHARMAP=null_pointer -DNEED_NULL_POINTER ++ +ifneq (y,$(OPTION_EGLIBC_SPAWN)) -+CPPFLAGS-charmap-dir.c += -DNO_UNCOMPRESS ++CFLAGS-charmap-dir.c += -DNO_UNCOMPRESS +endif ++ + CFLAGS-linereader.c = -DNO_TRANSLITERATION + CFLAGS-simple-hash.c = -I../locale - ifeq ($(run-built-tests),yes) - xtests-special += $(objpfx)test-iconvconfig.out Index: git/iconvdata/Makefile =================================================================== ---- git.orig/iconvdata/Makefile 2014-08-29 20:00:46.628070587 -0700 -+++ git/iconvdata/Makefile 2014-08-29 20:01:15.196070587 -0700 +--- git.orig/iconvdata/Makefile ++++ git/iconvdata/Makefile @@ -18,12 +18,15 @@ # # Makefile for iconv data and code. @@ -778,7 +846,7 @@ Index: git/iconvdata/Makefile ISO8859-6 ISO8859-7 ISO8859-8 ISO8859-9 ISO8859-10 \ ISO8859-11 ISO8859-13 ISO8859-14 ISO8859-15 ISO8859-16 \ T.61 ISO_6937 SJIS KOI-8 HP-ROMAN8 HP-ROMAN9 EBCDIC-AT-DE \ -@@ -63,11 +66,13 @@ +@@ -63,11 +66,13 @@ modules := ISO8859-1 ISO8859-2 ISO8859-3 MAC-CENTRALEUROPE KOI8-RU ISO8859-9E \ CP770 CP771 CP772 CP773 CP774 @@ -794,7 +862,7 @@ Index: git/iconvdata/Makefile ifeq ($(have-thread-library),yes) tests += bug-iconv3 endif -@@ -130,13 +135,13 @@ +@@ -127,13 +132,13 @@ ifeq (yes,$(build-shared)) # Rule to generate the shared objects. charmaps = ../localedata/charmaps -include $(objpfx)iconv-rules @@ -811,7 +879,7 @@ Index: git/iconvdata/Makefile # We can build the conversion tables for numerous charsets automatically. -@@ -204,7 +209,7 @@ +@@ -201,7 +206,7 @@ before-compile += $(addprefix $(objpfx), ifndef avoid-generated $(objpfx)iconv-rules: Makefile $(make-target-directory) @@ -820,7 +888,7 @@ Index: git/iconvdata/Makefile echo 8bit $(gen-8bit-modules); \ echo 8bit-gap $(gen-8bit-gap-modules); } | \ LC_ALL=C \ -@@ -247,7 +252,7 @@ +@@ -245,7 +250,7 @@ $(addprefix $(inst_gconvdir)/, $(modules $(do-install-program) $(inst_gconvdir)/gconv-modules: gconv-modules $(+force) $(do-install) @@ -829,7 +897,7 @@ Index: git/iconvdata/Makefile # Update the $(prefix)/lib/gconv/gconv-modules.cache file. This is necessary # if this libc has more gconv modules than the previously installed one. if test -f "$(inst_gconvdir)/gconv-modules.cache"; then \ -@@ -256,9 +261,9 @@ +@@ -254,9 +259,9 @@ ifeq (no,$(cross-compiling)) $(common-objpfx)iconv/iconvconfig \ $(addprefix --prefix=,$(install_root)); \ fi @@ -844,9 +912,9 @@ Index: git/iconvdata/Makefile Index: git/include/netdb.h =================================================================== ---- git.orig/include/netdb.h 2014-08-29 20:00:47.152070587 -0700 -+++ git/include/netdb.h 2014-08-29 20:01:15.196070587 -0700 -@@ -232,6 +232,10 @@ +--- git.orig/include/netdb.h ++++ git/include/netdb.h +@@ -232,6 +232,10 @@ extern enum nss_status _nss_ ## service (const char *name, int af, struct hostent *host, \ char *buffer, size_t buflen, int *errnop, \ int *h_errnop); \ @@ -859,8 +927,8 @@ Index: git/include/netdb.h size_t buflen, int *errnop, int *h_errnop); \ Index: git/inet/Makefile =================================================================== ---- git.orig/inet/Makefile 2014-08-29 20:00:47.176070587 -0700 -+++ git/inet/Makefile 2014-08-29 20:01:15.200070587 -0700 +--- git.orig/inet/Makefile ++++ git/inet/Makefile @@ -18,6 +18,8 @@ # # Sub-makefile for inet portion of the library. @@ -870,7 +938,7 @@ Index: git/inet/Makefile subdir := inet include ../Makeconfig -@@ -27,7 +29,8 @@ +@@ -27,7 +29,8 @@ headers := netinet/ether.h netinet/in.h netinet/tcp.h netinet/ip.h $(wildcard arpa/*.h protocols/*.h) \ aliases.h ifaddrs.h netinet/ip6.h netinet/icmp6.h bits/in.h @@ -880,7 +948,7 @@ Index: git/inet/Makefile inet_lnaof inet_mkadr \ inet_netof inet_ntoa inet_net herrno herrno-loc \ gethstbyad gethstbyad_r gethstbynm gethstbynm2 gethstbynm2_r \ -@@ -41,18 +44,23 @@ +@@ -41,18 +44,23 @@ routines := htonl htons \ getrpcent_r getrpcbyname_r getrpcbynumber_r \ ether_aton ether_aton_r ether_hton ether_line \ ether_ntoa ether_ntoa_r ether_ntoh \ @@ -912,89 +980,112 @@ Index: git/inet/Makefile Index: git/intl/dcigettext.c =================================================================== ---- git.orig/intl/dcigettext.c 2014-08-29 20:00:47.224070587 -0700 -+++ git/intl/dcigettext.c 2014-08-29 20:01:15.200070587 -0700 -@@ -77,6 +77,10 @@ +--- git.orig/intl/dcigettext.c ++++ git/intl/dcigettext.c +@@ -100,11 +100,15 @@ extern int errno; + # include "libgnuintl.h" #endif #include "hash-string.h" - +#ifdef _LIBC +# include <gnu/option-groups.h> +#endif -+ - /* Thread safetyness. */ + + /* Handle multi-threaded applications. */ #ifdef _LIBC # include <bits/libc-lock.h> -@@ -449,9 +453,11 @@ - #endif + # define gl_rwlock_define_initialized __libc_rwlock_define_initialized ++# define gl_rwlock_define __libc_rwlock_define + # define gl_rwlock_rdlock __libc_rwlock_rdlock + # define gl_rwlock_wrlock __libc_rwlock_wrlock + # define gl_rwlock_unlock __libc_rwlock_unlock +@@ -523,8 +527,10 @@ DCIGETTEXT (const char *domainname, cons + saved_errno = errno; #ifdef _LIBC -+#if __OPTION_EGLIBC_LOCALE_CODE - __libc_rwlock_define (extern, __libc_setlocale_lock attribute_hidden) - __libc_rwlock_rdlock (__libc_setlocale_lock); +- __libc_rwlock_define (extern, __libc_setlocale_lock attribute_hidden) +- __libc_rwlock_rdlock (__libc_setlocale_lock); ++# if __OPTION_EGLIBC_LOCALE_CODE ++ gl_rwlock_define (extern, __libc_setlocale_lock attribute_hidden) ++ gl_rwlock_rdlock (__libc_setlocale_lock); ++# endif #endif -+#endif - - __libc_rwlock_rdlock (_nl_state_lock); -@@ -470,7 +476,11 @@ - search.category = category; - # ifdef HAVE_PER_THREAD_LOCALE + gl_rwlock_rdlock (_nl_state_lock); +@@ -550,7 +556,11 @@ DCIGETTEXT (const char *domainname, cons + #ifdef HAVE_PER_THREAD_LOCALE + # ifndef IN_LIBGLOCALE # ifdef _LIBC +- localename = strdupa (__current_locale_name (category)); +# if __OPTION_EGLIBC_LOCALE_CODE - localename = strdupa (__current_locale_name (category)); ++ localename = strdupa (__current_locale_name (category)); +# else -+ localename = "C"; ++ localename = "C"; +# endif - # endif - search.localename = localename; - # endif -@@ -494,7 +504,9 @@ + # else + categoryname = category_to_name (category); + # define CATEGORYNAME_INITIALIZED +@@ -581,10 +591,12 @@ DCIGETTEXT (const char *domainname, cons + else retval = (char *) (*foundp)->translation; +- gl_rwlock_unlock (_nl_state_lock); # ifdef _LIBC -+#if __OPTION_EGLIBC_LOCALE_CODE - __libc_rwlock_unlock (__libc_setlocale_lock); -+#endif +- __libc_rwlock_unlock (__libc_setlocale_lock); ++# if __OPTION_EGLIBC_LOCALE_CODE ++ gl_rwlock_unlock (__libc_setlocale_lock); ++# endif # endif - __libc_rwlock_unlock (_nl_state_lock); ++ gl_rwlock_unlock (_nl_state_lock); + __set_errno (saved_errno); return retval; -@@ -611,7 +623,9 @@ - { - no_translation: - FREE_BLOCKS (block_list); -+#if __OPTION_EGLIBC_LOCALE_CODE - __libc_rwlock_unlock (__libc_setlocale_lock); -+#endif - __libc_rwlock_unlock (_nl_state_lock); - __set_errno (saved_errno); - return (plural == 0 -@@ -730,7 +744,9 @@ + } +@@ -838,10 +850,13 @@ DCIGETTEXT (const char *domainname, cons if (plural) retval = plural_lookup (domain, n, retval, retlen); -+#if __OPTION_EGLIBC_LOCALE_CODE - __libc_rwlock_unlock (__libc_setlocale_lock); -+#endif - __libc_rwlock_unlock (_nl_state_lock); +- gl_rwlock_unlock (_nl_state_lock); + #ifdef _LIBC +- __libc_rwlock_unlock (__libc_setlocale_lock); ++# if __OPTION_EGLIBC_LOCALE_CODE ++ ++ gl_rwlock_unlock (__libc_setlocale_lock); ++# endif + #endif ++ gl_rwlock_unlock (_nl_state_lock); return retval; } -@@ -1361,7 +1377,11 @@ - `LC_xxx', and `LANG'. On some systems this can be done by the - `setlocale' function itself. */ + } +@@ -850,10 +865,12 @@ DCIGETTEXT (const char *domainname, cons + return_untranslated: + /* Return the untranslated MSGID. */ + FREE_BLOCKS (block_list); +- gl_rwlock_unlock (_nl_state_lock); #ifdef _LIBC +- __libc_rwlock_unlock (__libc_setlocale_lock); +# if __OPTION_EGLIBC_LOCALE_CODE - retval = __current_locale_name (category); -+# else -+ retval = "C"; ++ gl_rwlock_unlock (__libc_setlocale_lock); +# endif - #else - retval = _nl_locale_name (category, categoryname); #endif ++ gl_rwlock_unlock (_nl_state_lock); + #ifndef _LIBC + if (!ENABLE_SECURE) + { +@@ -1550,7 +1567,11 @@ guess_category_value (int category, cons + `LC_xxx', and `LANG'. On some systems this can be done by the + `setlocale' function itself. */ + # ifdef _LIBC ++# if __OPTION_EGLIBC_LOCALE_CODE + locale = __current_locale_name (category); ++# else ++ locale = "C"; ++# endif + # else + locale_defaulted = 0; + # if HAVE_USELOCALE Index: git/intl/Makefile =================================================================== ---- git.orig/intl/Makefile 2014-08-29 20:00:47.220070587 -0700 -+++ git/intl/Makefile 2014-08-29 20:01:15.200070587 -0700 +--- git.orig/intl/Makefile ++++ git/intl/Makefile @@ -16,6 +16,7 @@ # <http://www.gnu.org/licenses/>. @@ -1003,7 +1094,7 @@ Index: git/intl/Makefile subdir = intl -@@ -48,7 +49,7 @@ +@@ -48,7 +49,7 @@ endif $(objpfx)plural.o: plural.c ifeq ($(run-built-tests),yes) @@ -1014,8 +1105,8 @@ Index: git/intl/Makefile $(objpfx)tst-gettext2.out $(objpfx)tst-codeset.out \ Index: git/io/Makefile =================================================================== ---- git.orig/io/Makefile 2014-08-29 20:00:47.244070587 -0700 -+++ git/io/Makefile 2014-08-29 20:01:15.200070587 -0700 +--- git.orig/io/Makefile ++++ git/io/Makefile @@ -18,6 +18,8 @@ # # Sub-makefile for I/O portion of the library. @@ -1025,7 +1116,7 @@ Index: git/io/Makefile subdir := io include ../Makeconfig -@@ -36,7 +38,7 @@ +@@ -36,7 +38,7 @@ routines := \ fxstatat fxstatat64 \ statfs fstatfs statfs64 fstatfs64 \ statvfs fstatvfs statvfs64 fstatvfs64 \ @@ -1034,7 +1125,7 @@ Index: git/io/Makefile mkdir mkdirat \ open open_2 open64 open64_2 openat openat_2 openat64 openat64_2 \ read write lseek lseek64 access euidaccess faccessat \ -@@ -49,11 +51,13 @@ +@@ -49,11 +51,13 @@ routines := \ ttyname ttyname_r isatty \ link linkat symlink symlinkat readlink readlinkat \ unlink unlinkat rmdir \ @@ -1049,7 +1140,7 @@ Index: git/io/Makefile aux := have_o_cloexec -@@ -64,18 +68,22 @@ +@@ -64,18 +68,22 @@ static-only-routines = stat fstat lstat fstatat fstatat64 mknod mknodat others := pwd @@ -1077,8 +1168,8 @@ Index: git/io/Makefile Index: git/libidn/Makefile =================================================================== ---- git.orig/libidn/Makefile 2014-08-29 20:00:47.316070587 -0700 -+++ git/libidn/Makefile 2014-08-29 20:01:15.200070587 -0700 +--- git.orig/libidn/Makefile ++++ git/libidn/Makefile @@ -16,6 +16,7 @@ # <http://www.gnu.org/licenses/>. @@ -1087,7 +1178,7 @@ Index: git/libidn/Makefile subdir := libidn -@@ -23,8 +24,8 @@ +@@ -23,8 +24,8 @@ include ../Makeconfig routines = idn-stub @@ -1100,8 +1191,8 @@ Index: git/libidn/Makefile iconvme Index: git/libidn/toutf8.c =================================================================== ---- git.orig/libidn/toutf8.c 2014-08-29 20:00:47.332070587 -0700 -+++ git/libidn/toutf8.c 2014-08-29 20:01:15.200070587 -0700 +--- git.orig/libidn/toutf8.c ++++ git/libidn/toutf8.c @@ -33,6 +33,11 @@ /* Get strlen. */ #include <string.h> @@ -1129,8 +1220,8 @@ Index: git/libidn/toutf8.c * stringprep_locale_charset - return charset used in current locale Index: git/libio/fileops.c =================================================================== ---- git.orig/libio/fileops.c 2014-08-29 20:00:47.352070587 -0700 -+++ git/libio/fileops.c 2014-08-29 20:01:15.200070587 -0700 +--- git.orig/libio/fileops.c ++++ git/libio/fileops.c @@ -38,6 +38,7 @@ #include <string.h> #include <errno.h> @@ -1139,7 +1230,7 @@ Index: git/libio/fileops.c #include <stdlib.h> #if _LIBC # include "../wcsmbs/wcsmbsload.h" -@@ -174,7 +175,7 @@ +@@ -172,7 +173,7 @@ _IO_new_file_close_it (_IO_FILE *fp) /* Free buffer. */ #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T @@ -1148,7 +1239,7 @@ Index: git/libio/fileops.c { if (_IO_have_wbackup (fp)) _IO_free_wbackup_area (fp); -@@ -359,6 +360,7 @@ +@@ -347,6 +348,7 @@ _IO_new_file_fopen (_IO_FILE *fp, const cs = strstr (last_recognized + 1, ",ccs="); if (cs != NULL) { @@ -1156,7 +1247,7 @@ Index: git/libio/fileops.c /* Yep. Load the appropriate conversions and set the orientation to wide. */ struct gconv_fcts fcts; -@@ -423,6 +425,12 @@ +@@ -406,6 +408,12 @@ _IO_new_file_fopen (_IO_FILE *fp, const /* Set the mode now. */ result->_mode = 1; @@ -1171,8 +1262,8 @@ Index: git/libio/fileops.c Index: git/libio/__fpurge.c =================================================================== ---- git.orig/libio/__fpurge.c 2014-08-29 20:00:47.336070587 -0700 -+++ git/libio/__fpurge.c 2014-08-29 20:01:15.200070587 -0700 +--- git.orig/libio/__fpurge.c ++++ git/libio/__fpurge.c @@ -21,7 +21,7 @@ void __fpurge (FILE *fp) @@ -1184,8 +1275,8 @@ Index: git/libio/__fpurge.c if (_IO_in_backup (fp)) Index: git/libio/iofwide.c =================================================================== ---- git.orig/libio/iofwide.c 2014-08-29 20:00:47.360070587 -0700 -+++ git/libio/iofwide.c 2014-08-29 20:01:15.200070587 -0700 +--- git.orig/libio/iofwide.c ++++ git/libio/iofwide.c @@ -26,6 +26,7 @@ #include <libioP.h> @@ -1203,7 +1294,7 @@ Index: git/libio/iofwide.c /* Prototypes of libio's codecvt functions. */ static enum __codecvt_result do_out (struct _IO_codecvt *codecvt, __mbstate_t *statep, -@@ -513,3 +516,26 @@ +@@ -499,3 +502,26 @@ do_max_length (struct _IO_codecvt *codec return MB_CUR_MAX; #endif } @@ -1232,9 +1323,9 @@ Index: git/libio/iofwide.c +#endif Index: git/libio/ioseekoff.c =================================================================== ---- git.orig/libio/ioseekoff.c 2014-08-29 20:00:47.364070587 -0700 -+++ git/libio/ioseekoff.c 2014-08-29 20:01:15.200070587 -0700 -@@ -60,7 +60,7 @@ +--- git.orig/libio/ioseekoff.c ++++ git/libio/ioseekoff.c +@@ -60,7 +60,7 @@ _IO_seekoff_unlocked (fp, offset, dir, m else abort (); } @@ -1245,9 +1336,9 @@ Index: git/libio/ioseekoff.c _IO_free_wbackup_area (fp); Index: git/libio/ioseekpos.c =================================================================== ---- git.orig/libio/ioseekpos.c 2014-08-29 20:00:47.364070587 -0700 -+++ git/libio/ioseekpos.c 2014-08-29 20:01:15.200070587 -0700 -@@ -35,7 +35,7 @@ +--- git.orig/libio/ioseekpos.c ++++ git/libio/ioseekpos.c +@@ -35,7 +35,7 @@ _IO_seekpos_unlocked (fp, pos, mode) /* If we have a backup buffer, get rid of it, since the __seekoff callback may not know to do the right thing about it. This may be over-kill, but it'll do for now. TODO */ @@ -1258,8 +1349,8 @@ Index: git/libio/ioseekpos.c _IO_free_backup_area (fp); Index: git/libio/iosetbuffer.c =================================================================== ---- git.orig/libio/iosetbuffer.c 2014-08-29 20:00:47.364070587 -0700 -+++ git/libio/iosetbuffer.c 2014-08-29 20:01:15.204070587 -0700 +--- git.orig/libio/iosetbuffer.c ++++ git/libio/iosetbuffer.c @@ -24,6 +24,8 @@ This exception applies to code released by its copyright holders in files containing the exception. */ @@ -1269,7 +1360,7 @@ Index: git/libio/iosetbuffer.c #include "libioP.h" void -@@ -38,9 +40,11 @@ +@@ -38,9 +40,11 @@ _IO_setbuffer (fp, buf, size) if (!buf) size = 0; (void) _IO_SETBUF (fp, buf, size); @@ -1283,8 +1374,8 @@ Index: git/libio/iosetbuffer.c libc_hidden_def (_IO_setbuffer) Index: git/libio/libioP.h =================================================================== ---- git.orig/libio/libioP.h 2014-08-29 20:00:47.372070587 -0700 -+++ git/libio/libioP.h 2014-08-29 20:01:15.204070587 -0700 +--- git.orig/libio/libioP.h ++++ git/libio/libioP.h @@ -42,6 +42,10 @@ /*# include <comthread.h>*/ #endif @@ -1296,7 +1387,7 @@ Index: git/libio/libioP.h #include <math_ldbl_opt.h> #include "iolibio.h" -@@ -508,8 +512,20 @@ +@@ -508,8 +512,20 @@ extern void _IO_old_init (_IO_FILE *fp, #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T @@ -1320,8 +1411,8 @@ Index: git/libio/libioP.h : _IO_wdo_write(_f, (_f)->_wide_data->_IO_write_base, \ Index: git/libio/Makefile =================================================================== ---- git.orig/libio/Makefile 2014-08-29 20:00:47.332070587 -0700 -+++ git/libio/Makefile 2014-08-29 20:01:15.204070587 -0700 +--- git.orig/libio/Makefile ++++ git/libio/Makefile @@ -18,6 +18,8 @@ # # Specific makefile for libio. @@ -1331,7 +1422,7 @@ Index: git/libio/Makefile subdir := libio include ../Makeconfig -@@ -27,16 +29,13 @@ +@@ -27,16 +29,13 @@ headers := stdio.h libio.h _G_config.h b routines := \ filedoalloc iofclose iofdopen iofflush iofgetpos iofgets iofopen \ @@ -1351,63 +1442,61 @@ Index: git/libio/Makefile \ clearerr feof ferror fileno fputc freopen fseek getc getchar \ memstream pclose putc putchar rewind setbuf setlinebuf vasprintf \ -@@ -47,25 +46,48 @@ - __fpurge __fpending __fsetlocking \ +@@ -48,24 +47,49 @@ routines := \ \ libc_fatal fmemopen -- + -tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc \ - tst_wprintf2 tst-widetext test-fmemopen tst-ext tst-ext2 \ - tst-fgetws tst-ungetwc1 tst-ungetwc2 tst-swscanf tst-sscanf \ - tst-mmap-setvbuf bug-ungetwc1 bug-ungetwc2 tst-atime tst-eof \ - tst-freopen bug-rewind bug-rewind2 bug-ungetc bug-fseek \ -- tst-mmap-eofsync tst-mmap-fflushsync bug-mmap-fflush \ -- tst-mmap2-eofsync tst-mmap-offend bug-fopena+ bug-wfflush \ -- bug-ungetc2 bug-ftell bug-ungetc3 bug-ungetc4 tst-fopenloc2 \ -- tst-memstream1 tst-memstream2 \ -- tst-wmemstream1 tst-wmemstream2 \ -- bug-memstream1 bug-wmemstream1 \ -- tst-setvbuf1 tst-popen1 tst-fgetwc bug-wsetpos tst-fseek \ -- tst-fwrite-error tst-ftell-partial-wide tst-ftell-active-handler \ -- tst-ftell-append +routines-$(OPTION_POSIX_C_LANG_WIDE_CHAR) += \ -+ wfiledoalloc \ -+ iowpadn \ -+ swprintf \ -+ vswprintf iovswscanf swscanf wgenops \ ++ wfiledoalloc \ ++ iowpadn \ ++ swprintf \ ++ vswprintf iovswscanf swscanf wgenops \ + wstrops wfileops wmemstream +routines-$(call option-disabled, OPTION_POSIX_C_LANG_WIDE_CHAR) += \ + wdummyfileops +routines-$(OPTION_POSIX_WIDE_CHAR_DEVICE_IO) += \ + fputwc fputwc_u getwc getwc_u getwchar getwchar_u iofgetws iofgetws_u \ -+ iofputws iofputws_u iogetwline ioungetwc putwc putwc_u \ -+ putwchar putwchar_u fwprintf vwprintf \ -+ wprintf wscanf fwscanf vwscanf \ ++ iofputws iofputws_u iogetwline ioungetwc putwc putwc_u \ ++ putwchar putwchar_u fwprintf vwprintf \ ++ wprintf wscanf fwscanf vwscanf \ + fwide + -+tests = test-fmemopen tst-ext tst-ext2 \ -+ tst-mmap-setvbuf tst-atime tst-eof \ -+ tst-freopen bug-ungetc bug-fseek \ -+ tst-mmap-eofsync tst-mmap-fflushsync bug-mmap-fflush \ -+ tst-mmap2-eofsync tst-mmap-offend bug-fopena+ \ -+ bug-ungetc2 bug-ungetc3 bug-ungetc4 \ -+ tst-memstream1 tst-memstream2 \ -+ bug-memstream1 tst-popen1 tst-fwrite-error \ ++tests = test-fmemopen tst-ext tst-ext2 \ ++ tst-mmap-setvbuf tst-atime tst-eof \ ++ tst-freopen bug-ungetc bug-fseek \ + tst-mmap-eofsync tst-mmap-fflushsync bug-mmap-fflush \ +- tst-mmap2-eofsync tst-mmap-offend bug-fopena+ bug-wfflush \ +- bug-ungetc2 bug-ftell bug-ungetc3 bug-ungetc4 tst-fopenloc2 \ ++ tst-mmap2-eofsync tst-mmap-offend bug-fopena+ \ ++ bug-ungetc2 bug-ungetc3 bug-ungetc4 \ + tst-memstream1 tst-memstream2 \ +- tst-wmemstream1 tst-wmemstream2 \ +- bug-memstream1 bug-wmemstream1 \ +- tst-setvbuf1 tst-popen1 tst-fgetwc bug-wsetpos tst-fseek \ +- tst-fwrite-error tst-ftell-partial-wide tst-ftell-active-handler \ +- tst-ftell-append tst-fputws ++ bug-memstream1 tst-popen1 tst-fwrite-error \ + tst-ftell-active-handler tst-ftell-append -+tests-$(OPTION_EGLIBC_LOCALE_CODE) \ -+ += tst-swscanf tst-fgetws tst-setvbuf1 \ -+ tst-ungetwc1 tst-ungetwc2 bug-ftell bug-ungetwc2 \ -+ tst-widetext -+tests-$(OPTION_POSIX_WIDE_CHAR_DEVICE_IO) \ -+ += bug-rewind bug-rewind2 bug-ungetwc1 \ -+ bug-wfflush bug-wmemstream1 tst-fopenloc2 \ -+ tst_getwc \ -+ tst_putwc tst_wprintf tst_wprintf2 tst_wscanf \ ++tests-$(OPTION_EGLIBC_LOCALE_CODE) \ ++ += tst-swscanf tst-fgetws tst-setvbuf1 \ ++ tst-ungetwc1 tst-ungetwc2 bug-ftell bug-ungetwc2 \ ++ tst-widetext tst-fputws ++tests-$(OPTION_POSIX_WIDE_CHAR_DEVICE_IO) \ ++ += bug-rewind bug-rewind2 bug-ungetwc1 \ ++ bug-wfflush bug-wmemstream1 tst-fopenloc2 \ ++ tst_getwc \ ++ tst_putwc tst_wprintf tst_wprintf2 tst_wscanf \ + tst-fgetwc bug-wsetpos tst-fseek tst-ftell-partial-wide -+tests-$(OPTION_POSIX_C_LANG_WIDE_CHAR) \ -+ += tst_swprintf tst_swscanf \ -+ tst-sscanf \ ++tests-$(OPTION_POSIX_C_LANG_WIDE_CHAR) \ ++ += tst_swprintf tst_swscanf \ ++ tst-sscanf \ + tst-wmemstream1 tst-wmemstream2 ++ ifeq (yes,$(build-shared)) # Add test-fopenloc only if shared library is enabled since it depends on # shared localedata objects. @@ -1416,7 +1505,7 @@ Index: git/libio/Makefile endif test-srcs = test-freopen -@@ -164,13 +186,17 @@ +@@ -164,13 +188,17 @@ shared-only-routines = oldiofopen oldiof oldiofsetpos64 ifeq ($(run-built-tests),yes) @@ -1436,8 +1525,8 @@ Index: git/libio/Makefile Index: git/libio/wdummyfileops.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ git/libio/wdummyfileops.c 2014-08-29 20:01:15.204070587 -0700 +--- /dev/null ++++ git/libio/wdummyfileops.c @@ -0,0 +1,161 @@ +/* Copyright (C) 2007 Free Software Foundation, Inc. + This file is part of the GNU C Library. @@ -1602,8 +1691,8 @@ Index: git/libio/wdummyfileops.c +strong_alias (_IO_wfile_jumps_disabled, _IO_wfile_jumps_maybe_mmap) Index: git/locale/catnames.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ git/locale/catnames.c 2014-08-29 20:01:15.204070587 -0700 +--- /dev/null ++++ git/locale/catnames.c @@ -0,0 +1,48 @@ +/* Copyright (C) 2006 Free Software Foundation, Inc. + This file is part of the GNU C Library. @@ -1655,8 +1744,8 @@ Index: git/locale/catnames.c + }; Index: git/locale/C-ctype.c =================================================================== ---- git.orig/locale/C-ctype.c 2014-08-29 20:00:47.396070587 -0700 -+++ git/locale/C-ctype.c 2014-08-29 20:01:15.204070587 -0700 +--- git.orig/locale/C-ctype.c ++++ git/locale/C-ctype.c @@ -19,8 +19,11 @@ #include "localeinfo.h" #include <endian.h> @@ -1669,7 +1758,7 @@ Index: git/locale/C-ctype.c /* This table's entries are taken from POSIX.2 Table 2-6 ``LC_CTYPE Category Definition in the POSIX Locale''. -@@ -647,6 +650,7 @@ +@@ -647,6 +650,7 @@ const struct __locale_data _nl_C_LC_CTYP { .word = L'7' }, { .word = L'8' }, { .word = L'9' }, @@ -1677,7 +1766,7 @@ Index: git/locale/C-ctype.c /* _NL_CTYPE_TRANSLIT_TAB_SIZE */ { .word = NTRANSLIT }, /* _NL_CTYPE_TRANSLIT_FROM_IDX */ -@@ -657,6 +661,22 @@ +@@ -657,6 +661,22 @@ const struct __locale_data _nl_C_LC_CTYP { .wstr = translit_to_idx }, /* _NL_CTYPE_TRANSLIT_TO_TBL */ { .wstr = (uint32_t *) translit_to_tbl }, @@ -1702,8 +1791,8 @@ Index: git/locale/C-ctype.c /* _NL_CTYPE_TRANSLIT_DEFAULT_MISSING */ Index: git/locale/dummy-setlocale.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ git/locale/dummy-setlocale.c 2014-08-29 20:01:15.204070587 -0700 +--- /dev/null ++++ git/locale/dummy-setlocale.c @@ -0,0 +1,33 @@ +/* Copyright (C) 2006 Free Software Foundation, Inc. + This file is part of the GNU C Library. @@ -1740,9 +1829,9 @@ Index: git/locale/dummy-setlocale.c +libc_hidden_def (setlocale) Index: git/locale/localeinfo.h =================================================================== ---- git.orig/locale/localeinfo.h 2014-08-29 20:00:47.404070587 -0700 -+++ git/locale/localeinfo.h 2014-08-29 20:01:15.204070587 -0700 -@@ -224,7 +224,7 @@ +--- git.orig/locale/localeinfo.h ++++ git/locale/localeinfo.h +@@ -224,7 +224,7 @@ __libc_tsd_define (extern, __locale_t, L unused. We can manage this playing some tricks with weak references. But with thread-local locale settings, it becomes quite ungainly unless we can use __thread variables. So only in that case do we attempt this. */ @@ -1753,8 +1842,8 @@ Index: git/locale/localeinfo.h #endif Index: git/locale/Makefile =================================================================== ---- git.orig/locale/Makefile 2014-08-29 20:00:47.400070587 -0700 -+++ git/locale/Makefile 2014-08-29 20:01:15.204070587 -0700 +--- git.orig/locale/Makefile ++++ git/locale/Makefile @@ -18,27 +18,43 @@ # # Makefile for locales. @@ -1810,7 +1899,7 @@ Index: git/locale/Makefile libBrokenLocale-routines = broken_cur_max -@@ -94,6 +110,9 @@ +@@ -93,6 +109,9 @@ CPPFLAGS-locale-programs = -DLOCALE_PATH CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts CFLAGS-charmap-dir.c = -Wno-write-strings @@ -1818,12 +1907,12 @@ Index: git/locale/Makefile +CFLAGS-charmap-dir.c += -DNO_UNCOMPRESS +endif - # This makes sure -DNOT_IN_libc et al are passed for all these modules. - cpp-srcs-left := $(addsuffix .c,$(localedef-modules) $(localedef-aux) \ + # Set libof-* for each routine. + cpp-srcs-left := $(localedef-modules) $(localedef-aux) $(locale-modules) \ Index: git/locale/programs/charmap-dir.c =================================================================== ---- git.orig/locale/programs/charmap-dir.c 2014-08-29 20:00:47.408070587 -0700 -+++ git/locale/programs/charmap-dir.c 2014-08-29 20:01:15.204070587 -0700 +--- git.orig/locale/programs/charmap-dir.c ++++ git/locale/programs/charmap-dir.c @@ -19,7 +19,9 @@ #include <error.h> #include <fcntl.h> @@ -1834,7 +1923,7 @@ Index: git/locale/programs/charmap-dir.c #include <stdio.h> #include <stdlib.h> #include <string.h> -@@ -156,6 +158,7 @@ +@@ -156,6 +158,7 @@ charmap_closedir (CHARMAP_DIR *cdir) return closedir (dir); } @@ -1842,7 +1931,7 @@ Index: git/locale/programs/charmap-dir.c /* Creates a subprocess decompressing the given pathname, and returns a stream reading its output (the decompressed data). */ static -@@ -204,6 +207,7 @@ +@@ -204,6 +207,7 @@ fopen_uncompressed (const char *pathname } return NULL; } @@ -1850,7 +1939,7 @@ Index: git/locale/programs/charmap-dir.c /* Opens a charmap for reading, given its name (not an alias name). */ FILE * -@@ -226,6 +230,7 @@ +@@ -226,6 +230,7 @@ charmap_open (const char *directory, con if (stream != NULL) return stream; @@ -1858,7 +1947,7 @@ Index: git/locale/programs/charmap-dir.c memcpy (p, ".gz", 4); stream = fopen_uncompressed (pathname, "gzip"); if (stream != NULL) -@@ -235,6 +240,7 @@ +@@ -235,6 +240,7 @@ charmap_open (const char *directory, con stream = fopen_uncompressed (pathname, "bzip2"); if (stream != NULL) return stream; @@ -1866,22 +1955,11 @@ Index: git/locale/programs/charmap-dir.c return NULL; } -@@ -263,8 +269,8 @@ - char *alias = NULL; - char junk[BUFSIZ]; - -- if (fscanf (stream, " <code_set_name> %ms", &alias) == 1 -- || fscanf (stream, "%% alias %ms", &alias) == 1) -+ if (fscanf (stream, " <code_set_name> %as", &alias) == 1 -+ || fscanf (stream, "%% alias %as", &alias) == 1) - { - aliases = (char **) xrealloc (aliases, - (naliases + 2) * sizeof (char *)); Index: git/locale/programs/ld-collate.c =================================================================== ---- git.orig/locale/programs/ld-collate.c 2014-08-29 20:00:47.408070587 -0700 -+++ git/locale/programs/ld-collate.c 2014-08-29 20:01:15.208070587 -0700 -@@ -350,7 +350,7 @@ +--- git.orig/locale/programs/ld-collate.c ++++ git/locale/programs/ld-collate.c +@@ -350,7 +350,7 @@ new_element (struct locale_collate_t *co } if (wcs != NULL) { @@ -1890,7 +1968,7 @@ Index: git/locale/programs/ld-collate.c uint32_t zero = 0; /* Handle <U0000> as a single character. */ if (nwcs == 0) -@@ -1776,8 +1776,7 @@ +@@ -1776,8 +1776,7 @@ symbol `%s' has the same encoding as"), if ((*eptr)->nwcs == runp->nwcs) { @@ -1900,7 +1978,7 @@ Index: git/locale/programs/ld-collate.c if (c == 0) { -@@ -2010,9 +2009,9 @@ +@@ -2010,9 +2009,9 @@ add_to_tablewc (uint32_t ch, struct elem one consecutive entry. */ if (runp->wcnext != NULL && runp->nwcs == runp->wcnext->nwcs @@ -1913,7 +1991,7 @@ Index: git/locale/programs/ld-collate.c && (runp->wcs[runp->nwcs - 1] == runp->wcnext->wcs[runp->nwcs - 1] + 1)) { -@@ -2036,9 +2035,9 @@ +@@ -2036,9 +2035,9 @@ add_to_tablewc (uint32_t ch, struct elem runp = runp->wcnext; while (runp->wcnext != NULL && runp->nwcs == runp->wcnext->nwcs @@ -1928,9 +2006,9 @@ Index: git/locale/programs/ld-collate.c Index: git/locale/programs/ld-ctype.c =================================================================== ---- git.orig/locale/programs/ld-ctype.c 2014-08-29 20:00:47.408070587 -0700 -+++ git/locale/programs/ld-ctype.c 2014-08-29 20:01:15.208070587 -0700 -@@ -957,7 +957,7 @@ +--- git.orig/locale/programs/ld-ctype.c ++++ git/locale/programs/ld-ctype.c +@@ -960,7 +960,7 @@ ctype_output (struct localedef_t *locale allocate_arrays (ctype, charmap, ctype->repertoire); default_missing_len = (ctype->default_missing @@ -1939,7 +2017,7 @@ Index: git/locale/programs/ld-ctype.c : 0); init_locale_data (&file, nelems); -@@ -1968,7 +1968,7 @@ +@@ -1971,7 +1971,7 @@ read_translit_entry (struct linereader * ignore = 1; else /* This value is usable. */ @@ -1948,7 +2026,7 @@ Index: git/locale/programs/ld-ctype.c first = 0; } -@@ -2516,8 +2516,8 @@ +@@ -2519,8 +2519,8 @@ with character code range values one mus } handle_tok_digit: @@ -1959,7 +2037,7 @@ Index: git/locale/programs/ld-ctype.c handle_digits = 1; goto read_charclass; -@@ -4001,8 +4001,7 @@ +@@ -4002,8 +4002,7 @@ allocate_arrays (struct locale_ctype_t * while (idx < number) { @@ -1969,8 +2047,8 @@ Index: git/locale/programs/ld-ctype.c if (res == 0) { replace = 1; -@@ -4039,11 +4038,11 @@ - for (cnt = 0; cnt < number; ++cnt) +@@ -4040,11 +4039,11 @@ allocate_arrays (struct locale_ctype_t * + for (size_t cnt = 0; cnt < number; ++cnt) { struct translit_to_t *srunp; - from_len += wcslen ((const wchar_t *) sorted[cnt]->from) + 1; @@ -1983,7 +2061,7 @@ Index: git/locale/programs/ld-ctype.c srunp = srunp->next; } /* Plus one for the extra NUL character marking the end of -@@ -4067,18 +4066,18 @@ +@@ -4068,18 +4067,18 @@ allocate_arrays (struct locale_ctype_t * ctype->translit_from_idx[cnt] = from_len; ctype->translit_to_idx[cnt] = to_len; @@ -2010,8 +2088,8 @@ Index: git/locale/programs/ld-ctype.c } Index: git/locale/programs/ld-messages.c =================================================================== ---- git.orig/locale/programs/ld-messages.c 2014-08-29 20:00:47.412070587 -0700 -+++ git/locale/programs/ld-messages.c 2014-08-29 20:01:15.208070587 -0700 +--- git.orig/locale/programs/ld-messages.c ++++ git/locale/programs/ld-messages.c @@ -25,6 +25,7 @@ #include <string.h> #include <stdint.h> @@ -2020,7 +2098,7 @@ Index: git/locale/programs/ld-messages.c #include <assert.h> -@@ -124,6 +125,7 @@ +@@ -124,6 +125,7 @@ No definition for %s category found"), " } else { @@ -2028,7 +2106,7 @@ Index: git/locale/programs/ld-messages.c int result; regex_t re; -@@ -140,6 +142,7 @@ +@@ -140,6 +142,7 @@ No definition for %s category found"), " } else if (result != 0) regfree (&re); @@ -2036,7 +2114,7 @@ Index: git/locale/programs/ld-messages.c } if (messages->noexpr == NULL) -@@ -158,6 +161,7 @@ +@@ -158,6 +161,7 @@ No definition for %s category found"), " } else { @@ -2044,7 +2122,7 @@ Index: git/locale/programs/ld-messages.c int result; regex_t re; -@@ -174,6 +178,7 @@ +@@ -174,6 +178,7 @@ No definition for %s category found"), " } else if (result != 0) regfree (&re); @@ -2054,9 +2132,9 @@ Index: git/locale/programs/ld-messages.c Index: git/locale/programs/ld-time.c =================================================================== ---- git.orig/locale/programs/ld-time.c 2014-08-29 20:00:47.412070587 -0700 -+++ git/locale/programs/ld-time.c 2014-08-29 20:01:15.208070587 -0700 -@@ -215,8 +215,10 @@ +--- git.orig/locale/programs/ld-time.c ++++ git/locale/programs/ld-time.c +@@ -215,8 +215,10 @@ No definition for %s category found"), " } else { @@ -2068,7 +2146,7 @@ Index: git/locale/programs/ld-time.c } } -@@ -226,7 +228,7 @@ +@@ -226,7 +228,7 @@ No definition for %s category found"), " const int days_per_month[12] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31 ,30, 31 }; size_t idx; @@ -2077,7 +2155,7 @@ Index: git/locale/programs/ld-time.c time->era_entries = (struct era_data *) xmalloc (time->num_era -@@ -464,18 +466,18 @@ +@@ -464,18 +466,18 @@ No definition for %s category found"), " } /* Now generate the wide character name and format. */ @@ -2103,7 +2181,7 @@ Index: git/locale/programs/ld-time.c } else time->era_entries[idx].wname = -@@ -530,7 +532,16 @@ +@@ -530,7 +532,16 @@ No definition for %s category found"), " if (time->date_fmt == NULL) time->date_fmt = "%a %b %e %H:%M:%S %Z %Y"; if (time->wdate_fmt == NULL) @@ -2123,9 +2201,9 @@ Index: git/locale/programs/ld-time.c Index: git/locale/programs/linereader.c =================================================================== ---- git.orig/locale/programs/linereader.c 2014-08-29 20:00:47.412070587 -0700 -+++ git/locale/programs/linereader.c 2014-08-29 20:01:15.208070587 -0700 -@@ -595,7 +595,7 @@ +--- git.orig/locale/programs/linereader.c ++++ git/locale/programs/linereader.c +@@ -595,7 +595,7 @@ get_string (struct linereader *lr, const { int return_widestr = lr->return_widestr; char *buf; @@ -2136,9 +2214,9 @@ Index: git/locale/programs/linereader.c Index: git/locale/programs/localedef.c =================================================================== ---- git.orig/locale/programs/localedef.c 2014-08-29 20:00:47.416070587 -0700 -+++ git/locale/programs/localedef.c 2014-08-29 20:01:15.208070587 -0700 -@@ -114,6 +114,7 @@ +--- git.orig/locale/programs/localedef.c ++++ git/locale/programs/localedef.c +@@ -114,6 +114,7 @@ void (*argp_program_version_hook) (FILE #define OPT_LIST_ARCHIVE 309 #define OPT_LITTLE_ENDIAN 400 #define OPT_BIG_ENDIAN 401 @@ -2146,7 +2224,7 @@ Index: git/locale/programs/localedef.c /* Definitions of arguments for argp functions. */ static const struct argp_option options[] = -@@ -150,6 +151,8 @@ +@@ -150,6 +151,8 @@ static const struct argp_option options[ N_("Generate little-endian output") }, { "big-endian", OPT_BIG_ENDIAN, NULL, 0, N_("Generate big-endian output") }, @@ -2155,7 +2233,7 @@ Index: git/locale/programs/localedef.c { NULL, 0, NULL, 0, NULL } }; -@@ -239,12 +242,14 @@ +@@ -239,12 +242,14 @@ main (int argc, char *argv[]) ctype locale. (P1003.2 4.35.5.2) */ setlocale (LC_CTYPE, "POSIX"); @@ -2170,7 +2248,7 @@ Index: git/locale/programs/localedef.c /* Process charmap file. */ charmap = charmap_read (charmap_file, verbose, 1, be_quiet, 1); -@@ -338,6 +343,9 @@ +@@ -338,6 +343,9 @@ parse_opt (int key, char *arg, struct ar case OPT_BIG_ENDIAN: set_big_endian (true); break; @@ -2182,9 +2260,9 @@ Index: git/locale/programs/localedef.c break; Index: git/locale/programs/locfile.c =================================================================== ---- git.orig/locale/programs/locfile.c 2014-08-29 20:00:47.432070587 -0700 -+++ git/locale/programs/locfile.c 2014-08-29 20:01:15.208070587 -0700 -@@ -544,6 +544,9 @@ +--- git.orig/locale/programs/locfile.c ++++ git/locale/programs/locfile.c +@@ -544,6 +544,9 @@ compare_files (const char *filename1, co machine running localedef. */ bool swap_endianness_p; @@ -2194,7 +2272,7 @@ Index: git/locale/programs/locfile.c /* When called outside a start_locale_structure/end_locale_structure or start_locale_prelude/end_locale_prelude block, record that the next byte in FILE's obstack will be the first byte of a new element. -@@ -621,7 +624,7 @@ +@@ -621,7 +624,7 @@ add_locale_string (struct locale_file *f void add_locale_wstring (struct locale_file *file, const uint32_t *string) { @@ -2205,9 +2283,9 @@ Index: git/locale/programs/locfile.c /* Record that FILE's next element is the 32-bit integer VALUE. */ Index: git/locale/programs/locfile.h =================================================================== ---- git.orig/locale/programs/locfile.h 2014-08-29 20:00:47.432070587 -0700 -+++ git/locale/programs/locfile.h 2014-08-29 20:01:15.208070587 -0700 -@@ -71,6 +71,8 @@ +--- git.orig/locale/programs/locfile.h ++++ git/locale/programs/locfile.h +@@ -71,6 +71,8 @@ extern void write_all_categories (struct extern bool swap_endianness_p; @@ -2216,11 +2294,37 @@ Index: git/locale/programs/locfile.h /* Change the output to be big-endian if BIG_ENDIAN is true and little-endian otherwise. */ static inline void -@@ -275,4 +277,49 @@ +@@ -89,7 +91,8 @@ maybe_swap_uint32 (uint32_t value) + } + + /* Likewise, but munge an array of N uint32_ts starting at ARRAY. */ +-static inline void ++static void ++__attribute__ ((unused)) + maybe_swap_uint32_array (uint32_t *array, size_t n) + { + if (swap_endianness_p) +@@ -99,7 +102,8 @@ maybe_swap_uint32_array (uint32_t *array + + /* Like maybe_swap_uint32_array, but the array of N elements is at + the end of OBSTACK's current object. */ +-static inline void ++static void ++__attribute__ ((unused)) + maybe_swap_uint32_obstack (struct obstack *obstack, size_t n) + { + maybe_swap_uint32_array ((uint32_t *) obstack_next_free (obstack) - n, n); +@@ -276,4 +280,55 @@ extern void identification_output (struc const struct charmap_t *charmap, const char *output_path); -+static inline size_t ++static size_t wcslen_uint32 (const uint32_t *str) __attribute__ ((unused)); ++static uint32_t * wmemcpy_uint32 (uint32_t *s1, const uint32_t *s2, size_t n) __attribute__ ((unused)); ++static uint32_t * wcschr_uint32 (const uint32_t *s, uint32_t ch) __attribute__ ((unused)); ++static int wcscmp_uint32 (const uint32_t *s1, const uint32_t *s2) __attribute__ ((unused)); ++static int wmemcmp_uint32 (const uint32_t *s1, const uint32_t *s2, size_t n) __attribute__ ((unused)); ++ ++static size_t +wcslen_uint32 (const uint32_t *str) +{ + size_t len = 0; @@ -2229,7 +2333,7 @@ Index: git/locale/programs/locfile.h + return len; +} + -+static inline int ++static int +wmemcmp_uint32 (const uint32_t *s1, const uint32_t *s2, size_t n) +{ + while (n-- != 0) @@ -2241,7 +2345,7 @@ Index: git/locale/programs/locfile.h + return 0; +} + -+static inline int ++static int +wcscmp_uint32 (const uint32_t *s1, const uint32_t *s2) +{ + while (*s1 != 0 && *s1 == *s2) @@ -2249,13 +2353,13 @@ Index: git/locale/programs/locfile.h + return *s1 - *s2; +} + -+static inline uint32_t * ++static uint32_t * +wmemcpy_uint32 (uint32_t *s1, const uint32_t *s2, size_t n) +{ + return memcpy (s1, s2, n * sizeof (uint32_t)); +} + -+static inline uint32_t * ++static uint32_t * +wcschr_uint32 (const uint32_t *s, uint32_t ch) +{ + do @@ -2268,9 +2372,9 @@ Index: git/locale/programs/locfile.h #endif /* locfile.h */ Index: git/locale/setlocale.c =================================================================== ---- git.orig/locale/setlocale.c 2014-08-29 20:00:47.432070587 -0700 -+++ git/locale/setlocale.c 2014-08-29 20:01:15.208070587 -0700 -@@ -64,36 +64,6 @@ +--- git.orig/locale/setlocale.c ++++ git/locale/setlocale.c +@@ -64,36 +64,6 @@ static char *const _nl_current_used[] = #endif @@ -2309,8 +2413,8 @@ Index: git/locale/setlocale.c #else Index: git/locale/xlocale.c =================================================================== ---- git.orig/locale/xlocale.c 2014-08-29 20:00:47.436070587 -0700 -+++ git/locale/xlocale.c 2014-08-29 20:01:15.208070587 -0700 +--- git.orig/locale/xlocale.c ++++ git/locale/xlocale.c @@ -18,6 +18,7 @@ <http://www.gnu.org/licenses/>. */ @@ -2319,7 +2423,7 @@ Index: git/locale/xlocale.c #include "localeinfo.h" #define DEFINE_CATEGORY(category, category_name, items, a) \ -@@ -25,6 +26,19 @@ +@@ -25,6 +26,19 @@ extern struct __locale_data _nl_C_##cate #include "categories.def" #undef DEFINE_CATEGORY @@ -2339,7 +2443,7 @@ Index: git/locale/xlocale.c /* Defined in locale/C-ctype.c. */ extern const char _nl_C_LC_CTYPE_class[] attribute_hidden; extern const char _nl_C_LC_CTYPE_toupper[] attribute_hidden; -@@ -52,3 +66,26 @@ +@@ -52,3 +66,26 @@ const struct __locale_struct _nl_C_locob .__ctype_tolower = (const int *) _nl_C_LC_CTYPE_tolower + 128, .__ctype_toupper = (const int *) _nl_C_LC_CTYPE_toupper + 128 }; @@ -2368,9 +2472,9 @@ Index: git/locale/xlocale.c +#endif /* __OPTION_EGLIBC_LOCALE_CODE */ Index: git/localedata/Makefile =================================================================== ---- git.orig/localedata/Makefile 2014-08-29 20:00:47.444070587 -0700 -+++ git/localedata/Makefile 2014-08-29 20:01:15.212070587 -0700 -@@ -21,12 +21,22 @@ +--- git.orig/localedata/Makefile ++++ git/localedata/Makefile +@@ -21,12 +21,22 @@ subdir := localedata include ../Makeconfig @@ -2396,7 +2500,7 @@ Index: git/localedata/Makefile subdir-dirs = tests-mbwc vpath %.c tests-mbwc -@@ -71,14 +81,20 @@ +@@ -71,14 +81,20 @@ locale_test_suite := tst_iswalnum tst_is tst_wcsxfrm tst_wctob tst_wctomb tst_wctrans \ tst_wctype tst_wcwidth @@ -2419,39 +2523,23 @@ Index: git/localedata/Makefile ifneq (no,$(PERL)) tests-special += $(objpfx)mtrace-tst-leaks.out endif -@@ -92,12 +108,14 @@ - - tests: $(objdir)/iconvdata/gconv-modules +@@ -95,6 +111,7 @@ tests: $(objdir)/iconvdata/gconv-modules + tests-static += tst-langinfo-static + ifeq ($(run-built-tests),yes) +ifeq (y,$(OPTION_EGLIBC_LOCALE_CODE)) tests-special += $(objpfx)sort-test.out $(objpfx)tst-fmon.out \ $(objpfx)tst-locale.out $(objpfx)tst-rpmatch.out \ $(objpfx)tst-trans.out $(objpfx)tst-ctype.out \ - $(objpfx)tst-langinfo.out $(objpfx)tst-langinfo-static.out \ - $(objpfx)tst-numeric.out - tests-static += tst-langinfo-static +@@ -113,6 +130,7 @@ CHARMAPS := $(shell echo "$(LOCALES)" | + CTYPE_FILES = $(addsuffix /LC_CTYPE,$(LOCALES)) + tests-special += $(addprefix $(objpfx),$(CTYPE_FILES)) + endif +endif - ifeq ($(run-built-tests),yes) - # We have to generate locales -@@ -143,9 +161,13 @@ - $(addprefix $(objpfx),$(CTYPE_FILES)): %: \ - gen-locale.sh $(common-objpfx)locale/localedef Makefile \ - $(addprefix charmaps/,$(CHARMAPS)) $(addprefix locales/,$(LOCALE_SRCS)) -- @$(SHELL) gen-locale.sh $(common-objpfx) \ -- '$(built-program-cmd-before-env)' '$(run-program-env)' \ -- '$(built-program-cmd-after-env)' $@; \ -+ @$(SHELL) gen-locale.sh $(common-objpfx) \ -+ '$(if $(cross-localedef), \ -+ $(cross-localedef), \ -+ $(built-program-cmd-before-env) \ -+ $(run-program-env) \ -+ $(built-program-cmd-after-env))' \ -+ $@; \ - $(evaluate-test) + include ../Rules - $(addsuffix .out,$(addprefix $(objpfx),$(tests))): %: \ -@@ -213,6 +235,11 @@ +@@ -205,6 +223,11 @@ endif include SUPPORTED @@ -2465,8 +2553,8 @@ Index: git/localedata/Makefile # Sometimes the whole collection of locale files should be installed. Index: git/login/Makefile =================================================================== ---- git.orig/login/Makefile 2014-08-29 20:00:47.736070587 -0700 -+++ git/login/Makefile 2014-08-29 20:01:15.212070587 -0700 +--- git.orig/login/Makefile ++++ git/login/Makefile @@ -18,6 +18,7 @@ # # Sub-makefile for login portion of the library. @@ -2475,7 +2563,7 @@ Index: git/login/Makefile subdir := login -@@ -25,14 +26,16 @@ +@@ -25,14 +26,16 @@ include ../Makeconfig headers := utmp.h bits/utmp.h lastlog.h pty.h @@ -2497,7 +2585,7 @@ Index: git/login/Makefile ifeq (yes,$(build-pt-chown)) others += pt_chown -@@ -46,8 +49,8 @@ +@@ -46,8 +49,8 @@ vpath %.c programs tests := tst-utmp tst-utmpx tst-grantpt tst-ptsname # Build the -lutil library with these extra functions. @@ -2510,9 +2598,9 @@ Index: git/login/Makefile Index: git/Makeconfig =================================================================== ---- git.orig/Makeconfig 2014-08-29 20:00:42.956070587 -0700 -+++ git/Makeconfig 2014-08-29 20:01:15.212070587 -0700 -@@ -582,7 +582,7 @@ +--- git.orig/Makeconfig ++++ git/Makeconfig +@@ -582,7 +582,7 @@ elf-objpfx = $(common-objpfx)elf/ # and run on the build system, causes that program with those # arguments to be run on the host for which the library is built. ifndef test-wrapper @@ -2521,7 +2609,7 @@ Index: git/Makeconfig endif # Likewise, but the name of the program is preceded by # <variable>=<value> assignments for environment variables. -@@ -1057,6 +1057,24 @@ +@@ -1055,6 +1055,24 @@ else libm = $(common-objpfx)math/libm.a endif @@ -2548,9 +2636,9 @@ Index: git/Makeconfig # dependencies. Index: git/Makerules =================================================================== ---- git.orig/Makerules 2014-08-29 20:00:42.960070587 -0700 -+++ git/Makerules 2014-08-29 20:01:15.212070587 -0700 -@@ -379,6 +379,25 @@ +--- git.orig/Makerules ++++ git/Makerules +@@ -446,6 +446,25 @@ define sed-remove-objpfx endef endif @@ -2578,8 +2666,8 @@ Index: git/Makerules ifeq (yes,$(build-shared)) Index: git/malloc/Makefile =================================================================== ---- git.orig/malloc/Makefile 2014-08-29 20:00:47.760070587 -0700 -+++ git/malloc/Makefile 2014-08-29 20:01:15.212070587 -0700 +--- git.orig/malloc/Makefile ++++ git/malloc/Makefile @@ -18,6 +18,8 @@ # # Makefile for malloc routines @@ -2589,7 +2677,7 @@ Index: git/malloc/Makefile subdir := malloc include ../Makeconfig -@@ -36,9 +38,15 @@ +@@ -36,9 +38,15 @@ install-lib := libmcheck.a non-lib.a := libmcheck.a # Additional library. @@ -2605,7 +2693,7 @@ Index: git/malloc/Makefile libmemusage-routines = memusage libmemusage-inhibit-o = $(filter-out .os,$(object-suffixes)) -@@ -67,7 +75,7 @@ +@@ -65,7 +73,7 @@ endif # Unless we get a test for the availability of libgd which also works # for cross-compiling we disable the memusagestat generation in this # situation. @@ -2616,8 +2704,8 @@ Index: git/malloc/Makefile others: $(objpfx)memusage Index: git/malloc/memusage.c =================================================================== ---- git.orig/malloc/memusage.c 2014-08-29 20:00:47.768070587 -0700 -+++ git/malloc/memusage.c 2014-08-29 20:01:15.212070587 -0700 +--- git.orig/malloc/memusage.c ++++ git/malloc/memusage.c @@ -33,6 +33,7 @@ #include <stdint.h> #include <sys/mman.h> @@ -2626,7 +2714,7 @@ Index: git/malloc/memusage.c #include <memusage.h> -@@ -93,7 +94,11 @@ +@@ -93,7 +94,11 @@ static __thread uintptr_t start_sp; #define peak_stack peak_use[1] #define peak_total peak_use[2] @@ -2641,9 +2729,9 @@ Index: git/malloc/memusage.c static int fd = -1; Index: git/malloc/memusage.sh =================================================================== ---- git.orig/malloc/memusage.sh 2014-08-29 20:00:47.768070587 -0700 -+++ git/malloc/memusage.sh 2014-08-29 20:01:15.212070587 -0700 -@@ -35,7 +35,7 @@ +--- git.orig/malloc/memusage.sh ++++ git/malloc/memusage.sh +@@ -35,7 +35,7 @@ do_missing_arg() { # Print help message do_help() { @@ -2654,9 +2742,9 @@ Index: git/malloc/memusage.sh -n,--progname=NAME Name of the program file to profile Index: git/math/Makefile =================================================================== ---- git.orig/math/Makefile 2014-08-29 20:00:47.836070587 -0700 -+++ git/math/Makefile 2014-08-29 20:01:15.212070587 -0700 -@@ -21,6 +21,8 @@ +--- git.orig/math/Makefile ++++ git/math/Makefile +@@ -21,6 +21,8 @@ subdir := math include ../Makeconfig @@ -2665,7 +2753,7 @@ Index: git/math/Makefile # Installed header files. headers := math.h bits/mathcalls.h bits/mathinline.h bits/huge_val.h \ bits/huge_valf.h bits/huge_vall.h bits/inf.h bits/nan.h \ -@@ -33,8 +35,8 @@ +@@ -33,8 +35,8 @@ aux := setfpucw fpu_control # Build the -lm library. @@ -2674,12 +2762,12 @@ Index: git/math/Makefile +extra-libs-$(OPTION_EGLIBC_LIBM) := libm +extra-libs-others-$(OPTION_EGLIBC_LIBM) = $(extra-libs-$(OPTION_EGLIBC_LIBM)) - libm-support = k_standard s_lib_version s_matherr s_signgam \ + libm-support = s_lib_version s_matherr s_signgam \ fclrexcpt fgetexcptflg fraiseexcpt fsetexcptflg \ Index: git/misc/err.c =================================================================== ---- git.orig/misc/err.c 2014-08-29 20:00:48.232070587 -0700 -+++ git/misc/err.c 2014-08-29 20:01:15.212070587 -0700 +--- git.orig/misc/err.c ++++ git/misc/err.c @@ -22,6 +22,7 @@ #include <errno.h> #include <string.h> @@ -2688,7 +2776,7 @@ Index: git/misc/err.c #include <wchar.h> #define flockfile(s) _IO_flockfile (s) -@@ -37,6 +38,7 @@ +@@ -37,6 +38,7 @@ extern char *__progname; va_end (ap); \ } @@ -2696,7 +2784,7 @@ Index: git/misc/err.c static void convert_and_print (const char *format, __gnuc_va_list ap) { -@@ -81,6 +83,7 @@ +@@ -81,6 +83,7 @@ convert_and_print (const char *format, _ __vfwprintf (stderr, wformat, ap); } @@ -2704,7 +2792,7 @@ Index: git/misc/err.c void vwarnx (const char *format, __gnuc_va_list ap) -@@ -88,9 +91,13 @@ +@@ -88,9 +91,13 @@ vwarnx (const char *format, __gnuc_va_li flockfile (stderr); if (_IO_fwide (stderr, 0) > 0) { @@ -2718,7 +2806,7 @@ Index: git/misc/err.c } else { -@@ -111,6 +118,7 @@ +@@ -111,6 +118,7 @@ vwarn (const char *format, __gnuc_va_lis flockfile (stderr); if (_IO_fwide (stderr, 0) > 0) { @@ -2726,7 +2814,7 @@ Index: git/misc/err.c __fwprintf (stderr, L"%s: ", __progname); if (format) { -@@ -119,6 +127,9 @@ +@@ -119,6 +127,9 @@ vwarn (const char *format, __gnuc_va_lis } __set_errno (error); __fwprintf (stderr, L"%m\n"); @@ -2738,8 +2826,8 @@ Index: git/misc/err.c { Index: git/misc/error.c =================================================================== ---- git.orig/misc/error.c 2014-08-29 20:00:48.232070587 -0700 -+++ git/misc/error.c 2014-08-29 20:01:15.212070587 -0700 +--- git.orig/misc/error.c ++++ git/misc/error.c @@ -35,6 +35,7 @@ #endif @@ -2748,7 +2836,7 @@ Index: git/misc/error.c # include <libintl.h> # include <stdbool.h> # include <stdint.h> -@@ -205,6 +206,7 @@ +@@ -205,6 +206,7 @@ error_tail (int status, int errnum, cons #if _LIBC if (_IO_fwide (stderr, 0) > 0) { @@ -2756,7 +2844,7 @@ Index: git/misc/error.c size_t len = strlen (message) + 1; wchar_t *wmessage = NULL; mbstate_t st; -@@ -265,6 +267,9 @@ +@@ -265,6 +267,9 @@ error_tail (int status, int errnum, cons if (use_malloc) free (wmessage); @@ -2768,8 +2856,8 @@ Index: git/misc/error.c #endif Index: git/misc/Makefile =================================================================== ---- git.orig/misc/Makefile 2014-08-29 20:00:48.232070587 -0700 -+++ git/misc/Makefile 2014-08-29 20:01:15.212070587 -0700 +--- git.orig/misc/Makefile ++++ git/misc/Makefile @@ -19,6 +19,10 @@ # Sub-makefile for misc portion of the library. # @@ -2781,7 +2869,7 @@ Index: git/misc/Makefile subdir := misc include ../Makeconfig -@@ -46,40 +50,47 @@ +@@ -46,40 +50,47 @@ routines := brk sbrk sstk ioctl \ select pselect \ acct chroot fsync sync fdatasync syncfs reboot \ gethostid sethostid \ @@ -2836,31 +2924,11 @@ Index: git/misc/Makefile CFLAGS-select.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-tsearch.c = $(uses-callbacks) -Index: git/misc/sys/xattr.h -=================================================================== ---- git.orig/misc/sys/xattr.h 2014-08-29 20:00:52.644070587 -0700 -+++ git/misc/sys/xattr.h 2014-08-29 20:01:15.216070587 -0700 -@@ -26,7 +26,6 @@ - - /* The following constants should be used for the fifth parameter of - `*setxattr'. */ --#ifndef __USE_KERNEL_XATTR_DEFS - enum - { - XATTR_CREATE = 1, /* set value, fail if attr already exists. */ -@@ -34,7 +33,6 @@ - XATTR_REPLACE = 2 /* set value, fail if attr does not exist. */ - #define XATTR_REPLACE XATTR_REPLACE - }; --#endif - - /* Set the attribute NAME of the file pointed to by PATH to VALUE (which - is SIZE bytes long). Return 0 on success, -1 for errors. */ Index: git/misc/tst-efgcvt.c =================================================================== ---- git.orig/misc/tst-efgcvt.c 2014-08-29 20:00:52.652070587 -0700 -+++ git/misc/tst-efgcvt.c 2014-08-29 20:01:15.216070587 -0700 -@@ -59,7 +59,7 @@ +--- git.orig/misc/tst-efgcvt.c ++++ git/misc/tst-efgcvt.c +@@ -59,7 +59,7 @@ static testcase ecvt_tests[] = { 123.01, -4, 3, "" }, { 126.71, -4, 3, "" }, { 0.0, 4, 1, "0000" }, @@ -2871,8 +2939,8 @@ Index: git/misc/tst-efgcvt.c #endif Index: git/nis/Makefile =================================================================== ---- git.orig/nis/Makefile 2014-08-29 20:00:52.660070587 -0700 -+++ git/nis/Makefile 2014-08-29 20:01:15.216070587 -0700 +--- git.orig/nis/Makefile ++++ git/nis/Makefile @@ -18,6 +18,8 @@ # # Makefile for NIS/NIS+ part. @@ -2882,7 +2950,7 @@ Index: git/nis/Makefile subdir := nis include ../Makeconfig -@@ -30,19 +32,26 @@ +@@ -30,19 +32,26 @@ endif # These are the databases available for the nis (and perhaps later nisplus) # service. This must be a superset of the services in nss. @@ -2915,7 +2983,7 @@ Index: git/nis/Makefile vpath %.c $(subdir-dirs) libnsl-routines = yp_xdr ypclnt ypupdate_xdr \ -@@ -60,11 +69,11 @@ +@@ -60,11 +69,11 @@ libnsl-routines = yp_xdr ypclnt ypupdate libnss_compat-routines := $(addprefix compat-,grp pwd spwd initgroups) libnss_compat-inhibit-o = $(filter-out .os,$(object-suffixes)) @@ -2929,7 +2997,7 @@ Index: git/nis/Makefile nss-nisplus nisplus-initgroups libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes)) -@@ -80,12 +89,12 @@ +@@ -80,12 +89,12 @@ libnsl-libc = $(common-objpfx)linkobj/li # Target-specific variable setting to link objects using deprecated # RPC interfaces with the version of libc.so that makes them available # for new links: @@ -2947,8 +3015,8 @@ Index: git/nis/Makefile endif Index: git/nptl/Makefile =================================================================== ---- git.orig/nptl/Makefile 2014-08-29 20:00:52.704070587 -0700 -+++ git/nptl/Makefile 2014-08-29 20:01:15.216070587 -0700 +--- git.orig/nptl/Makefile ++++ git/nptl/Makefile @@ -18,6 +18,8 @@ # # Sub-makefile for NPTL portion of the library. @@ -2958,7 +3026,7 @@ Index: git/nptl/Makefile subdir := nptl include ../Makeconfig -@@ -116,7 +118,7 @@ +@@ -117,7 +119,7 @@ libpthread-routines = nptl-init vars eve pt-raise pt-system \ flockfile ftrylockfile funlockfile \ sigaction \ @@ -2967,7 +3035,7 @@ Index: git/nptl/Makefile pthread_kill_other_threads \ pthread_getaffinity pthread_setaffinity \ pthread_attr_getaffinity pthread_attr_setaffinity \ -@@ -136,6 +138,8 @@ +@@ -137,6 +139,8 @@ libpthread-routines = nptl-init vars eve # pthread_setgid pthread_setegid pthread_setregid \ # pthread_setresgid @@ -2976,7 +3044,7 @@ Index: git/nptl/Makefile libpthread-shared-only-routines = version pt-allocrtsig unwind-forcedunwind libpthread-static-only-routines = pthread_atfork -@@ -210,7 +214,7 @@ +@@ -211,7 +215,7 @@ tests = tst-typesizes \ tst-mutexpi1 tst-mutexpi2 tst-mutexpi3 tst-mutexpi4 tst-mutexpi5 \ tst-mutexpi5a tst-mutexpi6 tst-mutexpi7 tst-mutexpi7a tst-mutexpi8 \ tst-mutexpi9 \ @@ -2985,7 +3053,7 @@ Index: git/nptl/Makefile tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 tst-cond7 \ tst-cond8 tst-cond9 tst-cond10 tst-cond11 tst-cond12 tst-cond13 \ tst-cond14 tst-cond15 tst-cond16 tst-cond17 tst-cond18 tst-cond19 \ -@@ -244,14 +248,14 @@ +@@ -245,14 +249,14 @@ tests = tst-typesizes \ tst-cancel6 tst-cancel7 tst-cancel8 tst-cancel9 tst-cancel10 \ tst-cancel11 tst-cancel12 tst-cancel13 tst-cancel14 tst-cancel15 \ tst-cancel16 tst-cancel17 tst-cancel18 tst-cancel19 tst-cancel20 \ @@ -3001,8 +3069,8 @@ Index: git/nptl/Makefile + tst-exec2 tst-exec3 tst-exec4 \ tst-exit1 tst-exit2 tst-exit3 \ tst-stdio1 tst-stdio2 \ - tst-stack1 tst-stack2 tst-stack3 tst-pthread-getattr \ -@@ -259,13 +263,12 @@ + tst-stack1 tst-stack2 tst-stack3 tst-stack4 tst-pthread-getattr \ +@@ -260,13 +264,12 @@ tests = tst-typesizes \ tst-unload \ tst-dlsym1 \ tst-sysconf \ @@ -3017,7 +3085,7 @@ Index: git/nptl/Makefile tst-abstime \ tst-vfork1 tst-vfork2 tst-vfork1x tst-vfork2x \ tst-getpid1 tst-getpid2 tst-getpid3 \ -@@ -275,6 +278,17 @@ +@@ -277,6 +280,17 @@ xtests = tst-setuid1 tst-setuid1-static tst-mutexpp1 tst-mutexpp6 tst-mutexpp10 test-srcs = tst-oddstacklimit @@ -3037,17 +3105,17 @@ Index: git/nptl/Makefile Index: git/nptl/pthread_create.c =================================================================== ---- git.orig/nptl/pthread_create.c 2014-08-29 20:00:52.764070587 -0700 -+++ git/nptl/pthread_create.c 2014-08-29 20:01:15.216070587 -0700 -@@ -31,6 +31,7 @@ - #include <kernel-features.h> +--- git.orig/nptl/pthread_create.c ++++ git/nptl/pthread_create.c +@@ -32,6 +32,7 @@ #include <exit-thread.h> + #include <default-sched.h> +#include <gnu/option-groups.h> #include <shlib-compat.h> #include <stap-probe.h> -@@ -240,8 +241,10 @@ +@@ -261,8 +262,10 @@ START_THREAD_DEFN THREAD_SETMEM (pd, cpuclock_offset, now); #endif @@ -3058,7 +3126,7 @@ Index: git/nptl/pthread_create.c /* Initialize pointers to locale data. */ __ctype_init (); -@@ -322,8 +325,10 @@ +@@ -345,8 +348,10 @@ START_THREAD_DEFN /* Run the destructor for the thread-local data. */ __nptl_deallocate_tsd (); @@ -3071,8 +3139,8 @@ Index: git/nptl/pthread_create.c do not notify the debugger, it might just irritate it if there Index: git/nscd/Makefile =================================================================== ---- git.orig/nscd/Makefile 2014-08-29 20:00:52.948070587 -0700 -+++ git/nscd/Makefile 2014-08-29 20:01:15.216070587 -0700 +--- git.orig/nscd/Makefile ++++ git/nscd/Makefile @@ -18,14 +18,17 @@ # # Sub-makefile for nscd portion of the library. @@ -3093,7 +3161,7 @@ Index: git/nscd/Makefile endif # To find xmalloc.c -@@ -37,14 +40,18 @@ +@@ -37,14 +40,18 @@ nscd-modules := nscd connections pwdcach dbg_log nscd_conf nscd_stat cache mem nscd_setup_thread \ xmalloc xstrdup aicache initgrcache gai res_hconf \ netgroupcache @@ -3117,7 +3185,7 @@ Index: git/nscd/Makefile endif -@@ -101,7 +108,15 @@ +@@ -100,7 +107,15 @@ include $(patsubst %,$(..)cppflags-itera $(objpfx)nscd: $(nscd-modules:%=$(objpfx)%.o) ifeq ($(build-shared),yes) @@ -3137,16 +3205,16 @@ Index: git/nscd/Makefile endif Index: git/nscd/nis_hash.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ git/nscd/nis_hash.c 2014-08-29 20:01:15.216070587 -0700 +--- /dev/null ++++ git/nscd/nis_hash.c @@ -0,0 +1,3 @@ +/* If OPTION_EGLIBC_NIS is disabled, nscd can't get this from libnsl.so; + we need our own copy. */ +#include "../nis/nis_hash.c" Index: git/nss/fixed-nsswitch.conf =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ git/nss/fixed-nsswitch.conf 2014-08-29 20:01:15.216070587 -0700 +--- /dev/null ++++ git/nss/fixed-nsswitch.conf @@ -0,0 +1,22 @@ +# /etc/nsswitch.conf +# @@ -3172,8 +3240,8 @@ Index: git/nss/fixed-nsswitch.conf +netgroup: files Index: git/nss/fixed-nsswitch.functions =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ git/nss/fixed-nsswitch.functions 2014-08-29 20:01:15.216070587 -0700 +--- /dev/null ++++ git/nss/fixed-nsswitch.functions @@ -0,0 +1,121 @@ +/* List of functions defined for fixed NSS in GNU C Library. + Copyright (C) 1996, 1997, 1998, 2005 Free Software Foundation, Inc. @@ -3298,8 +3366,8 @@ Index: git/nss/fixed-nsswitch.functions +DEFINE_GET (shadow, files, spnam) Index: git/nss/gen-fixed-nsswitch.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ git/nss/gen-fixed-nsswitch.c 2014-08-29 20:01:15.216070587 -0700 +--- /dev/null ++++ git/nss/gen-fixed-nsswitch.c @@ -0,0 +1,803 @@ +/* gen-fixed-nsswitch.c --- generate fixed name service data structures + Copyright (C) 1996-1999, 2001-2006, 2007 Free Software Foundation, Inc. @@ -4106,8 +4174,8 @@ Index: git/nss/gen-fixed-nsswitch.c +} Index: git/nss/getent.c =================================================================== ---- git.orig/nss/getent.c 2014-08-29 20:00:52.976070587 -0700 -+++ git/nss/getent.c 2014-08-29 20:01:15.216070587 -0700 +--- git.orig/nss/getent.c ++++ git/nss/getent.c @@ -39,6 +39,7 @@ #include <netinet/ether.h> #include <netinet/in.h> @@ -4116,7 +4184,7 @@ Index: git/nss/getent.c /* Get libc version number. */ #include <version.h> -@@ -91,6 +92,7 @@ +@@ -91,6 +92,7 @@ warranty; not even for MERCHANTABILITY o fprintf (stream, gettext ("Written by %s.\n"), "Thorsten Kukuk"); } @@ -4124,7 +4192,7 @@ Index: git/nss/getent.c /* This is for aliases */ static void print_aliases (struct aliasent *alias) -@@ -135,7 +137,9 @@ +@@ -135,7 +137,9 @@ aliases_keys (int number, char *key[]) return result; } @@ -4134,7 +4202,7 @@ Index: git/nss/getent.c /* This is for ethers */ static int ethers_keys (int number, char *key[]) -@@ -179,6 +183,7 @@ +@@ -179,6 +183,7 @@ ethers_keys (int number, char *key[]) return result; } @@ -4142,7 +4210,7 @@ Index: git/nss/getent.c /* This is for group */ static void -@@ -301,6 +306,7 @@ +@@ -301,6 +306,7 @@ gshadow_keys (int number, char *key[]) return result; } @@ -4150,7 +4218,7 @@ Index: git/nss/getent.c /* This is for hosts */ static void print_hosts (struct hostent *host) -@@ -598,6 +604,7 @@ +@@ -598,6 +604,7 @@ networks_keys (int number, char *key[]) return result; } @@ -4158,7 +4226,7 @@ Index: git/nss/getent.c /* Now is all for passwd */ static void -@@ -650,6 +657,7 @@ +@@ -650,6 +657,7 @@ passwd_keys (int number, char *key[]) return result; } @@ -4166,7 +4234,7 @@ Index: git/nss/getent.c /* This is for protocols */ static void print_protocols (struct protoent *proto) -@@ -805,6 +813,7 @@ +@@ -805,6 +813,7 @@ services_keys (int number, char *key[]) return result; } @@ -4174,7 +4242,7 @@ Index: git/nss/getent.c /* This is for shadow */ static void -@@ -871,21 +880,34 @@ +@@ -871,21 +880,34 @@ struct } databases[] = { #define D(name) { #name, name ## _keys }, @@ -4204,10 +4272,11 @@ Index: git/nss/getent.c D(group) D(gshadow) -D(hosts) -+DN(hosts) - D(initgroups) +-D(initgroups) -D(netgroup) -D(networks) ++DN(hosts) ++DN(initgroups) +DN(netgroup) +DN(networks) D(passwd) @@ -4222,8 +4291,8 @@ Index: git/nss/getent.c { NULL, NULL } Index: git/nss/getnssent_r.c =================================================================== ---- git.orig/nss/getnssent_r.c 2014-08-29 20:00:52.976070587 -0700 -+++ git/nss/getnssent_r.c 2014-08-29 20:01:15.220070587 -0700 +--- git.orig/nss/getnssent_r.c ++++ git/nss/getnssent_r.c @@ -16,6 +16,7 @@ <http://www.gnu.org/licenses/>. */ @@ -4232,7 +4301,7 @@ Index: git/nss/getnssent_r.c #include <netdb.h> #include "nsswitch.h" -@@ -59,11 +60,13 @@ +@@ -59,11 +60,13 @@ __nss_setent (const char *func_name, db_ } fct; int no_more; @@ -4246,7 +4315,7 @@ Index: git/nss/getnssent_r.c /* Cycle through the services and run their `setXXent' functions until we find an available service. */ -@@ -101,11 +104,13 @@ +@@ -101,11 +104,13 @@ __nss_endent (const char *func_name, db_ } fct; int no_more; @@ -4260,7 +4329,7 @@ Index: git/nss/getnssent_r.c /* Cycle through all the services and run their endXXent functions. */ no_more = setup (func_name, lookup_fct, &fct.ptr, nip, startp, 1); -@@ -141,12 +146,14 @@ +@@ -141,12 +146,14 @@ __nss_getent_r (const char *getent_func_ int no_more; enum nss_status status; @@ -4275,7 +4344,7 @@ Index: git/nss/getnssent_r.c /* Initialize status to return if no more functions are found. */ status = NSS_STATUS_NOTFOUND; -@@ -161,7 +168,7 @@ +@@ -161,7 +168,7 @@ __nss_getent_r (const char *getent_func_ int is_last_nip = *nip == *last_nip; status = DL_CALL_FCT (fct.f, @@ -4286,8 +4355,8 @@ Index: git/nss/getnssent_r.c provided buffer is too small. In this case we should give Index: git/nss/Makefile =================================================================== ---- git.orig/nss/Makefile 2014-08-29 20:00:52.972070587 -0700 -+++ git/nss/Makefile 2014-08-29 20:01:15.220070587 -0700 +--- git.orig/nss/Makefile ++++ git/nss/Makefile @@ -18,29 +18,36 @@ # # Makefile for name service switch. @@ -4333,7 +4402,7 @@ Index: git/nss/Makefile # Specify rules for the nss_* modules. We have some services. services := files db -@@ -55,7 +62,7 @@ +@@ -55,7 +62,7 @@ subdir-dirs = $(services:%=nss_%) vpath %.c $(subdir-dirs) ../locale/programs ../intl @@ -4342,7 +4411,7 @@ Index: git/nss/Makefile files-initgroups files-have_o_cloexec files-init libnss_db-dbs := $(addprefix db-,\ -@@ -78,6 +85,45 @@ +@@ -78,6 +85,45 @@ tests-static = tst-nss-static tests += $(tests-static) endif @@ -4390,8 +4459,8 @@ Index: git/nss/Makefile ifeq (yes,$(have-selinux)) Index: git/nss/nsswitch.c =================================================================== ---- git.orig/nss/nsswitch.c 2014-08-29 20:00:53.004070587 -0700 -+++ git/nss/nsswitch.c 2014-08-29 20:01:15.220070587 -0700 +--- git.orig/nss/nsswitch.c ++++ git/nss/nsswitch.c @@ -26,6 +26,7 @@ #include <stdio_ext.h> #include <stdlib.h> @@ -4416,7 +4485,7 @@ Index: git/nss/nsswitch.c /* Prototypes for the local functions. */ static name_database *nss_parse_file (const char *fname) internal_function; static name_database_entry *nss_getline (char *line) internal_function; -@@ -79,6 +89,9 @@ +@@ -79,6 +89,9 @@ bool __nss_database_custom[NSS_DBSIDX_ma __libc_lock_define_initialized (static, lock) @@ -4426,7 +4495,7 @@ Index: git/nss/nsswitch.c #if !defined DO_STATIC_NSS || defined SHARED /* String with revision number of the shared object files. */ static const char *const __nss_shlib_revision = LIBNSS_FILES_SO + 15; -@@ -93,6 +106,20 @@ +@@ -93,6 +106,20 @@ static name_database *service_table; __libc_freeres. */ static name_database_entry *defconfig_entries; @@ -4447,7 +4516,7 @@ Index: git/nss/nsswitch.c #ifdef USE_NSCD /* Nonzero if this is the nscd process. */ -@@ -109,20 +136,22 @@ +@@ -109,20 +136,22 @@ __nss_database_lookup (const char *datab const char *defconfig, service_user **ni) { /* Prevent multiple threads to change the service table. */ @@ -4472,7 +4541,7 @@ Index: git/nss/nsswitch.c /* Test whether configuration data is available. */ if (service_table != NULL) -@@ -144,6 +173,7 @@ +@@ -144,6 +173,7 @@ __nss_database_lookup (const char *datab *ni = entry->service; } @@ -4480,7 +4549,7 @@ Index: git/nss/nsswitch.c /* No configuration data is available, either because nsswitch.conf doesn't exist or because it doesn't have a line for this database. -@@ -166,13 +196,23 @@ +@@ -166,13 +196,23 @@ __nss_database_lookup (const char *datab { entry->next = defconfig_entries; entry->service = *ni; @@ -4506,7 +4575,7 @@ Index: git/nss/nsswitch.c return *ni != NULL ? 0 : -1; } -@@ -252,6 +292,7 @@ +@@ -252,6 +292,7 @@ __nss_next2 (service_user **ni, const ch libc_hidden_def (__nss_next2) @@ -4514,7 +4583,7 @@ Index: git/nss/nsswitch.c int attribute_compat_text_section __nss_next (service_user **ni, const char *fct_name, void **fctp, int status, -@@ -300,13 +341,13 @@ +@@ -300,13 +341,13 @@ __nss_configure_lookup (const char *dbna } /* Prevent multiple threads to change the service table. */ @@ -4530,7 +4599,7 @@ Index: git/nss/nsswitch.c return 0; } -@@ -402,7 +443,7 @@ +@@ -402,7 +443,7 @@ __nss_lookup_function (service_user *ni, void **found, *result; /* We now modify global data. Protect it. */ @@ -4539,7 +4608,7 @@ Index: git/nss/nsswitch.c /* Search the tree of functions previously requested. Data in the tree are `known_function' structures, whose first member is a -@@ -413,7 +454,7 @@ +@@ -413,7 +454,7 @@ __nss_lookup_function (service_user *ni, enough to a pointer to our structure to use as a lookup key that will be passed to `known_compare' (above). */ @@ -4548,7 +4617,7 @@ Index: git/nss/nsswitch.c if (found == NULL) /* This means out-of-memory. */ result = NULL; -@@ -440,7 +481,7 @@ +@@ -440,7 +481,7 @@ __nss_lookup_function (service_user *ni, #endif /* Oops. We can't instantiate this node properly. Remove it from the tree. */ @@ -4557,7 +4626,7 @@ Index: git/nss/nsswitch.c free (known); result = NULL; } -@@ -520,13 +561,43 @@ +@@ -520,13 +561,43 @@ __nss_lookup_function (service_user *ni, } /* Remove the lock. */ @@ -4602,7 +4671,7 @@ Index: git/nss/nsswitch.c static name_database * internal_function nss_parse_file (const char *fname) -@@ -632,8 +703,10 @@ +@@ -632,8 +703,10 @@ nss_parse_service_list (const char *line + (line - name + 1)); if (new_service == NULL) return result; @@ -4614,7 +4683,7 @@ Index: git/nss/nsswitch.c /* Set default actions. */ new_service->actions[2 + NSS_STATUS_TRYAGAIN] = NSS_ACTION_CONTINUE; -@@ -642,7 +715,7 @@ +@@ -642,7 +715,7 @@ nss_parse_service_list (const char *line new_service->actions[2 + NSS_STATUS_SUCCESS] = NSS_ACTION_RETURN; new_service->actions[2 + NSS_STATUS_RETURN] = NSS_ACTION_RETURN; new_service->library = NULL; @@ -4623,7 +4692,7 @@ Index: git/nss/nsswitch.c new_service->next = NULL; while (isspace (line[0])) -@@ -778,9 +851,10 @@ +@@ -778,9 +851,10 @@ nss_getline (char *line) result = (name_database_entry *) malloc (sizeof (name_database_entry) + len); if (result == NULL) return NULL; @@ -4635,7 +4704,7 @@ Index: git/nss/nsswitch.c /* Parse the list of services. */ result->service = nss_parse_service_list (line); -@@ -816,6 +890,7 @@ +@@ -816,6 +890,7 @@ nss_new_service (name_database *database return *currentp; } #endif @@ -4643,7 +4712,7 @@ Index: git/nss/nsswitch.c #if defined SHARED && defined USE_NSCD -@@ -834,6 +909,7 @@ +@@ -834,6 +909,7 @@ nss_load_all_libraries (const char *serv } @@ -4651,7 +4720,7 @@ Index: git/nss/nsswitch.c /* Called by nscd and nscd alone. */ void __nss_disable_nscd (void (*cb) (size_t, struct traced_file *)) -@@ -857,8 +933,10 @@ +@@ -857,8 +933,10 @@ __nss_disable_nscd (void (*cb) (size_t, __nss_not_use_nscd_services = -1; __nss_not_use_nscd_netgroup = -1; } @@ -4662,7 +4731,7 @@ Index: git/nss/nsswitch.c static void free_database_entries (name_database_entry *entry) { -@@ -871,8 +949,8 @@ +@@ -871,8 +949,8 @@ free_database_entries (name_database_ent { service_user *olds = service; @@ -4673,16 +4742,16 @@ Index: git/nss/nsswitch.c service = service->next; free (olds); -@@ -926,3 +1004,4 @@ +@@ -926,3 +1004,4 @@ libc_freeres_fn (free_mem) free (top); } +#endif /* __OPTION_EGLIBC_NSSWITCH */ Index: git/nss/nsswitch.h =================================================================== ---- git.orig/nss/nsswitch.h 2014-08-29 20:00:53.012070587 -0700 -+++ git/nss/nsswitch.h 2014-08-29 20:01:15.220070587 -0700 -@@ -65,10 +65,20 @@ +--- git.orig/nss/nsswitch.h ++++ git/nss/nsswitch.h +@@ -65,10 +65,20 @@ typedef struct service_user lookup_actions actions[5]; /* Link to the underlying library object. */ service_library *library; @@ -4706,7 +4775,7 @@ Index: git/nss/nsswitch.h } service_user; /* To access the action based on the status value use this macro. */ -@@ -82,7 +92,7 @@ +@@ -82,7 +92,7 @@ typedef struct name_database_entry /* List of service to be used. */ service_user *service; /* Name of the database. */ @@ -4717,8 +4786,8 @@ Index: git/nss/nsswitch.h Index: git/posix/bug-regex1.c =================================================================== ---- git.orig/posix/bug-regex1.c 2014-08-29 20:00:53.184070587 -0700 -+++ git/posix/bug-regex1.c 2014-08-29 20:01:15.220070587 -0700 +--- git.orig/posix/bug-regex1.c ++++ git/posix/bug-regex1.c @@ -4,6 +4,7 @@ #include <string.h> #include <regex.h> @@ -4727,7 +4796,7 @@ Index: git/posix/bug-regex1.c int main (void) -@@ -17,7 +18,9 @@ +@@ -17,7 +18,9 @@ main (void) memset (®ex, '\0', sizeof (regex)); setlocale (LC_ALL, "de_DE.ISO-8859-1"); @@ -4739,8 +4808,8 @@ Index: git/posix/bug-regex1.c Index: git/posix/bug-regex6.c =================================================================== ---- git.orig/posix/bug-regex6.c 2014-08-29 20:00:53.204070587 -0700 -+++ git/posix/bug-regex6.c 2014-08-29 20:01:15.220070587 -0700 +--- git.orig/posix/bug-regex6.c ++++ git/posix/bug-regex6.c @@ -22,6 +22,7 @@ #include <string.h> #include <sys/types.h> @@ -4749,7 +4818,7 @@ Index: git/posix/bug-regex6.c int -@@ -30,7 +31,12 @@ +@@ -30,7 +31,12 @@ main (int argc, char *argv[]) regex_t re; regmatch_t mat[10]; int i, j, ret = 0; @@ -4765,8 +4834,8 @@ Index: git/posix/bug-regex6.c { 0, 48 }, { 0, 5 }, { 0, 4 }, { 5, 20 }, { 7, 20 }, { 20, 42 }, Index: git/posix/fnmatch.c =================================================================== ---- git.orig/posix/fnmatch.c 2014-08-29 20:00:53.208070587 -0700 -+++ git/posix/fnmatch.c 2014-08-29 20:01:15.220070587 -0700 +--- git.orig/posix/fnmatch.c ++++ git/posix/fnmatch.c @@ -30,6 +30,10 @@ #include <ctype.h> #include <string.h> @@ -4778,19 +4847,19 @@ Index: git/posix/fnmatch.c #if defined STDC_HEADERS || defined _LIBC # include <stdlib.h> #endif -@@ -131,7 +135,7 @@ +@@ -131,7 +135,7 @@ extern int fnmatch (const char *pattern, # define ISWCTYPE(WC, WT) iswctype (WC, WT) # endif -# if (HAVE_MBSTATE_T && HAVE_MBSRTOWCS) || _LIBC -+# if (HAVE_MBSTATE_T && HAVE_MBSRTOWCS) || (_LIBC && __OPTION_EGLIBC_LOCALE_CODE) ++# if (HAVE_MBSTATE_T && HAVE_MBSRTOWCS && _LIBC && __OPTION_EGLIBC_LOCALE_CODE) /* In this case we are implementing the multibyte character handling. */ # define HANDLE_MULTIBYTE 1 # endif Index: git/posix/fnmatch_loop.c =================================================================== ---- git.orig/posix/fnmatch_loop.c 2014-08-29 20:00:53.220070587 -0700 -+++ git/posix/fnmatch_loop.c 2014-08-29 20:01:15.220070587 -0700 +--- git.orig/posix/fnmatch_loop.c ++++ git/posix/fnmatch_loop.c @@ -15,6 +15,8 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ @@ -4800,7 +4869,7 @@ Index: git/posix/fnmatch_loop.c #include <stdint.h> struct STRUCT -@@ -54,10 +56,15 @@ +@@ -54,10 +56,15 @@ FCT (pattern, string, string_end, no_lea const char *collseq = (const char *) _NL_CURRENT(LC_COLLATE, _NL_COLLATE_COLLSEQWC); # else @@ -4818,7 +4887,7 @@ Index: git/posix/fnmatch_loop.c while ((c = *p++) != L('\0')) { -@@ -277,7 +284,7 @@ +@@ -277,7 +284,7 @@ FCT (pattern, string, string_end, no_lea /* Leave room for the null. */ CHAR str[CHAR_CLASS_MAX_LENGTH + 1]; size_t c1 = 0; @@ -4827,7 +4896,7 @@ Index: git/posix/fnmatch_loop.c wctype_t wt; #endif const CHAR *startp = p; -@@ -307,7 +314,7 @@ +@@ -307,7 +314,7 @@ FCT (pattern, string, string_end, no_lea } str[c1] = L('\0'); @@ -4836,7 +4905,7 @@ Index: git/posix/fnmatch_loop.c wt = IS_CHAR_CLASS (str); if (wt == 0) /* Invalid character class name. */ -@@ -681,8 +688,10 @@ +@@ -680,8 +687,10 @@ FCT (pattern, string, string_end, no_lea else lcollseq = __collseq_table_lookup (collseq, cold); # else @@ -4849,7 +4918,7 @@ Index: git/posix/fnmatch_loop.c # endif is_seqval = 0; -@@ -858,7 +867,7 @@ +@@ -857,7 +866,7 @@ FCT (pattern, string, string_end, no_lea goto matched; } # else @@ -4860,8 +4929,8 @@ Index: git/posix/fnmatch_loop.c Index: git/posix/glob.c =================================================================== ---- git.orig/posix/glob.c 2014-08-29 20:00:53.232070587 -0700 -+++ git/posix/glob.c 2014-08-29 20:01:15.220070587 -0700 +--- git.orig/posix/glob.c ++++ git/posix/glob.c @@ -25,6 +25,9 @@ #include <sys/types.h> #include <sys/stat.h> @@ -4872,7 +4941,7 @@ Index: git/posix/glob.c /* Outcomment the following line for production quality code. */ /* #define NDEBUG 1 */ -@@ -607,6 +610,7 @@ +@@ -607,6 +610,7 @@ glob (pattern, flags, errfunc, pglob) if (home_dir == NULL || home_dir[0] == '\0') home_dir = "c:/users/default"; /* poor default */ # else @@ -4880,7 +4949,7 @@ Index: git/posix/glob.c if (home_dir == NULL || home_dir[0] == '\0') { int success; -@@ -623,19 +627,19 @@ +@@ -623,19 +627,19 @@ glob (pattern, flags, errfunc, pglob) if (success) { struct passwd *p; @@ -4903,7 +4972,7 @@ Index: git/posix/glob.c if (__libc_use_alloca (alloca_used + pwbuflen)) pwtmpbuf = alloca_account (pwbuflen, alloca_used); else -@@ -682,9 +686,9 @@ +@@ -682,9 +686,9 @@ glob (pattern, flags, errfunc, pglob) } __set_errno (save); } @@ -4915,7 +4984,7 @@ Index: git/posix/glob.c if (p != NULL) { if (!malloc_pwtmpbuf) -@@ -713,6 +717,7 @@ +@@ -713,6 +717,7 @@ glob (pattern, flags, errfunc, pglob) } } } @@ -4925,8 +4994,8 @@ Index: git/posix/glob.c if (flags & GLOB_TILDE_CHECK) Index: git/posix/Makefile =================================================================== ---- git.orig/posix/Makefile 2014-08-29 20:00:53.160070587 -0700 -+++ git/posix/Makefile 2014-08-29 20:01:15.220070587 -0700 +--- git.orig/posix/Makefile ++++ git/posix/Makefile @@ -18,6 +18,8 @@ # # Sub-makefile for POSIX portion of the library. @@ -4936,7 +5005,7 @@ Index: git/posix/Makefile subdir := posix include ../Makeconfig -@@ -43,13 +45,24 @@ +@@ -43,13 +45,24 @@ routines := \ getpgid setpgid getpgrp bsd-getpgrp setpgrp getsid setsid \ getresuid getresgid setresuid setresgid \ pathconf sysconf fpathconf \ @@ -4963,19 +5032,15 @@ Index: git/posix/Makefile spawn_faction_init spawn_faction_destroy spawn_faction_addclose \ spawn_faction_addopen spawn_faction_adddup2 \ spawnattr_init spawnattr_destroy \ -@@ -57,41 +70,53 @@ - spawnattr_getflags spawnattr_setflags \ - spawnattr_getpgroup spawnattr_setpgroup spawn spawnp spawni \ - spawnattr_getsigmask spawnattr_getschedpolicy spawnattr_getschedparam \ -- spawnattr_setsigmask spawnattr_setschedpolicy spawnattr_setschedparam \ -- posix_madvise \ -- get_child_max sched_cpucount sched_cpualloc sched_cpufree -+ spawnattr_setsigmask spawnattr_setschedpolicy spawnattr_setschedparam -+routines-$(OPTION_EGLIBC_WORDEXP) += wordexp +@@ -61,37 +74,53 @@ routines := \ + posix_madvise \ + get_child_max sched_cpucount sched_cpualloc sched_cpufree ++routines-$(OPTION_EGLIBC_WORDEXP) += wordexp ++ aux := init-posix environ -tests := tstgetopt testfnm runtests runptests \ -+tests := tstgetopt testfnm runtests \ ++tests := tstgetopt testfnm runtests \ tst-preadwrite tst-preadwrite64 test-vfork regexbug1 \ - tst-getlogin tst-mmap tst-getaddrinfo tst-truncate \ - tst-truncate64 tst-fork tst-fnmatch tst-regexloc tst-dir \ @@ -4998,8 +5063,8 @@ Index: git/posix/Makefile + bug-regex8 bug-regex9 bug-regex10 bug-regex12 \ + bug-regex14 bug-regex15 \ + bug-regex21 bug-regex24 \ -+ bug-regex27 bug-regex28 bug-regex29 bug-regex30 \ -+ bug-regex31 \ ++ bug-regex27 bug-regex28 \ ++ bug-regex29 bug-regex30 bug-regex31 \ + tst-nice tst-nanosleep \ + transbug \ + tst-vfork1 tst-vfork2 tst-vfork3 tst-waitid \ @@ -5015,22 +5080,23 @@ Index: git/posix/Makefile bug-getopt1 bug-getopt2 bug-getopt3 bug-getopt4 \ bug-getopt5 tst-getopt_long1 bug-regex34 bug-regex35 \ tst-pathconf tst-getaddrinfo4 tst-rxspencer-no-utf8 \ - tst-fnmatch3 bug-regex36 + tst-fnmatch3 bug-regex36 tst-getaddrinfo5 -xtests := bug-ga2 -+tests-$(OPTION_EGLIBC_LOCALE_CODE) \ -+ += tst-fnmatch tst-regexloc bug-regex1 bug-regex5 \ -+ bug-regex23 bug-regex25 bug-regex32 bug-regex33 ++tests-$(OPTION_EGLIBC_LOCALE_CODE) \ ++ += tst-fnmatch tst-regexloc bug-regex1 bug-regex5 \ ++ bug-regex23 bug-regex25 bug-regex32 bug-regex33 +tests-$(OPTION_EGLIBC_INET) \ -+ += tst-getaddrinfo bug-ga1 tst-getaddrinfo2 \ -+ tst-rfc3484 tst-rfc3484-2 tst-rfc3484-3 tst-getaddrinfo3 ++ += tst-getaddrinfo bug-ga1 tst-getaddrinfo2 \ ++ tst-rfc3484 tst-rfc3484-2 tst-rfc3484-3 tst-getaddrinfo3 +tests-$(OPTION_POSIX_REGEXP_GLIBC) \ -+ += runptests bug-regex11 bug-regex13 bug-regex16 \ -+ tst-regex2 tst-rxspencer tst-pcre tst-boost ++ += runptests bug-regex11 bug-regex13 bug-regex16 \ ++ tst-regex2 tst-rxspencer tst-pcre tst-boost +ifeq (yy,$(OPTION_EGLIBC_LOCALE_CODE)$(OPTION_POSIX_REGEXP_GLIBC)) -+tests += tst-regex bug-regex17 bug-regex18 bug-regex19 bug-regex20 \ -+ bug-regex22 bug-regex26 ++tests += tst-regex bug-regex17 bug-regex18 bug-regex19 bug-regex20 \ ++ bug-regex22 bug-regex26 +endif +xtests-$(OPTION_EGLIBC_INET) += bug-ga2 ++ ifeq (yes,$(build-shared)) test-srcs := globtest -tests += wordexp-test tst-exec tst-spawn @@ -5040,7 +5106,7 @@ Index: git/posix/Makefile endif tests-static = tst-exec-static tst-spawn-static tests += $(tests-static) -@@ -117,7 +142,10 @@ +@@ -117,7 +146,10 @@ generated += $(addprefix wordexp-test-re ifeq ($(run-built-tests),yes) ifeq (yes,$(build-shared)) @@ -5052,7 +5118,7 @@ Index: git/posix/Makefile endif endif -@@ -125,12 +153,16 @@ +@@ -125,12 +157,16 @@ endif # XXX Please note that for now we ignore the result of this test. tests-special += $(objpfx)annexc.out ifeq ($(run-built-tests),yes) @@ -5065,14 +5131,14 @@ Index: git/posix/Makefile $(objpfx)bug-glob2-mem.out $(objpfx)tst-vfork3-mem.out \ $(objpfx)tst-fnmatch-mem.out $(objpfx)bug-regex36-mem.out +ifeq (y,$(OPTION_POSIX_REGEXP_GLIBC)) -+tests-special += $(objpfx)bug-regex14-mem $(objpfx)tst-rxspencer-no-utf8-mem \ -+ $(objpfx)tst-pcre-mem $(objpfx)tst-boost-mem ++tests-special += $(objpfx)bug-regex14-mem.out $(objpfx)tst-rxspencer-no-utf8-mem.out \ ++ $(objpfx)tst-pcre-mem.out $(objpfx)tst-boost-mem.out +endif + xtests-special += $(objpfx)bug-ga2-mem.out endif -@@ -143,6 +175,8 @@ +@@ -143,6 +179,8 @@ $(objpfx)globtest.out: globtest.sh $(obj $(SHELL) $< $(common-objpfx) '$(test-via-rtld-prefix)' \ '$(test-program-prefix)' '$(test-wrapper-env)'; \ $(evaluate-test) @@ -5081,7 +5147,7 @@ Index: git/posix/Makefile $(objpfx)wordexp-tst.out: wordexp-tst.sh $(objpfx)wordexp-test $(SHELL) $< $(common-objpfx) '$(test-program-prefix-before-env)' \ '$(run-program-env)' '$(test-program-prefix-after-env)'; \ -@@ -205,7 +239,10 @@ +@@ -205,7 +243,10 @@ tst-dir-ARGS = `pwd` `cd $(common-objdir tst-chmod-ARGS = $(objdir) tst-vfork3-ARGS = --test-dir=$(objpfx) @@ -5095,17 +5161,17 @@ Index: git/posix/Makefile tst-boost-ARGS = BOOST.tests Index: git/posix/regcomp.c =================================================================== ---- git.orig/posix/regcomp.c 2014-08-29 20:00:53.264070587 -0700 -+++ git/posix/regcomp.c 2014-08-29 20:01:15.224070587 -0700 +--- git.orig/posix/regcomp.c ++++ git/posix/regcomp.c @@ -18,6 +18,7 @@ <http://www.gnu.org/licenses/>. */ #include <stdint.h> +#include <gnu/option-groups.h> - static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern, - size_t length, reg_syntax_t syntax); -@@ -305,7 +306,7 @@ + #ifdef _LIBC + # include <locale/weight.h> +@@ -309,7 +310,7 @@ re_compile_fastmap_iter (regex_t *bufp, { re_dfa_t *dfa = (re_dfa_t *) bufp->buffer; int node_cnt; @@ -5114,7 +5180,7 @@ Index: git/posix/regcomp.c for (node_cnt = 0; node_cnt < init_state->nodes.nelem; ++node_cnt) { int node = init_state->nodes.elems[node_cnt]; -@@ -315,9 +316,9 @@ +@@ -319,9 +320,9 @@ re_compile_fastmap_iter (regex_t *bufp, { re_set_fastmap (fastmap, icase, dfa->nodes[node].opr.c); #ifdef RE_ENABLE_I18N @@ -5126,7 +5192,7 @@ Index: git/posix/regcomp.c wchar_t wc; mbstate_t state; -@@ -348,7 +349,11 @@ +@@ -352,7 +353,11 @@ re_compile_fastmap_iter (regex_t *bufp, re_set_fastmap (fastmap, icase, ch); } } @@ -5139,7 +5205,7 @@ Index: git/posix/regcomp.c else if (type == COMPLEX_BRACKET) { re_charset_t *cset = dfa->nodes[node].opr.mbcset; -@@ -376,7 +381,7 @@ +@@ -380,7 +385,7 @@ re_compile_fastmap_iter (regex_t *bufp, i.e. where we would not find an invalid sequence. This only applies to multibyte character sets; for single byte character sets, the SIMPLE_BRACKET again suffices. */ @@ -5148,7 +5214,7 @@ Index: git/posix/regcomp.c && (cset->nchar_classes || cset->non_match || cset->nranges # ifdef _LIBC || cset->nequiv_classes -@@ -404,7 +409,7 @@ +@@ -408,7 +413,7 @@ re_compile_fastmap_iter (regex_t *bufp, memset (&state, '\0', sizeof (state)); if (__wcrtomb (buf, cset->mbchars[i], &state) != (size_t) -1) re_set_fastmap (fastmap, icase, *(unsigned char *) buf); @@ -5157,7 +5223,7 @@ Index: git/posix/regcomp.c { if (__wcrtomb (buf, towlower (cset->mbchars[i]), &state) != (size_t) -1) -@@ -413,7 +418,7 @@ +@@ -417,7 +422,7 @@ re_compile_fastmap_iter (regex_t *bufp, } } } @@ -5166,7 +5232,7 @@ Index: git/posix/regcomp.c else if (type == OP_PERIOD #ifdef RE_ENABLE_I18N || type == OP_UTF8_PERIOD -@@ -856,11 +861,15 @@ +@@ -860,11 +865,15 @@ init_dfa (re_dfa_t *dfa, size_t pat_len) dfa->mb_cur_max = MB_CUR_MAX; #ifdef _LIBC @@ -5183,7 +5249,7 @@ Index: git/posix/regcomp.c #else # ifdef HAVE_LANGINFO_CODESET codeset_name = nl_langinfo (CODESET); -@@ -886,7 +895,7 @@ +@@ -890,7 +899,7 @@ init_dfa (re_dfa_t *dfa, size_t pat_len) #endif #ifdef RE_ENABLE_I18N @@ -5192,7 +5258,7 @@ Index: git/posix/regcomp.c { if (dfa->is_utf8) dfa->sb_char = (re_bitset_ptr_t) utf8_sb_map; -@@ -1784,7 +1793,7 @@ +@@ -1788,7 +1797,7 @@ peek_token (re_token_t *token, re_string token->word_char = 0; #ifdef RE_ENABLE_I18N token->mb_partial = 0; @@ -5201,7 +5267,7 @@ Index: git/posix/regcomp.c !re_string_first_byte (input, re_string_cur_idx (input))) { token->type = CHARACTER; -@@ -1805,7 +1814,7 @@ +@@ -1809,7 +1818,7 @@ peek_token (re_token_t *token, re_string token->opr.c = c2; token->type = CHARACTER; #ifdef RE_ENABLE_I18N @@ -5210,7 +5276,7 @@ Index: git/posix/regcomp.c { wint_t wc = re_string_wchar_at (input, re_string_cur_idx (input) + 1); -@@ -1919,7 +1928,7 @@ +@@ -1923,7 +1932,7 @@ peek_token (re_token_t *token, re_string token->type = CHARACTER; #ifdef RE_ENABLE_I18N @@ -5219,7 +5285,7 @@ Index: git/posix/regcomp.c { wint_t wc = re_string_wchar_at (input, re_string_cur_idx (input)); token->word_char = IS_WIDE_WORD_CHAR (wc) != 0; -@@ -2019,7 +2028,7 @@ +@@ -2023,7 +2032,7 @@ peek_token_bracket (re_token_t *token, r token->opr.c = c; #ifdef RE_ENABLE_I18N @@ -5228,7 +5294,7 @@ Index: git/posix/regcomp.c !re_string_first_byte (input, re_string_cur_idx (input))) { token->type = CHARACTER; -@@ -2242,7 +2251,7 @@ +@@ -2246,7 +2255,7 @@ parse_expression (re_string_t *regexp, r return NULL; } #ifdef RE_ENABLE_I18N @@ -5237,7 +5303,7 @@ Index: git/posix/regcomp.c { while (!re_string_eoi (regexp) && !re_string_first_byte (regexp, re_string_cur_idx (regexp))) -@@ -2380,7 +2389,7 @@ +@@ -2384,7 +2393,7 @@ parse_expression (re_string_t *regexp, r *err = REG_ESPACE; return NULL; } @@ -5246,7 +5312,7 @@ Index: git/posix/regcomp.c dfa->has_mb_node = 1; break; case OP_WORD: -@@ -2686,7 +2695,7 @@ +@@ -2690,7 +2699,7 @@ build_range_exp (bitset_t sbcset, bracke However, for !_LIBC we have no collation elements: if the character set is single byte, the single byte character set that we build below suffices. parse_bracket_exp passes @@ -5255,7 +5321,7 @@ Index: git/posix/regcomp.c if (mbcset) { /* Check the space of the arrays. */ -@@ -2782,7 +2791,13 @@ +@@ -2786,7 +2795,13 @@ parse_bracket_exp (re_string_t *regexp, reg_syntax_t syntax, reg_errcode_t *err) { #ifdef _LIBC @@ -5269,7 +5335,7 @@ Index: git/posix/regcomp.c const char *collseqwc; uint32_t nrules; int32_t table_size; -@@ -2830,18 +2845,20 @@ +@@ -2834,18 +2849,20 @@ parse_bracket_exp (re_string_t *regexp, if (MB_CUR_MAX == 1) */ if (nrules == 0) @@ -5291,7 +5357,7 @@ Index: git/posix/regcomp.c else if (br_elem->type == COLL_SYM) { size_t sym_name_len = strlen ((char *) br_elem->opr.name); -@@ -2872,11 +2889,11 @@ +@@ -2876,11 +2893,11 @@ parse_bracket_exp (re_string_t *regexp, { /* No valid character. Match it as a single byte character. */ @@ -5305,7 +5371,7 @@ Index: git/posix/regcomp.c } return UINT_MAX; } -@@ -2916,7 +2933,7 @@ +@@ -2920,7 +2937,7 @@ parse_bracket_exp (re_string_t *regexp, However, if we have no collation elements, and the character set is single byte, the single byte character set that we build below suffices. */ @@ -5314,7 +5380,7 @@ Index: git/posix/regcomp.c { /* Check the space of the arrays. */ if (BE (*range_alloc == mbcset->nranges, 0)) -@@ -2953,7 +2970,7 @@ +@@ -2957,7 +2974,7 @@ parse_bracket_exp (re_string_t *regexp, if (MB_CUR_MAX == 1) */ if (nrules == 0) @@ -5323,7 +5389,7 @@ Index: git/posix/regcomp.c else ch_collseq = __collseq_table_lookup (collseqwc, __btowc (ch)); if (start_collseq <= ch_collseq && ch_collseq <= end_collseq) -@@ -3031,7 +3048,10 @@ +@@ -3035,7 +3052,10 @@ parse_bracket_exp (re_string_t *regexp, re_bitset_ptr_t sbcset; #ifdef RE_ENABLE_I18N re_charset_t *mbcset; @@ -5335,7 +5401,7 @@ Index: git/posix/regcomp.c int equiv_class_alloc = 0, char_class_alloc = 0; #endif /* not RE_ENABLE_I18N */ int non_match = 0; -@@ -3039,9 +3059,15 @@ +@@ -3043,9 +3063,15 @@ parse_bracket_exp (re_string_t *regexp, int token_len; int first_round = 1; #ifdef _LIBC @@ -5351,7 +5417,7 @@ Index: git/posix/regcomp.c if (nrules) { /* -@@ -3169,7 +3195,7 @@ +@@ -3175,7 +3201,7 @@ parse_bracket_exp (re_string_t *regexp, #else # ifdef RE_ENABLE_I18N *err = build_range_exp (sbcset, @@ -5360,7 +5426,7 @@ Index: git/posix/regcomp.c &range_alloc, &start_elem, &end_elem); # else *err = build_range_exp (sbcset, &start_elem, &end_elem); -@@ -3185,7 +3211,7 @@ +@@ -3191,7 +3217,7 @@ parse_bracket_exp (re_string_t *regexp, case SB_CHAR: bitset_set (sbcset, start_elem.opr.ch); break; @@ -5369,7 +5435,7 @@ Index: git/posix/regcomp.c case MB_CHAR: /* Check whether the array has enough space. */ if (BE (mbchar_alloc == mbcset->nmbchars, 0)) -@@ -3203,7 +3229,7 @@ +@@ -3209,7 +3235,7 @@ parse_bracket_exp (re_string_t *regexp, } mbcset->mbchars[mbcset->nmbchars++] = start_elem.opr.wch; break; @@ -5378,7 +5444,7 @@ Index: git/posix/regcomp.c case EQUIV_CLASS: *err = build_equiv_class (sbcset, #ifdef RE_ENABLE_I18N -@@ -3253,11 +3279,11 @@ +@@ -3259,11 +3285,11 @@ parse_bracket_exp (re_string_t *regexp, #ifdef RE_ENABLE_I18N /* Ensure only single byte characters are set. */ @@ -5392,7 +5458,7 @@ Index: git/posix/regcomp.c || mbcset->non_match))) { bin_tree_t *mbc_tree; -@@ -3326,7 +3352,7 @@ +@@ -3332,7 +3358,7 @@ parse_bracket_element (bracket_elem_t *e re_token_t *token, int token_len, re_dfa_t *dfa, reg_syntax_t syntax, int accept_hyphen) { @@ -5401,7 +5467,7 @@ Index: git/posix/regcomp.c int cur_char_size; cur_char_size = re_string_char_size_at (regexp, re_string_cur_idx (regexp)); if (cur_char_size > 1) -@@ -3336,7 +3362,7 @@ +@@ -3342,7 +3368,7 @@ parse_bracket_element (bracket_elem_t *e re_string_skip_bytes (regexp, cur_char_size); return REG_NOERROR; } @@ -5410,7 +5476,7 @@ Index: git/posix/regcomp.c re_string_skip_bytes (regexp, token_len); /* Skip a token. */ if (token->type == OP_OPEN_COLL_ELEM || token->type == OP_OPEN_CHAR_CLASS || token->type == OP_OPEN_EQUIV_CLASS) -@@ -3416,7 +3442,9 @@ +@@ -3422,7 +3448,9 @@ build_equiv_class (bitset_t sbcset, re_c build_equiv_class (bitset_t sbcset, const unsigned char *name) #endif /* not RE_ENABLE_I18N */ { @@ -5421,7 +5487,7 @@ Index: git/posix/regcomp.c uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES); if (nrules != 0) { -@@ -3488,7 +3516,7 @@ +@@ -3492,7 +3520,7 @@ build_equiv_class (bitset_t sbcset, cons mbcset->equiv_classes[mbcset->nequiv_classes++] = idx1; } else @@ -5430,7 +5496,7 @@ Index: git/posix/regcomp.c { if (BE (strlen ((const char *) name) != 1, 0)) return REG_ECOLLATE; -@@ -3522,7 +3550,7 @@ +@@ -3526,7 +3554,7 @@ build_charclass (RE_TRANSLATE_TYPE trans && (strcmp (name, "upper") == 0 || strcmp (name, "lower") == 0)) name = "alpha"; @@ -5439,7 +5505,7 @@ Index: git/posix/regcomp.c /* Check the space of the arrays. */ if (BE (*char_class_alloc == mbcset->nchar_classes, 0)) { -@@ -3538,7 +3566,7 @@ +@@ -3542,7 +3570,7 @@ build_charclass (RE_TRANSLATE_TYPE trans *char_class_alloc = new_char_class_alloc; } mbcset->char_classes[mbcset->nchar_classes++] = __wctype (name); @@ -5448,7 +5514,7 @@ Index: git/posix/regcomp.c #define BUILD_CHARCLASS_LOOP(ctype_func) \ do { \ -@@ -3649,7 +3677,7 @@ +@@ -3653,7 +3681,7 @@ build_charclass_op (re_dfa_t *dfa, RE_TR #ifdef RE_ENABLE_I18N /* Ensure only single byte characters are set. */ @@ -5457,7 +5523,7 @@ Index: git/posix/regcomp.c bitset_mask (sbcset, dfa->sb_char); #endif -@@ -3661,7 +3689,7 @@ +@@ -3665,7 +3693,7 @@ build_charclass_op (re_dfa_t *dfa, RE_TR goto build_word_op_espace; #ifdef RE_ENABLE_I18N @@ -5468,8 +5534,8 @@ Index: git/posix/regcomp.c /* Build a tree for complex bracket. */ Index: git/posix/regexec.c =================================================================== ---- git.orig/posix/regexec.c 2014-08-29 20:00:53.268070587 -0700 -+++ git/posix/regexec.c 2014-08-29 20:01:15.224070587 -0700 +--- git.orig/posix/regexec.c ++++ git/posix/regexec.c @@ -18,6 +18,7 @@ <http://www.gnu.org/licenses/>. */ @@ -5478,7 +5544,7 @@ Index: git/posix/regexec.c static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags, int n) internal_function; -@@ -186,11 +187,11 @@ +@@ -186,11 +187,11 @@ static int build_trtable (const re_dfa_t static int check_node_accept_bytes (const re_dfa_t *dfa, int node_idx, const re_string_t *input, int idx) internal_function; @@ -5492,7 +5558,7 @@ Index: git/posix/regexec.c #endif /* RE_ENABLE_I18N */ static int group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state, -@@ -255,25 +256,9 @@ +@@ -255,25 +256,9 @@ regexec (preg, string, nmatch, pmatch, e return err != REG_NOERROR; } @@ -5521,7 +5587,7 @@ Index: git/posix/regexec.c /* Entry points for GNU code. */ -@@ -728,7 +713,7 @@ +@@ -728,7 +713,7 @@ re_search_internal (preg, string, length incr = (range < 0) ? -1 : 1; left_lim = (range < 0) ? start + range : start; right_lim = (range < 0) ? start : start + range; @@ -5530,7 +5596,7 @@ Index: git/posix/regexec.c match_kind = (fastmap ? ((sb || !(preg->syntax & RE_ICASE || t) ? 4 : 0) -@@ -3448,7 +3433,7 @@ +@@ -3448,7 +3433,7 @@ out_free: if (BE (dest_states_word[i] == NULL && err != REG_NOERROR, 0)) goto out_free; @@ -5539,7 +5605,7 @@ Index: git/posix/regexec.c need_word_trtable = 1; dest_states_nl[i] = re_acquire_state_context (&err, dfa, &follows, -@@ -3590,7 +3575,7 @@ +@@ -3590,7 +3575,7 @@ group_nodes_into_DFAstates (const re_dfa else if (type == OP_PERIOD) { #ifdef RE_ENABLE_I18N @@ -5548,7 +5614,7 @@ Index: git/posix/regexec.c bitset_merge (accepts, dfa->sb_char); else #endif -@@ -3641,7 +3626,7 @@ +@@ -3641,7 +3626,7 @@ group_nodes_into_DFAstates (const re_dfa continue; } #ifdef RE_ENABLE_I18N @@ -5557,7 +5623,7 @@ Index: git/posix/regexec.c for (j = 0; j < BITSET_WORDS; ++j) any_set |= (accepts[j] &= (dfa->word_char[j] | ~dfa->sb_char[j])); else -@@ -3660,7 +3645,7 @@ +@@ -3660,7 +3645,7 @@ group_nodes_into_DFAstates (const re_dfa continue; } #ifdef RE_ENABLE_I18N @@ -5566,7 +5632,7 @@ Index: git/posix/regexec.c for (j = 0; j < BITSET_WORDS; ++j) any_set |= (accepts[j] &= ~(dfa->word_char[j] & dfa->sb_char[j])); else -@@ -3832,12 +3817,6 @@ +@@ -3836,12 +3821,6 @@ check_node_accept_bytes (const re_dfa_t if (node->type == COMPLEX_BRACKET) { const re_charset_t *cset = node->opr.mbcset; @@ -5579,7 +5645,7 @@ Index: git/posix/regexec.c int match_len = 0; wchar_t wc = ((cset->nranges || cset->nchar_classes || cset->nmbchars) ? re_string_wchar_at (input, str_idx) : 0); -@@ -3849,6 +3828,7 @@ +@@ -3853,6 +3832,7 @@ check_node_accept_bytes (const re_dfa_t match_len = char_len; goto check_node_accept_bytes_match; } @@ -5587,7 +5653,7 @@ Index: git/posix/regexec.c /* match with character_class? */ for (i = 0; i < cset->nchar_classes; ++i) { -@@ -3859,8 +3839,16 @@ +@@ -3863,14 +3843,22 @@ check_node_accept_bytes (const re_dfa_t goto check_node_accept_bytes_match; } } @@ -5605,7 +5671,14 @@ Index: git/posix/regexec.c nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES); if (nrules != 0) { -@@ -3953,8 +3941,12 @@ + unsigned int in_collseq = 0; + const int32_t *table, *indirect; +- const unsigned char *weights, *extra; ++ const unsigned char *weights, *extra = NULL; + const char *collseqwc; + + /* match with collating_symbol? */ +@@ -3955,8 +3943,12 @@ check_node_accept_bytes (const re_dfa_t } } else @@ -5619,7 +5692,7 @@ Index: git/posix/regexec.c /* match with range expression? */ #if __GNUC__ >= 2 wchar_t cmp_buf[] = {L'\0', L'\0', wc, L'\0', L'\0', L'\0'}; -@@ -3973,6 +3965,7 @@ +@@ -3975,6 +3967,7 @@ check_node_accept_bytes (const re_dfa_t goto check_node_accept_bytes_match; } } @@ -5627,7 +5700,7 @@ Index: git/posix/regexec.c } check_node_accept_bytes_match: if (!cset->non_match) -@@ -3988,7 +3981,7 @@ +@@ -3990,7 +3983,7 @@ check_node_accept_bytes (const re_dfa_t return 0; } @@ -5636,7 +5709,7 @@ Index: git/posix/regexec.c static unsigned int internal_function find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len) -@@ -4046,7 +4039,7 @@ +@@ -4048,7 +4041,7 @@ find_collation_sequence_value (const uns return UINT_MAX; } } @@ -5645,7 +5718,7 @@ Index: git/posix/regexec.c #endif /* RE_ENABLE_I18N */ /* Check whether the node accepts the byte which is IDX-th -@@ -4137,7 +4130,7 @@ +@@ -4139,7 +4132,7 @@ extend_buffers (re_match_context_t *mctx if (pstr->icase) { #ifdef RE_ENABLE_I18N @@ -5654,7 +5727,7 @@ Index: git/posix/regexec.c { ret = build_wcs_upper_buffer (pstr); if (BE (ret != REG_NOERROR, 0)) -@@ -4150,7 +4143,7 @@ +@@ -4152,7 +4145,7 @@ extend_buffers (re_match_context_t *mctx else { #ifdef RE_ENABLE_I18N @@ -5665,8 +5738,8 @@ Index: git/posix/regexec.c #endif /* RE_ENABLE_I18N */ Index: git/posix/regexec-compat.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ git/posix/regexec-compat.c 2014-08-29 20:01:15.224070587 -0700 +--- /dev/null ++++ git/posix/regexec-compat.c @@ -0,0 +1,39 @@ +/* Extended regular expression matching and search library. + Copyright (C) 2008 Free Software Foundation, Inc. @@ -5709,8 +5782,8 @@ Index: git/posix/regexec-compat.c +#endif Index: git/posix/regex.h =================================================================== ---- git.orig/posix/regex.h 2014-08-29 20:00:53.264070587 -0700 -+++ git/posix/regex.h 2014-08-29 20:01:15.224070587 -0700 +--- git.orig/posix/regex.h ++++ git/posix/regex.h @@ -21,6 +21,7 @@ #define _REGEX_H 1 @@ -5719,7 +5792,7 @@ Index: git/posix/regex.h /* Allow the use in C++ code. */ #ifdef __cplusplus -@@ -156,6 +157,8 @@ +@@ -156,6 +157,8 @@ typedef unsigned long int reg_syntax_t; treated as 'a\{1'. */ # define RE_INVALID_INTERVAL_ORD (RE_DEBUG << 1) @@ -5728,7 +5801,7 @@ Index: git/posix/regex.h /* If this bit is set, then ignore case when matching. If not set, then case is significant. */ # define RE_ICASE (RE_INVALID_INTERVAL_ORD << 1) -@@ -172,6 +175,7 @@ +@@ -172,6 +175,7 @@ typedef unsigned long int reg_syntax_t; /* If this bit is set, then no_sub will be set to 1 during re_compile_pattern. */ # define RE_NO_SUB (RE_CONTEXT_INVALID_DUP << 1) @@ -5736,7 +5809,7 @@ Index: git/posix/regex.h #endif /* This global variable defines the particular regexp syntax to use (for -@@ -231,8 +235,13 @@ +@@ -231,8 +235,13 @@ extern reg_syntax_t re_syntax_options; (RE_CHAR_CLASSES | RE_DOT_NEWLINE | RE_DOT_NOT_NULL \ | RE_INTERVALS | RE_NO_EMPTY_RANGES) @@ -5750,7 +5823,7 @@ Index: git/posix/regex.h /* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes RE_LIMITED_OPS, i.e., \? \+ \| are not recognized. Actually, this -@@ -298,9 +307,11 @@ +@@ -298,9 +307,11 @@ extern reg_syntax_t re_syntax_options; /* Like REG_NOTBOL, except for the end-of-line. */ #define REG_NOTEOL (1 << 1) @@ -5764,9 +5837,9 @@ Index: git/posix/regex.h /* If any error codes are removed, changed, or added, update the Index: git/posix/regex_internal.c =================================================================== ---- git.orig/posix/regex_internal.c 2014-08-29 20:00:53.264070587 -0700 -+++ git/posix/regex_internal.c 2014-08-29 20:01:15.224070587 -0700 -@@ -43,8 +43,8 @@ +--- git.orig/posix/regex_internal.c ++++ git/posix/regex_internal.c +@@ -43,8 +43,8 @@ re_string_allocate (re_string_t *pstr, c int init_buf_len; /* Ensure at least one character fits into the buffers. */ @@ -5777,7 +5850,7 @@ Index: git/posix/regex_internal.c init_buf_len = (len + 1 < init_len) ? len + 1: init_len; re_string_construct_common (str, len, pstr, trans, icase, dfa); -@@ -55,7 +55,7 @@ +@@ -55,7 +55,7 @@ re_string_allocate (re_string_t *pstr, c pstr->word_char = dfa->word_char; pstr->word_ops_used = dfa->word_ops_used; pstr->mbs = pstr->mbs_allocated ? pstr->mbs : (unsigned char *) str; @@ -5786,7 +5859,7 @@ Index: git/posix/regex_internal.c pstr->valid_raw_len = pstr->valid_len; return REG_NOERROR; } -@@ -82,7 +82,7 @@ +@@ -82,7 +82,7 @@ re_string_construct (re_string_t *pstr, if (icase) { #ifdef RE_ENABLE_I18N @@ -5795,7 +5868,7 @@ Index: git/posix/regex_internal.c { while (1) { -@@ -91,7 +91,7 @@ +@@ -91,7 +91,7 @@ re_string_construct (re_string_t *pstr, return ret; if (pstr->valid_raw_len >= len) break; @@ -5804,7 +5877,7 @@ Index: git/posix/regex_internal.c break; ret = re_string_realloc_buffers (pstr, pstr->bufs_len * 2); if (BE (ret != REG_NOERROR, 0)) -@@ -105,7 +105,7 @@ +@@ -105,7 +105,7 @@ re_string_construct (re_string_t *pstr, else { #ifdef RE_ENABLE_I18N @@ -5813,7 +5886,7 @@ Index: git/posix/regex_internal.c build_wcs_buffer (pstr); else #endif /* RE_ENABLE_I18N */ -@@ -130,7 +130,7 @@ +@@ -130,7 +130,7 @@ internal_function __attribute_warn_unuse re_string_realloc_buffers (re_string_t *pstr, int new_buf_len) { #ifdef RE_ENABLE_I18N @@ -5822,7 +5895,7 @@ Index: git/posix/regex_internal.c { wint_t *new_wcs; -@@ -177,7 +177,7 @@ +@@ -177,7 +177,7 @@ re_string_construct_common (const char * pstr->trans = trans; pstr->icase = icase ? 1 : 0; pstr->mbs_allocated = (trans != NULL || icase); @@ -5831,7 +5904,7 @@ Index: git/posix/regex_internal.c pstr->is_utf8 = dfa->is_utf8; pstr->map_notascii = dfa->map_notascii; pstr->stop = pstr->len; -@@ -203,7 +203,7 @@ +@@ -203,7 +203,7 @@ build_wcs_buffer (re_string_t *pstr) { #ifdef _LIBC unsigned char buf[MB_LEN_MAX]; @@ -5840,7 +5913,7 @@ Index: git/posix/regex_internal.c #else unsigned char buf[64]; #endif -@@ -226,7 +226,7 @@ +@@ -226,7 +226,7 @@ build_wcs_buffer (re_string_t *pstr) { int i, ch; @@ -5849,7 +5922,7 @@ Index: git/posix/regex_internal.c { ch = pstr->raw_mbs [pstr->raw_mbs_idx + byte_idx + i]; buf[i] = pstr->mbs[byte_idx + i] = pstr->trans[ch]; -@@ -275,7 +275,7 @@ +@@ -275,7 +275,7 @@ build_wcs_upper_buffer (re_string_t *pst size_t mbclen; #ifdef _LIBC char buf[MB_LEN_MAX]; @@ -5858,7 +5931,7 @@ Index: git/posix/regex_internal.c #else char buf[64]; #endif -@@ -369,7 +369,7 @@ +@@ -369,7 +369,7 @@ build_wcs_upper_buffer (re_string_t *pst { int i, ch; @@ -5867,7 +5940,7 @@ Index: git/posix/regex_internal.c { ch = pstr->raw_mbs [pstr->raw_mbs_idx + src_idx + i]; buf[i] = pstr->trans[ch]; -@@ -567,8 +567,9 @@ +@@ -567,8 +567,9 @@ re_string_translate_buffer (re_string_t } /* This function re-construct the buffers. @@ -5879,7 +5952,7 @@ Index: git/posix/regex_internal.c static reg_errcode_t internal_function __attribute_warn_unused_result__ -@@ -579,7 +580,7 @@ +@@ -579,7 +580,7 @@ re_string_reconstruct (re_string_t *pstr { /* Reset buffer. */ #ifdef RE_ENABLE_I18N @@ -5888,7 +5961,7 @@ Index: git/posix/regex_internal.c memset (&pstr->cur_state, '\0', sizeof (mbstate_t)); #endif /* RE_ENABLE_I18N */ pstr->len = pstr->raw_len; -@@ -670,7 +671,7 @@ +@@ -670,7 +671,7 @@ re_string_reconstruct (re_string_t *pstr pstr->tip_context = re_string_context_at (pstr, offset - 1, eflags); #ifdef RE_ENABLE_I18N @@ -5897,7 +5970,7 @@ Index: git/posix/regex_internal.c memmove (pstr->wcs, pstr->wcs + offset, (pstr->valid_len - offset) * sizeof (wint_t)); #endif /* RE_ENABLE_I18N */ -@@ -699,7 +700,7 @@ +@@ -699,7 +700,7 @@ re_string_reconstruct (re_string_t *pstr #endif pstr->valid_len = 0; #ifdef RE_ENABLE_I18N @@ -5906,7 +5979,7 @@ Index: git/posix/regex_internal.c { int wcs_idx; wint_t wc = WEOF; -@@ -711,7 +712,7 @@ +@@ -711,7 +712,7 @@ re_string_reconstruct (re_string_t *pstr /* Special case UTF-8. Multi-byte chars start with any byte other than 0x80 - 0xbf. */ raw = pstr->raw_mbs + pstr->raw_mbs_idx; @@ -5915,7 +5988,7 @@ Index: git/posix/regex_internal.c if (end < pstr->raw_mbs) end = pstr->raw_mbs; p = raw + offset - 1; -@@ -803,7 +804,7 @@ +@@ -803,7 +804,7 @@ re_string_reconstruct (re_string_t *pstr /* Then build the buffers. */ #ifdef RE_ENABLE_I18N @@ -5924,7 +5997,7 @@ Index: git/posix/regex_internal.c { if (pstr->icase) { -@@ -841,7 +842,7 @@ +@@ -841,7 +842,7 @@ re_string_peek_byte_case (const re_strin return re_string_peek_byte (pstr, idx); #ifdef RE_ENABLE_I18N @@ -5933,7 +6006,7 @@ Index: git/posix/regex_internal.c && ! re_string_is_single_byte_char (pstr, pstr->cur_idx + idx)) return re_string_peek_byte (pstr, idx); #endif -@@ -930,7 +931,7 @@ +@@ -930,7 +931,7 @@ re_string_context_at (const re_string_t return ((eflags & REG_NOTEOL) ? CONTEXT_ENDBUF : CONTEXT_NEWLINE | CONTEXT_ENDBUF); #ifdef RE_ENABLE_I18N @@ -5942,7 +6015,7 @@ Index: git/posix/regex_internal.c { wint_t wc; int wc_idx = idx; -@@ -1444,7 +1445,7 @@ +@@ -1444,7 +1445,7 @@ re_dfa_add_node (re_dfa_t *dfa, re_token dfa->nodes[dfa->nodes_len].constraint = 0; #ifdef RE_ENABLE_I18N dfa->nodes[dfa->nodes_len].accept_mb = @@ -5953,8 +6026,8 @@ Index: git/posix/regex_internal.c re_node_set_init_empty (dfa->edests + dfa->nodes_len); Index: git/posix/regex_internal.h =================================================================== ---- git.orig/posix/regex_internal.h 2014-08-29 20:00:53.264070587 -0700 -+++ git/posix/regex_internal.h 2014-08-29 20:01:15.224070587 -0700 +--- git.orig/posix/regex_internal.h ++++ git/posix/regex_internal.h @@ -26,6 +26,10 @@ #include <stdlib.h> #include <string.h> @@ -5966,7 +6039,7 @@ Index: git/posix/regex_internal.h #if defined HAVE_LANGINFO_H || defined HAVE_LANGINFO_CODESET || defined _LIBC # include <langinfo.h> #endif -@@ -370,6 +374,13 @@ +@@ -369,6 +373,13 @@ struct re_string_t }; typedef struct re_string_t re_string_t; @@ -5980,7 +6053,7 @@ Index: git/posix/regex_internal.h struct re_dfa_t; typedef struct re_dfa_t re_dfa_t; -@@ -655,6 +666,14 @@ +@@ -654,6 +665,14 @@ struct re_dfa_t __libc_lock_define (, lock) }; @@ -5995,7 +6068,7 @@ Index: git/posix/regex_internal.h #define re_node_set_init_empty(set) memset (set, '\0', sizeof (re_node_set)) #define re_node_set_remove(set,id) \ (re_node_set_remove_at (set, re_node_set_contains (set, id) - 1)) -@@ -715,7 +734,7 @@ +@@ -714,7 +733,7 @@ internal_function __attribute__ ((pure, re_string_char_size_at (const re_string_t *pstr, int idx) { int byte_idx; @@ -6004,7 +6077,7 @@ Index: git/posix/regex_internal.h return 1; for (byte_idx = 1; idx + byte_idx < pstr->valid_len; ++byte_idx) if (pstr->wcs[idx + byte_idx] != WEOF) -@@ -727,7 +746,7 @@ +@@ -726,7 +745,7 @@ static wint_t internal_function __attribute__ ((pure, unused)) re_string_wchar_at (const re_string_t *pstr, int idx) { @@ -6015,9 +6088,9 @@ Index: git/posix/regex_internal.h } Index: git/posix/xregex.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ git/posix/xregex.c 2014-08-29 20:01:15.228070587 -0700 -@@ -0,0 +1,8212 @@ +--- /dev/null ++++ git/posix/xregex.c +@@ -0,0 +1,8215 @@ +/* Extended regular expression matching and search library, + version 0.12. + (Implements POSIX draft P1003.2/D11.2, except for some of the @@ -6058,6 +6131,7 @@ Index: git/posix/xregex.c + +/*#include <ansidecl.h>*/ + ++ +#ifndef INSIDE_RECURSION + +# if defined STDC_HEADERS && !defined emacs @@ -6067,8 +6141,11 @@ Index: git/posix/xregex.c +# include <sys/types.h> +# endif + -+# define WIDE_CHAR_SUPPORT (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC) -+ ++# if (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_BTOWC) ++# define WIDE_CHAR_SUPPORT (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC) ++# else ++# define WIDE_CHAR_SUPPORT 0 ++# endif +/* For platform which support the ISO C amendement 1 functionality we + support user defined character classes. */ +# if WIDE_CHAR_SUPPORT @@ -6629,6 +6706,8 @@ Index: git/posix/xregex.c +# define PREFIX(name) byte_##name +# define ARG_PREFIX(name) name +# define PUT_CHAR(c) putchar (c) ++# include <locale/weight.h> ++# define FINDIDX findidx +#else +# ifdef WCHAR +# define CHAR_T wchar_t @@ -6642,6 +6721,10 @@ Index: git/posix/xregex.c +# define PUT_CHAR(c) printf ("%C", c); +# define TRUE 1 +# define FALSE 0 ++# define findidx findidxwc ++# include <locale/weightwc.h> ++# undef findidx ++# define FINDIDX findidxwc +# else +# ifdef MBS_SUPPORT +# define WCHAR @@ -8037,6 +8120,9 @@ Index: git/posix/xregex.c + reset the pointers that pointed into the old block to point to the + correct places in the new one. If extending the buffer results in it + being larger than MAX_BUF_SIZE, then flag memory exhausted. */ ++# ifndef __BOUNDED_POINTERS__ ++# define __BOUNDED_POINTERS__ 0 ++# endif +# if __BOUNDED_POINTERS__ +# define SET_HIGH_BOUND(P) (__ptrhigh (P) = __ptrlow (P) + bufp->allocated) +# define MOVE_BUFFER_POINTER(P) \ @@ -8942,9 +9028,6 @@ Index: git/posix/xregex.c + const int32_t *indirect; + wint_t *cp; + -+ /* This #include defines a local function! */ -+# include <locale/weightwc.h> -+ + if(delim == '=') + { + /* We push the index for equivalence class. */ @@ -8956,14 +9039,14 @@ Index: git/posix/xregex.c + weights = (const int32_t *) + _NL_CURRENT (LC_COLLATE, + _NL_COLLATE_WEIGHTWC); -+ extra = (const int32_t *) ++ extra = (const wint_t *) + _NL_CURRENT (LC_COLLATE, + _NL_COLLATE_EXTRAWC); + indirect = (const int32_t *) + _NL_CURRENT (LC_COLLATE, + _NL_COLLATE_INDIRECTWC); + -+ idx = findidx ((const wint_t**)&cp, c1); ++ idx = FINDIDX (table, indirect, extra, &cp, 1); + if (idx == 0 || cp < (wint_t*) str + c1) + /* This is no valid character. */ + FREE_STACK_RETURN (REG_ECOLLATE); @@ -9400,9 +9483,6 @@ Index: git/posix/xregex.c + const unsigned char *cp = str; + int ch; + -+ /* This #include defines a local function! */ -+# include <locale/weight.h> -+ + table = (const int32_t *) + _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB); + weights = (const unsigned char *) @@ -9411,8 +9491,7 @@ Index: git/posix/xregex.c + _NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB); + indirect = (const int32_t *) + _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB); -+ -+ idx = findidx (&cp, c1); ++ idx = FINDIDX (table, indirect, extra, &cp, 1); + if (idx == 0 || cp < str + c1) + /* This is no valid character. */ + FREE_STACK_RETURN (REG_ECOLLATE); @@ -12355,9 +12434,6 @@ Index: git/posix/xregex.c + wint_t *cp; + size_t len; + -+ /* This #include defines a local function! */ -+# include <locale/weightwc.h> -+ + table = (const int32_t *) + _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEWC); + weights = (const wint_t *) @@ -12383,7 +12459,7 @@ Index: git/posix/xregex.c + } + str_buf[i] = TRANSLATE(*(d+i)); + str_buf[i+1] = '\0'; /* sentinel */ -+ idx2 = findidx ((const wint_t**)&cp, i); ++ idx2 = FINDIDX (table, indirect, extra, &cp, 1); + } + + /* Update d, however d will be incremented at @@ -13165,8 +13241,8 @@ Index: git/posix/xregex.c + register from the stack, since lowest will == highest in + `pop_failure_point'. */ + active_reg_t dummy_low_reg, dummy_high_reg; -+ UCHAR_T *pdummy = NULL; -+ const CHAR_T *sdummy = NULL; ++ UCHAR_T *pdummy __attribute__ ((unused)) = NULL; ++ const CHAR_T *sdummy __attribute__ ((unused)) = NULL; + + DEBUG_PRINT1 ("EXECUTING pop_failure_jump.\n"); + POP_FAILURE_POINT (sdummy, pdummy, @@ -14232,8 +14308,8 @@ Index: git/posix/xregex.c +# define DEFINED_ONCE Index: git/pwd/Makefile =================================================================== ---- git.orig/pwd/Makefile 2014-08-29 20:00:53.316070587 -0700 -+++ git/pwd/Makefile 2014-08-29 20:01:15.232070587 -0700 +--- git.orig/pwd/Makefile ++++ git/pwd/Makefile @@ -18,6 +18,8 @@ # # Sub-makefile for pwd portion of the library. @@ -14245,8 +14321,8 @@ Index: git/pwd/Makefile include ../Makeconfig Index: git/resolv/Makefile =================================================================== ---- git.orig/resolv/Makefile 2014-08-29 20:00:53.320070587 -0700 -+++ git/resolv/Makefile 2014-08-29 20:01:15.232070587 -0700 +--- git.orig/resolv/Makefile ++++ git/resolv/Makefile @@ -18,6 +18,8 @@ # # Sub-makefile for resolv portion of the library. @@ -14256,7 +14332,7 @@ Index: git/resolv/Makefile subdir := resolv include ../Makeconfig -@@ -27,20 +29,21 @@ +@@ -27,20 +29,21 @@ headers := resolv.h \ arpa/nameser.h arpa/nameser_compat.h \ sys/bitypes.h @@ -14286,7 +14362,7 @@ Index: git/resolv/Makefile libresolv-routines := gethnamaddr res_comp res_debug \ res_data res_mkquery res_query res_send \ inet_net_ntop inet_net_pton inet_neta base64 \ -@@ -60,7 +63,7 @@ +@@ -60,7 +63,7 @@ routines += $(libnss_dns- static-only-routines += $(libnss_dns-routines) $(libresolv-routines) endif @@ -14297,8 +14373,8 @@ Index: git/resolv/Makefile Index: git/stdio-common/fxprintf.c =================================================================== ---- git.orig/stdio-common/fxprintf.c 2014-08-29 20:00:53.544070587 -0700 -+++ git/stdio-common/fxprintf.c 2014-08-29 20:01:15.232070587 -0700 +--- git.orig/stdio-common/fxprintf.c ++++ git/stdio-common/fxprintf.c @@ -23,6 +23,7 @@ #include <wchar.h> #include <string.h> @@ -14307,7 +14383,7 @@ Index: git/stdio-common/fxprintf.c int -@@ -37,6 +38,7 @@ +@@ -37,6 +38,7 @@ __fxprintf (FILE *fp, const char *fmt, . int res; if (_IO_fwide (fp, 0) > 0) { @@ -14315,7 +14391,7 @@ Index: git/stdio-common/fxprintf.c size_t len = strlen (fmt) + 1; wchar_t wfmt[len]; for (size_t i = 0; i < len; ++i) -@@ -45,6 +47,9 @@ +@@ -45,6 +47,9 @@ __fxprintf (FILE *fp, const char *fmt, . wfmt[i] = fmt[i]; } res = __vfwprintf (fp, wfmt, ap); @@ -14327,8 +14403,8 @@ Index: git/stdio-common/fxprintf.c res = _IO_vfprintf (fp, fmt, ap); Index: git/stdio-common/_i18n_number.h =================================================================== ---- git.orig/stdio-common/_i18n_number.h 2014-08-29 20:00:53.500070587 -0700 -+++ git/stdio-common/_i18n_number.h 2014-08-29 20:01:15.232070587 -0700 +--- git.orig/stdio-common/_i18n_number.h ++++ git/stdio-common/_i18n_number.h @@ -19,10 +19,13 @@ #include <stdbool.h> #include <wchar.h> @@ -14343,7 +14419,7 @@ Index: git/stdio-common/_i18n_number.h static CHAR_T * _i18n_number_rewrite (CHAR_T *w, CHAR_T *rear_ptr, CHAR_T *end) { -@@ -115,3 +118,13 @@ +@@ -115,3 +118,13 @@ _i18n_number_rewrite (CHAR_T *w, CHAR_T return w; } @@ -14359,8 +14435,8 @@ Index: git/stdio-common/_i18n_number.h +#endif Index: git/stdio-common/Makefile =================================================================== ---- git.orig/stdio-common/Makefile 2014-08-29 20:00:53.500070587 -0700 -+++ git/stdio-common/Makefile 2014-08-29 20:01:15.232070587 -0700 +--- git.orig/stdio-common/Makefile ++++ git/stdio-common/Makefile @@ -18,6 +18,8 @@ # # Specific makefile for stdio-common. @@ -14370,7 +14446,7 @@ Index: git/stdio-common/Makefile subdir := stdio-common include ../Makeconfig -@@ -30,7 +32,7 @@ +@@ -30,7 +32,7 @@ routines := \ vfprintf vprintf printf_fp reg-printf printf-prs printf_fphex \ reg-modifier reg-type \ printf_size fprintf printf snprintf sprintf asprintf dprintf \ @@ -14379,7 +14455,7 @@ Index: git/stdio-common/Makefile fscanf scanf sscanf \ perror psignal \ tmpfile tmpfile64 tmpnam tmpnam_r tempnam tempname \ -@@ -41,23 +43,37 @@ +@@ -41,23 +43,36 @@ routines := \ isoc99_vsscanf \ psiginfo @@ -14387,10 +14463,10 @@ Index: git/stdio-common/Makefile +# Ideally, _itowa and itowa-digits would be in this option group as +# well, but it is used unconditionally by printf_fp and printf_fphex, +# and it didn't seem straightforward to disentangle it. -+routines-$(OPTION_POSIX_C_LANG_WIDE_CHAR) += \ -+ vfwprintf vfwscanf ++routines-$(OPTION_POSIX_C_LANG_WIDE_CHAR) \ ++ += vfwprintf vfwscanf + -+aux := errlist siglist printf-parsemb fxprintf ++aux := errlist siglist printf-parsemb fxprintf +aux-$(OPTION_POSIX_C_LANG_WIDE_CHAR) += printf-parsewc tests := tstscanf test_rdwr test-popen tstgetln test-fseek \ @@ -14404,7 +14480,6 @@ Index: git/stdio-common/Makefile - tst-swprintf tst-fseek tst-fmemopen test-vfprintf tst-gets \ - tst-perror tst-sprintf tst-rndseek tst-fdopen tst-fphex bug14 \ + scanf11 scanf12 tst-tmpnam tst-cookie tst-obprintf \ -+ scanf11 scanf12 tst-tmpnam tst-cookie tst-obprintf \ + tst-fseek tst-fmemopen tst-gets \ + tst-sprintf tst-rndseek tst-fdopen tst-fphex \ tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \ @@ -14412,25 +14487,24 @@ Index: git/stdio-common/Makefile - bug19 bug19a tst-popen2 scanf13 scanf14 scanf15 bug20 bug21 bug22 \ - scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24 \ - bug-vfprintf-nargs tst-long-dbl-fphex tst-fphex-wide tst-sprintf3 \ -- bug25 tst-printf-round bug26 + tst-fwrite bug16 bug17 tst-sprintf2 bug18 \ -+ bug19 tst-popen2 scanf14 scanf15 bug21 bug22 scanf16 scanf17 \ -+ tst-setvbuf1 bug23 bug24 bug-vfprintf-nargs tst-sprintf3 bug25 \ -+ tst-printf-round bug26 -+ ++ bug19 tst-popen2 scanf14 scanf15 bug21 bug22 \ ++ scanf16 scanf17 tst-setvbuf1 bug23 bug24 \ ++ bug-vfprintf-nargs tst-sprintf3 \ + bug25 tst-printf-round bug23-2 bug23-3 bug23-4 bug26 +tests-$(OPTION_EGLIBC_LOCALE_CODE) \ -+ += tst-sscanf tst-swprintf test-vfprintf bug14 scanf13 tst-grouping ++ += tst-sscanf tst-swprintf test-vfprintf bug14 scanf13 tst-grouping +tests-$(OPTION_POSIX_WIDE_CHAR_DEVICE_IO) \ -+ += tst-perror bug19a bug20 tst-long-dbl-fphex tst-fphex-wide ++ += tst-perror bug19a bug20 tst-long-dbl-fphex tst-fphex-wide +tests-$(OPTION_POSIX_C_LANG_WIDE_CHAR) \ -+ += bug18a tst-swscanf tst-wc-printf ++ += bug18a tst-swscanf tst-wc-printf test-srcs = tst-unbputc tst-printf Index: git/stdio-common/printf_fp.c =================================================================== ---- git.orig/stdio-common/printf_fp.c 2014-08-29 20:00:53.548070587 -0700 -+++ git/stdio-common/printf_fp.c 2014-08-29 20:01:15.232070587 -0700 +--- git.orig/stdio-common/printf_fp.c ++++ git/stdio-common/printf_fp.c @@ -39,6 +39,7 @@ #include <unistd.h> #include <stdlib.h> @@ -14439,18 +14513,18 @@ Index: git/stdio-common/printf_fp.c #include <stdbool.h> #include <rounding-mode.h> -@@ -148,6 +149,10 @@ - wchar_t thousands_sep, int ngroups) - internal_function; +@@ -142,6 +143,10 @@ extern mp_size_t __mpn_extract_long_doub + extern unsigned int __guess_grouping (unsigned int intdig_max, + const char *grouping); +/* Ideally, when OPTION_EGLIBC_LOCALE_CODE is disabled, this should do + all its work in ordinary characters, rather than doing it in wide + characters and then converting at the end. But that is a challenge + for another day. */ - int - ___printf_fp (FILE *fp, -@@ -206,7 +211,14 @@ + static wchar_t *group_number (wchar_t *buf, wchar_t *bufend, + unsigned int intdig_no, const char *grouping, +@@ -251,7 +256,14 @@ ___printf_fp (FILE *fp, mp_limb_t cy; /* Nonzero if this is output on a wide character stream. */ @@ -14465,15 +14539,15 @@ Index: git/stdio-common/printf_fp.c /* Buffer in which we produce the output. */ wchar_t *wbuffer = NULL; -@@ -258,6 +270,7 @@ - +@@ -261,6 +273,7 @@ ___printf_fp (FILE *fp, + p.expsign = 0; /* Figure out the decimal point character. */ +#if __OPTION_EGLIBC_LOCALE_CODE if (info->extra == 0) { decimal = _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT); -@@ -277,7 +290,13 @@ +@@ -280,7 +293,13 @@ ___printf_fp (FILE *fp, /* The decimal point character must not be zero. */ assert (*decimal != '\0'); assert (decimalwc != L'\0'); @@ -14487,7 +14561,7 @@ Index: git/stdio-common/printf_fp.c if (info->group) { if (info->extra == 0) -@@ -321,6 +340,9 @@ +@@ -324,6 +343,9 @@ ___printf_fp (FILE *fp, } else grouping = NULL; @@ -14499,8 +14573,8 @@ Index: git/stdio-common/printf_fp.c #ifndef __NO_LONG_DOUBLE_MATH Index: git/stdio-common/printf_fphex.c =================================================================== ---- git.orig/stdio-common/printf_fphex.c 2014-08-29 20:00:53.548070587 -0700 -+++ git/stdio-common/printf_fphex.c 2014-08-29 20:01:15.232070587 -0700 +--- git.orig/stdio-common/printf_fphex.c ++++ git/stdio-common/printf_fphex.c @@ -28,6 +28,7 @@ #include <_itoa.h> #include <_itowa.h> @@ -14509,7 +14583,7 @@ Index: git/stdio-common/printf_fphex.c #include <stdbool.h> #include <rounding-mode.h> -@@ -139,10 +140,18 @@ +@@ -139,10 +140,18 @@ __printf_fphex (FILE *fp, int done = 0; /* Nonzero if this is output on a wide character stream. */ @@ -14528,7 +14602,7 @@ Index: git/stdio-common/printf_fphex.c if (info->extra == 0) { decimal = _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT); -@@ -156,6 +165,10 @@ +@@ -156,6 +165,10 @@ __printf_fphex (FILE *fp, } /* The decimal point character must never be zero. */ assert (*decimal != '\0' && decimalwc != L'\0'); @@ -14541,8 +14615,8 @@ Index: git/stdio-common/printf_fphex.c /* Fetch the argument value. */ Index: git/stdio-common/printf_size.c =================================================================== ---- git.orig/stdio-common/printf_size.c 2014-08-29 20:00:53.548070587 -0700 -+++ git/stdio-common/printf_size.c 2014-08-29 20:01:15.232070587 -0700 +--- git.orig/stdio-common/printf_size.c ++++ git/stdio-common/printf_size.c @@ -23,6 +23,7 @@ #include <math.h> #include <printf.h> @@ -14551,7 +14625,7 @@ Index: git/stdio-common/printf_size.c /* This defines make it possible to use the same code for GNU C library and -@@ -116,7 +117,14 @@ +@@ -116,7 +117,14 @@ __printf_size (FILE *fp, const struct pr struct printf_info fp_info; int done = 0; @@ -14568,25 +14642,25 @@ Index: git/stdio-common/printf_size.c /* Fetch the argument value. */ Index: git/stdio-common/scanf14.c =================================================================== ---- git.orig/stdio-common/scanf14.c 2014-08-29 20:00:53.548070587 -0700 -+++ git/stdio-common/scanf14.c 2014-08-29 20:01:15.232070587 -0700 -@@ -2,6 +2,7 @@ - #include <stdlib.h> +--- git.orig/stdio-common/scanf14.c ++++ git/stdio-common/scanf14.c +@@ -3,6 +3,7 @@ #include <string.h> #include <wchar.h> + #include <libc-internal.h> +#include <gnu/option-groups.h> #define FAIL() \ do { \ -@@ -36,6 +37,7 @@ - FAIL (); - else if (d != 2.25 || memcmp (c, " x", 2) != 0) - FAIL (); +@@ -48,6 +49,7 @@ main (void) + /* See explanation above. */ + DIAG_PUSH_NEEDS_COMMENT; + DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wformat"); +#if __OPTION_EGLIBC_LOCALE_CODE if (sscanf (" 3.25S x", "%4aS%3c", &lsp, c) != 2) FAIL (); else -@@ -45,6 +47,7 @@ +@@ -57,6 +59,7 @@ main (void) memset (lsp, 'x', sizeof L"3.25"); free (lsp); } @@ -14596,17 +14670,17 @@ Index: git/stdio-common/scanf14.c else Index: git/stdio-common/tstdiomisc.c =================================================================== ---- git.orig/stdio-common/tstdiomisc.c 2014-08-29 20:00:53.584070587 -0700 -+++ git/stdio-common/tstdiomisc.c 2014-08-29 20:01:15.232070587 -0700 -@@ -3,6 +3,7 @@ - #include <stdio.h> +--- git.orig/stdio-common/tstdiomisc.c ++++ git/stdio-common/tstdiomisc.c +@@ -4,6 +4,7 @@ #include <string.h> #include <wchar.h> + #include <libc-internal.h> +#include <gnu/option-groups.h> static int t1 (void) -@@ -125,6 +126,7 @@ +@@ -134,6 +135,7 @@ F (void) printf ("expected \"-inf -INF -inf -INF -inf -INF -inf -INF\", got \"%s\"\n", buf); @@ -14614,7 +14688,7 @@ Index: git/stdio-common/tstdiomisc.c swprintf (wbuf, sizeof wbuf / sizeof (wbuf[0]), L"%a %A %e %E %f %F %g %G", qnanval, qnanval, qnanval, qnanval, qnanval, qnanval, qnanval, qnanval); -@@ -162,6 +164,7 @@ +@@ -171,6 +173,7 @@ F (void) result |= wcscmp (wbuf, L"-inf -INF -inf -INF -inf -INF -inf -INF") != 0; printf ("expected L\"-inf -INF -inf -INF -inf -INF -inf -INF\", got L\"%S\"\n", wbuf); @@ -14622,7 +14696,7 @@ Index: git/stdio-common/tstdiomisc.c lqnanval = NAN; -@@ -206,6 +209,7 @@ +@@ -215,6 +218,7 @@ F (void) printf ("expected \"-inf -INF -inf -INF -inf -INF -inf -INF\", got \"%s\"\n", buf); @@ -14630,7 +14704,7 @@ Index: git/stdio-common/tstdiomisc.c swprintf (wbuf, sizeof wbuf / sizeof (wbuf[0]), L"%La %LA %Le %LE %Lf %LF %Lg %LG", lqnanval, lqnanval, lqnanval, lqnanval, -@@ -250,6 +254,7 @@ +@@ -259,6 +263,7 @@ F (void) result |= wcscmp (wbuf, L"-inf -INF -inf -INF -inf -INF -inf -INF") != 0; printf ("expected L\"-inf -INF -inf -INF -inf -INF -inf -INF\", got L\"%S\"\n", wbuf); @@ -14640,8 +14714,8 @@ Index: git/stdio-common/tstdiomisc.c } Index: git/stdio-common/tst-popen.c =================================================================== ---- git.orig/stdio-common/tst-popen.c 2014-08-29 20:00:53.576070587 -0700 -+++ git/stdio-common/tst-popen.c 2014-08-29 20:01:15.232070587 -0700 +--- git.orig/stdio-common/tst-popen.c ++++ git/stdio-common/tst-popen.c @@ -19,6 +19,7 @@ #include <stdio.h> #include <string.h> @@ -14650,7 +14724,7 @@ Index: git/stdio-common/tst-popen.c static int do_test (void) -@@ -34,12 +35,14 @@ +@@ -34,12 +35,14 @@ do_test (void) return 1; } @@ -14667,17 +14741,18 @@ Index: git/stdio-common/tst-popen.c { Index: git/stdio-common/tst-sprintf.c =================================================================== ---- git.orig/stdio-common/tst-sprintf.c 2014-08-29 20:00:53.580070587 -0700 -+++ git/stdio-common/tst-sprintf.c 2014-08-29 20:01:15.236070587 -0700 -@@ -2,6 +2,7 @@ - #include <stdlib.h> +--- git.orig/stdio-common/tst-sprintf.c ++++ git/stdio-common/tst-sprintf.c +@@ -3,7 +3,7 @@ #include <locale.h> #include <string.h> + #include <libc-internal.h> +- +#include <gnu/option-groups.h> - - int -@@ -10,12 +11,14 @@ + static int + do_test (void) +@@ -11,12 +11,14 @@ do_test (void) char buf[100]; int result = 0; @@ -14694,8 +14769,8 @@ Index: git/stdio-common/tst-sprintf.c #define STR(x) #x Index: git/stdio-common/vfprintf.c =================================================================== ---- git.orig/stdio-common/vfprintf.c 2014-08-29 20:00:53.588070587 -0700 -+++ git/stdio-common/vfprintf.c 2014-08-29 20:01:15.236070587 -0700 +--- git.orig/stdio-common/vfprintf.c ++++ git/stdio-common/vfprintf.c @@ -29,6 +29,7 @@ #include <_itoa.h> #include <locale/localeinfo.h> @@ -14723,7 +14798,7 @@ Index: git/stdio-common/vfprintf.c #include "_i18n_number.h" /* Include the shared code for parsing the format string. */ -@@ -1123,8 +1136,11 @@ +@@ -1129,8 +1142,11 @@ vfprintf (FILE *s, const CHAR_T *format, # define process_string_arg(fspec) \ LABEL (form_character): \ /* Character. */ \ @@ -14737,7 +14812,7 @@ Index: git/stdio-common/vfprintf.c --width; /* Account for the character itself. */ \ if (!left) \ PAD (' '); \ -@@ -1137,6 +1153,7 @@ +@@ -1143,6 +1159,7 @@ vfprintf (FILE *s, const CHAR_T *format, break; \ \ LABEL (form_wcharacter): \ @@ -14745,7 +14820,7 @@ Index: git/stdio-common/vfprintf.c { \ /* Wide character. */ \ char buf[MB_CUR_MAX]; \ -@@ -1203,6 +1220,7 @@ +@@ -1209,6 +1226,7 @@ vfprintf (FILE *s, const CHAR_T *format, } \ else \ { \ @@ -14753,7 +14828,7 @@ Index: git/stdio-common/vfprintf.c const wchar_t *s2 = (const wchar_t *) string; \ mbstate_t mbstate; \ \ -@@ -1403,7 +1421,9 @@ +@@ -1409,7 +1427,9 @@ vfprintf (FILE *s, const CHAR_T *format, LABEL (flag_quote): group = 1; @@ -14764,7 +14839,7 @@ Index: git/stdio-common/vfprintf.c { #ifdef COMPILE_WPRINTF thousands_sep = _NL_CURRENT_WORD (LC_NUMERIC, -@@ -1702,7 +1722,9 @@ +@@ -1708,7 +1728,9 @@ do_positional: free (workstart); workstart = NULL; @@ -14777,8 +14852,8 @@ Index: git/stdio-common/vfprintf.c thousands_sep = _NL_CURRENT_WORD (LC_NUMERIC, Index: git/stdio-common/vfscanf.c =================================================================== ---- git.orig/stdio-common/vfscanf.c 2014-08-29 20:00:53.588070587 -0700 -+++ git/stdio-common/vfscanf.c 2014-08-29 20:01:15.236070587 -0700 +--- git.orig/stdio-common/vfscanf.c ++++ git/stdio-common/vfscanf.c @@ -29,6 +29,7 @@ #include <wctype.h> #include <bits/libc-lock.h> @@ -14800,7 +14875,7 @@ Index: git/stdio-common/vfscanf.c #define encode_error() do { \ errval = 4; \ __set_errno (EILSEQ); \ -@@ -316,24 +323,35 @@ +@@ -316,24 +323,35 @@ _IO_vfscanf_internal (_IO_FILE *s, const ARGCHECK (s, format); { @@ -14843,7 +14918,7 @@ Index: git/stdio-common/vfscanf.c } /* Lock the stream. */ -@@ -385,6 +403,8 @@ +@@ -385,6 +403,8 @@ _IO_vfscanf_internal (_IO_FILE *s, const #ifndef COMPILE_WSCANF if (!isascii ((unsigned char) *f)) { @@ -14852,7 +14927,7 @@ Index: git/stdio-common/vfscanf.c /* Non-ASCII, may be a multibyte. */ int len = __mbrlen (f, strlen (f), &state); if (len > 0) -@@ -830,6 +850,8 @@ +@@ -830,6 +850,8 @@ _IO_vfscanf_internal (_IO_FILE *s, const } /* FALLTHROUGH */ case L_('C'): @@ -14861,7 +14936,7 @@ Index: git/stdio-common/vfscanf.c if (width == -1) width = 1; -@@ -1172,6 +1194,8 @@ +@@ -1172,6 +1194,8 @@ _IO_vfscanf_internal (_IO_FILE *s, const /* FALLTHROUGH */ case L_('S'): @@ -14870,7 +14945,7 @@ Index: git/stdio-common/vfscanf.c { #ifndef COMPILE_WSCANF mbstate_t cstate; -@@ -1419,10 +1443,17 @@ +@@ -1419,10 +1443,17 @@ _IO_vfscanf_internal (_IO_FILE *s, const const char *mbdigits[10]; const char *mbdigits_extended[10]; #endif @@ -14888,7 +14963,7 @@ Index: git/stdio-common/vfscanf.c int n; from_level = 0; -@@ -2088,6 +2119,7 @@ +@@ -2088,6 +2119,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const --width; } @@ -14896,7 +14971,7 @@ Index: git/stdio-common/vfscanf.c wctrans_t map; if (__builtin_expect ((flags & I18N) != 0, 0) /* Hexadecimal floats make no sense, fixing localized -@@ -2304,6 +2336,7 @@ +@@ -2304,6 +2336,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const ; #endif } @@ -14904,7 +14979,7 @@ Index: git/stdio-common/vfscanf.c /* Have we read any character? If we try to read a number in hexadecimal notation and we have read only the `0x' -@@ -2343,7 +2376,10 @@ +@@ -2343,7 +2376,10 @@ _IO_vfscanf_internal (_IO_FILE *s, const case L_('['): /* Character class. */ if (flags & LONG) @@ -14916,7 +14991,7 @@ Index: git/stdio-common/vfscanf.c else STRING_ARG (str, char, 100); -@@ -2417,6 +2453,7 @@ +@@ -2417,6 +2453,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const if (flags & LONG) { size_t now = read_in; @@ -14926,8 +15001,8 @@ Index: git/stdio-common/vfscanf.c input_error (); Index: git/stdlib/Makefile =================================================================== ---- git.orig/stdlib/Makefile 2014-08-29 20:00:53.588070587 -0700 -+++ git/stdlib/Makefile 2014-08-29 20:01:15.236070587 -0700 +--- git.orig/stdlib/Makefile ++++ git/stdlib/Makefile @@ -18,6 +18,8 @@ # # Makefile for stdlib routines @@ -14937,7 +15012,7 @@ Index: git/stdlib/Makefile subdir := stdlib include ../Makeconfig -@@ -30,7 +32,7 @@ +@@ -30,7 +32,7 @@ headers := stdlib.h bits/stdlib.h bits/s alloca.h fmtmsg.h \ bits/stdlib-bsearch.h @@ -14946,7 +15021,7 @@ Index: git/stdlib/Makefile atof atoi atol atoll \ abort \ bsearch qsort msort \ -@@ -39,7 +41,6 @@ +@@ -39,7 +41,6 @@ routines := \ quick_exit at_quick_exit cxa_at_quick_exit cxa_thread_atexit_impl \ abs labs llabs \ div ldiv lldiv \ @@ -14954,7 +15029,7 @@ Index: git/stdlib/Makefile random random_r rand rand_r \ drand48 erand48 lrand48 nrand48 mrand48 jrand48 \ srand48 seed48 lcong48 \ -@@ -52,9 +53,18 @@ +@@ -52,9 +53,18 @@ routines := \ strtof_l strtod_l strtold_l \ system canonicalize \ a64l l64a \ @@ -14975,7 +15050,7 @@ Index: git/stdlib/Makefile aux = grouping groupingwc tens_in_limb # These routines will be omitted from the libc shared object. -@@ -62,20 +72,22 @@ +@@ -62,20 +72,22 @@ aux = grouping groupingwc tens_in_limb # linked against when the shared library will be used. static-only-routines = atexit at_quick_exit @@ -15006,7 +15081,7 @@ Index: git/stdlib/Makefile modules-names = tst-tls-atexit-lib ifeq ($(build-shared),yes) -@@ -115,8 +127,10 @@ +@@ -115,8 +127,10 @@ CFLAGS-tst-makecontext2.c = $(stack-alig tests-special += $(objpfx)isomac.out ifeq ($(run-built-tests),yes) @@ -15019,8 +15094,8 @@ Index: git/stdlib/Makefile Index: git/stdlib/strtod_l.c =================================================================== ---- git.orig/stdlib/strtod_l.c 2014-08-29 20:00:53.648070587 -0700 -+++ git/stdlib/strtod_l.c 2014-08-29 20:01:15.236070587 -0700 +--- git.orig/stdlib/strtod_l.c ++++ git/stdlib/strtod_l.c @@ -17,6 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ @@ -15029,7 +15104,7 @@ Index: git/stdlib/strtod_l.c #include <xlocale.h> extern double ____strtod_l_internal (const char *, char **, int, __locale_t); -@@ -548,6 +549,7 @@ +@@ -548,6 +549,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group /* Used in several places. */ int cnt; @@ -15037,7 +15112,7 @@ Index: git/stdlib/strtod_l.c struct __locale_data *current = loc->__locales[LC_NUMERIC]; if (__glibc_unlikely (group)) -@@ -586,6 +588,17 @@ +@@ -586,6 +588,17 @@ ____STRTOF_INTERNAL (nptr, endptr, group decimal_len = strlen (decimal); assert (decimal_len > 0); #endif @@ -15057,8 +15132,8 @@ Index: git/stdlib/strtod_l.c exponent = 0; Index: git/stdlib/tst-strtod.c =================================================================== ---- git.orig/stdlib/tst-strtod.c 2014-08-29 20:00:53.700070587 -0700 -+++ git/stdlib/tst-strtod.c 2014-08-29 20:01:15.236070587 -0700 +--- git.orig/stdlib/tst-strtod.c ++++ git/stdlib/tst-strtod.c @@ -23,6 +23,7 @@ #include <errno.h> #include <string.h> @@ -15067,7 +15142,7 @@ Index: git/stdlib/tst-strtod.c struct ltest { -@@ -176,7 +177,9 @@ +@@ -176,7 +177,9 @@ main (int argc, char ** argv) status |= long_dbl (); @@ -15077,7 +15152,7 @@ Index: git/stdlib/tst-strtod.c return status ? EXIT_FAILURE : EXIT_SUCCESS; } -@@ -219,6 +222,7 @@ +@@ -219,6 +222,7 @@ long_dbl (void) return 0; } @@ -15085,15 +15160,15 @@ Index: git/stdlib/tst-strtod.c /* Perform a few tests in a locale with thousands separators. */ static int locale_test (void) -@@ -276,3 +280,4 @@ +@@ -276,3 +280,4 @@ locale_test (void) return result; } +#endif /* __OPTION_EGLIBC_LOCALE_CODE */ Index: git/streams/Makefile =================================================================== ---- git.orig/streams/Makefile 2014-08-29 20:00:53.712070587 -0700 -+++ git/streams/Makefile 2014-08-29 20:01:15.236070587 -0700 +--- git.orig/streams/Makefile ++++ git/streams/Makefile @@ -18,11 +18,14 @@ # # Makefile for streams. @@ -15112,8 +15187,8 @@ Index: git/streams/Makefile include ../Rules Index: git/string/Makefile =================================================================== ---- git.orig/string/Makefile 2014-08-29 20:00:53.716070587 -0700 -+++ git/string/Makefile 2014-08-29 20:01:15.236070587 -0700 +--- git.orig/string/Makefile ++++ git/string/Makefile @@ -18,6 +18,8 @@ # # Sub-makefile for string portion of library. @@ -15123,7 +15198,7 @@ Index: git/string/Makefile subdir := string include ../Makeconfig -@@ -39,10 +41,12 @@ +@@ -39,10 +41,12 @@ routines := strcat strchr strcmp strcoll $(addprefix argz-,append count create ctsep next \ delete extract insert stringify \ addsep replace) \ @@ -15137,7 +15212,7 @@ Index: git/string/Makefile strop-tests := memchr memcmp memcpy memmove mempcpy memset memccpy \ stpcpy stpncpy strcat strchr strcmp strcpy strcspn \ strlen strncmp strncpy strpbrk strrchr strspn memmem \ -@@ -51,10 +55,12 @@ +@@ -51,10 +55,12 @@ strop-tests := memchr memcmp memcpy memm tests := tester inl-tester noinl-tester testcopy test-ffs \ tst-strlen stratcliff tst-svc tst-inlcall \ bug-strncat1 bug-strspn1 bug-strpbrk1 tst-bswap \ @@ -15155,17 +15230,17 @@ Index: git/string/Makefile Index: git/string/strcoll_l.c =================================================================== ---- git.orig/string/strcoll_l.c 2014-08-29 20:00:53.744070587 -0700 -+++ git/string/strcoll_l.c 2014-08-29 20:01:15.240070587 -0700 -@@ -25,6 +25,7 @@ - #include <stdlib.h> +--- git.orig/string/strcoll_l.c ++++ git/string/strcoll_l.c +@@ -24,6 +24,7 @@ + #include <stdint.h> #include <string.h> #include <sys/param.h> +#include <gnu/option-groups.h> #ifndef STRING_TYPE # define STRING_TYPE char -@@ -472,7 +473,11 @@ +@@ -247,7 +248,11 @@ int STRCOLL (const STRING_TYPE *s1, const STRING_TYPE *s2, __locale_t l) { struct __locale_data *current = l->__locales[LC_COLLATE]; @@ -15179,8 +15254,8 @@ Index: git/string/strcoll_l.c const unsigned char *rulesets; Index: git/string/strerror_l.c =================================================================== ---- git.orig/string/strerror_l.c 2014-08-29 20:00:53.744070587 -0700 -+++ git/string/strerror_l.c 2014-08-29 20:01:15.240070587 -0700 +--- git.orig/string/strerror_l.c ++++ git/string/strerror_l.c @@ -21,6 +21,7 @@ #include <stdlib.h> #include <string.h> @@ -15189,7 +15264,7 @@ Index: git/string/strerror_l.c static __thread char *last_value; -@@ -29,10 +30,14 @@ +@@ -29,10 +30,14 @@ static __thread char *last_value; static const char * translate (const char *str, locale_t loc) { @@ -15206,8 +15281,8 @@ Index: git/string/strerror_l.c Index: git/string/strxfrm_l.c =================================================================== ---- git.orig/string/strxfrm_l.c 2014-08-29 20:00:53.748070587 -0700 -+++ git/string/strxfrm_l.c 2014-08-29 20:01:15.240070587 -0700 +--- git.orig/string/strxfrm_l.c ++++ git/string/strxfrm_l.c @@ -24,6 +24,7 @@ #include <stdlib.h> #include <string.h> @@ -15216,23 +15291,23 @@ Index: git/string/strxfrm_l.c #ifndef STRING_TYPE # define STRING_TYPE char -@@ -85,7 +86,11 @@ - STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, __locale_t l) +@@ -670,7 +671,11 @@ STRXFRM (STRING_TYPE *dest, const STRING { + locale_data_t l_data; struct __locale_data *current = l->__locales[LC_COLLATE]; +#if __OPTION_EGLIBC_LOCALE_CODE - uint_fast32_t nrules = current->values[_NL_ITEM_INDEX (_NL_COLLATE_NRULES)].word; + l_data.nrules = current->values[_NL_ITEM_INDEX (_NL_COLLATE_NRULES)].word; +#else -+ const uint_fast32_t nrules = 0; ++ l_data.nrules = 0; +#endif - /* We don't assign the following values right away since it might be - unnecessary in case there are no rules. */ - const unsigned char *rulesets; + + /* Handle byte comparison case. */ + if (l_data.nrules == 0) Index: git/string/test-strcmp.c =================================================================== ---- git.orig/string/test-strcmp.c 2014-08-29 20:00:53.752070587 -0700 -+++ git/string/test-strcmp.c 2014-08-29 20:01:15.240070587 -0700 -@@ -329,34 +329,6 @@ +--- git.orig/string/test-strcmp.c ++++ git/string/test-strcmp.c +@@ -329,34 +329,6 @@ check (void) FOR_EACH_IMPL (impl, 0) check_result (impl, s1 + i1, s2 + i2, exp_result); } @@ -15269,8 +15344,8 @@ Index: git/string/test-strcmp.c Index: git/string/tst-strxfrm2.c =================================================================== ---- git.orig/string/tst-strxfrm2.c 2014-08-29 20:00:53.756070587 -0700 -+++ git/string/tst-strxfrm2.c 2014-08-29 20:01:15.240070587 -0700 +--- git.orig/string/tst-strxfrm2.c ++++ git/string/tst-strxfrm2.c @@ -1,6 +1,7 @@ #include <locale.h> #include <stdio.h> @@ -15279,7 +15354,7 @@ Index: git/string/tst-strxfrm2.c static int do_test (void) -@@ -38,6 +39,7 @@ +@@ -38,6 +39,7 @@ do_test (void) res = 1; } @@ -15287,7 +15362,7 @@ Index: git/string/tst-strxfrm2.c if (setlocale (LC_ALL, "de_DE.UTF-8") == NULL) { puts ("setlocale failed"); -@@ -75,6 +77,7 @@ +@@ -75,6 +77,7 @@ do_test (void) res = 1; } } @@ -15297,8 +15372,8 @@ Index: git/string/tst-strxfrm2.c } Index: git/string/tst-strxfrm.c =================================================================== ---- git.orig/string/tst-strxfrm.c 2014-08-29 20:00:53.756070587 -0700 -+++ git/string/tst-strxfrm.c 2014-08-29 20:01:15.240070587 -0700 +--- git.orig/string/tst-strxfrm.c ++++ git/string/tst-strxfrm.c @@ -3,6 +3,7 @@ #include <stdio.h> #include <stdlib.h> @@ -15307,7 +15382,7 @@ Index: git/string/tst-strxfrm.c char const string[] = ""; -@@ -64,8 +65,10 @@ +@@ -64,8 +65,10 @@ do_test (void) int result = 0; result |= test ("C"); @@ -15320,8 +15395,8 @@ Index: git/string/tst-strxfrm.c } Index: git/sunrpc/Makefile =================================================================== ---- git.orig/sunrpc/Makefile 2014-08-29 20:00:53.760070587 -0700 -+++ git/sunrpc/Makefile 2014-08-29 20:01:15.240070587 -0700 +--- git.orig/sunrpc/Makefile ++++ git/sunrpc/Makefile @@ -18,6 +18,8 @@ # # Sub-makefile for sunrpc portion of the library. @@ -15331,7 +15406,7 @@ Index: git/sunrpc/Makefile subdir := sunrpc include ../Makeconfig -@@ -55,7 +57,6 @@ +@@ -55,7 +57,6 @@ headers-in-tirpc = $(addprefix rpc/,auth headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h headers = rpc/netdb.h @@ -15339,7 +15414,7 @@ Index: git/sunrpc/Makefile generated += $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen generated-dirs += rpcsvc -@@ -65,18 +66,28 @@ +@@ -65,18 +66,28 @@ headers += $(headers-in-tirpc) $(headers endif ifeq ($(build-shared),yes) @@ -15373,7 +15448,7 @@ Index: git/sunrpc/Makefile ifneq ($(link-obsolete-rpc),yes) # We only add the RPC for compatibility to libc.so. shared-only-routines = $(routines) -@@ -85,25 +96,28 @@ +@@ -85,25 +96,28 @@ endif # We do not build rpcinfo anymore. It is not needed for a bootstrap # and not wanted on complete systems. @@ -15414,9 +15489,9 @@ Index: git/sunrpc/Makefile omit-deps = $(librpcsvc-routines) Index: git/sysdeps/generic/ldsodefs.h =================================================================== ---- git.orig/sysdeps/generic/ldsodefs.h 2014-08-29 20:00:53.904070587 -0700 -+++ git/sysdeps/generic/ldsodefs.h 2014-08-29 20:01:15.240070587 -0700 -@@ -425,6 +425,12 @@ +--- git.orig/sysdeps/generic/ldsodefs.h ++++ git/sysdeps/generic/ldsodefs.h +@@ -425,6 +425,12 @@ extern struct rtld_global _rtld_global _ # undef __rtld_global_attribute__ #endif @@ -15429,7 +15504,7 @@ Index: git/sysdeps/generic/ldsodefs.h #ifndef SHARED # define GLRO(name) _##name #else -@@ -437,8 +443,10 @@ +@@ -437,8 +443,10 @@ struct rtld_global_ro { #endif @@ -15442,9 +15517,9 @@ Index: git/sysdeps/generic/ldsodefs.h #define DL_DEBUG_BINDINGS (1 << 2) Index: git/sysdeps/gnu/Makefile =================================================================== ---- git.orig/sysdeps/gnu/Makefile 2014-08-29 20:00:53.924070587 -0700 -+++ git/sysdeps/gnu/Makefile 2014-08-29 20:01:15.240070587 -0700 -@@ -57,7 +57,8 @@ +--- git.orig/sysdeps/gnu/Makefile ++++ git/sysdeps/gnu/Makefile +@@ -59,7 +59,8 @@ $(foreach o,$(object-suffixes) $(object- endif ifeq ($(subdir),login) @@ -15456,9 +15531,9 @@ Index: git/sysdeps/gnu/Makefile sysdep_headers += utmpx.h bits/utmpx.h Index: git/sysdeps/ieee754/ldbl-opt/Makefile =================================================================== ---- git.orig/sysdeps/ieee754/ldbl-opt/Makefile 2014-08-29 20:00:54.452070587 -0700 -+++ git/sysdeps/ieee754/ldbl-opt/Makefile 2014-08-29 20:01:15.244070587 -0700 -@@ -11,19 +11,18 @@ +--- git.orig/sysdeps/ieee754/ldbl-opt/Makefile ++++ git/sysdeps/ieee754/ldbl-opt/Makefile +@@ -11,19 +11,18 @@ libm-routines += s_nexttowardfd routines += math_ldbl_opt nldbl-compat extra-libs += libnldbl @@ -15487,7 +15562,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/Makefile strtold strtold_l strtoldint wcstold wcstold_l wcstoldint \ qecvt qfcvt qgcvt qecvt_r qfcvt_r \ isinf isnan finite signbit scalb log2 lgamma_r ceil \ -@@ -38,9 +37,15 @@ +@@ -38,9 +37,15 @@ libnldbl-calls = asprintf dprintf fprint casinh cexp clog cproj csin csinh csqrt ctan ctanh cpow \ cabs carg cimag creal clog10 \ isoc99_scanf isoc99_fscanf isoc99_sscanf \ @@ -15506,8 +15581,8 @@ Index: git/sysdeps/ieee754/ldbl-opt/Makefile libnldbl-static-only-routines = $(libnldbl-routines) Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c =================================================================== ---- git.orig/sysdeps/ieee754/ldbl-opt/nldbl-compat.c 2014-08-29 20:00:54.468070587 -0700 -+++ git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c 2014-08-29 20:01:15.244070587 -0700 +--- git.orig/sysdeps/ieee754/ldbl-opt/nldbl-compat.c ++++ git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c @@ -26,6 +26,7 @@ #include <locale/localeinfo.h> #include <sys/syslog.h> @@ -15516,7 +15591,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c #include "nldbl-compat.h" -@@ -33,20 +34,14 @@ +@@ -33,20 +34,14 @@ libc_hidden_proto (__nldbl_vfprintf) libc_hidden_proto (__nldbl_vsscanf) libc_hidden_proto (__nldbl_vsprintf) libc_hidden_proto (__nldbl_vfscanf) @@ -15537,7 +15612,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c libc_hidden_proto (__nldbl___vasprintf_chk) libc_hidden_proto (__nldbl___vdprintf_chk) libc_hidden_proto (__nldbl___obstack_vprintf_chk) -@@ -54,8 +49,17 @@ +@@ -54,8 +49,17 @@ libc_hidden_proto (__nldbl___vstrfmon) libc_hidden_proto (__nldbl___vstrfmon_l) libc_hidden_proto (__nldbl___isoc99_vsscanf) libc_hidden_proto (__nldbl___isoc99_vfscanf) @@ -15555,7 +15630,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c static void __nldbl_cleanup (void *arg) -@@ -117,6 +121,7 @@ +@@ -117,6 +121,7 @@ __nldbl_fprintf (FILE *stream, const cha } weak_alias (__nldbl_fprintf, __nldbl__IO_fprintf) @@ -15563,7 +15638,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c int attribute_compat_text_section weak_function __nldbl_fwprintf (FILE *stream, const wchar_t *fmt, ...) -@@ -130,6 +135,7 @@ +@@ -130,6 +135,7 @@ __nldbl_fwprintf (FILE *stream, const wc return done; } @@ -15571,7 +15646,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c int attribute_compat_text_section -@@ -226,6 +232,7 @@ +@@ -226,6 +232,7 @@ __nldbl_snprintf (char *s, size_t maxlen return done; } @@ -15579,7 +15654,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c int attribute_compat_text_section __nldbl_swprintf (wchar_t *s, size_t n, const wchar_t *fmt, ...) -@@ -239,6 +246,7 @@ +@@ -239,6 +246,7 @@ __nldbl_swprintf (wchar_t *s, size_t n, return done; } @@ -15587,7 +15662,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c int attribute_compat_text_section weak_function -@@ -264,6 +272,7 @@ +@@ -264,6 +272,7 @@ __nldbl_vdprintf (int d, const char *fmt } libc_hidden_def (__nldbl_vdprintf) @@ -15595,7 +15670,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c int attribute_compat_text_section weak_function __nldbl_vfwprintf (FILE *s, const wchar_t *fmt, va_list ap) -@@ -275,6 +284,7 @@ +@@ -275,6 +284,7 @@ __nldbl_vfwprintf (FILE *s, const wchar_ return res; } libc_hidden_def (__nldbl_vfwprintf) @@ -15603,7 +15678,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c int attribute_compat_text_section -@@ -297,6 +307,7 @@ +@@ -297,6 +307,7 @@ __nldbl_vsnprintf (char *string, size_t libc_hidden_def (__nldbl_vsnprintf) weak_alias (__nldbl_vsnprintf, __nldbl___vsnprintf) @@ -15611,7 +15686,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c int attribute_compat_text_section weak_function __nldbl_vswprintf (wchar_t *string, size_t maxlen, const wchar_t *fmt, -@@ -330,6 +341,7 @@ +@@ -330,6 +341,7 @@ __nldbl_wprintf (const wchar_t *fmt, ... return done; } @@ -15619,7 +15694,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c int attribute_compat_text_section -@@ -419,6 +431,7 @@ +@@ -419,6 +431,7 @@ __nldbl_scanf (const char *fmt, ...) return done; } @@ -15627,7 +15702,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c int attribute_compat_text_section __nldbl_vfwscanf (FILE *s, const wchar_t *fmt, va_list ap) -@@ -491,6 +504,7 @@ +@@ -491,6 +504,7 @@ __nldbl_wscanf (const wchar_t *fmt, ...) return done; } @@ -15635,7 +15710,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c int attribute_compat_text_section -@@ -506,6 +520,7 @@ +@@ -506,6 +520,7 @@ __nldbl___fprintf_chk (FILE *stream, int return done; } @@ -15643,7 +15718,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c int attribute_compat_text_section __nldbl___fwprintf_chk (FILE *stream, int flag, const wchar_t *fmt, ...) -@@ -519,6 +534,7 @@ +@@ -519,6 +534,7 @@ __nldbl___fwprintf_chk (FILE *stream, in return done; } @@ -15651,7 +15726,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c int attribute_compat_text_section -@@ -563,6 +579,7 @@ +@@ -563,6 +579,7 @@ __nldbl___sprintf_chk (char *s, int flag return done; } @@ -15659,7 +15734,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c int attribute_compat_text_section __nldbl___swprintf_chk (wchar_t *s, size_t n, int flag, size_t slen, -@@ -577,6 +594,7 @@ +@@ -577,6 +594,7 @@ __nldbl___swprintf_chk (wchar_t *s, size return done; } @@ -15667,7 +15742,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c int attribute_compat_text_section -@@ -590,6 +608,7 @@ +@@ -590,6 +608,7 @@ __nldbl___vfprintf_chk (FILE *s, int fla } libc_hidden_def (__nldbl___vfprintf_chk) @@ -15675,7 +15750,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c int attribute_compat_text_section __nldbl___vfwprintf_chk (FILE *s, int flag, const wchar_t *fmt, va_list ap) -@@ -601,6 +620,7 @@ +@@ -601,6 +620,7 @@ __nldbl___vfwprintf_chk (FILE *s, int fl return res; } libc_hidden_def (__nldbl___vfwprintf_chk) @@ -15683,7 +15758,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c int attribute_compat_text_section -@@ -635,6 +655,7 @@ +@@ -635,6 +655,7 @@ __nldbl___vsprintf_chk (char *string, in } libc_hidden_def (__nldbl___vsprintf_chk) @@ -15691,7 +15766,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c int attribute_compat_text_section __nldbl___vswprintf_chk (wchar_t *string, size_t maxlen, int flag, size_t slen, -@@ -668,6 +689,7 @@ +@@ -668,6 +689,7 @@ __nldbl___wprintf_chk (int flag, const w return done; } @@ -15699,7 +15774,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c int attribute_compat_text_section -@@ -775,6 +797,7 @@ +@@ -775,6 +797,7 @@ __nldbl___printf_fp (FILE *fp, const str return ___printf_fp (fp, &info_no_ldbl, args); } @@ -15707,7 +15782,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c ssize_t attribute_compat_text_section __nldbl_strfmon (char *s, size_t maxsize, const char *format, ...) -@@ -829,6 +852,7 @@ +@@ -829,6 +852,7 @@ __nldbl___vstrfmon_l (char *s, size_t ma return res; } libc_hidden_def (__nldbl___vstrfmon_l) @@ -15715,7 +15790,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c void attribute_compat_text_section -@@ -941,6 +965,7 @@ +@@ -941,6 +965,7 @@ __nldbl___isoc99_scanf (const char *fmt, return done; } @@ -15723,7 +15798,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c int attribute_compat_text_section __nldbl___isoc99_vfwscanf (FILE *s, const wchar_t *fmt, va_list ap) -@@ -1014,6 +1039,7 @@ +@@ -1014,6 +1039,7 @@ __nldbl___isoc99_wscanf (const wchar_t * return done; } @@ -15731,7 +15806,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c #if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) compat_symbol (libc, __nldbl__IO_printf, _IO_printf, GLIBC_2_0); -@@ -1057,6 +1083,7 @@ +@@ -1057,6 +1083,7 @@ compat_symbol (libc, __nldbl_printf_size compat_symbol (libc, __nldbl___strfmon_l, __strfmon_l, GLIBC_2_1); #endif #if LONG_DOUBLE_COMPAT(libc, GLIBC_2_2) @@ -15739,7 +15814,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c compat_symbol (libc, __nldbl_swprintf, swprintf, GLIBC_2_2); compat_symbol (libc, __nldbl_vwprintf, vwprintf, GLIBC_2_2); compat_symbol (libc, __nldbl_wprintf, wprintf, GLIBC_2_2); -@@ -1069,6 +1096,7 @@ +@@ -1069,6 +1096,7 @@ compat_symbol (libc, __nldbl_vfwscanf, v compat_symbol (libc, __nldbl_vswscanf, vswscanf, GLIBC_2_2); compat_symbol (libc, __nldbl_vwscanf, vwscanf, GLIBC_2_2); compat_symbol (libc, __nldbl_wscanf, wscanf, GLIBC_2_2); @@ -15749,8 +15824,8 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.c compat_symbol (libc, __nldbl_strfmon_l, strfmon_l, GLIBC_2_3); Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.h =================================================================== ---- git.orig/sysdeps/ieee754/ldbl-opt/nldbl-compat.h 2014-08-29 20:00:54.468070587 -0700 -+++ git/sysdeps/ieee754/ldbl-opt/nldbl-compat.h 2014-08-29 20:01:15.244070587 -0700 +--- git.orig/sysdeps/ieee754/ldbl-opt/nldbl-compat.h ++++ git/sysdeps/ieee754/ldbl-opt/nldbl-compat.h @@ -30,6 +30,7 @@ #include <math.h> #include <monetary.h> @@ -15779,7 +15854,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.h NLDBL_DECL (__asprintf); NLDBL_DECL (asprintf); NLDBL_DECL (__printf_fp); -@@ -66,12 +63,18 @@ +@@ -66,12 +63,18 @@ NLDBL_DECL (__isoc99_sscanf); NLDBL_DECL (__isoc99_vscanf); NLDBL_DECL (__isoc99_vfscanf); NLDBL_DECL (__isoc99_vsscanf); @@ -15798,7 +15873,7 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.h /* This one does not exist in the normal interface, only __nldbl___vstrfmon really exists. */ -@@ -82,22 +85,23 @@ +@@ -82,22 +85,23 @@ extern ssize_t __nldbl___vstrfmon (char since we don't compile with _FORTIFY_SOURCE. */ extern int __nldbl___vfprintf_chk (FILE *__restrict, int, const char *__restrict, _G_va_list); @@ -15830,8 +15905,8 @@ Index: git/sysdeps/ieee754/ldbl-opt/nldbl-compat.h #endif /* __NLDBL_COMPAT_H */ Index: git/sysdeps/unix/sysv/linux/gethostid.c =================================================================== ---- git.orig/sysdeps/unix/sysv/linux/gethostid.c 2014-08-29 20:00:58.840070587 -0700 -+++ git/sysdeps/unix/sysv/linux/gethostid.c 2014-08-29 20:01:15.244070587 -0700 +--- git.orig/sysdeps/unix/sysv/linux/gethostid.c ++++ git/sysdeps/unix/sysv/linux/gethostid.c @@ -21,6 +21,7 @@ #include <unistd.h> #include <netdb.h> @@ -15840,7 +15915,7 @@ Index: git/sysdeps/unix/sysv/linux/gethostid.c #define HOSTIDFILE "/etc/hostid" -@@ -89,6 +90,7 @@ +@@ -89,6 +90,7 @@ gethostid (void) return id; } @@ -15848,7 +15923,7 @@ Index: git/sysdeps/unix/sysv/linux/gethostid.c /* Getting from the file was not successful. An intelligent guess for a unique number of a host is its IP address. Return this. */ if (__gethostname (hostname, MAXHOSTNAMELEN) < 0 || hostname[0] == '\0') -@@ -115,5 +117,9 @@ +@@ -115,5 +117,9 @@ gethostid (void) /* For the return value to be not exactly the IP address we do some bit fiddling. */ return (int32_t) (in.s_addr << 16 | in.s_addr >> 16); @@ -15860,8 +15935,8 @@ Index: git/sysdeps/unix/sysv/linux/gethostid.c #endif Index: git/sysdeps/unix/sysv/linux/libc_fatal.c =================================================================== ---- git.orig/sysdeps/unix/sysv/linux/libc_fatal.c 2014-08-29 20:00:58.980070587 -0700 -+++ git/sysdeps/unix/sysv/linux/libc_fatal.c 2014-08-29 20:01:15.244070587 -0700 +--- git.orig/sysdeps/unix/sysv/linux/libc_fatal.c ++++ git/sysdeps/unix/sysv/linux/libc_fatal.c @@ -23,6 +23,7 @@ #include <string.h> #include <sys/mman.h> @@ -15870,7 +15945,7 @@ Index: git/sysdeps/unix/sysv/linux/libc_fatal.c static bool writev_for_fatal (int fd, const struct iovec *iov, size_t niov, size_t total) -@@ -40,6 +41,7 @@ +@@ -40,6 +41,7 @@ writev_for_fatal (int fd, const struct i static void backtrace_and_maps (int do_abort, bool written, int fd) { @@ -15878,7 +15953,7 @@ Index: git/sysdeps/unix/sysv/linux/libc_fatal.c if (do_abort > 1 && written) { void *addrs[64]; -@@ -62,6 +64,7 @@ +@@ -62,6 +64,7 @@ backtrace_and_maps (int do_abort, bool w close_not_cancel_no_status (fd2); } } @@ -15888,8 +15963,8 @@ Index: git/sysdeps/unix/sysv/linux/libc_fatal.c Index: git/time/Makefile =================================================================== ---- git.orig/time/Makefile 2014-08-29 20:00:59.504070587 -0700 -+++ git/time/Makefile 2014-08-29 20:01:15.244070587 -0700 +--- git.orig/time/Makefile ++++ git/time/Makefile @@ -18,6 +18,8 @@ # # Makefile for time routines @@ -15899,7 +15974,7 @@ Index: git/time/Makefile subdir := time include ../Makeconfig -@@ -30,14 +32,20 @@ +@@ -30,15 +32,23 @@ routines := offtime asctime clock ctime tzfile getitimer setitimer \ stime dysize timegm ftime \ getdate strptime strptime_l \ @@ -15907,27 +15982,30 @@ Index: git/time/Makefile + strftime strftime_l \ timespec_get -aux := era alt_digit lc-time-cleanup -+routines-$(OPTION_POSIX_C_LANG_WIDE_CHAR) \ -+ := wcsftime wcsftime_l -+aux-$(OPTION_EGLIBC_LOCALE_CODE) += alt_digit era lc-time-cleanup -tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \ - tst-getdate tst-mktime tst-mktime2 tst-ftime_l tst-strftime \ ++routines-$(OPTION_POSIX_C_LANG_WIDE_CHAR) \ ++ := wcsftime wcsftime_l ++aux-$(OPTION_EGLIBC_LOCALE_CODE) += alt_digit era lc-time-cleanup ++ +tests := test_time clocktest tst-posixtz \ + tst-getdate tst-mktime tst-mktime2 tst-strftime \ tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \ - tst-strptime3 bug-getdate1 tst-strptime-whitespace + tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime + +tests-$(OPTION_EGLIBC_LOCALE_CODE) \ -+ += tst-strptime tst-ftime_l ++ += tst-strptime tst-ftime_l +tests-$(OPTION_POSIX_WIDE_CHAR_DEVICE_IO) \ -+ += tst_wcsftime - ++ += tst_wcsftime ++ include ../Rules + tz-cflags = -DTZDIR='"$(zonedir)"' \ Index: git/time/strftime_l.c =================================================================== ---- git.orig/time/strftime_l.c 2014-08-29 20:00:59.528070587 -0700 -+++ git/time/strftime_l.c 2014-08-29 20:01:15.244070587 -0700 +--- git.orig/time/strftime_l.c ++++ git/time/strftime_l.c @@ -35,6 +35,10 @@ # include "../locale/localeinfo.h" #endif @@ -15939,7 +16017,7 @@ Index: git/time/strftime_l.c #if defined emacs && !defined HAVE_BCOPY # define HAVE_MEMCPY 1 #endif -@@ -882,7 +886,7 @@ +@@ -882,7 +886,7 @@ __strftime_internal (s, maxsize, format, case L_('C'): if (modifier == L_('E')) { @@ -15948,7 +16026,7 @@ Index: git/time/strftime_l.c struct era_entry *era = _nl_get_era_entry (tp HELPER_LOCALE_ARG); if (era) { -@@ -955,7 +959,7 @@ +@@ -955,7 +959,7 @@ __strftime_internal (s, maxsize, format, if (modifier == L_('O') && 0 <= number_value) { @@ -15957,7 +16035,7 @@ Index: git/time/strftime_l.c /* Get the locale specific alternate representation of the number NUMBER_VALUE. If none exist NULL is returned. */ const CHAR_T *cp = nl_get_alt_digit (number_value -@@ -1260,7 +1264,7 @@ +@@ -1260,7 +1264,7 @@ __strftime_internal (s, maxsize, format, case L_('Y'): if (modifier == 'E') { @@ -15966,7 +16044,7 @@ Index: git/time/strftime_l.c struct era_entry *era = _nl_get_era_entry (tp HELPER_LOCALE_ARG); if (era) { -@@ -1285,7 +1289,7 @@ +@@ -1285,7 +1289,7 @@ __strftime_internal (s, maxsize, format, case L_('y'): if (modifier == L_('E')) { @@ -15977,8 +16055,8 @@ Index: git/time/strftime_l.c { Index: git/time/strptime_l.c =================================================================== ---- git.orig/time/strptime_l.c 2014-08-29 20:00:59.528070587 -0700 -+++ git/time/strptime_l.c 2014-08-29 20:01:15.244070587 -0700 +--- git.orig/time/strptime_l.c ++++ git/time/strptime_l.c @@ -29,6 +29,7 @@ #ifdef _LIBC @@ -15987,7 +16065,7 @@ Index: git/time/strptime_l.c # include "../locale/localeinfo.h" #endif -@@ -84,7 +85,7 @@ +@@ -84,7 +85,7 @@ localtime_r (t, tp) if (val < from || val > to) \ return NULL; \ } while (0) @@ -15996,7 +16074,18 @@ Index: git/time/strptime_l.c # define get_alt_number(from, to, n) \ ({ \ __label__ do_normal; \ -@@ -820,6 +821,7 @@ +@@ -257,8 +258,10 @@ __strptime_internal (rp, fmt, tmp, state + int cnt; + int cnt_longest; + size_t val; ++#if ! _LIBC || __OPTION_EGLIBC_LOCALE_CODE + size_t num_eras; + struct era_entry *era = NULL; ++#endif + enum ptime_locale_status { not, loc, raw } decided_longest; + struct __strptime_state + { +@@ -820,6 +823,7 @@ __strptime_internal (rp, fmt, tmp, state s.want_xday = 1; break; case 'C': @@ -16004,7 +16093,7 @@ Index: git/time/strptime_l.c if (s.decided != raw) { if (s.era_cnt >= 0) -@@ -856,10 +858,12 @@ +@@ -856,10 +860,12 @@ __strptime_internal (rp, fmt, tmp, state s.decided = raw; } @@ -16017,7 +16106,7 @@ Index: git/time/strptime_l.c if (s.decided != raw) { get_number(0, 9999, 4); -@@ -918,9 +922,10 @@ +@@ -918,9 +924,10 @@ __strptime_internal (rp, fmt, tmp, state s.decided = raw; } @@ -16029,7 +16118,7 @@ Index: git/time/strptime_l.c if (s.decided != raw) { num_eras = _NL_CURRENT_WORD (LC_TIME, -@@ -948,6 +953,7 @@ +@@ -948,6 +955,7 @@ __strptime_internal (rp, fmt, tmp, state s.decided = raw; } @@ -16037,7 +16126,7 @@ Index: git/time/strptime_l.c get_number (0, 9999, 4); tm->tm_year = val - 1900; s.want_century = 0; -@@ -1118,6 +1124,7 @@ +@@ -1118,6 +1126,7 @@ __strptime_internal (rp, fmt, tmp, state tm->tm_year = (s.century - 19) * 100; } @@ -16045,7 +16134,7 @@ Index: git/time/strptime_l.c if (s.era_cnt != -1) { era = _nl_select_era_entry (s.era_cnt HELPER_LOCALE_ARG); -@@ -1132,6 +1139,7 @@ +@@ -1132,6 +1141,7 @@ __strptime_internal (rp, fmt, tmp, state tm->tm_year = era->start_date[0]; } else @@ -16055,9 +16144,9 @@ Index: git/time/strptime_l.c /* No era found but we have seen an E modifier. Rectify some Index: git/timezone/Makefile =================================================================== ---- git.orig/timezone/Makefile 2014-08-29 20:01:14.044070587 -0700 -+++ git/timezone/Makefile 2014-08-29 20:01:15.244070587 -0700 -@@ -115,7 +115,7 @@ +--- git.orig/timezone/Makefile ++++ git/timezone/Makefile +@@ -117,7 +117,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps) $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make sed -e 's|/bin/bash|/bin/sh|' \ @@ -16068,8 +16157,8 @@ Index: git/timezone/Makefile -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \ Index: git/wcsmbs/Makefile =================================================================== ---- git.orig/wcsmbs/Makefile 2014-08-29 20:00:59.548070587 -0700 -+++ git/wcsmbs/Makefile 2014-08-29 20:01:15.244070587 -0700 +--- git.orig/wcsmbs/Makefile ++++ git/wcsmbs/Makefile @@ -18,15 +18,21 @@ # # Sub-makefile for wcsmbs portion of the library. @@ -16094,34 +16183,36 @@ Index: git/wcsmbs/Makefile btowc wctob mbsinit \ mbrlen mbrtowc wcrtomb mbsrtowcs wcsrtombs \ mbsnrtowcs wcsnrtombs wcsnlen wcschrnul \ -@@ -38,14 +44,19 @@ +@@ -38,14 +44,21 @@ routines := wcscat wcschr wcscmp wcscpy wcscoll_l wcsxfrm_l \ wcscasecmp wcsncase wcscasecmp_l wcsncase_l \ wcsmbsload mbsrtowcs_l \ - isoc99_wscanf isoc99_vwscanf isoc99_fwscanf isoc99_vfwscanf \ isoc99_swscanf isoc99_vswscanf \ mbrtoc16 c16rtomb -+routines-$(OPTION_POSIX_WIDE_CHAR_DEVICE_IO) \ -+ += isoc99_wscanf isoc99_vwscanf isoc99_fwscanf isoc99_vfwscanf ++routines-$(OPTION_POSIX_WIDE_CHAR_DEVICE_IO) \ ++ += isoc99_wscanf isoc99_vwscanf isoc99_fwscanf isoc99_vfwscanf ++ strop-tests := wcscmp wmemcmp wcslen wcschr wcsrchr wcscpy -tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \ - tst-wcrtomb tst-wcpncpy tst-mbsrtowcs tst-wchar-h tst-mbrtowc2 \ - tst-c16c32-1 wcsatcliff $(addprefix test-,$(strop-tests)) ++ +tests := tst-wchar-h +tests-$(OPTION_EGLIBC_LOCALE_CODE) \ -+ += tst-btowc tst-mbrtowc tst-mbrtowc2 tst-wcrtomb tst-c16c32-1 ++ += tst-btowc tst-mbrtowc tst-mbrtowc2 tst-wcrtomb tst-c16c32-1 +tests-$(OPTION_POSIX_C_LANG_WIDE_CHAR) \ -+ += tst-wcstof wcsmbs-tst1 tst-wcsnlen \ ++ += tst-wcstof wcsmbs-tst1 tst-wcsnlen \ + tst-wcpncpy tst-mbsrtowcs \ + wcsatcliff $(addprefix test-,$(strop-tests)) - tests-ifunc := $(strop-tests:%=test-%-ifunc) - tests += $(tests-ifunc) + + include ../Rules Index: git/wcsmbs/wcsmbsload.c =================================================================== ---- git.orig/wcsmbs/wcsmbsload.c 2014-08-29 20:00:59.580070587 -0700 -+++ git/wcsmbs/wcsmbsload.c 2014-08-29 20:01:15.248070587 -0700 +--- git.orig/wcsmbs/wcsmbsload.c ++++ git/wcsmbs/wcsmbsload.c @@ -21,6 +21,7 @@ #include <limits.h> #include <stdlib.h> @@ -16130,7 +16221,7 @@ Index: git/wcsmbs/wcsmbsload.c #include <locale/localeinfo.h> #include <wcsmbsload.h> -@@ -143,6 +144,7 @@ +@@ -143,6 +144,7 @@ __wcsmbs_getfct (const char *to, const c }) @@ -16138,7 +16229,7 @@ Index: git/wcsmbs/wcsmbsload.c /* Some of the functions here must not be used while setlocale is called. */ __libc_rwlock_define (extern, __libc_setlocale_lock attribute_hidden) -@@ -211,6 +213,17 @@ +@@ -211,6 +213,17 @@ __wcsmbs_load_conv (struct __locale_data __libc_rwlock_unlock (__libc_setlocale_lock); } @@ -16158,8 +16249,8 @@ Index: git/wcsmbs/wcsmbsload.c /* Clone the current conversion function set. */ Index: git/wctype/Makefile =================================================================== ---- git.orig/wctype/Makefile 2014-08-29 20:00:59.584070587 -0700 -+++ git/wctype/Makefile 2014-08-29 20:01:15.248070587 -0700 +--- git.orig/wctype/Makefile ++++ git/wctype/Makefile @@ -18,14 +18,20 @@ # # Sub-makefile for wctype portion of the library. @@ -16186,8 +16277,8 @@ Index: git/wctype/Makefile include ../Rules Index: git/sysdeps/nptl/Makefile =================================================================== ---- git.orig/sysdeps/nptl/Makefile 2014-08-29 20:00:58.036070587 -0700 -+++ git/sysdeps/nptl/Makefile 2014-08-29 20:01:15.248070587 -0700 +--- git.orig/sysdeps/nptl/Makefile ++++ git/sysdeps/nptl/Makefile @@ -18,6 +18,9 @@ ifeq ($(subdir),nptl) @@ -16200,8 +16291,8 @@ Index: git/sysdeps/nptl/Makefile ifeq ($(subdir),rt) Index: git/sysdeps/nptl/bits/libc-lock.h =================================================================== ---- git.orig/sysdeps/nptl/bits/libc-lock.h 2014-08-29 20:00:58.036070587 -0700 -+++ git/sysdeps/nptl/bits/libc-lock.h 2014-08-29 20:01:15.248070587 -0700 +--- git.orig/sysdeps/nptl/bits/libc-lock.h ++++ git/sysdeps/nptl/bits/libc-lock.h @@ -24,6 +24,14 @@ #include <stddef.h> @@ -16216,11 +16307,11 @@ Index: git/sysdeps/nptl/bits/libc-lock.h + /* Mutex type. */ #if defined _LIBC || defined _IO_MTSAFE_IO - # if (defined NOT_IN_libc && !defined IS_IN_libpthread) || !defined _LIBC -@@ -87,6 +95,14 @@ + # if (!IS_IN (libc) && !IS_IN (libpthread)) || !defined _LIBC +@@ -87,6 +95,15 @@ typedef struct __libc_lock_recursive_opa /* Lock the recursive named lock variable. */ - #if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread) + #if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread)) +# if __OPTION_EGLIBC_BIG_MACROS != 1 +/* EGLIBC: Declare wrapper function for a big macro if either + !__OPTION_EGLIBC_BIG_MACROS or we are using a back door from @@ -16229,10 +16320,11 @@ Index: git/sysdeps/nptl/bits/libc-lock.h +libc_hidden_proto (__libc_lock_lock_recursive_fn); +# endif /* __OPTION_EGLIBC_BIG_MACROS != 1 */ +# if __OPTION_EGLIBC_BIG_MACROS ++ # define __libc_lock_lock_recursive(NAME) \ do { \ void *self = THREAD_SELF; \ -@@ -97,6 +113,10 @@ +@@ -97,6 +114,10 @@ typedef struct __libc_lock_recursive_opa } \ ++(NAME).cnt; \ } while (0) @@ -16243,10 +16335,10 @@ Index: git/sysdeps/nptl/bits/libc-lock.h #else # define __libc_lock_lock_recursive(NAME) \ __libc_maybe_call (__pthread_mutex_lock, (&(NAME).mutex), 0) -@@ -104,6 +124,14 @@ +@@ -104,6 +125,14 @@ typedef struct __libc_lock_recursive_opa /* Try to lock the recursive named lock variable. */ - #if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread) + #if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread)) +# if __OPTION_EGLIBC_BIG_MACROS != 1 +/* EGLIBC: Declare wrapper function for a big macro if either + !__OPTION_EGLIBC_BIG_MACROS or we are using a back door from @@ -16258,7 +16350,7 @@ Index: git/sysdeps/nptl/bits/libc-lock.h # define __libc_lock_trylock_recursive(NAME) \ ({ \ int result = 0; \ -@@ -122,6 +150,10 @@ +@@ -122,6 +151,10 @@ typedef struct __libc_lock_recursive_opa ++(NAME).cnt; \ result; \ }) @@ -16269,10 +16361,10 @@ Index: git/sysdeps/nptl/bits/libc-lock.h #else # define __libc_lock_trylock_recursive(NAME) \ __libc_maybe_call (__pthread_mutex_trylock, (&(NAME).mutex), 0) -@@ -129,6 +161,14 @@ +@@ -129,6 +162,14 @@ typedef struct __libc_lock_recursive_opa /* Unlock the recursive named lock variable. */ - #if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread) + #if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread)) +# if __OPTION_EGLIBC_BIG_MACROS != 1 +/* EGLIBC: Declare wrapper function for a big macro if either + !__OPTION_EGLIBC_BIG_MACROS, or we are using a back door from @@ -16284,7 +16376,7 @@ Index: git/sysdeps/nptl/bits/libc-lock.h /* We do no error checking here. */ # define __libc_lock_unlock_recursive(NAME) \ do { \ -@@ -138,6 +178,10 @@ +@@ -138,6 +179,10 @@ typedef struct __libc_lock_recursive_opa lll_unlock ((NAME).lock, LLL_PRIVATE); \ } \ } while (0) @@ -16297,8 +16389,8 @@ Index: git/sysdeps/nptl/bits/libc-lock.h __libc_maybe_call (__pthread_mutex_unlock, (&(NAME).mutex), 0) Index: git/sysdeps/nptl/bits/libc-lockP.h =================================================================== ---- git.orig/sysdeps/nptl/bits/libc-lockP.h 2014-08-29 20:00:58.044070587 -0700 -+++ git/sysdeps/nptl/bits/libc-lockP.h 2014-08-29 20:01:15.248070587 -0700 +--- git.orig/sysdeps/nptl/bits/libc-lockP.h ++++ git/sysdeps/nptl/bits/libc-lockP.h @@ -33,6 +33,8 @@ #include <lowlevellock.h> #include <tls.h> @@ -16306,12 +16398,12 @@ Index: git/sysdeps/nptl/bits/libc-lockP.h +#include <errno.h> /* For EBUSY. */ +#include <gnu/option-groups.h> /* For __OPTION_EGLIBC_BIG_MACROS. */ - /* Mutex type. */ - #if defined NOT_IN_libc && !defined IS_IN_libpthread -@@ -159,10 +161,22 @@ + #if IS_IN (libpthread) + /* This gets us the declarations of the __pthread_* internal names, +@@ -171,10 +173,22 @@ typedef pthread_key_t __libc_key_t; /* Lock the named lock variable. */ - #if !defined NOT_IN_libc || defined IS_IN_libpthread + #if IS_IN (libc) || IS_IN (libpthread) -# ifndef __libc_lock_lock -# define __libc_lock_lock(NAME) \ +# if __OPTION_EGLIBC_BIG_MACROS != 1 @@ -16328,16 +16420,16 @@ Index: git/sysdeps/nptl/bits/libc-lockP.h -# endif +# endif +# else -+# define __libc_lock_lock(NAME) \ ++# define __libc_lock_lock(NAME) \ + __libc_lock_lock_fn (&(NAME)) +# endif /* __OPTION_EGLIBC_BIG_MACROS */ #else # undef __libc_lock_lock # define __libc_lock_lock(NAME) \ -@@ -175,10 +189,22 @@ +@@ -187,10 +201,22 @@ typedef pthread_key_t __libc_key_t; /* Try to lock the named lock variable. */ - #if !defined NOT_IN_libc || defined IS_IN_libpthread + #if IS_IN (libc) || IS_IN (libpthread) -# ifndef __libc_lock_trylock -# define __libc_lock_trylock(NAME) \ +# if __OPTION_EGLIBC_BIG_MACROS != 1 @@ -16360,10 +16452,10 @@ Index: git/sysdeps/nptl/bits/libc-lockP.h #else # undef __libc_lock_trylock # define __libc_lock_trylock(NAME) \ -@@ -194,8 +220,20 @@ +@@ -206,8 +232,20 @@ typedef pthread_key_t __libc_key_t; /* Unlock the named lock variable. */ - #if !defined NOT_IN_libc || defined IS_IN_libpthread + #if IS_IN (libc) || IS_IN (libpthread) +# if __OPTION_EGLIBC_BIG_MACROS != 1 +/* EGLIBC: Declare wrapper function for a big macro if either + !__OPTION_EGLIBC_BIG_MACROS, or we are using a back door from @@ -16383,8 +16475,8 @@ Index: git/sysdeps/nptl/bits/libc-lockP.h __libc_maybe_call (__pthread_mutex_unlock, (&(NAME)), 0) Index: git/sysdeps/nptl/small-macros-fns.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ git/sysdeps/nptl/small-macros-fns.c 2014-08-29 20:01:15.248070587 -0700 +--- /dev/null ++++ git/sysdeps/nptl/small-macros-fns.c @@ -0,0 +1,72 @@ +/* EGLIBC: function wrappers for big macros. + Copyright (C) 2009 Free Software Foundation, Inc. @@ -16458,28 +16550,10 @@ Index: git/sysdeps/nptl/small-macros-fns.c +libc_hidden_def (__libc_lock_unlock_recursive_fn); + +#endif /*defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)*/ -Index: git/include/libc-symbols.h -=================================================================== ---- git.orig/include/libc-symbols.h 2014-08-29 20:00:47.144070587 -0700 -+++ git/include/libc-symbols.h 2014-08-29 20:01:15.248070587 -0700 -@@ -60,8 +60,11 @@ - /* Define these macros for the benefit of portable GNU code that wants to check - them. Of course, STDC_HEADERS is never false when building libc! */ - #define STDC_HEADERS 1 --#define HAVE_MBSTATE_T 1 --#define HAVE_MBSRTOWCS 1 -+ -+#if __OPTION_EGLIBC_LOCALE_CODE -+# define HAVE_MBSTATE_T 1 -+# define HAVE_MBSRTOWCS 1 -+#endif - #define HAVE_LIBINTL_H 1 - #define HAVE_WCTYPE_H 1 - #define HAVE_ISWCTYPE 1 Index: git/crypt/crypt_common.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ git/crypt/crypt_common.c 2014-08-29 20:01:15.248070587 -0700 +--- /dev/null ++++ git/crypt/crypt_common.c @@ -0,0 +1,42 @@ +/* + * crypt: crypt(3) implementation @@ -16525,9 +16599,9 @@ Index: git/crypt/crypt_common.c +} Index: git/crypt/crypt_util.c =================================================================== ---- git.orig/crypt/crypt_util.c 2014-08-29 20:00:43.028070587 -0700 -+++ git/crypt/crypt_util.c 2014-08-29 20:01:15.248070587 -0700 -@@ -242,10 +242,6 @@ +--- git.orig/crypt/crypt_util.c ++++ git/crypt/crypt_util.c +@@ -242,10 +242,6 @@ static ufc_long eperm32tab[4][256][2]; */ static ufc_long efp[16][64][2]; @@ -16538,7 +16612,7 @@ Index: git/crypt/crypt_util.c /* * For use by the old, non-reentrant routines * (crypt/encrypt/setkey) -@@ -949,17 +945,3 @@ +@@ -949,17 +945,3 @@ setkey(__key) { __setkey_r(__key, &_ufc_foobar); } @@ -16558,9 +16632,9 @@ Index: git/crypt/crypt_util.c -} Index: git/sysdeps/arm/Makefile =================================================================== ---- git.orig/sysdeps/arm/Makefile 2014-08-29 20:29:37.000000000 -0700 -+++ git/sysdeps/arm/Makefile 2014-08-29 20:31:09.904070587 -0700 -@@ -37,10 +37,13 @@ +--- git.orig/sysdeps/arm/Makefile ++++ git/sysdeps/arm/Makefile +@@ -37,10 +37,13 @@ ifeq ($(subdir),csu) # get offset to rtld_global._dl_hwcap gen-as-const-headers += rtld-global-offsets.sym tlsdesc.sym aeabi_constants = aeabi_lcsts aeabi_sighandlers aeabi_math diff --git a/meta/recipes-core/glibc/glibc/elf-Makefile-fix-a-typo.patch b/meta/recipes-core/glibc/glibc/elf-Makefile-fix-a-typo.patch new file mode 100644 index 0000000000..ec480067a8 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/elf-Makefile-fix-a-typo.patch @@ -0,0 +1,36 @@ +From 6207fb45553ee98f2f326883b7c21b76c8267343 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Tue, 31 Mar 2015 02:31:25 -0700 +Subject: [PATCH] elf/Makefile: fix a typo + +Fixed a typo: +name-target-directory -> make-target-directory + +There is no name-target-directory, it should be make-target-directory, +this fixed the error: +/bin/bash: /path/to/elf/runtime-linker.T: No such file or directory +Makefile:361: recipe for target '/path/to/elf/runtime-linker.st' failed + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + elf/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/elf/Makefile b/elf/Makefile +index e5b142c..62fe245 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -358,7 +358,7 @@ $(objpfx)interp.os: $(elf-objpfx)runtime-linker.h + + $(elf-objpfx)runtime-linker.h: $(elf-objpfx)runtime-linker.st; @: + $(elf-objpfx)runtime-linker.st: $(common-objpfx)config.make +- $(name-target-directory) ++ $(make-target-directory) + echo '#define RUNTIME_LINKER "$(rtlddir)/$(rtld-installed-name)"' \ + > ${@:st=T} + $(move-if-change) ${@:st=T} ${@:st=h} +-- +1.7.9.5 + diff --git a/meta/recipes-core/glibc/glibc/fsl-ppc-no-fsqrt.patch b/meta/recipes-core/glibc/glibc/fsl-ppc-no-fsqrt.patch deleted file mode 100644 index f88eaf444e..0000000000 --- a/meta/recipes-core/glibc/glibc/fsl-ppc-no-fsqrt.patch +++ /dev/null @@ -1,100 +0,0 @@ -Create e5500 specific math_private.h and let it include when compiling for e5500/64bit core -We prefefine __CPU_HAS_FSQRT to 0 and then in general ppc64 math_private.h we check if its -already defined before redefining it. This way we can ensure that on e5500 builds it wont -emit fsqrt intructions - --Khem - -Upstream-Status: Pending - -Index: git/sysdeps/powerpc/fpu/math_private.h -=================================================================== ---- git.orig/sysdeps/powerpc/fpu/math_private.h 2014-08-29 10:31:30.224070587 -0700 -+++ git/sysdeps/powerpc/fpu/math_private.h 2014-08-29 10:31:30.212070587 -0700 -@@ -25,10 +25,12 @@ - #include <fenv_private.h> - #include_next <math_private.h> - --# if __WORDSIZE == 64 || defined _ARCH_PWR4 --# define __CPU_HAS_FSQRT 1 --# else --# define __CPU_HAS_FSQRT ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0) -+# ifndef __CPU_HAS_FSQRT -+# if __WORDSIZE == 64 || defined _ARCH_PWR4 -+# define __CPU_HAS_FSQRT 1 -+# else -+# define __CPU_HAS_FSQRT ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0) -+# endif - # endif - - extern double __slow_ieee754_sqrt (double); -Index: git/sysdeps/powerpc/powerpc64/e5500/fpu/math_private.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ git/sysdeps/powerpc/powerpc64/e5500/fpu/math_private.h 2014-08-29 10:31:30.212070587 -0700 -@@ -0,0 +1,9 @@ -+#ifndef _E5500_MATH_PRIVATE_H_ -+#define _E5500_MATH_PRIVATE_H_ 1 -+/* E5500 core FPU does not implement -+ fsqrt */ -+ -+#define __CPU_HAS_FSQRT 0 -+#include_next <math_private.h> -+ -+#endif /* _E5500_MATH_PRIVATE_H_ */ -Index: git/sysdeps/powerpc/powerpc64/e6500/fpu/math_private.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ git/sysdeps/powerpc/powerpc64/e6500/fpu/math_private.h 2014-08-29 10:31:30.212070587 -0700 -@@ -0,0 +1,9 @@ -+#ifndef _E6500_MATH_PRIVATE_H_ -+#define _E6500_MATH_PRIVATE_H_ 1 -+/* E6500 core FPU does not implement -+ fsqrt */ -+ -+#define __CPU_HAS_FSQRT 0 -+#include_next <math_private.h> -+ -+#endif /* _E6500_MATH_PRIVATE_H_ */ -Index: git/sysdeps/powerpc/powerpc32/e500mc/fpu/math_private.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ git/sysdeps/powerpc/powerpc32/e500mc/fpu/math_private.h 2014-08-29 10:31:30.212070587 -0700 -@@ -0,0 +1,9 @@ -+#ifndef _E500MC_MATH_PRIVATE_H_ -+#define _E500MC_MATH_PRIVATE_H_ 1 -+/* E500MC core FPU does not implement -+ fsqrt */ -+ -+#define __CPU_HAS_FSQRT 0 -+#include_next <math_private.h> -+ -+#endif /* _E500MC_MATH_PRIVATE_H_ */ -Index: git/sysdeps/powerpc/powerpc32/e5500/fpu/math_private.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ git/sysdeps/powerpc/powerpc32/e5500/fpu/math_private.h 2014-08-29 10:31:30.216070587 -0700 -@@ -0,0 +1,9 @@ -+#ifndef _E5500_MATH_PRIVATE_H_ -+#define _E5500_MATH_PRIVATE_H_ 1 -+/* E5500 core FPU does not implement -+ fsqrt */ -+ -+#define __CPU_HAS_FSQRT 0 -+#include_next <math_private.h> -+ -+#endif /* _E5500_MATH_PRIVATE_H_ */ -Index: git/sysdeps/powerpc/powerpc32/e6500/fpu/math_private.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ git/sysdeps/powerpc/powerpc32/e6500/fpu/math_private.h 2014-08-29 10:31:30.216070587 -0700 -@@ -0,0 +1,9 @@ -+#ifndef _E6500_MATH_PRIVATE_H_ -+#define _E6500_MATH_PRIVATE_H_ 1 -+/* E6500 core FPU does not implement -+ fsqrt */ -+ -+#define __CPU_HAS_FSQRT 0 -+#include_next <math_private.h> -+ -+#endif /* _E6500_MATH_PRIVATE_H_ */ diff --git a/meta/recipes-core/glibc/glibc/grok_gold.patch b/meta/recipes-core/glibc/glibc/grok_gold.patch index 26875c79d4..5151802ecf 100644 --- a/meta/recipes-core/glibc/glibc/grok_gold.patch +++ b/meta/recipes-core/glibc/glibc/grok_gold.patch @@ -8,9 +8,9 @@ Upstream-Status: Backport Index: git/configure =================================================================== ---- git.orig/configure 2014-08-29 10:32:34.464070587 -0700 -+++ git/configure 2014-08-29 10:32:34.456070587 -0700 -@@ -4592,7 +4592,7 @@ +--- git.orig/configure ++++ git/configure +@@ -4593,7 +4593,7 @@ else # Found it, now check the version. { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $LD" >&5 $as_echo_n "checking version of $LD... " >&6; } @@ -18,17 +18,17 @@ Index: git/configure + ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU [Bbinutilsd][^.]* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*) + 2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) Index: git/configure.ac =================================================================== ---- git.orig/configure.ac 2014-08-29 10:32:34.464070587 -0700 -+++ git/configure.ac 2014-08-29 10:32:34.460070587 -0700 -@@ -930,7 +930,7 @@ - [GNU assembler.* \([0-9]*\.[0-9.]*\)], - [2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], AS=: critic_missing="$critic_missing as") +--- git.orig/configure.ac ++++ git/configure.ac +@@ -913,7 +913,7 @@ AC_CHECK_PROG_VER(AS, $AS, --version, + [2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*], + AS=: critic_missing="$critic_missing as") AC_CHECK_PROG_VER(LD, $LD, --version, - [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], + [GNU [Bbinutilsd][^.]* \([0-9][0-9]*\.[0-9.]*\)], - [2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], LD=: critic_missing="$critic_missing ld") + [2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*], + LD=: critic_missing="$critic_missing ld") - # These programs are version sensitive. diff --git a/meta/recipes-core/glibc/glibc_2.20.bb b/meta/recipes-core/glibc/glibc_2.21.bb index 30a4397cd6..fcef4ff3e5 100644 --- a/meta/recipes-core/glibc/glibc_2.20.bb +++ b/meta/recipes-core/glibc/glibc_2.21.bb @@ -2,11 +2,11 @@ require glibc.inc DEPENDS += "gperf-native kconfig-frontends-native" -PV = "2.20" +SRCREV = "4e42b5b8f89f0e288e68be7ad70f9525aebc2cff" -SRCREV = "b8079dd0d360648e4e8de48656c5c38972621072" +BRANCH = "release/${PV}/master" -SRC_URI = "git://sourceware.org/git/glibc.git;branch=release/${PV}/master \ +SRC_URI = "git://sourceware.org/git/glibc.git;branch=${BRANCH} \ file://IO-acquire-lock-fix.patch \ file://mips-rld-map-check.patch \ file://etc/ld.so.conf \ @@ -16,13 +16,16 @@ SRC_URI = "git://sourceware.org/git/glibc.git;branch=release/${PV}/master \ file://ppc-sqrt_finite.patch \ file://ppc_slow_ieee754_sqrt.patch \ file://add_resource_h_to_wait_h.patch \ - file://fsl-ppc-no-fsqrt.patch \ file://0001-R_ARM_TLS_DTPOFF32.patch \ file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ file://fix-tibetian-locales.patch \ file://ppce6500-32b_slow_ieee754_sqrt.patch \ file://grok_gold.patch \ file://fix_am_rootsbindir.patch \ + file://0001-Add-unused-attribute.patch \ + file://0001-When-disabling-SSE-also-make-sure-that-fpmath-is-not.patch \ + file://0001-yes-within-the-path-sets-wrong-config-variables.patch \ + file://elf-Makefile-fix-a-typo.patch \ ${EGLIBCPATCHES} \ " EGLIBCPATCHES = "\ @@ -61,17 +64,13 @@ TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}" GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1" # -# For now, we will skip building of a gcc package if it is a uclibc one -# and our build is not a uclibc one, and we skip a glibc one if our build -# is a uclibc build. +# We will skip parsing glibc when system C library selection is not glibc +# this helps in easing out parsing for non-glibc system libraries # -# See the note in gcc/gcc_3.4.0.oe -# - python __anonymous () { import re - uc_os = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) - if uc_os: + notglibc = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) or (re.match('.*musl$', d.getVar('TARGET_OS', True)) != None) + if notglibc: raise bb.parse.SkipPackage("incompatible with target %s" % d.getVar('TARGET_OS', True)) } @@ -85,9 +84,12 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-selinux \ --enable-obsolete-rpc \ --with-kconfig=${STAGING_BINDIR_NATIVE} \ + --disable-nscd \ ${GLIBC_EXTRA_OECONF}" EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'libc-inet-anl', '--enable-nscd', '--disable-nscd', d)}" + do_patch_append() { bb.build.exec_func('do_fix_readlib_c', d) diff --git a/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling_fix.patch b/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling_fix.patch index 931a151e20..6aecfe5268 100644 --- a/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling_fix.patch +++ b/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling_fix.patch @@ -20,28 +20,28 @@ index 3f5b25b..0bf0de3 100644 + Elf64_Addr dynamic_addr; + Elf64_Xword dynamic_size; char *program_interpreter; - + Elf64_Ehdr *elf_header; @@ -311,7 +311,7 @@ process_elf_file64 (const char *file_name, const char *lib, int *flag, - error (0, 0, _("more than one dynamic segment\n")); - - dynamic_addr = read64(segment->p_offset, be); + error (0, 0, _("more than one dynamic segment\n")); + + dynamic_addr = read64(segment->p_offset, be); - dynamic_size = read32(segment->p_filesz, be); + dynamic_size = read64(segment->p_filesz, be); - break; - - case PT_INTERP: + break; + + case PT_INTERP: @@ -329,11 +329,11 @@ process_elf_file64 (const char *file_name, const char *lib, int *flag, - break; - - case PT_NOTE: + break; + + case PT_NOTE: - if (!*osversion && read32(segment->p_filesz, be) >= 32 && read32(segment->p_align, be) >= 4) + if (!*osversion && read64(segment->p_filesz, be) >= 32 && read64(segment->p_align, be) >= 4) - { - Elf64_Word *abi_note = (Elf64_Word *) (file_contents - + read64(segment->p_offset, be)); + { + Elf64_Word *abi_note = (Elf64_Word *) (file_contents + + read64(segment->p_offset, be)); - Elf64_Addr size = read32(segment->p_filesz, be); + Elf64_Xword size = read64(segment->p_filesz, be); - - while (read32(abi_note [0], be) != 4 || read32(abi_note [1], be) != 16 - || read32(abi_note [2], be) != 1 + + while (read32(abi_note [0], be) != 4 || read32(abi_note [1], be) != 16 + || read32(abi_note [2], be) != 1 diff --git a/meta/recipes-core/images/build-appliance-image_8.0.bb b/meta/recipes-core/images/build-appliance-image_12.0.1.bb index 7651ff8537..2a57e4845d 100644 --- a/meta/recipes-core/images/build-appliance-image_8.0.bb +++ b/meta/recipes-core/images/build-appliance-image_12.0.1.bb @@ -21,8 +21,8 @@ IMAGE_FSTYPES = "vmdk" inherit core-image -SRCREV ?= "f0a2a2f44587f02fa7f434e82f91a6de2231f6b6" -SRC_URI = "git://git.yoctoproject.org/poky;branch=dizzy \ +SRCREV ?= "0db74ea8f414c88932b9028a6973f39851ad9e6e" +SRC_URI = "git://git.yoctoproject.org/poky;branch=fido \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ " diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm64/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm64/interfaces new file mode 100644 index 0000000000..16967763e5 --- /dev/null +++ b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm64/interfaces @@ -0,0 +1,5 @@ +# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) + +# The loopback interface +auto lo +iface lo inet loopback diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb index 3d88506c05..733ae41f20 100644 --- a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb +++ b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb @@ -16,6 +16,8 @@ SRC_URI = "file://copyright \ file://interfaces \ file://nfsroot" +S = "${WORKDIR}" + do_install () { install -d ${D}${sysconfdir}/init.d \ ${D}${sysconfdir}/network/if-pre-up.d \ diff --git a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb index 0ede20b15d..7ae7969f5e 100644 --- a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb @@ -5,6 +5,8 @@ SRC_URI = "file://init-boot.sh" PR = "r2" +S = "${WORKDIR}" + do_install() { install -m 0755 ${WORKDIR}/init-boot.sh ${D}/init } diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index 403127be09..89b900dba9 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb @@ -14,6 +14,8 @@ SRC_URI = "file://init \ file://e2fs \ file://debug" +S = "${WORKDIR}" + do_install() { install -d ${D}/init.d diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb index ac54902415..b54cb619f1 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb @@ -7,6 +7,8 @@ SRC_URI = "file://init-live.sh" PR = "r12" +S = "${WORKDIR}" + do_install() { install -m 0755 ${WORKDIR}/init-live.sh ${D}/init } diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb index a54960c596..c03bd2d765 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb @@ -5,6 +5,8 @@ SRC_URI = "file://init-install-efi-testfs.sh" RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools" +S = "${WORKDIR}" + do_install() { install -m 0755 ${WORKDIR}/init-install-efi-testfs.sh ${D}/install-efi.sh } diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb index 7195dc2718..b0994d78c3 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb @@ -7,6 +7,8 @@ PR = "r1" RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools" +S = "${WORKDIR}" + do_install() { install -m 0755 ${WORKDIR}/init-install-efi.sh ${D}/install-efi.sh } diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb index db4cf544e8..937bfd4d38 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb @@ -5,6 +5,8 @@ SRC_URI = "file://init-install-testfs.sh" RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs" +S = "${WORKDIR}" + do_install() { install -m 0755 ${WORKDIR}/init-install-testfs.sh ${D}/install.sh } diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb index 7bf31c9cf8..6241a90e20 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb @@ -5,6 +5,8 @@ SRC_URI = "file://init-install.sh" PR = "r9" +S = "${WORKDIR}" + RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs" do_install() { diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index a665acf6e4..a086591b80 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -35,6 +35,8 @@ SRC_URI = "file://functions \ file://logrotate-dmesg.conf \ " +S = "${WORKDIR}" + SRC_URI_append_arm = " file://alignment.sh" KERNEL_VERSION = "" @@ -161,4 +163,11 @@ pkg_postinst_${PN} () { systemctl $OPTS mask $SERVICE.service done fi + + # Delete any old volatile cache script, as directories may have moved + if [ -z "$D" ]; then + rm -f "/etc/volatile.cache" + fi } + +CONFFILES_${PN} += "${sysconfdir}/init.d/checkroot.sh" diff --git a/meta/recipes-core/libcgroup/libcgroup_0.41.bb b/meta/recipes-core/libcgroup/libcgroup_0.41.bb index 69f85666aa..52ba1d760f 100644 --- a/meta/recipes-core/libcgroup/libcgroup_0.41.bb +++ b/meta/recipes-core/libcgroup/libcgroup_0.41.bb @@ -17,9 +17,6 @@ SRC_URI[sha256sum] = "e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706 EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes', '--enable-pam=no', d)}" -# http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg21444.html -PARALLEL_MAKE = "" - PACKAGES =+ "cgroups-pam-plugin" FILES_cgroups-pam-plugin = "${base_libdir}/security/pam_cgroup.so*" FILES_${PN}-dbg += "${base_libdir}/security/.debug" diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc index bcf9a62ded..1314bbfb8d 100644 --- a/meta/recipes-core/libxml/libxml2.inc +++ b/meta/recipes-core/libxml/libxml2.inc @@ -21,6 +21,7 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \ file://libxml2-CVE-2014-0191-fix.patch \ file://python-sitepackages-dir.patch \ file://libxml-m4-use-pkgconfig.patch \ + file://configure.ac-fix-cross-compiling-warning.patch \ " BINCONFIG = "${bindir}/xml2-config" @@ -33,7 +34,7 @@ RDEPENDS_${PN}-ptest_append_libc-glibc += "glibc-gconv-ebcdic-us glibc-gconv-ibm # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header do_configure_prepend () { - sed -i -e '/.*ansidecl.h.*/d' ${S}/configure.in + sed -i -e '/.*ansidecl.h.*/d' ${S}/configure.ac } do_configure_prepend_class-nativesdk () { @@ -65,7 +66,7 @@ PACKAGES += "${PN}-utils ${PN}-python" FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug" FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" -FILES_${PN}-dev += "${libdir}/xml2Conf.sh" +FILES_${PN}-dev += "${libdir}/xml2Conf.sh ${libdir}/cmake/*" FILES_${PN}-utils += "${bindir}/*" FILES_${PN}-python += "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta/recipes-core/libxml/libxml2/72a46a519ce7326d9a00f0b6a7f2a8e958cd1675.patch b/meta/recipes-core/libxml/libxml2/72a46a519ce7326d9a00f0b6a7f2a8e958cd1675.patch new file mode 100644 index 0000000000..10a8112b58 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/72a46a519ce7326d9a00f0b6a7f2a8e958cd1675.patch @@ -0,0 +1,30 @@ +From 72a46a519ce7326d9a00f0b6a7f2a8e958cd1675 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard <veillard@redhat.com> +Date: Thu, 23 Oct 2014 11:35:36 +0800 +Subject: Fix missing entities after CVE-2014-3660 fix + +For https://bugzilla.gnome.org/show_bug.cgi?id=738805 + +The fix for CVE-2014-3660 introduced a regression in some case +where entity substitution is required and the entity is used +first in anotther entity referenced from an attribute value + +Upstream-Status: Backport + +diff --git a/parser.c b/parser.c +index 67c9dfd..a8d1b67 100644 +--- a/parser.c ++++ b/parser.c +@@ -7235,7 +7235,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { + * far more secure as the parser will only process data coming from + * the document entity by default. + */ +- if ((ent->checked == 0) && ++ if (((ent->checked == 0) || ++ ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) && + ((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) || + (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) { + unsigned long oldnbent = ctxt->nbentities; +-- +cgit v0.10.1 + diff --git a/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch b/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch new file mode 100644 index 0000000000..2f8079b052 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch @@ -0,0 +1,45 @@ +configure.ac: fix cross compiling warning + +There is a warning while cross compiling which triggered a +failure by do_qa_configure +... +|configure:12652: checking for gzread in -lz +|configure:12677: mips-poky-linux-gcc -meb -mabi=32 -mhard-float + -L/lib conftest.c -lz >&5 +|ld: warning: library search path "/lib" is unsafe for cross-compilation +... + +While do the lib checking, do not add '-L${Z_DIR}/lib' to LDFLAGS could fix it. + +Upstream-Status: Inappropriate [oe specific] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9a90600..0bac8a4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -391,8 +391,6 @@ if test "$with_zlib" = "no"; then + echo "Disabling compression support" + else + AC_CHECK_HEADERS(zlib.h, +- [SAVE_LDFLAGS="${LDFLAGS}" +- LDFLAGS="-L${Z_DIR}/lib" + AC_CHECK_LIB(z, gzread,[ + AC_DEFINE([HAVE_LIBZ], [1], [Have compression library]) + WITH_ZLIB=1 +@@ -406,8 +404,7 @@ else + esac] + else + Z_LIBS="-lz" +- fi]) +- LDFLAGS="${SAVE_LDFLAGS}"]) ++ fi])) + fi + + AC_SUBST(Z_CFLAGS) +-- +1.9.1 + diff --git a/meta/recipes-core/libxml/libxml2/libxml2-CVE-2014-3660.patch b/meta/recipes-core/libxml/libxml2/libxml2-CVE-2014-3660.patch new file mode 100644 index 0000000000..b9621c93eb --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/libxml2-CVE-2014-3660.patch @@ -0,0 +1,147 @@ +From be2a7edaf289c5da74a4f9ed3a0b6c733e775230 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard <veillard@redhat.com> +Date: Thu, 16 Oct 2014 13:59:47 +0800 +Subject: Fix for CVE-2014-3660 + +Issues related to the billion laugh entity expansion which happened to +escape the initial set of fixes + +Upstream-status: Backport +Reference: https://git.gnome.org/browse/libxml2/commit/?id=be2a7edaf289c5da74a4f9ed3a0b6c733e775230&context=3&ignorews=0&ss=0 + +Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> + +diff --git a/parser.c b/parser.c +index f51e8d2..1d93967 100644 +--- a/parser.c ++++ b/parser.c +@@ -130,6 +130,29 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size, + return (0); + if (ctxt->lastError.code == XML_ERR_ENTITY_LOOP) + return (1); ++ ++ /* ++ * This may look absurd but is needed to detect ++ * entities problems ++ */ ++ if ((ent != NULL) && (ent->etype != XML_INTERNAL_PREDEFINED_ENTITY) && ++ (ent->content != NULL) && (ent->checked == 0)) { ++ unsigned long oldnbent = ctxt->nbentities; ++ xmlChar *rep; ++ ++ ent->checked = 1; ++ ++ rep = xmlStringDecodeEntities(ctxt, ent->content, ++ XML_SUBSTITUTE_REF, 0, 0, 0); ++ ++ ent->checked = (ctxt->nbentities - oldnbent + 1) * 2; ++ if (rep != NULL) { ++ if (xmlStrchr(rep, '<')) ++ ent->checked |= 1; ++ xmlFree(rep); ++ rep = NULL; ++ } ++ } + if (replacement != 0) { + if (replacement < XML_MAX_TEXT_LENGTH) + return(0); +@@ -189,9 +212,12 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size, + return (0); + } else { + /* +- * strange we got no data for checking just return ++ * strange we got no data for checking + */ +- return (0); ++ if (((ctxt->lastError.code != XML_ERR_UNDECLARED_ENTITY) && ++ (ctxt->lastError.code != XML_WAR_UNDECLARED_ENTITY)) || ++ (ctxt->nbentities <= 10000)) ++ return (0); + } + xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL); + return (1); +@@ -2589,6 +2615,7 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) { + name, NULL); + ctxt->valid = 0; + } ++ xmlParserEntityCheck(ctxt, 0, NULL, 0); + } else if (ctxt->input->free != deallocblankswrapper) { + input = xmlNewBlanksWrapperInputStream(ctxt, entity); + if (xmlPushInput(ctxt, input) < 0) +@@ -2759,6 +2786,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, + if ((ctxt->lastError.code == XML_ERR_ENTITY_LOOP) || + (ctxt->lastError.code == XML_ERR_INTERNAL_ERROR)) + goto int_error; ++ xmlParserEntityCheck(ctxt, 0, ent, 0); + if (ent != NULL) + ctxt->nbentities += ent->checked / 2; + if ((ent != NULL) && +@@ -2810,6 +2838,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, + ent = xmlParseStringPEReference(ctxt, &str); + if (ctxt->lastError.code == XML_ERR_ENTITY_LOOP) + goto int_error; ++ xmlParserEntityCheck(ctxt, 0, ent, 0); + if (ent != NULL) + ctxt->nbentities += ent->checked / 2; + if (ent != NULL) { +@@ -7312,6 +7341,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { + (ret != XML_WAR_UNDECLARED_ENTITY)) { + xmlFatalErrMsgStr(ctxt, XML_ERR_UNDECLARED_ENTITY, + "Entity '%s' failed to parse\n", ent->name); ++ xmlParserEntityCheck(ctxt, 0, ent, 0); + } else if (list != NULL) { + xmlFreeNodeList(list); + list = NULL; +@@ -7418,7 +7448,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { + /* + * We are copying here, make sure there is no abuse + */ +- ctxt->sizeentcopy += ent->length; ++ ctxt->sizeentcopy += ent->length + 5; + if (xmlParserEntityCheck(ctxt, 0, ent, ctxt->sizeentcopy)) + return; + +@@ -7466,7 +7496,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { + /* + * We are copying here, make sure there is no abuse + */ +- ctxt->sizeentcopy += ent->length; ++ ctxt->sizeentcopy += ent->length + 5; + if (xmlParserEntityCheck(ctxt, 0, ent, ctxt->sizeentcopy)) + return; + +@@ -7652,6 +7682,7 @@ xmlParseEntityRef(xmlParserCtxtPtr ctxt) { + ctxt->sax->reference(ctxt->userData, name); + } + } ++ xmlParserEntityCheck(ctxt, 0, ent, 0); + ctxt->valid = 0; + } + +@@ -7845,6 +7876,7 @@ xmlParseStringEntityRef(xmlParserCtxtPtr ctxt, const xmlChar ** str) { + "Entity '%s' not defined\n", + name); + } ++ xmlParserEntityCheck(ctxt, 0, ent, 0); + /* TODO ? check regressions ctxt->valid = 0; */ + } + +@@ -8004,6 +8036,7 @@ xmlParsePEReference(xmlParserCtxtPtr ctxt) + name, NULL); + ctxt->valid = 0; + } ++ xmlParserEntityCheck(ctxt, 0, NULL, 0); + } else { + /* + * Internal checking in case the entity quest barfed +@@ -8243,6 +8276,7 @@ xmlParseStringPEReference(xmlParserCtxtPtr ctxt, const xmlChar **str) { + name, NULL); + ctxt->valid = 0; + } ++ xmlParserEntityCheck(ctxt, 0, NULL, 0); + } else { + /* + * Internal checking in case the entity quest barfed +-- +cgit v0.10.1 + diff --git a/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch b/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch index a697ddf873..e83c8325e5 100644 --- a/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch +++ b/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch @@ -4,12 +4,18 @@ The python binary used when building for nativesdk doesn't give us the correct path here so we need to be able to specify it ourselves. Upstream-Status: Inappropriate [config] - Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> ---- a/configure.in -+++ b/configure.in -@@ -743,7 +743,8 @@ dnl +Rebase to 2.9.2 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -813,7 +813,8 @@ dnl PYTHON_VERSION= PYTHON_INCLUDES= @@ -19,3 +25,6 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> PYTHON_TESTS= pythondir= if test "$with_python" != "no" ; then +-- +1.9.1 + diff --git a/meta/recipes-core/libxml/libxml2_2.9.1.bb b/meta/recipes-core/libxml/libxml2_2.9.2.bb index 0b6ac5d5c6..1affff12ae 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.1.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.2.bb @@ -1,8 +1,9 @@ require libxml2.inc -SRC_URI += "http://www.w3.org/XML/Test/xmlts20080827.tar.gz;name=testtar" +SRC_URI += "http://www.w3.org/XML/Test/xmlts20080827.tar.gz;name=testtar \ + file://72a46a519ce7326d9a00f0b6a7f2a8e958cd1675.patch" -SRC_URI[libtar.md5sum] = "9c0cfef285d5c4a5c80d00904ddab380" -SRC_URI[libtar.sha256sum] = "fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb" +SRC_URI[libtar.md5sum] = "9e6a9aca9d155737868b3dc5fd82f788" +SRC_URI[libtar.sha256sum] = "5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc" SRC_URI[testtar.md5sum] = "ae3d1ebe000a3972afa104ca7f0e1b4a" SRC_URI[testtar.sha256sum] = "96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7" diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 58e0ffa4f2..6d4c8c8fe1 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -12,16 +12,21 @@ TOOLCHAIN_HOST_TASK ?= "\ nativesdk-python-modules \ nativesdk-python-misc \ nativesdk-python-git \ + nativesdk-python-pexpect \ nativesdk-ncurses-terminfo-base \ nativesdk-chrpath \ nativesdk-tar \ + nativesdk-buildtools-perl-dummy \ nativesdk-git \ + nativesdk-git-perltools \ nativesdk-pigz \ nativesdk-make \ nativesdk-wget \ nativesdk-ca-certificates \ " +SDK_PACKAGE_ARCHS =+ "buildtools-dummy-${SDKPKGSUFFIX}" + TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-buildtools-nativesdk-standalone-${DISTRO_VERSION}" RDEPENDS = "${TOOLCHAIN_HOST_TASK}" diff --git a/meta/recipes-core/meta/meta-environment-extsdk.bb b/meta/recipes-core/meta/meta-environment-extsdk.bb new file mode 100644 index 0000000000..d9e596143f --- /dev/null +++ b/meta/recipes-core/meta/meta-environment-extsdk.bb @@ -0,0 +1,12 @@ +# meta-environment for extensible SDK + +require meta-environment.bb + +PN = "meta-environment-extsdk-${MACHINE}" + +create_sdk_files_append() { + local sysroot=${SDKPATH}/${@os.path.relpath(d.getVar('STAGING_DIR_TARGET', True), d.getVar('TOPDIR', True))} + local sdkpathnative=${SDKPATH}/${@os.path.relpath(d.getVar('STAGING_DIR_NATIVE',True), d.getVar('TOPDIR', True))} + + toolchain_create_sdk_env_script '' '' $sysroot '' ${bindir_native} ${prefix_native} $sdkpathnative +} diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb index bb208a39aa..5d72e38e91 100644 --- a/meta/recipes-core/meta/meta-environment.bb +++ b/meta/recipes-core/meta/meta-environment.bb @@ -6,9 +6,9 @@ PR = "r8" EXCLUDE_FROM_WORLD = "1" -ORIGOS := "${TARGET_OS}" +MODIFYTOS = "0" -REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${ORIGOS}" +REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" inherit toolchain-scripts TOOLCHAIN_NEED_CONFIGSITE_CACHE += "zlib" @@ -19,7 +19,6 @@ SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}" inherit cross-canadian -do_generate_content[nostamp] = "1" do_generate_content[cleandirs] = "${SDK_OUTPUT}" do_generate_content[dirs] = "${SDK_OUTPUT}/${SDKPATH}" python do_generate_content() { @@ -31,7 +30,6 @@ python do_generate_content() { # make sure we only use the SDKTARGETSYSROOT value from 'd' localdata.setVar('SDKTARGETSYSROOT', d.getVar('SDKTARGETSYSROOT', True)) - localdata.setVar('TARGET_OS', d.getVar('ORIGOS', True)) localdata.setVar('libdir', d.getVar('target_libdir', False)) # Process DEFAULTTUNE @@ -58,7 +56,6 @@ create_sdk_files() { toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${REAL_MULTIMACH_TARGET_SYS} } -do_install[nostamp] = "1" do_install() { install -d ${D}/${SDKPATH} install -m 0644 -t ${D}/${SDKPATH} ${SDK_OUTPUT}/${SDKPATH}/* diff --git a/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb b/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb new file mode 100644 index 0000000000..d971c3ca3d --- /dev/null +++ b/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb @@ -0,0 +1,19 @@ +SUMMARY = "Dummy package which ensures perl is excluded from buildtools" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +inherit nativesdk + +# Put it somewhere separate to ensure it's never used except when we want it +PACKAGE_ARCH = "buildtools-dummy-${SDKPKGSUFFIX}" + +PERLPACKAGES = "nativesdk-perl \ + nativesdk-perl-module-file-path" + +ALLOW_EMPTY_${PN} = "1" + +python populate_packages_prepend() { + d.appendVar('RPROVIDES_${PN}', '${PERLPACKAGES}') + d.appendVar('RCONFLICTS_${PN}', '${PERLPACKAGES}') +} + diff --git a/meta/recipes-core/meta/uninative-tarball.bb b/meta/recipes-core/meta/uninative-tarball.bb index e17685a117..62bdde85fc 100644 --- a/meta/recipes-core/meta/uninative-tarball.bb +++ b/meta/recipes-core/meta/uninative-tarball.bb @@ -11,7 +11,6 @@ TOOLCHAIN_HOST_TASK = "\ " INHIBIT_DEFAULT_DEPS = "1" -DEPENDS += "patchelf-native" TOOLCHAIN_OUTPUTNAME ?= "${BUILD_ARCH}-nativesdk-libc" @@ -25,6 +24,8 @@ inherit populate_sdk deltask install deltask package +SDK_DEPENDS += "patchelf-native" + SDK_PACKAGING_FUNC = "" fakeroot create_sdk_files() { @@ -44,5 +45,5 @@ fakeroot tar_sdk() { rm sysroots -rf patchelf --set-interpreter ${@''.join('a' for n in xrange(1024))} ./${BUILD_SYS}/usr/bin/patchelf mv ./${BUILD_SYS}/usr/bin/patchelf ./${BUILD_SYS}/usr/bin/patchelf-uninative - tar ${SDKTAROPTS} -c --file=${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 . + tar ${SDKTAROPTS} -c -j --file=${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 . } diff --git a/meta/recipes-core/netbase/netbase_5.2.bb b/meta/recipes-core/netbase/netbase_5.3.bb index ab7ae6527c..4ac0221c9e 100644 --- a/meta/recipes-core/netbase/netbase_5.2.bb +++ b/meta/recipes-core/netbase/netbase_5.3.bb @@ -6,11 +6,11 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab" PE = "1" -SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \ +SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.xz \ file://hosts" -SRC_URI[md5sum] = "3a01bfce6a28e1743412198abd241262" -SRC_URI[sha256sum] = "d62ba56d62b9b121664828175c2a237a7014ef32df8a4116ea33cff332de3307" +SRC_URI[md5sum] = "2637a27fd3de02a278d2b5be7e6558c1" +SRC_URI[sha256sum] = "81f6c69795044d62b8ad959cf9daf049d0545fd466c52860ad3f933b1e97b88b" do_install () { install -d ${D}/${mandir}/man8 ${D}${sysconfdir} diff --git a/meta/recipes-core/os-release/os-release.bb b/meta/recipes-core/os-release/os-release.bb index 33e958137f..87fea6f04d 100644 --- a/meta/recipes-core/os-release/os-release.bb +++ b/meta/recipes-core/os-release/os-release.bb @@ -3,6 +3,7 @@ inherit allarch SUMMARY = "Operating system identification" DESCRIPTION = "The /etc/os-release file contains operating system identification data." LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" INHIBIT_DEFAULT_DEPS = "1" do_fetch[noexec] = "1" diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index f4b2cd574d..262d65f5dc 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb @@ -8,6 +8,7 @@ PR = "r83" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup +inherit bluetooth PROVIDES = "${PACKAGES}" PACKAGES = ' \ @@ -203,7 +204,7 @@ RRECOMMENDS_packagegroup-base-pcmcia = "\ SUMMARY_packagegroup-base-bluetooth = "Bluetooth support" RDEPENDS_packagegroup-base-bluetooth = "\ - bluez4 \ + ${BLUEZ} \ ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \ " @@ -346,8 +347,10 @@ RRECOMMENDS_packagegroup-base-nfs = "\ SUMMARY_packagegroup-base-zeroconf = "Zeroconf support" RDEPENDS_packagegroup-base-zeroconf = "\ - libnss-mdns \ avahi-daemon" +RDEPENDS_packagegroup-base-zeroconf_append_libc-glibc = "\ + libnss-mdns \ + " SUMMARY_packagegroup-base-ipv6 = "IPv6 support" RDEPENDS_packagegroup-base-ipv6 = "\ diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb index a544bbdbdb..a41eada5af 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb @@ -6,6 +6,8 @@ SUMMARY = "Software development tools" LICENSE = "MIT" PR = "r9" +PACKAGE_ARCH = "${MACHINE_ARCH}" + inherit packagegroup #PACKAGEFUNCS =+ 'generate_sdk_pkgs' @@ -26,9 +28,18 @@ RDEPENDS_packagegroup-core-sdk = "\ file \ tcl" +SANITIZERS = "libasan-dev libubsan-dev" +SANITIZERS_aarch64 = "" +SANITIZERS_mips = "" +SANITIZERS_mips64 = "" +SANITIZERS_mips64n32 = "" +SANITIZERS_powerpc64 = "" +SANITIZERS_sparc = "" + RRECOMMENDS_packagegroup-core-sdk = "\ libgomp \ - libgomp-dev" + libgomp-dev \ + ${SANITIZERS}" #python generate_sdk_pkgs () { # poky_pkgs = read_pkgdata('packagegroup-core', d)['PACKAGES'] diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index 41d2548b70..6f4842f182 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb @@ -12,6 +12,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup PROFILE_TOOLS_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sysprof', '', d)}" +# sysprof doesn't support aarch64 +PROFILE_TOOLS_X_aarch64 = "" PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}" RRECOMMENDS_${PN} = "\ @@ -36,6 +38,7 @@ SYSTEMTAP = "systemtap" SYSTEMTAP_libc-uclibc = "" SYSTEMTAP_mips = "" SYSTEMTAP_mips64 = "" +SYSTEMTAP_mips64n32 = "" SYSTEMTAP_aarch64 = "" # lttng-ust uses sched_getcpu() which is not there on uclibc @@ -53,7 +56,6 @@ LTTNGTOOLS_aarch64 = "" LTTNGMODULES = "lttng-modules" LTTNGMODULES_aarch64 = "" -LTTNGMODULES_arm = "" BABELTRACE = "babeltrace" BABELTRACE_aarch64 = "" @@ -64,6 +66,7 @@ VALGRIND = "valgrind" VALGRIND_libc-uclibc = "" VALGRIND_mips = "" VALGRIND_mips64 = "" +VALGRIND_mips64n32 = "" VALGRIND_arm = "" VALGRIND_aarch64 = "" diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb index 33a3eee258..4177c450aa 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb @@ -30,7 +30,7 @@ X11GLTOOLS = "\ X11TOOLS = "\ fstests \ - owl-video \ + gst-player-bin \ x11perf \ xrestop \ xwininfo \ diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index 65aca7ff38..47589b6ad6 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -7,7 +7,9 @@ DESCRIPTION = "Packages required to run the build system" PR = "r13" LICENSE = "MIT" -inherit packagegroup +inherit packagegroup distro_features_check +# rdepends on libx11-dev +REQUIRED_DISTRO_FEATURES = "x11" PACKAGES = "\ packagegroup-self-hosted \ @@ -29,6 +31,7 @@ RDEPENDS_packagegroup-self-hosted = "\ # midori depends on webkit-gtk which could not build for mips64 MIDORI = "midori" MIDORI_mips64 = "" +MIDORI_mips64n32 = "" RDEPENDS_packagegroup-self-hosted-host-tools = "\ connman \ @@ -120,6 +123,7 @@ RDEPENDS_packagegroup-self-hosted-extended = "\ gettext \ gettext-runtime \ git \ + git-perltools \ grep \ groff \ gzip \ @@ -153,37 +157,11 @@ RDEPENDS_packagegroup-self-hosted-extended = "\ perl-pod \ ${PTH} \ python \ - python-compile \ python-compiler \ - python-compression \ - python-core \ - python-curses \ - python-datetime \ - python-difflib \ - python-distutils \ - python-elementtree \ - python-email \ - python-fcntl \ python-git \ - python-json \ - python-logging \ python-misc \ - python-mmap \ - python-multiprocessing \ - python-netclient \ - python-netserver \ - python-pickle \ - python-pkgutil \ - python-pprint \ - python-re \ + python-modules \ python-rpm \ - python-shell \ - python-sqlite3 \ - python-subprocess \ - python-textutils \ - python-unittest \ - python-unixadmin \ - python-xmlrpc \ quota \ readline \ rpm \ diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 4e8f071a8e..7f0dc7859f 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -5,7 +5,7 @@ SECTION = "base" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=16;md5=840fb2356b10a85bed78dd09dc7745c6" -SRCREV = "afd4e228c606a9998feae44a3fed4474803240b7" +SRCREV = "14c8f7b705de944beb4de3f296506d80871e410f" PV = "0.1+git${SRCPV}" PR = "r15" diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 0ce3b519e6..3f662c3070 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc @@ -16,8 +16,6 @@ SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz;name=archive \ file://config-dirent-symbols.patch \ file://norpath.patch" -S = "${WORKDIR}/${BPN}-${PV}" - inherit autotools texinfo EXTRA_AUTORECONF += "--exclude=autoheader" diff --git a/meta/recipes-core/readline/readline_5.2.bb b/meta/recipes-core/readline/readline_5.2.bb index fe610e3964..c1007a2311 100644 --- a/meta/recipes-core/readline/readline_5.2.bb +++ b/meta/recipes-core/readline/readline_5.2.bb @@ -63,8 +63,6 @@ SRC_URI[patch13.sha256sum] = "0cc649516a5bdfa61c5e56937407570288b6972d75aa1bd060 SRC_URI[patch14.md5sum] = "a1be30e1c6f1099bb5fcef00a2631fb8" SRC_URI[patch14.sha256sum] = "6f1a68320d01522ca1ea5a737124ecc8739f3dcbfea2dee21e3ccf839a21a817" -S = "${WORKDIR}/${BPN}-${PV}" - inherit autotools EXTRA_AUTORECONF += "--exclude=autoheader" diff --git a/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service b/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service index 6dd335c0bc..182167befe 100644 --- a/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service +++ b/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service @@ -21,7 +21,7 @@ IgnoreOnIsolate=yes [Service] Environment="TERM=xterm" -ExecStart=-/sbin/agetty -8 --keep-baud %I @BAUDRATE@ $TERM +ExecStart=-/sbin/agetty -8 -L --keep-baud %I @BAUDRATE@ $TERM Type=idle Restart=always RestartSec=0 diff --git a/meta/recipes-core/systemd/systemd-systemctl-native.bb b/meta/recipes-core/systemd/systemd-systemctl-native.bb index 72bc77df4f..fbdc9c0a18 100644 --- a/meta/recipes-core/systemd/systemd-systemctl-native.bb +++ b/meta/recipes-core/systemd/systemd-systemctl-native.bb @@ -9,6 +9,8 @@ inherit native SRC_URI = "file://systemctl" +S = "${WORKDIR}" + do_install() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/systemctl ${D}${bindir} diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl b/meta/recipes-core/systemd/systemd-systemctl/systemctl index b37f27abfb..6e163bd5c2 100755 --- a/meta/recipes-core/systemd/systemd-systemctl/systemctl +++ b/meta/recipes-core/systemd/systemd-systemctl/systemctl @@ -77,18 +77,31 @@ for service in $services; do exit 0 fi - echo "Try to find location of $service..." + service_base_file=`echo $service | sed 's/\(@\).*\(\.[^.]\+\)/\1\2/'` + if [ -z `echo $service | sed '/@/p;d'` ]; then + echo "Try to find location of $service..." + service_template=false + else + echo "Try to find location of template $service_base_file of instance $service..." + service_template=true + if [ -z `echo $service | sed 's/^.\+@\(.*\)\.[^.]\+/\1/'` ]; then + instance_specified=false + else + instance_specified=true + fi + fi + # find service file for p in $ROOT/etc/systemd/system \ $ROOT/lib/systemd/system \ $ROOT/usr/lib/systemd/system; do - if [ -e $p/$service ]; then - service_file=$p/$service + if [ -e $p/$service_base_file ]; then + service_file=$p/$service_base_file service_file=${service_file##$ROOT} fi done if [ -z "$service_file" ]; then - echo "'$service' couldn't be found; exiting with error" + echo "'$service_base_file' couldn't be found; exiting with error" exit 1 fi echo "Found $service in $service_file" @@ -115,13 +128,29 @@ for service in $services; do for r in $wanted_by; do echo "WantedBy=$r found in $service" if [ "$action" = "enable" ]; then + enable_service=$service + if [ "$service_template" = true -a "$instance_specified" = false ]; then + default_instance=$(sed '/^DefaultInstance[[:space:]]*=/s,[^=]*=,,p;d' "$ROOT/$service_file") + if [ -z $default_instance ]; then + echo "Template unit without instance or DefaultInstance directive, nothing to enable" + continue + else + echo "Found DefaultInstance $default_instance, enabling it" + enable_service=$(echo $service | sed "s/@/@$default_instance/") + fi + fi mkdir -p $ROOT/etc/systemd/system/$r.wants - ln -s $service_file $ROOT/etc/systemd/system/$r.wants - echo "Enabled $service for $wanted_by." + ln -s $service_file $ROOT/etc/systemd/system/$r.wants/$enable_service + echo "Enabled $enable_service for $wanted_by." else - rm -f $ROOT/etc/systemd/system/$r.wants/$service - rmdir --ignore-fail-on-non-empty -p $ROOT/etc/systemd/system/$r.wants - echo "Disabled $service for $wanted_by." + if [ "$service_template" = true -a "$instance_specified" = false ]; then + disable_service="$ROOT/etc/systemd/system/$r.wants/`echo $service | sed 's/@/@*/'`" + else + disable_service="$ROOT/etc/systemd/system/$r.wants/$service" + fi + rm -f $disable_service + [ -d $ROOT/etc/systemd/system/$r.wants ] && rmdir --ignore-fail-on-non-empty -p $ROOT/etc/systemd/system/$r.wants + echo "Disabled ${disable_service##$ROOT/etc/systemd/system/$r.wants/} for $wanted_by." fi done diff --git a/meta/recipes-core/systemd/systemd/00-create-volatile.conf b/meta/recipes-core/systemd/systemd/00-create-volatile.conf index 9ffa88e464..87cbe1e7d3 100644 --- a/meta/recipes-core/systemd/systemd/00-create-volatile.conf +++ b/meta/recipes-core/systemd/systemd/00-create-volatile.conf @@ -4,4 +4,4 @@ d /var/volatile/log - - - - -d /var/volatile/tmp - - - - +d /var/volatile/tmp 1777 - - diff --git a/meta/recipes-core/systemd/systemd/0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch b/meta/recipes-core/systemd/systemd/0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch deleted file mode 100644 index 448ef1a917..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch +++ /dev/null @@ -1,29 +0,0 @@ -Upstream-Status: Backport - -Subject: missing.h: add fake __NR_memfd_create for MIPS - -We don't have the correct __NR_memfd_create syscall number yet, so set it to -0xffffffff for now to prevent compile time errors. - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - src/shared/missing.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/shared/missing.h b/src/shared/missing.h -index 3ff1a21..3051cb5 100644 ---- a/src/shared/missing.h -+++ b/src/shared/missing.h -@@ -167,6 +167,9 @@ static inline int pivot_root(const char *new_root, const char *put_old) { - # define __NR_fanotify_mark 5296 - # endif - # endif -+# ifndef __NR_memfd_create -+# define __NR_memfd_create 0xffffffff /* FIXME */ -+# endif - #else - # ifndef __NR_fanotify_init - # define __NR_fanotify_init 338 --- -1.9.1 - diff --git a/meta/recipes-core/systemd/systemd/0001-tmpfiles-avoid-creating-duplicate-acl-entries.patch b/meta/recipes-core/systemd/systemd/0001-tmpfiles-avoid-creating-duplicate-acl-entries.patch new file mode 100644 index 0000000000..6652e28e23 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-tmpfiles-avoid-creating-duplicate-acl-entries.patch @@ -0,0 +1,134 @@ +Upstream-Status: Backport +Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca> + +From 33d36e28b0a23fb7ac33435a1329d65bff1ba4ec Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> +Date: Mon, 23 Feb 2015 23:19:54 -0500 +Subject: [PATCH] tmpfiles: avoid creating duplicate acl entries + +https://bugs.freedesktop.org/show_bug.cgi?id=89202 +https://bugs.debian.org/778656 + +Status quo ante can be restored with: + getfacl -p /var/log/journal/`cat /etc/machine-id`|grep -v '^#'|sort -u|sudo setfacl --set-file=- /var/log/journal/`cat /etc/machine-id` + +(cherry picked from commit 1c73f3bc29111a00738569c9d40a989b161a0624) +--- + src/shared/acl-util.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++-- + src/shared/acl-util.h | 4 +++ + 2 files changed, 81 insertions(+), 2 deletions(-) + +diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c +index a4ff1ab..cbe09d7 100644 +--- a/src/shared/acl-util.c ++++ b/src/shared/acl-util.c +@@ -282,6 +282,77 @@ int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask) + return 0; + } + ++static int acl_entry_equal(acl_entry_t a, acl_entry_t b) { ++ acl_tag_t tag_a, tag_b; ++ ++ if (acl_get_tag_type(a, &tag_a) < 0) ++ return -errno; ++ ++ if (acl_get_tag_type(b, &tag_b) < 0) ++ return -errno; ++ ++ if (tag_a != tag_b) ++ return false; ++ ++ switch (tag_a) { ++ case ACL_USER_OBJ: ++ case ACL_GROUP_OBJ: ++ case ACL_MASK: ++ case ACL_OTHER: ++ /* can have only one of those */ ++ return true; ++ case ACL_USER: { ++ _cleanup_(acl_free_uid_tpp) uid_t *uid_a, *uid_b; ++ ++ uid_a = acl_get_qualifier(a); ++ if (!uid_a) ++ return -errno; ++ ++ uid_b = acl_get_qualifier(b); ++ if (!uid_b) ++ return -errno; ++ ++ return *uid_a == *uid_b; ++ } ++ case ACL_GROUP: { ++ _cleanup_(acl_free_gid_tpp) gid_t *gid_a, *gid_b; ++ ++ gid_a = acl_get_qualifier(a); ++ if (!gid_a) ++ return -errno; ++ ++ gid_b = acl_get_qualifier(b); ++ if (!gid_b) ++ return -errno; ++ ++ return *gid_a == *gid_b; ++ } ++ default: ++ assert_not_reached("Unknown acl tag type"); ++ } ++} ++ ++static int find_acl_entry(acl_t acl, acl_entry_t entry, acl_entry_t *out) { ++ acl_entry_t i; ++ int r; ++ ++ for (r = acl_get_entry(acl, ACL_FIRST_ENTRY, &i); ++ r > 0; ++ r = acl_get_entry(acl, ACL_NEXT_ENTRY, &i)) { ++ ++ r = acl_entry_equal(i, entry); ++ if (r < 0) ++ return r; ++ if (r > 0) { ++ *out = i; ++ return 1; ++ } ++ } ++ if (r < 0) ++ return -errno; ++ return 0; ++} ++ + int acls_for_file(const char *path, acl_type_t type, acl_t new, acl_t *acl) { + _cleanup_(acl_freep) acl_t old; + acl_entry_t i; +@@ -297,8 +368,12 @@ int acls_for_file(const char *path, acl_type_t type, acl_t new, acl_t *acl) { + + acl_entry_t j; + +- if (acl_create_entry(&old, &j) < 0) +- return -errno; ++ r = find_acl_entry(old, i, &j); ++ if (r < 0) ++ return r; ++ if (r == 0) ++ if (acl_create_entry(&old, &j) < 0) ++ return -errno; + + if (acl_copy_entry(j, i) < 0) + return -errno; +diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h +index 90e88ff..fdb9006 100644 +--- a/src/shared/acl-util.h ++++ b/src/shared/acl-util.h +@@ -41,5 +41,9 @@ int acls_for_file(const char *path, acl_type_t type, acl_t new, acl_t *acl); + DEFINE_TRIVIAL_CLEANUP_FUNC(acl_t, acl_free); + #define acl_free_charp acl_free + DEFINE_TRIVIAL_CLEANUP_FUNC(char*, acl_free_charp); ++#define acl_free_uid_tp acl_free ++DEFINE_TRIVIAL_CLEANUP_FUNC(uid_t*, acl_free_uid_tp); ++#define acl_free_gid_tp acl_free ++DEFINE_TRIVIAL_CLEANUP_FUNC(gid_t*, acl_free_gid_tp); + + #endif +-- +2.3.1 + diff --git a/meta/recipes-core/systemd/systemd/0001-tmpfiles.d-etc.conf-disable-resolv.conf-symlink.patch b/meta/recipes-core/systemd/systemd/0001-tmpfiles.d-etc.conf-disable-resolv.conf-symlink.patch deleted file mode 100644 index 7218322d4c..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-tmpfiles.d-etc.conf-disable-resolv.conf-symlink.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f0ab1600fb56d680e6aba3d0d51dfb9ffa3d9403 Mon Sep 17 00:00:00 2001 -From: "Peter A. Bigot" <pab@pabigot.com> -Date: Thu, 18 Sep 2014 08:36:54 -0500 -Subject: [PATCH] tmpfiles.d/etc.conf: disable resolv.conf symlink - -This link is valid only if ENABLE_RESOLVED is configured for systemd. -If left unconditional, the symlink is created preventing connman from -storing the configuration it received from DHCP or other sources. - -Upstream has a TODO to fix this, but has not done so as of this date. -Provide a temporary workaround for OE until this is done properly -upstream. - -Upstream-Status: Inappropriate [OE-specific] -Signed-off-by: Peter A. Bigot <pab@pabigot.com> ---- - tmpfiles.d/etc.conf | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tmpfiles.d/etc.conf b/tmpfiles.d/etc.conf -index b23272c..5364dd8 100644 ---- a/tmpfiles.d/etc.conf -+++ b/tmpfiles.d/etc.conf -@@ -10,6 +10,7 @@ - L /etc/os-release - - - - ../usr/lib/os-release - L /etc/localtime - - - - ../usr/share/zoneinfo/UTC - L+ /etc/mtab - - - - ../proc/self/mounts --L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf -+# TODO: conditional on ENABLE_RESOLVED -+#L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf - C /etc/nsswitch.conf - - - - - C /etc/pam.d - - - - --- -1.8.5.5 - diff --git a/meta/recipes-core/systemd/systemd/0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch b/meta/recipes-core/systemd/systemd/0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch new file mode 100644 index 0000000000..b6ab5effc2 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch @@ -0,0 +1,44 @@ +From 100e50604efc4032001a2de6a6b47853c0003817 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 20 Feb 2015 05:29:15 +0000 +Subject: [PATCH 01/11] units: Prefer getty to agetty in console setup systemd + units + +Upstream-Status: Inappropriate [configuration specific] + +Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + units/getty@.service.m4 | 2 +- + units/serial-getty@.service.m4 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 +index 46164ab..bdf6ec8 100644 +--- a/units/getty@.service.m4 ++++ b/units/getty@.service.m4 +@@ -27,7 +27,7 @@ ConditionPathExists=/dev/tty0 + + [Service] + # the VT is cleared by TTYVTDisallocate +-ExecStart=-/sbin/agetty --noclear %I $TERM ++ExecStart=-/sbin/getty -L %I $TERM + Type=idle + Restart=always + RestartSec=0 +diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4 +index 4522d0d..e6d499d 100644 +--- a/units/serial-getty@.service.m4 ++++ b/units/serial-getty@.service.m4 +@@ -22,7 +22,7 @@ Before=getty.target + IgnoreOnIsolate=yes + + [Service] +-ExecStart=-/sbin/agetty --keep-baud 115200,38400,9600 %I $TERM ++ExecStart=-/sbin/getty -L 115200 %I $TERM + Type=idle + Restart=always + UtmpIdentifier=%I +-- +2.1.4 + diff --git a/meta/recipes-core/systemd/systemd/0002-shared-missing.h-fall-back-to-insecure-getenv.patch b/meta/recipes-core/systemd/systemd/0002-shared-missing.h-fall-back-to-insecure-getenv.patch new file mode 100644 index 0000000000..1cf7840976 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0002-shared-missing.h-fall-back-to-insecure-getenv.patch @@ -0,0 +1,25 @@ +From 03baade6db2cf83b44a157818ba827d725449bb0 Mon Sep 17 00:00:00 2001 +From: Emil Renner Berthing <systemd@esmil.dk> +Date: Thu, 18 Sep 2014 15:24:47 +0200 +Subject: [PATCH 02/11] shared/missing.h: fall back to insecure getenv + +--- + src/shared/missing.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/shared/missing.h b/src/shared/missing.h +index b33a70c..11cca04 100644 +--- a/src/shared/missing.h ++++ b/src/shared/missing.h +@@ -366,7 +366,7 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle + # ifdef HAVE___SECURE_GETENV + # define secure_getenv __secure_getenv + # else +-# error "neither secure_getenv nor __secure_getenv are available" ++# define secure_getenv getenv + # endif + #endif + +-- +2.1.4 + diff --git a/meta/recipes-core/systemd/systemd/0002-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch b/meta/recipes-core/systemd/systemd/0002-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch new file mode 100644 index 0000000000..c195437ba0 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0002-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch @@ -0,0 +1,86 @@ +Upstream-Status: Backport +Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca> + +From 31d05181e3a34c5c0ff6314d8eca1c3b4bb29423 Mon Sep 17 00:00:00 2001 +From: Hans-Peter Deifel <hpd@hpdeifel.de> +Date: Tue, 3 Mar 2015 00:35:08 +0100 +Subject: [PATCH 2/2] tmpfiles: quietly ignore ACLs on unsupported filesystems + +A warning is printed if ACLs cannot be retrieved for any reason other +than -ENOSYS. For -ENOSYS, debug log is printed. + +(cherry picked from commit d873e8778c92014c02a9122852758b436fa95c0e) +--- + src/tmpfiles/tmpfiles.c | 36 ++++++++++++++++++++---------------- + 1 file changed, 20 insertions(+), 16 deletions(-) + +diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c +index 88ba7e4..187997e 100644 +--- a/src/tmpfiles/tmpfiles.c ++++ b/src/tmpfiles/tmpfiles.c +@@ -704,6 +704,9 @@ static int path_set_acl(const char *path, acl_type_t type, acl_t acl, bool modif + int r; + _cleanup_(acl_free_charpp) char *t = NULL; + ++ /* Returns 0 for success, positive error if already warned, ++ * negative error otherwise. */ ++ + if (modify) { + r = acls_for_file(path, type, acl, &dup); + if (r < 0) +@@ -731,35 +734,36 @@ static int path_set_acl(const char *path, acl_type_t type, acl_t acl, bool modif + + r = acl_set_file(path, type, dup); + if (r < 0) +- return log_error_errno(-errno, +- "Setting %s ACL \"%s\" on %s failed: %m", +- type == ACL_TYPE_ACCESS ? "access" : "default", +- strna(t), path); ++ return -log_error_errno(errno, ++ "Setting %s ACL \"%s\" on %s failed: %m", ++ type == ACL_TYPE_ACCESS ? "access" : "default", ++ strna(t), path); ++ + return 0; + } + #endif + + static int path_set_acls(Item *item, const char *path) { ++ int r = 0; + #ifdef HAVE_ACL +- int r; +- + assert(item); + assert(path); + +- if (item->acl_access) { ++ if (item->acl_access) + r = path_set_acl(path, ACL_TYPE_ACCESS, item->acl_access, item->force); +- if (r < 0) +- return r; +- } + +- if (item->acl_default) { ++ if (r == 0 && item->acl_default) + r = path_set_acl(path, ACL_TYPE_DEFAULT, item->acl_default, item->force); +- if (r < 0) +- return r; +- } +-#endif + +- return 0; ++ if (r > 0) ++ return -r; /* already warned */ ++ else if (r == -ENOTSUP) { ++ log_debug_errno(r, "ACLs not supported by file system at %s", path); ++ return 0; ++ } else if (r < 0) ++ log_error_errno(r, "ACL operation on \"%s\" failed: %m", path); ++#endif ++ return r; + } + + static int write_one_file(Item *i, const char *path) { +-- +2.3.1 + diff --git a/meta/recipes-core/systemd/systemd/binfmt-install.patch b/meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch index c2d5099f24..c14cc6fdd6 100644 --- a/meta/recipes-core/systemd/systemd/binfmt-install.patch +++ b/meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -1,19 +1,33 @@ -Don't install dependency links at install time for the binfmt services, use -[Install] blocks so that they get created when the service is enabled like a -traditional service. +From 184a89caacfa00f07e7275bca592bd7dda1b541e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 20 Feb 2015 05:03:44 +0000 +Subject: [PATCH 03/11] binfmt: Don't install dependency links at install time + for the binfmt services -The [Install] blocks were rejected upstream as they don't have a way to "enable" -it on install without static symlinks which can't be disabled, only masked. We +use [Install] blocks so that they get created when the service is enabled +like a traditional service. + +The [Install] blocks were rejected upstream as they don't have a way to +"enable" +it on install without static symlinks which can't be disabled, only +masked. We however can do that in a postinst. Upstream-Status: Denied + Signed-off-by: Ross Burton <ross.burton@intel.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.am | 4 ---- + units/proc-sys-fs-binfmt_misc.automount | 3 +++ + units/systemd-binfmt.service.in | 5 +++++ + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 7933de6..78acb6f 100644 +index ba63f68..0fb3f9f 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -3133,10 +3133,6 @@ INSTALL_DIRS += \ +@@ -4838,10 +4838,6 @@ INSTALL_DIRS += \ $(prefix)/lib/binfmt.d \ $(sysconfdir)/binfmt.d @@ -36,21 +50,25 @@ index 6be3893..709adef 100644 +[Install] +WantedBy=sysinit.target diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in -index 02dfe77..86d3481 100644 +index 34a5d52..617462b 100644 --- a/units/systemd-binfmt.service.in +++ b/units/systemd-binfmt.service.in -@@ -11,6 +11,7 @@ Documentation=man:systemd-binfmt.service(8) man:binfmt.d(5) +@@ -11,6 +11,8 @@ Documentation=man:systemd-binfmt.service(8) man:binfmt.d(5) Documentation=https://www.kernel.org/doc/Documentation/binfmt_misc.txt DefaultDependencies=no Conflicts=shutdown.target +Wants=proc-sys-fs-binfmt_misc.automount - After=systemd-readahead-collect.service systemd-readahead-replay.service proc-sys-fs-binfmt_misc.automount ++ + After=proc-sys-fs-binfmt_misc.automount Before=sysinit.target shutdown.target ConditionPathIsReadWrite=/proc/sys/ -@@ -24,3 +25,6 @@ ConditionDirectoryNotEmpty=|/run/binfmt.d +@@ -24,3 +26,6 @@ ConditionDirectoryNotEmpty=|/run/binfmt.d Type=oneshot RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-binfmt + +[Install] +WantedBy=sysinit.target +-- +2.1.4 + diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch b/meta/recipes-core/systemd/systemd/0004-configure-Check-for-additional-features-that-uclibc-.patch index 4639532236..dddb7da690 100644 --- a/meta/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch +++ b/meta/recipes-core/systemd/systemd/0004-configure-Check-for-additional-features-that-uclibc-.patch @@ -1,11 +1,24 @@ +From 4e2e8dbf3f23ab7dca32286cc0f37bff6ac49e22 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 20 Feb 2015 05:05:45 +0000 +Subject: [PATCH 04/11] configure: Check for additional features that uclibc + doesnt support + +This helps in supporting uclibc which does not have all features that +glibc might have + Upstream-Status: Denied [no desire for uclibc support] + Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac 2014-03-15 17:53:51.756340454 -0700 -+++ git/configure.ac 2014-03-15 18:07:34.888355897 -0700 -@@ -78,6 +78,24 @@ +diff --git a/configure.ac b/configure.ac +index 9a2235b..a5b2e6e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -103,6 +103,24 @@ AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't s M4_DEFINES= @@ -30,3 +43,6 @@ Index: git/configure.ac # gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line m4_ifdef([GTK_DOC_CHECK], [ GTK_DOC_CHECK([1.18],[--flavour no-tmpl])], +-- +2.1.4 + diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch b/meta/recipes-core/systemd/systemd/0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch index 7170a38af3..85279d68c2 100644 --- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch +++ b/meta/recipes-core/systemd/systemd/0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch @@ -1,20 +1,29 @@ +From a7417c2e6950d55c22c1b0d15783898b8ff229ef Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 20 Feb 2015 05:10:37 +0000 +Subject: [PATCH 05/11] nspawn: Use execvpe only when libc supports it + Upstream-Status: Denied [no desire for uclibc support] + Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/nspawn/nspawn.c | 7 +++++++ + 1 file changed, 7 insertions(+) -Index: systemd-209/src/nspawn/nspawn.c -=================================================================== ---- systemd-209.orig/src/nspawn/nspawn.c 2014-02-19 15:03:09.000000000 -0800 -+++ systemd-209/src/nspawn/nspawn.c 2014-02-19 23:20:38.720628627 -0800 -@@ -91,6 +91,8 @@ - LINK_GUEST - } LinkJournal; +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c +index 0d8d199..b597edb 100644 +--- a/src/nspawn/nspawn.c ++++ b/src/nspawn/nspawn.c +@@ -129,6 +129,8 @@ typedef enum Volatile { + VOLATILE_STATE, + } Volatile; +#include "config.h" + static char *arg_directory = NULL; + static char *arg_template = NULL; static char *arg_user = NULL; - static sd_id128_t arg_uuid = {}; -@@ -2045,7 +2047,12 @@ +@@ -4257,7 +4259,12 @@ int main(int argc, char *argv[]) { a[0] = (char*) "/sbin/init"; execve(a[0], a, env_use); } else if (argc > optind) @@ -23,7 +32,10 @@ Index: systemd-209/src/nspawn/nspawn.c +#else + environ = env_use; + execvp(argv[optind], argv + optind); -+#endif /* HAVE_EXECVPE */ ++#endif /* HAVE_EXECVPE */ else { chdir(home ? home : "/root"); execle("/bin/bash", "-bash", NULL, env_use); +-- +2.1.4 + diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch b/meta/recipes-core/systemd/systemd/0006-journal-Use-posix-fallocate-only-if-available.patch index f8e19ce172..631dd77465 100644 --- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch +++ b/meta/recipes-core/systemd/systemd/0006-journal-Use-posix-fallocate-only-if-available.patch @@ -1,19 +1,24 @@ -Upstream-Status: Denied [no desire for uclibc support] +From 34a61b6c9eed3fad360066fb63132ebc7e0aaaa6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 20 Feb 2015 05:12:48 +0000 +Subject: [PATCH 06/11] journal: Use posix fallocate only if available + +Some architecture ports in uclibc did not support it in past -This patch is uclibc specific, thus not suitable for upstream. +Upstream-Status: Denied [no desire for uclibc support] Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- - src/journal/journal-file.c | 16 +++++++++++++++- - src/journal/journald-kmsg.c | 16 ++++++++++++++-- - 2 files changed, 29 insertions(+), 3 deletions(-) + src/journal/journal-file.c | 16 +++++++++++++++- + src/journal/journald-kmsg.c | 15 ++++++++++++++- + 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c -index f2f1f35..092f87b 100644 +index 2845e05..9431171 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c -@@ -38,6 +38,8 @@ +@@ -36,6 +36,8 @@ #include "compress.h" #include "fsprg.h" @@ -22,7 +27,7 @@ index f2f1f35..092f87b 100644 #define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem)) #define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem)) -@@ -314,7 +316,7 @@ static int journal_file_verify_header(JournalFile *f) { +@@ -354,7 +356,7 @@ static int journal_file_fstat(JournalFile *f) { static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) { uint64_t old_size, new_size; @@ -31,7 +36,7 @@ index f2f1f35..092f87b 100644 assert(f); -@@ -362,9 +364,21 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) +@@ -418,9 +420,21 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) /* Note that the glibc fallocate() fallback is very inefficient, hence we try to minimize the allocation area as we can. */ @@ -51,13 +56,13 @@ index f2f1f35..092f87b 100644 + +#endif /* HAVE_POSIX_FALLOCATE */ - if (fstat(f->fd, &f->last_stat) < 0) - return -errno; + f->header->arena_size = htole64(new_size - le64toh(f->header->header_size)); + diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c -index 12992e7..dc4fa93 100644 +index c4216c4..a998ed5 100644 --- a/src/journal/journald-kmsg.c +++ b/src/journal/journald-kmsg.c -@@ -437,6 +437,7 @@ fail: +@@ -436,6 +436,7 @@ fail: int server_open_kernel_seqnum(Server *s) { _cleanup_close_ int fd; uint64_t *p; @@ -65,28 +70,27 @@ index 12992e7..dc4fa93 100644 assert(s); -@@ -449,8 +450,19 @@ int server_open_kernel_seqnum(Server *s) { - log_error("Failed to open /run/systemd/journal/kernel-seqnum, ignoring: %m"); +@@ -449,7 +450,19 @@ int server_open_kernel_seqnum(Server *s) { return 0; } -- + - if (posix_fallocate(fd, 0, sizeof(uint64_t)) < 0) { +#ifdef HAVE_POSIX_FALLOCATE + r = posix_fallocate(fd, 0, sizeof(uint64_t)); +#else -+ /* Use good old method to write zeros into the journal file -+ perhaps very inefficient yet working. */ -+ char *buf = alloca(sizeof(uint64_t)); -+ off_t oldpos = lseek(fd, 0, SEEK_CUR); -+ bzero(buf, sizeof(uint64_t)); -+ lseek(fd, 0, SEEK_SET); -+ r = write(fd, buf, sizeof(uint64_t)); -+ lseek(fd, oldpos, SEEK_SET); ++ /* Use good old method to write zeros into the journal file ++ perhaps very inefficient yet working. */ ++ char *buf = alloca(sizeof(uint64_t)); ++ off_t oldpos = lseek(fd, 0, SEEK_CUR); ++ bzero(buf, sizeof(uint64_t)); ++ lseek(fd, 0, SEEK_SET); ++ r = write(fd, buf, sizeof(uint64_t)); ++ lseek(fd, oldpos, SEEK_SET); +#endif /* HAVE_POSIX_FALLOCATE */ -+ if (r < 0) { - log_error("Failed to allocate sequential number file, ignoring: %m"); ++ if (r < 0) { + log_error_errno(errno, "Failed to allocate sequential number file, ignoring: %m"); return 0; } -- -1.7.9.5 +2.1.4 diff --git a/meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch b/meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch new file mode 100644 index 0000000000..29c20c010f --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch @@ -0,0 +1,42 @@ +From f771407d3e0288ca0c06a894194d3ddad69b9a8e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 20 Feb 2015 05:17:05 +0000 +Subject: [PATCH 07/11] util: Use mkostemp only if libc supports it + +Upstream-Status: Denied [no desire for uclibc support] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/shared/util.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/shared/util.c b/src/shared/util.c +index dc65280..72f4665 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -97,6 +97,8 @@ + #include "def.h" + #include "sparse-endian.h" + ++#include "config.h" ++ + int saved_argc = 0; + char **saved_argv = NULL; + +@@ -6682,7 +6684,13 @@ int mkostemp_safe(char *pattern, int flags) { + + u = umask(077); + ++#ifdef HAVE_MKOSTEMP + fd = mkostemp(pattern, flags); ++#else ++ fd = mkstemp(pattern); ++ if (fd >= 0) fcntl(fd, F_SETFD, flags); ++#endif /* HAVE_MKOSTEMP */ ++ + if (fd < 0) + return -errno; + +-- +2.1.4 + diff --git a/meta/recipes-core/systemd/systemd/uclibc-get-physmem.patch b/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch index 39dfc9e2ea..5297625c93 100644 --- a/meta/recipes-core/systemd/systemd/uclibc-get-physmem.patch +++ b/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch @@ -1,18 +1,24 @@ -bypass unimplemented _SC_PHYS_PAGES system configuration API in uclibc +From b45ea3bfd6635744c8a6b74d0ac701b44bb1d294 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 20 Feb 2015 05:19:37 +0000 +Subject: [PATCH 08/11] util: bypass unimplemented _SC_PHYS_PAGES system + configuration API on uclibc Upstream-Status: Inappropriate [uclibc-specific] Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/shared/util.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) -Index: git/src/shared/util.c -=================================================================== ---- git.orig/src/shared/util.c 2014-03-15 18:09:34.796358146 -0700 -+++ git/src/shared/util.c 2014-03-15 20:16:33.836501084 -0700 -@@ -6332,11 +6332,24 @@ - +diff --git a/src/shared/util.c b/src/shared/util.c +index 72f4665..cbbe3b1 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -6793,10 +6793,25 @@ uint64_t physical_memory(void) { /* We return this as uint64_t in case we are running as 32bit * process on a 64bit kernel with huge amounts of memory */ -- + +#ifdef __UCLIBC__ + char line[128]; + FILE *f = fopen("/proc/meminfo", "r"); @@ -29,9 +35,12 @@ Index: git/src/shared/util.c +#else mem = sysconf(_SC_PHYS_PAGES); assert(mem > 0); -- + return (uint64_t) mem * (uint64_t) page_size(); +#endif } - char* mount_test_option(const char *haystack, const char *needle) { + void hexdump(FILE *f, const void *p, size_t s) { +-- +2.1.4 + diff --git a/meta/recipes-core/systemd/systemd/0001-add-support-for-executing-scripts-under-etc-rcS.d.patch b/meta/recipes-core/systemd/systemd/0009-sysv-generator-add-support-for-executing-scripts-und.patch index 9aa07c1b10..9ea3e83e52 100644 --- a/meta/recipes-core/systemd/systemd/0001-add-support-for-executing-scripts-under-etc-rcS.d.patch +++ b/meta/recipes-core/systemd/systemd/0009-sysv-generator-add-support-for-executing-scripts-und.patch @@ -1,20 +1,25 @@ -Upstream-Status: Inappropriate [OE specific] - -Subject: add support for executing scripts under /etc/rcS.d/ +From 8791b5b3934c55694872b6915a67340683ead91b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 20 Feb 2015 05:22:52 +0000 +Subject: [PATCH 09/11] sysv-generator: add support for executing scripts under + /etc/rcS.d/ To be compatible, all services translated from scripts under /etc/rcS.d would run before services translated from scripts under /etc/rcN.d. +Upstream-Status: Inappropriate [OE specific] + Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> --- src/sysv-generator/sysv-generator.c | 50 ++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index 9a869ba..10c55c0 100644 +index bd67f32..6756cc6 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c -@@ -43,7 +43,8 @@ +@@ -42,7 +42,8 @@ typedef enum RunlevelType { RUNLEVEL_UP, @@ -24,9 +29,9 @@ index 9a869ba..10c55c0 100644 } RunlevelType; static const struct { -@@ -58,6 +59,9 @@ static const struct { - { "rc4.d", SPECIAL_RUNLEVEL4_TARGET, RUNLEVEL_UP }, - { "rc5.d", SPECIAL_RUNLEVEL5_TARGET, RUNLEVEL_UP }, +@@ -57,6 +58,9 @@ static const struct { + { "rc4.d", SPECIAL_MULTI_USER_TARGET, RUNLEVEL_UP }, + { "rc5.d", SPECIAL_GRAPHICAL_TARGET, RUNLEVEL_UP }, + /* Debian style rcS.d, also adopted by OE */ + { "rcS.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT}, @@ -34,7 +39,7 @@ index 9a869ba..10c55c0 100644 /* Standard SysV runlevels for shutdown */ { "rc0.d", SPECIAL_POWEROFF_TARGET, RUNLEVEL_DOWN }, { "rc6.d", SPECIAL_REBOOT_TARGET, RUNLEVEL_DOWN } -@@ -66,7 +70,7 @@ static const struct { +@@ -65,7 +69,7 @@ static const struct { directories in this order, and we want to make sure that sysv_start_priority is known when we first load the unit. And that value we only know from S links. Hence @@ -43,7 +48,7 @@ index 9a869ba..10c55c0 100644 }; typedef struct SysvStub { -@@ -82,6 +86,8 @@ typedef struct SysvStub { +@@ -81,6 +85,8 @@ typedef struct SysvStub { char **conflicts; bool has_lsb; bool reload; @@ -52,7 +57,7 @@ index 9a869ba..10c55c0 100644 } SysvStub; const char *arg_dest = "/tmp"; -@@ -156,6 +162,9 @@ static int generate_unit_file(SysvStub *s) { +@@ -183,6 +189,9 @@ static int generate_unit_file(SysvStub *s) { "Description=%s\n", s->path, s->description); @@ -62,7 +67,7 @@ index 9a869ba..10c55c0 100644 if (!isempty(before)) fprintf(f, "Before=%s\n", before); if (!isempty(after)) -@@ -661,18 +670,30 @@ static int fix_order(SysvStub *s, Hashmap *all_services) { +@@ -704,18 +713,30 @@ static int fix_order(SysvStub *s, Hashmap *all_services) { if (s->has_lsb && other->has_lsb) continue; @@ -101,7 +106,7 @@ index 9a869ba..10c55c0 100644 /* FIXME: Maybe we should compare the name here lexicographically? */ } -@@ -725,6 +746,8 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) { +@@ -778,6 +799,8 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) { return log_oom(); service->sysv_start_priority = -1; @@ -110,7 +115,7 @@ index 9a869ba..10c55c0 100644 service->name = name; service->path = fpath; -@@ -810,9 +833,11 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) { +@@ -864,9 +887,11 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) { if (de->d_name[0] == 'S') { @@ -122,8 +127,8 @@ index 9a869ba..10c55c0 100644 + service->from_rcsd = (rcnd_table[i].type == RUNLEVEL_SYSINIT)?true:false; } - r = set_ensure_allocated(&runlevel_services[i], -@@ -825,7 +850,8 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) { + r = set_ensure_allocated(&runlevel_services[i], NULL); +@@ -878,7 +903,8 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) { goto finish; } else if (de->d_name[0] == 'K' && @@ -131,8 +136,8 @@ index 9a869ba..10c55c0 100644 + (rcnd_table[i].type == RUNLEVEL_DOWN || + rcnd_table[i].type == RUNLEVEL_SYSINIT)) { - r = set_ensure_allocated(&shutdown_services, - trivial_hash_func, trivial_compare_func); + r = set_ensure_allocated(&shutdown_services, NULL); + if (r < 0) -- -1.9.1 +2.1.4 diff --git a/meta/recipes-core/systemd/systemd/0001-Make-root-s-home-directory-configurable.patch b/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch index c5ad29174c..41b903951e 100644 --- a/meta/recipes-core/systemd/systemd/0001-Make-root-s-home-directory-configurable.patch +++ b/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch @@ -1,7 +1,7 @@ -From 4dc8dee0435bb63cbe474004b0a8df0363fe94dd Mon Sep 17 00:00:00 2001 -From: Dan McGregor <dan.mcgregor@usask.ca> -Date: Fri, 5 Sep 2014 06:28:58 -0600 -Subject: [PATCH] Make root's home directory configurable. +From 3dc731c1d270e2e143de621db9bd898299fd849d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 20 Feb 2015 05:24:49 +0000 +Subject: [PATCH 10/11] Make root's home directory configurable OpenEmbedded has a configurable home directory for root. Allow systemd to be built using its idea of what root's home directory @@ -10,6 +10,7 @@ should be. Upstream-Status: Pending Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca> +Signed-off-by: Khem Raj <raj.khem@gmail.com> --- Makefile.am | 2 ++ configure.ac | 7 +++++++ @@ -18,14 +19,14 @@ Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca> src/shared/util.c | 4 ++-- units/console-shell.service.m4.in | 4 ++-- units/emergency.service.in | 4 ++-- - units/rescue.service.m4.in | 4 ++-- + units/rescue.service.in | 4 ++-- 8 files changed, 20 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 4028112..5d18f5c 100644 +index 0fb3f9f..4623963 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -191,6 +191,7 @@ AM_CPPFLAGS = \ +@@ -199,6 +199,7 @@ AM_CPPFLAGS = \ -DKEXEC=\"$(KEXEC)\" \ -DLIBDIR=\"$(libdir)\" \ -DROOTLIBDIR=\"$(rootlibdir)\" \ @@ -33,7 +34,7 @@ index 4028112..5d18f5c 100644 -DTEST_DIR=\"$(abs_top_srcdir)/test\" \ -I $(top_srcdir)/src \ -I $(top_builddir)/src/shared \ -@@ -5584,6 +5585,7 @@ EXTRA_DIST += \ +@@ -6342,6 +6343,7 @@ EXTRA_DIST += \ substitutions = \ '|rootlibexecdir=$(rootlibexecdir)|' \ '|rootbindir=$(rootbindir)|' \ @@ -42,13 +43,13 @@ index 4028112..5d18f5c 100644 '|SYSTEMCTL=$(rootbindir)/systemctl|' \ '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \ diff --git a/configure.ac b/configure.ac -index 18b7198..365bc73 100644 +index a5b2e6e..55bb7d8 100644 --- a/configure.ac +++ b/configure.ac -@@ -1272,6 +1272,11 @@ AC_ARG_WITH([rootlibdir], +@@ -1428,6 +1428,11 @@ AC_ARG_WITH([rootlibdir], [], [with_rootlibdir=${libdir}]) - + +AC_ARG_WITH([roothomedir], + AS_HELP_STRING([--with-roothomedir=DIR], [Home directory for the root user]), + [], @@ -57,15 +58,15 @@ index 18b7198..365bc73 100644 AC_ARG_WITH([pamlibdir], AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]), [], -@@ -1317,6 +1322,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir]) +@@ -1518,6 +1523,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir]) AC_SUBST([pamconfdir], [$with_pamconfdir]) AC_SUBST([rootprefix], [$with_rootprefix]) AC_SUBST([rootlibdir], [$with_rootlibdir]) +AC_SUBST([roothomedir], [$with_roothomedir]) - + AC_CONFIG_FILES([ Makefile po/Makefile.in -@@ -1400,6 +1406,7 @@ AC_MSG_RESULT([ +@@ -1617,6 +1623,7 @@ AC_MSG_RESULT([ include_prefix: ${INCLUDE_PREFIX} lib dir: ${libdir} rootlib dir: ${with_rootlibdir} @@ -74,34 +75,34 @@ index 18b7198..365bc73 100644 SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} Build Python: ${PYTHON} diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c -index 62599d0..852d34c 100644 +index 97135db..14d12f1 100644 --- a/src/core/unit-printf.c +++ b/src/core/unit-printf.c @@ -259,7 +259,7 @@ static int specifier_user_home(char specifier, void *data, void *userdata, char * best of it if we can, but fail if we can't */ - + if (!c->user || streq(c->user, "root") || streq(c->user, "0")) - n = strdup("/root"); + n = strdup(ROOTHOMEDIR); else return -ENOTSUP; - + diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index d01da45..3e876d5 100644 +index b597edb..0b32673 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -3312,7 +3312,7 @@ int main(int argc, char *argv[]) { +@@ -4192,7 +4192,7 @@ int main(int argc, char *argv[]) { if (r < 0) _exit(EXIT_FAILURE); - + - if ((asprintf((char**)(envp + n_env++), "HOME=%s", home ? home: "/root") < 0) || + if ((asprintf((char**)(envp + n_env++), "HOME=%s", home ? home: ROOTHOMEDIR) < 0) || (asprintf((char**)(envp + n_env++), "USER=%s", arg_user ? arg_user : "root") < 0) || (asprintf((char**)(envp + n_env++), "LOGNAME=%s", arg_user ? arg_user : "root") < 0)) { log_oom(); -@@ -3402,7 +3402,7 @@ int main(int argc, char *argv[]) { - } else if (argc > optind) - execvpe(argv[optind], argv + optind, env_use); +@@ -4266,7 +4266,7 @@ int main(int argc, char *argv[]) { + execvp(argv[optind], argv + optind); + #endif /* HAVE_EXECVPE */ else { - chdir(home ? home : "/root"); + chdir(home ? home : ROOTHOMEDIR); @@ -109,19 +110,19 @@ index d01da45..3e876d5 100644 execle("/bin/sh", "-sh", NULL, env_use); } diff --git a/src/shared/util.c b/src/shared/util.c -index 85a570a..aef6033 100644 +index cbbe3b1..a0e3cc5 100644 --- a/src/shared/util.c +++ b/src/shared/util.c -@@ -4377,7 +4377,7 @@ int get_user_creds( +@@ -4609,7 +4609,7 @@ int get_user_creds( *gid = 0; - + if (home) - *home = "/root"; + *home = ROOTHOMEDIR; - + if (shell) *shell = "/bin/sh"; -@@ -5363,7 +5363,7 @@ int get_home_dir(char **_h) { +@@ -5611,7 +5611,7 @@ int get_home_dir(char **_h) { /* Hardcode home directory for root to avoid NSS */ u = getuid(); if (u == 0) { @@ -129,52 +130,52 @@ index 85a570a..aef6033 100644 + h = strdup(ROOTHOMEDIR); if (!h) return -ENOMEM; - + diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in -index 3f4904a..e2af652 100644 +index 5c80722..efde5f0 100644 --- a/units/console-shell.service.m4.in +++ b/units/console-shell.service.m4.in @@ -15,8 +15,8 @@ After=rc-local.service Before=getty.target - + [Service] -Environment=HOME=/root -WorkingDirectory=/root +Environment=HOME=@roothomedir@ +WorkingDirectory=@roothomedir@ - ExecStart=-/sbin/sulogin + ExecStart=-@SULOGIN@ ExecStopPost=-@SYSTEMCTL@ poweroff Type=idle diff --git a/units/emergency.service.in b/units/emergency.service.in -index 91fc1bb..659547e 100644 +index 2695d7b..7f47b73 100644 --- a/units/emergency.service.in +++ b/units/emergency.service.in -@@ -13,8 +13,8 @@ Conflicts=shutdown.target +@@ -14,8 +14,8 @@ Conflicts=rescue.service Before=shutdown.target - + [Service] -Environment=HOME=/root -WorkingDirectory=/root +Environment=HOME=@roothomedir@ +WorkingDirectory=@roothomedir@ ExecStartPre=-/bin/plymouth quit - ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" to try again\\nto boot into default mode.' - ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default" -diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in -index ef54369..7aad86f 100644 ---- a/units/rescue.service.m4.in -+++ b/units/rescue.service.m4.in + ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\ntry again to boot into default mode.' + ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --fail --no-block default" +diff --git a/units/rescue.service.in b/units/rescue.service.in +index de73fee..47f3593 100644 +--- a/units/rescue.service.in ++++ b/units/rescue.service.in @@ -14,8 +14,8 @@ After=sysinit.target plymouth-start.service Before=shutdown.target - + [Service] -Environment=HOME=/root -WorkingDirectory=/root +Environment=HOME=@roothomedir@ +WorkingDirectory=@roothomedir@ ExecStartPre=-/bin/plymouth quit - ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.' - ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default" + ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\nboot into default mode.' + ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --fail --no-block default" -- -1.9.3 +2.1.4 diff --git a/meta/recipes-core/systemd/systemd/0001-systemd-user-avoid-using-system-auth.patch b/meta/recipes-core/systemd/systemd/0011-systemd-user-avoid-using-system-auth.patch index fbde13f077..e562bca100 100644 --- a/meta/recipes-core/systemd/systemd/0001-systemd-user-avoid-using-system-auth.patch +++ b/meta/recipes-core/systemd/systemd/0011-systemd-user-avoid-using-system-auth.patch @@ -1,11 +1,15 @@ -Upstream-Status: Inappropriate [oe specific] - -Subject: systemd-user: avoid using system-auth +From 7e202f71785bf5a67c8a4f6b58d3585608fbfdc4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 20 Feb 2015 05:26:25 +0000 +Subject: [PATCH 11/11] systemd-user: avoid using system-auth In OE, we don't provide system-auth, instead, we use common-* files. So modify systemd-user file to use common-* files. +Upstream-Status: Inappropriate [oe specific] + Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> --- src/login/systemd-user | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -17,10 +21,11 @@ index 8112d74..99635af 100644 @@ -2,5 +2,5 @@ # # Used by systemd --user instances. - + -account include system-auth -session include system-auth +account include common-account +session include common-session --- -1.9.1 +-- +2.1.4 + diff --git a/meta/recipes-core/systemd/systemd/0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch b/meta/recipes-core/systemd/systemd/0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch new file mode 100644 index 0000000000..ccd675798c --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch @@ -0,0 +1,185 @@ +From 2abf886295b979bce6d3f0a240f6f5ecfd70ba37 Mon Sep 17 00:00:00 2001 +From: Randy Witt <randy.e.witt@linux.intel.com> +Date: Wed, 4 Mar 2015 18:32:40 -0800 +Subject: [PATCH] tmpfiles.c: Honor ordering within files as the docs say. + +Previously, globs would always get processed first followed by any other +items in arbitrary order. This is contrary to the documentation which +states "Otherwise, the files/directories are processed in the order they +are listed." + +To fix this, remove the separate "globs" hashmap, and instead use only one +marking each entry as a glob or not. There should be little overhead +from doing this, considering the only time nested processing will occur +is for processing of globs which are not of type "X". + +Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> +--- + src/tmpfiles/tmpfiles.c | 53 ++++++++++++++++++++++--------------------------- + 1 file changed, 24 insertions(+), 29 deletions(-) + +diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c +index 917bb3c..0b6d226 100644 +--- a/src/tmpfiles/tmpfiles.c ++++ b/src/tmpfiles/tmpfiles.c +@@ -116,6 +116,7 @@ typedef struct Item { + bool force:1; + + bool done:1; ++ bool glob:1; + } Item; + + typedef struct ItemArray { +@@ -137,7 +138,7 @@ static const char conf_file_dirs[] = CONF_DIRS_NULSTR("tmpfiles"); + + #define MAX_DEPTH 256 + +-static Hashmap *items = NULL, *globs = NULL; ++static OrderedHashmap *items = NULL; + static Set *unix_sockets = NULL; + + static bool needs_glob(ItemType t) { +@@ -176,17 +177,17 @@ static bool takes_ownership(ItemType t) { + RECURSIVE_REMOVE_PATH); + } + +-static struct Item* find_glob(Hashmap *h, const char *match) { ++static struct Item* find_glob(OrderedHashmap *h, const char *match) { + ItemArray *j; + Iterator i; + +- HASHMAP_FOREACH(j, h, i) { ++ ORDERED_HASHMAP_FOREACH(j, h, i) { + unsigned n; + + for (n = 0; n < j->count; n++) { + Item *item = j->items + n; + +- if (fnmatch(item->path, match, FNM_PATHNAME|FNM_PERIOD) == 0) ++ if (item->glob && fnmatch(item->path, match, FNM_PATHNAME|FNM_PERIOD) == 0) + return item; + } + } +@@ -391,12 +392,12 @@ static int dir_cleanup( + } + + /* Is there an item configured for this path? */ +- if (hashmap_get(items, sub_path)) { ++ if (ordered_hashmap_get(items, sub_path)) { + log_debug("Ignoring \"%s\": a separate entry exists.", sub_path); + continue; + } + +- if (find_glob(globs, sub_path)) { ++ if (find_glob(items, sub_path)) { + log_debug("Ignoring \"%s\": a separate glob exists.", sub_path); + continue; + } +@@ -1378,7 +1379,7 @@ static int process_item(Item *i) { + PATH_FOREACH_PREFIX(prefix, i->path) { + ItemArray *j; + +- j = hashmap_get(items, prefix); ++ j = ordered_hashmap_get(items, prefix); + if (j) { + int s; + +@@ -1505,7 +1506,6 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { + _cleanup_free_ char *action = NULL, *mode = NULL, *user = NULL, *group = NULL, *age = NULL, *path = NULL; + _cleanup_(item_free_contents) Item i = {}; + ItemArray *existing; +- Hashmap *h; + int r, c = -1, pos; + bool force = false, boot = false; + +@@ -1739,9 +1739,9 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { + i.age_set = true; + } + +- h = needs_glob(i.type) ? globs : items; ++ i.glob = needs_glob(i.type); + +- existing = hashmap_get(h, i.path); ++ existing = ordered_hashmap_get(items, i.path); + if (existing) { + unsigned n; + +@@ -1752,7 +1752,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { + } + } else { + existing = new0(ItemArray, 1); +- r = hashmap_put(h, i.path, existing); ++ r = ordered_hashmap_put(items, i.path, existing); + if (r < 0) + return log_oom(); + } +@@ -1911,14 +1911,20 @@ static int read_config_file(const char *fn, bool ignore_enoent) { + } + + /* we have to determine age parameter for each entry of type X */ +- HASHMAP_FOREACH(i, globs, iterator) { ++ ORDERED_HASHMAP_FOREACH(i, items, iterator) { + Iterator iter; + Item *j, *candidate_item = NULL; ++ int number = 0; + ++ if (!i->glob) ++ continue; + if (i->type != IGNORE_DIRECTORY_PATH) + continue; + +- HASHMAP_FOREACH(j, items, iter) { ++ ORDERED_HASHMAP_FOREACH(j, items, iter) { ++ number++; ++ if (j == i) ++ continue; + if (j->type != CREATE_DIRECTORY && j->type != TRUNCATE_DIRECTORY && j->type != CREATE_SUBVOLUME) + continue; + +@@ -1964,10 +1970,9 @@ int main(int argc, char *argv[]) { + + mac_selinux_init(NULL); + +- items = hashmap_new(&string_hash_ops); +- globs = hashmap_new(&string_hash_ops); ++ items = ordered_hashmap_new(&string_hash_ops); + +- if (!items || !globs) { ++ if (!items) { + r = log_oom(); + goto finish; + } +@@ -2000,27 +2005,17 @@ int main(int argc, char *argv[]) { + } + } + +- HASHMAP_FOREACH(a, globs, iterator) { +- k = process_item_array(a); +- if (k < 0 && r == 0) +- r = k; +- } +- +- HASHMAP_FOREACH(a, items, iterator) { ++ ORDERED_HASHMAP_FOREACH(a, items, iterator) { + k = process_item_array(a); + if (k < 0 && r == 0) + r = k; + } + + finish: +- while ((a = hashmap_steal_first(items))) +- item_array_free(a); +- +- while ((a = hashmap_steal_first(globs))) ++ while ((a = ordered_hashmap_steal_first(items))) + item_array_free(a); + +- hashmap_free(items); +- hashmap_free(globs); ++ ordered_hashmap_free(items); + + free(arg_include_prefixes); + free(arg_exclude_prefixes); +-- +1.9.3 + diff --git a/meta/recipes-core/systemd/systemd/0013-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch b/meta/recipes-core/systemd/systemd/0013-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch new file mode 100644 index 0000000000..a49d626824 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0013-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch @@ -0,0 +1,37 @@ +From 65eae3b76243d2dfd869f8c43b787575f7b4b994 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org> +Date: Sun, 1 Mar 2015 21:13:10 -0300 +Subject: [PATCH] journal: fix Inappropriate ioctl for device on ext4 + +Logs constantly show + +systemd-journald[395]: Failed to set file attributes: Inappropriate ioctl for device + +This is because ext4 does not support FS_NOCOW_FL. + +[zj: fold into one conditional as suggested on the ML and + fix (preexisting) r/errno confusion in error message.] + +Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> +--- + src/journal/journal-file.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c +index 9c9a548..0e33a0f 100644 +--- a/src/journal/journal-file.c ++++ b/src/journal/journal-file.c +@@ -2609,8 +2609,8 @@ int journal_file_open( + * shouldn't be too bad, given that we do our own + * checksumming). */ + r = chattr_fd(f->fd, true, FS_NOCOW_FL); +- if (r < 0) +- log_warning_errno(errno, "Failed to set file attributes: %m"); ++ if (r < 0 && r != -ENOTTY) ++ log_warning_errno(r, "Failed to set file attributes: %m"); + + /* Let's attach the creation time to the journal file, + * so that the vacuuming code knows the age of this +-- +1.9.3 + diff --git a/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch b/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch new file mode 100644 index 0000000000..fe2ba5328d --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch @@ -0,0 +1,28 @@ +From 4f0a722489154da99e7f6b3051afde984eed2f74 Mon Sep 17 00:00:00 2001 +From: Jonathan Liu <net147@gmail.com> +Date: Thu, 19 Mar 2015 15:01:29 +1100 +Subject: [PATCH] Revert "rules: remove firmware loading rules" + +This reverts commit 70e7d754ddb356fb1a2942b262f8cee9650e2a19. +Userspace firmware loading support is needed for Linux < 3.7. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Jonathan Liu <net147@gmail.com> +--- + rules/50-firmware.rules | 3 +++ + 1 file changed, 3 insertions(+) + create mode 100644 rules/50-firmware.rules + +diff --git a/rules/50-firmware.rules b/rules/50-firmware.rules +new file mode 100644 +index 0000000..f0ae684 +--- /dev/null ++++ b/rules/50-firmware.rules +@@ -0,0 +1,3 @@ ++# do not edit this file, it will be overwritten on update ++ ++SUBSYSTEM=="firmware", ACTION=="add", RUN{builtin}="firmware" +-- +2.3.3 + diff --git a/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch b/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch new file mode 100644 index 0000000000..3e3aa278bd --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch @@ -0,0 +1,367 @@ +From 7f074def4e32045353ba4336d703e17b8de7ec4e Mon Sep 17 00:00:00 2001 +From: Jonathan Liu <net147@gmail.com> +Date: Thu, 19 Mar 2015 15:01:33 +1100 +Subject: [PATCH] Revert "udev: remove userspace firmware loading support" + +This reverts commit be2ea723b1d023b3d385d3b791ee4607cbfb20ca. +Userspace firmware loading support is needed for Linux < 3.7. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Jonathan Liu <net147@gmail.com> +--- + Makefile.am | 12 +++ + README | 9 ++- + TODO | 1 + + configure.ac | 20 +++++ + src/udev/udev-builtin-firmware.c | 154 +++++++++++++++++++++++++++++++++++++++ + src/udev/udev-builtin.c | 3 + + src/udev/udev.h | 6 ++ + src/udev/udevd.c | 13 ++++ + 8 files changed, 214 insertions(+), 4 deletions(-) + create mode 100644 src/udev/udev-builtin-firmware.c + +diff --git a/Makefile.am b/Makefile.am +index bf04d31..9394700 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3678,6 +3678,18 @@ libudev_core_la_LIBADD = \ + $(BLKID_LIBS) \ + $(KMOD_LIBS) + ++libudev_core_la_CPPFLAGS = \ ++ $(AM_CPPFLAGS) \ ++ -DFIRMWARE_PATH="$(FIRMWARE_PATH)" ++ ++if ENABLE_FIRMWARE ++libudev_core_la_SOURCES += \ ++ src/udev/udev-builtin-firmware.c ++ ++dist_udevrules_DATA += \ ++ rules/50-firmware.rules ++endif ++ + if HAVE_KMOD + libudev_core_la_SOURCES += \ + src/udev/udev-builtin-kmod.c +diff --git a/README b/README +index c722092..db382d2 100644 +--- a/README ++++ b/README +@@ -36,7 +36,8 @@ LICENSE: + - except src/udev/* which is (currently still) GPLv2, GPLv2+ + + REQUIREMENTS: +- Linux kernel >= 3.7 ++ Linux kernel >= 3.0 ++ Linux kernel >= 3.3 for loop device partition support features with nspawn + Linux kernel >= 3.8 for Smack support + + Kernel Config Options: +@@ -51,14 +52,14 @@ REQUIREMENTS: + CONFIG_PROC_FS + CONFIG_FHANDLE (libudev, mount and bind mount handling) + +- udev will fail to work with the legacy sysfs layout: ++ Udev will fail to work with the legacy layout: + CONFIG_SYSFS_DEPRECATED=n + + Legacy hotplug slows down the system and confuses udev: + CONFIG_UEVENT_HELPER_PATH="" + +- Userspace firmware loading is not supported and should +- be disabled in the kernel: ++ Userspace firmware loading is deprecated, will go away, and ++ sometimes causes problems: + CONFIG_FW_LOADER_USER_HELPER=n + + Some udev rules and virtualization detection relies on it: +diff --git a/TODO b/TODO +index 255a4f2..407bdd0 100644 +--- a/TODO ++++ b/TODO +@@ -727,6 +727,7 @@ Features: + * ExecOnFailure=/usr/bin/foo + + * udev: ++ - remove src/udev/udev-builtin-firmware.c (CONFIG_FW_LOADER_USER_HELPER=n) + - move to LGPL + - kill scsi_id + - add trigger --subsystem-match=usb/usb_device device +diff --git a/configure.ac b/configure.ac +index 97a29d6..13b80ce 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1245,6 +1245,25 @@ fi + AM_CONDITIONAL(HAVE_MYHOSTNAME, [test "$have_myhostname" = "yes"]) + + # ------------------------------------------------------------------------------ ++AC_ARG_WITH(firmware-path, ++ AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]], ++ [Firmware search path (default="")]), ++ [], [with_firmware_path=""]) ++OLD_IFS=$IFS ++IFS=: ++for i in $with_firmware_path; do ++ if test "x${FIRMWARE_PATH}" = "x"; then ++ FIRMWARE_PATH="\\\"${i}/\\\"" ++ else ++ FIRMWARE_PATH="${FIRMWARE_PATH}, \\\"${i}/\\\"" ++ fi ++done ++IFS=$OLD_IFS ++AC_SUBST(FIRMWARE_PATH) ++AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is available]) ]) ++AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"]) ++ ++# ------------------------------------------------------------------------------ + AC_ARG_ENABLE([gudev], + AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support @<:@default=enabled@:>@]), + [], [enable_gudev=yes]) +@@ -1533,6 +1552,7 @@ AC_MSG_RESULT([ + Build Python: ${PYTHON} + Installation Python: ${PYTHON_BINARY} + sphinx binary: ${SPHINX_BUILD} ++ firmware path: ${FIRMWARE_PATH} + PAM modules dir: ${with_pamlibdir} + PAM configuration dir: ${with_pamconfdir} + D-Bus policy dir: ${with_dbuspolicydir} +diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c +new file mode 100644 +index 0000000..bd8c2fb +--- /dev/null ++++ b/src/udev/udev-builtin-firmware.c +@@ -0,0 +1,154 @@ ++/* ++ * firmware - Kernel firmware loader ++ * ++ * Copyright (C) 2009 Piter Punk <piterpunk@slackware.com> ++ * Copyright (C) 2009-2011 Kay Sievers <kay@vrfy.org> ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details:* ++ */ ++ ++#include <unistd.h> ++#include <stdlib.h> ++#include <string.h> ++#include <stdio.h> ++#include <getopt.h> ++#include <errno.h> ++#include <stdbool.h> ++#include <sys/utsname.h> ++#include <sys/stat.h> ++ ++#include "udev.h" ++ ++static bool set_loading(struct udev *udev, char *loadpath, const char *state) { ++ FILE *ldfile; ++ ++ ldfile = fopen(loadpath, "we"); ++ if (ldfile == NULL) { ++ log_error("error: can not open '%s'", loadpath); ++ return false; ++ }; ++ fprintf(ldfile, "%s\n", state); ++ fclose(ldfile); ++ return true; ++} ++ ++static bool copy_firmware(struct udev *udev, const char *source, const char *target, size_t size) { ++ char *buf; ++ FILE *fsource = NULL, *ftarget = NULL; ++ bool ret = false; ++ ++ buf = malloc(size); ++ if (buf == NULL) { ++ log_error("No memory available to load firmware file"); ++ return false; ++ } ++ ++ log_debug("writing '%s' (%zi) to '%s'", source, size, target); ++ ++ fsource = fopen(source, "re"); ++ if (fsource == NULL) ++ goto exit; ++ ftarget = fopen(target, "we"); ++ if (ftarget == NULL) ++ goto exit; ++ if (fread(buf, size, 1, fsource) != 1) ++ goto exit; ++ if (fwrite(buf, size, 1, ftarget) == 1) ++ ret = true; ++exit: ++ if (ftarget != NULL) ++ fclose(ftarget); ++ if (fsource != NULL) ++ fclose(fsource); ++ free(buf); ++ return ret; ++} ++ ++static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], bool test) { ++ struct udev *udev = udev_device_get_udev(dev); ++ static const char *searchpath[] = { FIRMWARE_PATH }; ++ char loadpath[UTIL_PATH_SIZE]; ++ char datapath[UTIL_PATH_SIZE]; ++ char fwpath[UTIL_PATH_SIZE]; ++ const char *firmware; ++ FILE *fwfile = NULL; ++ struct utsname kernel; ++ struct stat statbuf; ++ unsigned int i; ++ int rc = EXIT_SUCCESS; ++ ++ firmware = udev_device_get_property_value(dev, "FIRMWARE"); ++ if (firmware == NULL) { ++ log_error("firmware parameter missing"); ++ rc = EXIT_FAILURE; ++ goto exit; ++ } ++ ++ /* lookup firmware file */ ++ uname(&kernel); ++ for (i = 0; i < ELEMENTSOF(searchpath); i++) { ++ strscpyl(fwpath, sizeof(fwpath), searchpath[i], kernel.release, "/", firmware, NULL); ++ fwfile = fopen(fwpath, "re"); ++ if (fwfile != NULL) ++ break; ++ ++ strscpyl(fwpath, sizeof(fwpath), searchpath[i], firmware, NULL); ++ fwfile = fopen(fwpath, "re"); ++ if (fwfile != NULL) ++ break; ++ } ++ ++ strscpyl(loadpath, sizeof(loadpath), udev_device_get_syspath(dev), "/loading", NULL); ++ ++ if (fwfile == NULL) { ++ log_debug("did not find firmware file '%s'", firmware); ++ rc = EXIT_FAILURE; ++ /* ++ * Do not cancel the request in the initrd, the real root might have ++ * the firmware file and the 'coldplug' run in the real root will find ++ * this pending request and fulfill or cancel it. ++ * */ ++ if (!in_initrd()) ++ set_loading(udev, loadpath, "-1"); ++ goto exit; ++ } ++ ++ if (stat(fwpath, &statbuf) < 0 || statbuf.st_size == 0) { ++ if (!in_initrd()) ++ set_loading(udev, loadpath, "-1"); ++ rc = EXIT_FAILURE; ++ goto exit; ++ } ++ ++ if (!set_loading(udev, loadpath, "1")) ++ goto exit; ++ ++ strscpyl(datapath, sizeof(datapath), udev_device_get_syspath(dev), "/data", NULL); ++ if (!copy_firmware(udev, fwpath, datapath, statbuf.st_size)) { ++ log_error("error sending firmware '%s' to device", firmware); ++ set_loading(udev, loadpath, "-1"); ++ rc = EXIT_FAILURE; ++ goto exit; ++ }; ++ ++ set_loading(udev, loadpath, "0"); ++exit: ++ if (fwfile) ++ fclose(fwfile); ++ return rc; ++} ++ ++const struct udev_builtin udev_builtin_firmware = { ++ .name = "firmware", ++ .cmd = builtin_firmware, ++ .help = "kernel firmware loader", ++ .run_once = true, ++}; +diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c +index 1950ec2..f21c0b6 100644 +--- a/src/udev/udev-builtin.c ++++ b/src/udev/udev-builtin.c +@@ -34,6 +34,9 @@ static const struct udev_builtin *builtins[] = { + [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid, + #endif + [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs, ++#ifdef HAVE_FIRMWARE ++ [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware, ++#endif + [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb, + [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id, + [UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard, +diff --git a/src/udev/udev.h b/src/udev/udev.h +index dece6ec..f7ee1e7 100644 +--- a/src/udev/udev.h ++++ b/src/udev/udev.h +@@ -151,6 +151,9 @@ enum udev_builtin_cmd { + UDEV_BUILTIN_BLKID, + #endif + UDEV_BUILTIN_BTRFS, ++#ifdef HAVE_FIRMWARE ++ UDEV_BUILTIN_FIRMWARE, ++#endif + UDEV_BUILTIN_HWDB, + UDEV_BUILTIN_INPUT_ID, + UDEV_BUILTIN_KEYBOARD, +@@ -179,6 +182,9 @@ struct udev_builtin { + extern const struct udev_builtin udev_builtin_blkid; + #endif + extern const struct udev_builtin udev_builtin_btrfs; ++#ifdef HAVE_FIRMWARE ++extern const struct udev_builtin udev_builtin_firmware; ++#endif + extern const struct udev_builtin udev_builtin_hwdb; + extern const struct udev_builtin udev_builtin_input_id; + extern const struct udev_builtin udev_builtin_keyboard; +diff --git a/src/udev/udevd.c b/src/udev/udevd.c +index 99d4c89..71af1e1 100644 +--- a/src/udev/udevd.c ++++ b/src/udev/udevd.c +@@ -99,6 +99,9 @@ struct event { + dev_t devnum; + int ifindex; + bool is_block; ++#ifdef HAVE_FIRMWARE ++ bool nodelay; ++#endif + }; + + static inline struct event *node_to_event(struct udev_list_node *node) { +@@ -472,6 +475,10 @@ static int event_queue_insert(struct udev_device *dev) { + event->devnum = udev_device_get_devnum(dev); + event->is_block = streq("block", udev_device_get_subsystem(dev)); + event->ifindex = udev_device_get_ifindex(dev); ++#ifdef HAVE_FIRMWARE ++ if (streq(udev_device_get_subsystem(dev), "firmware")) ++ event->nodelay = true; ++#endif + + log_debug("seq %llu queued, '%s' '%s'", udev_device_get_seqnum(dev), + udev_device_get_action(dev), udev_device_get_subsystem(dev)); +@@ -548,6 +555,12 @@ static bool is_devpath_busy(struct event *event) { + return true; + } + ++#ifdef HAVE_FIRMWARE ++ /* allow to bypass the dependency tracking */ ++ if (event->nodelay) ++ continue; ++#endif ++ + /* parent device event found */ + if (event->devpath[common] == '/') { + event->delaying_seqnum = loop_event->seqnum; +-- +2.3.3 + diff --git a/meta/recipes-core/systemd/systemd/optional_secure_getenv.patch b/meta/recipes-core/systemd/systemd/optional_secure_getenv.patch deleted file mode 100644 index 2063268246..0000000000 --- a/meta/recipes-core/systemd/systemd/optional_secure_getenv.patch +++ /dev/null @@ -1,19 +0,0 @@ -on uclibc secure_getenv is not available -therefore default to using getenv instead - -Upstream-Status: Denied [no desire for uclibc support] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: git/src/shared/missing.h -=================================================================== ---- git.orig/src/shared/missing.h 2012-09-22 18:46:44.141282145 -0700 -+++ git/src/shared/missing.h 2012-09-22 18:48:44.081276570 -0700 -@@ -233,6 +233,8 @@ - #ifndef HAVE_SECURE_GETENV - # ifdef HAVE___SECURE_GETENV - # define secure_getenv __secure_getenv -+# elif defined __UCLIBC__ -+# define secure_getenv getenv - # else - # error neither secure_getenv nor __secure_getenv are available - # endif diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch b/meta/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch deleted file mode 100644 index 9b4c940984..0000000000 --- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch +++ /dev/null @@ -1,35 +0,0 @@ -Prefer getty to agetty in console setup systemd units - -Upstream-Status: Inappropriate [configuration specific] -Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> ---- - units/getty@.service.m4 | 2 +- - units/serial-getty@.service.m4 | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: git/units/getty@.service.m4 -=================================================================== ---- git.orig/units/getty@.service.m4 2014-03-15 08:16:17.000000000 -0700 -+++ git/units/getty@.service.m4 2014-03-15 08:21:11.007695825 -0700 -@@ -27,7 +27,7 @@ - - [Service] - # the VT is cleared by TTYVTDisallocate --ExecStart=-/sbin/agetty --noclear %I $TERM -+ExecStart=-/sbin/getty -L %I $TERM - Type=idle - Restart=always - RestartSec=0 -Index: git/units/serial-getty@.service.m4 -=================================================================== ---- git.orig/units/serial-getty@.service.m4 2014-03-15 08:16:17.000000000 -0700 -+++ git/units/serial-getty@.service.m4 2014-03-15 08:22:31.291697331 -0700 -@@ -22,7 +22,7 @@ - IgnoreOnIsolate=yes - - [Service] --ExecStart=-/sbin/agetty --keep-baud 115200,38400,9600 %I $TERM -+ExecStart=-/sbin/getty -L 115200 %I $TERM - Type=idle - Restart=always - RestartSec=0 diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch b/meta/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch deleted file mode 100644 index 8c7aa072da..0000000000 --- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch +++ /dev/null @@ -1,30 +0,0 @@ -Upstream-Status: Denied [no desire for uclibc support] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: git/src/shared/util.c -=================================================================== ---- git.orig/src/shared/util.c 2014-03-15 15:14:21.368160908 -0700 -+++ git/src/shared/util.c 2014-03-15 15:44:21.988194688 -0700 -@@ -85,6 +85,8 @@ - #include "def.h" - #include "missing.h" - -+#include "config.h" -+ - int saved_argc = 0; - char **saved_argv = NULL; - -@@ -6222,7 +6224,13 @@ - - u = umask(077); - -+#ifdef HAVE_MKOSTEMP - fd = mkostemp(pattern, flags); -+#else -+ fd = mkstemp(pattern); -+ if (fd >= 0) fcntl(fd, F_SETFD, flags); -+#endif /* HAVE_MKOSTEMP */ -+ - if (fd < 0) - return -errno; - diff --git a/meta/recipes-core/systemd/systemd/tmpfiles-pam.patch b/meta/recipes-core/systemd/systemd/tmpfiles-pam.patch new file mode 100644 index 0000000000..a40b1b9d3f --- /dev/null +++ b/meta/recipes-core/systemd/systemd/tmpfiles-pam.patch @@ -0,0 +1,30 @@ +Upstream-Status: Submitted +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From 0802aaaa9784813d318d045c79533a044eedf542 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Tue, 3 Mar 2015 11:32:29 +0000 +Subject: [PATCH] tmpfiles.d: only copy /etc/pam.d if PAM is present + +If HAVE_PAM isn't set then don't attempt to copy /etc/pam.d from the factory, as +it doesn't get installed. + +Signed-off-by: Ross Burton <ross.burton@intel.com> +--- + tmpfiles.d/etc.conf.m4 | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 +index 9b0e080..ab5cd16 100644 +--- a/tmpfiles.d/etc.conf.m4 ++++ b/tmpfiles.d/etc.conf.m4 +@@ -14,4 +14,6 @@ m4_ifdef(`ENABLE_RESOLVED', + L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf + )m4_dnl + C /etc/nsswitch.conf - - - - ++m4_ifdef(`HAVE_PAM', + C /etc/pam.d - - - - ++)m4_dnl +-- +1.7.10.4 + diff --git a/meta/recipes-core/systemd/systemd/uclibc-sysinfo_h.patch b/meta/recipes-core/systemd/systemd/uclibc-sysinfo_h.patch deleted file mode 100644 index 15645dee11..0000000000 --- a/meta/recipes-core/systemd/systemd/uclibc-sysinfo_h.patch +++ /dev/null @@ -1,19 +0,0 @@ -Dont include sys/sysinfo.h on uclibc it conflicts with linux/sysinfo.h - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Inappropriate [uclibc specific] - -Index: systemd-209/src/readahead/readahead-common.c -=================================================================== ---- systemd-209.orig/src/readahead/readahead-common.c 2014-02-12 18:42:33.810685053 -0800 -+++ systemd-209/src/readahead/readahead-common.c 2014-02-19 23:49:31.856661142 -0800 -@@ -22,7 +22,9 @@ - #include <errno.h> - #include <stdlib.h> - #include <string.h> -+#ifndef __UCLIBC__ - #include <sys/sysinfo.h> -+#endif - #include <sys/inotify.h> - #include <fcntl.h> - #include <sys/mman.h> diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_219.bb index b33f95e023..43c4f95e4b 100644 --- a/meta/recipes-core/systemd/systemd_216.bb +++ b/meta/recipes-core/systemd/systemd_219.bb @@ -1,6 +1,15 @@ -SUMMARY = "System and service manager for Linux, replacing SysVinit" +SUMMARY = "A System and service manager" HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd" +DESCRIPTION = "systemd is a system and service manager for Linux, compatible with \ +SysV and LSB init scripts. systemd provides aggressive parallelization \ +capabilities, uses socket and D-Bus activation for starting services, \ +offers on-demand starting of daemons, keeps track of processes using \ +Linux cgroups, supports snapshotting and restoring of the system \ +state, maintains mount and automount points and implements an \ +elaborate transactional dependency-based service control logic. It can \ +work as a drop-in replacement for sysvinit." + LICENSE = "GPLv2 & LGPLv2.1 & MIT" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \ @@ -11,46 +20,52 @@ PROVIDES = "udev" PE = "1" DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SECTION = "base/shell" inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext -SRCREV = "5d0ae62c665262c4c55536457e84e278c252cc0b" - -PV = "216+git${SRCPV}" - -SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=git \ - file://binfmt-install.patch \ - file://systemd-pam-configure-check-uclibc.patch \ - file://systemd-pam-fix-execvpe.patch \ - file://systemd-pam-fix-fallocate.patch \ - file://systemd-pam-fix-mkostemp.patch \ - file://optional_secure_getenv.patch \ - file://uclibc-sysinfo_h.patch \ - file://uclibc-get-physmem.patch \ - file://0001-add-support-for-executing-scripts-under-etc-rcS.d.patch \ - file://0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch \ - file://0001-Make-root-s-home-directory-configurable.patch \ - file://0001-systemd-user-avoid-using-system-auth.patch \ +SRCREV = "a88abde72169ddc2df77df3fa5bed30725022253" + +PV = "219+git${SRCPV}" + +SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master \ + file://0002-shared-missing.h-fall-back-to-insecure-getenv.patch \ + file://0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ + file://0004-configure-Check-for-additional-features-that-uclibc-.patch \ + file://0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch \ + file://0006-journal-Use-posix-fallocate-only-if-available.patch \ + file://0007-util-Use-mkostemp-only-if-libc-supports-it.patch \ + file://0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch \ + file://0009-sysv-generator-add-support-for-executing-scripts-und.patch \ + file://0010-Make-root-s-home-directory-configurable.patch \ + file://0011-systemd-user-avoid-using-system-auth.patch \ + file://0001-tmpfiles-avoid-creating-duplicate-acl-entries.patch \ + file://0002-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch \ + file://0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch \ + file://0013-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch \ + file://0014-Revert-rules-remove-firmware-loading-rules.patch \ + file://0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch \ + file://tmpfiles-pam.patch \ file://touchscreen.rules \ file://00-create-volatile.conf \ file://init \ file://run-ptest \ - ${@bb.utils.contains('PACKAGECONFIG', 'resolved', '', 'file://0001-tmpfiles.d-etc.conf-disable-resolv.conf-symlink.patch', d)} \ " S = "${WORKDIR}/git" SRC_URI_append_libc-uclibc = "\ - file://systemd-pam-fix-getty-unit.patch \ - " + file://0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch \ + " LDFLAGS_append_libc-uclibc = " -lrt" GTKDOC_DOCDIR = "${S}/docs/" -PACKAGECONFIG ??= "xz" +PACKAGECONFIG ??= "xz ldconfig \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)}" + PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl" # Sign the journal for anti-tampering PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" @@ -66,8 +81,19 @@ PACKAGECONFIG[resolved] = "--enable-resolved,--disable-resolved" PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd" PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn" PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit" - -CACHED_CONFIGUREVARS = "ac_cv_path_KILL=${base_bindir}/kill" +PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" +PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam" +# Verify keymaps on locale change +PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon" +# Update NAT firewall rules +PACKAGECONFIG[iptc] = "--enable-libiptc,--disable-libiptc,iptables" +PACKAGECONFIG[ldconfig] = "--enable-ldconfig,--disable-ldconfig,," + +CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill" +CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod" +CACHED_CONFIGUREVARS += "ac_cv_path_QUOTACHECK=${sbindir}/quotacheck" +CACHED_CONFIGUREVARS += "ac_cv_path_QUOTAON=${sbindir}/quotaon" +CACHED_CONFIGUREVARS += "ac_cv_path_SULOGIN=${base_sbindir}/sulogin" # Helper variables to clarify locations. This mirrors the logic in systemd's # build system. @@ -79,8 +105,6 @@ rootlibexecdir = "${rootprefix}/lib" EXTRA_OECONF = " --with-rootprefix=${rootprefix} \ --with-rootlibdir=${rootlibdir} \ --with-roothomedir=${ROOT_HOME} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ - --disable-manpages \ --disable-coredump \ --disable-introspection \ --disable-kdbus \ @@ -88,7 +112,6 @@ EXTRA_OECONF = " --with-rootprefix=${rootprefix} \ --without-python \ --with-sysvrcnd-path=${sysconfdir} \ --with-firmware-path=/lib/firmware \ - ac_cv_path_KILL=${base_bindir}/kill \ " # uclibc does not have NSS EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname " @@ -123,6 +146,9 @@ do_install() { # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable touch ${D}${sysconfdir}/machine-id + + install -d ${D}${sysconfdir}/udev/rules.d/ + install -d ${D}${sysconfdir}/tmpfiles.d install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ @@ -133,6 +159,8 @@ do_install() { sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd fi + chown root:systemd-journal ${D}/${localstatedir}/log/journal + # Delete journal README, as log can be symlinked inside volatile. rm -f ${D}/${localstatedir}/log/README @@ -150,6 +178,14 @@ do_install() { # Enable journal to forward message to syslog daemon sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/' ${D}${sysconfdir}/systemd/journald.conf + # its needed in 216 upstream has fixed it with 919699ec301ea507edce4a619141ed22e789ac0d + # don't order journal flushing afte remote-fs.target + sed -i -e 's/ remote-fs.target$//' ${D}${systemd_unitdir}/system/systemd-journal-flush.service + # this file is needed to exist if networkd is disabled but timesyncd is still in use since timesyncd checks it + # for existence else it fails + if [ -s ${D}${libdir}/tmpfiles.d/systemd.conf ]; then + ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${libdir}/tmpfiles.d/systemd.conf', d)} + fi } do_install_ptest () { @@ -181,7 +217,7 @@ SYSTEMD_PACKAGES = "${PN}-binfmt" SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} += "--system systemd-journal-gateway" +USERADD_PARAM_${PN} += "--system systemd-journal-gateway; --system systemd-timesync" GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal" FILES_${PN}-analyze = "${bindir}/systemd-analyze" @@ -191,8 +227,7 @@ RDEPENDS_${PN}-initramfs = "${PN}" FILES_libgudev = "${libdir}/libgudev*${SOLIBS}" -# The test cases need perl and bash to run correctly. -RDEPENDS_${PN}-ptest += "perl bash" +RDEPENDS_${PN}-ptest += "perl python bash" FILES_${PN}-ptest += "${libdir}/udev/rules.d" FILES_${PN}-dbg += "${libdir}/systemd/ptest/.debug" @@ -203,6 +238,7 @@ FILES_${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \ ${systemd_unitdir}/system/systemd-vconsole-setup.service \ ${systemd_unitdir}/system/sysinit.target.wants/systemd-vconsole-setup.service" +RDEPENDS_${PN}-kernel-install += "bash" FILES_${PN}-kernel-install = "${bindir}/kernel-install \ ${sysconfdir}/kernel/ \ ${exec_prefix}/lib/kernel \ @@ -237,6 +273,7 @@ FILES_${PN} = " ${base_bindir}/* \ ${sysconfdir}/dbus-1/ \ ${sysconfdir}/machine-id \ ${sysconfdir}/modules-load.d/ \ + ${sysconfdir}/pam.d/ \ ${sysconfdir}/sysctl.d/ \ ${sysconfdir}/systemd/ \ ${sysconfdir}/tmpfiles.d/ \ @@ -264,7 +301,6 @@ FILES_${PN} = " ${base_bindir}/* \ /lib/udev/rules.d/71-seat.rules \ /lib/udev/rules.d/73-seat-late.rules \ /lib/udev/rules.d/99-systemd.rules \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d', '', d)} \ " FILES_${PN}-dbg += "${rootlibdir}/.debug ${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/" @@ -300,14 +336,7 @@ FILES_udev += "${base_sbindir}/udevd \ ${rootlibexecdir}/udev/scsi_id \ ${rootlibexecdir}/udev/v4l_id \ ${rootlibexecdir}/udev/keymaps \ - ${rootlibexecdir}/udev/rules.d/4*.rules \ - ${rootlibexecdir}/udev/rules.d/5*.rules \ - ${rootlibexecdir}/udev/rules.d/6*.rules \ - ${rootlibexecdir}/udev/rules.d/70-power-switch.rules \ - ${rootlibexecdir}/udev/rules.d/75*.rules \ - ${rootlibexecdir}/udev/rules.d/78*.rules \ - ${rootlibexecdir}/udev/rules.d/8*.rules \ - ${rootlibexecdir}/udev/rules.d/95*.rules \ + ${rootlibexecdir}/udev/rules.d/*.rules \ ${sysconfdir}/udev \ ${sysconfdir}/init.d/systemd-udevd \ ${systemd_unitdir}/system/*udev* \ diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb index c3244b4602..e087f0ff86 100644 --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb @@ -6,7 +6,7 @@ PR = "r10" SRC_URI = "file://inittab" -S = "${WORKDIR}/sysvinit-${PV}" +S = "${WORKDIR}" INHIBIT_DEFAULT_DEPS = "1" @@ -23,7 +23,7 @@ do_install() { do j=`echo ${i} | sed s/\;/\ /g` label=`echo ${i} | sed -e 's/^.*;tty//' -e 's/;.*//'` - echo "$label:12345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab + echo "$label:12345:respawn:${base_sbindir}/getty -L ${j}" >> ${D}${sysconfdir}/inittab done if [ "${USE_VT}" = "1" ]; then @@ -41,7 +41,7 @@ EOF for n in ${SYSVINIT_ENABLED_GETTYS} do - echo "$n:2345:respawn:${base_sbindir}/getty 38400 tty$n" >> ${D}${sysconfdir}/inittab + echo "$n:12345:respawn:${base_sbindir}/getty 38400 tty$n" >> ${D}${sysconfdir}/inittab done echo "" >> ${D}${sysconfdir}/inittab fi diff --git a/meta/recipes-core/uclibc/uclibc-git.inc b/meta/recipes-core/uclibc/uclibc-git.inc index a2b2353c5a..8308e603cc 100644 --- a/meta/recipes-core/uclibc/uclibc-git.inc +++ b/meta/recipes-core/uclibc/uclibc-git.inc @@ -15,7 +15,7 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master \ file://argp-headers.patch \ file://remove_attribute_optimize_Os.patch \ file://compile-arm-fork-with-O2.patch \ - file://orign_path.patch \ + file://0001-ldso-limited-support-for-ORIGIN-in-rpath.patch \ file://0001-atexit_old-Do-not-add-it-to-shared-libc.patch \ file://0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch \ file://0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch \ diff --git a/meta/recipes-core/uclibc/uclibc-git/orign_path.patch b/meta/recipes-core/uclibc/uclibc-git/0001-ldso-limited-support-for-ORIGIN-in-rpath.patch index 81bb8f8459..7479ec35e1 100644 --- a/meta/recipes-core/uclibc/uclibc-git/orign_path.patch +++ b/meta/recipes-core/uclibc/uclibc-git/0001-ldso-limited-support-for-ORIGIN-in-rpath.patch @@ -1,13 +1,56 @@ -Patch is backported from +From 32eaf738faafad2b16e1f3f5beb91736b3c27a3b Mon Sep 17 00:00:00 2001 +From: Junling Zheng <zhengjunling@huawei.com> +Date: Fri, 3 Apr 2015 05:02:27 +0000 +Subject: [PATCH] ldso: limited support for $ORIGIN in rpath +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Derived from: http://lists.busybox.net/pipermail/uclibc/2011-March/045003.html -Upstream-Status: Pending +However, the above patch introduced '_dl_strchr' in ldso/ldso/dl-elf.c, +and caused the following undefined referencing compiling error: + + | .../libdl.a(libdl.os): In function `search_for_named_library': + | .../dl-elf.c:156: undefined reference to `_dl_strchr' + | collect2: error: ld returned 1 exit status + +This problem would be reproduced through compiling gdb in static mode +using uclibc. + +So, add the definition of '_dl_strchr' to fix it. The '_dl_strstr' is +added as well. -Index: git/ldso/ldso/dl-elf.c -=================================================================== ---- git.orig/ldso/ldso/dl-elf.c 2012-06-19 18:29:08.629931662 -0700 -+++ git/ldso/ldso/dl-elf.c 2012-06-19 21:21:14.798431393 -0700 -@@ -133,56 +133,60 @@ +Upstream-Status: Submitted + +Signed-off-by: Timo Teräs <timo.teras at iki.fi> +Signed-off-by: Junling Zheng <zhengjunling@huawei.com> +--- + ldso/include/dl-string.h | 2 ++ + ldso/ldso/dl-elf.c | 79 +++++++++++++++++++++++++----------------------- + ldso/ldso/ldso.c | 18 +++++++++-- + 3 files changed, 59 insertions(+), 40 deletions(-) + +diff --git a/ldso/include/dl-string.h b/ldso/include/dl-string.h +index aacad10..14ae617 100644 +--- a/ldso/include/dl-string.h ++++ b/ldso/include/dl-string.h +@@ -204,7 +204,9 @@ static __always_inline char * _dl_get_last_path_component(char *path) + # define _dl_strcat strcat + # define _dl_strcpy strcpy + # define _dl_strcmp strcmp ++# define _dl_strchr strchr + # define _dl_strrchr strrchr ++# define _dl_strstr strstr + # define _dl_memcpy memcpy + # define _dl_memcmp memcmp + # define _dl_memset memset +diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c +index 1b06bc1..b323c90 100644 +--- a/ldso/ldso/dl-elf.c ++++ b/ldso/ldso/dl-elf.c +@@ -133,56 +133,60 @@ _dl_protect_relro (struct elf_resolve *l) * in uClibc/ldso/util/ldd.c */ static struct elf_resolve * search_for_named_library(const char *name, unsigned rflags, const char *path_list, @@ -16,9 +59,9 @@ Index: git/ldso/ldso/dl-elf.c { - char *path, *path_n, *mylibname; + char *mylibname; ++ const char *p, *pn; struct elf_resolve *tpnt; - int done; -+ const char *p, *pn; + int plen; if (path_list==NULL) @@ -100,7 +143,7 @@ Index: git/ldso/ldso/dl-elf.c return NULL; } -@@ -234,8 +238,10 @@ +@@ -234,7 +238,8 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp if (pnt) { pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB]; _dl_if_debug_dprint("\tsearching RPATH='%s'\n", pnt); @@ -108,11 +151,9 @@ Index: git/ldso/ldso/dl-elf.c + if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt, + tpnt->libname)) != NULL) return tpnt1; -+ } #endif - -@@ -243,7 +249,7 @@ +@@ -243,7 +248,7 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp /* Check in LD_{ELF_}LIBRARY_PATH, if specified and allowed */ if (_dl_library_path) { _dl_if_debug_dprint("\tsearching LD_LIBRARY_PATH='%s'\n", _dl_library_path); @@ -121,7 +162,7 @@ Index: git/ldso/ldso/dl-elf.c { return tpnt1; } -@@ -257,7 +263,7 @@ +@@ -257,7 +262,7 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp if (pnt) { pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB]; _dl_if_debug_dprint("\tsearching RUNPATH='%s'\n", pnt); @@ -130,7 +171,7 @@ Index: git/ldso/ldso/dl-elf.c return tpnt1; } #endif -@@ -291,7 +297,7 @@ +@@ -291,7 +296,7 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp /* Look for libraries wherever the shared library loader * was installed */ _dl_if_debug_dprint("\tsearching ldso dir='%s'\n", _dl_ldsopath); @@ -139,7 +180,7 @@ Index: git/ldso/ldso/dl-elf.c if (tpnt1 != NULL) return tpnt1; #endif -@@ -304,7 +310,7 @@ +@@ -304,7 +309,7 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp #ifndef __LDSO_CACHE_SUPPORT__ ":" UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib" #endif @@ -148,14 +189,15 @@ Index: git/ldso/ldso/dl-elf.c if (tpnt1 != NULL) return tpnt1; -Index: git/ldso/ldso/ldso.c -=================================================================== ---- git.orig/ldso/ldso/ldso.c 2012-06-19 18:29:08.633931663 -0700 -+++ git/ldso/ldso/ldso.c 2012-06-19 18:29:10.197931738 -0700 -@@ -403,6 +403,20 @@ +diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c +index 5619629..73bcc41 100644 +--- a/ldso/ldso/ldso.c ++++ b/ldso/ldso/ldso.c +@@ -402,6 +402,20 @@ static ptrdiff_t _dl_build_local_scope (struct elf_resolve **list, + p += _dl_build_local_scope (p, q->tpnt); return p - list; } - ++ +static void _dl_setup_progname(const char *argv0) +{ + char image[PATH_MAX]; @@ -169,11 +211,10 @@ Index: git/ldso/ldso/ldso.c + _dl_progname = argv0; + } +} -+ + void *_dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp, char **argv - DL_GET_READY_TO_RUN_EXTRA_PARMS) -@@ -454,9 +468,7 @@ +@@ -454,9 +468,7 @@ void *_dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, * been fixed up by now. Still no function calls outside of this * library, since the dynamic resolver is not yet ready. */ @@ -184,3 +225,6 @@ Index: git/ldso/ldso/ldso.c #ifdef __DSBT__ _dl_ldso_dsbt = (void *)tpnt->dynamic_info[DT_DSBT_BASE_IDX]; +-- +1.8.3.4 + diff --git a/meta/recipes-core/udev/udev-extraconf_1.1.bb b/meta/recipes-core/udev/udev-extraconf_1.1.bb index d69056dd76..6fbd92548a 100644 --- a/meta/recipes-core/udev/udev-extraconf_1.1.bb +++ b/meta/recipes-core/udev/udev-extraconf_1.1.bb @@ -13,6 +13,8 @@ SRC_URI = " \ file://localextra.rules \ " +S = "${WORKDIR}" + do_install() { install -d ${D}${sysconfdir}/udev/rules.d diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc index 280da10b48..19e0e86506 100644 --- a/meta/recipes-core/udev/udev.inc +++ b/meta/recipes-core/udev/udev.inc @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ LDFLAGS += "-lrt" -DEPENDS = "acl glib-2.0 libusb usbutils pciutils gperf-native libxslt-native util-linux" +DEPENDS = "glib-2.0 libusb usbutils pciutils glib-2.0-native gperf-native libxslt-native util-linux" RPROVIDES_${PN} = "hotplug" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ @@ -27,11 +27,12 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://udev-cache \ file://udev-cache.default \ file://add-install-ptest.patch \ + file://fix_rule-syntax-regex-ptest.patch \ file://run-ptest \ file://init" inherit autotools pkgconfig update-rc.d ptest -RDEPENDS_${PN}-ptest += "make perl" +RDEPENDS_${PN}-ptest += "make perl python" libexecdir = "${base_libdir}" EXTRA_OECONF = "--disable-introspection \ diff --git a/meta/recipes-core/udev/udev/add-install-ptest.patch b/meta/recipes-core/udev/udev/add-install-ptest.patch index 0f8e9b6588..bfc2e9409d 100644 --- a/meta/recipes-core/udev/udev/add-install-ptest.patch +++ b/meta/recipes-core/udev/udev/add-install-ptest.patch @@ -8,20 +8,33 @@ Signed-off-by: Björn Stenberg <bjst@enea.com> Signed-off-by: Alexandra Safta <alst@enea.com> Upstream-Status: Pending +Add missing files for rule-syntax-check +- Add rule-syntax-check.py +- Add the deployed udev rules to the testdata + +Signed-off-by: Max Krummenacher <max.oss.09@gmail.com> +Upstream-Status: Pending --- a/Makefile.am 2012-03-18 16:28:14.000000000 +0100 +++ b/Makefile.am 2013-02-18 10:03:36.531101244 +0100 -@@ -708,3 +708,11 @@ +@@ -708,3 +708,18 @@ for i in src/docs/html/*.{html,css,png}; do echo $$i; kup put $$i $$i.sign /pub/linux/utils/kernel/hotplug/libudev/; done for i in src/gudev/docs/html/*.{html,css,png}; do rm -f $$i.sign; gpg --armor --detach-sign --output=$$i.sign $$i; done for i in src/gudev/docs/html/*.{html,css,png}; do echo $$i; kup put $$i $$i.sign /pub/linux/utils/kernel/hotplug/gudev/; done + ++RULES = rules/* src/accelerometer/61-accelerometer.rules \ ++ src/cdrom_id/60-cdrom_id.rules \ ++ src/keymap/95-keyboard-force-release.rules src/keymap/95-keymap.rules \ ++ src/mtd_probe/75-probe_mtd.rules src/v4l_id/60-persistent-v4l.rules ++ +install-ptest: + install test-udev $(DESTDIR) + cp Makefile $(DESTDIR) + sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile -+ $(MKDIR_P) $(DESTDIR)/test ++ install -d $(DESTDIR)/test $(DESTDIR)/rules + (cd $(top_srcdir) && install $(TESTS) $(DESTDIR)/test) -+ tar -C $(DESTDIR)/test/ -xJf $(top_srcdir)/test/sys.tar.xz ++ (cd $(top_srcdir) && install test/rule-syntax-check.py $(DESTDIR)/test) ++ (cd $(top_srcdir) && install $(RULES) $(DESTDIR)/rules) ++ cp $(top_srcdir)/test/sys.tar.xz $(DESTDIR)/test/ --- a/test/udev-test.pl 2012-03-18 16:43:36.000000000 +0100 +++ b/test/udev-test.pl 2013-02-18 10:31:29.706357321 +0100 @@ -1459,11 +1459,13 @@ diff --git a/meta/recipes-core/udev/udev/fix_rule-syntax-regex-ptest.patch b/meta/recipes-core/udev/udev/fix_rule-syntax-regex-ptest.patch new file mode 100644 index 0000000000..548a241d8a --- /dev/null +++ b/meta/recipes-core/udev/udev/fix_rule-syntax-regex-ptest.patch @@ -0,0 +1,59 @@ +The rule-syntax-check script fails with errors like this: + +Invalid line /lib/udev/rules.d/95-keymap.rules:49: ENV{DMI_VENDOR}=="ASUS*", KERNELS=="input*", ATTRS{name}=="Asus Extra Buttons", ATTR{[dmi/id]product_name}=="W3J", RUN+="keymap $name module-asus-w3j" +(' clause:', 'ATTR{[dmi/id]product_name}=="W3J"') +() + + +Move line comment from end of rules file to its own line, the regex used to +test correct syntax choke on it. + +The rule-syntax-check.py uses regex which errournessly complains on ATTR rules +of the form ATTR{[dmi/id]board_name}=="30B7" +Use the regex from systemd's script which allow [] characters and additional +compare operators + +The Makefile passes rules-test.sh script a build host path to the testdata. +Ignore the argument and use a relative path instead. + + +Signed-off-by: Max Krummenacher <max.oss.09@gmail.com> +Upstream status pending +Upstream status Inappropriate (cross environment path) + +diff -Naur udev-182.orig/src/keymap/95-keymap.rules udev-182/src/keymap/95-keymap.rules +--- udev-182.orig/src/keymap/95-keymap.rules 2012-02-07 00:01:55.154640792 +0100 ++++ udev-182/src/keymap/95-keymap.rules 2015-01-24 20:58:40.156930520 +0100 +@@ -94,7 +94,8 @@ + ENV{DMI_VENDOR}=="Hewlett-Packard", ATTR{[dmi/id]product_name}=="HP G62 Notebook PC", RUN+="keymap $name 0xB2 www" + ENV{DMI_VENDOR}=="Hewlett-Packard", ATTR{[dmi/id]product_name}=="HP ProBook*", RUN+="keymap $name 0xF8 rfkill" + # HP Pavillion dv6315ea has empty DMI_VENDOR +-ATTR{[dmi/id]board_vendor}=="Quanta", ATTR{[dmi/id]board_name}=="30B7", ATTR{[dmi/id]board_version}=="65.2B", RUN+="keymap $name 0x88 media" # "quick play ++# "quick play" ++ATTR{[dmi/id]board_vendor}=="Quanta", ATTR{[dmi/id]board_name}=="30B7", ATTR{[dmi/id]board_version}=="65.2B", RUN+="keymap $name 0x88 media" + + # Gateway clone of Acer Aspire One AOA110/AOA150 + ENV{DMI_VENDOR}=="Gateway*", ATTR{[dmi/id]product_name}=="*AOA1*", RUN+="keymap $name acer" +diff -Naur udev-182.orig/test/rule-syntax-check.py udev-182/test/rule-syntax-check.py +--- udev-182.orig/test/rule-syntax-check.py 2012-02-15 20:10:12.872333342 +0100 ++++ udev-182/test/rule-syntax-check.py 2015-01-24 21:08:00.496049600 +0100 +@@ -28,7 +28,7 @@ + no_args_tests = re.compile('(ACTION|DEVPATH|KERNELS?|NAME|SYMLINK|SUBSYSTEMS?|DRIVERS?|TAG|RESULT|TEST)\s*(?:=|!)=\s*"([^"]*)"$') + args_tests = re.compile('(ATTRS?|ENV|TEST){([a-zA-Z0-9/_.*%-]+)}\s*(?:=|!)=\s*"([^"]*)"$') + no_args_assign = re.compile('(NAME|SYMLINK|OWNER|GROUP|MODE|TAG|PROGRAM|RUN|LABEL|GOTO|WAIT_FOR|OPTIONS|IMPORT)\s*(?:\+=|:=|=)\s*"([^"]*)"$') +-args_assign = re.compile('(ATTR|ENV|IMPORT){([a-zA-Z0-9/_.*%-]+)}\s*=\s*"([^"]*)"$') ++args_assign = re.compile('(ATTR|ENV|IMPORT|RUN){([][a-zA-Z0-9/_.*%-]+)}\s*(=|==|\+=)\s*"([^"]*)"$') + + result = 0 + buffer = '' +--- udev-182.orig/test/rules-test.sh 2012-01-29 01:15:46.000000000 +0100 ++++ udev-182/test/rules-test.sh 2015-01-24 17:53:51.201858658 +0100 +@@ -4,7 +4,7 @@ + # (C) 2010 Canonical Ltd. + # Author: Martin Pitt <martin.pitt@ubuntu.com> + +-[ -n "$srcdir" ] || srcdir=`dirname $0`/.. ++srcdir=`dirname $0`/.. + + # skip if we don't have python + type python >/dev/null 2>&1 || { diff --git a/meta/recipes-core/udev/udev/init b/meta/recipes-core/udev/udev/init index d26cbfca96..0ab028b391 100644 --- a/meta/recipes-core/udev/udev/init +++ b/meta/recipes-core/udev/udev/init @@ -16,21 +16,26 @@ export TZ=/etc/localtime [ -x @UDEVD@ ] || exit 1 SYSCONF_CACHED="/etc/udev/cache.data" SYSCONF_TMP="/dev/shm/udev.cache" +DEVCACHE_REGEN="/dev/shm/udev-regen" # create to request cache regen + +# A list of files which are used as a criteria to judge whether the udev cache could be reused. +CMP_FILE_LIST="/proc/version /proc/cmdline /proc/devices" +[ -f /proc/atags ] && CMP_FILE_LIST="$CMP_FILE_LIST /proc/atags" + +# List of files whose metadata (size/mtime/name) will be included in cached +# system state. +META_FILE_LIST="lib/udev/rules.d/* etc/udev/rules.d/*" + +# Command to compute system configuration. +sysconf_cmd () { + cat -- $CMP_FILE_LIST + stat -c '%s %Y %n' -- $META_FILE_LIST | awk -F/ '{print $1 " " $NF;}' +} + [ -f /etc/default/udev-cache ] && . /etc/default/udev-cache [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf [ -f /etc/default/rcS ] && . /etc/default/rcS -readfiles () { - READDATA="" - for filename in $@; do - if [ -r $filename ]; then - while read line; do - READDATA="$READDATA$line" - done < $filename - fi - done -} - kill_udevd () { pid=`pidof -x udevd` [ -n "$pid" ] && kill $pid @@ -62,35 +67,32 @@ case "$1" in mkdir -m 1777 -p /var/volatile/tmp # Cache handling. - # A list of files which are used as a criteria to judge whether the udev cache could be reused. - CMP_FILE_LIST="/proc/version /proc/cmdline /proc/devices /proc/atags" if [ "$DEVCACHE" != "" ]; then if [ -e $DEVCACHE ]; then - readfiles $CMP_FILE_LIST - NEWDATA="$READDATA" - readfiles "$SYSCONF_CACHED" - OLDDATA="$READDATA" - if [ "$OLDDATA" = "$NEWDATA" ]; then + sysconf_cmd > "$SYSCONF_TMP" + if cmp $SYSCONF_CACHED $SYSCONF_TMP >/dev/null; then tar xmf $DEVCACHE -C / -m not_first_boot=1 [ "$VERBOSE" != "no" ] && echo "udev: using cache file $DEVCACHE" [ -e $SYSCONF_TMP ] && rm -f "$SYSCONF_TMP" + [ -e "$DEVCACHE_REGEN" ] && rm -f "$DEVCACHE_REGEN" else # Output detailed reason why the cached /dev is not used - if [ "$VERBOSE" != "no" ]; then - echo "udev: udev cache not used" - echo "udev: we use $CMP_FILE_LIST as criteria to judge whether the cache /dev could be resued" - echo "udev: olddata: $OLDDATA" - echo "udev: newdata: $NEWDATA" - fi - echo "$NEWDATA" > "$SYSCONF_TMP" + cat <<EOF +udev: Not using udev cache because of changes detected in the following files: +udev: $CMP_FILE_LIST +udev: $META_FILE_LIST +udev: The udev cache will be regenerated. To identify the detected changes, +udev: compare the cached sysconf at $SYSCONF_CACHED +udev: against the current sysconf at $SYSCONF_TMP +EOF + touch "$DEVCACHE_REGEN" fi else if [ "$ROOTFS_READ_ONLY" != "yes" ]; then # If rootfs is not read-only, it's possible that a new udev cache would be generated; # otherwise, we do not bother to read files. - readfiles $CMP_FILE_LIST - echo "$READDATA" > "$SYSCONF_TMP" + touch "$DEVCACHE_REGEN" fi fi fi diff --git a/meta/recipes-core/udev/udev/local.rules b/meta/recipes-core/udev/udev/local.rules index 9d4da493f7..d502cdd6ba 100644 --- a/meta/recipes-core/udev/udev/local.rules +++ b/meta/recipes-core/udev/udev/local.rules @@ -13,9 +13,6 @@ # %% the '%' char itself # -# Try and modprobe for drivers for new hardware -ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" - # Create a symlink to any touchscreen input device # Trigger based on input type, that the evbit (-e) has EV_SYN and EV_ABS, # has an EV_ABS value (-a) which is used for touchscreen type devices. diff --git a/meta/recipes-core/udev/udev/run-ptest b/meta/recipes-core/udev/udev/run-ptest index c6961ce58a..0e39806b01 100644 --- a/meta/recipes-core/udev/udev/run-ptest +++ b/meta/recipes-core/udev/udev/run-ptest @@ -1,3 +1,5 @@ #!/bin/sh +tar -C test/ -xJf test/sys.tar.xz make -k check-TESTS +make test-sys-distclean diff --git a/meta/recipes-core/udev/udev/udev-cache b/meta/recipes-core/udev/udev/udev-cache index 497d257397..df97000dde 100644 --- a/meta/recipes-core/udev/udev/udev-cache +++ b/meta/recipes-core/udev/udev/udev-cache @@ -19,6 +19,22 @@ export TZ=/etc/localtime DEVCACHE_TMP="/dev/shm/udev-cache-tmp.tar" SYSCONF_CACHED="/etc/udev/cache.data" SYSCONF_TMP="/dev/shm/udev.cache" +DEVCACHE_REGEN="/dev/shm/udev-regen" # create to request cache regen + +# A list of files which are used as a criteria to judge whether the udev cache could be reused. +CMP_FILE_LIST="/proc/version /proc/cmdline /proc/devices" +[ -f /proc/atags ] && CMP_FILE_LIST="$CMP_FILE_LIST /proc/atags" + +# List of files whose metadata (size/mtime/name) will be included in cached +# system state. +META_FILE_LIST="lib/udev/rules.d/* etc/udev/rules.d/*" + +# Command to compute system configuration. +sysconf_cmd () { + cat -- $CMP_FILE_LIST + stat -c '%s %Y %n' -- $META_FILE_LIST | awk -F/ '{print $1 " " $NF;}' +} + [ -f /etc/default/udev-cache ] && . /etc/default/udev-cache if [ "$ROOTFS_READ_ONLY" = "yes" ]; then @@ -26,13 +42,28 @@ if [ "$ROOTFS_READ_ONLY" = "yes" ]; then exit 0 fi -if [ "$DEVCACHE" != "" -a -e "$SYSCONF_TMP" ]; then - echo "Populating dev cache" +[ "$DEVCACHE" != "" ] || exit 0 +[ "${VERBOSE}" == "no" ] || echo -n "udev-cache: checking for ${DEVCACHE_REGEN}... " +if ! [ -e "$DEVCACHE_REGEN" ]; then + [ "${VERBOSE}" == "no" ] || echo "not found." + exit 0 +fi +[ "${VERBOSE}" == "no" ] || echo "found." +echo "Populating dev cache" + +( + set -e + trap 'echo "udev-cache: update failed!"' EXIT + udevadm control --stop-exec-queue + sysconf_cmd > "$SYSCONF_TMP" find /dev -xdev \( -type b -o -type c -o -type l \) | cut -c 2- \ | xargs tar cf "${DEVCACHE_TMP}" -T- gzip < "${DEVCACHE_TMP}" > "$DEVCACHE" rm -f "${DEVCACHE_TMP}" mv "$SYSCONF_TMP" "$SYSCONF_CACHED" -fi + udevadm control --start-exec-queue + rm -f "$DEVCACHE_REGEN" + trap - EXIT +) & exit 0 diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 2c299e8588..2d17fa2f8c 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -17,27 +17,25 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \ file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16" -inherit autotools gettext pkgconfig systemd +inherit autotools gettext pkgconfig systemd update-alternatives python-dir DEPENDS = "zlib ncurses" DEPENDS_append_class-native = " lzo-native" DEPENDS_append_class-nativesdk = " lzo-native" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ - file://MCONFIG \ - file://defines.h \ - file://make_include \ - file://swapargs.h \ " PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ util-linux-swaponoff util-linux-losetup util-linux-umount \ - util-linux-mount util-linux-readprofile util-linux-libblkid \ - util-linux-libmount util-linux-libuuid util-linux-uuidd \ + util-linux-mount util-linux-readprofile util-linux-uuidd \ util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ util-linux-mkfs util-linux-mcookie util-linux-reset \ util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \ util-linux-partx ${PN}-bash-completion util-linux-hwclock \ - util-linux-findfs" + util-linux-findfs util-linux-getopt" +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" + +PACKAGES_DYNAMIC = "^util-linux-lib.*" SHARED_EXTRA_OECONF = "--disable-use-tty-group \ --disable-makeinstall-chown \ @@ -51,19 +49,24 @@ SHARED_EXTRA_OECONF = "--disable-use-tty-group \ EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}" -PACKAGECONFIG_class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} " +PACKAGECONFIG_class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," # Respect the systemd feature for uuidd -PACKAGECONFIG[systemd] = "--enable-socket-activation --with-systemdsystemunitdir=${systemd_unitdir}/system/, --disable-socket-activation --without-systemdsystemunitdir" +PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/, --without-systemd --without-systemdsystemunitdir,systemd" # Build setpriv requires libcap-ng PACKAGECONFIG[libcap-ng] = "--enable-setpriv,--disable-setpriv,libcap-ng," +# Build python bindings for libmount +PACKAGECONFIG[pylibmount] = "--with-python --enable-pylibmount,--without-python --disable-pylibmount,python" + FILES_${PN}-bash-completion += "${datadir}/bash-completion" FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" +FILES_${PN}-dev += "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.la" +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/dist-packages/libmount/.debug/" + FILES_util-linux-agetty = "${base_sbindir}/agetty" FILES_util-linux-fdisk = "${base_sbindir}/fdisk.${BPN}" FILES_util-linux-fstrim = "${base_sbindir}/fstrim" @@ -74,17 +77,17 @@ FILES_util-linux-losetup = "${base_sbindir}/losetup.${BPN}" FILES_util-linux-mount = "${base_bindir}/mount.${BPN}" FILES_util-linux-mcookie = "${bindir}/mcookie" FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" -FILES_util-linux-readprofile = "${base_sbindir}/readprofile.${BPN}" +FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" FILES_util-linux-reset = "${base_bindir}/reset" FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" FILES_util-linux-findfs = "${sbindir}/findfs" +FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" -FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" -FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" -FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*" +FILES_util-linux-pylibmount = "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.so \ + ${libdir}/${PYTHON_DIR}/dist-packages/libmount/__init__.*" FILES_util-linux-lscpu = "${bindir}/lscpu" FILES_util-linux-fsck = "${base_sbindir}/fsck*" @@ -93,7 +96,6 @@ FILES_util-linux-mkfs = "${sbindir}/mkfs" FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" - # Util-linux' blkid replaces the e2fsprogs one FILES_util-linux-blkid = "${base_sbindir}/blkid*" RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" @@ -112,15 +114,14 @@ RDEPENDS_${PN}_class-nativesdk = "" RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev" -SYSTEMD_PACKAGES = "${PN}-uuidd" -SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.service" +#SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim" +SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.socket uuidd.service" +SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" +SYSTEMD_SERVICE_${PN}-fstrim = "fstrim.timer fstrim.service" +SYSTEMD_AUTO_ENABLE_${PN}-fstrim = "disable" do_compile () { set -e - install ${WORKDIR}/MCONFIG ${S}/MCONFIG - install ${WORKDIR}/make_include ${S}/make_include - install ${WORKDIR}/swapargs.h ${S}/mount-deprecated/swapargs.h - install ${WORKDIR}/defines.h ${S}/defines.h oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' } @@ -135,9 +136,8 @@ do_install () { mkdir -p ${D}${base_bindir} sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" - sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk readprofile fsck blkid blockdev fstrim sulogin switch_root" - usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt" - binprogs_a="dmesg kill more umount mount login reset su" + sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root" + binprogs_a="dmesg getopt kill more umount mount login reset su" if [ "${base_sbindir}" != "${sbindir}" ]; then mkdir -p ${D}${base_sbindir} @@ -163,13 +163,17 @@ do_install () { rm -f ${D}${bindir}/chkdupexe } -inherit update-alternatives +# reset and nologin causes a conflict with ncurses-native and shadow-native +do_install_append_class-native () { + rm -f ${D}${base_bindir}/reset + rm -f ${D}${base_sbindir}/nologin +} ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" -ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject getopt sulogin" +ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject sulogin" ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" @@ -180,15 +184,15 @@ ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" -ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" -ALTERNATIVE_TARGET[getopt] = "${bindir}/getopt" -ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1 reset.1" +ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 reset.1" ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" +ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" +ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" ALTERNATIVE_LINK_NAME[reset.1] = "${mandir}/man1/reset.1" ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" @@ -214,7 +218,7 @@ ALTERNATIVE_util-linux-umount = "umount" ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" ALTERNATIVE_util-linux-readprofile = "readprofile" -ALTERNATIVE_LINK_NAME[readprofile] = "${base_sbindir}/readprofile" +ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" ALTERNATIVE_util-linux-losetup = "losetup" ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" @@ -234,6 +238,9 @@ ALTERNATIVE_util-linux-reset = "reset" ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset" ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset" +ALTERNATIVE_util-linux-getopt = "getopt" +ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" + BBCLASSEXTEND = "native nativesdk" python do_package_prepend () { @@ -242,3 +249,10 @@ python do_package_prepend () { d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, '%s/%s' % (d.getVar('base_bindir', True), alt_name)) d.appendVar('ALTERNATIVE_%s' % (d.getVar('PN', True)), ' ' + alt_name) } + +python populate_packages_prepend() { + do_split_packages(d, '${base_libdir}', '^lib(.*)\.so\..*$', + output_pattern='util-linux-lib%s', + description='util-linux lib%s', + extra_depends='', prepend=True, allow_links=True) +} diff --git a/meta/recipes-core/util-linux/util-linux/CVE-2014-9114.patch b/meta/recipes-core/util-linux/util-linux/CVE-2014-9114.patch new file mode 100644 index 0000000000..5eaa08df63 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/CVE-2014-9114.patch @@ -0,0 +1,174 @@ +Upstream-Status: Backport + +This patch is for CVE-2014-9114. +This patch should be removed once util-linux is upgraded to 2.26. + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + +From 89e90ae7b2826110ea28c1c0eb8e7c56c3907bdc Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Thu, 27 Nov 2014 13:39:35 +0100 +Subject: [PATCH] libblkid: care about unsafe chars in cache + +The high-level libblkid API uses /run/blkid/blkid.tab cache to +store probing results. The cache format is + + <device NAME="value" ...>devname</device> + +and unfortunately the cache code does not escape quotation marks: + + # mkfs.ext4 -L 'AAA"BBB' + + # cat /run/blkid/blkid.tab + ... + <device ... LABEL="AAA"BBB" ...>/dev/sdb1</device> + +such string is later incorrectly parsed and blkid(8) returns +nonsenses. And for use-cases like + + # eval $(blkid -o export /dev/sdb1) + +it's also insecure. + +Note that mount, udevd and blkid -p are based on low-level libblkid +API, it bypass the cache and directly read data from the devices. + +The current udevd upstream does not depend on blkid(8) output at all, +it's directly linked with the library and all unsafe chars are encoded by +\x<hex> notation. + + # mkfs.ext4 -L 'X"`/tmp/foo` "' /dev/sdb1 + # udevadm info --export-db | grep LABEL + ... + E: ID_FS_LABEL=X__/tmp/foo___ + E: ID_FS_LABEL_ENC=X\x22\x60\x2ftmp\x2ffoo\x60\x20\x22 + +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + libblkid/src/read.c | 21 ++++++++++++++++++--- + libblkid/src/save.c | 22 +++++++++++++++++++++- + misc-utils/blkid.8 | 5 ++++- + misc-utils/blkid.c | 4 ++-- + 4 files changed, 45 insertions(+), 7 deletions(-) + +diff --git a/libblkid/src/read.c b/libblkid/src/read.c +index 0e91c9c..81ab0df 100644 +--- a/libblkid/src/read.c ++++ b/libblkid/src/read.c +@@ -252,15 +252,30 @@ static int parse_token(char **name, char **value, char **cp) + *value = skip_over_blank(*value + 1); + + if (**value == '"') { +- end = strchr(*value + 1, '"'); +- if (!end) { ++ char *p = end = *value + 1; ++ ++ /* convert 'foo\"bar' to 'foo"bar' */ ++ while (*p) { ++ if (*p == '\\') { ++ p++; ++ *end = *p; ++ } else { ++ *end = *p; ++ if (*p == '"') ++ break; ++ } ++ p++; ++ end++; ++ } ++ ++ if (*end != '"') { + DBG(READ, ul_debug("unbalanced quotes at: %s", *value)); + *cp = *value; + return -BLKID_ERR_CACHE; + } + (*value)++; + *end = '\0'; +- end++; ++ end = ++p; + } else { + end = skip_over_word(*value); + if (*end) { +diff --git a/libblkid/src/save.c b/libblkid/src/save.c +index 8216f09..5e8bbee 100644 +--- a/libblkid/src/save.c ++++ b/libblkid/src/save.c +@@ -26,6 +26,21 @@ + + #include "blkidP.h" + ++ ++static void save_quoted(const char *data, FILE *file) ++{ ++ const char *p; ++ ++ fputc('"', file); ++ for (p = data; p && *p; p++) { ++ if ((unsigned char) *p == 0x22 || /* " */ ++ (unsigned char) *p == 0x5c) /* \ */ ++ fputc('\\', file); ++ ++ fputc(*p, file); ++ } ++ fputc('"', file); ++} + static int save_dev(blkid_dev dev, FILE *file) + { + struct list_head *p; +@@ -43,9 +58,14 @@ static int save_dev(blkid_dev dev, FILE *file) + + if (dev->bid_pri) + fprintf(file, " PRI=\"%d\"", dev->bid_pri); ++ + list_for_each(p, &dev->bid_tags) { + blkid_tag tag = list_entry(p, struct blkid_struct_tag, bit_tags); +- fprintf(file, " %s=\"%s\"", tag->bit_name,tag->bit_val); ++ ++ fputc(' ', file); /* space between tags */ ++ fputs(tag->bit_name, file); /* tag NAME */ ++ fputc('=', file); /* separator between NAME and VALUE */ ++ save_quoted(tag->bit_val, file); /* tag "VALUE" */ + } + fprintf(file, ">%s</device>\n", dev->bid_name); + +diff --git a/misc-utils/blkid.8 b/misc-utils/blkid.8 +index 156a14b..c95b833 100644 +--- a/misc-utils/blkid.8 ++++ b/misc-utils/blkid.8 +@@ -200,7 +200,10 @@ partitions. This output format is \fBDEPRECATED\fR. + .TP + .B export + print key=value pairs for easy import into the environment; this output format +-is automatically enabled when I/O Limits (\fB-i\fR option) are requested ++is automatically enabled when I/O Limits (\fB-i\fR option) are requested. ++ ++The non-printing characters are encoded by ^ and M- notation and all ++potentially unsafe characters are escaped. + .RE + .TP + .BI \-O " offset" +diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c +index a6ca660..1bd8646 100644 +--- a/misc-utils/blkid.c ++++ b/misc-utils/blkid.c +@@ -306,7 +306,7 @@ static void print_value(int output, int num, const char *devname, + printf("DEVNAME=%s\n", devname); + fputs(name, stdout); + fputs("=", stdout); +- safe_print(value, valsz, NULL); ++ safe_print(value, valsz, " \\\"'$`<>"); + fputs("\n", stdout); + + } else { +@@ -315,7 +315,7 @@ static void print_value(int output, int num, const char *devname, + fputs(" ", stdout); + fputs(name, stdout); + fputs("=\"", stdout); +- safe_print(value, valsz, "\""); ++ safe_print(value, valsz, "\"\\"); + fputs("\"", stdout); + } + } +-- +1.9.1 + diff --git a/meta/recipes-core/util-linux/util-linux/MCONFIG b/meta/recipes-core/util-linux/util-linux/MCONFIG deleted file mode 100644 index 3fea2c02d7..0000000000 --- a/meta/recipes-core/util-linux/util-linux/MCONFIG +++ /dev/null @@ -1,223 +0,0 @@ -# MCONFIG -- Configuration stuff for util-linux -# Created: Sat Feb 4 15:50:30 1995 -# Copyright 1995 Rickard E. Faith (faith@cs.unc.edu) - -# For a user-mode install, make (at least) three changes: -# - remove the `-o root' part in INSTALLSUID -# - set USE_TTY_GROUP=no -# - define DESTDIR - -# Select for ARCH one of intel, alpha, sparc, arm, m68k, mips -# Select for CPU i386 if the binaries must be able to run on an intel 386 -# (by default i486 code is generated, see below) -CPU=$(shell uname -m) -ARCH=$(shell echo $(CPU) | sed 's/i.86/intel/;s/arm.*/arm/') - -# If HAVE_PAM is set to "yes", then login, chfn, chsh, and newgrp -# will use PAM for authentication. Additionally, passwd will not be -# installed as it is not PAM aware. -HAVE_PAM=no - -# If HAVE_SHADOW is set to "yes", then login, chfn, chsh, newgrp, passwd, -# and vipw will not be built or installed from the login-utils -# subdirectory. -HAVE_SHADOW=yes - -# If HAVE_PASSWD is set to "yes", then passwd will not be built or -# installed from the login-utils subdirectory (but login, chfn, chsh, -# newgrp, and vipw *will* be installed). -HAVE_PASSWD=no - -# If you use chfn and chsh from this package, REQUIRE_PASSWORD will require -# non-root users to enter the account password before updating /etc/passwd. -REQUIRE_PASSWORD=yes -#REQUIRE_PASSWORD=no - -# If you use chsh from this package, ONLY_LISTED_SHELLS will require that -# the selected shell be listed in /etc/shells -- otherwise only a warning is -# printed. This prevents someone from setting their shell to /bin/false. -ONLY_LISTED_SHELLS=yes -#ONLY_LISTED_SHELLS=no - - -# If HAVE_SYSVINIT is set to "yes", then simpleinit and shutdown will not -# be built or installed from the login-utils subdirectory. (The shutdown -# and halt that come with the SysVinit package should be used with the init -# found in that package.) -HAVE_SYSVINIT=no - -# If HAVE_SYSVINIT_UTILS is set to "yes", then last, mesg, and wall will -# not be built or installed from the login-utils subdirectory. (The -# shutdown and init from the SysVinit package do not depend on the last, -# mesg, and wall from that package.) -HAVE_SYSVINIT_UTILS=no - -# If HAVE_WRITE is set to "yes", then write will not be built or -# installed from the misc-utils subdirectory. -# (There is a network aware write in netwrite from NetKit 0.16 or later.) -HAVE_WRITE=no - -# If HAVE_GETTY is set to "yes", then agetty will not be built or -# installed from the login-utils subdirectory. Note that agetty can -# co-exist with other gettys, so this option should never be used. -HAVE_GETTY=no - -# If USE_TTY_GROUP is set to "yes", then wall and write will be installed -# setgid to the "tty" group, and mesg will only set the group write bit. -# Note that this is only useful if login/xterm/etc. change the group of the -# user's tty to "tty" [The login in util-linux does this correctly, and -# xterm will do it correctly if X is compiled with USE_TTY_GROUP set -# properly.] -USE_TTY_GROUP=no - -# If HAVE_KILL is set to "yes", then kill will not be built or -# installed from the misc-utils subdirectory. -# (There is also a kill in the procps package.) -HAVE_KILL=no - -# If ALLOW_VCS_USE is set to "yes", then login will chown /dev/vcsN -# to the current user, allowing her to make a screendump and do other -# nifty things on the console, but also allowing him to keep an open -# file descriptor after logging out to trick the next user. -ALLOW_VCS_USE=yes - -# If HAVE_RESET is set to "yes", then reset won't be installed. The version -# of reset that comes with the ncurses package is less aggressive. -HAVE_RESET=yes - -# If HAVE_SLN is set to "yes", then sln won't be installed -# (but the man page sln.8 will be installed anyway). -# sln also comes with libc and glibc. -HAVE_SLN=no - -# If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed. -HAVE_FDUTILS=no - -# If SILENT_PG is set to "yes", then pg will not ring the bell -# when an invalid key is pressed -SILENT_PG=no - -# If configure decides that Native Language Support (NLS) is available, -# it sets MAY_ENABLE_NLS in defines.h. If you don't want NLS, set -# DISABLE_NLS to "yes". -DISABLE_NLS=no - -# Different optimizations for different cpus. -# gcc 3.0 likes options -mcpu=i486 instead of -m486 -ifeq "$(ARCH)" "intel" - ifeq "$(HAVE_OLD_GCC)" "yes" - CPUHEAD=-m - else - CPUHEAD=-mcpu=i - endif - ifeq "$(CPU)" "i386" - CPUTAIL=386 - else - CPUTAIL=486 - endif - CPUOPT= $(CPUHEAD)$(CPUTAIL) - OPT= -pipe -O2 $(CPUOPT) -fomit-frame-pointer -else - ifeq "$(ARCH)" "arm" - OPT= -pipe -O2 -fsigned-char -fomit-frame-pointer - else - OPT= -O2 -fomit-frame-pointer - endif -endif - -WARNFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes - -LIB=../lib - -ERR_O=$(LIB)/err.o - -# Set HAVE_SLANG to yes if you have slang (and prefer to use that for cfdisk) -# (If neither HAVE_NCURSES nor HAVE_SLANG is defined, cfdisk is not made.) -# HAVE_SLANG=yes -# There is a subdirectory /usr/include/slang containing slcurses.h -# SLANGFLAGS=-I/usr/include/slang -# No such subdirectory - slcurses.h lives in /usr/include -# (no extra definition required). -LIBSLANG=-lslang - -# -# Paths used for compilation (not all are actually used, see CFLAGS below) -# -DEV_DIR= /dev -ETC_DIR= /etc -SBIN_DIR= /sbin -USRSBIN_DIR= /usr/sbin -USRLIB_DIR= /usr/lib -USRBIN_DIR= /usr/bin -USRGAMES_DIR= /usr/games -USRSHAREMISC_DIR=/usr/share/misc -LOCALE_DIR= /usr/share/locale -BIN_DIR= /bin -VAR_PATH= /var -LOG_DIR= /var/log -MAN_DIR= /usr/share/man -INFO_DIR= /usr/share/info - -# -# Paths used for install -# -DEVDIR= $(DESTDIR)$(DEV_DIR) -ETCDIR= $(DESTDIR)$(ETC_DIR) -SBINDIR= $(DESTDIR)$(SBIN_DIR) -USRSBINDIR= $(DESTDIR)$(USRSBIN_DIR) -USRLIBDIR= $(DESTDIR)$(USRLIB_DIR) -USRBINDIR= $(DESTDIR)$(USRBIN_DIR) -USRGAMESDIR= $(DESTDIR)$(USRGAMES_DIR) -USRSHAREMISCDIR=$(DESTDIR)$(USRSHAREMISC_DIR) -LOCALEDIR= $(DESTDIR)$(LOCALE_DIR) -BINDIR= $(DESTDIR)$(BIN_DIR) -VARPATH= $(DESTDIR)$(VAR_PATH) -LOGDIR= $(DESTDIR)$(LOG_DIR) -MANDIR= $(DESTDIR)$(MAN_DIR) -MAN1DIR= $(MANDIR)/man1 -MAN3DIR= $(MANDIR)/man3 -MAN5DIR= $(MANDIR)/man5 -MAN6DIR= $(MANDIR)/man6 -MAN8DIR= $(MANDIR)/man8 -INFODIR= $(DESTDIR)$(INFO_DIR) - -# Directory for shutdown, halt, reboot, etc. -SHUTDOWNDIR= $(SBINDIR) - -# Modes -DIRMODE= 755 -BINMODE= 755 -MANMODE= 644 -DATMODE= 644 -INFOMODE= 644 -SUIDMODE= 4755 - -CHMOD= chmod -INSTALL= install -INSTALLDIR= $(INSTALL) -d -m $(DIRMODE) -INSTALLBIN= $(INSTALL) -m $(BINMODE) -INSTALLMAN= $(INSTALL) -m $(MANMODE) -INSTALLDAT= $(INSTALL) -m $(DATMODE) -INSTALLSUID= $(INSTALL) -m $(SUIDMODE) - -ifeq "$(DISABLE_NLS)" "yes" -NLSFLAGS = -DDISABLE_NLS -endif - -CFLAGS := $(OPT) -I$(LIB) $(WARNFLAGS) \ - $(CURSESFLAGS) $(SLANGFLAGS) $(NLSFLAGS) \ - -D_FILE_OFFSET_BITS=64 \ - -DSBINDIR=\"$(SBIN_DIR)\" \ - -DUSRSBINDIR=\"$(USRSBIN_DIR)\" \ - -DLOGDIR=\"$(LOG_DIR)\" \ - -DVARPATH=\"$(VAR_PATH)\" \ - -DLOCALEDIR=\"$(LOCALE_DIR)\" \ - $(CFLAGS) - - -%.o: %.c - $(CC) -c $(CFLAGS) $< -o $@ - -%: %.cc - $(CXX) $(CFLAGS) $< -o $@ - diff --git a/meta/recipes-core/util-linux/util-linux/defines.h b/meta/recipes-core/util-linux/util-linux/defines.h deleted file mode 100644 index 6ce6b86df5..0000000000 --- a/meta/recipes-core/util-linux/util-linux/defines.h +++ /dev/null @@ -1,10 +0,0 @@ -#define UTIL_LINUX_VERSION "2.12" -#define util_linux_version "util-linux-2.12" - -#define HAVE_blkpg_h -#define HAVE_kd_h -#define HAVE_locale_h -#define HAVE_langinfo_h -#define HAVE_sys_user_h -#define HAVE_asm_types_h -//#define NEED_tqueue_h diff --git a/meta/recipes-core/util-linux/util-linux/fix-configure.patch b/meta/recipes-core/util-linux/util-linux/fix-configure.patch deleted file mode 100644 index cefae97e9c..0000000000 --- a/meta/recipes-core/util-linux/util-linux/fix-configure.patch +++ /dev/null @@ -1,20 +0,0 @@ -The userlib_execdir was not getting set correctly, the quoting -was wrong as these quoted items were not getting expanded correctly. - -Upstream-Status: Pending - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Index: util-linux-2.24.1/configure.ac -=================================================================== ---- util-linux-2.24.1.orig/configure.ac -+++ util-linux-2.24.1/configure.ac -@@ -76,7 +76,7 @@ fi - AC_SUBST([usrsbin_execdir]) - - AS_CASE([$libdir], -- ['${exec_prefix}/'* | '${prefix}/'* | /usr/*], -+ [${exec_prefix}/* | ${prefix}/* | /usr/*], - [usrlib_execdir=$libdir], - [usrlib_execdir='${exec_prefix}'$libdir] - ) diff --git a/meta/recipes-core/util-linux/util-linux/make_include b/meta/recipes-core/util-linux/util-linux/make_include deleted file mode 100644 index e6abcd91f7..0000000000 --- a/meta/recipes-core/util-linux/util-linux/make_include +++ /dev/null @@ -1,17 +0,0 @@ -VERSION=2.12 -CC=gcc -CFLAGS= -LDFLAGS= -HAVE_OLD_GCC=yes -HAVE_RAW_H=yes -HAVE_NCURSES=yes -CURSESFLAGS=-DNCH=1 -LIBCURSES=-lncurses -HAVE_TERMCAP=no -NEED_LIBCRYPT=yes -FOREIGN = --foreign-user -HAVE_XGETTEXT=yes -HAVE_OPENPTY=yes -HAVE_PIVOT_ROOT=yes -HAVE_GOOD_RPC=yes -HAVE_ZLIB=yes diff --git a/meta/recipes-core/util-linux/util-linux/swapargs.h b/meta/recipes-core/util-linux/util-linux/swapargs.h deleted file mode 100644 index e960eef05f..0000000000 --- a/meta/recipes-core/util-linux/util-linux/swapargs.h +++ /dev/null @@ -1,3 +0,0 @@ -#define SWAPON_HAS_TWO_ARGS -#include <asm/page.h> -#include <sys/swap.h> diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-ensure-the-existence-of-directory-for-PAT.patch b/meta/recipes-core/util-linux/util-linux/util-linux-ensure-the-existence-of-directory-for-PAT.patch deleted file mode 100644 index 8f26451aa8..0000000000 --- a/meta/recipes-core/util-linux/util-linux/util-linux-ensure-the-existence-of-directory-for-PAT.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream-Status: Pending - -util-linux: ensure the existence of directory for PATHFILES - -When compiling util-linux, it's possible to encounter the following error. - /bin/sh: line 2:: misc-utils/uuidd.8.tmp: No such file or directory - -This is because that the misc-utils directory doesn't exist when trying to write to -misc-utils/uuidd.8.tmp. - -When generating misc-utils/uuidd.8 (or anything in PATHFILES), its directory -may not have been created yet. So we need to ensure the existence of the directory -to avoid the compilation error. - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile.am b/Makefile.am -index 17f4c33..ca3dc0f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -123,6 +123,7 @@ EXTRA_DIST += $(PATHFILES:=.in) - - $(PATHFILES): Makefile - @ rm -f $@ $@.tmp -+ @ mkdir -p `dirname $@` - $(AM_V_GEN) srcdir=''; \ - test -f ./$@.in || srcdir=$(srcdir)/; \ - $(edit_cmd) $${srcdir}$@.in >$@.tmp --- -1.7.9.5 - diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native.patch b/meta/recipes-core/util-linux/util-linux/util-linux-native.patch index afe543c6e8..1f496dee21 100644 --- a/meta/recipes-core/util-linux/util-linux/util-linux-native.patch +++ b/meta/recipes-core/util-linux/util-linux/util-linux-native.patch @@ -16,24 +16,29 @@ Patches revert upstream changes in order to support older machines. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + configure.ac | 1 + + include/c.h | 7 +++++++ + 2 files changed, 8 insertions(+) -Index: util-linux-2.24.1/configure.ac -=================================================================== ---- util-linux-2.24.1.orig/configure.ac -+++ util-linux-2.24.1/configure.ac -@@ -302,6 +302,7 @@ AC_CHECK_FUNCS([ \ +diff --git a/configure.ac b/configure.ac +index eb3680b..93e015f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -318,6 +318,7 @@ AC_CHECK_FUNCS([ \ llseek \ lseek64 \ mempcpy \ + mkostemp \ nanosleep \ + open_memstream \ personality \ - posix_fadvise \ -Index: util-linux-2.24.1/include/c.h -=================================================================== ---- util-linux-2.24.1.orig/include/c.h -+++ util-linux-2.24.1/include/c.h -@@ -236,6 +236,13 @@ static inline int dirfd(DIR *d) +diff --git a/include/c.h b/include/c.h +index e423e8b..cf33b94 100644 +--- a/include/c.h ++++ b/include/c.h +@@ -233,6 +233,13 @@ static inline int dirfd(DIR *d) #endif /* @@ -47,27 +52,6 @@ Index: util-linux-2.24.1/include/c.h * MAXHOSTNAMELEN replacement */ static inline size_t get_hostname_max(void) -Index: util-linux-2.24.1/lib/randutils.c -=================================================================== ---- util-linux-2.24.1.orig/lib/randutils.c -+++ util-linux-2.24.1/lib/randutils.c -@@ -16,6 +16,7 @@ - #include <sys/syscall.h> - - #include "randutils.h" -+#include "c.h" - - #ifdef HAVE_TLS - #define THREAD_LOCAL static __thread -Index: util-linux-2.24.1/lib/wholedisk.c -=================================================================== ---- util-linux-2.24.1.orig/lib/wholedisk.c -+++ util-linux-2.24.1/lib/wholedisk.c -@@ -10,6 +10,7 @@ - - #include "blkdev.h" - #include "wholedisk.h" -+#include "c.h" - - int is_whole_disk_fd(int fd, const char *name) - { +-- +1.9.1 + diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch index f131b763ca..6717a75a90 100644 --- a/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch +++ b/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch @@ -1,27 +1,33 @@ Upstream-Status: Pending -Index: util-linux-2.22.1/login-utils/login.c -=================================================================== ---- util-linux-2.22.1.orig/login-utils/login.c -+++ util-linux-2.22.1/login-utils/login.c -@@ -1239,6 +1239,8 @@ int main(int argc, char **argv) +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + login-utils/login.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/login-utils/login.c b/login-utils/login.c +index ebb76f5..38c881b 100644 +--- a/login-utils/login.c ++++ b/login-utils/login.c +@@ -1110,6 +1110,7 @@ int main(int argc, char **argv) char *buff; int childArgc = 0; int retcode; + struct sigaction act; -+ char *pwdbuf = NULL; struct passwd *pwd = NULL, _pwd; -@@ -1252,7 +1254,10 @@ int main(int argc, char **argv) +@@ -1123,7 +1124,9 @@ int main(int argc, char **argv) timeout = (unsigned int)getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT); signal(SIGALRM, timedout); -- siginterrupt(SIGALRM, 1); /* we have to interrupt syscalls like ioclt() */ +- siginterrupt(SIGALRM, 1); /* we have to interrupt syscalls like ioctl() */ + (void) sigaction(SIGALRM, NULL, &act); + act.sa_flags &= ~SA_RESTART; + sigaction(SIGALRM, &act, NULL); -+ alarm(timeout); signal(SIGQUIT, SIG_IGN); signal(SIGINT, SIG_IGN); +-- +1.9.1 + diff --git a/meta/recipes-core/util-linux/util-linux_2.24.2.bb b/meta/recipes-core/util-linux/util-linux_2.25.2.bb index ed753e48b3..0ff1e7cc64 100644 --- a/meta/recipes-core/util-linux/util-linux_2.24.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.25.2.bb @@ -1,4 +1,4 @@ -MAJOR_VERSION = "2.24" +MAJOR_VERSION = "2.25" require util-linux.inc PR = "r1" @@ -13,14 +13,13 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ file://util-linux-ng-2.16-mount_lock_path.patch \ file://uclibc-__progname-conflict.patch \ file://configure-sbindir.patch \ - file://fix-configure.patch \ file://fix-parallel-build.patch \ - file://util-linux-ensure-the-existence-of-directory-for-PAT.patch \ + file://CVE-2014-9114.patch \ ${OLDHOST} \ " -SRC_URI[md5sum] = "3f191727a0d28f7204b755cf1b6ea0aa" -SRC_URI[sha256sum] = "1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0" +SRC_URI[md5sum] = "cab3d7be354000f629bc601238b629b3" +SRC_URI[sha256sum] = "e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6" CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc index 378021a327..321934b97d 100644 --- a/meta/recipes-devtools/apt/apt.inc +++ b/meta/recipes-devtools/apt/apt.inc @@ -2,7 +2,7 @@ SUMMARY = "Advanced front-end for dpkg" LICENSE = "GPLv2.0+" SECTION = "base" -SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ +SRC_URI = "http://snapshot.debian.org/archive/debian/20130726T154545Z/pool/main/a/${BPN}/${BPN}_${PV}.tar.gz \ file://no-ko-translation.patch \ file://use-host.patch \ file://makerace.patch \ diff --git a/meta/recipes-devtools/apt/apt_0.9.9.4.bb b/meta/recipes-devtools/apt/apt_0.9.9.4.bb index 86ffe66ca4..77cbff1c0c 100644 --- a/meta/recipes-devtools/apt/apt_0.9.9.4.bb +++ b/meta/recipes-devtools/apt/apt_0.9.9.4.bb @@ -1,5 +1,5 @@ DEPENDS = "curl db" -RDEPENDS_${PN} = "dpkg bash" +RDEPENDS_${PN} = "dpkg bash debianutils" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" require apt.inc diff --git a/meta/recipes-devtools/autoconf/autoconf_2.69.bb b/meta/recipes-devtools/autoconf/autoconf_2.69.bb index 6614a7b780..809007f35d 100644 --- a/meta/recipes-devtools/autoconf/autoconf_2.69.bb +++ b/meta/recipes-devtools/autoconf/autoconf_2.69.bb @@ -2,8 +2,6 @@ require autoconf.inc PR = "r11" -PARALLEL_MAKE = "" - LICENSE = "GPLv2 & GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504" @@ -22,6 +20,6 @@ SRC_URI[sha256sum] = "954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd SRC_URI_append_class-native = " file://fix_path_xtra.patch" -EXTRA_OECONF += "ac_cv_path_M4=m4" +EXTRA_OECONF += "ac_cv_path_M4=m4 ac_cv_prog_TEST_EMACS=no" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/autogen/autogen-native_5.18.3.bb b/meta/recipes-devtools/autogen/autogen-native_5.18.4.bb index abc0a42102..302ba79f77 100644 --- a/meta/recipes-devtools/autogen/autogen-native_5.18.3.bb +++ b/meta/recipes-devtools/autogen/autogen-native_5.18.4.bb @@ -13,8 +13,8 @@ SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ file://increase-timeout-limit.patch \ file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch" -SRC_URI[md5sum] = "0fb6b003423e004d94e0119c2390078f" -SRC_URI[sha256sum] = "73d05a689105eb9b8be54f32498c99ddbd360776fc61cf45be6a2a4eb4a40039" +SRC_URI[md5sum] = "6f48029cc839303d28496e1609868938" +SRC_URI[sha256sum] = "3cd9f81a8ae7c6865bb9bbbe16c4307a243a1373d0b315a83571cbba1fff725d" DEPENDS = "guile-native libtool-native libxml2-native" diff --git a/meta/recipes-devtools/automake/automake_1.14.1.bb b/meta/recipes-devtools/automake/automake_1.15.bb index be73d19cf6..d5b6e9eba4 100644 --- a/meta/recipes-devtools/automake/automake_1.14.1.bb +++ b/meta/recipes-devtools/automake/automake_1.15.bb @@ -22,8 +22,8 @@ SRC_URI += " file://python-libdir.patch \ file://py-compile-compile-only-optimized-byte-code.patch \ file://buildtest.patch" -SRC_URI[md5sum] = "d052a3e884631b9c7892f2efce542d75" -SRC_URI[sha256sum] = "814c2333f350ce00034a1fe718e0e4239998ceea7b0aff67e9fd273ed6dfc23b" +SRC_URI[md5sum] = "716946a105ca228ab545fc37a70df3a3" +SRC_URI[sha256sum] = "7946e945a96e28152ba5a6beb0625ca715c6e32ac55f2e353ef54def0c8ed924" do_install_append () { install -d ${D}${datadir} diff --git a/meta/recipes-devtools/binutils/binutils-2.24.inc b/meta/recipes-devtools/binutils/binutils-2.24.inc index 8f3216f2bf..63c928712e 100644 --- a/meta/recipes-devtools/binutils/binutils-2.24.inc +++ b/meta/recipes-devtools/binutils/binutils-2.24.inc @@ -32,6 +32,14 @@ SRC_URI = "\ file://replace_macros_with_static_inline.patch \ file://0001-Fix-MMIX-build-breakage-from-bfd_set_section_vma-cha.patch \ file://binutils-uninitialised-warning.patch \ + file://binutils_CVE-2014-8484.patch \ + file://binutils_CVE-2014-8485.patch \ + file://binutils_CVE-2014-8501.patch \ + file://binutils_CVE-2014-8502_1.patch \ + file://binutils_CVE-2014-8502.patch \ + file://binutils_CVE-2014-8503.patch \ + file://binutils_CVE-2014-8504.patch \ + file://binutils_CVE-2014-8737.patch \ " SRC_URI[md5sum] = "e0f71a7b2ddab0f8612336ac81d9636b" diff --git a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8484.patch b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8484.patch new file mode 100644 index 0000000000..e789499477 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8484.patch @@ -0,0 +1,67 @@ +Upstream-Status: Backport + +CVE-2014-8484 fix. + +[YOCTO #7084] + +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +From bd25671c6f202c4a5108883caa2adb24ff6f361f Mon Sep 17 00:00:00 2001 +From: Alan Modra <amodra@gmail.com> +Date: Fri, 29 Aug 2014 10:36:29 +0930 +Subject: [PATCH] Report an error for S-records with less than the miniumum + size + + * srec.c (srec_scan): Revert last change. Report an error for + S-records with less than the miniumum byte count. +--- + bfd/ChangeLog | 5 +++++ + bfd/srec.c | 18 +++++++++++++++--- + 2 files changed, 20 insertions(+), 3 deletions(-) + +Index: binutils-2.24/bfd/srec.c +=================================================================== +--- binutils-2.24.orig/bfd/srec.c ++++ binutils-2.24/bfd/srec.c +@@ -455,7 +455,7 @@ srec_scan (bfd *abfd) + { + file_ptr pos; + char hdr[3]; +- unsigned int bytes; ++ unsigned int bytes, min_bytes; + bfd_vma address; + bfd_byte *data; + unsigned char check_sum; +@@ -478,6 +478,19 @@ srec_scan (bfd *abfd) + } + + check_sum = bytes = HEX (hdr + 1); ++ min_bytes = 3; ++ if (hdr[0] == '2' || hdr[0] == '8') ++ min_bytes = 4; ++ else if (hdr[0] == '3' || hdr[0] == '7') ++ min_bytes = 5; ++ if (bytes < min_bytes) ++ { ++ (*_bfd_error_handler) (_("%B:%d: byte count %d too small\n"), ++ abfd, lineno, bytes); ++ bfd_set_error (bfd_error_bad_value); ++ goto error_return; ++ } ++ + if (bytes * 2 > bufsize) + { + if (buf != NULL) +Index: binutils-2.24/bfd/ChangeLog +=================================================================== +--- binutils-2.24.orig/bfd/ChangeLog ++++ binutils-2.24/bfd/ChangeLog +@@ -1,3 +1,8 @@ ++2014-08-29 Alan Modra <amodra@gmail.com> ++ ++ * srec.c (srec_scan): Revert last change. Report an error for ++ S-records with less than the miniumum byte count. ++ + 2013-12-02 Tristan Gingold <gingold@adacore.com> + + * configure.in: Bump version to 2.24 diff --git a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8485.patch b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8485.patch new file mode 100644 index 0000000000..ec3308b4f4 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8485.patch @@ -0,0 +1,102 @@ +Upstream-Status: Backport + +CVE-2014-8485 fix. + +[YOCTO #7084] + +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +From 493a33860c71cac998f1a56d6d87d6faa801fbaa Mon Sep 17 00:00:00 2001 +From: Nick Clifton <nickc@redhat.com> +Date: Mon, 27 Oct 2014 12:43:16 +0000 +Subject: [PATCH] This patch closes a potential security hole in applications + that use the bfd library to parse binaries containing maliciously corrupt + section group headers. + + PR binutils/17510 + * elf.c (setup_group): Improve handling of corrupt group + sections. +--- + bfd/ChangeLog | 6 ++++++ + bfd/elf.c | 34 ++++++++++++++++++++++++++++++---- + 2 files changed, 36 insertions(+), 4 deletions(-) + +Index: binutils-2.24/bfd/elf.c +=================================================================== +--- binutils-2.24.orig/bfd/elf.c ++++ binutils-2.24/bfd/elf.c +@@ -608,9 +608,10 @@ setup_group (bfd *abfd, Elf_Internal_Shd + if (shdr->contents == NULL) + { + _bfd_error_handler +- (_("%B: Corrupt size field in group section header: 0x%lx"), abfd, shdr->sh_size); ++ (_("%B: corrupt size field in group section header: 0x%lx"), abfd, shdr->sh_size); + bfd_set_error (bfd_error_bad_value); +- return FALSE; ++ -- num_group; ++ continue; + } + + memset (shdr->contents, 0, amt); +@@ -618,7 +619,16 @@ setup_group (bfd *abfd, Elf_Internal_Shd + if (bfd_seek (abfd, shdr->sh_offset, SEEK_SET) != 0 + || (bfd_bread (shdr->contents, shdr->sh_size, abfd) + != shdr->sh_size)) +- return FALSE; ++ { ++ _bfd_error_handler ++ (_("%B: invalid size field in group section header: 0x%lx"), abfd, shdr->sh_size); ++ bfd_set_error (bfd_error_bad_value); ++ -- num_group; ++ /* PR 17510: If the group contents are even partially ++ corrupt, do not allow any of the contents to be used. */ ++ memset (shdr->contents, 0, amt); ++ continue; ++ } + + /* Translate raw contents, a flag word followed by an + array of elf section indices all in target byte order, +@@ -651,6 +661,21 @@ setup_group (bfd *abfd, Elf_Internal_Shd + } + } + } ++ ++ /* PR 17510: Corrupt binaries might contain invalid groups. */ ++ if (num_group != (unsigned) elf_tdata (abfd)->num_group) ++ { ++ elf_tdata (abfd)->num_group = num_group; ++ ++ /* If all groups are invalid then fail. */ ++ if (num_group == 0) ++ { ++ elf_tdata (abfd)->group_sect_ptr = NULL; ++ elf_tdata (abfd)->num_group = num_group = -1; ++ (*_bfd_error_handler) (_("%B: no valid group sections found"), abfd); ++ bfd_set_error (bfd_error_bad_value); ++ } ++ } + } + } + +@@ -716,6 +741,7 @@ setup_group (bfd *abfd, Elf_Internal_Shd + { + (*_bfd_error_handler) (_("%B: no group info for section %A"), + abfd, newsect); ++ return FALSE; + } + return TRUE; + } +Index: binutils-2.24/bfd/ChangeLog +=================================================================== +--- binutils-2.24.orig/bfd/ChangeLog ++++ binutils-2.24/bfd/ChangeLog +@@ -1,3 +1,9 @@ ++2014-10-27 Nick Clifton <nickc@redhat.com> ++ ++ PR binutils/17510 ++ * elf.c (setup_group): Improve handling of corrupt group ++ sections. ++ + 2014-08-29 Alan Modra <amodra@gmail.com> + + * srec.c (srec_scan): Revert last change. Report an error for diff --git a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8501.patch b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8501.patch new file mode 100644 index 0000000000..a48fe9b23b --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8501.patch @@ -0,0 +1,60 @@ +Upstream-Status: Backport + +CVE-2014-8501 fix. + +[YOCTO #7084] + +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +From 7e1e19887abd24aeb15066b141cdff5541e0ec8e Mon Sep 17 00:00:00 2001 +From: Nick Clifton <nickc@redhat.com> +Date: Mon, 27 Oct 2014 14:45:06 +0000 +Subject: [PATCH] Fix a seg-fault in strings and other binutuils when parsing a + corrupt PE executable with an invalid value in the NumberOfRvaAndSizes field + of the AOUT header. + + PR binutils/17512 + * peXXigen.c (_bfd_XXi_swap_aouthdr_in): Handle corrupt binaries + with an invalid value for NumberOfRvaAndSizes. +--- + bfd/ChangeLog | 4 ++++ + bfd/peXXigen.c | 12 ++++++++++++ + 2 files changed, 16 insertions(+) + +Index: binutils-2.24/bfd/peXXigen.c +=================================================================== +--- binutils-2.24.orig/bfd/peXXigen.c ++++ binutils-2.24/bfd/peXXigen.c +@@ -460,6 +460,18 @@ _bfd_XXi_swap_aouthdr_in (bfd * abfd, + { + int idx; + ++ /* PR 17512: Corrupt PE binaries can cause seg-faults. */ ++ if (a->NumberOfRvaAndSizes > 16) ++ { ++ (*_bfd_error_handler) ++ (_("%B: aout header specifies an invalid number of data-directory entries: %d"), ++ abfd, a->NumberOfRvaAndSizes); ++ /* Paranoia: If the number is corrupt, then assume that the ++ actual entries themselves might be corrupt as well. */ ++ a->NumberOfRvaAndSizes = 0; ++ } ++ ++ + for (idx = 0; idx < a->NumberOfRvaAndSizes; idx++) + { + /* If data directory is empty, rva also should be 0. */ +Index: binutils-2.24/bfd/ChangeLog +=================================================================== +--- binutils-2.24.orig/bfd/ChangeLog ++++ binutils-2.24/bfd/ChangeLog +@@ -1,5 +1,9 @@ + 2014-10-27 Nick Clifton <nickc@redhat.com> + ++ PR binutils/17512 ++ * peXXigen.c (_bfd_XXi_swap_aouthdr_in): Handle corrupt binaries ++ with an invalid value for NumberOfRvaAndSizes. ++ + PR binutils/17510 + * elf.c (setup_group): Improve handling of corrupt group + sections. diff --git a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8502.patch b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8502.patch new file mode 100644 index 0000000000..05af65bad1 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8502.patch @@ -0,0 +1,89 @@ +Upstream-Status: Backport + +CVE-2014-8502 fix. + +[YOCTO #7084] + +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +From 5a4b0ccc20ba30caef53b01bee2c0aaa5b855339 Mon Sep 17 00:00:00 2001 +From: Nick Clifton <nickc@redhat.com> +Date: Tue, 28 Oct 2014 15:42:56 +0000 +Subject: [PATCH] More fixes for corrupt binaries crashing the binutils. + + PR binutils/17512 + * elf.c (bfd_section_from_shdr): Allocate and free the recursion + detection table on a per-bfd basis. + * peXXigen.c (pe_print_edata): Handle binaries with a truncated + export table. +--- + bfd/ChangeLog | 8 ++++++++ + bfd/elf.c | 16 +++++++++++++--- + bfd/peXXigen.c | 9 +++++++++ + 3 files changed, 30 insertions(+), 3 deletions(-) + +Index: binutils-2.24/bfd/peXXigen.c +=================================================================== +--- binutils-2.24.orig/bfd/peXXigen.c ++++ binutils-2.24/bfd/peXXigen.c +@@ -1438,6 +1438,15 @@ pe_print_edata (bfd * abfd, void * vfile + } + } + ++ /* PR 17512: Handle corrupt PE binaries. */ ++ if (datasize < 36) ++ { ++ fprintf (file, ++ _("\nThere is an export table in %s, but it is too small (%d)\n"), ++ section->name, (int) datasize); ++ return TRUE; ++ } ++ + fprintf (file, _("\nThere is an export table in %s at 0x%lx\n"), + section->name, (unsigned long) addr); + +Index: binutils-2.24/bfd/elf.c +=================================================================== +--- binutils-2.24.orig/bfd/elf.c ++++ binutils-2.24/bfd/elf.c +@@ -1576,6 +1576,7 @@ bfd_section_from_shdr (bfd *abfd, unsign + const char *name; + bfd_boolean ret = TRUE; + static bfd_boolean * sections_being_created = NULL; ++ static bfd * sections_being_created_abfd = NULL; + static unsigned int nesting = 0; + + if (shindex >= elf_numsections (abfd)) +@@ -1588,13 +1589,20 @@ bfd_section_from_shdr (bfd *abfd, unsign + loop. Detect this here, by refusing to load a section that we are + already in the process of loading. We only trigger this test if + we have nested at least three sections deep as normal ELF binaries +- can expect to recurse at least once. */ ++ can expect to recurse at least once. ++ ++ FIXME: It would be better if this array was attached to the bfd, ++ rather than being held in a static pointer. */ ++ ++ if (sections_being_created_abfd != abfd) ++ sections_being_created = NULL; + + if (sections_being_created == NULL) + { + /* FIXME: It would be more efficient to attach this array to the bfd somehow. */ + sections_being_created = (bfd_boolean *) + bfd_zalloc (abfd, elf_numsections (abfd) * sizeof (bfd_boolean)); ++ sections_being_created_abfd = abfd; + } + if (sections_being_created [shindex]) + { +@@ -2098,7 +2106,10 @@ bfd_section_from_shdr (bfd *abfd, unsign + if (sections_being_created) + sections_being_created [shindex] = FALSE; + if (-- nesting == 0) ++ { + sections_being_created = NULL; ++ sections_being_created_abfd = abfd; ++ } + return ret; + } + diff --git a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8502_1.patch b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8502_1.patch new file mode 100644 index 0000000000..9e0c9c8b3c --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8502_1.patch @@ -0,0 +1,523 @@ +Upstream-Status: Backport + +CVE-2014-8502 supporting patch. + +[YOCTO #7084] + +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +From bf67003b4567600ed3022a439207ac8f26454f91 Mon Sep 17 00:00:00 2001 +From: Nick Clifton <nickc@redhat.com> +Date: Mon, 27 Oct 2014 18:05:37 +0000 +Subject: [PATCH] This fixes more seg-faults in tools like "strings" and + "objdump" when presented with corrupt binaries. + + PR binutils/17512 + * elf.c (bfd_section_from_shdr): Detect and warn about ELF + binaries with a group of sections linked by the string table + indicies. + * peXXigen.c (pe_print_edata): Detect out of range rvas and + entry counts for the Export Address table, Name Pointer table + and Ordinal table. +--- + bfd/ChangeLog | 5 ++ + bfd/elf.c | 194 ++++++++++++++++++++++++++++++++++++++------------------- + bfd/peXXigen.c | 18 +++++- + 3 files changed, 150 insertions(+), 67 deletions(-) + +Index: binutils-2.24/bfd/elf.c +=================================================================== +--- binutils-2.24.orig/bfd/elf.c ++++ binutils-2.24/bfd/elf.c +@@ -1574,38 +1574,67 @@ bfd_section_from_shdr (bfd *abfd, unsign + Elf_Internal_Ehdr *ehdr; + const struct elf_backend_data *bed; + const char *name; ++ bfd_boolean ret = TRUE; ++ static bfd_boolean * sections_being_created = NULL; ++ static unsigned int nesting = 0; + + if (shindex >= elf_numsections (abfd)) + return FALSE; + ++ if (++ nesting > 3) ++ { ++ /* PR17512: A corrupt ELF binary might contain a recursive group of ++ sections, each the string indicies pointing to the next in the ++ loop. Detect this here, by refusing to load a section that we are ++ already in the process of loading. We only trigger this test if ++ we have nested at least three sections deep as normal ELF binaries ++ can expect to recurse at least once. */ ++ ++ if (sections_being_created == NULL) ++ { ++ /* FIXME: It would be more efficient to attach this array to the bfd somehow. */ ++ sections_being_created = (bfd_boolean *) ++ bfd_zalloc (abfd, elf_numsections (abfd) * sizeof (bfd_boolean)); ++ } ++ if (sections_being_created [shindex]) ++ { ++ (*_bfd_error_handler) ++ (_("%B: warning: loop in section dependencies detected"), abfd); ++ return FALSE; ++ } ++ sections_being_created [shindex] = TRUE; ++ } ++ + hdr = elf_elfsections (abfd)[shindex]; + ehdr = elf_elfheader (abfd); + name = bfd_elf_string_from_elf_section (abfd, ehdr->e_shstrndx, + hdr->sh_name); + if (name == NULL) +- return FALSE; ++ goto fail; + + bed = get_elf_backend_data (abfd); + switch (hdr->sh_type) + { + case SHT_NULL: + /* Inactive section. Throw it away. */ +- return TRUE; ++ goto success; + +- case SHT_PROGBITS: /* Normal section with contents. */ +- case SHT_NOBITS: /* .bss section. */ +- case SHT_HASH: /* .hash section. */ +- case SHT_NOTE: /* .note section. */ ++ case SHT_PROGBITS: /* Normal section with contents. */ ++ case SHT_NOBITS: /* .bss section. */ ++ case SHT_HASH: /* .hash section. */ ++ case SHT_NOTE: /* .note section. */ + case SHT_INIT_ARRAY: /* .init_array section. */ + case SHT_FINI_ARRAY: /* .fini_array section. */ + case SHT_PREINIT_ARRAY: /* .preinit_array section. */ + case SHT_GNU_LIBLIST: /* .gnu.liblist section. */ + case SHT_GNU_HASH: /* .gnu.hash section. */ +- return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); ++ ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); ++ goto success; + + case SHT_DYNAMIC: /* Dynamic linking information. */ + if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex)) +- return FALSE; ++ goto fail; ++ + if (hdr->sh_link > elf_numsections (abfd)) + { + /* PR 10478: Accept Solaris binaries with a sh_link +@@ -1619,11 +1648,11 @@ bfd_section_from_shdr (bfd *abfd, unsign + break; + /* Otherwise fall through. */ + default: +- return FALSE; ++ goto fail; + } + } + else if (elf_elfsections (abfd)[hdr->sh_link] == NULL) +- return FALSE; ++ goto fail; + else if (elf_elfsections (abfd)[hdr->sh_link]->sh_type != SHT_STRTAB) + { + Elf_Internal_Shdr *dynsymhdr; +@@ -1652,24 +1681,26 @@ bfd_section_from_shdr (bfd *abfd, unsign + } + } + } +- break; ++ goto success; + +- case SHT_SYMTAB: /* A symbol table */ ++ case SHT_SYMTAB: /* A symbol table. */ + if (elf_onesymtab (abfd) == shindex) +- return TRUE; ++ goto success; + + if (hdr->sh_entsize != bed->s->sizeof_sym) +- return FALSE; ++ goto fail; ++ + if (hdr->sh_info * hdr->sh_entsize > hdr->sh_size) + { + if (hdr->sh_size != 0) +- return FALSE; ++ goto fail; + /* Some assemblers erroneously set sh_info to one with a + zero sh_size. ld sees this as a global symbol count + of (unsigned) -1. Fix it here. */ + hdr->sh_info = 0; +- return TRUE; ++ goto success; + } ++ + BFD_ASSERT (elf_onesymtab (abfd) == 0); + elf_onesymtab (abfd) = shindex; + elf_tdata (abfd)->symtab_hdr = *hdr; +@@ -1686,7 +1717,7 @@ bfd_section_from_shdr (bfd *abfd, unsign + && (abfd->flags & DYNAMIC) != 0 + && ! _bfd_elf_make_section_from_shdr (abfd, hdr, name, + shindex)) +- return FALSE; ++ goto fail; + + /* Go looking for SHT_SYMTAB_SHNDX too, since if there is one we + can't read symbols without that section loaded as well. It +@@ -1712,26 +1743,29 @@ bfd_section_from_shdr (bfd *abfd, unsign + break; + } + if (i != shindex) +- return bfd_section_from_shdr (abfd, i); ++ ret = bfd_section_from_shdr (abfd, i); + } +- return TRUE; ++ goto success; + +- case SHT_DYNSYM: /* A dynamic symbol table */ ++ case SHT_DYNSYM: /* A dynamic symbol table. */ + if (elf_dynsymtab (abfd) == shindex) +- return TRUE; ++ goto success; + + if (hdr->sh_entsize != bed->s->sizeof_sym) +- return FALSE; ++ goto fail; ++ + if (hdr->sh_info * hdr->sh_entsize > hdr->sh_size) + { + if (hdr->sh_size != 0) +- return FALSE; ++ goto fail; ++ + /* Some linkers erroneously set sh_info to one with a + zero sh_size. ld sees this as a global symbol count + of (unsigned) -1. Fix it here. */ + hdr->sh_info = 0; +- return TRUE; ++ goto success; + } ++ + BFD_ASSERT (elf_dynsymtab (abfd) == 0); + elf_dynsymtab (abfd) = shindex; + elf_tdata (abfd)->dynsymtab_hdr = *hdr; +@@ -1740,34 +1774,38 @@ bfd_section_from_shdr (bfd *abfd, unsign + + /* Besides being a symbol table, we also treat this as a regular + section, so that objcopy can handle it. */ +- return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); ++ ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); ++ goto success; + +- case SHT_SYMTAB_SHNDX: /* Symbol section indices when >64k sections */ ++ case SHT_SYMTAB_SHNDX: /* Symbol section indices when >64k sections. */ + if (elf_symtab_shndx (abfd) == shindex) +- return TRUE; ++ goto success; + + BFD_ASSERT (elf_symtab_shndx (abfd) == 0); + elf_symtab_shndx (abfd) = shindex; + elf_tdata (abfd)->symtab_shndx_hdr = *hdr; + elf_elfsections (abfd)[shindex] = &elf_tdata (abfd)->symtab_shndx_hdr; +- return TRUE; ++ goto success; + +- case SHT_STRTAB: /* A string table */ ++ case SHT_STRTAB: /* A string table. */ + if (hdr->bfd_section != NULL) +- return TRUE; ++ goto success; ++ + if (ehdr->e_shstrndx == shindex) + { + elf_tdata (abfd)->shstrtab_hdr = *hdr; + elf_elfsections (abfd)[shindex] = &elf_tdata (abfd)->shstrtab_hdr; +- return TRUE; ++ goto success; + } ++ + if (elf_elfsections (abfd)[elf_onesymtab (abfd)]->sh_link == shindex) + { + symtab_strtab: + elf_tdata (abfd)->strtab_hdr = *hdr; + elf_elfsections (abfd)[shindex] = &elf_tdata (abfd)->strtab_hdr; +- return TRUE; ++ goto success; + } ++ + if (elf_elfsections (abfd)[elf_dynsymtab (abfd)]->sh_link == shindex) + { + dynsymtab_strtab: +@@ -1776,8 +1814,9 @@ bfd_section_from_shdr (bfd *abfd, unsign + elf_elfsections (abfd)[shindex] = hdr; + /* We also treat this as a regular section, so that objcopy + can handle it. */ +- return _bfd_elf_make_section_from_shdr (abfd, hdr, name, +- shindex); ++ ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, ++ shindex); ++ goto success; + } + + /* If the string table isn't one of the above, then treat it as a +@@ -1795,9 +1834,9 @@ bfd_section_from_shdr (bfd *abfd, unsign + { + /* Prevent endless recursion on broken objects. */ + if (i == shindex) +- return FALSE; ++ goto fail; + if (! bfd_section_from_shdr (abfd, i)) +- return FALSE; ++ goto fail; + if (elf_onesymtab (abfd) == i) + goto symtab_strtab; + if (elf_dynsymtab (abfd) == i) +@@ -1805,7 +1844,8 @@ bfd_section_from_shdr (bfd *abfd, unsign + } + } + } +- return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); ++ ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); ++ goto success; + + case SHT_REL: + case SHT_RELA: +@@ -1820,7 +1860,7 @@ bfd_section_from_shdr (bfd *abfd, unsign + if (hdr->sh_entsize + != (bfd_size_type) (hdr->sh_type == SHT_REL + ? bed->s->sizeof_rel : bed->s->sizeof_rela)) +- return FALSE; ++ goto fail; + + /* Check for a bogus link to avoid crashing. */ + if (hdr->sh_link >= num_sec) +@@ -1828,8 +1868,9 @@ bfd_section_from_shdr (bfd *abfd, unsign + ((*_bfd_error_handler) + (_("%B: invalid link %lu for reloc section %s (index %u)"), + abfd, hdr->sh_link, name, shindex)); +- return _bfd_elf_make_section_from_shdr (abfd, hdr, name, +- shindex); ++ ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, ++ shindex); ++ goto success; + } + + /* For some incomprehensible reason Oracle distributes +@@ -1870,7 +1911,7 @@ bfd_section_from_shdr (bfd *abfd, unsign + if ((elf_elfsections (abfd)[hdr->sh_link]->sh_type == SHT_SYMTAB + || elf_elfsections (abfd)[hdr->sh_link]->sh_type == SHT_DYNSYM) + && ! bfd_section_from_shdr (abfd, hdr->sh_link)) +- return FALSE; ++ goto fail; + + /* If this reloc section does not use the main symbol table we + don't treat it as a reloc section. BFD can't adequately +@@ -1885,14 +1926,18 @@ bfd_section_from_shdr (bfd *abfd, unsign + || hdr->sh_info >= num_sec + || elf_elfsections (abfd)[hdr->sh_info]->sh_type == SHT_REL + || elf_elfsections (abfd)[hdr->sh_info]->sh_type == SHT_RELA) +- return _bfd_elf_make_section_from_shdr (abfd, hdr, name, +- shindex); ++ { ++ ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, ++ shindex); ++ goto success; ++ } + + if (! bfd_section_from_shdr (abfd, hdr->sh_info)) +- return FALSE; ++ goto fail; ++ + target_sect = bfd_section_from_elf_index (abfd, hdr->sh_info); + if (target_sect == NULL) +- return FALSE; ++ goto fail; + + esdt = elf_section_data (target_sect); + if (hdr->sh_type == SHT_RELA) +@@ -1904,7 +1949,7 @@ bfd_section_from_shdr (bfd *abfd, unsign + amt = sizeof (*hdr2); + hdr2 = (Elf_Internal_Shdr *) bfd_alloc (abfd, amt); + if (hdr2 == NULL) +- return FALSE; ++ goto fail; + *hdr2 = *hdr; + *p_hdr = hdr2; + elf_elfsections (abfd)[shindex] = hdr2; +@@ -1920,34 +1965,40 @@ bfd_section_from_shdr (bfd *abfd, unsign + target_sect->use_rela_p = 1; + } + abfd->flags |= HAS_RELOC; +- return TRUE; ++ goto success; + } + + case SHT_GNU_verdef: + elf_dynverdef (abfd) = shindex; + elf_tdata (abfd)->dynverdef_hdr = *hdr; +- return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); ++ ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); ++ goto success; + + case SHT_GNU_versym: + if (hdr->sh_entsize != sizeof (Elf_External_Versym)) +- return FALSE; ++ goto fail; ++ + elf_dynversym (abfd) = shindex; + elf_tdata (abfd)->dynversym_hdr = *hdr; +- return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); ++ ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); ++ goto success; + + case SHT_GNU_verneed: + elf_dynverref (abfd) = shindex; + elf_tdata (abfd)->dynverref_hdr = *hdr; +- return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); ++ ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); ++ goto success; + + case SHT_SHLIB: +- return TRUE; ++ goto success; + + case SHT_GROUP: + if (! IS_VALID_GROUP_SECTION_HEADER (hdr, GRP_ENTRY_SIZE)) +- return FALSE; ++ goto fail; ++ + if (!_bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex)) +- return FALSE; ++ goto fail; ++ + if (hdr->contents != NULL) + { + Elf_Internal_Group *idx = (Elf_Internal_Group *) hdr->contents; +@@ -1973,7 +2024,7 @@ bfd_section_from_shdr (bfd *abfd, unsign + } + } + } +- break; ++ goto success; + + default: + /* Possibly an attributes section. */ +@@ -1981,14 +2032,14 @@ bfd_section_from_shdr (bfd *abfd, unsign + || hdr->sh_type == bed->obj_attrs_section_type) + { + if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex)) +- return FALSE; ++ goto fail; + _bfd_elf_parse_attributes (abfd, hdr); +- return TRUE; ++ goto success; + } + + /* Check for any processor-specific section types. */ + if (bed->elf_backend_section_from_shdr (abfd, hdr, name, shindex)) +- return TRUE; ++ goto success; + + if (hdr->sh_type >= SHT_LOUSER && hdr->sh_type <= SHT_HIUSER) + { +@@ -2000,9 +2051,12 @@ bfd_section_from_shdr (bfd *abfd, unsign + "specific section `%s' [0x%8x]"), + abfd, name, hdr->sh_type); + else +- /* Allow sections reserved for applications. */ +- return _bfd_elf_make_section_from_shdr (abfd, hdr, name, +- shindex); ++ { ++ /* Allow sections reserved for applications. */ ++ ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, ++ shindex); ++ goto success; ++ } + } + else if (hdr->sh_type >= SHT_LOPROC + && hdr->sh_type <= SHT_HIPROC) +@@ -2023,8 +2077,11 @@ bfd_section_from_shdr (bfd *abfd, unsign + "`%s' [0x%8x]"), + abfd, name, hdr->sh_type); + else +- /* Otherwise it should be processed. */ +- return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); ++ { ++ /* Otherwise it should be processed. */ ++ ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex); ++ goto success; ++ } + } + else + /* FIXME: We should handle this section. */ +@@ -2032,10 +2089,17 @@ bfd_section_from_shdr (bfd *abfd, unsign + (_("%B: don't know how to handle section `%s' [0x%8x]"), + abfd, name, hdr->sh_type); + +- return FALSE; ++ goto fail; + } + +- return TRUE; ++ fail: ++ ret = FALSE; ++ success: ++ if (sections_being_created) ++ sections_being_created [shindex] = FALSE; ++ if (-- nesting == 0) ++ sections_being_created = NULL; ++ return ret; + } + + /* Return the local symbol specified by ABFD, R_SYMNDX. */ +Index: binutils-2.24/bfd/peXXigen.c +=================================================================== +--- binutils-2.24.orig/bfd/peXXigen.c ++++ binutils-2.24/bfd/peXXigen.c +@@ -1528,7 +1528,12 @@ pe_print_edata (bfd * abfd, void * vfile + _("\nExport Address Table -- Ordinal Base %ld\n"), + edt.base); + +- for (i = 0; i < edt.num_functions; ++i) ++ /* PR 17512: Handle corrupt PE binaries. */ ++ if (edt.eat_addr + (edt.num_functions * 4) - adj >= datasize) ++ fprintf (file, _("\tInvalid Export Address Table rva (0x%lx) or entry count (0x%lx)\n"), ++ (long) edt.eat_addr, ++ (long) edt.num_functions); ++ else for (i = 0; i < edt.num_functions; ++i) + { + bfd_vma eat_member = bfd_get_32 (abfd, + data + edt.eat_addr + (i * 4) - adj); +@@ -1564,7 +1569,16 @@ pe_print_edata (bfd * abfd, void * vfile + fprintf (file, + _("\n[Ordinal/Name Pointer] Table\n")); + +- for (i = 0; i < edt.num_names; ++i) ++ /* PR 17512: Handle corrupt PE binaries. */ ++ if (edt.npt_addr + (edt.num_names * 4) - adj >= datasize) ++ fprintf (file, _("\tInvalid Name Pointer Table rva (0x%lx) or entry count (0x%lx)\n"), ++ (long) edt.npt_addr, ++ (long) edt.num_names); ++ else if (edt.ot_addr + (edt.num_names * 2) - adj >= datasize) ++ fprintf (file, _("\tInvalid Ordinal Table rva (0x%lx) or entry count (0x%lx)\n"), ++ (long) edt.ot_addr, ++ (long) edt.num_names); ++ else for (i = 0; i < edt.num_names; ++i) + { + bfd_vma name_ptr = bfd_get_32 (abfd, + data + +Index: binutils-2.24/bfd/ChangeLog +=================================================================== +--- binutils-2.24.orig/bfd/ChangeLog ++++ binutils-2.24/bfd/ChangeLog +@@ -1,8 +1,13 @@ + 2014-10-27 Nick Clifton <nickc@redhat.com> + + PR binutils/17512 ++ * elf.c (bfd_section_from_shdr): Detect and warn about ELF ++ binaries with a group of sections linked by the string table ++ indicies. + * peXXigen.c (_bfd_XXi_swap_aouthdr_in): Handle corrupt binaries + with an invalid value for NumberOfRvaAndSizes. ++ (pe_print_edata): Detect out of range rvas and entry counts for ++ the Export Address table, Name Pointer table and Ordinal table. + + PR binutils/17510 + * elf.c (setup_group): Improve handling of corrupt group diff --git a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8503.patch b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8503.patch new file mode 100644 index 0000000000..2dd3354fc1 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8503.patch @@ -0,0 +1,47 @@ +Upstream-Status: Backport + +CVE-2014-8503 fix. + +[YOCTO #7084] + +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +From 0102ea8cec5fc509bba6c91df61b7ce23a799d32 Mon Sep 17 00:00:00 2001 +From: Nick Clifton <nickc@redhat.com> +Date: Thu, 30 Oct 2014 17:16:17 +0000 +Subject: [PATCH] Fixes a seg-fault in the ihex parser when it encounters a + malformed ihex file. + + PR binutils/17512 + * ihex.c (ihex_scan): Fix typo in invocation of ihex_bad_byte. +--- + bfd/ChangeLog | 1 + + bfd/ihex.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +Index: binutils-2.24/bfd/ihex.c +=================================================================== +--- binutils-2.24.orig/bfd/ihex.c ++++ binutils-2.24/bfd/ihex.c +@@ -322,7 +322,7 @@ ihex_scan (bfd *abfd) + { + if (! ISHEX (buf[i])) + { +- ihex_bad_byte (abfd, lineno, hdr[i], error); ++ ihex_bad_byte (abfd, lineno, buf[i], error); + goto error_return; + } + } +Index: binutils-2.24/bfd/ChangeLog +=================================================================== +--- binutils-2.24.orig/bfd/ChangeLog ++++ binutils-2.24/bfd/ChangeLog +@@ -1,3 +1,8 @@ ++2014-10-30 Nick Clifton <nickc@redhat.com> ++ ++ PR binutils/17512 ++ * ihex.c (ihex_scan): Fix typo in invocation of ihex_bad_byte. ++ + 2014-10-27 Nick Clifton <nickc@redhat.com> + + PR binutils/17512 diff --git a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8504.patch b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8504.patch new file mode 100644 index 0000000000..b4d1d1ff61 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8504.patch @@ -0,0 +1,75 @@ +Upstream-Status: Backport + +CVE-2014-8504 fix. + +[YOCTO #7084] + +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +From 708d7d0d11f0f2d776171979aa3479e8e12a38a0 Mon Sep 17 00:00:00 2001 +From: Nick Clifton <nickc@redhat.com> +Date: Tue, 28 Oct 2014 10:48:14 +0000 +Subject: [PATCH] This patch fixes a flaw in the SREC parser which could cause + a stack overflow and potential secuiryt breach. + + PR binutils/17510 + * srec.c (srec_bad_byte): Increase size of buf to allow for + negative values. + (srec_scan): Use an unsigned char buffer to hold header bytes. +--- + bfd/ChangeLog | 8 ++++++++ + bfd/elf.c | 2 +- + bfd/peXXigen.c | 1 - + bfd/srec.c | 4 ++-- + 4 files changed, 11 insertions(+), 4 deletions(-) + +Index: binutils-2.24/bfd/ChangeLog +=================================================================== +--- binutils-2.24.orig/bfd/ChangeLog ++++ binutils-2.24/bfd/ChangeLog +@@ -1,3 +1,11 @@ ++2014-10-28 Andreas Schwab <schwab@suse.de> ++ Nick Clifton <nickc@redhat.com> ++ ++ PR binutils/17510 ++ * srec.c (srec_bad_byte): Increase size of buf to allow for ++ negative values. ++ (srec_scan): Use an unsigned char buffer to hold header bytes. ++ + 2014-10-30 Nick Clifton <nickc@redhat.com> + + PR binutils/17512 +Index: binutils-2.24/bfd/peXXigen.c +=================================================================== +--- binutils-2.24.orig/bfd/peXXigen.c ++++ binutils-2.24/bfd/peXXigen.c +@@ -471,7 +471,6 @@ _bfd_XXi_swap_aouthdr_in (bfd * abfd, + a->NumberOfRvaAndSizes = 0; + } + +- + for (idx = 0; idx < a->NumberOfRvaAndSizes; idx++) + { + /* If data directory is empty, rva also should be 0. */ +Index: binutils-2.24/bfd/srec.c +=================================================================== +--- binutils-2.24.orig/bfd/srec.c ++++ binutils-2.24/bfd/srec.c +@@ -248,7 +248,7 @@ srec_bad_byte (bfd *abfd, + } + else + { +- char buf[10]; ++ char buf[40]; + + if (! ISPRINT (c)) + sprintf (buf, "\\%03o", (unsigned int) c); +@@ -454,7 +454,7 @@ srec_scan (bfd *abfd) + case 'S': + { + file_ptr pos; +- char hdr[3]; ++ unsigned char hdr[3]; + unsigned int bytes, min_bytes; + bfd_vma address; + bfd_byte *data; diff --git a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8737.patch b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8737.patch new file mode 100644 index 0000000000..4a84562201 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8737.patch @@ -0,0 +1,177 @@ +Upstream-Status: Backport + +CVE-2014-8737 fix. + +[YOCTO #7084] + +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +From dd9b91de2149ee81d47f708e7b0bbf57da10ad42 Mon Sep 17 00:00:00 2001 +From: Nick Clifton <nickc@redhat.com> +Date: Thu, 6 Nov 2014 14:49:10 +0000 +Subject: [PATCH] Prevent archive memebers with illegal pathnames from being + extracted from an archive. + + PR binutils/17552, binutils/17533 + * bucomm.c (is_valid_archive_path): New function. Returns false + for absolute pathnames and pathnames that include /../. + * bucomm.h (is_valid_archive_path): Add prototype. + * ar.c (extract_file): Use new function to check for valid + pathnames when extracting files from an archive. + * objcopy.c (copy_archive): Likewise. + * doc/binutils.texi: Update documentation to mention the + limitation on pathname of archive members. +--- + binutils/ChangeLog | 16 ++++++++++++++-- + binutils/ar.c | 9 +++++++++ + binutils/bucomm.c | 26 ++++++++++++++++++++++++++ + binutils/bucomm.h | 12 ++++++++---- + binutils/doc/binutils.texi | 3 ++- + binutils/objcopy.c | 6 ++++++ + 6 files changed, 65 insertions(+), 7 deletions(-) + +Index: binutils-2.24/binutils/ar.c +=================================================================== +--- binutils-2.24.orig/binutils/ar.c ++++ binutils-2.24/binutils/ar.c +@@ -1031,6 +1031,15 @@ extract_file (bfd *abfd) + bfd_size_type size; + struct stat buf; + ++ /* PR binutils/17533: Do not allow directory traversal ++ outside of the current directory tree. */ ++ if (! is_valid_archive_path (bfd_get_filename (abfd))) ++ { ++ non_fatal (_("illegal pathname found in archive member: %s"), ++ bfd_get_filename (abfd)); ++ return; ++ } ++ + if (bfd_stat_arch_elt (abfd, &buf) != 0) + /* xgettext:c-format */ + fatal (_("internal stat error on %s"), bfd_get_filename (abfd)); +Index: binutils-2.24/binutils/bucomm.c +=================================================================== +--- binutils-2.24.orig/binutils/bucomm.c ++++ binutils-2.24/binutils/bucomm.c +@@ -624,3 +624,29 @@ bfd_get_archive_filename (const bfd *abf + bfd_get_filename (abfd)); + return buf; + } ++ ++/* Returns TRUE iff PATHNAME, a filename of an archive member, ++ is valid for writing. For security reasons absolute paths ++ and paths containing /../ are not allowed. See PR 17533. */ ++ ++bfd_boolean ++is_valid_archive_path (char const * pathname) ++{ ++ const char * n = pathname; ++ ++ if (IS_ABSOLUTE_PATH (n)) ++ return FALSE; ++ ++ while (*n) ++ { ++ if (*n == '.' && *++n == '.' && ( ! *++n || IS_DIR_SEPARATOR (*n))) ++ return FALSE; ++ ++ while (*n && ! IS_DIR_SEPARATOR (*n)) ++ n++; ++ while (IS_DIR_SEPARATOR (*n)) ++ n++; ++ } ++ ++ return TRUE; ++} +Index: binutils-2.24/binutils/bucomm.h +=================================================================== +--- binutils-2.24.orig/binutils/bucomm.h ++++ binutils-2.24/binutils/bucomm.h +@@ -23,6 +23,8 @@ + #ifndef _BUCOMM_H + #define _BUCOMM_H + ++/* In bucomm.c. */ ++ + /* Return the filename in a static buffer. */ + const char *bfd_get_archive_filename (const bfd *); + +@@ -58,20 +60,22 @@ bfd_vma parse_vma (const char *, const c + + off_t get_file_size (const char *); + ++bfd_boolean is_valid_archive_path (char const *); ++ + extern char *program_name; + +-/* filemode.c */ ++/* In filemode.c. */ + void mode_string (unsigned long, char *); + +-/* version.c */ ++/* In version.c. */ + extern void print_version (const char *); + +-/* rename.c */ ++/* In rename.c. */ + extern void set_times (const char *, const struct stat *); + + extern int smart_rename (const char *, const char *, int); + +-/* libiberty. */ ++/* In libiberty. */ + void *xmalloc (size_t); + + void *xrealloc (void *, size_t); +Index: binutils-2.24/binutils/doc/binutils.texi +=================================================================== +--- binutils-2.24.orig/binutils/doc/binutils.texi ++++ binutils-2.24/binutils/doc/binutils.texi +@@ -234,7 +234,8 @@ a normal archive. Instead the elements + individually to the second archive. + + The paths to the elements of the archive are stored relative to the +-archive itself. ++archive itself. For security reasons absolute paths and paths with a ++@code{/../} component are not allowed. + + @cindex compatibility, @command{ar} + @cindex @command{ar} compatibility +Index: binutils-2.24/binutils/objcopy.c +=================================================================== +--- binutils-2.24.orig/binutils/objcopy.c ++++ binutils-2.24/binutils/objcopy.c +@@ -2206,6 +2206,12 @@ copy_archive (bfd *ibfd, bfd *obfd, cons + bfd_boolean del = TRUE; + bfd_boolean ok_object; + ++ /* PR binutils/17533: Do not allow directory traversal ++ outside of the current directory tree by archive members. */ ++ if (! is_valid_archive_path (bfd_get_filename (this_element))) ++ fatal (_("illegal pathname found in archive member: %s"), ++ bfd_get_filename (this_element)); ++ + /* Create an output file for this member. */ + output_name = concat (dir, "/", + bfd_get_filename (this_element), (char *) 0); +Index: binutils-2.24/binutils/ChangeLog +=================================================================== +--- binutils-2.24.orig/binutils/ChangeLog ++++ binutils-2.24/binutils/ChangeLog +@@ -1,3 +1,15 @@ ++2014-11-06 Nick Clifton <nickc@redhat.com> ++ ++ PR binutils/17552, binutils/17533 ++ * bucomm.c (is_valid_archive_path): New function. Returns false ++ for absolute pathnames and pathnames that include /../. ++ * bucomm.h (is_valid_archive_path): Add prototype. ++ * ar.c (extract_file): Use new function to check for valid ++ pathnames when extracting files from an archive. ++ * objcopy.c (copy_archive): Likewise. ++ * doc/binutils.texi: Update documentation to mention the ++ limitation on pathname of archive members. ++ + 2013-11-22 Cory Fields <cory@coryfields.com> + + * windres.c (define_resource): Use zero for timestamp, making diff --git a/meta/recipes-devtools/bison/bison_2.3.bb b/meta/recipes-devtools/bison/bison_2.3.bb index 174916bcb1..182e8802b2 100644 --- a/meta/recipes-devtools/bison/bison_2.3.bb +++ b/meta/recipes-devtools/bison/bison_2.3.bb @@ -11,17 +11,12 @@ DEPENDS = "bison-native flex-native" PR = "r1" -BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \ +SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \ file://bison-2.3_m4.patch" -SRC_URI = "${BASE_SRC_URI}" - SRC_URI[md5sum] = "22327efdd5080e2b1acb6e560a04b43a" SRC_URI[sha256sum] = "52f78aa4761a74ceb7fdf770f3554dd84308c3b93c4255e3a5c17558ecda293e" -DEPENDS_class-native = "gettext-native" -SRC_URI_class-native = "${BASE_SRC_URI}" - inherit autotools gettext texinfo acpaths = "-I ${S}/m4" @@ -29,11 +24,3 @@ do_configure_prepend () { rm -f ${S}/m4/*gl.m4 cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/runtime-po/ } - -do_install_append_class-native() { - create_wrapper ${D}/${bindir}/bison \ - M4=${STAGING_BINDIR_NATIVE}/m4 \ - BISON_PKGDATADIR=${STAGING_DATADIR_NATIVE}/bison -} -#bison-native encodes the staging M4 path -BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch new file mode 100644 index 0000000000..65c31a4448 --- /dev/null +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch @@ -0,0 +1,32 @@ +From 373eb51328b5e10529763cad441210e6b0efb24e Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Wed, 11 Feb 2015 22:08:41 -0800 +Subject: [PATCH] Makefile: fix for parallel build + +Fixed: +mkfs.c:300:46: error: 'BTRFS_BUILD_VERSION' undeclared (first use in this function) + fprintf(stderr, "mkfs.btrfs, part of %s\n", BTRFS_BUILD_VERSION); + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 9c69ada..30c6f06 100644 +--- a/Makefile ++++ b/Makefile +@@ -118,7 +118,7 @@ else + AM_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 + endif + +-%.o.d: %.c ++%.o.d: %.c version.h + $(Q)$(CC) -MM -MG -MF $@ -MT $(@:.o.d=.o) -MT $(@:.o.d=.static.o) -MT $@ $(AM_CFLAGS) $(CFLAGS) $< + + .c.o: +-- +1.7.9.5 + diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch deleted file mode 100644 index 6df4e10a19..0000000000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch +++ /dev/null @@ -1,22 +0,0 @@ -Doc generation requires xmlto and ascidoc which we don't have right now. -Disable doc generation until such times as we have the right dependencies. - -RP 2014/7/16 - -Upstream-Status: Inappropriate - -Index: git/Makefile -=================================================================== ---- git.orig/Makefile 2014-07-16 13:21:43.289386655 +0000 -+++ git/Makefile 2014-07-16 13:42:46.453421079 +0000 -@@ -57,8 +57,8 @@ - btrfs_fragment_libs = -lgd -lpng -ljpeg -lfreetype - - SUBDIRS = --BUILDDIRS = $(patsubst %,build-%,$(SUBDIRS)) build-Documentation --INSTALLDIRS = $(patsubst %,install-%,$(SUBDIRS)) install-Documentation -+BUILDDIRS = $(patsubst %,build-%,$(SUBDIRS)) -+INSTALLDIRS = $(patsubst %,install-%,$(SUBDIRS)) - CLEANDIRS = $(patsubst %,clean-%,$(SUBDIRS)) - - .PHONY: $(SUBDIRS) diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb index 0eed13bfb1..d86075c4c6 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb @@ -12,13 +12,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067" SECTION = "base" DEPENDS = "util-linux attr e2fsprogs lzo acl" -SRCREV = "24cf4d8c3ee924b474f68514e0167cc2e602a48d" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git \ - file://nodocs.patch" +SRCREV = "344599a7aefe23c7169ccdde3ad1b921bb60024c" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ + file://fix-parallel.patch \ +" + S = "${WORKDIR}/git" -PV = "3.14.2+git${SRCPV}" +PV = "3.18.2+git${SRCPV}" +EXTRA_OEMAKE += "DISABLE_DOCUMENTATION=1" do_install () { oe_runmake 'DESTDIR=${D}' install diff --git a/meta/recipes-devtools/build-compare/build-compare_git.bb b/meta/recipes-devtools/build-compare/build-compare_git.bb new file mode 100644 index 0000000000..418aee0d5e --- /dev/null +++ b/meta/recipes-devtools/build-compare/build-compare_git.bb @@ -0,0 +1,27 @@ +SUMMARY = "Build Result Compare Script" +DESCRIPTION = "This package contains scripts to find out if the build result\ +differs to a former build." +HOMEPAGE = "https://github.com/openSUSE/build-compare" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "git://github.com/openSUSE/build-compare.git" +SRC_URI += "file://Rename-rpm-check.sh-to-pkg-diff.sh.patch;striplevel=1" +SRC_URI += "file://Ignore-DWARF-sections.patch;striplevel=1" +PATCHTOOL = "git" + +SRCREV = "c5352c054c6ef15735da31b76d6d88620f4aff0a" + +S = "${WORKDIR}/git" + +BBCLASSEXTEND += "native nativesdk" + +do_install() { + install -d ${D}/${bindir} + install -m 755 functions.sh ${D}/${bindir} + install -m 755 pkg-diff.sh ${D}/${bindir} + install -m 755 same-build-result.sh ${D}/${bindir} + install -m 755 srpm-check.sh ${D}/${bindir} +} + +RDEPENDS_${PN} += "bash" diff --git a/meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch b/meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch new file mode 100644 index 0000000000..7dda1acbf2 --- /dev/null +++ b/meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch @@ -0,0 +1,40 @@ +From 015715694eadd714b903f30ade876e0738d44974 Mon Sep 17 00:00:00 2001 +From: Randy Witt <randy.e.witt@linux.intel.com> +Date: Mon, 5 Jan 2015 15:09:20 -0800 +Subject: [PATCH] Ignore DWARF sections. + +Assume for now that we don't care about the DWARF sections due to path +differences. However, in the case the tool is ran on a "debug" package +it will most likely falsely say the packages have no differences. + +Upstream-Status: Inappropriate [other] + +The package difference tool is correctly labelling the packages as different +when the DWARF sections don't match due to paths. The paths in the debug info +should actually be made to be the same using compile flags or some other +mechanism. + +However, to make the tool more useful to Yocto until the work can be done +to ensure identical paths in debug sections, this patch is being applied. + +Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> +--- + pkg-diff.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pkg-diff.sh b/pkg-diff.sh +index 56035c1..0f1fa76 100755 +--- a/pkg-diff.sh ++++ b/pkg-diff.sh +@@ -658,7 +658,7 @@ check_single_file() + echo "" >$file1 + echo "" >$file2 + # Don't compare .build-id and .gnu_debuglink sections +- sections="$(objdump -s new/$file | grep "Contents of section .*:" | sed -r "s,.* (.*):,\1,g" | grep -v -e "\.build-id" -e "\.gnu_debuglink" | tr "\n" " ")" ++ sections="$(objdump -s new/$file | grep "Contents of section .*:" | sed -r "s,.* (.*):,\1,g" | grep -v -e "\.build-id" -e "\.gnu_debuglink" -e "\.debug_abbrev" -e "\.debug_aranges" -e "\.debug_frame" -e "\.debug_info" -e "\.debug_line" -e "\.debug_loc" -e "\.debug_macinfo" -e "\.debug_pubnames" -e "\.debug_pubtypes" -e "\.debug_ranges" -e "\.debug_str" | tr "\n" " ")" + for section in $sections; do + objdump -s -j $section old/$file | sed "s,^old/,," > $file1 + objdump -s -j $section new/$file | sed "s,^new/,," > $file2 +-- +1.9.3 + diff --git a/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch b/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch new file mode 100644 index 0000000000..cff3a9e236 --- /dev/null +++ b/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch @@ -0,0 +1,1599 @@ +From 4de3df5a1b361cd09a081f0e0bdb94cbf684ed48 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 19 Feb 2015 00:34:47 -0800 +Subject: [PATCH] Rename rpm-check.sh to pkg-diff.sh. + +The tool now accepts package input other than rpm, so change the name +which could be misleading. + +Upstream-Status: Submitted [https://github.com/openSUSE/build-compare/pulls] + +Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> + +Updated for rpm-check.sh. + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + build-compare.spec | 2 +- + pkg-diff.sh | 765 ++++++++++++++++++++++++++++++++++++++++++++++++++ + rpm-check.sh | 764 ------------------------------------------------- + same-build-result.sh | 4 +- + 4 files changed, 768 insertions(+), 767 deletions(-) + create mode 100644 pkg-diff.sh + delete mode 100755 rpm-check.sh + +diff --git a/build-compare.spec b/build-compare.spec +index 14a97e9..5f47ca1 100644 +--- a/build-compare.spec ++++ b/build-compare.spec +@@ -25,7 +25,7 @@ Version: 2015.02.10 + Release: 0 + Source1: COPYING + Source2: same-build-result.sh +-Source3: rpm-check.sh ++Source3: pkg-diff.sh + Source4: functions.sh + Source5: srpm-check.sh + BuildRoot: %{_tmppath}/%{name}-%{version}-build +diff --git a/pkg-diff.sh b/pkg-diff.sh +new file mode 100644 +index 0000000..56035c1 +--- /dev/null ++++ b/pkg-diff.sh +@@ -0,0 +1,765 @@ ++#! /bin/bash ++# ++# Copyright (c) 2009, 2010, 2011, 2012 SUSE Linux Product GmbH, Germany. ++# Licensed under GPL v2, see COPYING file for details. ++# ++# Written by Michael Matz and Stephan Coolo ++# Enhanced by Andreas Jaeger ++ ++FUNCTIONS=${0%/*}/functions.sh ++ ++check_all= ++case $1 in ++ -a | --check-all) ++ check_all=1 ++ shift ++esac ++ ++if test "$#" != 2; then ++ echo "usage: $0 [-a|--check-all] old.rpm new.rpm" ++ exit 1 ++fi ++ ++self_script=$(cd $(dirname $0); echo $(pwd)/$(basename $0)) ++ ++source $FUNCTIONS ++ ++oldpkg=`readlink -f $1` ++newpkg=`readlink -f $2` ++rename_script=`mktemp` ++ ++if test ! -f "$oldpkg"; then ++ echo "can't open $1" ++ exit 1 ++fi ++ ++if test ! -f "$newpkg"; then ++ echo "can't open $2" ++ exit 1 ++fi ++ ++#usage unjar <file> ++function unjar() ++{ ++ local file ++ file=$1 ++ ++ if [[ $(type -p fastjar) ]]; then ++ UNJAR=fastjar ++ elif [[ $(type -p jar) ]]; then ++ UNJAR=jar ++ elif [[ $(type -p unzip) ]]; then ++ UNJAR=unzip ++ else ++ echo "ERROR: jar, fastjar, or unzip is not installed (trying file $file)" ++ exit 1 ++ fi ++ ++ case $UNJAR in ++ jar|fastjar) ++ # echo jar -xf $file ++ ${UNJAR} -xf $file ++ ;; ++ unzip) ++ unzip -oqq $file ++ ;; ++ esac ++} ++ ++# list files in directory ++#usage unjar_l <file> ++function unjar_l() ++{ ++ local file ++ file=$1 ++ ++ if [[ $(type -p fastjar) ]]; then ++ UNJAR=fastjar ++ elif [[ $(type -p jar) ]]; then ++ UNJAR=jar ++ elif [[ $(type -p unzip) ]]; then ++ UNJAR=unzip ++ else ++ echo "ERROR: jar, fastjar, or unzip is not installed (trying file $file)" ++ exit 1 ++ fi ++ ++ case $UNJAR in ++ jar|fastjar) ++ ${UNJAR} -tf $file ++ ;; ++ unzip) ++ unzip -l $file ++ ;; ++ esac ++} ++ ++filter_disasm() ++{ ++ sed -e 's/^ *[0-9a-f]\+://' -e 's/\$0x[0-9a-f]\+/$something/' -e 's/callq *[0-9a-f]\+/callq /' -e 's/# *[0-9a-f]\+/# /' -e 's/\(0x\)\?[0-9a-f]\+(/offset(/' -e 's/[0-9a-f]\+ </</' -e 's/^<\(.*\)>:/\1:/' -e 's/<\(.*\)+0x[0-9a-f]\+>/<\1 + ofs>/' ++} ++ ++echo "Comparing `basename $oldpkg` to `basename $newpkg`" ++ ++case $oldpkg in ++ *.rpm) ++ cmp_spec $rename_script $oldpkg $newpkg ++ RES=$? ++ case $RES in ++ 0) ++ echo "RPM meta information is identical" ++ if test -z "$check_all"; then ++ exit 0 ++ fi ++ ;; ++ 1) ++ echo "RPM meta information is different" ++ if test -z "$check_all"; then ++ exit 1 ++ fi ++ ;; ++ 2) ++ echo "RPM file checksum differs." ++ RES=0 ++ ;; ++ *) ++ echo "Wrong exit code!" ++ exit 1 ++ ;; ++ esac ++ ;; ++esac ++ ++file1=`mktemp` ++file2=`mktemp` ++ ++dir=`mktemp -d` ++echo "Extracting packages" ++unpackage $oldpkg $dir/old ++unpackage $newpkg $dir/new ++ ++# files is set in cmp_spec for rpms, so if RES is empty we should assume ++# it wasn't an rpm and pick all files for comparison. ++if [ -z $RES ]; then ++ oldfiles=`cd $dir/old; find . -type f` ++ newfiles=`cd $dir/new; find . -type f` ++ ++ files=`echo -e "$oldfiles\n$newfiles" | sort -u` ++fi ++ ++cd $dir ++bash $rename_script ++ ++dfile=`mktemp` ++ ++diff_two_files() ++{ ++ if ! cmp -s old/$file new/$file; then ++ echo "$file differs ($ftype)" ++ hexdump -C old/$file > $file1 ++ hexdump -C new/$file > $file2 ++ diff -u $file1 $file2 | head -n 200 ++ return 1 ++ fi ++ return 0 ++} ++ ++trim_man_first_line() ++{ ++ # Handles the first line if it is like: ++ #.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) ++ #.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3. ++ local f=$1 ++ sed -i -e '1{ ++ s|^\.\\"[[:blank:]]\+Automatically[[:blank:]]generated[[:blank:]]by[[:blank:]]Pod::Man[[:blank:]].*|.\\" Overly verbose Pod::Man| ++ s|^\.\\"[[:blank:]]\+DO[[:blank:]]NOT[[:blank:]]MODIFY[[:blank:]]THIS[[:blank:]]FILE![[:blank:]]\+It[[:blank:]]was[[:blank:]]generated[[:blank:]]by[[:blank:]]help2man[[:blank:]].*|.\\" Overly verbose help2man| ++ }' $f ++} ++ ++trim_man_TH() ++{ ++ # Handles lines like: ++ # .TH debhelper 7 "2010-02-27" "7.4.15" "Debhelper" ++ # .TH DIRMNGR-CLIENT 1 2010-02-27 "Dirmngr 1.0.3" "GNU Privacy Guard" ++ # .TH ccmake 1 "March 06, 2010" "ccmake 2.8.1-rc3" ++ # .TH QEMU-IMG 1 "2010-03-14" " " " " ++ # .TH kdecmake 1 "May 07, 2010" "cmake 2.8.1" ++ # .TH "appender.h" 3 "12 May 2010" "Version 1.2.1" "log4c" \" -*- nroff -*- ++ # .TH "appender.h" 3 "Tue Aug 31 2010" "Version 1.2.1" "log4c" \" -*- nroff -*- ++ # .TH "OFFLINEIMAP" "1" "11 May 2010" "John Goerzen" "OfflineIMAP Manual" ++ # .TH gv 3guile "13 May 2010" ++ #.TH "GIT\-ARCHIMPORT" "1" "09/13/2010" "Git 1\&.7\&.1" "Git Manual" ++ # .TH LDIRECTORD 8 "2010-10-20" "perl v5.12.2" "User Contributed Perl Documentation" ++ # .TH ccmake 1 "February 05, 2012" "ccmake 2.8.7" ++ # .TH "appender.h" 3 "Tue Aug 31 2010" "Version 1.2.1" "log4c" \" -*- nroff -*- ++ # .TH ARCH "1" "September 2010" "GNU coreutils 8.5" "User Commands" ++ # .TH "GCM-CALIBRATE" "1" "03 February 2012" "" "" ++ #.TH Locale::Po4a::Xml.pm 3pm "2015-01-30" "Po4a Tools" "Po4a Tools" ++ local f=$1 ++ # (.TH quoted section) (quoted_date)(*) ++ sed -i -e 's|^\([[:blank:]]*\.TH[[:blank:]]\+"[^"]\+"[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\("[^"]\+"\)\([[:blank:]]\+.*\)\?|\1 "qq2000-01-01"\3|' $f ++ # (.TH unquoted section) (quoted_date)(*) ++ sed -i -e 's|^\([[:blank:]]*\.TH[[:blank:]]\+[^"][^[:blank:]]\+[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\("[^"]\+"\)\([[:blank:]]\+.*\)\?|\1 "uq2000-02-02"\3|' $f ++ # (.TH quoted section) (unquoted_date)(*) ++ sed -i -e 's|^\([[:blank:]]*\.TH[[:blank:]]\+"[^"]\+"[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\([^"][^[:blank:]]\+\)\([[:blank:]]\+.*\)\?|\1 qu2000-03-03\3|' $f ++ # (.TH unquoted section) (unquoted_date)(*) ++ sed -i -e 's|^\([[:blank:]]*\.TH[[:blank:]]\+[^"][^[:blank:]]\+[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\([^"][^[:blank:]]\+\)\([[:blank:]]\+.*\)\?|\1 uu2000-04-04\3|' $f ++} ++ ++strip_numbered_anchors() ++{ ++ # Remove numbered anchors on Docbook / HTML files. ++ # This should be save since we remove them from old and new files. ++ # A trailing </a> or </div> tag will stay also on both files. ++ for f in old/$file new/$file; do ++ sed -i -e 's%<[ ]*a[ ]\+name[^<]*[0-9]\+[^<]*%%g' \ ++ -e 's%<[ ]*a[ ]\+href[^<]*#[^<]*[0-9]\+[^<]*%%g' \ ++ -e 's%<[^<]*id="ftn\.[^<]*[0-9]\+[^<]*%%g' $f ++ done ++} ++ ++ ++check_compressed_file() ++{ ++ local file=$1 ++ local ext=$2 ++ local tmpdir=`mktemp -d` ++ local ftype ++ local ret=0 ++ echo "$ext file with odd filename: $file" ++ if test -n "$tmpdir"; then ++ mkdir $tmpdir/{old,new} ++ cp --parents --dereference old/$file $tmpdir/ ++ cp --parents --dereference new/$file $tmpdir/ ++ if pushd $tmpdir > /dev/null ; then ++ case "$ext" in ++ bz2) ++ mv old/$file{,.bz2} ++ mv new/$file{,.bz2} ++ bzip2 -d old/$file.bz2 ++ bzip2 -d new/$file.bz2 ++ ;; ++ gzip) ++ mv old/$file{,.gz} ++ mv new/$file{,.gz} ++ gzip -d old/$file.gz ++ gzip -d new/$file.gz ++ ;; ++ xz) ++ mv old/$file{,.xz} ++ mv new/$file{,.xz} ++ xz -d old/$file.xz ++ xz -d new/$file.xz ++ ;; ++ esac ++ ftype=`/usr/bin/file old/$file | sed 's@^[^:]\+:[[:blank:]]*@@'` ++ case $ftype in ++ POSIX\ tar\ archive) ++ echo "$ext content is: $ftype" ++ mv old/$file{,.tar} ++ mv new/$file{,.tar} ++ if ! check_single_file ${file}.tar; then ++ ret=1 ++ fi ++ ;; ++ ASCII\ cpio\ archive\ *) ++ echo "$ext content is: $ftype" ++ mv old/$file{,.cpio} ++ mv new/$file{,.cpio} ++ if ! check_single_file ${file}.cpio; then ++ ret=1 ++ fi ++ ;; ++ *) ++ echo "unhandled $ext content: $ftype" ++ if ! diff_two_files; then ++ ret=1 ++ fi ++ ;; ++ esac ++ popd > /dev/null ++ fi ++ rm -rf "$tmpdir" ++ fi ++ return $ret ++} ++ ++check_single_file() ++{ ++ local file="$1" ++ case $file in ++ *.spec) ++ sed -i -e "s,Release:.*$release1,Release: @RELEASE@," old/$file ++ sed -i -e "s,Release:.*$release2,Release: @RELEASE@," new/$file ++ ;; ++ *.exe.mdb|*.dll.mdb) ++ # Just debug information, we can skip them ++ echo "$file skipped as debug file." ++ return 0 ++ ;; ++ *.a) ++ flist=`ar t new/$file` ++ pwd=$PWD ++ fdir=`dirname $file` ++ cd old/$fdir ++ ar x `basename $file` ++ cd $pwd/new/$fdir ++ ar x `basename $file` ++ cd $pwd ++ for f in $flist; do ++ if ! check_single_file $fdir/$f; then ++ return 1 ++ fi ++ done ++ return 0 ++ ;; ++ *.cpio) ++ flist=`cpio --quiet --list --force-local < "new/$file"` ++ pwd=$PWD ++ fdir=$file.extract.$PPID.$$ ++ mkdir old/$fdir new/$fdir ++ cd old/$fdir ++ cpio --quiet --extract --force-local < "../${file##*/}" ++ cd $pwd/new/$fdir ++ cpio --quiet --extract --force-local < "../${file##*/}" ++ cd $pwd ++ local ret=0 ++ for f in $flist; do ++ if ! check_single_file $fdir/$f; then ++ ret=1 ++ if test -z "$check_all"; then ++ break ++ fi ++ fi ++ done ++ rm -rf old/$fdir new/$fdir ++ return $ret ++ ;; ++ *.tar|*.tar.bz2|*.tar.gz|*.tgz|*.tbz2) ++ flist=`tar tf new/$file` ++ pwd=$PWD ++ fdir=`dirname $file` ++ cd old/$fdir ++ tar xf `basename $file` ++ cd $pwd/new/$fdir ++ tar xf `basename $file` ++ cd $pwd ++ local ret=0 ++ for f in $flist; do ++ if ! check_single_file $fdir/$f; then ++ ret=1 ++ if test -z "$check_all"; then ++ break ++ fi ++ fi ++ done ++ return $ret ++ ;; ++ *.zip|*.jar|*.war) ++ cd old ++ unjar_l ./$file |sort > flist ++ # 10-05-2010 14:39 ++ sed -i -e "s, [0-9][0-9]-[0-9][0-9]-[0-9]\+ [0-9][0-9]:[0-9][0-9] , date ," flist ++ # 2012-02-03 07:59 ++ sed -i -e "s, 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9] , date ," flist ++ cd ../new ++ unjar_l ./$file |sort> flist ++ sed -i -e "s, [0-9][0-9]-[0-9][0-9]-[0-9]\+ [0-9][0-9]:[0-9][0-9] , date ,; " flist ++ sed -i -e "s, 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9] , date ," flist ++ cd .. ++ if ! cmp -s old/flist new/flist; then ++ echo "$file has different file list" ++ diff -u old/flist new/flist ++ return 1 ++ fi ++ flist=`grep date new/flist | sed -e 's,.* date ,,'` ++ pwd=$PWD ++ fdir=`dirname $file` ++ cd old/$fdir ++ unjar `basename $file` ++ cd $pwd/new/$fdir ++ unjar `basename $file` ++ cd $pwd ++ local ret=0 ++ for f in $flist; do ++ if test -f new/$fdir/$f && ! check_single_file $fdir/$f; then ++ ret=1 ++ if test -z "$check_all"; then ++ break ++ fi ++ fi ++ done ++ return $ret;; ++ *.pyc|*.pyo) ++ perl -e "open fh, '+<', 'old/$file'; seek fh, 4, SEEK_SET; print fh '0000';" ++ perl -e "open fh, '+<', 'new/$file'; seek fh, 4, SEEK_SET; print fh '0000';" ++ ;; ++ *.bz2) ++ bunzip2 -c old/$file > old/${file/.bz2/} ++ bunzip2 -c new/$file > new/${file/.bz2/} ++ check_single_file ${file/.bz2/} ++ return $? ++ ;; ++ *.gz) ++ gunzip -c old/$file > old/${file/.gz/} ++ gunzip -c new/$file > new/${file/.gz/} ++ check_single_file ${file/.gz/} ++ return $? ++ ;; ++ *.rpm) ++ $self_script -a old/$file new/$file ++ return $? ++ ;; ++ *png) ++ # Try to remove timestamps, only if convert from ImageMagick is installed ++ if [[ $(type -p convert) ]]; then ++ convert old/$file +set date:create +set date:modify old/${file/.png/_n.png} ++ convert old/$file +set date:create +set date:modify new/${file/.png/_n.png} ++ if ! cmp -s old/${file/.png/_n.png} new/${file/.png/_n.png}; then ++ echo "$file differs ($ftype)" ++ hexdump -C old/${file/.png/_n.png} > $file1 ++ hexdump -C new/${file/.png/_n.png} > $file2 ++ diff -u $file1 $file2 | head -n 20 ++ return 1 ++ fi ++ return 0 ++ fi ++ ;; ++ /usr/share/locale/*/LC_MESSAGES/*.mo|/usr/share/locale-bundle/*/LC_MESSAGES/*.mo) ++ for f in old/$file new/$file; do ++ sed -i -e "s,POT-Creation-Date: ....-..-.. ..:..+....,POT-Creation-Date: 1970-01-01 00:00+0000," $f ++ done ++ ;; ++ /usr/share/doc/packages/*/*.html|\ ++ /usr/share/doc/kde/HTML/*/*/*.html|/usr/share/doc/*/html/*.html) ++ for f in old/$file new/$file; do ++ # texi2html output, e.g. in kvm, indent, qemu ++ sed -i -e "s|^<!-- Created on .*, 20.. by texi2html .\...|<!-- Created on August 7, 2009 by texi2html 1.82|" $f ++ sed -i -e 's|^ *This document was generated by <em>Autobuild</em> on <em>.*, 20..</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html .\...</em></a>.$| This document was generated by <em>Autobuild</em> on <em>August 7, 2009</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html 1.82</em></a>.|' $f ++ # doxygen docu, e.g. in libssh and log4c ++ sed -i -e 's|Generated on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9] 20[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |' $f ++ # Generated on Sat Aug 14 2010 16:49:48 for libssh ++ sed -i -e 's|Generated on ... ... [0-9]* 20[0-9][0-9] [0-9]*:[0-9][0-9]:[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |' $f ++ done ++ strip_numbered_anchors ++ ;; ++ /usr/share/javadoc/*.html |\ ++ /usr/share/javadoc/*/*.html|/usr/share/javadoc/*/*/*.html) ++ strip_numbered_anchors ++ # There are more timestamps in html, so far we handle only some primitive versions. ++ for f in old/$file new/$file; do ++ # Javadoc: ++ # <head> ++ # <!-- Generated by javadoc (version 1.7.0_75) on Tue Feb 03 02:20:12 GMT 2015 --> ++ # <!-- Generated by javadoc on Tue Feb 03 00:02:48 GMT 2015 --> ++ # <meta name="date" content="2015-02-03"> ++ # </head> ++ sed -i -e ' ++ /^<head>/{ ++ : next ++ n ++ /^<\/head>/{ ++ b end_head ++ } ++ s/^\(<!-- Generated by javadoc\) \((\(build\|version\) [0-9._]\+) on ... ... .. ..:..:.. \(GMT\|UTC\) ....\) \(-->\)/\1 some-date-removed-by-build-compare \5/ ++ t next ++ s/^\(<!-- Generated by javadoc\) \(on ... ... .. ..:..:.. \(GMT\|UTC\) ....\) \(-->\)/\1 some-date-removed-by-build-compare \3/ ++ t next ++ s/^<meta name="date" content="[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}">/<meta name="date" content="some-date-removed-by-build-compare">/ ++ b next ++ } ++ : end_head ++ ' $f ++ # Gjdoc HtmlDoclet: ++ sed -i -e 's%Generated by Gjdoc HtmlDoclet [0-9,.]*, part of <a href="http://www.gnu.org/software/classpath/cp-tools/" title="" target="_top">GNU Classpath Tools</a>, on .*, 20.. [0-9]*:..:.. \(a\|p\)\.m\. GMT.%Generated by Gjdoc.%' $f ++ sed -i -e 's%<!DOCTYPE html PUBLIC "-//gnu.org///DTD XHTML 1.1 plus Target 1.0//EN"\(.*\)GNU Classpath Tools</a>, on [A-Z][a-z]* [0-9]*, 20?? [0-9]*:??:?? \(a|p\)\.m\. GMT.</p>%<!DOCTYPE html PUBLIC "-//gnu.org///DTD XHTML 1.1 plus Target 1.0//EN"\1GNU Classpath Tools</a>, on January 1, 2009 0:00:00 a.m. GMT.</p>%' $f ++ sed -i -e 's%<!DOCTYPE html PUBLIC "-//gnu.org///DTD\(.*GNU Classpath Tools</a>\), on [a-zA-Z]* [0-9][0-9], 20.. [0-9]*:..:.. \(a\|p\)\.m\. GMT.</p>%<!DOCTYPE html PUBLIC "-//gnu.org///DTD\1,on May 1, 2010 1:11:42 p.m. GMT.</p>%' $f ++ # deprecated-list is randomly ordered, sort it for comparison ++ case $f in ++ */deprecated-list.html) ++ sort -o $f $f ++ ;; ++ esac ++ done ++ ;; ++ /usr/share/javadoc/gjdoc.properties |\ ++ /usr/share/javadoc/*/gjdoc.properties) ++ for f in old/$file new/$file; do ++ sed -i -e 's|^#[A-Z][a-z]\{2\} [A-Z][a-z]\{2\} [0-9]\{2\} ..:..:.. GMT 20..$|#Fri Jan 01 11:27:36 GMT 2009|' $f ++ done ++ ;; ++ */fonts.scale|*/fonts.dir|*/encodings.dir) ++ for f in old/$file new/$file; do ++ # sort files before comparing ++ sort -o $f $f ++ done ++ ;; ++ /var/adm/perl-modules/*) ++ for f in old/$file new/$file; do ++ sed -i -e 's|^=head2 ... ... .. ..:..:.. ....: C<Module>|=head2 Wed Jul 1 00:00:00 2009: C<Module>|' $f ++ done ++ ;; ++ /usr/share/man/man3/*3pm) ++ for f in old/$file new/$file; do ++ sed -i -e 's| 3 "20..-..-.." "perl v5....." "User Contributed Perl Documentation"$| 3 "2009-01-01" "perl v5.10.0" "User Contributed Perl Documentation"|' $f ++ trim_man_TH $f ++ trim_man_first_line $f ++ done ++ ;; ++ /usr/share/man/*/man*|/usr/share/man/man*|/usr/lib/texmf/doc/man/*/*) ++ ++ for f in old/$file new/$file; do ++ trim_man_TH $f ++ trim_man_first_line $f ++ # generated by docbook xml: ++ #.\" Date: 09/13/2010 ++ sed -i -e 's|Date: [0-1][0-9]/[0-9][0-9]/201[0-9]|Date: 09/13/2010|' $f ++ done ++ ;; ++ *.elc) ++ # emacs lisp files ++ for f in old/$file new/$file; do ++ sed -i -e 's|Compiled by abuild@.* on ... ... .. ..:..:.. 20..$|compiled by abuild@buildhost on Wed Jul 01 00:00:00 2009|' $f ++ done ++ ;; ++ /var/lib/texmf/web2c/*/*fmt |\ ++ /var/lib/texmf/web2c/metafont/*.base|\ ++ /var/lib/texmf/web2c/metapost/*.mem) ++ # binary dump of TeX and Metafont formats, we can ignore them for good ++ echo "difference in $file ignored." ++ return 0 ++ ;; ++ */libtool) ++ for f in old/$file new/$file; do ++ sed -i -e 's|^# Libtool was configured on host [A-Za-z0-9]*:$|# Libtool was configured on host x42:|' $f ++ done ++ ;; ++ /etc/mail/*cf|/etc/sendmail.cf) ++ # from sendmail package ++ for f in old/$file new/$file; do ++ # - ##### built by abuild@build33 on Thu May 6 11:21:17 UTC 2010 ++ sed -i -e 's|built by abuild@[a-z0-9]* on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9] .* 20[0-9][0-9]|built by abuild@build42 on Thu May 6 11:21:17 UTC 2010|' $f ++ done ++ ;; ++ /usr/share/doc/kde/HTML/*/*/index.cache|/usr/share/doc/kde/HTML/*/*/*/index.cache|\ ++ /usr/share/gtk-doc/html/*/*.html|/usr/share/gtk-doc/html/*/*.devhelp2) ++ # various kde and gtk packages ++ strip_numbered_anchors ++ ;; ++ */created.rid) ++ # ruby documentation ++ # file just contains a timestamp and nothing else, so ignore it ++ echo "Ignore $file" ++ return 0 ++ ;; ++ */rdoc/files/*.html) ++ # ruby documentation ++ # <td>Mon Sep 20 19:02:43 +0000 2010</td> ++ for f in old/$file new/$file; do ++ sed -i -e 's%<td>[A-Z][a-z][a-z] [A-Z][a-z][a-z] [0-9]\+ [0-9]\+:[0-9]\+:[0-9]\+ +0000 201[0-9]</td>%<td>Mon Sep 20 19:02:43 +0000 2010</td>%g' $f ++ done ++ strip_numbered_anchors ++ ;; ++ */Linux*Env.Set.sh) ++ # LibreOffice files, contains: ++ # Generated on: Mon Apr 18 13:19:22 UTC 2011 ++ for f in old/$file new/$file; do ++ sed -i -e 's%^# Generated on:.*UTC 201[0-9] *$%# Generated on: Sometime%g' $f ++ done ++ ;; ++ /usr/lib/libreoffice/solver/inc/*/deliver.log) ++ # LibreOffice log file ++ echo "Ignore $file" ++ return 0 ++ ;; ++ /var/adm/update-messages/*|/var/adm/update-scripts/*) ++ # encode version-release inside ++ oldfn=`echo "$file"|sed -e s/-$release2/-$release1/;` ++ ++ # fetchmsttfonts embeds the release number in the update shell script. ++ echo sed -i -e "s/-$release1/-$release2/g;" "old/$oldfn" ++ sed -i -e "s/-$release1/-$release2/g;" "old/$oldfn" ++ ++ if ! diff -u old/$oldfn new/$file; then ++ echo "$oldfn is not same as $file" ++ return 1 ++ fi ++ echo "$file and $oldfn are same" ++ return 0 ++ ;; ++ *.ps) ++ for f in "old/$file" "new/$file"; do ++ sed -i -e ' ++ /^%%CreationDate:[[:blank:]]/d ++ /^%%Creator:[[:blank:]]groff[[:blank:]]version[[:blank:]]/d ++ /^%DVIPSSource:[[:blank:]]/d ++ ' "$f" ++ done ++ ;; ++ *pdf) ++ # PDF files contain a unique ID, remove it ++ # Format of the ID is: ++ # /ID [<9ACE247A70CF9BEAFEE15E116259BD6D> <9ACE247A70CF9BEAFEE15E116259BD6D>] ++ # with optional spaces. pdftex creates also: ++ # /CreationDate (D:20120103083206Z) ++ # /ModDate (D:20120103083206Z) ++ # and possibly XML metadata as well ++ for f in "old/$file" "new/$file"; do ++ sed -i \ ++ '/obj/,/endobj/{ ++ s%/ID \?\[ \?<[^>]\+> \?<[^>]\+> \?\]%/IDrandom%g; ++ s%/CreationDate \?(D:[^)]*)%/CreationDate (D: XXX)%g; ++ s%/ModDate \?(D:[^)]*)%/ModDate (D: XXX)%g; ++ s%<pdf:CreationDate>[^<]*</pdf:CreationDate>%<pdf:CreationDate>XXX</pdf:CreationDate>%g; ++ s%<pdf:ModDate>[^<]*</pdf:ModDate>%<pdf:ModDate>XXX</pdf:ModDate>%g; ++ s%<xap:CreateDate>[^<]*</xap:CreateDate>%<xap:CreateDate>XXX</xap:CreateDate>%g; ++ s%<xap:ModifyDate>[^<]*</xap:ModifyDate>%<xap:ModifyDate>XXX</xap:ModifyDate>%g; ++ s%<xap:MetadataDate>[^<]*</xap:MetadataDate>%<xap:MetadataDate>XXX</xap:MetadataDate>%g; ++ }' "$f" ++ done ++ ;; ++ esac ++ ++ ftype=`/usr/bin/file old/$file | sed 's@^[^:]\+:[[:blank:]]*@@'` ++ case $ftype in ++ PE32\ executable*Mono\/\.Net\ assembly*) ++ echo "PE32 Mono/.Net assembly: $file" ++ if [ -x /usr/bin/monodis ] ; then ++ monodis old/$file 2>/dev/null|sed -e 's/GUID = {.*}/GUID = { 42 }/;'> ${file1} ++ monodis new/$file 2>/dev/null|sed -e 's/GUID = {.*}/GUID = { 42 }/;'> ${file2} ++ if ! cmp -s ${file1} ${file2}; then ++ echo "$file differs ($ftype)" ++ diff -u ${file1} ${file2} ++ return 1 ++ fi ++ else ++ echo "Cannot compare, no monodis installed" ++ return 1 ++ fi ++ ;; ++ ELF*executable*|ELF*[LM]SB\ shared\ object*) ++ objdump -d --no-show-raw-insn old/$file | filter_disasm > $file1 ++ if ! test -s $file1; then ++ # objdump has no idea how to handle it ++ if ! diff_two_files; then ++ ret=1 ++ break ++ fi ++ fi ++ elfdiff= ++ sed -i -e "s,old/,," $file1 ++ objdump -d --no-show-raw-insn new/$file | filter_disasm > $file2 ++ sed -i -e "s,new/,," $file2 ++ if ! diff -u $file1 $file2 > $dfile; then ++ echo "$file differs in assembler output" ++ head -n 200 $dfile ++ elfdiff="1" ++ fi ++ echo "" >$file1 ++ echo "" >$file2 ++ # Don't compare .build-id and .gnu_debuglink sections ++ sections="$(objdump -s new/$file | grep "Contents of section .*:" | sed -r "s,.* (.*):,\1,g" | grep -v -e "\.build-id" -e "\.gnu_debuglink" | tr "\n" " ")" ++ for section in $sections; do ++ objdump -s -j $section old/$file | sed "s,^old/,," > $file1 ++ objdump -s -j $section new/$file | sed "s,^new/,," > $file2 ++ if ! diff -u $file1 $file2 > $dfile; then ++ echo "$file differs in ELF section $section" ++ head -n 200 $dfile ++ elfdiff="1" ++ fi ++ done ++ if test -z "$elfdiff"; then ++ echo "$file: only difference was in build-id or gnu_debuglink, GOOD." ++ return 0 ++ fi ++ return 1 ++ ;; ++ *ASCII*|*text*) ++ if ! cmp -s old/$file new/$file; then ++ echo "$file differs ($ftype)" ++ diff -u old/$file new/$file | head -n 200 ++ return 1 ++ fi ++ ;; ++ directory|setuid,\ directory|sticky,\ directory) ++ # tar might package directories - ignore them here ++ return 0 ++ ;; ++ bzip2\ compressed\ data*) ++ if ! check_compressed_file "$file" "bz2"; then ++ return 1 ++ fi ++ ;; ++ gzip\ compressed\ data*) ++ if ! check_compressed_file "$file" "gzip"; then ++ return 1 ++ fi ++ ;; ++ XZ\ compressed\ data*) ++ if ! check_compressed_file "$file" "xz"; then ++ return 1 ++ fi ++ ;; ++ POSIX\ tar\ archive) ++ mv old/$file{,.tar} ++ mv new/$file{,.tar} ++ if ! check_single_file ${file}.tar; then ++ return 1 ++ fi ++ ;; ++ cpio\ archive) ++ mv old/$file{,.cpio} ++ mv new/$file{,.cpio} ++ if ! check_single_file ${file}.cpio; then ++ return 1 ++ fi ++ ;; ++ symbolic\ link\ to\ *) ++ readlink "old/$file" > $file1 ++ readlink "new/$file" > $file2 ++ if ! diff -u $file1 $file2; then ++ echo "symlink target for $file differs" ++ return 1 ++ fi ++ ;; ++ *) ++ if ! diff_two_files; then ++ return 1 ++ fi ++ ;; ++ esac ++ return 0 ++} ++ ++# We need /proc mounted for some tests, so check that it's mounted and ++# complain if not. ++PROC_MOUNTED=0 ++if [ ! -d /proc/self/ ]; then ++ echo "/proc is not mounted" ++ mount -orw -n -tproc none /proc ++ PROC_MOUNTED=1 ++fi ++ ++# preserve cmp_spec result for check_all runs ++ret=$RES ++for file in $files; do ++ if ! check_single_file $file; then ++ ret=1 ++ if test -z "$check_all"; then ++ break ++ fi ++ fi ++done ++ ++if [ "$PROC_MOUNTED" -eq "1" ]; then ++ echo "Unmounting proc" ++ umount /proc ++fi ++ ++rm $file1 $file2 $dfile $rename_script ++rm -rf $dir ++if test "$ret" = 0; then ++ echo "Package content is identical" ++fi ++exit $ret ++# vim: tw=666 ts=2 et +diff --git a/rpm-check.sh b/rpm-check.sh +deleted file mode 100755 +index dd47642..0000000 +--- a/rpm-check.sh ++++ /dev/null +@@ -1,764 +0,0 @@ +-#! /bin/bash +-# +-# Copyright (c) 2009, 2010, 2011, 2012 SUSE Linux Product GmbH, Germany. +-# Licensed under GPL v2, see COPYING file for details. +-# +-# Written by Michael Matz and Stephan Coolo +-# Enhanced by Andreas Jaeger +- +-FUNCTIONS=${0%/*}/functions.sh +- +-check_all= +-case $1 in +- -a | --check-all) +- check_all=1 +- shift +-esac +- +-if test "$#" != 2; then +- echo "usage: $0 [-a|--check-all] old.rpm new.rpm" +- exit 1 +-fi +- +-self_script=$(cd $(dirname $0); echo $(pwd)/$(basename $0)) +- +-source $FUNCTIONS +- +-oldpkg=`readlink -f $1` +-newpkg=`readlink -f $2` +-rename_script=`mktemp` +- +-if test ! -f "$oldpkg"; then +- echo "can't open $1" +- exit 1 +-fi +- +-if test ! -f "$newpkg"; then +- echo "can't open $2" +- exit 1 +-fi +- +-#usage unjar <file> +-function unjar() +-{ +- local file +- file=$1 +- +- if [[ $(type -p fastjar) ]]; then +- UNJAR=fastjar +- elif [[ $(type -p jar) ]]; then +- UNJAR=jar +- elif [[ $(type -p unzip) ]]; then +- UNJAR=unzip +- else +- echo "ERROR: jar, fastjar, or unzip is not installed (trying file $file)" +- exit 1 +- fi +- +- case $UNJAR in +- jar|fastjar) +- # echo jar -xf $file +- ${UNJAR} -xf $file +- ;; +- unzip) +- unzip -oqq $file +- ;; +- esac +-} +- +-# list files in directory +-#usage unjar_l <file> +-function unjar_l() +-{ +- local file +- file=$1 +- +- if [[ $(type -p fastjar) ]]; then +- UNJAR=fastjar +- elif [[ $(type -p jar) ]]; then +- UNJAR=jar +- elif [[ $(type -p unzip) ]]; then +- UNJAR=unzip +- else +- echo "ERROR: jar, fastjar, or unzip is not installed (trying file $file)" +- exit 1 +- fi +- +- case $UNJAR in +- jar|fastjar) +- ${UNJAR} -tf $file +- ;; +- unzip) +- unzip -l $file +- ;; +- esac +-} +- +-filter_disasm() +-{ +- sed -e 's/^ *[0-9a-f]\+://' -e 's/\$0x[0-9a-f]\+/$something/' -e 's/callq *[0-9a-f]\+/callq /' -e 's/# *[0-9a-f]\+/# /' -e 's/\(0x\)\?[0-9a-f]\+(/offset(/' -e 's/[0-9a-f]\+ </</' -e 's/^<\(.*\)>:/\1:/' -e 's/<\(.*\)+0x[0-9a-f]\+>/<\1 + ofs>/' +-} +- +-echo "Comparing `basename $oldpkg` to `basename $newpkg`" +- +-case $oldpkg in +- *.rpm) +- cmp_spec $rename_script $oldpkg $newpkg +- RES=$? +- case $RES in +- 0) +- echo "RPM meta information is identical" +- if test -z "$check_all"; then +- exit 0 +- fi +- ;; +- 1) +- echo "RPM meta information is different" +- if test -z "$check_all"; then +- exit 1 +- fi +- ;; +- 2) +- echo "RPM file checksum differs." +- RES=0 +- ;; +- *) +- echo "Wrong exit code!" +- exit 1 +- ;; +- esac +- ;; +-esac +- +-file1=`mktemp` +-file2=`mktemp` +- +-dir=`mktemp -d` +-echo "Extracting packages" +-unpackage $oldpkg $dir/old +-unpackage $newpkg $dir/new +- +-# files is set in cmp_spec for rpms, so if RES is empty we should assume +-# it wasn't an rpm and pick all files for comparison. +-if [ -z $RES ]; then +- oldfiles=`cd $dir/old; find . -type f` +- newfiles=`cd $dir/new; find . -type f` +- +- files=`echo -e "$oldfiles\n$newfiles" | sort -u` +-fi +- +-cd $dir +-bash $rename_script +- +-dfile=`mktemp` +- +-diff_two_files() +-{ +- if ! cmp -s old/$file new/$file; then +- echo "$file differs ($ftype)" +- hexdump -C old/$file > $file1 +- hexdump -C new/$file > $file2 +- diff -u $file1 $file2 | head -n 200 +- return 1 +- fi +- return 0 +-} +- +-trim_man_first_line() +-{ +- # Handles the first line if it is like: +- #.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) +- #.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3. +- local f=$1 +- sed -i -e '1{ +- s|^\.\\"[[:blank:]]\+Automatically[[:blank:]]generated[[:blank:]]by[[:blank:]]Pod::Man[[:blank:]].*|.\\" Overly verbose Pod::Man| +- s|^\.\\"[[:blank:]]\+DO[[:blank:]]NOT[[:blank:]]MODIFY[[:blank:]]THIS[[:blank:]]FILE![[:blank:]]\+It[[:blank:]]was[[:blank:]]generated[[:blank:]]by[[:blank:]]help2man[[:blank:]].*|.\\" Overly verbose help2man| +- }' $f +-} +- +-trim_man_TH() +-{ +- # Handles lines like: +- # .TH debhelper 7 "2010-02-27" "7.4.15" "Debhelper" +- # .TH DIRMNGR-CLIENT 1 2010-02-27 "Dirmngr 1.0.3" "GNU Privacy Guard" +- # .TH ccmake 1 "March 06, 2010" "ccmake 2.8.1-rc3" +- # .TH QEMU-IMG 1 "2010-03-14" " " " " +- # .TH kdecmake 1 "May 07, 2010" "cmake 2.8.1" +- # .TH "appender.h" 3 "12 May 2010" "Version 1.2.1" "log4c" \" -*- nroff -*- +- # .TH "appender.h" 3 "Tue Aug 31 2010" "Version 1.2.1" "log4c" \" -*- nroff -*- +- # .TH "OFFLINEIMAP" "1" "11 May 2010" "John Goerzen" "OfflineIMAP Manual" +- # .TH gv 3guile "13 May 2010" +- #.TH "GIT\-ARCHIMPORT" "1" "09/13/2010" "Git 1\&.7\&.1" "Git Manual" +- # .TH LDIRECTORD 8 "2010-10-20" "perl v5.12.2" "User Contributed Perl Documentation" +- # .TH ccmake 1 "February 05, 2012" "ccmake 2.8.7" +- # .TH "appender.h" 3 "Tue Aug 31 2010" "Version 1.2.1" "log4c" \" -*- nroff -*- +- # .TH ARCH "1" "September 2010" "GNU coreutils 8.5" "User Commands" +- # .TH "GCM-CALIBRATE" "1" "03 February 2012" "" "" +- #.TH Locale::Po4a::Xml.pm 3pm "2015-01-30" "Po4a Tools" "Po4a Tools" +- local f=$1 +- # (.TH quoted section) (quoted_date)(*) +- sed -i -e 's|^\([[:blank:]]*\.TH[[:blank:]]\+"[^"]\+"[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\("[^"]\+"\)\([[:blank:]]\+.*\)\?|\1 "qq2000-01-01"\3|' $f +- # (.TH unquoted section) (quoted_date)(*) +- sed -i -e 's|^\([[:blank:]]*\.TH[[:blank:]]\+[^"][^[:blank:]]\+[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\("[^"]\+"\)\([[:blank:]]\+.*\)\?|\1 "uq2000-02-02"\3|' $f +- # (.TH quoted section) (unquoted_date)(*) +- sed -i -e 's|^\([[:blank:]]*\.TH[[:blank:]]\+"[^"]\+"[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\([^"][^[:blank:]]\+\)\([[:blank:]]\+.*\)\?|\1 qu2000-03-03\3|' $f +- # (.TH unquoted section) (unquoted_date)(*) +- sed -i -e 's|^\([[:blank:]]*\.TH[[:blank:]]\+[^"][^[:blank:]]\+[[:blank:]]\+[^[:blank:]]\+\)[[:blank:]]\+\([^"][^[:blank:]]\+\)\([[:blank:]]\+.*\)\?|\1 uu2000-04-04\3|' $f +-} +- +-strip_numbered_anchors() +-{ +- # Remove numbered anchors on Docbook / HTML files. +- # This should be save since we remove them from old and new files. +- # A trailing </a> or </div> tag will stay also on both files. +- for f in old/$file new/$file; do +- sed -i -e 's%<[ ]*a[ ]\+name[^<]*[0-9]\+[^<]*%%g' \ +- -e 's%<[ ]*a[ ]\+href[^<]*#[^<]*[0-9]\+[^<]*%%g' \ +- -e 's%<[^<]*id="ftn\.[^<]*[0-9]\+[^<]*%%g' $f +- done +-} +- +- +-check_compressed_file() +-{ +- local file=$1 +- local ext=$2 +- local tmpdir=`mktemp -d` +- local ftype +- local ret=0 +- echo "$ext file with odd filename: $file" +- if test -n "$tmpdir"; then +- mkdir $tmpdir/{old,new} +- cp --parents --dereference old/$file $tmpdir/ +- cp --parents --dereference new/$file $tmpdir/ +- if pushd $tmpdir > /dev/null ; then +- case "$ext" in +- bz2) +- mv old/$file{,.bz2} +- mv new/$file{,.bz2} +- bzip2 -d old/$file.bz2 +- bzip2 -d new/$file.bz2 +- ;; +- gzip) +- mv old/$file{,.gz} +- mv new/$file{,.gz} +- gzip -d old/$file.gz +- gzip -d new/$file.gz +- ;; +- xz) +- mv old/$file{,.xz} +- mv new/$file{,.xz} +- xz -d old/$file.xz +- xz -d new/$file.xz +- ;; +- esac +- ftype=`/usr/bin/file old/$file | sed 's@^[^:]\+:[[:blank:]]*@@'` +- case $ftype in +- POSIX\ tar\ archive) +- echo "$ext content is: $ftype" +- mv old/$file{,.tar} +- mv new/$file{,.tar} +- if ! check_single_file ${file}.tar; then +- ret=1 +- fi +- ;; +- ASCII\ cpio\ archive\ *) +- echo "$ext content is: $ftype" +- mv old/$file{,.cpio} +- mv new/$file{,.cpio} +- if ! check_single_file ${file}.cpio; then +- ret=1 +- fi +- ;; +- *) +- echo "unhandled $ext content: $ftype" +- if ! diff_two_files; then +- ret=1 +- fi +- ;; +- esac +- popd > /dev/null +- fi +- rm -rf "$tmpdir" +- fi +- return $ret +-} +- +-check_single_file() +-{ +- local file="$1" +- case $file in +- *.spec) +- sed -i -e "s,Release:.*$release1,Release: @RELEASE@," old/$file +- sed -i -e "s,Release:.*$release2,Release: @RELEASE@," new/$file +- ;; +- *.exe.mdb|*.dll.mdb) +- # Just debug information, we can skip them +- echo "$file skipped as debug file." +- return 0 +- ;; +- *.a) +- flist=`ar t new/$file` +- pwd=$PWD +- fdir=`dirname $file` +- cd old/$fdir +- ar x `basename $file` +- cd $pwd/new/$fdir +- ar x `basename $file` +- cd $pwd +- for f in $flist; do +- if ! check_single_file $fdir/$f; then +- return 1 +- fi +- done +- return 0 +- ;; +- *.cpio) +- flist=`cpio --quiet --list --force-local < "new/$file"` +- pwd=$PWD +- fdir=$file.extract.$PPID.$$ +- mkdir old/$fdir new/$fdir +- cd old/$fdir +- cpio --quiet --extract --force-local < "../${file##*/}" +- cd $pwd/new/$fdir +- cpio --quiet --extract --force-local < "../${file##*/}" +- cd $pwd +- local ret=0 +- for f in $flist; do +- if ! check_single_file $fdir/$f; then +- ret=1 +- if test -z "$check_all"; then +- break +- fi +- fi +- done +- rm -rf old/$fdir new/$fdir +- return $ret +- ;; +- *.tar|*.tar.bz2|*.tar.gz|*.tgz|*.tbz2) +- flist=`tar tf new/$file` +- pwd=$PWD +- fdir=`dirname $file` +- cd old/$fdir +- tar xf `basename $file` +- cd $pwd/new/$fdir +- tar xf `basename $file` +- cd $pwd +- local ret=0 +- for f in $flist; do +- if ! check_single_file $fdir/$f; then +- ret=1 +- if test -z "$check_all"; then +- break +- fi +- fi +- done +- return $ret +- ;; +- *.zip|*.jar|*.war) +- cd old +- unjar_l ./$file |sort > flist +- # 10-05-2010 14:39 +- sed -i -e "s, [0-9][0-9]-[0-9][0-9]-[0-9]\+ [0-9][0-9]:[0-9][0-9] , date ," flist +- # 2012-02-03 07:59 +- sed -i -e "s, 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9] , date ," flist +- cd ../new +- unjar_l ./$file |sort> flist +- sed -i -e "s, [0-9][0-9]-[0-9][0-9]-[0-9]\+ [0-9][0-9]:[0-9][0-9] , date ,; " flist +- sed -i -e "s, 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9] , date ," flist +- cd .. +- if ! cmp -s old/flist new/flist; then +- echo "$file has different file list" +- diff -u old/flist new/flist +- return 1 +- fi +- flist=`grep date new/flist | sed -e 's,.* date ,,'` +- pwd=$PWD +- fdir=`dirname $file` +- cd old/$fdir +- unjar `basename $file` +- cd $pwd/new/$fdir +- unjar `basename $file` +- cd $pwd +- local ret=0 +- for f in $flist; do +- if test -f new/$fdir/$f && ! check_single_file $fdir/$f; then +- ret=1 +- if test -z "$check_all"; then +- break +- fi +- fi +- done +- return $ret;; +- *.pyc|*.pyo) +- perl -e "open fh, '+<', 'old/$file'; seek fh, 4, SEEK_SET; print fh '0000';" +- perl -e "open fh, '+<', 'new/$file'; seek fh, 4, SEEK_SET; print fh '0000';" +- ;; +- *.bz2) +- bunzip2 -c old/$file > old/${file/.bz2/} +- bunzip2 -c new/$file > new/${file/.bz2/} +- check_single_file ${file/.bz2/} +- return $? +- ;; +- *.gz) +- gunzip -c old/$file > old/${file/.gz/} +- gunzip -c new/$file > new/${file/.gz/} +- check_single_file ${file/.gz/} +- return $? +- ;; +- *.rpm) +- $self_script -a old/$file new/$file +- return $? +- ;; +- *png) +- # Try to remove timestamps, only if convert from ImageMagick is installed +- if [[ $(type -p convert) ]]; then +- convert old/$file +set date:create +set date:modify old/${file/.png/_n.png} +- convert old/$file +set date:create +set date:modify new/${file/.png/_n.png} +- if ! cmp -s old/${file/.png/_n.png} new/${file/.png/_n.png}; then +- echo "$file differs ($ftype)" +- hexdump -C old/${file/.png/_n.png} > $file1 +- hexdump -C new/${file/.png/_n.png} > $file2 +- diff -u $file1 $file2 | head -n 20 +- return 1 +- fi +- return 0 +- fi +- ;; +- /usr/share/locale/*/LC_MESSAGES/*.mo|/usr/share/locale-bundle/*/LC_MESSAGES/*.mo) +- for f in old/$file new/$file; do +- sed -i -e "s,POT-Creation-Date: ....-..-.. ..:..+....,POT-Creation-Date: 1970-01-01 00:00+0000," $f +- done +- ;; +- /usr/share/doc/packages/*/*.html|\ +- /usr/share/doc/kde/HTML/*/*/*.html|/usr/share/doc/*/html/*.html) +- for f in old/$file new/$file; do +- # texi2html output, e.g. in kvm, indent, qemu +- sed -i -e "s|^<!-- Created on .*, 20.. by texi2html .\...|<!-- Created on August 7, 2009 by texi2html 1.82|" $f +- sed -i -e 's|^ *This document was generated by <em>Autobuild</em> on <em>.*, 20..</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html .\...</em></a>.$| This document was generated by <em>Autobuild</em> on <em>August 7, 2009</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html 1.82</em></a>.|' $f +- # doxygen docu, e.g. in libssh and log4c +- sed -i -e 's|Generated on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9] 20[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |' $f +- # Generated on Sat Aug 14 2010 16:49:48 for libssh +- sed -i -e 's|Generated on ... ... [0-9]* 20[0-9][0-9] [0-9]*:[0-9][0-9]:[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |' $f +- done +- strip_numbered_anchors +- ;; +- /usr/share/javadoc/*.html |\ +- /usr/share/javadoc/*/*.html|/usr/share/javadoc/*/*/*.html) +- strip_numbered_anchors +- # There are more timestamps in html, so far we handle only some primitive versions. +- for f in old/$file new/$file; do +- # Javadoc: +- # <head> +- # <!-- Generated by javadoc (version 1.7.0_75) on Tue Feb 03 02:20:12 GMT 2015 --> +- # <!-- Generated by javadoc on Tue Feb 03 00:02:48 GMT 2015 --> +- # <meta name="date" content="2015-02-03"> +- # </head> +- sed -i -e ' +- /^<head>/{ +- : next +- n +- /^<\/head>/{ +- b end_head +- } +- s/^\(<!-- Generated by javadoc\) \((\(build\|version\) [0-9._]\+) on ... ... .. ..:..:.. \(GMT\|UTC\) ....\) \(-->\)/\1 some-date-removed-by-build-compare \5/ +- t next +- s/^\(<!-- Generated by javadoc\) \(on ... ... .. ..:..:.. \(GMT\|UTC\) ....\) \(-->\)/\1 some-date-removed-by-build-compare \3/ +- t next +- s/^<meta name="date" content="[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}">/<meta name="date" content="some-date-removed-by-build-compare">/ +- b next +- } +- : end_head +- ' $f +- # Gjdoc HtmlDoclet: +- sed -i -e 's%Generated by Gjdoc HtmlDoclet [0-9,.]*, part of <a href="http://www.gnu.org/software/classpath/cp-tools/" title="" target="_top">GNU Classpath Tools</a>, on .*, 20.. [0-9]*:..:.. \(a\|p\)\.m\. GMT.%Generated by Gjdoc.%' $f +- sed -i -e 's%<!DOCTYPE html PUBLIC "-//gnu.org///DTD XHTML 1.1 plus Target 1.0//EN"\(.*\)GNU Classpath Tools</a>, on [A-Z][a-z]* [0-9]*, 20?? [0-9]*:??:?? \(a|p\)\.m\. GMT.</p>%<!DOCTYPE html PUBLIC "-//gnu.org///DTD XHTML 1.1 plus Target 1.0//EN"\1GNU Classpath Tools</a>, on January 1, 2009 0:00:00 a.m. GMT.</p>%' $f +- sed -i -e 's%<!DOCTYPE html PUBLIC "-//gnu.org///DTD\(.*GNU Classpath Tools</a>\), on [a-zA-Z]* [0-9][0-9], 20.. [0-9]*:..:.. \(a\|p\)\.m\. GMT.</p>%<!DOCTYPE html PUBLIC "-//gnu.org///DTD\1,on May 1, 2010 1:11:42 p.m. GMT.</p>%' $f +- # deprecated-list is randomly ordered, sort it for comparison +- case $f in +- */deprecated-list.html) +- sort -o $f $f +- ;; +- esac +- done +- ;; +- /usr/share/javadoc/gjdoc.properties |\ +- /usr/share/javadoc/*/gjdoc.properties) +- for f in old/$file new/$file; do +- sed -i -e 's|^#[A-Z][a-z]\{2\} [A-Z][a-z]\{2\} [0-9]\{2\} ..:..:.. GMT 20..$|#Fri Jan 01 11:27:36 GMT 2009|' $f +- done +- ;; +- */fonts.scale|*/fonts.dir|*/encodings.dir) +- for f in old/$file new/$file; do +- # sort files before comparing +- sort -o $f $f +- done +- ;; +- /var/adm/perl-modules/*) +- for f in old/$file new/$file; do +- sed -i -e 's|^=head2 ... ... .. ..:..:.. ....: C<Module>|=head2 Wed Jul 1 00:00:00 2009: C<Module>|' $f +- done +- ;; +- /usr/share/man/man3/*3pm) +- for f in old/$file new/$file; do +- sed -i -e 's| 3 "20..-..-.." "perl v5....." "User Contributed Perl Documentation"$| 3 "2009-01-01" "perl v5.10.0" "User Contributed Perl Documentation"|' $f +- trim_man_TH $f +- trim_man_first_line $f +- done +- ;; +- /usr/share/man/*/man*|/usr/share/man/man*|/usr/lib/texmf/doc/man/*/*) +- +- for f in old/$file new/$file; do +- trim_man_TH $f +- trim_man_first_line $f +- # generated by docbook xml: +- #.\" Date: 09/13/2010 +- sed -i -e 's|Date: [0-1][0-9]/[0-9][0-9]/201[0-9]|Date: 09/13/2010|' $f +- done +- ;; +- *.elc) +- # emacs lisp files +- for f in old/$file new/$file; do +- sed -i -e 's|Compiled by abuild@.* on ... ... .. ..:..:.. 20..$|compiled by abuild@buildhost on Wed Jul 01 00:00:00 2009|' $f +- done +- ;; +- /var/lib/texmf/web2c/*/*fmt |\ +- /var/lib/texmf/web2c/metafont/*.base|\ +- /var/lib/texmf/web2c/metapost/*.mem) +- # binary dump of TeX and Metafont formats, we can ignore them for good +- echo "difference in $file ignored." +- return 0 +- ;; +- */libtool) +- for f in old/$file new/$file; do +- sed -i -e 's|^# Libtool was configured on host [A-Za-z0-9]*:$|# Libtool was configured on host x42:|' $f +- done +- ;; +- /etc/mail/*cf|/etc/sendmail.cf) +- # from sendmail package +- for f in old/$file new/$file; do +- # - ##### built by abuild@build33 on Thu May 6 11:21:17 UTC 2010 +- sed -i -e 's|built by abuild@[a-z0-9]* on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9] .* 20[0-9][0-9]|built by abuild@build42 on Thu May 6 11:21:17 UTC 2010|' $f +- done +- ;; +- /usr/share/doc/kde/HTML/*/*/index.cache|/usr/share/doc/kde/HTML/*/*/*/index.cache|\ +- /usr/share/gtk-doc/html/*/*.html|/usr/share/gtk-doc/html/*/*.devhelp2) +- # various kde and gtk packages +- strip_numbered_anchors +- ;; +- */created.rid) +- # ruby documentation +- # file just contains a timestamp and nothing else, so ignore it +- echo "Ignore $file" +- return 0 +- ;; +- */rdoc/files/*.html) +- # ruby documentation +- # <td>Mon Sep 20 19:02:43 +0000 2010</td> +- for f in old/$file new/$file; do +- sed -i -e 's%<td>[A-Z][a-z][a-z] [A-Z][a-z][a-z] [0-9]\+ [0-9]\+:[0-9]\+:[0-9]\+ +0000 201[0-9]</td>%<td>Mon Sep 20 19:02:43 +0000 2010</td>%g' $f +- done +- strip_numbered_anchors +- ;; +- */Linux*Env.Set.sh) +- # LibreOffice files, contains: +- # Generated on: Mon Apr 18 13:19:22 UTC 2011 +- for f in old/$file new/$file; do +- sed -i -e 's%^# Generated on:.*UTC 201[0-9] *$%# Generated on: Sometime%g' $f +- done +- ;; +- /usr/lib/libreoffice/solver/inc/*/deliver.log) +- # LibreOffice log file +- echo "Ignore $file" +- return 0 +- ;; +- /var/adm/update-messages/*|/var/adm/update-scripts/*) +- # encode version-release inside +- oldfn=`echo "$file"|sed -e s/-$release2/-$release1/;` +- +- # fetchmsttfonts embeds the release number in the update shell script. +- echo sed -i -e "s/-$release1/-$release2/g;" "old/$oldfn" +- sed -i -e "s/-$release1/-$release2/g;" "old/$oldfn" +- +- if ! diff -u old/$oldfn new/$file; then +- echo "$oldfn is not same as $file" +- return 1 +- fi +- echo "$file and $oldfn are same" +- return 0 +- ;; +- *.ps) +- for f in "old/$file" "new/$file"; do +- sed -i -e ' +- /^%%CreationDate:[[:blank:]]/d +- /^%%Creator:[[:blank:]]groff[[:blank:]]version[[:blank:]]/d +- ' "$f" +- done +- ;; +- *pdf) +- # PDF files contain a unique ID, remove it +- # Format of the ID is: +- # /ID [<9ACE247A70CF9BEAFEE15E116259BD6D> <9ACE247A70CF9BEAFEE15E116259BD6D>] +- # with optional spaces. pdftex creates also: +- # /CreationDate (D:20120103083206Z) +- # /ModDate (D:20120103083206Z) +- # and possibly XML metadata as well +- for f in "old/$file" "new/$file"; do +- sed -i \ +- '/obj/,/endobj/{ +- s%/ID \?\[ \?<[^>]\+> \?<[^>]\+> \?\]%/IDrandom%g; +- s%/CreationDate \?(D:[^)]*)%/CreationDate (D: XXX)%g; +- s%/ModDate \?(D:[^)]*)%/ModDate (D: XXX)%g; +- s%<pdf:CreationDate>[^<]*</pdf:CreationDate>%<pdf:CreationDate>XXX</pdf:CreationDate>%g; +- s%<pdf:ModDate>[^<]*</pdf:ModDate>%<pdf:ModDate>XXX</pdf:ModDate>%g; +- s%<xap:CreateDate>[^<]*</xap:CreateDate>%<xap:CreateDate>XXX</xap:CreateDate>%g; +- s%<xap:ModifyDate>[^<]*</xap:ModifyDate>%<xap:ModifyDate>XXX</xap:ModifyDate>%g; +- s%<xap:MetadataDate>[^<]*</xap:MetadataDate>%<xap:MetadataDate>XXX</xap:MetadataDate>%g; +- }' "$f" +- done +- ;; +- esac +- +- ftype=`/usr/bin/file old/$file | sed 's@^[^:]\+:[[:blank:]]*@@'` +- case $ftype in +- PE32\ executable*Mono\/\.Net\ assembly*) +- echo "PE32 Mono/.Net assembly: $file" +- if [ -x /usr/bin/monodis ] ; then +- monodis old/$file 2>/dev/null|sed -e 's/GUID = {.*}/GUID = { 42 }/;'> ${file1} +- monodis new/$file 2>/dev/null|sed -e 's/GUID = {.*}/GUID = { 42 }/;'> ${file2} +- if ! cmp -s ${file1} ${file2}; then +- echo "$file differs ($ftype)" +- diff -u ${file1} ${file2} +- return 1 +- fi +- else +- echo "Cannot compare, no monodis installed" +- return 1 +- fi +- ;; +- ELF*executable*|ELF*[LM]SB\ shared\ object*) +- objdump -d --no-show-raw-insn old/$file | filter_disasm > $file1 +- if ! test -s $file1; then +- # objdump has no idea how to handle it +- if ! diff_two_files; then +- ret=1 +- break +- fi +- fi +- elfdiff= +- sed -i -e "s,old/,," $file1 +- objdump -d --no-show-raw-insn new/$file | filter_disasm > $file2 +- sed -i -e "s,new/,," $file2 +- if ! diff -u $file1 $file2 > $dfile; then +- echo "$file differs in assembler output" +- head -n 200 $dfile +- elfdiff="1" +- fi +- echo "" >$file1 +- echo "" >$file2 +- # Don't compare .build-id and .gnu_debuglink sections +- sections="$(objdump -s new/$file | grep "Contents of section .*:" | sed -r "s,.* (.*):,\1,g" | grep -v -e "\.build-id" -e "\.gnu_debuglink" | tr "\n" " ")" +- for section in $sections; do +- objdump -s -j $section old/$file | sed "s,^old/,," > $file1 +- objdump -s -j $section new/$file | sed "s,^new/,," > $file2 +- if ! diff -u $file1 $file2 > $dfile; then +- echo "$file differs in ELF section $section" +- head -n 200 $dfile +- elfdiff="1" +- fi +- done +- if test -z "$elfdiff"; then +- echo "$file: only difference was in build-id or gnu_debuglink, GOOD." +- return 0 +- fi +- return 1 +- ;; +- *ASCII*|*text*) +- if ! cmp -s old/$file new/$file; then +- echo "$file differs ($ftype)" +- diff -u old/$file new/$file | head -n 200 +- return 1 +- fi +- ;; +- directory|setuid,\ directory|sticky,\ directory) +- # tar might package directories - ignore them here +- return 0 +- ;; +- bzip2\ compressed\ data*) +- if ! check_compressed_file "$file" "bz2"; then +- return 1 +- fi +- ;; +- gzip\ compressed\ data*) +- if ! check_compressed_file "$file" "gzip"; then +- return 1 +- fi +- ;; +- XZ\ compressed\ data*) +- if ! check_compressed_file "$file" "xz"; then +- return 1 +- fi +- ;; +- POSIX\ tar\ archive) +- mv old/$file{,.tar} +- mv new/$file{,.tar} +- if ! check_single_file ${file}.tar; then +- return 1 +- fi +- ;; +- cpio\ archive) +- mv old/$file{,.cpio} +- mv new/$file{,.cpio} +- if ! check_single_file ${file}.cpio; then +- return 1 +- fi +- ;; +- symbolic\ link\ to\ *) +- readlink "old/$file" > $file1 +- readlink "new/$file" > $file2 +- if ! diff -u $file1 $file2; then +- echo "symlink target for $file differs" +- return 1 +- fi +- ;; +- *) +- if ! diff_two_files; then +- return 1 +- fi +- ;; +- esac +- return 0 +-} +- +-# We need /proc mounted for some tests, so check that it's mounted and +-# complain if not. +-PROC_MOUNTED=0 +-if [ ! -d /proc/self/ ]; then +- echo "/proc is not mounted" +- mount -orw -n -tproc none /proc +- PROC_MOUNTED=1 +-fi +- +-# preserve cmp_spec result for check_all runs +-ret=$RES +-for file in $files; do +- if ! check_single_file $file; then +- ret=1 +- if test -z "$check_all"; then +- break +- fi +- fi +-done +- +-if [ "$PROC_MOUNTED" -eq "1" ]; then +- echo "Unmounting proc" +- umount /proc +-fi +- +-rm $file1 $file2 $dfile $rename_script +-rm -rf $dir +-if test "$ret" = 0; then +- echo "Package content is identical" +-fi +-exit $ret +-# vim: tw=666 ts=2 et +diff --git a/same-build-result.sh b/same-build-result.sh +index c8907e2..7e9bd4f 100644 +--- a/same-build-result.sh ++++ b/same-build-result.sh +@@ -7,11 +7,11 @@ + # Enhanced by Andreas Jaeger <aj@suse.de> + # + # The script decides if the new build differes from the former one, +-# using rpm-check.sh. ++# using pkg-diff.sh. + # The script is called as part of the build process as: + # /usr/lib/build/same-build-result.sh /.build.oldpackages /usr/src/packages/RPMS /usr/src/packages/SRPMS + +-CMPSCRIPT=${0%/*}/rpm-check.sh ++CMPSCRIPT=${0%/*}/pkg-diff.sh + SCMPSCRIPT=${0%/*}/srpm-check.sh + + check_all=1 +-- +1.7.9.5 + diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a20.bb b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a20.bb index 01f9e6efb6..282710908e 100644 --- a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a20.bb +++ b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a20.bb @@ -2,12 +2,12 @@ # Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) SUMMARY = "A set of tools for CD recording, including cdrecord" -HOMEPAGE = "http://cdrecord.berlios.de/private/cdrecord.html" +HOMEPAGE = "http://sourceforge.net/projects/cdrtools/" SECTION = "console/utils" LICENSE = "GPLv2 & CDDL-1.0 & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=32f68170be424c2cd64804337726b312" -SRC_URI = "ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-${PV}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/cdrtools/alpha/cdrtools-${PV}.tar.bz2" SRC_URI[md5sum] = "f8c6f0fdcba7df0606095498d10315a7" SRC_URI[sha256sum] = "e399ea964b8048793721b71461271e46d81f242bd2feefb8dbd259c30e75a5a9" diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.12.2.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.12.2.bb index cd6b1d8845..e40dfdd2d8 100644 --- a/meta/recipes-devtools/cmake/cmake-native_2.8.12.2.bb +++ b/meta/recipes-devtools/cmake/cmake-native_2.8.12.2.bb @@ -15,4 +15,5 @@ SRC_URI[sha256sum] = "8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a CMAKE_EXTRACONF = "\ -DBUILD_CursesDialog=0 \ -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \ + -DHAVE_SYS_ACL_H=0 \ " diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 8592a23046..28b7f2d887 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -13,13 +13,13 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}" SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://support-oe-qt4-tools-names.patch \ - file://aarch64-cmake.patch \ - file://aarch64-kwsys.patch \ file://qt4-fail-silent.patch \ file://cmake-2.8.11.2-FindFreetype.patch \ " -inherit autotools-brokensep +PR = "r1" + +inherit autotools # Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable # and possibly missing qmake binary (qtbase-native can be removed from sysroot @@ -47,5 +47,5 @@ do_configure_prepend() { CMAKE_EXTRACONF = "" do_configure () { - ./configure --prefix=${prefix} -- ${CMAKE_EXTRACONF} + ${S}/configure --prefix=${prefix} -- ${CMAKE_EXTRACONF} } diff --git a/meta/recipes-devtools/cmake/cmake/aarch64-cmake.patch b/meta/recipes-devtools/cmake/cmake/aarch64-cmake.patch deleted file mode 100644 index 3e26d58267..0000000000 --- a/meta/recipes-devtools/cmake/cmake/aarch64-cmake.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Riku Voipio <riku.voipio@linaro.org> -Date: Fri, 21 Dec 2012 11:20:02 +0000 (+0200) -Subject: KWIML: Teach ABI.h about Aarch64 -X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=34916522 - -KWIML: Teach ABI.h about Aarch64 - -The __aarch64__ defines Aarch64, while __AARCH64EB__ defines bigendian -and __AARCH64EL__ little endian. Only little endian tested, no big -endian toolchain exists yet. - -Signed-off-by: Riku Voipio <riku.voipio@linaro.org> - -Hand edited by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> to get it applied in OE - -Upstream-Status: Backport ---- - -diff --git a/ABI.h.in b/ABI.h.in -index f93ddba..7f4772a 100644 ---- a/Utilities/KWIML/ABI.h.in -+++ b/Utilities/KWIML/ABI.h.in -@@ -418,6 +418,14 @@ suppression macro @KWIML@_ABI_NO_VERIFY was defined. - #elif defined(__vax__) - # define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG - -+/* Aarch64 */ -+#elif defined(__aarch64__) -+# if !defined(__AARCH64EB__) -+# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_LITTLE -+# else -+# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG -+# endif -+ - /* Unknown CPU */ - #elif !defined(@KWIML@_ABI_NO_ERROR_ENDIAN) - # error "Byte order of target CPU unknown." diff --git a/meta/recipes-devtools/cmake/cmake/aarch64-kwsys.patch b/meta/recipes-devtools/cmake/cmake/aarch64-kwsys.patch deleted file mode 100644 index 2b68eae6c2..0000000000 --- a/meta/recipes-devtools/cmake/cmake/aarch64-kwsys.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: KWSys Robot <kwrobot@kitware.com> -Date: Fri, 21 Dec 2012 13:29:37 +0000 (-0500) -Subject: KWSys 2012-12-21 (8ce09af5) -X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=567e7d94 - -KWSys 2012-12-21 (8ce09af5) - -Extract upstream KWSys using the following shell commands. - -$ git archive --prefix=upstream-kwsys/ 8ce09af5 | tar x -$ git shortlog --no-merges --abbrev=8 --format='%h %s' 933eb822..8ce09af5 -Riku Voipio (1): - 8ce09af5 CPU: Add Aarch64 support - -Change-Id: I4bd0a97abaa0f958e2679afe2d4ad4bcc37434a0 - -Hand edited by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> to get it applied in OE - -Upstream-Status: Backport ---- - -diff --git a/CPU.h.in b/CPU.h.in -index ecd29d1..2e1a584 100644 ---- a/Source/kwsys/CPU.h.in -+++ b/Source/kwsys/CPU.h.in -@@ -98,6 +98,14 @@ - #elif defined(__SYSC_ZARCH__) - # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG - -+/* Aarch64 */ -+#elif defined(__aarch64__) -+# if !defined(__AARCH64EB__) -+# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_LITTLE -+# else -+# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG -+# endif -+ - /* Unknown CPU */ - #else - # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID 0 diff --git a/meta/recipes-devtools/distcc/files/distcc b/meta/recipes-devtools/distcc/files/distcc index c7c414d829..e36f0fa695 100755 --- a/meta/recipes-devtools/distcc/files/distcc +++ b/meta/recipes-devtools/distcc/files/distcc @@ -51,6 +51,9 @@ should_start() { echo "$DAEMON not starting" exit 0 fi + # we need permission to write to the pid file + touch /var/run/$NAME.pid + chown distcc /var/run/$NAME.pid } case "$1" in @@ -75,6 +78,7 @@ case "$1" in echo "$0: stop failed with error code $code" >&2 exit $code } + rm -f /var/run/$NAME.pid >/dev/null 2>&1 echo "." ;; restart|force-reload) @@ -92,6 +96,7 @@ case "$1" in --exec $DAEMON -- $DAEMON_ARGS $ALLOW || { code=$? + rm -f /var/run/$NAME.pid >/dev/null 2>&1 echo "$0: restart failed with error code $code" >&2 exit $code } diff --git a/meta/recipes-devtools/dmidecode/dmidecode_2.12.bb b/meta/recipes-devtools/dmidecode/dmidecode_2.12.bb index 3e3a350fd8..b5151b8acd 100644 --- a/meta/recipes-devtools/dmidecode/dmidecode_2.12.bb +++ b/meta/recipes-devtools/dmidecode/dmidecode_2.12.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/dmidecode/${BP}.tar.bz2" -COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm|powerpc).*-linux" +COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm|powerpc|powerpc64).*-linux" do_install() { oe_runmake DESTDIR="${D}" install diff --git a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch index 3cdc4c869b..0559a5c0d2 100644 --- a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch +++ b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch @@ -17,7 +17,8 @@ index aba0016..cc73aa2 100755 -#!/bin/bash +#!/bin/sh # vim: number - + # docbook-xsl-update - Update environment to latest docbook-xsl snapshot --- +-- 1.9.1 + diff --git a/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb b/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb index b59b25019c..d1c24b8748 100644 --- a/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb +++ b/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb @@ -2,13 +2,14 @@ # Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) SUMMARY = "DOS FAT Filesystem Utilities" +HOMEPAGE = "http://daniel-baumann.ch/software/dosfstools/" SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://mkdosfs/COPYING;md5=cbe67f08d6883bff587f615f0cc81aa8" PR = "r5" -SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \ +SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.src.tar.gz/407d405ade410f7597d364ab5dc8c9f6/${BP}.src.tar.gz \ file://mkdosfs-bootcode.patch \ file://mkdosfs-dir.patch \ file://alignment_hack.patch \ diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index 929906dfd8..5db1fde8f1 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -2,18 +2,15 @@ SUMMARY = "Package maintenance system from Debian" LICENSE = "GPLv2.0+" SECTION = "base" -SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.xz \ - file://ignore_extra_fields.patch" +SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.xz" + +SRC_URI_append_class-native = " file://tar-error-code.patch" DEPENDS = "zlib bzip2 perl ncurses" DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alternatives-native gettext-native perl-native" -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} xz run-postinsts" +RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} xz run-postinsts perl" RDEPENDS_${PN}_class-native = "xz-native" -S = "${WORKDIR}/${BPN}-${PV}" - -PARALLEL_MAKE = "" - inherit autotools gettext perlnative pkgconfig systemd python () { @@ -37,6 +34,8 @@ EXTRA_OECONF = "\ --without-selinux \ " +EXTRA_OECONF_append_class-target = " TAR=tar" + do_configure () { echo >> ${S}/m4/compiler.m4 sed -i -e 's#PERL_LIBDIR=.*$#PERL_LIBDIR="${libdir}/perl"#' ${S}/configure @@ -49,7 +48,6 @@ do_install_append () { rm ${D}${bindir}/update-alternatives sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env nativeperl|' ${D}${bindir}/dpkg-* else - mv ${D}${bindir}/update-alternatives ${D}${sbindir} sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/dpkg-* fi @@ -70,7 +68,7 @@ PROV_class-native = "" PROVIDES += "${PROV}" PACKAGES =+ "update-alternatives-dpkg" -FILES_update-alternatives-dpkg = "${sbindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives" +FILES_update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives" RPROVIDES_update-alternatives-dpkg += "update-alternatives" PACKAGES += "${PN}-perl" diff --git a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch b/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch new file mode 100644 index 0000000000..af275dec17 --- /dev/null +++ b/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch @@ -0,0 +1,38 @@ +Author: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com> +Date: Wed Apr 8 18:08:14 2015 +0530 + +[PATCH] add armeb triplet entry into triplettable. + +Cross-compling dpkg application for armeb fails with below error +during configure task, + +(snip) + configure:23141: checking dpkg cpu type + configure:23148: result: armeb + configure:23150: WARNING: armeb not found in cputable + configure:23162: checking dpkg operating system type + configure:23169: result: linux-gnueabi + configure:23171: WARNING: linux-gnueabi not found in ostable + configure:23183: checking dpkg architecture name + configure:23189: error: cannot determine host dpkg architecture +-- CUT -- + +the required combination of "gnueabi-linux-armeb" was not found in +the triplettable file thereby returning dpkg_arch as +empty in configure script. + +Upstream-Status: Pending + +Signed-off-by: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com> + +diff -Naurp dpkg-1.17.21_org/triplettable dpkg-1.17.21/triplettable +--- dpkg-1.17.21_org/triplettable 2015-04-08 17:08:52.370759171 +0530 ++++ dpkg-1.17.21/triplettable 2015-04-08 17:09:12.406752081 +0530 +@@ -9,6 +9,7 @@ musleabihf-linux-arm musl-linux-armhf + musl-linux-<cpu> musl-linux-<cpu> + gnueabihf-linux-arm armhf + gnueabi-linux-arm armel ++gnueabi-linux-armeb armeb + gnuabin32-linux-mips64el mipsn32el + gnuabin32-linux-mips64 mipsn32 + gnuabi64-linux-mips64el mips64el diff --git a/meta/recipes-devtools/dpkg/dpkg/dpkg-1.17.4-CVE-2014-0471-CVE-2014-3127.patch b/meta/recipes-devtools/dpkg/dpkg/dpkg-1.17.4-CVE-2014-0471-CVE-2014-3127.patch deleted file mode 100644 index e59c6661ea..0000000000 --- a/meta/recipes-devtools/dpkg/dpkg/dpkg-1.17.4-CVE-2014-0471-CVE-2014-3127.patch +++ /dev/null @@ -1,68 +0,0 @@ -dpkg: Security Advisory - CVE-2014-3127 - -commit a12eb58959d0a10584a428f4a3103a49204c410f upstream - -dpkg 1.15.9 on Debian squeeze introduces support for the "C-style -encoded filenames" feature without recognizing that the squeeze patch -program lacks this feature, which triggers an interaction error that -allows remote attackers to conduct directory traversal attacks and -modify files outside of the intended directories via a crafted source -package. - -NOTE: this can be considered a release engineering problem in the -effort to fix CVE-2014-0471. - -Upstream-Status: Backport - -Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> -===================================================== -diff -uarN dpkg-1.17.1-org/scripts/Dpkg/Source/Patch.pm dpkg-1.17.1/scripts/Dpkg/Source/Patch.pm ---- dpkg-1.17.1-org/scripts/Dpkg/Source/Patch.pm 2014-06-05 16:32:41.765446564 +0800 -+++ dpkg-1.17.1/scripts/Dpkg/Source/Patch.pm 2014-06-05 16:37:21.461446359 +0800 -@@ -324,31 +324,6 @@ - return $line; - } - --my %ESCAPE = (( -- 'a' => "\a", -- 'b' => "\b", -- 'f' => "\f", -- 'n' => "\n", -- 'r' => "\r", -- 't' => "\t", -- 'v' => "\cK", -- '\\' => '\\', -- '"' => '"', --), ( -- map { sprintf('%03o', $_) => chr($_) } (0..255) --)); -- --sub _unescape { -- my ($diff, $str) = @_; -- -- if (exists $ESCAPE{$str}) { -- return $ESCAPE{$str}; -- } else { -- error(_g('diff %s patches file with unknown escape sequence \\%s'), -- $diff, $str); -- } --} -- - # Fetch the header filename ignoring the optional timestamp - sub _fetch_filename { - my ($diff, $header) = @_; -@@ -358,12 +333,7 @@ - - # Is it a C-style string? - if ($header =~ m/^"/) { -- $header =~ m/^"((?:[^\\"]|\\.)*)"/; -- error(_g('diff %s patches file with unbalanced quote'), $diff) -- unless defined $1; -- -- $header = $1; -- $header =~ s/\\([0-3][0-7]{2}|.)/_unescape($diff, $1)/eg; -+ error(_g('diff %s patches file with C-style encoded filename'), $diff); - } else { - # Tab is the official separator, it's always used when - # filename contain spaces. Try it first, otherwise strip on space diff --git a/meta/recipes-devtools/dpkg/dpkg/dpkg-1.17.4-CVE-2014-0471.patch b/meta/recipes-devtools/dpkg/dpkg/dpkg-1.17.4-CVE-2014-0471.patch deleted file mode 100644 index 195d309506..0000000000 --- a/meta/recipes-devtools/dpkg/dpkg/dpkg-1.17.4-CVE-2014-0471.patch +++ /dev/null @@ -1,97 +0,0 @@ -dpkg: Security Advisory - CVE-2014-0471 - -commit a82651188476841d190c58693f95827d61959b51 upstream - -Directory traversal vulnerability in the unpacking functionality in -dpkg before 1.15.9, 1.16.x before 1.16.13, and 1.17.x before 1.17.8 -allows remote attackers to write arbitrary files via a crafted source -package, related to "C-style filename quoting." - -Upstream-Status: Backport - -Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> -=================================================== -diff -uarN dpkg-1.17.1-org/scripts/Dpkg/Source/Patch.pm dpkg-1.17.1/scripts/Dpkg/Source/Patch.pm ---- dpkg-1.17.1-org/scripts/Dpkg/Source/Patch.pm 2014-06-05 15:24:07.422446284 +0800 -+++ dpkg-1.17.1/scripts/Dpkg/Source/Patch.pm 2014-06-05 15:41:37.746446314 +0800 -@@ -324,14 +324,53 @@ - return $line; - } - --# Strip timestamp --sub _strip_ts { -- my $header = shift; -- -- # Tab is the official separator, it's always used when -- # filename contain spaces. Try it first, otherwise strip on space -- # if there's no tab -- $header =~ s/\s.*// unless ($header =~ s/\t.*//); -+my %ESCAPE = (( -+ 'a' => "\a", -+ 'b' => "\b", -+ 'f' => "\f", -+ 'n' => "\n", -+ 'r' => "\r", -+ 't' => "\t", -+ 'v' => "\cK", -+ '\\' => '\\', -+ '"' => '"', -+), ( -+ map { sprintf('%03o', $_) => chr($_) } (0..255) -+)); -+ -+sub _unescape { -+ my ($diff, $str) = @_; -+ -+ if (exists $ESCAPE{$str}) { -+ return $ESCAPE{$str}; -+ } else { -+ error(_g('diff %s patches file with unknown escape sequence \\%s'), -+ $diff, $str); -+ } -+} -+ -+# Fetch the header filename ignoring the optional timestamp -+sub _fetch_filename { -+ my ($diff, $header) = @_; -+ -+ # Strip any leading spaces. -+ $header =~ s/^\s+//; -+ -+ # Is it a C-style string? -+ if ($header =~ m/^"/) { -+ $header =~ m/^"((?:[^\\"]|\\.)*)"/; -+ error(_g('diff %s patches file with unbalanced quote'), $diff) -+ unless defined $1; -+ -+ $header = $1; -+ $header =~ s/\\([0-3][0-7]{2}|.)/_unescape($diff, $1)/eg; -+ } else { -+ # Tab is the official separator, it's always used when -+ # filename contain spaces. Try it first, otherwise strip on space -+ # if there's no tab -+ $header =~ s/\s.*// unless $header =~ s/\t.*//; -+ } -+ - return $header; - } - -@@ -400,7 +439,7 @@ - unless(s/^--- //) { - error(_g("expected ^--- in line %d of diff `%s'"), $., $diff); - } -- $path{old} = $_ = _strip_ts($_); -+ $path{old} = $_ = _fetch_filename($diff, $_); - $fn{old} = $_ if $_ ne '/dev/null' and s{^[^/]*/+}{$destdir/}; - if (/\.dpkg-orig$/) { - error(_g("diff `%s' patches file with name ending .dpkg-orig"), $diff); -@@ -412,7 +451,7 @@ - unless (s/^\+\+\+ //) { - error(_g("line after --- isn't as expected in diff `%s' (line %d)"), $diff, $.); - } -- $path{new} = $_ = _strip_ts($_); -+ $path{new} = $_ = _fetch_filename($diff, $_); - $fn{new} = $_ if $_ ne '/dev/null' and s{^[^/]*/+}{$destdir/}; - - unless (defined $fn{old} or defined $fn{new}) { diff --git a/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch b/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch deleted file mode 100644 index 4e3eb97ed8..0000000000 --- a/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch +++ /dev/null @@ -1,21 +0,0 @@ -Upstream-Status: Inappropriate [workaround] - -Index: dpkg-1.16.8/dpkg-deb/build.c -=================================================================== ---- dpkg-1.16.8.orig/dpkg-deb/build.c -+++ dpkg-1.16.8/dpkg-deb/build.c -@@ -340,13 +340,13 @@ check_new_pkg(const char *dir) - if (pkg->priority == pri_other) - warning(_("'%s' contains user-defined Priority value '%s'"), - controlfile, pkg->otherpriority); -- for (field = pkg->available.arbs; field; field = field->next) { -+ /*for (field = pkg->available.arbs; field; field = field->next) { - if (known_arbitrary_field(field)) - continue; - - warning(_("'%s' contains user-defined field '%s'"), controlfile, - field->name); -- } -+ }*/ - - free(controlfile); diff --git a/meta/recipes-devtools/dpkg/dpkg/no-vla-warning.patch b/meta/recipes-devtools/dpkg/dpkg/no-vla-warning.patch index 0e57dbc7fc..f660b18646 100644 --- a/meta/recipes-devtools/dpkg/dpkg/no-vla-warning.patch +++ b/meta/recipes-devtools/dpkg/dpkg/no-vla-warning.patch @@ -11,22 +11,22 @@ Upstream-Status: Pending Signed-off-by: Donn Seeley <donn.seeley@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +Signed-off-by: AnÃbal Limón <anibal.limon@linux.intel.com> --- m4/dpkg-compiler.m4 | 1 - 1 file changed, 1 deletion(-) diff --git a/m4/dpkg-compiler.m4 b/m4/dpkg-compiler.m4 -index f1c760b..500b5ad 100644 +index 53f67c6..6e66a43 100644 --- a/m4/dpkg-compiler.m4 +++ b/m4/dpkg-compiler.m4 -@@ -72,7 +72,6 @@ if test "x$enable_compiler_warnings" = "xyes"; then - DPKG_WARNING_ALL([-Wformat-security]) - DPKG_WARNING_ALL([-Wpointer-arith]) - DPKG_WARNING_ALL([-Wlogical-op]) -- DPKG_WARNING_ALL([-Wvla]) - DPKG_WARNING_ALL([-Winit-self]) - DPKG_WARNING_ALL([-Wwrite-strings]) - DPKG_WARNING_ALL([-Wcast-align]) --- -1.7.10.4 - +@@ -49,7 +49,6 @@ AC_DEFUN([DPKG_CHECK_COMPILER_WARNINGS], [ + DPKG_CHECK_COMPILER_FLAG([-Wformat-security]) + DPKG_CHECK_COMPILER_FLAG([-Wpointer-arith]) + DPKG_CHECK_COMPILER_FLAG([-Wlogical-op]) +- DPKG_CHECK_COMPILER_FLAG([-Wvla]) + DPKG_CHECK_COMPILER_FLAG([-Winit-self]) + DPKG_CHECK_COMPILER_FLAG([-Wwrite-strings]) + DPKG_CHECK_COMPILER_FLAG([-Wcast-align]) +--- +1.17.21 diff --git a/meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch b/meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch new file mode 100644 index 0000000000..7be2090206 --- /dev/null +++ b/meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch @@ -0,0 +1,54 @@ +When running do_package_write_deb, we have trees of hardlinked files +such as the dbg source files in ${PN}-dbg. If something makes another +copy of one of those files (or deletes one), the number of links a file +has changes and tar can notice this, e.g.: + +| DEBUG: Executing python function do_package_deb +| dpkg-deb: building package `sed-ptest' in `/media/build1/poky/build/tmp/work/i586-poky-linux/sed/4.2.2-r0/deploy-debs/i586/sed-ptest_4.2.2-r0.3_i386.deb'. +| tar: ./usr/lib/sed/ptest/testsuite/tst-regex2: file changed as we read it +| dpkg-deb: error: subprocess tar -cf returned error exit status 1 + +Tar returns an error of 1 when files 'change' and other errors codes +in other error cases. We tweak dpkg-deb here so that it ignores an exit +code of 1 from tar. The files don't really change (and we have locking in +place to avoid that kind of issue). + +Upsteam-Status: Inappropriate +RP 2015/3/27 + +Index: dpkg-1.17.21/dpkg-deb/build.c +=================================================================== +--- dpkg-1.17.21.orig/dpkg-deb/build.c ++++ dpkg-1.17.21/dpkg-deb/build.c +@@ -398,7 +398,7 @@ do_build(const char *const *argv) + bool subdir; + char *tfbuf; + int arfd; +- int p1[2], p2[2], gzfd; ++ int p1[2], p2[2], gzfd, rc; + pid_t c1, c2; + + /* Decode our arguments. */ +@@ -493,7 +493,9 @@ do_build(const char *const *argv) + } + close(p1[0]); + subproc_reap(c2, "gzip -9c", 0); +- subproc_reap(c1, "tar -cf", 0); ++ rc = subproc_reap(c1, "tar -cf", SUBPROC_RETERROR); ++ if (rc && rc != 1) ++ ohshite(_("subprocess %s returned error exit status %d"), "tar -cf", rc); + + if (lseek(gzfd, 0, SEEK_SET)) + ohshite(_("failed to rewind temporary file (%s)"), _("control member")); +@@ -581,7 +583,10 @@ do_build(const char *const *argv) + /* All done, clean up wait for tar and gzip to finish their job. */ + close(p1[1]); + subproc_reap(c2, _("<compress> from tar -cf"), 0); +- subproc_reap(c1, "tar -cf", 0); ++ rc = subproc_reap(c1, "tar -cf", SUBPROC_RETERROR); ++ if (rc && rc != 1) ++ ohshite(_("subprocess %s returned error exit status %d"), "tar -cf", rc); ++ + /* Okay, we have data.tar as well now, add it to the ar wrapper. */ + if (deb_format.major == 2) { + char datamember[16 + 1]; diff --git a/meta/recipes-devtools/dpkg/dpkg_1.17.4.bb b/meta/recipes-devtools/dpkg/dpkg_1.17.21.bb index 83526f3c96..ebb8671473 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.17.4.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.17.21.bb @@ -12,10 +12,9 @@ SRC_URI += "file://noman.patch \ file://dpkg-configure.service \ file://glibc2.5-sync_file_range.patch \ file://no-vla-warning.patch \ - file://dpkg-1.17.4-CVE-2014-0471.patch \ - file://dpkg-1.17.4-CVE-2014-0471-CVE-2014-3127.patch \ + file://add_armeb_triplet_entry.patch \ " -SRC_URI[md5sum] = "cc25086e1e3bd9512a95f14cfe9002e1" -SRC_URI[sha256sum] = "01cdc81c33e77c3d7c40df17e19171794542be7cf12e411381ffcaa8f87b1854" +SRC_URI[md5sum] = "765a96fd0180196613bbfa3c4aef0775" +SRC_URI[sha256sum] = "3ed776627181cb9c1c9ba33f94a6319084be2e9ec9c23dd61ce784c4f602cf05" diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2015-0247.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2015-0247.patch new file mode 100644 index 0000000000..4de67c9704 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2015-0247.patch @@ -0,0 +1,58 @@ +From f66e6ce4446738c2c7f43d41988a3eb73347e2f5 Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o <tytso@mit.edu> +Date: Sat, 9 Aug 2014 12:24:54 -0400 +Subject: libext2fs: avoid buffer overflow if s_first_meta_bg is too big + +If s_first_meta_bg is greater than the of number block group +descriptor blocks, then reading or writing the block group descriptors +will end up overruning the memory buffer allocated for the +descriptors. Fix this by limiting first_meta_bg to no more than +fs->desc_blocks. This doesn't correct the bad s_first_meta_bg value, +but it avoids causing the e2fsprogs userspace programs from +potentially crashing. + +Fixes CVE-2015-0247 +Upstream-Status: Backport + +Signed-off-by: Theodore Ts'o <tytso@mit.edu> +Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> + +diff --git a/lib/ext2fs/closefs.c b/lib/ext2fs/closefs.c +index 4599eef..1f99113 100644 +--- a/lib/ext2fs/closefs.c ++++ b/lib/ext2fs/closefs.c +@@ -344,9 +344,11 @@ errcode_t ext2fs_flush2(ext2_filsys fs, int flags) + * superblocks and group descriptors. + */ + group_ptr = (char *) group_shadow; +- if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) ++ if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) { + old_desc_blocks = fs->super->s_first_meta_bg; +- else ++ if (old_desc_blocks > fs->super->s_first_meta_bg) ++ old_desc_blocks = fs->desc_blocks; ++ } else + old_desc_blocks = fs->desc_blocks; + + ext2fs_numeric_progress_init(fs, &progress, NULL, +diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c +index a1a3517..ba501e6 100644 +--- a/lib/ext2fs/openfs.c ++++ b/lib/ext2fs/openfs.c +@@ -378,9 +378,11 @@ errcode_t ext2fs_open2(const char *name, const char *io_options, + #ifdef WORDS_BIGENDIAN + groups_per_block = EXT2_DESC_PER_BLOCK(fs->super); + #endif +- if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) ++ if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) { + first_meta_bg = fs->super->s_first_meta_bg; +- else ++ if (first_meta_bg > fs->desc_blocks) ++ first_meta_bg = fs->desc_blocks; ++ } else + first_meta_bg = fs->desc_blocks; + if (first_meta_bg) { + retval = io_channel_read_blk(fs->io, group_block + +-- +cgit v0.10.2 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/cache_inode.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/cache_inode.patch new file mode 100644 index 0000000000..f9ef8e5f26 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/cache_inode.patch @@ -0,0 +1,52 @@ +The comment to this function says: + +""" + * Stupid algorithm --- we now just search forward starting from the + * goal. Should put in a smarter one someday.... +""" + +This adds in a rather hacky algorthim which starts where we finished +searching previously using a static variable rather than starting +from scratch if a hint isn't provided. + +This was after noticing that mkfs.ext4 -F X -d Y was spending *lots* +of time in ext2fs_new_block2 called from ext2fs_bmap from ext2fs_file_write(). + +Numbers wise, this took a core-image-sato-sdk mkfs time from over +8 minutes to around 35 seconds. + +Upstream-Status: Pending + +RP 2015/02/20 + +Index: e2fsprogs-1.42.9/lib/ext2fs/alloc.c +=================================================================== +--- e2fsprogs-1.42.9.orig/lib/ext2fs/alloc.c ++++ e2fsprogs-1.42.9/lib/ext2fs/alloc.c +@@ -160,6 +160,8 @@ errcode_t ext2fs_new_inode(ext2_filsys f + return 0; + } + ++static blk64_t last_goal = 0; ++ + /* + * Stupid algorithm --- we now just search forward starting from the + * goal. Should put in a smarter one someday.... +@@ -170,6 +172,9 @@ errcode_t ext2fs_new_block2(ext2_filsys + blk64_t i; + int c_ratio; + ++ if (!goal) ++ goal = last_goal; ++ + EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS); + + if (!map) +@@ -194,6 +199,7 @@ errcode_t ext2fs_new_block2(ext2_filsys + + if (!ext2fs_fast_test_block_bitmap2(map, i)) { + *ret = i; ++ last_goal = i; + return 0; + } + i = (i + c_ratio) & ~(c_ratio - 1); diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb index 1fb4a6cd85..66065bc049 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb @@ -19,6 +19,8 @@ SRC_URI += "file://acinclude.m4 \ file://0012-Fix-musl-build-failures.patch \ file://0001-e2fsprogs-fix-cross-compilation-problem.patch \ file://misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch \ + file://cache_inode.patch \ + file://CVE-2015-0247.patch \ " SRC_URI[md5sum] = "3f8e41e63b432ba114b33f58674563f7" @@ -63,9 +65,10 @@ do_install_append_class-target() { RDEPENDS_e2fsprogs = "e2fsprogs-badblocks" RRECOMMENDS_e2fsprogs = "e2fsprogs-mke2fs e2fsprogs-e2fsck" -PACKAGES =+ "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-badblocks" +PACKAGES =+ "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-badblocks e2fsprogs-resize2fs" PACKAGES =+ "libcomerr libss libe2p libext2fs" +FILES_e2fsprogs-resize2fs = "${base_sbindir}/resize2fs*" FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf" FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label" @@ -76,7 +79,7 @@ FILES_libe2p = "${base_libdir}/libe2p.so.*" FILES_libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*" FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" inherit update-alternatives diff --git a/meta/recipes-devtools/elfutils/elfutils/arm_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.148/arm_backend.diff index d4e4675ad5..d4e4675ad5 100644 --- a/meta/recipes-devtools/elfutils/elfutils/arm_backend.diff +++ b/meta/recipes-devtools/elfutils/elfutils-0.148/arm_backend.diff diff --git a/meta/recipes-devtools/elfutils/elfutils/elf_additions.diff b/meta/recipes-devtools/elfutils/elfutils-0.148/elf_additions.diff index 5baa709000..5baa709000 100644 --- a/meta/recipes-devtools/elfutils/elfutils/elf_additions.diff +++ b/meta/recipes-devtools/elfutils/elfutils-0.148/elf_additions.diff diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/elf_begin.c-CVE-2014-9447-fix.patch b/meta/recipes-devtools/elfutils/elfutils-0.148/elf_begin.c-CVE-2014-9447-fix.patch new file mode 100644 index 0000000000..84e8ddcca7 --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils-0.148/elf_begin.c-CVE-2014-9447-fix.patch @@ -0,0 +1,36 @@ +From 323ca04a0c9189544075c19b49da67f6443a8950 Mon Sep 17 00:00:00 2001 +From: Li xin <lixin.fnst@cn.fujitsu.com> +Date: Wed, 21 Jan 2015 09:33:38 +0900 +Subject: [PATCH] elf_begin.c: CVE-2014-9447 fix + +this patch is from: + https://git.fedorahosted.org/cgit/elfutils.git/commit/?id=147018e729e7c22eeabf15b82d26e4bf68a0d18e + +Upstream-Status: Backport + +Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> +--- + libelf/elf_begin.c | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/libelf/elf_begin.c b/libelf/elf_begin.c +index e46add3..e83ba35 100644 +--- a/libelf/elf_begin.c ++++ b/libelf/elf_begin.c +@@ -736,11 +736,8 @@ read_long_names (Elf *elf) + break; + + /* NUL-terminate the string. */ +- *runp = '\0'; +- +- /* Skip the NUL byte and the \012. */ +- runp += 2; +- ++ *runp++ = '\0'; ++ + /* A sanity check. Somebody might have generated invalid + archive. */ + if (runp >= newp + len) +-- +1.8.4.2 + diff --git a/meta/recipes-devtools/elfutils/elfutils/elfutils-ar-c-fix-num-passed-to-memset.patch b/meta/recipes-devtools/elfutils/elfutils-0.148/elfutils-ar-c-fix-num-passed-to-memset.patch index b619619ec0..b619619ec0 100644 --- a/meta/recipes-devtools/elfutils/elfutils/elfutils-ar-c-fix-num-passed-to-memset.patch +++ b/meta/recipes-devtools/elfutils/elfutils-0.148/elfutils-ar-c-fix-num-passed-to-memset.patch diff --git a/meta/recipes-devtools/elfutils/elfutils/elfutils-fsize.patch b/meta/recipes-devtools/elfutils/elfutils-0.148/elfutils-fsize.patch index 0ff353d0de..0ff353d0de 100644 --- a/meta/recipes-devtools/elfutils/elfutils/elfutils-fsize.patch +++ b/meta/recipes-devtools/elfutils/elfutils-0.148/elfutils-fsize.patch diff --git a/meta/recipes-devtools/elfutils/elfutils/fix-build-gcc-4.8.patch b/meta/recipes-devtools/elfutils/elfutils-0.148/fix-build-gcc-4.8.patch index 0e28690207..0e28690207 100644 --- a/meta/recipes-devtools/elfutils/elfutils/fix-build-gcc-4.8.patch +++ b/meta/recipes-devtools/elfutils/elfutils-0.148/fix-build-gcc-4.8.patch diff --git a/meta/recipes-devtools/elfutils/elfutils/fix_for_gcc-4.7.patch b/meta/recipes-devtools/elfutils/elfutils-0.148/fix_for_gcc-4.7.patch index bd634b4418..bd634b4418 100644 --- a/meta/recipes-devtools/elfutils/elfutils/fix_for_gcc-4.7.patch +++ b/meta/recipes-devtools/elfutils/elfutils-0.148/fix_for_gcc-4.7.patch diff --git a/meta/recipes-devtools/elfutils/elfutils/hppa_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.148/hppa_backend.diff index a86b97c683..a86b97c683 100644 --- a/meta/recipes-devtools/elfutils/elfutils/hppa_backend.diff +++ b/meta/recipes-devtools/elfutils/elfutils-0.148/hppa_backend.diff diff --git a/meta/recipes-devtools/elfutils/elfutils/m68k_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.148/m68k_backend.diff index 5b621f92ff..5b621f92ff 100644 --- a/meta/recipes-devtools/elfutils/elfutils/m68k_backend.diff +++ b/meta/recipes-devtools/elfutils/elfutils-0.148/m68k_backend.diff diff --git a/meta/recipes-devtools/elfutils/elfutils/mips_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.148/mips_backend.diff index 3f81a75b1a..3f81a75b1a 100644 --- a/meta/recipes-devtools/elfutils/elfutils/mips_backend.diff +++ b/meta/recipes-devtools/elfutils/elfutils-0.148/mips_backend.diff diff --git a/meta/recipes-devtools/elfutils/elfutils/nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch b/meta/recipes-devtools/elfutils/elfutils-0.148/nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch index 2b5dad368a..2b5dad368a 100644 --- a/meta/recipes-devtools/elfutils/elfutils/nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch +++ b/meta/recipes-devtools/elfutils/elfutils-0.148/nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch diff --git a/meta/recipes-devtools/elfutils/elfutils/redhat-portability.diff b/meta/recipes-devtools/elfutils/elfutils-0.148/redhat-portability.diff index b8a912c412..b8a912c412 100644 --- a/meta/recipes-devtools/elfutils/elfutils/redhat-portability.diff +++ b/meta/recipes-devtools/elfutils/elfutils-0.148/redhat-portability.diff diff --git a/meta/recipes-devtools/elfutils/elfutils/redhat-robustify.diff b/meta/recipes-devtools/elfutils/elfutils-0.148/redhat-robustify.diff index cd398549df..cd398549df 100644 --- a/meta/recipes-devtools/elfutils/elfutils/redhat-robustify.diff +++ b/meta/recipes-devtools/elfutils/elfutils-0.148/redhat-robustify.diff diff --git a/meta/recipes-devtools/elfutils/elfutils/remove-unused.patch b/meta/recipes-devtools/elfutils/elfutils-0.148/remove-unused.patch index 6a19791480..6a19791480 100644 --- a/meta/recipes-devtools/elfutils/elfutils/remove-unused.patch +++ b/meta/recipes-devtools/elfutils/elfutils-0.148/remove-unused.patch diff --git a/meta/recipes-devtools/elfutils/elfutils/testsuite-ignore-elflint.diff b/meta/recipes-devtools/elfutils/elfutils-0.148/testsuite-ignore-elflint.diff index d792d5fd73..d792d5fd73 100644 --- a/meta/recipes-devtools/elfutils/elfutils/testsuite-ignore-elflint.diff +++ b/meta/recipes-devtools/elfutils/elfutils-0.148/testsuite-ignore-elflint.diff diff --git a/meta/recipes-devtools/elfutils/elfutils-0.158/CVE-2014-0172.patch b/meta/recipes-devtools/elfutils/elfutils-0.158/CVE-2014-0172.patch deleted file mode 100644 index 6c44314589..0000000000 --- a/meta/recipes-devtools/elfutils/elfutils-0.158/CVE-2014-0172.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7f1eec317db79627b473c5b149a22a1b20d1f68f Mon Sep 17 00:00:00 2001 -From: Mark Wielaard <mjw@redhat.com> -Date: Wed, 9 Apr 2014 11:33:23 +0200 -Subject: [PATCH] CVE-2014-0172 Check for overflow before calling malloc to - uncompress data. - -https://bugzilla.redhat.com/show_bug.cgi?id=1085663 - -Reported-by: Florian Weimer <fweimer@redhat.com> -Signed-off-by: Mark Wielaard <mjw@redhat.com> - -Index: elfutils-0.158/libdw/dwarf_begin_elf.c -=================================================================== ---- elfutils-0.158.orig/libdw/dwarf_begin_elf.c 2014-05-01 17:10:01.928213292 +0000 -+++ elfutils-0.158/libdw/dwarf_begin_elf.c 2014-05-01 17:10:01.924213375 +0000 -@@ -1,5 +1,5 @@ - /* Create descriptor from ELF descriptor for processing file. -- Copyright (C) 2002-2011 Red Hat, Inc. -+ Copyright (C) 2002-2011, 2014 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 2002. - -@@ -289,6 +289,12 @@ - memcpy (&size, data->d_buf + 4, sizeof size); - size = be64toh (size); - -+ /* Check for unsigned overflow so malloc always allocated -+ enough memory for both the Elf_Data header and the -+ uncompressed section data. */ -+ if (unlikely (sizeof (Elf_Data) + size < size)) -+ break; -+ - Elf_Data *zdata = malloc (sizeof (Elf_Data) + size); - if (unlikely (zdata == NULL)) - break; diff --git a/meta/recipes-devtools/elfutils/elfutils-0.158/core_filename.patch b/meta/recipes-devtools/elfutils/elfutils-0.158/core_filename.patch deleted file mode 100644 index e2f0576d7b..0000000000 --- a/meta/recipes-devtools/elfutils/elfutils-0.158/core_filename.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Matthias Klose <doko@ubuntu.com> -Date: Tue, 7 Jan 2014 10:25:29 +0100 -Subject: [PATCH] tests: backtrace-subr.sh (check_native_core) should check - core file name. - -Needed when /proc/sys/kernel/core_uses_pid is set to 0. Try to rename -the core file, and if it does still fail, skip the test. - -diff --git a/tests/backtrace-subr.sh b/tests/backtrace-subr.sh -index e7ece91..62b873c 100644 ---- a/tests/backtrace-subr.sh -+++ b/tests/backtrace-subr.sh -@@ -111,6 +111,11 @@ check_native_core() - - # Skip the test if we cannot adjust core ulimit. - core="core.`ulimit -c unlimited || exit 77; set +ex; testrun ${abs_builddir}/$child --gencore; true`" -+ # see if /proc/sys/kernel/core_uses_pid is set to 0 -+ if [ -f core ]; then -+ mv core "$core" -+ fi -+ if [ ! -f "$core" ]; then exit 77; fi - - if [ "x$SAVED_VALGRIND_CMD" != "x" ]; then - VALGRIND_CMD="$SAVED_VALGRIND_CMD" --- -1.9.2 - diff --git a/meta/recipes-devtools/elfutils/elfutils-0.158/elf_additions.diff b/meta/recipes-devtools/elfutils/elfutils-0.158/elf_additions.diff deleted file mode 100644 index 671c8ee1ae..0000000000 --- a/meta/recipes-devtools/elfutils/elfutils-0.158/elf_additions.diff +++ /dev/null @@ -1,77 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - libelf/elf.h | 27 +++++++++++++++++++++++++-- - 1 file changed, 25 insertions(+), 2 deletions(-) - -diff --git a/libelf/elf.h b/libelf/elf.h ---- a/libelf/elf.h -+++ b/libelf/elf.h -@@ -142,6 +142,7 @@ typedef struct - #define ELFOSABI_NETBSD 2 /* NetBSD. */ - #define ELFOSABI_GNU 3 /* Object uses GNU ELF extensions. */ - #define ELFOSABI_LINUX ELFOSABI_GNU /* Compatibility alias. */ -+#define ELFOSABI_HURD 4 /* GNU/Hurd */ - #define ELFOSABI_SOLARIS 6 /* Sun Solaris. */ - #define ELFOSABI_AIX 7 /* IBM AIX. */ - #define ELFOSABI_IRIX 8 /* SGI Irix. */ -@@ -149,8 +150,13 @@ typedef struct - #define ELFOSABI_TRU64 10 /* Compaq TRU64 UNIX. */ - #define ELFOSABI_MODESTO 11 /* Novell Modesto. */ - #define ELFOSABI_OPENBSD 12 /* OpenBSD. */ -+#define ELFOSABI_OPENVMS 13 /* OpenVMS */ -+#define ELFOSABI_NSK 14 /* Hewlett-Packard Non-Stop Kernel */ -+#define ELFOSABI_AROS 15 /* Amiga Research OS */ -+/* 64-255 Architecture-specific value range */ - #define ELFOSABI_ARM_AEABI 64 /* ARM EABI */ - #define ELFOSABI_ARM 97 /* ARM */ -+/* This is deprecated? It's not in the latest version anymore. */ - #define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */ - - #define EI_ABIVERSION 8 /* ABI version */ -@@ -205,7 +211,7 @@ typedef struct - #define EM_H8_300H 47 /* Hitachi H8/300H */ - #define EM_H8S 48 /* Hitachi H8S */ - #define EM_H8_500 49 /* Hitachi H8/500 */ --#define EM_IA_64 50 /* Intel Merced */ -+#define EM_IA_64 50 /* Intel IA64 */ - #define EM_MIPS_X 51 /* Stanford MIPS-X */ - #define EM_COLDFIRE 52 /* Motorola Coldfire */ - #define EM_68HC12 53 /* Motorola M68HC12 */ -@@ -219,7 +225,8 @@ typedef struct - #define EM_TINYJ 61 /* Advanced Logic Corp. Tinyj emb.fam*/ - #define EM_X86_64 62 /* AMD x86-64 architecture */ - #define EM_PDSP 63 /* Sony DSP Processor */ -- -+#define EM_PDP10 64 /* Digital Equipment Corp. PDP-10 */ -+#define EM_PDP11 65 /* Digital Equipment Corp. PDP-11 */ - #define EM_FX66 66 /* Siemens FX66 microcontroller */ - #define EM_ST9PLUS 67 /* STMicroelectronics ST9+ 8/16 mc */ - #define EM_ST7 68 /* STmicroelectronics ST7 8 bit mc */ -@@ -249,6 +256,22 @@ typedef struct - #define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */ - #define EM_ARC_A5 93 /* ARC Cores Tangent-A5 */ - #define EM_XTENSA 94 /* Tensilica Xtensa Architecture */ -+#define EM_VIDEOCORE 95 /* Alphamosaic VideoCore processor */ -+#define EM_TMM_GPP 96 /* Thompson Multimedia General Purpose Processor */ -+#define EM_NS32K 97 /* National Semiconductor 32000 series */ -+#define EM_TPC 98 /* Tenor Network TPC processor */ -+#define EM_SNP1K 99 /* Trebia SNP 1000 processor */ -+#define EM_ST200 100 /* STMicroelectronics (www.st.com) ST200 microcontroller */ -+#define EM_IP2K 101 /* Ubicom IP2XXX microcontroller family */ -+#define EM_MAX 102 /* MAX Processor */ -+#define EM_CR 103 /* National Semiconductor CompactRISC */ -+#define EM_F2MC16 104 /* Fujitsu F2MC16 */ -+#define EM_MSP430 105 /* TI msp430 micro controller */ -+#define EM_BLACKFIN 106 /* Analog Devices Blackfin (DSP) processor */ -+#define EM_SE_C33 107 /* S1C33 Family of Seiko Epson processors */ -+#define EM_SEP 108 /* Sharp embedded microprocessor */ -+#define EM_ARCA 109 /* Arca RISC Microprocessor */ -+ - #define EM_AARCH64 183 /* ARM AARCH64 */ - #define EM_TILEPRO 188 /* Tilera TILEPro */ - #define EM_MICROBLAZE 189 /* Xilinx MicroBlaze */ --- -1.8.1.2 - diff --git a/meta/recipes-devtools/elfutils/elfutils-0.158/m4-biarch.m4-tweak-AC_RUN_IFELSE-for-cross-compiling.patch b/meta/recipes-devtools/elfutils/elfutils-0.158/m4-biarch.m4-tweak-AC_RUN_IFELSE-for-cross-compiling.patch deleted file mode 100644 index 1dbd52d557..0000000000 --- a/meta/recipes-devtools/elfutils/elfutils-0.158/m4-biarch.m4-tweak-AC_RUN_IFELSE-for-cross-compiling.patch +++ /dev/null @@ -1,34 +0,0 @@ -m4/biarch.m4: tweak AC_RUN_IFELSE for cross-compiling - -Macro: AC_RUN_IFELSE (input, - [action-if-true], - [action-if-false], - [action-if-cross-compiling]) - -Add the missing [action-if-cross-compiling] part to support -cross-compiling. - -Upstream-Status: inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - m4/biarch.m4 | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/m4/biarch.m4 b/m4/biarch.m4 ---- a/m4/biarch.m4 -+++ b/m4/biarch.m4 -@@ -40,7 +40,9 @@ AC_CACHE_CHECK([whether $biarch_CC makes executables we can run], - save_CC="$CC" - CC="$biarch_CC" - AC_RUN_IFELSE([AC_LANG_PROGRAM([], [])], -- utrace_cv_cc_biarch=yes, utrace_cv_cc_biarch=no) -+ utrace_cv_cc_biarch=yes, -+ utrace_cv_cc_biarch=no, -+ utrace_cv_cc_biarch=yes) - CC="$save_CC"])], [utrace_cv_cc_biarch=no]) - AS_IF([test $utrace_cv_cc_biarch != yes], [dnl - AC_MSG_WARN([not running biarch tests, $biarch_CC does not work])])]) --- -1.8.1.2 - diff --git a/meta/recipes-devtools/elfutils/elfutils-0.158/redhat-robustify.diff b/meta/recipes-devtools/elfutils/elfutils-0.158/redhat-robustify.diff deleted file mode 100644 index f358a85466..0000000000 --- a/meta/recipes-devtools/elfutils/elfutils-0.158/redhat-robustify.diff +++ /dev/null @@ -1,1756 +0,0 @@ ---- elfutils/libdwfl/ChangeLog -+++ elfutils/libdwfl/ChangeLog -@@ -680,6 +680,11 @@ - * dwfl_module_getdwarf.c (open_elf): Clear errno before CBFAIL. - Reported by Kurt Roeckx <kurt@roeckx.be>. - -+2011-03-23 Petr Machata <pmachata@redhat.com> -+ -+ * relocate.c (relocate_section): Use gelf_fsize instead of relying -+ on shdr->sh_entsize. -+ - 2011-02-11 Roland McGrath <roland@redhat.com> - - * linux-kernel-modules.c (try_kernel_name): Try .gz, .bz2, .xz ---- elfutils/libdwfl/relocate.c -+++ elfutils/libdwfl/relocate.c -@@ -1,5 +1,5 @@ - /* Relocate debug information. -- Copyright (C) 2005-2010 Red Hat, Inc. -+ Copyright (C) 2005-2011 Red Hat, Inc. - This file is part of elfutils. - - This file is free software; you can redistribute it and/or modify -@@ -456,7 +456,10 @@ relocate_section (Dwfl_Module *mod, Elf - } - } - -- size_t nrels = shdr->sh_size / shdr->sh_entsize; -+ size_t sh_entsize -+ = gelf_fsize (relocated, shdr->sh_type == SHT_REL ? ELF_T_REL : ELF_T_RELA, -+ 1, EV_CURRENT); -+ size_t nrels = shdr->sh_size / sh_entsize; - size_t complete = 0; - if (shdr->sh_type == SHT_REL) - for (size_t relidx = 0; !result && relidx < nrels; ++relidx) -@@ -558,7 +561,7 @@ relocate_section (Dwfl_Module *mod, Elf - nrels = next; - } - -- shdr->sh_size = reldata->d_size = nrels * shdr->sh_entsize; -+ shdr->sh_size = reldata->d_size = nrels * sh_entsize; - gelf_update_shdr (scn, shdr); - } - ---- elfutils/libelf/ChangeLog -+++ elfutils/libelf/ChangeLog -@@ -754,10 +754,53 @@ - If section content hasn't been read yet, do it before looking for the - block size. If no section data present, infer size of section header. - -+2005-05-14 Jakub Jelinek <jakub@redhat.com> -+ -+ * libelfP.h (INVALID_NDX): Define. -+ * gelf_getdyn.c (gelf_getdyn): Use it. Remove ndx < 0 test if any. -+ * gelf_getlib.c (gelf_getlib): Likewise. -+ * gelf_getmove.c (gelf_getmove): Likewise. -+ * gelf_getrel.c (gelf_getrel): Likewise. -+ * gelf_getrela.c (gelf_getrela): Likewise. -+ * gelf_getsym.c (gelf_getsym): Likewise. -+ * gelf_getsyminfo.c (gelf_getsyminfo): Likewise. -+ * gelf_getsymshndx.c (gelf_getsymshndx): Likewise. -+ * gelf_getversym.c (gelf_getversym): Likewise. -+ * gelf_update_dyn.c (gelf_update_dyn): Likewise. -+ * gelf_update_lib.c (gelf_update_lib): Likewise. -+ * gelf_update_move.c (gelf_update_move): Likewise. -+ * gelf_update_rel.c (gelf_update_rel): Likewise. -+ * gelf_update_rela.c (gelf_update_rela): Likewise. -+ * gelf_update_sym.c (gelf_update_sym): Likewise. -+ * gelf_update_syminfo.c (gelf_update_syminfo): Likewise. -+ * gelf_update_symshndx.c (gelf_update_symshndx): Likewise. -+ * gelf_update_versym.c (gelf_update_versym): Likewise. -+ * elf_newscn.c (elf_newscn): Check for overflow. -+ * elf32_updatefile.c (__elfw2(LIBELFBITS,updatemmap)): Likewise. -+ (__elfw2(LIBELFBITS,updatefile)): Likewise. -+ * elf_begin.c (file_read_elf): Likewise. -+ * elf32_newphdr.c (elfw2(LIBELFBITS,newphdr)): Likewise. -+ * elf_getarsym.c (elf_getarsym): Likewise. -+ * elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)): Likewise. - 2005-05-11 Ulrich Drepper <drepper@redhat.com> - - * elf.h: Update again. - -+2005-05-17 Jakub Jelinek <jakub@redhat.com> -+ -+ * elf32_getphdr.c (elfw2(LIBELFBITS,getphdr)): Check if program header -+ table fits into object's bounds. -+ * elf_getshstrndx.c (elf_getshstrndx): Add elf->start_offset to -+ elf->map_address. Check if first section header fits into object's -+ bounds. -+ * elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)): -+ Check if section header table fits into object's bounds. -+ * elf_begin.c (get_shnum): Ensure section headers fits into -+ object's bounds. -+ (file_read_elf): Make sure scncnt is small enough to allocate both -+ ElfXX_Shdr and Elf_Scn array. Make sure section and program header -+ tables fit into object's bounds. Avoid memory leak on failure. -+ - 2005-05-09 Ulrich Drepper <drepper@redhat.com> - - * elf.h: Update from glibc. ---- elfutils/libelf/elf32_getphdr.c -+++ elfutils/libelf/elf32_getphdr.c -@@ -93,6 +93,16 @@ __elfw2(LIBELFBITS,getphdr_wrlock) (elf) - - if (elf->map_address != NULL) - { -+ /* First see whether the information in the ELF header is -+ valid and it does not ask for too much. */ -+ if (unlikely (ehdr->e_phoff >= elf->maximum_size) -+ || unlikely (elf->maximum_size - ehdr->e_phoff < size)) -+ { -+ /* Something is wrong. */ -+ __libelf_seterrno (ELF_E_INVALID_PHDR); -+ goto out; -+ } -+ - /* All the data is already mapped. Use it. */ - void *file_phdr = ((char *) elf->map_address - + elf->start_offset + ehdr->e_phoff); ---- elfutils/libelf/elf32_getshdr.c -+++ elfutils/libelf/elf32_getshdr.c -@@ -60,7 +60,8 @@ load_shdr_wrlock (Elf_Scn *scn) - goto out; - - size_t shnum; -- if (__elf_getshdrnum_rdlock (elf, &shnum) != 0) -+ if (__elf_getshdrnum_rdlock (elf, &shnum) != 0 -+ || shnum > SIZE_MAX / sizeof (ElfW2(LIBELFBITS,Shdr))) - goto out; - size_t size = shnum * sizeof (ElfW2(LIBELFBITS,Shdr)); - -@@ -77,6 +78,16 @@ load_shdr_wrlock (Elf_Scn *scn) - - if (elf->map_address != NULL) - { -+ /* First see whether the information in the ELF header is -+ valid and it does not ask for too much. */ -+ if (unlikely (ehdr->e_shoff >= elf->maximum_size) -+ || unlikely (elf->maximum_size - ehdr->e_shoff < size)) -+ { -+ /* Something is wrong. */ -+ __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER); -+ goto free_and_out; -+ } -+ - ElfW2(LIBELFBITS,Shdr) *notcvt; - - /* All the data is already mapped. If we could use it ---- elfutils/libelf/elf32_newphdr.c -+++ elfutils/libelf/elf32_newphdr.c -@@ -114,6 +114,12 @@ elfw2(LIBELFBITS,newphdr) (elf, count) - || count == PN_XNUM - || elf->state.ELFW(elf,LIBELFBITS).phdr == NULL) - { -+ if (unlikely (count > SIZE_MAX / sizeof (ElfW2(LIBELFBITS,Phdr)))) -+ { -+ result = NULL; -+ goto out; -+ } -+ - /* Allocate a new program header with the appropriate number of - elements. */ - result = (ElfW2(LIBELFBITS,Phdr) *) ---- elfutils/libelf/elf32_updatefile.c -+++ elfutils/libelf/elf32_updatefile.c -@@ -202,6 +202,9 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf - /* Write all the sections. Well, only those which are modified. */ - if (shnum > 0) - { -+ if (unlikely (shnum > SIZE_MAX / sizeof (Elf_Scn *))) -+ return 1; -+ - Elf_ScnList *list = &elf->state.ELFW(elf,LIBELFBITS).scns; - Elf_Scn **scns = (Elf_Scn **) alloca (shnum * sizeof (Elf_Scn *)); - char *const shdr_start = ((char *) elf->map_address + elf->start_offset -@@ -624,6 +627,10 @@ __elfw2(LIBELFBITS,updatefile) (Elf *elf - /* Write all the sections. Well, only those which are modified. */ - if (shnum > 0) - { -+ if (unlikely (shnum > SIZE_MAX / (sizeof (Elf_Scn *) -+ + sizeof (ElfW2(LIBELFBITS,Shdr))))) -+ return 1; -+ - off_t shdr_offset = elf->start_offset + ehdr->e_shoff; - #if EV_NUM != 2 - xfct_t shdr_fctp = __elf_xfctstom[__libelf_version - 1][EV_CURRENT - 1][ELFW(ELFCLASS, LIBELFBITS) - 1][ELF_T_SHDR]; ---- elfutils/libelf/elf_begin.c -+++ elfutils/libelf/elf_begin.c -@@ -144,7 +144,8 @@ get_shnum (void *map_address, unsigned c - - if (unlikely (result == 0) && ehdr.e32->e_shoff != 0) - { -- if (ehdr.e32->e_shoff + sizeof (Elf32_Shdr) > maxsize) -+ if (unlikely (ehdr.e32->e_shoff >= maxsize) -+ || unlikely (maxsize - ehdr.e32->e_shoff < sizeof (Elf32_Shdr))) - /* Cannot read the first section header. */ - return 0; - -@@ -192,7 +193,8 @@ get_shnum (void *map_address, unsigned c - - if (unlikely (result == 0) && ehdr.e64->e_shoff != 0) - { -- if (ehdr.e64->e_shoff + sizeof (Elf64_Shdr) > maxsize) -+ if (unlikely (ehdr.e64->e_shoff >= maxsize) -+ || unlikely (ehdr.e64->e_shoff + sizeof (Elf64_Shdr) > maxsize)) - /* Cannot read the first section header. */ - return 0; - -@@ -264,6 +266,15 @@ file_read_elf (int fildes, void *map_add - /* Could not determine the number of sections. */ - return NULL; - -+ /* Check for too many sections. */ -+ if (e_ident[EI_CLASS] == ELFCLASS32) -+ { -+ if (scncnt > SIZE_MAX / (sizeof (Elf_Scn) + sizeof (Elf32_Shdr))) -+ return NULL; -+ } -+ else if (scncnt > SIZE_MAX / (sizeof (Elf_Scn) + sizeof (Elf64_Shdr))) -+ return NULL; -+ - /* We can now allocate the memory. Even if there are no section headers, - we allocate space for a zeroth section in case we need it later. */ - const size_t scnmax = (scncnt ?: (cmd == ELF_C_RDWR || cmd == ELF_C_RDWR_MMAP) -@@ -303,6 +314,16 @@ file_read_elf (int fildes, void *map_add - { - /* We can use the mmapped memory. */ - elf->state.elf32.ehdr = ehdr; -+ -+ if (unlikely (ehdr->e_shoff >= maxsize) -+ || unlikely (maxsize - ehdr->e_shoff -+ < scncnt * sizeof (Elf32_Shdr))) -+ { -+ free_and_out: -+ free (elf); -+ __libelf_seterrno (ELF_E_INVALID_FILE); -+ return NULL; -+ } - elf->state.elf32.shdr - = (Elf32_Shdr *) ((char *) ehdr + ehdr->e_shoff); - -@@ -389,6 +410,11 @@ file_read_elf (int fildes, void *map_add - { - /* We can use the mmapped memory. */ - elf->state.elf64.ehdr = ehdr; -+ -+ if (unlikely (ehdr->e_shoff >= maxsize) -+ || unlikely (ehdr->e_shoff -+ + scncnt * sizeof (Elf32_Shdr) > maxsize)) -+ goto free_and_out; - elf->state.elf64.shdr - = (Elf64_Shdr *) ((char *) ehdr + ehdr->e_shoff); - ---- elfutils/libelf/elf_getarsym.c -+++ elfutils/libelf/elf_getarsym.c -@@ -183,6 +183,9 @@ elf_getarsym (elf, ptr) - size_t index_size = atol (tmpbuf); - - if (SARMAG + sizeof (struct ar_hdr) + index_size > elf->maximum_size -+#if SIZE_MAX <= 4294967295U -+ || n >= SIZE_MAX / sizeof (Elf_Arsym) -+#endif - || n * w > index_size) - { - /* This index table cannot be right since it does not fit into ---- elfutils/libelf/elf_getshdrstrndx.c -+++ elfutils/libelf/elf_getshdrstrndx.c -@@ -104,10 +104,25 @@ elf_getshdrstrndx (elf, dst) - if (elf->map_address != NULL - && elf->state.elf32.ehdr->e_ident[EI_DATA] == MY_ELFDATA - && (ALLOW_UNALIGNED -- || (((size_t) ((char *) elf->map_address + offset)) -+ || (((size_t) ((char *) elf->map_address -+ + elf->start_offset + offset)) - & (__alignof__ (Elf32_Shdr) - 1)) == 0)) -- /* We can directly access the memory. */ -- num = ((Elf32_Shdr *) (elf->map_address + offset))->sh_link; -+ { -+ /* First see whether the information in the ELF header is -+ valid and it does not ask for too much. */ -+ if (unlikely (elf->maximum_size - offset -+ < sizeof (Elf32_Shdr))) -+ { -+ /* Something is wrong. */ -+ __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER); -+ result = -1; -+ goto out; -+ } -+ -+ /* We can directly access the memory. */ -+ num = ((Elf32_Shdr *) (elf->map_address + elf->start_offset -+ + offset))->sh_link; -+ } - else - { - /* We avoid reading in all the section headers. Just read -@@ -142,10 +157,25 @@ elf_getshdrstrndx (elf, dst) - if (elf->map_address != NULL - && elf->state.elf64.ehdr->e_ident[EI_DATA] == MY_ELFDATA - && (ALLOW_UNALIGNED -- || (((size_t) ((char *) elf->map_address + offset)) -+ || (((size_t) ((char *) elf->map_address -+ + elf->start_offset + offset)) - & (__alignof__ (Elf64_Shdr) - 1)) == 0)) -- /* We can directly access the memory. */ -- num = ((Elf64_Shdr *) (elf->map_address + offset))->sh_link; -+ { -+ /* First see whether the information in the ELF header is -+ valid and it does not ask for too much. */ -+ if (unlikely (elf->maximum_size - offset -+ < sizeof (Elf64_Shdr))) -+ { -+ /* Something is wrong. */ -+ __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER); -+ result = -1; -+ goto out; -+ } -+ -+ /* We can directly access the memory. */ -+ num = ((Elf64_Shdr *) (elf->map_address + elf->start_offset -+ + offset))->sh_link; -+ } - else - { - /* We avoid reading in all the section headers. Just read ---- elfutils/libelf/elf_newscn.c -+++ elfutils/libelf/elf_newscn.c -@@ -83,10 +83,18 @@ elf_newscn (elf) - else - { - /* We must allocate a new element. */ -- Elf_ScnList *newp; -+ Elf_ScnList *newp = NULL; - - assert (elf->state.elf.scnincr > 0); - -+ if ( -+#if SIZE_MAX <= 4294967295U -+ likely (elf->state.elf.scnincr -+ < SIZE_MAX / 2 / sizeof (Elf_Scn) - sizeof (Elf_ScnList)) -+#else -+ 1 -+#endif -+ ) - newp = (Elf_ScnList *) calloc (sizeof (Elf_ScnList) - + ((elf->state.elf.scnincr *= 2) - * sizeof (Elf_Scn)), 1); ---- elfutils/libelf/gelf_getdyn.c -+++ elfutils/libelf/gelf_getdyn.c -@@ -1,5 +1,5 @@ - /* Get information from dynamic table at the given index. -- Copyright (C) 2000, 2001, 2002 Red Hat, Inc. -+ Copyright (C) 2000-2009 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 2000. - -@@ -72,7 +72,7 @@ gelf_getdyn (data, ndx, dst) - table entries has to be adopted. The user better has provided - a buffer where we can store the information. While copying the - data we are converting the format. */ -- if (unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size)) -+ if (INVALID_NDX (ndx, Elf32_Dyn, &data_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; -@@ -93,7 +93,7 @@ gelf_getdyn (data, ndx, dst) - - /* The data is already in the correct form. Just make sure the - index is OK. */ -- if (unlikely ((ndx + 1) * sizeof (GElf_Dyn) > data_scn->d.d_size)) -+ if (INVALID_NDX (ndx, GElf_Dyn, &data_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; ---- elfutils/libelf/gelf_getlib.c -+++ elfutils/libelf/gelf_getlib.c -@@ -1,5 +1,5 @@ - /* Get library from table at the given index. -- Copyright (C) 2004 Red Hat, Inc. -+ Copyright (C) 2004-2009 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 2004. - -@@ -65,7 +65,7 @@ gelf_getlib (data, ndx, dst) - /* The data is already in the correct form. Just make sure the - index is OK. */ - GElf_Lib *result = NULL; -- if (unlikely ((ndx + 1) * sizeof (GElf_Lib) > data->d_size)) -+ if (INVALID_NDX (ndx, GElf_Lib, data)) - __libelf_seterrno (ELF_E_INVALID_INDEX); - else - { ---- elfutils/libelf/gelf_getmove.c -+++ elfutils/libelf/gelf_getmove.c -@@ -1,5 +1,5 @@ - /* Get move structure at the given index. -- Copyright (C) 2000, 2001, 2002 Red Hat, Inc. -+ Copyright (C) 2000-2009 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 2000. - -@@ -62,7 +62,7 @@ gelf_getmove (data, ndx, dst) - - /* The data is already in the correct form. Just make sure the - index is OK. */ -- if (unlikely ((ndx + 1) * sizeof (GElf_Move) > data->d_size)) -+ if (INVALID_NDX (ndx, GElf_Move, data)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; ---- elfutils/libelf/gelf_getrela.c -+++ elfutils/libelf/gelf_getrela.c -@@ -1,5 +1,5 @@ - /* Get RELA relocation information at given index. -- Copyright (C) 2000, 2001, 2002 Red Hat, Inc. -+ Copyright (C) 2000-2009 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 2000. - -@@ -50,12 +50,6 @@ gelf_getrela (data, ndx, dst) - if (data_scn == NULL) - return NULL; - -- if (unlikely (ndx < 0)) -- { -- __libelf_seterrno (ELF_E_INVALID_INDEX); -- return NULL; -- } -- - if (unlikely (data_scn->d.d_type != ELF_T_RELA)) - { - __libelf_seterrno (ELF_E_INVALID_HANDLE); -@@ -72,7 +66,7 @@ gelf_getrela (data, ndx, dst) - if (scn->elf->class == ELFCLASS32) - { - /* We have to convert the data. */ -- if (unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size)) -+ if (INVALID_NDX (ndx, Elf32_Rela, &data_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - result = NULL; -@@ -93,7 +87,7 @@ gelf_getrela (data, ndx, dst) - { - /* Simply copy the data after we made sure we are actually getting - correct data. */ -- if (unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size)) -+ if (INVALID_NDX (ndx, Elf64_Rela, &data_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - result = NULL; ---- elfutils/libelf/gelf_getrel.c -+++ elfutils/libelf/gelf_getrel.c -@@ -1,5 +1,5 @@ - /* Get REL relocation information at given index. -- Copyright (C) 2000, 2001, 2002 Red Hat, Inc. -+ Copyright (C) 2000-2009 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 2000. - -@@ -50,12 +50,6 @@ gelf_getrel (data, ndx, dst) - if (data_scn == NULL) - return NULL; - -- if (unlikely (ndx < 0)) -- { -- __libelf_seterrno (ELF_E_INVALID_INDEX); -- return NULL; -- } -- - if (unlikely (data_scn->d.d_type != ELF_T_REL)) - { - __libelf_seterrno (ELF_E_INVALID_HANDLE); -@@ -72,7 +66,7 @@ gelf_getrel (data, ndx, dst) - if (scn->elf->class == ELFCLASS32) - { - /* We have to convert the data. */ -- if (unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size)) -+ if (INVALID_NDX (ndx, Elf32_Rel, &data_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - result = NULL; -@@ -92,7 +86,7 @@ gelf_getrel (data, ndx, dst) - { - /* Simply copy the data after we made sure we are actually getting - correct data. */ -- if (unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size)) -+ if (INVALID_NDX (ndx, Elf64_Rel, &data_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - result = NULL; ---- elfutils/libelf/gelf_getsym.c -+++ elfutils/libelf/gelf_getsym.c -@@ -1,5 +1,5 @@ - /* Get symbol information from symbol table at the given index. -- Copyright (C) 1999, 2000, 2001, 2002 Red Hat, Inc. -+ Copyright (C) 1999-2009 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 1999. - -@@ -69,7 +69,7 @@ gelf_getsym (data, ndx, dst) - table entries has to be adopted. The user better has provided - a buffer where we can store the information. While copying the - data we are converting the format. */ -- if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > data->d_size)) -+ if (INVALID_NDX (ndx, Elf32_Sym, data)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; -@@ -98,7 +98,7 @@ gelf_getsym (data, ndx, dst) - - /* The data is already in the correct form. Just make sure the - index is OK. */ -- if (unlikely ((ndx + 1) * sizeof (GElf_Sym) > data->d_size)) -+ if (INVALID_NDX (ndx, GElf_Sym, data)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; ---- elfutils/libelf/gelf_getsyminfo.c -+++ elfutils/libelf/gelf_getsyminfo.c -@@ -1,5 +1,5 @@ - /* Get additional symbol information from symbol table at the given index. -- Copyright (C) 2000, 2001, 2002 Red Hat, Inc. -+ Copyright (C) 2000-2009 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 2000. - -@@ -63,7 +63,7 @@ gelf_getsyminfo (data, ndx, dst) - - /* The data is already in the correct form. Just make sure the - index is OK. */ -- if (unlikely ((ndx + 1) * sizeof (GElf_Syminfo) > data->d_size)) -+ if (INVALID_NDX (ndx, GElf_Syminfo, data)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; ---- elfutils/libelf/gelf_getsymshndx.c -+++ elfutils/libelf/gelf_getsymshndx.c -@@ -1,6 +1,6 @@ - /* Get symbol information and separate section index from symbol table - at the given index. -- Copyright (C) 2000, 2001, 2002 Red Hat, Inc. -+ Copyright (C) 2000-2009 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 2000. - -@@ -69,7 +69,7 @@ gelf_getsymshndx (symdata, shndxdata, nd - section index table. */ - if (likely (shndxdata_scn != NULL)) - { -- if (unlikely ((ndx + 1) * sizeof (Elf32_Word) > shndxdata_scn->d.d_size)) -+ if (INVALID_NDX (ndx, Elf32_Word, &shndxdata_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; -@@ -89,7 +89,7 @@ gelf_getsymshndx (symdata, shndxdata, nd - table entries has to be adopted. The user better has provided - a buffer where we can store the information. While copying the - data we are converting the format. */ -- if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > symdata->d_size)) -+ if (INVALID_NDX (ndx, Elf32_Sym, symdata)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; -@@ -118,7 +118,7 @@ gelf_getsymshndx (symdata, shndxdata, nd - - /* The data is already in the correct form. Just make sure the - index is OK. */ -- if (unlikely ((ndx + 1) * sizeof (GElf_Sym) > symdata->d_size)) -+ if (INVALID_NDX (ndx, GElf_Sym, symdata)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; ---- elfutils/libelf/gelf_getversym.c -+++ elfutils/libelf/gelf_getversym.c -@@ -1,5 +1,5 @@ - /* Get symbol version information at the given index. -- Copyright (C) 1999, 2000, 2001, 2002 Red Hat, Inc. -+ Copyright (C) 1999-2009 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 1999. - -@@ -71,7 +71,7 @@ gelf_getversym (data, ndx, dst) - - /* The data is already in the correct form. Just make sure the - index is OK. */ -- if (unlikely ((ndx + 1) * sizeof (GElf_Versym) > data->d_size)) -+ if (INVALID_NDX (ndx, GElf_Versym, data)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - result = NULL; ---- elfutils/libelf/gelf_update_dyn.c -+++ elfutils/libelf/gelf_update_dyn.c -@@ -1,5 +1,5 @@ - /* Update information in dynamic table at the given index. -- Copyright (C) 2000, 2001, 2002 Red Hat, Inc. -+ Copyright (C) 2000-2009 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 2000. - -@@ -50,12 +50,6 @@ gelf_update_dyn (data, ndx, src) - if (data == NULL) - return 0; - -- if (unlikely (ndx < 0)) -- { -- __libelf_seterrno (ELF_E_INVALID_INDEX); -- return 0; -- } -- - if (unlikely (data_scn->d.d_type != ELF_T_DYN)) - { - /* The type of the data better should match. */ -@@ -81,7 +75,7 @@ gelf_update_dyn (data, ndx, src) - } - - /* Check whether we have to resize the data buffer. */ -- if (unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size)) -+ if (INVALID_NDX (ndx, Elf32_Dyn, &data_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; -@@ -95,7 +89,7 @@ gelf_update_dyn (data, ndx, src) - else - { - /* Check whether we have to resize the data buffer. */ -- if (unlikely ((ndx + 1) * sizeof (Elf64_Dyn) > data_scn->d.d_size)) -+ if (INVALID_NDX (ndx, Elf64_Dyn, &data_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; ---- elfutils/libelf/gelf_update_lib.c -+++ elfutils/libelf/gelf_update_lib.c -@@ -1,5 +1,5 @@ - /* Update library in table at the given index. -- Copyright (C) 2004 Red Hat, Inc. -+ Copyright (C) 2004-2009 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 2004. - -@@ -47,12 +47,6 @@ gelf_update_lib (data, ndx, src) - if (data == NULL) - return 0; - -- if (unlikely (ndx < 0)) -- { -- __libelf_seterrno (ELF_E_INVALID_INDEX); -- return 0; -- } -- - Elf_Data_Scn *data_scn = (Elf_Data_Scn *) data; - if (unlikely (data_scn->d.d_type != ELF_T_LIB)) - { -@@ -66,7 +60,7 @@ gelf_update_lib (data, ndx, src) - - /* Check whether we have to resize the data buffer. */ - int result = 0; -- if (unlikely ((ndx + 1) * sizeof (Elf64_Lib) > data_scn->d.d_size)) -+ if (INVALID_NDX (ndx, Elf64_Lib, &data_scn->d)) - __libelf_seterrno (ELF_E_INVALID_INDEX); - else - { ---- elfutils/libelf/gelf_update_move.c -+++ elfutils/libelf/gelf_update_move.c -@@ -1,5 +1,5 @@ - /* Update move structure at the given index. -- Copyright (C) 2000, 2001, 2002 Red Hat, Inc. -+ Copyright (C) 2000-2009 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 2000. - -@@ -54,8 +54,7 @@ gelf_update_move (data, ndx, src) - assert (sizeof (GElf_Move) == sizeof (Elf64_Move)); - - /* Check whether we have to resize the data buffer. */ -- if (unlikely (ndx < 0) -- || unlikely ((ndx + 1) * sizeof (GElf_Move) > data_scn->d.d_size)) -+ if (INVALID_NDX (ndx, GElf_Move, &data_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - return 0; ---- elfutils/libelf/gelf_update_rela.c -+++ elfutils/libelf/gelf_update_rela.c -@@ -1,5 +1,5 @@ - /* Update RELA relocation information at given index. -- Copyright (C) 2000, 2001, 2002 Red Hat, Inc. -+ Copyright (C) 2000-2009 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 2000. - -@@ -47,12 +47,6 @@ gelf_update_rela (Elf_Data *dst, int ndx - if (dst == NULL) - return 0; - -- if (unlikely (ndx < 0)) -- { -- __libelf_seterrno (ELF_E_INVALID_INDEX); -- return 0; -- } -- - if (unlikely (data_scn->d.d_type != ELF_T_RELA)) - { - /* The type of the data better should match. */ -@@ -80,7 +74,7 @@ gelf_update_rela (Elf_Data *dst, int ndx - } - - /* Check whether we have to resize the data buffer. */ -- if (unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size)) -+ if (INVALID_NDX (ndx, Elf32_Rela, &data_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; -@@ -96,7 +90,7 @@ gelf_update_rela (Elf_Data *dst, int ndx - else - { - /* Check whether we have to resize the data buffer. */ -- if (unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size)) -+ if (INVALID_NDX (ndx, Elf64_Rela, &data_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; ---- elfutils/libelf/gelf_update_rel.c -+++ elfutils/libelf/gelf_update_rel.c -@@ -1,5 +1,5 @@ - /* Update REL relocation information at given index. -- Copyright (C) 2000, 2001, 2002 Red Hat, Inc. -+ Copyright (C) 2000-2009 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 2000. - -@@ -47,12 +47,6 @@ gelf_update_rel (Elf_Data *dst, int ndx, - if (dst == NULL) - return 0; - -- if (unlikely (ndx < 0)) -- { -- __libelf_seterrno (ELF_E_INVALID_INDEX); -- return 0; -- } -- - if (unlikely (data_scn->d.d_type != ELF_T_REL)) - { - /* The type of the data better should match. */ -@@ -78,7 +72,7 @@ gelf_update_rel (Elf_Data *dst, int ndx, - } - - /* Check whether we have to resize the data buffer. */ -- if (unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size)) -+ if (INVALID_NDX (ndx, Elf32_Rel, &data_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; -@@ -93,7 +87,7 @@ gelf_update_rel (Elf_Data *dst, int ndx, - else - { - /* Check whether we have to resize the data buffer. */ -- if (unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size)) -+ if (INVALID_NDX (ndx, Elf64_Rel, &data_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; ---- elfutils/libelf/gelf_update_sym.c -+++ elfutils/libelf/gelf_update_sym.c -@@ -1,5 +1,5 @@ - /* Update symbol information in symbol table at the given index. -- Copyright (C) 2000, 2001, 2002 Red Hat, Inc. -+ Copyright (C) 2000-2009 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 2000. - -@@ -51,12 +51,6 @@ gelf_update_sym (data, ndx, src) - if (data == NULL) - return 0; - -- if (unlikely (ndx < 0)) -- { -- __libelf_seterrno (ELF_E_INVALID_INDEX); -- return 0; -- } -- - if (unlikely (data_scn->d.d_type != ELF_T_SYM)) - { - /* The type of the data better should match. */ -@@ -81,7 +75,7 @@ gelf_update_sym (data, ndx, src) - } - - /* Check whether we have to resize the data buffer. */ -- if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > data_scn->d.d_size)) -+ if (INVALID_NDX (ndx, Elf32_Sym, &data_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; -@@ -104,7 +98,7 @@ gelf_update_sym (data, ndx, src) - else - { - /* Check whether we have to resize the data buffer. */ -- if (unlikely ((ndx + 1) * sizeof (Elf64_Sym) > data_scn->d.d_size)) -+ if (INVALID_NDX (ndx, Elf64_Sym, &data_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; ---- elfutils/libelf/gelf_update_syminfo.c -+++ elfutils/libelf/gelf_update_syminfo.c -@@ -1,5 +1,5 @@ - /* Update additional symbol information in symbol table at the given index. -- Copyright (C) 2000, 2001, 2002 Red Hat, Inc. -+ Copyright (C) 2000-2009 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 2000. - -@@ -51,12 +51,6 @@ gelf_update_syminfo (data, ndx, src) - if (data == NULL) - return 0; - -- if (unlikely (ndx < 0)) -- { -- __libelf_seterrno (ELF_E_INVALID_INDEX); -- return 0; -- } -- - if (unlikely (data_scn->d.d_type != ELF_T_SYMINFO)) - { - /* The type of the data better should match. */ -@@ -72,7 +66,7 @@ gelf_update_syminfo (data, ndx, src) - rwlock_wrlock (scn->elf->lock); - - /* Check whether we have to resize the data buffer. */ -- if (unlikely ((ndx + 1) * sizeof (GElf_Syminfo) > data_scn->d.d_size)) -+ if (INVALID_NDX (ndx, GElf_Syminfo, &data_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; ---- elfutils/libelf/gelf_update_symshndx.c -+++ elfutils/libelf/gelf_update_symshndx.c -@@ -1,6 +1,6 @@ - /* Update symbol information and section index in symbol table at the - given index. -- Copyright (C) 2000, 2001, 2002 Red Hat, Inc. -+ Copyright (C) 2000-2009 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 2000. - -@@ -56,12 +56,6 @@ gelf_update_symshndx (symdata, shndxdata - if (symdata == NULL) - return 0; - -- if (unlikely (ndx < 0)) -- { -- __libelf_seterrno (ELF_E_INVALID_INDEX); -- return 0; -- } -- - if (unlikely (symdata_scn->d.d_type != ELF_T_SYM)) - { - /* The type of the data better should match. */ -@@ -107,7 +101,7 @@ gelf_update_symshndx (symdata, shndxdata - } - - /* Check whether we have to resize the data buffer. */ -- if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > symdata_scn->d.d_size)) -+ if (INVALID_NDX (ndx, Elf32_Sym, &symdata_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; -@@ -130,7 +124,7 @@ gelf_update_symshndx (symdata, shndxdata - else - { - /* Check whether we have to resize the data buffer. */ -- if (unlikely ((ndx + 1) * sizeof (Elf64_Sym) > symdata_scn->d.d_size)) -+ if (INVALID_NDX (ndx, Elf64_Sym, &symdata_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - goto out; ---- elfutils/libelf/gelf_update_versym.c -+++ elfutils/libelf/gelf_update_versym.c -@@ -1,5 +1,5 @@ - /* Update symbol version information. -- Copyright (C) 2001, 2002 Red Hat, Inc. -+ Copyright (C) 2001-2009 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper <drepper@redhat.com>, 2001. - -@@ -54,8 +54,7 @@ gelf_update_versym (data, ndx, src) - assert (sizeof (GElf_Versym) == sizeof (Elf64_Versym)); - - /* Check whether we have to resize the data buffer. */ -- if (unlikely (ndx < 0) -- || unlikely ((ndx + 1) * sizeof (GElf_Versym) > data_scn->d.d_size)) -+ if (INVALID_NDX (ndx, GElf_Versym, &data_scn->d)) - { - __libelf_seterrno (ELF_E_INVALID_INDEX); - return 0; ---- elfutils/libelf/libelfP.h -+++ elfutils/libelf/libelfP.h -@@ -587,4 +587,8 @@ extern uint32_t __libelf_crc32 (uint32_t - /* Align offset to 4 bytes as needed for note name and descriptor data. */ - #define NOTE_ALIGN(n) (((n) + 3) & -4U) - -+/* Convenience macro. */ -+#define INVALID_NDX(ndx, type, data) \ -+ unlikely ((data)->d_size / sizeof (type) <= (unsigned int) (ndx)) -+ - #endif /* libelfP.h */ ---- elfutils/src/ChangeLog -+++ elfutils/src/ChangeLog -@@ -702,6 +702,12 @@ - - * readelf.c (dwarf_attr_string): Grok DW_AT_GNU_odr_signature. - -+2011-03-23 Petr Machata <pmachata@redhat.com> -+ -+ * readelf.c (handle_dynamic, handle_relocs_rel) -+ (handle_relocs_rela, handle_versym, print_liblist): -+ Use gelf_fsize instead of relying on shdr->sh_entsize. -+ - 2011-02-11 Roland McGrath <roland@redhat.com> - - * elfcmp.c (verbose): New variable. -@@ -2414,6 +2420,16 @@ - object symbols or symbols with unknown type. - (check_rel): Likewise. - -+2005-06-09 Roland McGrath <roland@redhat.com> -+ -+ * readelf.c (handle_dynamic, handle_symtab): Check for bogus sh_link. -+ (handle_verneed, handle_verdef, handle_versym, handle_hash): Likewise. -+ (handle_scngrp): Check for bogus sh_info. -+ -+ * strip.c (handle_elf): Check for bogus values in sh_link, sh_info, -+ st_shndx, e_shstrndx, and SHT_GROUP or SHT_SYMTAB_SHNDX data. -+ Don't use assert on input values, instead bail with "illformed" error. -+ - 2005-06-08 Roland McGrath <roland@redhat.com> - - * readelf.c (print_ops): Add consts. -@@ -2459,6 +2475,19 @@ - - * readelf.c (dwarf_tag_string): Add new tags. - -+2005-05-17 Jakub Jelinek <jakub@redhat.com> -+ -+ * elflint.c (check_hash): Don't check entries beyond end of section. -+ (check_note): Don't crash if gelf_rawchunk fails. -+ (section_name): Return <invalid> if gelf_getshdr returns NULL. -+ -+2005-05-14 Jakub Jelinek <jakub@redhat.com> -+ -+ * elflint.c (section_name): Return "<invalid>" instead of -+ crashing on invalid section name. -+ (check_symtab, is_rel_dyn, check_rela, check_rel, check_dynamic, -+ check_symtab_shndx, check_hash, check_versym): Robustify. -+ - 2005-05-08 Roland McGrath <roland@redhat.com> - - * strip.c (handle_elf): Don't translate hash and versym data formats, ---- elfutils/src/elflint.c -+++ elfutils/src/elflint.c -@@ -123,6 +123,10 @@ static uint32_t shstrndx; - /* Array to count references in section groups. */ - static int *scnref; - -+/* Numbers of sections and program headers. */ -+static unsigned int shnum; -+static unsigned int phnum; -+ - - int - main (int argc, char *argv[]) -@@ -311,10 +315,19 @@ section_name (Ebl *ebl, int idx) - { - GElf_Shdr shdr_mem; - GElf_Shdr *shdr; -+ const char *ret; -+ -+ if ((unsigned int) idx > shnum) -+ return "<invalid>"; - - shdr = gelf_getshdr (elf_getscn (ebl->elf, idx), &shdr_mem); -+ if (shdr == NULL) -+ return "<invalid>"; - -- return elf_strptr (ebl->elf, shstrndx, shdr->sh_name); -+ ret = elf_strptr (ebl->elf, shstrndx, shdr->sh_name); -+ if (ret == NULL) -+ return "<invalid>"; -+ return ret; - } - - -@@ -337,11 +350,6 @@ static const int valid_e_machine[] = - (sizeof (valid_e_machine) / sizeof (valid_e_machine[0])) - - --/* Numbers of sections and program headers. */ --static unsigned int shnum; --static unsigned int phnum; -- -- - static void - check_elf_header (Ebl *ebl, GElf_Ehdr *ehdr, size_t size) - { -@@ -625,7 +633,8 @@ section [%2d] '%s': symbol table cannot - } - } - -- if (shdr->sh_entsize != gelf_fsize (ebl->elf, ELF_T_SYM, 1, EV_CURRENT)) -+ size_t sh_entsize = gelf_fsize (ebl->elf, ELF_T_SYM, 1, EV_CURRENT); -+ if (shdr->sh_entsize != sh_entsize) - ERROR (gettext ("\ - section [%2u] '%s': entry size is does not match ElfXX_Sym\n"), - idx, section_name (ebl, idx)); -@@ -663,7 +672,7 @@ section [%2d] '%s': XINDEX for zeroth en - xndxscnidx, section_name (ebl, xndxscnidx)); - } - -- for (size_t cnt = 1; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt) -+ for (size_t cnt = 1; cnt < shdr->sh_size / sh_entsize; ++cnt) - { - sym = gelf_getsymshndx (data, xndxdata, cnt, &sym_mem, &xndx); - if (sym == NULL) -@@ -683,7 +692,8 @@ section [%2d] '%s': symbol %zu: invalid - else - { - name = elf_strptr (ebl->elf, shdr->sh_link, sym->st_name); -- assert (name != NULL); -+ assert (name != NULL -+ || strshdr->sh_type != SHT_STRTAB); - } - - if (sym->st_shndx == SHN_XINDEX) -@@ -1040,9 +1050,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e - { - GElf_Shdr rcshdr_mem; - const GElf_Shdr *rcshdr = gelf_getshdr (scn, &rcshdr_mem); -- assert (rcshdr != NULL); - -- if (rcshdr->sh_type == SHT_DYNAMIC) -+ if (rcshdr == NULL) -+ break; -+ -+ if (rcshdr->sh_type == SHT_DYNAMIC && rcshdr->sh_entsize) - { - /* Found the dynamic section. Look through it. */ - Elf_Data *d = elf_getdata (scn, NULL); -@@ -1052,7 +1064,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e - { - GElf_Dyn dyn_mem; - GElf_Dyn *dyn = gelf_getdyn (d, cnt, &dyn_mem); -- assert (dyn != NULL); -+ -+ if (dyn == NULL) -+ break; - - if (dyn->d_tag == DT_RELCOUNT) - { -@@ -1066,7 +1080,9 @@ section [%2d] '%s': DT_RELCOUNT used for - /* Does the number specified number of relative - relocations exceed the total number of - relocations? */ -- if (dyn->d_un.d_val > shdr->sh_size / shdr->sh_entsize) -+ if (shdr->sh_entsize != 0 -+ && dyn->d_un.d_val > (shdr->sh_size -+ / shdr->sh_entsize)) - ERROR (gettext ("\ - section [%2d] '%s': DT_RELCOUNT value %d too high for this section\n"), - idx, section_name (ebl, idx), -@@ -1226,7 +1242,8 @@ section [%2d] '%s': no relocations for m - } - } - -- if (shdr->sh_entsize != gelf_fsize (ebl->elf, reltype, 1, EV_CURRENT)) -+ size_t sh_entsize = gelf_fsize (ebl->elf, reltype, 1, EV_CURRENT); -+ if (shdr->sh_entsize != sh_entsize) - ERROR (gettext (reltype == ELF_T_RELA ? "\ - section [%2d] '%s': section entry size does not match ElfXX_Rela\n" : "\ - section [%2d] '%s': section entry size does not match ElfXX_Rel\n"), -@@ -1449,7 +1466,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G - Elf_Data *symdata = elf_getdata (symscn, NULL); - enum load_state state = state_undecided; - -- for (size_t cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt) -+ size_t sh_entsize = gelf_fsize (ebl->elf, ELF_T_RELA, 1, EV_CURRENT); -+ for (size_t cnt = 0; cnt < shdr->sh_size / sh_entsize; ++cnt) - { - GElf_Rela rela_mem; - GElf_Rela *rela = gelf_getrela (data, cnt, &rela_mem); -@@ -1499,7 +1517,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE - Elf_Data *symdata = elf_getdata (symscn, NULL); - enum load_state state = state_undecided; - -- for (size_t cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt) -+ size_t sh_entsize = gelf_fsize (ebl->elf, ELF_T_REL, 1, EV_CURRENT); -+ for (size_t cnt = 0; cnt < shdr->sh_size / sh_entsize; ++cnt) - { - GElf_Rel rel_mem; - GElf_Rel *rel = gelf_getrel (data, cnt, &rel_mem); -@@ -1598,7 +1617,8 @@ section [%2d] '%s': referenced as string - shdr->sh_link, section_name (ebl, shdr->sh_link), - idx, section_name (ebl, idx)); - -- if (shdr->sh_entsize != gelf_fsize (ebl->elf, ELF_T_DYN, 1, EV_CURRENT)) -+ size_t sh_entsize = gelf_fsize (ebl->elf, ELF_T_DYN, 1, EV_CURRENT); -+ if (shdr->sh_entsize != sh_entsize) - ERROR (gettext ("\ - section [%2d] '%s': section entry size does not match ElfXX_Dyn\n"), - idx, section_name (ebl, idx)); -@@ -1608,7 +1628,7 @@ section [%2d] '%s': section entry size d - idx, section_name (ebl, idx)); - - bool non_null_warned = false; -- for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt) -+ for (cnt = 0; cnt < shdr->sh_size / sh_entsize; ++cnt) - { - GElf_Dyn dyn_mem; - GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dyn_mem); -@@ -1880,6 +1900,8 @@ section [%2d] '%s': entry size does not - idx, section_name (ebl, idx)); - - if (symshdr != NULL -+ && shdr->sh_entsize -+ && symshdr->sh_entsize - && (shdr->sh_size / shdr->sh_entsize - < symshdr->sh_size / symshdr->sh_entsize)) - ERROR (gettext ("\ -@@ -1906,6 +1928,12 @@ section [%2d] '%s': extended section ind - } - - Elf_Data *data = elf_getdata (elf_getscn (ebl->elf, idx), NULL); -+ if (data == NULL) -+ { -+ ERROR (gettext ("section [%2d] '%s': cannot get section data\n"), -+ idx, section_name (ebl, idx)); -+ return; -+ } - - if (*((Elf32_Word *) data->d_buf) != 0) - ERROR (gettext ("symbol 0 should have zero extended section index\n")); -@@ -1948,7 +1976,7 @@ section [%2d] '%s': hash table section i - - size_t maxidx = nchain; - -- if (symshdr != NULL) -+ if (symshdr != NULL && symshdr->sh_entsize != 0) - { - size_t symsize = symshdr->sh_size / symshdr->sh_entsize; - -@@ -1959,18 +1987,28 @@ section [%2d] '%s': hash table section i - maxidx = symsize; - } - -+ Elf32_Word *buf = (Elf32_Word *) data->d_buf; -+ Elf32_Word *end = (Elf32_Word *) ((char *) data->d_buf + shdr->sh_size); - size_t cnt; - for (cnt = 2; cnt < 2 + nbucket; ++cnt) -- if (((Elf32_Word *) data->d_buf)[cnt] >= maxidx) -+ { -+ if (buf + cnt >= end) -+ break; -+ else if (buf[cnt] >= maxidx) - ERROR (gettext ("\ - section [%2d] '%s': hash bucket reference %zu out of bounds\n"), - idx, section_name (ebl, idx), cnt - 2); -+ } - - for (; cnt < 2 + nbucket + nchain; ++cnt) -- if (((Elf32_Word *) data->d_buf)[cnt] >= maxidx) -+ { -+ if (buf + cnt >= end) -+ break; -+ else if (buf[cnt] >= maxidx) - ERROR (gettext ("\ - section [%2d] '%s': hash chain reference %zu out of bounds\n"), - idx, section_name (ebl, idx), cnt - 2 - nbucket); -+ } - } - - -@@ -2000,18 +2038,28 @@ section [%2d] '%s': hash table section i - maxidx = symsize; - } - -+ Elf64_Xword *buf = (Elf64_Xword *) data->d_buf; -+ Elf64_Xword *end = (Elf64_Xword *) ((char *) data->d_buf + shdr->sh_size); - size_t cnt; - for (cnt = 2; cnt < 2 + nbucket; ++cnt) -- if (((Elf64_Xword *) data->d_buf)[cnt] >= maxidx) -+ { -+ if (buf + cnt >= end) -+ break; -+ else if (buf[cnt] >= maxidx) - ERROR (gettext ("\ - section [%2d] '%s': hash bucket reference %zu out of bounds\n"), - idx, section_name (ebl, idx), cnt - 2); -+ } - - for (; cnt < 2 + nbucket + nchain; ++cnt) -- if (((Elf64_Xword *) data->d_buf)[cnt] >= maxidx) -+ { -+ if (buf + cnt >= end) -+ break; -+ else if (buf[cnt] >= maxidx) - ERROR (gettext ("\ - section [%2d] '%s': hash chain reference %" PRIu64 " out of bounds\n"), -- idx, section_name (ebl, idx), (uint64_t) (cnt - 2 - nbucket)); -+ idx, section_name (ebl, idx), (uint64_t) cnt - 2 - nbucket); -+ } - } - - -@@ -2036,7 +2084,7 @@ section [%2d] '%s': bitmask size not pow - if (shdr->sh_size < (4 + bitmask_words + nbuckets) * sizeof (Elf32_Word)) - { - ERROR (gettext ("\ --section [%2d] '%s': hash table section is too small (is %ld, expected at least%ld)\n"), -+section [%2d] '%s': hash table section is too small (is %ld, expected at least %ld)\n"), - idx, section_name (ebl, idx), (long int) shdr->sh_size, - (long int) ((4 + bitmask_words + nbuckets) * sizeof (Elf32_Word))); - return; -@@ -2708,8 +2756,9 @@ section [%2d] '%s' refers in sh_link to - - /* The number of elements in the version symbol table must be the - same as the number of symbols. */ -- if (shdr->sh_size / shdr->sh_entsize -- != symshdr->sh_size / symshdr->sh_entsize) -+ if (shdr->sh_entsize && symshdr->sh_entsize -+ && (shdr->sh_size / shdr->sh_entsize -+ != symshdr->sh_size / symshdr->sh_entsize)) - ERROR (gettext ("\ - section [%2d] '%s' has different number of entries than symbol table [%2d] '%s'\n"), - idx, section_name (ebl, idx), ---- elfutils/src/readelf.c -+++ elfutils/src/readelf.c -@@ -1364,6 +1364,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G - Elf32_Word *grpref = (Elf32_Word *) data->d_buf; - - GElf_Sym sym_mem; -+ GElf_Sym *sym = gelf_getsym (symdata, shdr->sh_info, &sym_mem); -+ - printf ((grpref[0] & GRP_COMDAT) - ? ngettext ("\ - \nCOMDAT section group [%2zu] '%s' with signature '%s' contains %zu entry:\n", -@@ -1376,8 +1378,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G - data->d_size / sizeof (Elf32_Word) - 1), - elf_ndxscn (scn), - elf_strptr (ebl->elf, shstrndx, shdr->sh_name), -- elf_strptr (ebl->elf, symshdr->sh_link, -- gelf_getsym (symdata, shdr->sh_info, &sym_mem)->st_name) -+ (sym == NULL ? NULL -+ : elf_strptr (ebl->elf, symshdr->sh_link, sym->st_name)) - ?: gettext ("<INVALID SYMBOL>"), - data->d_size / sizeof (Elf32_Word) - 1); - -@@ -1528,10 +1530,12 @@ static void - handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr) - { - int class = gelf_getclass (ebl->elf); -- GElf_Shdr glink; -+ GElf_Shdr glink_mem; -+ GElf_Shdr *glink; - Elf_Data *data; - size_t cnt; - size_t shstrndx; -+ size_t sh_entsize; - - /* Get the data of the section. */ - data = elf_getdata (scn, NULL); -@@ -1543,21 +1547,26 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, - error (EXIT_FAILURE, 0, - gettext ("cannot get section header string table index")); - -+ sh_entsize = gelf_fsize (ebl->elf, ELF_T_DYN, 1, EV_CURRENT); -+ -+ glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link), &glink_mem); -+ if (glink == NULL) -+ error (EXIT_FAILURE, 0, gettext ("invalid sh_link value in section %Zu"), -+ elf_ndxscn (scn)); -+ - printf (ngettext ("\ - \nDynamic segment contains %lu entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", - "\ - \nDynamic segment contains %lu entries:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", -- shdr->sh_size / shdr->sh_entsize), -- (unsigned long int) (shdr->sh_size / shdr->sh_entsize), -+ shdr->sh_size / sh_entsize), -+ (unsigned long int) (shdr->sh_size / sh_entsize), - class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, - shdr->sh_offset, - (int) shdr->sh_link, -- elf_strptr (ebl->elf, shstrndx, -- gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link), -- &glink)->sh_name)); -+ elf_strptr (ebl->elf, shstrndx, glink->sh_name)); - fputs_unlocked (gettext (" Type Value\n"), stdout); - -- for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt) -+ for (cnt = 0; cnt < shdr->sh_size / sh_entsize; ++cnt) - { - GElf_Dyn dynmem; - GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dynmem); -@@ -1706,7 +1715,8 @@ static void - handle_relocs_rel (Ebl *ebl, GElf_Ehdr *ehdr, Elf_Scn *scn, GElf_Shdr *shdr) - { - int class = gelf_getclass (ebl->elf); -- int nentries = shdr->sh_size / shdr->sh_entsize; -+ size_t sh_entsize = gelf_fsize (ebl->elf, ELF_T_REL, 1, EV_CURRENT); -+ int nentries = shdr->sh_size / sh_entsize; - - /* Get the data of the section. */ - Elf_Data *data = elf_getdata (scn, NULL); -@@ -1892,7 +1902,8 @@ static void - handle_relocs_rela (Ebl *ebl, GElf_Ehdr *ehdr, Elf_Scn *scn, GElf_Shdr *shdr) - { - int class = gelf_getclass (ebl->elf); -- int nentries = shdr->sh_size / shdr->sh_entsize; -+ size_t sh_entsize = gelf_fsize (ebl->elf, ELF_T_RELA, 1, EV_CURRENT); -+ int nentries = shdr->sh_size / sh_entsize; - - /* Get the data of the section. */ - Elf_Data *data = elf_getdata (scn, NULL); -@@ -2139,6 +2150,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G - error (EXIT_FAILURE, 0, - gettext ("cannot get section header string table index")); - -+ GElf_Shdr glink_mem; -+ GElf_Shdr *glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link), -+ &glink_mem); -+ if (glink == NULL) -+ error (EXIT_FAILURE, 0, gettext ("invalid sh_link value in section %Zu"), -+ elf_ndxscn (scn)); -+ - /* Now we can compute the number of entries in the section. */ - unsigned int nsyms = data->d_size / (class == ELFCLASS32 - ? sizeof (Elf32_Sym) -@@ -2149,15 +2167,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G - nsyms), - (unsigned int) elf_ndxscn (scn), - elf_strptr (ebl->elf, shstrndx, shdr->sh_name), nsyms); -- GElf_Shdr glink; - printf (ngettext (" %lu local symbol String table: [%2u] '%s'\n", - " %lu local symbols String table: [%2u] '%s'\n", - shdr->sh_info), - (unsigned long int) shdr->sh_info, - (unsigned int) shdr->sh_link, -- elf_strptr (ebl->elf, shstrndx, -- gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link), -- &glink)->sh_name)); -+ elf_strptr (ebl->elf, shstrndx, glink->sh_name)); - - fputs_unlocked (class == ELFCLASS32 - ? gettext ("\ -@@ -2393,7 +2408,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, - error (EXIT_FAILURE, 0, - gettext ("cannot get section header string table index")); - -- GElf_Shdr glink; -+ GElf_Shdr glink_mem; -+ GElf_Shdr *glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link), -+ &glink_mem); -+ if (glink == NULL) -+ error (EXIT_FAILURE, 0, gettext ("invalid sh_link value in section %Zu"), -+ elf_ndxscn (scn)); -+ - printf (ngettext ("\ - \nVersion needs section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", - "\ -@@ -2404,9 +2425,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, - class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, - shdr->sh_offset, - (unsigned int) shdr->sh_link, -- elf_strptr (ebl->elf, shstrndx, -- gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link), -- &glink)->sh_name)); -+ elf_strptr (ebl->elf, shstrndx, glink->sh_name)); - - unsigned int offset = 0; - for (int cnt = shdr->sh_info; --cnt >= 0; ) -@@ -2459,8 +2478,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G - error (EXIT_FAILURE, 0, - gettext ("cannot get section header string table index")); - -+ GElf_Shdr glink_mem; -+ GElf_Shdr *glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link), -+ &glink_mem); -+ if (glink == NULL) -+ error (EXIT_FAILURE, 0, gettext ("invalid sh_link value in section %Zu"), -+ elf_ndxscn (scn)); -+ - int class = gelf_getclass (ebl->elf); -- GElf_Shdr glink; - printf (ngettext ("\ - \nVersion definition section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", - "\ -@@ -2472,9 +2497,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G - class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, - shdr->sh_offset, - (unsigned int) shdr->sh_link, -- elf_strptr (ebl->elf, shstrndx, -- gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link), -- &glink)->sh_name)); -+ elf_strptr (ebl->elf, shstrndx, glink->sh_name)); - - unsigned int offset = 0; - for (int cnt = shdr->sh_info; --cnt >= 0; ) -@@ -2736,25 +2759,30 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G - filename = NULL; - } - -+ GElf_Shdr glink_mem; -+ GElf_Shdr *glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link), -+ &glink_mem); -+ size_t sh_entsize = gelf_fsize (ebl->elf, ELF_T_HALF, 1, EV_CURRENT); -+ if (glink == NULL) -+ error (EXIT_FAILURE, 0, gettext ("invalid sh_link value in section %Zu"), -+ elf_ndxscn (scn)); -+ - /* Print the header. */ -- GElf_Shdr glink; - printf (ngettext ("\ - \nVersion symbols section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'", - "\ - \nVersion symbols section [%2u] '%s' contains %d entries:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'", -- shdr->sh_size / shdr->sh_entsize), -+ shdr->sh_size / sh_entsize), - (unsigned int) elf_ndxscn (scn), - elf_strptr (ebl->elf, shstrndx, shdr->sh_name), -- (int) (shdr->sh_size / shdr->sh_entsize), -+ (int) (shdr->sh_size / sh_entsize), - class == ELFCLASS32 ? 10 : 18, shdr->sh_addr, - shdr->sh_offset, - (unsigned int) shdr->sh_link, -- elf_strptr (ebl->elf, shstrndx, -- gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link), -- &glink)->sh_name)); -+ elf_strptr (ebl->elf, shstrndx, glink->sh_name)); - - /* Now we can finally look at the actual contents of this section. */ -- for (unsigned int cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt) -+ for (unsigned int cnt = 0; cnt < shdr->sh_size / sh_entsize; ++cnt) - { - if (cnt % 2 == 0) - printf ("\n %4d:", cnt); -@@ -2803,7 +2831,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, - for (Elf32_Word cnt = 0; cnt < nbucket; ++cnt) - ++counts[lengths[cnt]]; - -- GElf_Shdr glink; -+ GElf_Shdr glink_mem; -+ GElf_Shdr *glink = gelf_getshdr (elf_getscn (ebl->elf, -+ shdr->sh_link), -+ &glink_mem); -+ if (glink == NULL) -+ { -+ error (0, 0, gettext ("invalid sh_link value in section %Zu"), -+ elf_ndxscn (scn)); -+ return; -+ } -+ - printf (ngettext ("\ - \nHistogram for bucket list length in section [%2u] '%s' (total of %d bucket):\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n", - "\ -@@ -2816,9 +2854,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn, - shdr->sh_addr, - shdr->sh_offset, - (unsigned int) shdr->sh_link, -- elf_strptr (ebl->elf, shstrndx, -- gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link), -- &glink)->sh_name)); -+ elf_strptr (ebl->elf, shstrndx, glink->sh_name)); - - if (extrastr != NULL) - fputs (extrastr, stdout); -@@ -3078,7 +3114,8 @@ print_liblist (Ebl *ebl) - - if (shdr != NULL && shdr->sh_type == SHT_GNU_LIBLIST) - { -- int nentries = shdr->sh_size / shdr->sh_entsize; -+ size_t sh_entsize = gelf_fsize (ebl->elf, ELF_T_LIB, 1, EV_CURRENT); -+ int nentries = shdr->sh_size / sh_entsize; - printf (ngettext ("\ - \nLibrary list section [%2zu] '%s' at offset %#0" PRIx64 " contains %d entry:\n", - "\ -@@ -4398,6 +4435,16 @@ print_decoded_aranges_section (Ebl *ebl, - return; - } - -+ GElf_Shdr glink_mem; -+ GElf_Shdr *glink; -+ glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link), &glink_mem); -+ if (glink == NULL) -+ { -+ error (0, 0, gettext ("invalid sh_link value in section %Zu"), -+ elf_ndxscn (scn)); -+ return; -+ } -+ - printf (ngettext ("\ - \nDWARF section [%2zu] '%s' at offset %#" PRIx64 " contains %zu entry:\n", - "\ ---- elfutils/src/strip.c -+++ elfutils/src/strip.c -@@ -565,6 +565,11 @@ handle_elf (int fd, Elf *elf, const char - goto fail_close; - } - -+ if (shstrndx >= shnum) -+ goto illformed; -+ -+#define elf_assert(test) do { if (!(test)) goto illformed; } while (0) -+ - /* Storage for section information. We leave room for two more - entries since we unconditionally create a section header string - table. Maybe some weird tool created an ELF file without one. -@@ -586,7 +591,7 @@ handle_elf (int fd, Elf *elf, const char - { - /* This should always be true (i.e., there should not be any - holes in the numbering). */ -- assert (elf_ndxscn (scn) == cnt); -+ elf_assert (elf_ndxscn (scn) == cnt); - - shdr_info[cnt].scn = scn; - -@@ -599,6 +604,7 @@ handle_elf (int fd, Elf *elf, const char - shdr_info[cnt].shdr.sh_name); - if (shdr_info[cnt].name == NULL) - { -+ illformed: - error (0, 0, gettext ("illformed file '%s'"), fname); - goto fail_close; - } -@@ -608,6 +614,8 @@ handle_elf (int fd, Elf *elf, const char - - /* Remember the shdr.sh_link value. */ - shdr_info[cnt].old_sh_link = shdr_info[cnt].shdr.sh_link; -+ if (shdr_info[cnt].old_sh_link >= shnum) -+ goto illformed; - - /* Sections in files other than relocatable object files which - are not loaded can be freely moved by us. In relocatable -@@ -620,7 +628,7 @@ handle_elf (int fd, Elf *elf, const char - appropriate reference. */ - if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_SYMTAB_SHNDX)) - { -- assert (shdr_info[shdr_info[cnt].shdr.sh_link].symtab_idx == 0); -+ elf_assert (shdr_info[shdr_info[cnt].shdr.sh_link].symtab_idx == 0); - shdr_info[shdr_info[cnt].shdr.sh_link].symtab_idx = cnt; - } - else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GROUP)) -@@ -637,7 +645,12 @@ handle_elf (int fd, Elf *elf, const char - for (inner = 1; - inner < shdr_info[cnt].data->d_size / sizeof (Elf32_Word); - ++inner) -+ { -+ if (grpref[inner] < shnum) - shdr_info[grpref[inner]].group_idx = cnt; -+ else -+ goto illformed; -+ } - - if (inner == 1 || (inner == 2 && (grpref[0] & GRP_COMDAT) == 0)) - /* If the section group contains only one element and this -@@ -648,7 +661,7 @@ handle_elf (int fd, Elf *elf, const char - } - else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GNU_versym)) - { -- assert (shdr_info[shdr_info[cnt].shdr.sh_link].version_idx == 0); -+ elf_assert (shdr_info[shdr_info[cnt].shdr.sh_link].version_idx == 0); - shdr_info[shdr_info[cnt].shdr.sh_link].version_idx = cnt; - } - -@@ -656,7 +669,7 @@ handle_elf (int fd, Elf *elf, const char - discarded right away. */ - if ((shdr_info[cnt].shdr.sh_flags & SHF_GROUP) != 0) - { -- assert (shdr_info[cnt].group_idx != 0); -+ elf_assert (shdr_info[cnt].group_idx != 0); - - if (shdr_info[shdr_info[cnt].group_idx].idx == 0) - { -@@ -732,10 +745,14 @@ handle_elf (int fd, Elf *elf, const char - { - /* If a relocation section is marked as being removed make - sure the section it is relocating is removed, too. */ -- if ((shdr_info[cnt].shdr.sh_type == SHT_REL -+ if (shdr_info[cnt].shdr.sh_type == SHT_REL - || shdr_info[cnt].shdr.sh_type == SHT_RELA) -- && shdr_info[shdr_info[cnt].shdr.sh_info].idx != 0) -- shdr_info[cnt].idx = 1; -+ { -+ if (shdr_info[cnt].shdr.sh_info >= shnum) -+ goto illformed; -+ else if (shdr_info[shdr_info[cnt].shdr.sh_info].idx != 0) -+ shdr_info[cnt].idx = 1; -+ } - - /* If a group section is marked as being removed make - sure all the sections it contains are being removed, too. */ -@@ -779,7 +796,7 @@ handle_elf (int fd, Elf *elf, const char - if (shdr_info[cnt].symtab_idx != 0 - && shdr_info[shdr_info[cnt].symtab_idx].data == NULL) - { -- assert (shdr_info[cnt].shdr.sh_type == SHT_SYMTAB); -+ elf_assert (shdr_info[cnt].shdr.sh_type == SHT_SYMTAB); - - shdr_info[shdr_info[cnt].symtab_idx].data - = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn, -@@ -819,6 +836,9 @@ handle_elf (int fd, Elf *elf, const char - else if (scnidx == SHN_XINDEX) - scnidx = xndx; - -+ if (scnidx >= shnum) -+ goto illformed; -+ - if (shdr_info[scnidx].idx == 0) - /* This symbol table has a real symbol in - a discarded section. So preserve the -@@ -849,12 +869,16 @@ handle_elf (int fd, Elf *elf, const char - } - - /* Handle references through sh_info. */ -- if (SH_INFO_LINK_P (&shdr_info[cnt].shdr) -- && shdr_info[shdr_info[cnt].shdr.sh_info].idx == 0) -+ if (SH_INFO_LINK_P (&shdr_info[cnt].shdr)) -+ { -+ if (shdr_info[cnt].shdr.sh_info >= shnum) -+ goto illformed; -+ else if ( shdr_info[shdr_info[cnt].shdr.sh_info].idx == 0) - { - shdr_info[shdr_info[cnt].shdr.sh_info].idx = 1; - changes |= shdr_info[cnt].shdr.sh_info < cnt; - } -+ } - - /* Mark the section as investigated. */ - shdr_info[cnt].idx = 2; -@@ -995,7 +1019,7 @@ handle_elf (int fd, Elf *elf, const char - error (EXIT_FAILURE, 0, gettext ("while generating output file: %s"), - elf_errmsg (-1)); - -- assert (elf_ndxscn (shdr_info[cnt].newscn) == shdr_info[cnt].idx); -+ elf_assert (elf_ndxscn (shdr_info[cnt].newscn) == shdr_info[cnt].idx); - - /* Add this name to the section header string table. */ - shdr_info[cnt].se = ebl_strtabadd (shst, shdr_info[cnt].name, 0); -@@ -1032,7 +1056,7 @@ handle_elf (int fd, Elf *elf, const char - error (EXIT_FAILURE, 0, - gettext ("while create section header section: %s"), - elf_errmsg (-1)); -- assert (elf_ndxscn (shdr_info[cnt].newscn) == shdr_info[cnt].idx); -+ elf_assert (elf_ndxscn (shdr_info[cnt].newscn) == shdr_info[cnt].idx); - - shdr_info[cnt].data = elf_newdata (shdr_info[cnt].newscn); - if (shdr_info[cnt].data == NULL) -@@ -1089,7 +1113,7 @@ handle_elf (int fd, Elf *elf, const char - error (EXIT_FAILURE, 0, - gettext ("while create section header section: %s"), - elf_errmsg (-1)); -- assert (elf_ndxscn (shdr_info[cnt].newscn) == idx); -+ elf_assert (elf_ndxscn (shdr_info[cnt].newscn) == idx); - - /* Finalize the string table and fill in the correct indices in the - section headers. */ -@@ -1179,20 +1203,20 @@ handle_elf (int fd, Elf *elf, const char - shndxdata = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn, - NULL); - -- assert ((versiondata->d_size / sizeof (Elf32_Word)) -+ elf_assert ((versiondata->d_size / sizeof (Elf32_Word)) - >= shdr_info[cnt].data->d_size / elsize); - } - - if (shdr_info[cnt].version_idx != 0) - { -- assert (shdr_info[cnt].shdr.sh_type == SHT_DYNSYM); -+ elf_assert (shdr_info[cnt].shdr.sh_type == SHT_DYNSYM); - /* This section has associated version - information. We have to modify that - information, too. */ - versiondata = elf_getdata (shdr_info[shdr_info[cnt].version_idx].scn, - NULL); - -- assert ((versiondata->d_size / sizeof (GElf_Versym)) -+ elf_assert ((versiondata->d_size / sizeof (GElf_Versym)) - >= shdr_info[cnt].data->d_size / elsize); - } - -@@ -1247,7 +1271,7 @@ handle_elf (int fd, Elf *elf, const char - sec = shdr_info[sym->st_shndx].idx; - else - { -- assert (shndxdata != NULL); -+ elf_assert (shndxdata != NULL); - - sec = shdr_info[xshndx].idx; - } -@@ -1268,7 +1292,7 @@ handle_elf (int fd, Elf *elf, const char - nxshndx = sec; - } - -- assert (sec < SHN_LORESERVE || shndxdata != NULL); -+ elf_assert (sec < SHN_LORESERVE || shndxdata != NULL); - - if ((inner != destidx || nshndx != sym->st_shndx - || (shndxdata != NULL && nxshndx != xshndx)) -@@ -1295,9 +1319,11 @@ handle_elf (int fd, Elf *elf, const char - { - size_t sidx = (sym->st_shndx != SHN_XINDEX - ? sym->st_shndx : xshndx); -- assert (GELF_ST_TYPE (sym->st_info) == STT_SECTION -- || (shdr_info[sidx].shdr.sh_type == SHT_GROUP -- && shdr_info[sidx].shdr.sh_info == inner)); -+ elf_assert (GELF_ST_TYPE (sym->st_info) == STT_SECTION -+ || ((shdr_info[sidx].shdr.sh_type -+ == SHT_GROUP) -+ && (shdr_info[sidx].shdr.sh_info -+ == inner))); - } - } - -@@ -1485,11 +1511,11 @@ handle_elf (int fd, Elf *elf, const char - { - GElf_Sym sym_mem; - GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem); -- assert (sym != NULL); -+ elf_assert (sym != NULL); - - const char *name = elf_strptr (elf, strshndx, - sym->st_name); -- assert (name != NULL); -+ elf_assert (name != NULL); - size_t hidx = elf_hash (name) % nbucket; - - if (bucket[hidx] == 0) -@@ -1508,8 +1534,8 @@ handle_elf (int fd, Elf *elf, const char - else - { - /* Alpha and S390 64-bit use 64-bit SHT_HASH entries. */ -- assert (shdr_info[cnt].shdr.sh_entsize -- == sizeof (Elf64_Xword)); -+ elf_assert (shdr_info[cnt].shdr.sh_entsize -+ == sizeof (Elf64_Xword)); - - Elf64_Xword *bucket = (Elf64_Xword *) hashd->d_buf; - -@@ -1539,11 +1565,11 @@ handle_elf (int fd, Elf *elf, const char - { - GElf_Sym sym_mem; - GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem); -- assert (sym != NULL); -+ elf_assert (sym != NULL); - - const char *name = elf_strptr (elf, strshndx, - sym->st_name); -- assert (name != NULL); -+ elf_assert (name != NULL); - size_t hidx = elf_hash (name) % nbucket; - - if (bucket[hidx] == 0) diff --git a/meta/recipes-devtools/elfutils/elfutils-0.158/unwind_non_linux.patch b/meta/recipes-devtools/elfutils/elfutils-0.158/unwind_non_linux.patch deleted file mode 100644 index 870ec23703..0000000000 --- a/meta/recipes-devtools/elfutils/elfutils-0.158/unwind_non_linux.patch +++ /dev/null @@ -1,256 +0,0 @@ -From 02cefdaa6429e620d6457fdb3ad9934f194c5a93 Mon Sep 17 00:00:00 2001 -From: Kurt Roeckx <kurt@roeckx.be> -Date: Tue, 22 Apr 2014 21:46:22 +0200 -Subject: [PATCH] Unwinding is only supported on Linux - -Index: elfutils-0.158/backends/i386_initreg.c -=================================================================== ---- elfutils-0.158.orig/backends/i386_initreg.c 2014-05-01 17:11:18.870616302 +0000 -+++ elfutils-0.158/backends/i386_initreg.c 2014-05-01 17:11:18.866616384 +0000 -@@ -44,7 +44,7 @@ - ebl_tid_registers_t *setfunc __attribute__ ((unused)), - void *arg __attribute__ ((unused))) - { --#if !defined __i386__ && !defined __x86_64__ -+#if (!defined __i386__ && !defined __x86_64__) || !defined(__linux__) - return false; - #else /* __i386__ || __x86_64__ */ - struct user_regs_struct user_regs; -Index: elfutils-0.158/backends/x86_64_initreg.c -=================================================================== ---- elfutils-0.158.orig/backends/x86_64_initreg.c 2014-05-01 17:11:18.870616302 +0000 -+++ elfutils-0.158/backends/x86_64_initreg.c 2014-05-01 17:11:18.866616384 +0000 -@@ -44,7 +44,7 @@ - ebl_tid_registers_t *setfunc __attribute__ ((unused)), - void *arg __attribute__ ((unused))) - { --#ifndef __x86_64__ -+#if !defined(__x86_64__) || !defined(__linux__) - return false; - #else /* __x86_64__ */ - struct user_regs_struct user_regs; -Index: elfutils-0.158/libdwfl/linux-pid-attach.c -=================================================================== ---- elfutils-0.158.orig/libdwfl/linux-pid-attach.c 2014-05-01 17:11:18.870616302 +0000 -+++ elfutils-0.158/libdwfl/linux-pid-attach.c 2014-05-01 17:12:47.980766442 +0000 -@@ -37,6 +37,8 @@ - # define MAX(a, b) ((a) > (b) ? (a) : (b)) - #endif - -+#ifdef __linux__ -+ - struct pid_arg - { - DIR *dir; -@@ -358,3 +360,87 @@ - return 0; - } - INTDEF (dwfl_linux_proc_attach) -+ -+#else /* __linux__ */ -+ -+static pid_t -+pid_next_thread (Dwfl *dwfl __attribute__ ((unused)), -+ void *dwfl_arg __attribute__ ((unused)), -+ void **thread_argp __attribute__ ((unused))) -+{ -+ errno = ENOSYS; -+ __libdwfl_seterrno (DWFL_E_ERRNO); -+ return -1; -+} -+ -+static bool -+pid_getthread (Dwfl *dwfl __attribute__ ((unused)), -+ pid_t tid __attribute__ ((unused)), -+ void *dwfl_arg __attribute__ ((unused)), -+ void **thread_argp __attribute__ ((unused))) -+{ -+ errno = ENOSYS; -+ __libdwfl_seterrno (DWFL_E_ERRNO); -+ return false; -+} -+ -+static bool -+pid_memory_read (Dwfl *dwfl __attribute__ ((unused)), -+ Dwarf_Addr addr __attribute__ ((unused)), -+ Dwarf_Word *result __attribute__ ((unused)), -+ void *arg __attribute__ ((unused))) -+{ -+ errno = ENOSYS; -+ __libdwfl_seterrno (DWFL_E_ERRNO); -+ return false; -+} -+ -+static bool -+pid_set_initial_registers (Dwfl_Thread *thread __attribute__ ((unused)), -+ void *thread_arg __attribute__ ((unused))) -+{ -+ errno = ENOSYS; -+ __libdwfl_seterrno (DWFL_E_ERRNO); -+ return false; -+} -+ -+static void -+pid_detach (Dwfl *dwfl __attribute__ ((unused)), -+ void *dwfl_arg __attribute__ ((unused))) -+{ -+} -+ -+static void -+pid_thread_detach (Dwfl_Thread *thread __attribute__ ((unused)), -+ void *thread_arg __attribute__ ((unused))) -+{ -+} -+ -+static const Dwfl_Thread_Callbacks pid_thread_callbacks = -+{ -+ pid_next_thread, -+ pid_getthread, -+ pid_memory_read, -+ pid_set_initial_registers, -+ pid_detach, -+ pid_thread_detach, -+}; -+ -+int -+dwfl_linux_proc_attach (Dwfl *dwfl __attribute__ ((unused)), -+ pid_t pid __attribute__ ((unused)), -+ bool assume_ptrace_stopped __attribute__ ((unused))) -+{ -+ return ENOSYS; -+} -+INTDEF (dwfl_linux_proc_attach) -+ -+struct __libdwfl_pid_arg * -+internal_function -+__libdwfl_get_pid_arg (Dwfl *dwfl __attribute__ ((unused))) -+{ -+ return NULL; -+} -+ -+#endif /* ! __linux __ */ -+ -Index: elfutils-0.158/tests/backtrace-child.c -=================================================================== ---- elfutils-0.158.orig/tests/backtrace-child.c 2014-05-01 17:11:18.870616302 +0000 -+++ elfutils-0.158/tests/backtrace-child.c 2014-05-01 17:11:18.866616384 +0000 -@@ -79,6 +79,18 @@ - #include <stdio.h> - #include <unistd.h> - -+#ifndef __linux__ -+ -+int -+main (int argc __attribute__ ((unused)), char **argv) -+{ -+ fprintf (stderr, "%s: Unwinding not supported for this architecture\n", -+ argv[0]); -+ return 77; -+} -+ -+#else /* __linux__ */ -+ - #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) - #define NOINLINE_NOCLONE __attribute__ ((noinline, noclone)) - #else -@@ -221,3 +233,6 @@ - /* Not reached. */ - abort (); - } -+ -+#endif /* ! __linux__ */ -+ -Index: elfutils-0.158/tests/backtrace-data.c -=================================================================== ---- elfutils-0.158.orig/tests/backtrace-data.c 2014-05-01 17:11:18.870616302 +0000 -+++ elfutils-0.158/tests/backtrace-data.c 2014-05-01 17:11:18.866616384 +0000 -@@ -40,7 +40,7 @@ - #include <string.h> - #include ELFUTILS_HEADER(dwfl) - --#ifndef __x86_64__ -+#if !defined(__x86_64__) || !defined(__linux__) - - int - main (int argc __attribute__ ((unused)), char **argv) -@@ -50,7 +50,7 @@ - return 77; - } - --#else /* __x86_64__ */ -+#else /* __x86_64__ && __linux__ */ - - /* The only arch specific code is set_initial_registers. */ - -Index: elfutils-0.158/tests/backtrace-dwarf.c -=================================================================== ---- elfutils-0.158.orig/tests/backtrace-dwarf.c 2014-05-01 17:11:18.870616302 +0000 -+++ elfutils-0.158/tests/backtrace-dwarf.c 2014-05-01 17:11:18.866616384 +0000 -@@ -25,6 +25,18 @@ - #include <sys/ptrace.h> - #include ELFUTILS_HEADER(dwfl) - -+#ifndef __linux__ -+ -+int -+main (int argc __attribute__ ((unused)), char **argv) -+{ -+ fprintf (stderr, "%s: Unwinding not supported for this architecture\n", -+ argv[0]); -+ return 77; -+} -+ -+#else /* __linux__ */ -+ - static void cleanup_13_abort (void); - #define main cleanup_13_main - #include "cleanup-13.c" -@@ -148,3 +160,6 @@ - /* There is an exit (0) call if we find the "main" frame, */ - error (1, 0, "dwfl_getthreads: %s", dwfl_errmsg (-1)); - } -+ -+#endif /* ! __linux__ */ -+ -Index: elfutils-0.158/tests/backtrace-subr.sh -=================================================================== ---- elfutils-0.158.orig/tests/backtrace-subr.sh 2014-05-01 17:11:18.870616302 +0000 -+++ elfutils-0.158/tests/backtrace-subr.sh 2014-05-01 17:11:18.866616384 +0000 -@@ -84,6 +84,7 @@ - echo ./backtrace ./backtrace.$arch.{exec,core} - testrun ${abs_builddir}/backtrace -e ./backtrace.$arch.exec --core=./backtrace.$arch.core 1>backtrace.$arch.bt 2>backtrace.$arch.err || true - cat backtrace.$arch.{bt,err} -+ check_unsupported backtrace.$arch.err backtrace.$arch.core - check_all backtrace.$arch.{bt,err} backtrace.$arch.core - } - -Index: elfutils-0.158/tests/backtrace.c -=================================================================== ---- elfutils-0.158.orig/tests/backtrace.c 2014-05-01 17:11:18.870616302 +0000 -+++ elfutils-0.158/tests/backtrace.c 2014-05-01 17:11:18.866616384 +0000 -@@ -39,6 +39,18 @@ - #include <sys/syscall.h> - #include ELFUTILS_HEADER(dwfl) - -+#ifndef __linux__ -+ -+int -+main (int argc __attribute__ ((unused)), char **argv) -+{ -+ fprintf (stderr, "%s: Unwinding not supported for this architecture\n", -+ argv[0]); -+ return 77; -+} -+ -+#else /* __linux__ */ -+ - static int - dump_modules (Dwfl_Module *mod, void **userdata __attribute__ ((unused)), - const char *name, Dwarf_Addr start, -@@ -452,3 +464,6 @@ - dwfl_end (dwfl); - return 0; - } -+ -+#endif /* ! __linux__ */ -+ diff --git a/meta/recipes-devtools/elfutils/elfutils-0.161/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch new file mode 100644 index 0000000000..3754c1c361 --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils-0.161/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch @@ -0,0 +1,35 @@ +From 668accf322fd7185e273bfd50b84320e71d9de5a Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Fri, 10 Apr 2015 00:29:18 +0200 +Subject: [PATCH] elf_getarsym: Silence -Werror=maybe-uninitialized false + positive + +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + libelf/elf_getarsym.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/libelf/elf_getarsym.c b/libelf/elf_getarsym.c +index d0bb28a..08954d2 100644 +--- a/libelf/elf_getarsym.c ++++ b/libelf/elf_getarsym.c +@@ -165,8 +165,13 @@ elf_getarsym (elf, ptr) + int w = index64_p ? 8 : 4; + + /* We have an archive. The first word in there is the number of +- entries in the table. */ +- uint64_t n; ++ entries in the table. ++ Set to SIZE_MAX just to silence -Werror=maybe-uninitialized ++ elf_getarsym.c:290:9: error: 'n' may be used uninitialized in this function ++ The read_number_entries function doesn't initialize n only when returning ++ -1 which in turn ensures to jump over usage of this uninitialized variable. ++ */ ++ uint64_t n = SIZE_MAX; + size_t off = elf->start_offset + SARMAG + sizeof (struct ar_hdr); + if (read_number_entries (&n, elf, &off, index64_p) < 0) + { +-- +2.3.5 + diff --git a/meta/recipes-devtools/elfutils/elfutils-0.158/arm_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.161/arm_backend.diff index fc3d6dc3f4..c97c4e470d 100644 --- a/meta/recipes-devtools/elfutils/elfutils-0.158/arm_backend.diff +++ b/meta/recipes-devtools/elfutils/elfutils-0.161/arm_backend.diff @@ -1,7 +1,25 @@ -Index: elfutils-0.158/backends/arm_init.c -=================================================================== ---- elfutils-0.158.orig/backends/arm_init.c 2014-04-21 11:13:24.378519252 +0000 -+++ elfutils-0.158/backends/arm_init.c 2014-04-21 11:13:24.374519343 +0000 +From 0db1687eee0b4d16ccbc40db5a06b574fca6614c Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 14 Nov 2014 15:25:42 +0800 +Subject: [PATCH] Rebase arm_backend.diff from 0.159 to 0.160 + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + backends/arm_init.c | 18 ++++- + backends/arm_regs.c | 132 ++++++++++++++++++++++++++++++++++++ + backends/arm_retval.c | 44 +++++++++++- + backends/libebl_arm.h | 9 +++ + libelf/elf.h | 11 +++ + tests/run-addrcfi.sh | 93 ++++++++++++++++++++++++- + tests/run-allregs.sh | 95 +++++++++++++++++++++++++- + tests/run-readelf-mixed-corenote.sh | 11 ++- + 8 files changed, 401 insertions(+), 12 deletions(-) + create mode 100644 backends/libebl_arm.h + +diff --git a/backends/arm_init.c b/backends/arm_init.c +index 3283c97..8b57d3f 100644 +--- a/backends/arm_init.c ++++ b/backends/arm_init.c @@ -35,21 +35,32 @@ #define RELOC_PREFIX R_ARM_ #include "libebl_CPU.h" @@ -36,7 +54,7 @@ Index: elfutils-0.158/backends/arm_init.c /* We handle it. */ eh->name = "ARM"; arm_init_reloc (eh); -@@ -61,7 +72,10 @@ +@@ -61,7 +72,10 @@ arm_init (elf, machine, eh, ehlen) HOOK (eh, core_note); HOOK (eh, auxv_info); HOOK (eh, check_object_attribute); @@ -46,12 +64,12 @@ Index: elfutils-0.158/backends/arm_init.c + else + eh->return_value_location = arm_return_value_location_hard; HOOK (eh, abi_cfi); + HOOK (eh, check_reloc_target_type); - return MODVERSION; -Index: elfutils-0.158/backends/arm_regs.c -=================================================================== ---- elfutils-0.158.orig/backends/arm_regs.c 2014-04-21 11:13:24.378519252 +0000 -+++ elfutils-0.158/backends/arm_regs.c 2014-04-21 11:13:24.374519343 +0000 +diff --git a/backends/arm_regs.c b/backends/arm_regs.c +index 21c5ad3..4ee1039 100644 +--- a/backends/arm_regs.c ++++ b/backends/arm_regs.c @@ -31,6 +31,7 @@ #endif @@ -60,7 +78,7 @@ Index: elfutils-0.158/backends/arm_regs.c #include <dwarf.h> #define BACKEND arm_ -@@ -76,6 +77,9 @@ +@@ -76,6 +77,9 @@ arm_register_info (Ebl *ebl __attribute__ ((unused)), break; case 16 + 0 ... 16 + 7: @@ -70,7 +88,7 @@ Index: elfutils-0.158/backends/arm_regs.c regno += 96 - 16; /* Fall through. */ case 96 + 0 ... 96 + 7: -@@ -87,11 +91,139 @@ +@@ -87,11 +91,139 @@ arm_register_info (Ebl *ebl __attribute__ ((unused)), namelen = 2; break; @@ -210,11 +228,11 @@ Index: elfutils-0.158/backends/arm_regs.c *setname = "VFP"; *type = DW_ATE_float; *bits = 64; -Index: elfutils-0.158/backends/arm_retval.c -=================================================================== ---- elfutils-0.158.orig/backends/arm_retval.c 2014-04-21 11:13:24.378519252 +0000 -+++ elfutils-0.158/backends/arm_retval.c 2014-04-21 11:13:24.374519343 +0000 -@@ -48,6 +48,13 @@ +diff --git a/backends/arm_retval.c b/backends/arm_retval.c +index 7aced74..052132e 100644 +--- a/backends/arm_retval.c ++++ b/backends/arm_retval.c +@@ -48,6 +48,13 @@ static const Dwarf_Op loc_intreg[] = #define nloc_intreg 1 #define nloc_intregs(n) (2 * (n)) @@ -228,7 +246,7 @@ Index: elfutils-0.158/backends/arm_retval.c /* The return value is a structure and is actually stored in stack space passed in a hidden argument by the caller. But, the compiler helpfully returns the address of that space in r0. */ -@@ -58,8 +65,9 @@ +@@ -58,8 +65,9 @@ static const Dwarf_Op loc_aggregate[] = #define nloc_aggregate 1 @@ -240,11 +258,11 @@ Index: elfutils-0.158/backends/arm_retval.c { /* Start with the function's type, and get the DW_AT_type attribute, which is the type of the return value. */ -@@ -112,14 +120,31 @@ - else - return -1; - } -+ if (tag == DW_TAG_base_type) +@@ -98,14 +106,31 @@ arm_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp) + else + return -1; + } ++ if (tag == DW_TAG_base_type) + { + Dwarf_Word encoding; + if (dwarf_formudata (dwarf_attr_integrate (typedie, DW_AT_encoding, @@ -259,20 +277,20 @@ Index: elfutils-0.158/backends/arm_retval.c + goto aggregate; + } + } - if (size <= 16) - { - intreg: - *locp = loc_intreg; - return size <= 4 ? nloc_intreg : nloc_intregs ((size + 3) / 4); - } -+ /* fall through. */ + if (size <= 16) + { + intreg: + *locp = loc_intreg; + return size <= 4 ? nloc_intreg : nloc_intregs ((size + 3) / 4); + } ++ /* fall through. */ - aggregate: -+ /* XXX TODO sometimes aggregates are returned in r0 (-mabi=aapcs) */ - *locp = loc_aggregate; - return nloc_aggregate; - -@@ -138,3 +163,18 @@ + aggregate: ++ /* XXX TODO sometimes aggregates are returned in r0 (-mabi=aapcs) */ + *locp = loc_aggregate; + return nloc_aggregate; + } +@@ -125,3 +150,18 @@ arm_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp) DWARF and might be valid. */ return -2; } @@ -291,11 +309,26 @@ Index: elfutils-0.158/backends/arm_retval.c + return arm_return_value_location_ (functypedie, locp, 0); +} + -Index: elfutils-0.158/libelf/elf.h -=================================================================== ---- elfutils-0.158.orig/libelf/elf.h 2014-04-21 11:13:24.378519252 +0000 -+++ elfutils-0.158/libelf/elf.h 2014-04-21 11:13:24.374519343 +0000 -@@ -2318,6 +2318,9 @@ +diff --git a/backends/libebl_arm.h b/backends/libebl_arm.h +new file mode 100644 +index 0000000..c00770c +--- /dev/null ++++ b/backends/libebl_arm.h +@@ -0,0 +1,9 @@ ++#ifndef _LIBEBL_ARM_H ++#define _LIBEBL_ARM_H 1 ++ ++#include <libdw.h> ++ ++extern int arm_return_value_location_soft(Dwarf_Die *, const Dwarf_Op **locp); ++extern int arm_return_value_location_hard(Dwarf_Die *, const Dwarf_Op **locp); ++ ++#endif +diff --git a/libelf/elf.h b/libelf/elf.h +index a3cce3e..0891674 100644 +--- a/libelf/elf.h ++++ b/libelf/elf.h +@@ -2346,6 +2346,9 @@ typedef Elf32_Addr Elf32_Conflict; #define EF_ARM_EABI_VER4 0x04000000 #define EF_ARM_EABI_VER5 0x05000000 @@ -305,7 +338,7 @@ Index: elfutils-0.158/libelf/elf.h /* Additional symbol types for Thumb. */ #define STT_ARM_TFUNC STT_LOPROC /* A Thumb function. */ #define STT_ARM_16BIT STT_HIPROC /* A Thumb label. */ -@@ -2335,12 +2338,19 @@ +@@ -2363,12 +2366,19 @@ typedef Elf32_Addr Elf32_Conflict; /* Processor specific values for the Phdr p_type field. */ #define PT_ARM_EXIDX (PT_LOPROC + 1) /* ARM unwind segment. */ @@ -325,7 +358,7 @@ Index: elfutils-0.158/libelf/elf.h /* AArch64 relocs. */ -@@ -2619,6 +2629,7 @@ +@@ -2647,6 +2657,7 @@ typedef Elf32_Addr Elf32_Conflict; TLS block (LDR, STR). */ #define R_ARM_TLS_IE12GP 111 /* 12 bit GOT entry relative to GOT origin (LDR). */ @@ -333,25 +366,122 @@ Index: elfutils-0.158/libelf/elf.h #define R_ARM_ME_TOO 128 /* Obsolete. */ #define R_ARM_THM_TLS_DESCSEQ 129 #define R_ARM_THM_TLS_DESCSEQ16 129 -Index: elfutils-0.158/backends/libebl_arm.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ elfutils-0.158/backends/libebl_arm.h 2014-04-21 11:13:24.374519343 +0000 -@@ -0,0 +1,9 @@ -+#ifndef _LIBEBL_ARM_H -+#define _LIBEBL_ARM_H 1 -+ -+#include <libdw.h> -+ -+extern int arm_return_value_location_soft(Dwarf_Die *, const Dwarf_Op **locp); -+extern int arm_return_value_location_hard(Dwarf_Die *, const Dwarf_Op **locp); -+ -+#endif -Index: elfutils-0.158/tests/run-allregs.sh -=================================================================== ---- elfutils-0.158.orig/tests/run-allregs.sh 2014-04-21 11:13:24.378519252 +0000 -+++ elfutils-0.158/tests/run-allregs.sh 2014-04-21 11:13:24.378519252 +0000 -@@ -2671,7 +2671,28 @@ +diff --git a/tests/run-addrcfi.sh b/tests/run-addrcfi.sh +index 5d33246..78464a8 100755 +--- a/tests/run-addrcfi.sh ++++ b/tests/run-addrcfi.sh +@@ -2530,6 +2530,38 @@ dwarf_cfi_addrframe (.eh_frame): no matching address range + FPA reg21 (f5): undefined + FPA reg22 (f6): undefined + FPA reg23 (f7): undefined ++ VFP reg64 (s0): undefined ++ VFP reg65 (s1): undefined ++ VFP reg66 (s2): undefined ++ VFP reg67 (s3): undefined ++ VFP reg68 (s4): undefined ++ VFP reg69 (s5): undefined ++ VFP reg70 (s6): undefined ++ VFP reg71 (s7): undefined ++ VFP reg72 (s8): undefined ++ VFP reg73 (s9): undefined ++ VFP reg74 (s10): undefined ++ VFP reg75 (s11): undefined ++ VFP reg76 (s12): undefined ++ VFP reg77 (s13): undefined ++ VFP reg78 (s14): undefined ++ VFP reg79 (s15): undefined ++ VFP reg80 (s16): undefined ++ VFP reg81 (s17): undefined ++ VFP reg82 (s18): undefined ++ VFP reg83 (s19): undefined ++ VFP reg84 (s20): undefined ++ VFP reg85 (s21): undefined ++ VFP reg86 (s22): undefined ++ VFP reg87 (s23): undefined ++ VFP reg88 (s24): undefined ++ VFP reg89 (s25): undefined ++ VFP reg90 (s26): undefined ++ VFP reg91 (s27): undefined ++ VFP reg92 (s28): undefined ++ VFP reg93 (s29): undefined ++ VFP reg94 (s30): undefined ++ VFP reg95 (s31): undefined + FPA reg96 (f0): undefined + FPA reg97 (f1): undefined + FPA reg98 (f2): undefined +@@ -2538,7 +2570,66 @@ dwarf_cfi_addrframe (.eh_frame): no matching address range + FPA reg101 (f5): undefined + FPA reg102 (f6): undefined + FPA reg103 (f7): undefined +- integer reg128 (spsr): undefined ++ MMX reg104 (wcgr0): undefined ++ MMX reg105 (wcgr1): undefined ++ MMX reg106 (wcgr2): undefined ++ MMX reg107 (wcgr3): undefined ++ MMX reg108 (wcgr4): undefined ++ MMX reg109 (wcgr5): undefined ++ MMX reg110 (wcgr6): undefined ++ MMX reg111 (wcgr7): undefined ++ MMX reg112 (wr0): undefined ++ MMX reg113 (wr1): undefined ++ MMX reg114 (wr2): undefined ++ MMX reg115 (wr3): undefined ++ MMX reg116 (wr4): undefined ++ MMX reg117 (wr5): undefined ++ MMX reg118 (wr6): undefined ++ MMX reg119 (wr7): undefined ++ MMX reg120 (wr8): undefined ++ MMX reg121 (wr9): undefined ++ MMX reg122 (wr10): undefined ++ MMX reg123 (wr11): undefined ++ MMX reg124 (wr12): undefined ++ MMX reg125 (wr13): undefined ++ MMX reg126 (wr14): undefined ++ MMX reg127 (wr15): undefined ++ state reg128 (spsr): undefined ++ state reg129 (spsr_fiq): undefined ++ state reg130 (spsr_irq): undefined ++ state reg131 (spsr_abt): undefined ++ state reg132 (spsr_und): undefined ++ state reg133 (spsr_svc): undefined ++ integer reg144 (r8_usr): undefined ++ integer reg145 (r9_usr): undefined ++ integer reg146 (r10_usr): undefined ++ integer reg147 (r11_usr): undefined ++ integer reg148 (r12_usr): undefined ++ integer reg149 (r13_usr): undefined ++ integer reg150 (r14_usr): undefined ++ integer reg151 (r8_fiq): undefined ++ integer reg152 (r9_fiq): undefined ++ integer reg153 (r10_fiq): undefined ++ integer reg154 (r11_fiq): undefined ++ integer reg155 (r12_fiq): undefined ++ integer reg156 (r13_fiq): undefined ++ integer reg157 (r14_fiq): undefined ++ integer reg158 (r13_irq): undefined ++ integer reg159 (r14_irq): undefined ++ integer reg160 (r13_abt): undefined ++ integer reg161 (r14_abt): undefined ++ integer reg162 (r13_und): undefined ++ integer reg163 (r14_und): undefined ++ integer reg164 (r13_svc): undefined ++ integer reg165 (r14_svc): undefined ++ MMX reg192 (wc0): undefined ++ MMX reg193 (wc1): undefined ++ MMX reg194 (wc2): undefined ++ MMX reg195 (wc3): undefined ++ MMX reg196 (wc4): undefined ++ MMX reg197 (wc5): undefined ++ MMX reg198 (wc6): undefined ++ MMX reg199 (wc7): undefined + VFP reg256 (d0): undefined + VFP reg257 (d1): undefined + VFP reg258 (d2): undefined +diff --git a/tests/run-allregs.sh b/tests/run-allregs.sh +index 6f3862e..13557d5 100755 +--- a/tests/run-allregs.sh ++++ b/tests/run-allregs.sh +@@ -2671,7 +2671,28 @@ integer registers: 13: sp (sp), address 32 bits 14: lr (lr), address 32 bits 15: pc (pc), address 32 bits @@ -381,7 +511,7 @@ Index: elfutils-0.158/tests/run-allregs.sh FPA registers: 16: f0 (f0), float 96 bits 17: f1 (f1), float 96 bits -@@ -2689,7 +2710,72 @@ +@@ -2689,7 +2710,72 @@ FPA registers: 101: f5 (f5), float 96 bits 102: f6 (f6), float 96 bits 103: f7 (f7), float 96 bits @@ -454,7 +584,7 @@ Index: elfutils-0.158/tests/run-allregs.sh 256: d0 (d0), float 64 bits 257: d1 (d1), float 64 bits 258: d2 (d2), float 64 bits -@@ -2722,6 +2808,13 @@ +@@ -2722,6 +2808,13 @@ VFP registers: 285: d29 (d29), float 64 bits 286: d30 (d30), float 64 bits 287: d31 (d31), float 64 bits @@ -468,11 +598,11 @@ Index: elfutils-0.158/tests/run-allregs.sh EOF # See run-readelf-mixed-corenote.sh for instructions to regenerate -Index: elfutils-0.158/tests/run-readelf-mixed-corenote.sh -=================================================================== ---- elfutils-0.158.orig/tests/run-readelf-mixed-corenote.sh 2014-04-21 11:13:24.378519252 +0000 -+++ elfutils-0.158/tests/run-readelf-mixed-corenote.sh 2014-04-21 11:13:24.378519252 +0000 -@@ -30,12 +30,11 @@ +diff --git a/tests/run-readelf-mixed-corenote.sh b/tests/run-readelf-mixed-corenote.sh +index 01e4594..9a8a380 100755 +--- a/tests/run-readelf-mixed-corenote.sh ++++ b/tests/run-readelf-mixed-corenote.sh +@@ -30,12 +30,11 @@ Note segment of 892 bytes at offset 0x274: pid: 11087, ppid: 11063, pgrp: 11087, sid: 11063 utime: 0.000000, stime: 0.010000, cutime: 0.000000, cstime: 0.000000 orig_r0: -1, fpvalid: 1 @@ -490,114 +620,6 @@ Index: elfutils-0.158/tests/run-readelf-mixed-corenote.sh CORE 124 PRPSINFO state: 0, sname: R, zomb: 0, nice: 0, flag: 0x00400500 uid: 0, gid: 0, pid: 11087, ppid: 11063, pgrp: 11087, sid: 11063 -Index: elfutils-0.158/tests/run-addrcfi.sh -=================================================================== ---- elfutils-0.158.orig/tests/run-addrcfi.sh 2014-04-21 11:13:24.378519252 +0000 -+++ elfutils-0.158/tests/run-addrcfi.sh 2014-04-21 11:13:24.378519252 +0000 -@@ -2530,6 +2530,38 @@ - FPA reg21 (f5): undefined - FPA reg22 (f6): undefined - FPA reg23 (f7): undefined -+ VFP reg64 (s0): undefined -+ VFP reg65 (s1): undefined -+ VFP reg66 (s2): undefined -+ VFP reg67 (s3): undefined -+ VFP reg68 (s4): undefined -+ VFP reg69 (s5): undefined -+ VFP reg70 (s6): undefined -+ VFP reg71 (s7): undefined -+ VFP reg72 (s8): undefined -+ VFP reg73 (s9): undefined -+ VFP reg74 (s10): undefined -+ VFP reg75 (s11): undefined -+ VFP reg76 (s12): undefined -+ VFP reg77 (s13): undefined -+ VFP reg78 (s14): undefined -+ VFP reg79 (s15): undefined -+ VFP reg80 (s16): undefined -+ VFP reg81 (s17): undefined -+ VFP reg82 (s18): undefined -+ VFP reg83 (s19): undefined -+ VFP reg84 (s20): undefined -+ VFP reg85 (s21): undefined -+ VFP reg86 (s22): undefined -+ VFP reg87 (s23): undefined -+ VFP reg88 (s24): undefined -+ VFP reg89 (s25): undefined -+ VFP reg90 (s26): undefined -+ VFP reg91 (s27): undefined -+ VFP reg92 (s28): undefined -+ VFP reg93 (s29): undefined -+ VFP reg94 (s30): undefined -+ VFP reg95 (s31): undefined - FPA reg96 (f0): undefined - FPA reg97 (f1): undefined - FPA reg98 (f2): undefined -@@ -2538,7 +2570,66 @@ - FPA reg101 (f5): undefined - FPA reg102 (f6): undefined - FPA reg103 (f7): undefined -- integer reg128 (spsr): undefined -+ MMX reg104 (wcgr0): undefined -+ MMX reg105 (wcgr1): undefined -+ MMX reg106 (wcgr2): undefined -+ MMX reg107 (wcgr3): undefined -+ MMX reg108 (wcgr4): undefined -+ MMX reg109 (wcgr5): undefined -+ MMX reg110 (wcgr6): undefined -+ MMX reg111 (wcgr7): undefined -+ MMX reg112 (wr0): undefined -+ MMX reg113 (wr1): undefined -+ MMX reg114 (wr2): undefined -+ MMX reg115 (wr3): undefined -+ MMX reg116 (wr4): undefined -+ MMX reg117 (wr5): undefined -+ MMX reg118 (wr6): undefined -+ MMX reg119 (wr7): undefined -+ MMX reg120 (wr8): undefined -+ MMX reg121 (wr9): undefined -+ MMX reg122 (wr10): undefined -+ MMX reg123 (wr11): undefined -+ MMX reg124 (wr12): undefined -+ MMX reg125 (wr13): undefined -+ MMX reg126 (wr14): undefined -+ MMX reg127 (wr15): undefined -+ state reg128 (spsr): undefined -+ state reg129 (spsr_fiq): undefined -+ state reg130 (spsr_irq): undefined -+ state reg131 (spsr_abt): undefined -+ state reg132 (spsr_und): undefined -+ state reg133 (spsr_svc): undefined -+ integer reg144 (r8_usr): undefined -+ integer reg145 (r9_usr): undefined -+ integer reg146 (r10_usr): undefined -+ integer reg147 (r11_usr): undefined -+ integer reg148 (r12_usr): undefined -+ integer reg149 (r13_usr): undefined -+ integer reg150 (r14_usr): undefined -+ integer reg151 (r8_fiq): undefined -+ integer reg152 (r9_fiq): undefined -+ integer reg153 (r10_fiq): undefined -+ integer reg154 (r11_fiq): undefined -+ integer reg155 (r12_fiq): undefined -+ integer reg156 (r13_fiq): undefined -+ integer reg157 (r14_fiq): undefined -+ integer reg158 (r13_irq): undefined -+ integer reg159 (r14_irq): undefined -+ integer reg160 (r13_abt): undefined -+ integer reg161 (r14_abt): undefined -+ integer reg162 (r13_und): undefined -+ integer reg163 (r14_und): undefined -+ integer reg164 (r13_svc): undefined -+ integer reg165 (r14_svc): undefined -+ MMX reg192 (wc0): undefined -+ MMX reg193 (wc1): undefined -+ MMX reg194 (wc2): undefined -+ MMX reg195 (wc3): undefined -+ MMX reg196 (wc4): undefined -+ MMX reg197 (wc5): undefined -+ MMX reg198 (wc6): undefined -+ MMX reg199 (wc7): undefined - VFP reg256 (d0): undefined - VFP reg257 (d1): undefined - VFP reg258 (d2): undefined +-- +1.9.1 + diff --git a/meta/recipes-devtools/elfutils/elfutils-0.161/arm_func_value.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/arm_func_value.patch new file mode 100644 index 0000000000..eeb2063807 --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils-0.161/arm_func_value.patch @@ -0,0 +1,166 @@ +From: Mark Wielaard <mjw@redhat.com> +Date: Sun, 15 Jun 2014 11:30:35 +0200 +Subject: libebl: Add sym_func_value hook. + +The ARM EABI says that the zero bit of function symbol st_value indicates +whether the symbol points to a THUMB or ARM function. Add a new ebl hook +to adjust the st_value in such a case so that we get the actual value that +the symbol points to. It isn't easily possible to reuse the existing +resolve_sym_value for this purpose, so we end up with another hook that +can be used from dwfl_module_getsym and elflint. + +Rebase arm_func_value.patch from 0.159 to 0.160 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + backends/arm_init.c | 1 + + backends/arm_symbol.c | 8 ++++++++ + libdwfl/dwfl_module_getsym.c | 2 +- + libebl/Makefile.am | 3 ++- + libebl/ebl-hooks.h | 3 +++ + libebl/eblsymfuncval.c | 43 +++++++++++++++++++++++++++++++++++++++++++ + libebl/libebl.h | 11 +++++++++++ + 7 files changed, 69 insertions(+), 2 deletions(-) + create mode 100644 libebl/eblsymfuncval.c + +diff --git a/backends/arm_init.c b/backends/arm_init.c +index 8b57d3f..2266829 100644 +--- a/backends/arm_init.c ++++ b/backends/arm_init.c +@@ -78,6 +78,7 @@ arm_init (elf, machine, eh, ehlen) + eh->return_value_location = arm_return_value_location_hard; + HOOK (eh, abi_cfi); + HOOK (eh, check_reloc_target_type); ++ HOOK (eh, sym_func_value); + + /* We only unwind the core integer registers. */ + eh->frame_nregs = 16; +diff --git a/backends/arm_symbol.c b/backends/arm_symbol.c +index cd467ff..49fca55 100644 +--- a/backends/arm_symbol.c ++++ b/backends/arm_symbol.c +@@ -129,3 +129,11 @@ arm_check_reloc_target_type (Ebl *ebl __attribute__ ((unused)), Elf64_Word sh_ty + { + return sh_type == SHT_ARM_EXIDX; + } ++ ++/* ARM EABI says that the low bit indicates whether the function ++ symbol value is a THUMB function or not. Mask it off. */ ++GElf_Addr ++arm_sym_func_value (Ebl *ebl __attribute__ ((unused)), GElf_Addr val) ++{ ++ return val & ~(GElf_Addr)1; ++} +diff --git a/libdwfl/dwfl_module_getsym.c b/libdwfl/dwfl_module_getsym.c +index 42d2b67..fb192d7 100644 +--- a/libdwfl/dwfl_module_getsym.c ++++ b/libdwfl/dwfl_module_getsym.c +@@ -119,7 +119,7 @@ __libdwfl_getsym (Dwfl_Module *mod, int ndx, GElf_Sym *sym, GElf_Addr *addr, + descriptors). */ + + char *ident; +- GElf_Addr st_value = sym->st_value & ebl_func_addr_mask (mod->ebl); ++ GElf_Addr st_value = ebl_sym_func_value (mod->ebl, sym->st_value); + *resolved = false; + if (! adjust_st_value && mod->e_type != ET_REL && alloc + && (GELF_ST_TYPE (sym->st_info) == STT_FUNC +diff --git a/libebl/Makefile.am b/libebl/Makefile.am +index ec4477b..889c21b 100644 +--- a/libebl/Makefile.am ++++ b/libebl/Makefile.am +@@ -55,7 +55,8 @@ gen_SOURCES = eblopenbackend.c eblclosebackend.c eblstrtab.c \ + eblsysvhashentrysize.c eblauxvinfo.c eblcheckobjattr.c \ + ebl_check_special_section.c ebl_syscall_abi.c eblabicfi.c \ + eblstother.c eblinitreg.c ebldwarftoregno.c eblnormalizepc.c \ +- eblunwind.c eblresolvesym.c eblcheckreloctargettype.c ++ eblunwind.c eblresolvesym.c eblcheckreloctargettype.c \ ++ eblsymfuncval.c + + libebl_a_SOURCES = $(gen_SOURCES) + +diff --git a/libebl/ebl-hooks.h b/libebl/ebl-hooks.h +index e1186f8..160a821 100644 +--- a/libebl/ebl-hooks.h ++++ b/libebl/ebl-hooks.h +@@ -191,5 +191,8 @@ bool EBLHOOK(unwind) (Ebl *ebl, Dwarf_Addr pc, ebl_tid_registers_t *setfunc, + (e.g. function descriptor resolving) */ + bool EBLHOOK(resolve_sym_value) (Ebl *ebl, GElf_Addr *addr); + ++/* Returns the real value of a symbol function address or offset. */ ++GElf_Addr EBLHOOK(sym_func_value) (Ebl *ebl, GElf_Addr val); ++ + /* Destructor for ELF backend handle. */ + void EBLHOOK(destr) (struct ebl *); +diff --git a/libebl/eblsymfuncval.c b/libebl/eblsymfuncval.c +new file mode 100644 +index 0000000..c0b322f +--- /dev/null ++++ b/libebl/eblsymfuncval.c +@@ -0,0 +1,43 @@ ++/* Turn a symbol function value into a real function address or offset. ++ Copyright (C) 2014 Red Hat, Inc. ++ This file is part of elfutils. ++ ++ This file is free software; you can redistribute it and/or modify ++ it under the terms of either ++ ++ * the GNU Lesser General Public License as published by the Free ++ Software Foundation; either version 3 of the License, or (at ++ your option) any later version ++ ++ or ++ ++ * the GNU General Public License as published by the Free ++ Software Foundation; either version 2 of the License, or (at ++ your option) any later version ++ ++ or both in parallel, as here. ++ ++ elfutils is distributed in the hope that it will be useful, but ++ WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ General Public License for more details. ++ ++ You should have received copies of the GNU General Public License and ++ the GNU Lesser General Public License along with this program. If ++ not, see <http://www.gnu.org/licenses/>. */ ++ ++#ifdef HAVE_CONFIG_H ++# include <config.h> ++#endif ++ ++#include <libeblP.h> ++#include <assert.h> ++ ++GElf_Addr ++ebl_sym_func_value (Ebl *ebl, GElf_Addr val) ++{ ++ if (ebl == NULL || ebl->sym_func_value == NULL) ++ return val; ++ ++ return ebl->sym_func_value (ebl, val); ++} +diff --git a/libebl/libebl.h b/libebl/libebl.h +index bb993bf..40cf635 100644 +--- a/libebl/libebl.h ++++ b/libebl/libebl.h +@@ -459,6 +459,17 @@ extern bool ebl_unwind (Ebl *ebl, Dwarf_Addr pc, ebl_tid_registers_t *setfunc, + extern bool ebl_resolve_sym_value (Ebl *ebl, GElf_Addr *addr) + __nonnull_attribute__ (2); + ++/* Returns the real value of a symbol function address or offset ++ (e.g. when the st_value contains some flag bits that need to be ++ masked off). This is different from ebl_resolve_sym_value which ++ only works for actual symbol addresses (in non-ET_REL files) that ++ might resolve to an address in a different section. ++ ebl_sym_func_value is called to turn the given value into the a ++ real address or offset (the original value might not be a real ++ address). This works for both ET_REL when the value is a section ++ offset or ET_EXEC or ET_DYN symbol values, which are addresses. */ ++extern GElf_Addr ebl_sym_func_value (Ebl *ebl, GElf_Addr val); ++ + #ifdef __cplusplus + } + #endif +-- +1.9.1 + diff --git a/meta/recipes-devtools/elfutils/elfutils-0.161/arm_unwind_ret_mask.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/arm_unwind_ret_mask.patch new file mode 100644 index 0000000000..8abb36bb49 --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils-0.161/arm_unwind_ret_mask.patch @@ -0,0 +1,83 @@ +From: Mark Wielaard <mjw@redhat.com> +Date: Sun, 15 Jun 2014 12:30:02 +0200 +Subject: libebl: Add ebl_unwind_ret_mask. + +Another ARM oddity. A return value address in an unwind will contain an +extra bit to indicate whether to return to a regular ARM or THUMB function. +Add a new ebl function to return a mask to use to get the actual return +address during an unwind ebl_unwind_ret_mask. + +Rebase arm_unwind_ret_mask.patch from 0.159 to 0.160 + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + backends/arm_init.c | 3 +++ + libebl/eblinitreg.c | 8 ++++++++ + libebl/libebl.h | 4 ++++ + libebl/libeblP.h | 6 ++++++ + 4 files changed, 21 insertions(+) + +diff --git a/backends/arm_init.c b/backends/arm_init.c +index 2266829..f8df042 100644 +--- a/backends/arm_init.c ++++ b/backends/arm_init.c +@@ -87,5 +87,8 @@ arm_init (elf, machine, eh, ehlen) + /* Bit zero encodes whether an function address is THUMB or ARM. */ + eh->func_addr_mask = ~(GElf_Addr)1; + ++ /* Bit zero encodes whether to return to a THUMB or ARM function. */ ++ eh->unwind_ret_mask = ~(GElf_Addr)1; ++ + return MODVERSION; + } +diff --git a/libebl/eblinitreg.c b/libebl/eblinitreg.c +index 5729b3c..ca681c0 100644 +--- a/libebl/eblinitreg.c ++++ b/libebl/eblinitreg.c +@@ -56,3 +56,11 @@ ebl_func_addr_mask (Ebl *ebl) + return ((ebl == NULL || ebl->func_addr_mask == 0) + ? ~(GElf_Addr)0 : ebl->func_addr_mask); + } ++ ++GElf_Addr ++ebl_unwind_ret_mask (Ebl *ebl) ++{ ++ return ((ebl == NULL || ebl->unwind_ret_mask == 0) ++ ? ~(GElf_Addr)0 : ebl->unwind_ret_mask); ++} ++ +diff --git a/libebl/libebl.h b/libebl/libebl.h +index 40cf635..be70027 100644 +--- a/libebl/libebl.h ++++ b/libebl/libebl.h +@@ -420,6 +420,10 @@ extern size_t ebl_frame_nregs (Ebl *ebl) + tables) is needed. */ + extern GElf_Addr ebl_func_addr_mask (Ebl *ebl); + ++/* Mask to use for unwind return address in case the architecture adds ++ some extra non-address bits to it. */ ++extern GElf_Addr ebl_unwind_ret_mask (Ebl *ebl); ++ + /* Convert *REGNO as is in DWARF to a lower range suitable for + Dwarf_Frame->REGS indexing. */ + extern bool ebl_dwarf_to_regno (Ebl *ebl, unsigned *regno) +diff --git a/libebl/libeblP.h b/libebl/libeblP.h +index dbd67f3..e18ace6 100644 +--- a/libebl/libeblP.h ++++ b/libebl/libeblP.h +@@ -70,6 +70,12 @@ struct ebl + otherwise it should be the actual mask to use. */ + GElf_Addr func_addr_mask; + ++ /* Mask to use to get the return address from an unwind in case the ++ architecture adds some extra non-address bits to it. When not ++ initialized (0) then ebl_unwind_ret_mask will return ~0, otherwise ++ it should be the actual mask to use. */ ++ GElf_Addr unwind_ret_mask; ++ + /* Function descriptor load address and table as used by + ebl_resolve_sym_value if available for this arch. */ + GElf_Addr fd_addr; +-- +1.9.1 + diff --git a/meta/recipes-devtools/elfutils/elfutils-0.158/fixheadercheck.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/fixheadercheck.patch index 8796e9a394..8796e9a394 100644 --- a/meta/recipes-devtools/elfutils/elfutils-0.158/fixheadercheck.patch +++ b/meta/recipes-devtools/elfutils/elfutils-0.161/fixheadercheck.patch diff --git a/meta/recipes-devtools/elfutils/elfutils-0.158/hppa_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.161/hppa_backend.diff index 6c19d176e0..d51a720073 100644 --- a/meta/recipes-devtools/elfutils/elfutils-0.158/hppa_backend.diff +++ b/meta/recipes-devtools/elfutils/elfutils-0.161/hppa_backend.diff @@ -478,7 +478,7 @@ Index: elfutils-0.158/backends/parisc_retval.c + /* Follow typedefs and qualifiers to get to the actual type. */ + while (tag == DW_TAG_typedef + || tag == DW_TAG_const_type || tag == DW_TAG_volatile_type -+ || tag == DW_TAG_restrict_type || tag == DW_TAG_mutable_type) ++ || tag == DW_TAG_restrict_type) + { + attr = dwarf_attr_integrate (typedie, DW_AT_type, &attr_mem); + typedie = dwarf_formref_die (attr, &die_mem); diff --git a/meta/recipes-devtools/elfutils/elfutils-0.158/m68k_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.161/m68k_backend.diff index 48bffdad0c..f5b566f2d5 100644 --- a/meta/recipes-devtools/elfutils/elfutils-0.158/m68k_backend.diff +++ b/meta/recipes-devtools/elfutils/elfutils-0.161/m68k_backend.diff @@ -409,7 +409,7 @@ Index: elfutils-0.158/backends/m68k_retval.c + /* Follow typedefs and qualifiers to get to the actual type. */ + while (tag == DW_TAG_typedef + || tag == DW_TAG_const_type || tag == DW_TAG_volatile_type -+ || tag == DW_TAG_restrict_type || tag == DW_TAG_mutable_type) ++ || tag == DW_TAG_restrict_type) + { + attr = dwarf_attr_integrate (typedie, DW_AT_type, &attr_mem); + typedie = dwarf_formref_die (attr, &die_mem); diff --git a/meta/recipes-devtools/elfutils/elfutils-0.158/mips_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.161/mips_backend.diff index b188927a0b..d73a3f2869 100644 --- a/meta/recipes-devtools/elfutils/elfutils-0.158/mips_backend.diff +++ b/meta/recipes-devtools/elfutils/elfutils-0.161/mips_backend.diff @@ -496,7 +496,7 @@ Index: elfutils-0.158/backends/mips_retval.c + /* Follow typedefs and qualifiers to get to the actual type. */ + while (tag == DW_TAG_typedef + || tag == DW_TAG_const_type || tag == DW_TAG_volatile_type -+ || tag == DW_TAG_restrict_type || tag == DW_TAG_mutable_type) ++ || tag == DW_TAG_restrict_type) + { + attr = dwarf_attr_integrate (typedie, DW_AT_type, &attr_mem); + typedie = dwarf_formref_die (attr, &die_mem); diff --git a/meta/recipes-devtools/elfutils/elfutils-0.158/mips_readelf_w.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/mips_readelf_w.patch index 8e669e7199..8e669e7199 100644 --- a/meta/recipes-devtools/elfutils/elfutils-0.158/mips_readelf_w.patch +++ b/meta/recipes-devtools/elfutils/elfutils-0.161/mips_readelf_w.patch diff --git a/meta/recipes-devtools/elfutils/elfutils-0.161/non_linux.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/non_linux.patch new file mode 100644 index 0000000000..35b1b389fb --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils-0.161/non_linux.patch @@ -0,0 +1,35 @@ +Index: elfutils-0.159/libdwfl/linux-pid-attach.c +=================================================================== +--- elfutils-0.159.orig/libdwfl/linux-pid-attach.c ++++ elfutils-0.159/libdwfl/linux-pid-attach.c +@@ -393,6 +393,16 @@ pid_getthread (Dwfl *dwfl __attribute__ + return false; + } + ++bool ++internal_function ++__libdwfl_ptrace_attach (pid_t tid __attribute__ ((unused)), ++ bool *tid_was_stoppedp __attribute__ ((unused))) ++{ ++ errno = ENOSYS; ++ __libdwfl_seterrno (DWFL_E_ERRNO); ++ return false; ++} ++ + static bool + pid_memory_read (Dwfl *dwfl __attribute__ ((unused)), + Dwarf_Addr addr __attribute__ ((unused)), +@@ -419,6 +429,13 @@ pid_detach (Dwfl *dwfl __attribute__ ((u + { + } + ++void ++internal_function ++__libdwfl_ptrace_detach (pid_t tid __attribute__ ((unused)), ++ bool tid_was_stopped __attribute__ ((unused))) ++{ ++} ++ + static void + pid_thread_detach (Dwfl_Thread *thread __attribute__ ((unused)), + void *thread_arg __attribute__ ((unused))) diff --git a/meta/recipes-devtools/elfutils/elfutils-0.158/redhat-portability.diff b/meta/recipes-devtools/elfutils/elfutils-0.161/redhat-portability.diff index 5a75375690..08f25a53eb 100644 --- a/meta/recipes-devtools/elfutils/elfutils-0.158/redhat-portability.diff +++ b/meta/recipes-devtools/elfutils/elfutils-0.161/redhat-portability.diff @@ -1,52 +1,47 @@ ---- elfutils/backends/ChangeLog -+++ elfutils/backends/ChangeLog -@@ -292,6 +292,10 @@ - * ppc_attrs.c (ppc_check_object_attribute): Handle tag - GNU_Power_ABI_Struct_Return. - -+2009-01-23 Roland McGrath <roland@redhat.com> -+ -+ * Makefile.am (libebl_%.so): Use $(LD_AS_NEEDED). -+ - 2008-10-04 Ulrich Drepper <drepper@redhat.com> - - * i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and -@@ -619,6 +623,11 @@ - * sparc_init.c: Likewise. - * x86_64_init.c: Likewise. - -+2005-11-22 Roland McGrath <roland@redhat.com> -+ -+ * Makefile.am (LD_AS_NEEDED): New variable, substituted by configure. -+ (libebl_%.so rule): Use it in place of -Wl,--as-needed. -+ - 2005-11-19 Roland McGrath <roland@redhat.com> - - * ppc64_reloc.def: REL30 -> ADDR30. -@@ -641,6 +650,9 @@ - * Makefile.am (uninstall): Don't try to remove $(pkgincludedir). - (CLEANFILES): Add libebl_$(m).so. - -+ * Makefile.am (WEXTRA): New variable, substituted by configure. -+ (AM_CFLAGS): Use it in place of -Wextra. -+ - * ppc_reloc.def: Update bits per Alan Modra <amodra@bigpond.net.au>. - * ppc64_reloc.def: Likewise. - ---- elfutils/backends/Makefile.am -+++ elfutils/backends/Makefile.am -@@ -124,7 +124,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a - $(LINK) -shared -o $(@:.map=.so) \ - -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \ - -Wl,--version-script,$(@:.so=.map) \ -- -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap) -+ -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap) - $(textrel_check) - - libebl_i386.so: $(cpu_i386) ---- elfutils/ChangeLog -+++ elfutils/ChangeLog -@@ -118,6 +118,8 @@ +Rebase to 1.161 + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + ChangeLog | 30 +++++++++++++++++++++++ + backends/ChangeLog | 12 +++++++++ + backends/Makefile.am | 2 +- + config/ChangeLog | 4 +++ + config/eu.am | 14 ++++++++--- + configure.ac | 60 +++++++++++++++++++++++++++++++++++++++++++-- + lib/ChangeLog | 8 ++++++ + lib/eu-config.h | 11 +++++++++ + libasm/ChangeLog | 5 ++++ + libcpu/ChangeLog | 8 ++++++ + libcpu/i386_disasm.c | 1 + + libdw/ChangeLog | 13 ++++++++++ + libdw/dwarf_begin_elf.c | 8 ++++++ + libdw/libdw.h | 2 +- + libdwfl/ChangeLog | 20 +++++++++++++++ + libdwfl/linux-core-attach.c | 29 ++++++++++++++++++++++ + libdwfl/linux-pid-attach.c | 14 +++++++++++ + libebl/ChangeLog | 5 ++++ + libelf/ChangeLog | 10 ++++++++ + libelf/common.h | 4 +-- + libelf/gnuhash_xlate.h | 6 +++-- + src/ChangeLog | 30 +++++++++++++++++++++++ + src/Makefile.am | 5 ++++ + src/addr2line.c | 4 +-- + src/findtextrel.c | 6 ++++- + src/ld.h | 2 ++ + src/readelf.c | 15 ++++++++---- + src/strings.c | 11 +++++++++ + src/strip.c | 20 +++++++++++++-- + tests/ChangeLog | 14 +++++++++++ + tests/Makefile.am | 1 + + tests/backtrace.c | 1 + + tests/line2addr.c | 2 +- + 33 files changed, 355 insertions(+), 22 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index f81b302..3f9eaf1 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -187,6 +187,8 @@ 2012-01-24 Mark Wielaard <mjw@redhat.com> @@ -55,7 +50,7 @@ * COPYING: Fix address. Updated version from gnulib. 2012-01-23 Mark Wielaard <mjw@redhat.com> -@@ -136,6 +138,9 @@ +@@ -205,6 +207,9 @@ 2011-10-08 Mike Frysinger <vapier@gentoo.org> @@ -65,7 +60,7 @@ * configure.ac: Fix use of AC_ARG_ENABLE to handle $enableval correctly. 2011-10-02 Ulrich Drepper <drepper@gmail.com> -@@ -157,6 +162,10 @@ +@@ -226,6 +231,10 @@ * configure.ac (LOCALEDIR, DATADIRNAME): Removed. @@ -76,7 +71,7 @@ 2009-09-21 Ulrich Drepper <drepper@redhat.com> * configure.ac: Update for more modern autoconf. -@@ -165,6 +174,10 @@ +@@ -234,6 +243,10 @@ * configure.ac (zip_LIBS): Check for liblzma too. @@ -87,7 +82,7 @@ 2009-04-19 Roland McGrath <roland@redhat.com> * configure.ac (eu_version): Round down here, not in version.h macros. -@@ -176,6 +189,8 @@ +@@ -245,6 +258,8 @@ 2009-01-23 Roland McGrath <roland@redhat.com> @@ -96,7 +91,7 @@ * configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3. * configure.ac (__thread check): Use AC_LINK_IFELSE, in case of -@@ -256,6 +271,10 @@ +@@ -325,6 +340,10 @@ * configure.ac: Add dummy automake conditional to get dependencies for non-generic linker right. See src/Makefile.am. @@ -107,7 +102,7 @@ 2005-11-18 Roland McGrath <roland@redhat.com> * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable. -@@ -303,6 +322,17 @@ +@@ -372,6 +391,17 @@ * Makefile.am (all_SUBDIRS): Add libdwfl. * configure.ac: Write libdwfl/Makefile. @@ -125,9 +120,61 @@ 2005-05-19 Roland McGrath <roland@redhat.com> * configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros. ---- elfutils/config/ChangeLog -+++ elfutils/config/ChangeLog -@@ -44,6 +44,10 @@ +diff --git a/backends/ChangeLog b/backends/ChangeLog +index e800d16..6a86248 100644 +--- a/backends/ChangeLog ++++ b/backends/ChangeLog +@@ -433,6 +433,10 @@ + * ppc_attrs.c (ppc_check_object_attribute): Handle tag + GNU_Power_ABI_Struct_Return. + ++2009-01-23 Roland McGrath <roland@redhat.com> ++ ++ * Makefile.am (libebl_%.so): Use $(LD_AS_NEEDED). ++ + 2008-10-04 Ulrich Drepper <drepper@redhat.com> + + * i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and +@@ -760,6 +764,11 @@ + * sparc_init.c: Likewise. + * x86_64_init.c: Likewise. + ++2005-11-22 Roland McGrath <roland@redhat.com> ++ ++ * Makefile.am (LD_AS_NEEDED): New variable, substituted by configure. ++ (libebl_%.so rule): Use it in place of -Wl,--as-needed. ++ + 2005-11-19 Roland McGrath <roland@redhat.com> + + * ppc64_reloc.def: REL30 -> ADDR30. +@@ -782,6 +791,9 @@ + * Makefile.am (uninstall): Don't try to remove $(pkgincludedir). + (CLEANFILES): Add libebl_$(m).so. + ++ * Makefile.am (WEXTRA): New variable, substituted by configure. ++ (AM_CFLAGS): Use it in place of -Wextra. ++ + * ppc_reloc.def: Update bits per Alan Modra <amodra@bigpond.net.au>. + * ppc64_reloc.def: Likewise. + +diff --git a/backends/Makefile.am b/backends/Makefile.am +index 4d15a5d..507c9df 100644 +--- a/backends/Makefile.am ++++ b/backends/Makefile.am +@@ -131,7 +131,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw) + $(LINK) -shared -o $(@:.map=.so) \ + -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \ + -Wl,--version-script,$(@:.so=.map) \ +- -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) ++ -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) + @$(textrel_check) + + libebl_i386.so: $(cpu_i386) +diff --git a/config/ChangeLog b/config/ChangeLog +index 1b4e896..058dd88 100644 +--- a/config/ChangeLog ++++ b/config/ChangeLog +@@ -71,6 +71,10 @@ * known-dwarf.awk: Use gawk. @@ -138,17 +185,19 @@ 2010-07-02 Ulrich Drepper <drepper@redhat.com> * elfutils.spec.in: Add more BuildRequires. ---- elfutils/config/eu.am -+++ elfutils/config/eu.am +diff --git a/config/eu.am b/config/eu.am +index faf8add..6ca36a5 100644 +--- a/config/eu.am ++++ b/config/eu.am @@ -1,6 +1,6 @@ ## Common automake fragments for elfutils subdirectory makefiles. ## --## Copyright (C) 2010 Red Hat, Inc. -+## Copyright (C) 2010-2011 Red Hat, Inc. +-## Copyright (C) 2010, 2014 Red Hat, Inc. ++## Copyright (C) 2010-2011, 2014 Red Hat, Inc. ## ## This file is part of elfutils. ## -@@ -29,14 +29,20 @@ +@@ -29,13 +29,21 @@ ## not, see <http://www.gnu.org/licenses/>. ## @@ -157,43 +206,26 @@ + DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"' AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. - AM_CFLAGS = -std=gnu99 -Wall -Wshadow \ -- $(if $($(*F)_no_Werror),,-Werror) \ +-AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ ++AM_CFLAGS = -std=gnu99 -Wall -Wshadow \ + $(if $($(*F)_no_Werror),,-Werror) \ - $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ + $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \ - $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \ ++ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \ $($(*F)_CFLAGS) +if BUILD_WERROR +AM_CFLAGS += $(if $($(*F)_no_Werror),,-Werror) +endif + - if MUDFLAP - AM_CFLAGS += -fmudflap - libmudflap = -lmudflap ---- elfutils/config.h.in -+++ elfutils/config.h.in -@@ -6,6 +6,9 @@ - /* Defined if libdw should support GNU ref_alt FORM, dwz multi files. */ - #undef ENABLE_DWZ + COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) -+/* Have __builtin_popcount. */ -+#undef HAVE_BUILTIN_POPCOUNT -+ - /* Define to 1 if you have the <inttypes.h> header file. */ - #undef HAVE_INTTYPES_H - -@@ -102,4 +105,7 @@ - /* Define for large files, on AIX-style hosts. */ - #undef _LARGE_FILES - -+/* Stubbed out if missing compiler support. */ -+#undef __thread -+ - #include <eu-config.h> ---- elfutils/configure.ac -+++ elfutils/configure.ac -@@ -99,6 +99,54 @@ CFLAGS="$old_CFLAGS"]) + %.os: %.c %.o +diff --git a/configure.ac b/configure.ac +index 0e67a79..a1ad6db 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -89,6 +89,54 @@ CFLAGS="$old_CFLAGS"]) AS_IF([test "x$ac_cv_c99" != xyes], AC_MSG_ERROR([gcc with C99 support required])) @@ -248,7 +280,7 @@ AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl # Use the same flags that we use for our DSOs, so the test is representative. # Some old compiler/linker/libc combinations fail some ways and not others. -@@ -114,7 +162,10 @@ static __thread int a; int foo (int b) { +@@ -104,7 +152,10 @@ static __thread int a; int foo (int b) { return a + b; }]], CFLAGS="$save_CFLAGS" LDFLAGS="$save_LDFLAGS"]) AS_IF([test "x$ac_cv_tls" != xyes], @@ -260,9 +292,9 @@ dnl This test must come as early as possible after the compiler configuration dnl tests, because the choice of the file model can (in principle) affect -@@ -213,6 +264,11 @@ AM_CONDITIONAL(USE_VALGRIND, test "$use_ +@@ -183,6 +234,11 @@ AM_CONDITIONAL(USE_VALGRIND, test "$use_valgrind" = yes) AM_CONDITIONAL(BUILD_STATIC, [dnl - test "$use_mudflap" = yes -o "$use_gprof" = yes -o "$use_gcov" = yes]) + test "$use_gprof" = yes -o "$use_gcov" = yes]) +AC_ARG_ENABLE([werror], +AS_HELP_STRING([--disable-werror],[do not build with -Werror]), @@ -272,7 +304,7 @@ AC_ARG_ENABLE([tests-rpath], AS_HELP_STRING([--enable-tests-rpath],[build $ORIGIN-using rpath into tests]), [tests_use_rpath=$enableval], [tests_use_rpath=no]) -@@ -324,7 +380,7 @@ case "$eu_version" in +@@ -302,7 +358,7 @@ case "$eu_version" in esac # Round up to the next release API (x.y) version. @@ -281,9 +313,11 @@ AC_CHECK_SIZEOF(long) ---- elfutils/lib/ChangeLog -+++ elfutils/lib/ChangeLog -@@ -61,6 +61,9 @@ +diff --git a/lib/ChangeLog b/lib/ChangeLog +index 4415213..4911cc1 100644 +--- a/lib/ChangeLog ++++ b/lib/ChangeLog +@@ -65,6 +65,9 @@ 2009-01-23 Roland McGrath <roland@redhat.com> @@ -293,7 +327,7 @@ * eu-config.h: Add multiple inclusion protection. 2009-01-17 Ulrich Drepper <drepper@redhat.com> -@@ -117,6 +120,11 @@ +@@ -121,6 +124,11 @@ * Makefile.am (libeu_a_SOURCES): Add it. * system.h: Declare crc32_file. @@ -305,9 +339,11 @@ 2005-04-30 Ulrich Drepper <drepper@redhat.com> * Makefile.am: Use -ffunction-sections for xmalloc.c. ---- elfutils/lib/eu-config.h -+++ elfutils/lib/eu-config.h -@@ -162,6 +162,17 @@ asm (".section predict_data, \"aw\"; .pr +diff --git a/lib/eu-config.h b/lib/eu-config.h +index 3afff26..d89f3a8 100644 +--- a/lib/eu-config.h ++++ b/lib/eu-config.h +@@ -162,6 +162,17 @@ asm (".section predict_data, \"aw\"; .previous\n" /* This macro is used by the tests conditionalize for standalone building. */ #define ELFUTILS_HEADER(name) <lib##name.h> @@ -325,9 +361,11 @@ #ifdef SHARED # define OLD_VERSION(name, version) \ ---- elfutils/libasm/ChangeLog -+++ elfutils/libasm/ChangeLog -@@ -75,6 +75,11 @@ +diff --git a/libasm/ChangeLog b/libasm/ChangeLog +index 9b25af9..32b9fd0 100644 +--- a/libasm/ChangeLog ++++ b/libasm/ChangeLog +@@ -87,6 +87,11 @@ * asm_error.c: Add new error ASM_E_IOERROR. * libasmP.h: Add ASM_E_IOERROR definition. @@ -339,9 +377,11 @@ 2005-02-15 Ulrich Drepper <drepper@redhat.com> * Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2. ---- elfutils/libcpu/ChangeLog -+++ elfutils/libcpu/ChangeLog -@@ -47,6 +47,9 @@ +diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog +index a20f440..5ea23b7 100644 +--- a/libcpu/ChangeLog ++++ b/libcpu/ChangeLog +@@ -51,6 +51,9 @@ 2009-01-23 Roland McGrath <roland@redhat.com> @@ -351,7 +391,7 @@ * Makefile.am (i386_parse_CFLAGS): Use quotes around command substitution that can produce leading whitespace. -@@ -376,6 +379,11 @@ +@@ -380,6 +383,11 @@ * defs/i386.doc: New file. * defs/x86_64: New file. @@ -363,9 +403,11 @@ 2005-02-15 Ulrich Drepper <drepper@redhat.com> * Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2. ---- elfutils/libcpu/i386_disasm.c -+++ elfutils/libcpu/i386_disasm.c -@@ -822,6 +822,7 @@ i386_disasm (const uint8_t **startp, con +diff --git a/libcpu/i386_disasm.c b/libcpu/i386_disasm.c +index 832241f..c7a0df0 100644 +--- a/libcpu/i386_disasm.c ++++ b/libcpu/i386_disasm.c +@@ -822,6 +822,7 @@ i386_disasm (const uint8_t **startp, const uint8_t *end, GElf_Addr addr, default: assert (! "INVALID not handled"); @@ -373,9 +415,11 @@ } } else ---- elfutils/libdw/ChangeLog -+++ elfutils/libdw/ChangeLog -@@ -346,6 +346,10 @@ +diff --git a/libdw/ChangeLog b/libdw/ChangeLog +index abc2d71..a9ee0b0 100644 +--- a/libdw/ChangeLog ++++ b/libdw/ChangeLog +@@ -717,6 +717,10 @@ * Makefile.am (known-dwarf.h): Run gawk on config/known-dwarf.awk. @@ -386,7 +430,7 @@ 2011-07-14 Mark Wielaard <mjw@redhat.com> * libdw.h (dwarf_offdie): Fix documentation to mention .debug_info. -@@ -705,6 +709,10 @@ +@@ -1076,6 +1080,10 @@ * dwarf_hasattr_integrate.c: Integrate DW_AT_specification too. @@ -397,7 +441,7 @@ 2009-08-10 Roland McGrath <roland@redhat.com> * dwarf_getscopevar.c: Use dwarf_diename. -@@ -1473,6 +1481,11 @@ +@@ -1844,6 +1852,11 @@ 2005-05-31 Roland McGrath <roland@redhat.com> @@ -409,9 +453,11 @@ * dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to formref offset. ---- elfutils/libdw/dwarf_begin_elf.c -+++ elfutils/libdw/dwarf_begin_elf.c -@@ -48,6 +48,14 @@ +diff --git a/libdw/dwarf_begin_elf.c b/libdw/dwarf_begin_elf.c +index 4c49ce2..7ea1430 100644 +--- a/libdw/dwarf_begin_elf.c ++++ b/libdw/dwarf_begin_elf.c +@@ -47,6 +47,14 @@ #if USE_ZLIB # include <endian.h> # define crc32 loser_crc32 @@ -426,9 +472,11 @@ # include <zlib.h> # undef crc32 #endif ---- elfutils/libdw/libdw.h -+++ elfutils/libdw/libdw.h -@@ -879,7 +879,7 @@ extern Dwarf_OOM dwarf_new_oom_handler ( +diff --git a/libdw/libdw.h b/libdw/libdw.h +index b2b2282..722c589 100644 +--- a/libdw/libdw.h ++++ b/libdw/libdw.h +@@ -1003,7 +1003,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (Dwarf *dbg, Dwarf_OOM handler); /* Inline optimizations. */ @@ -437,9 +485,11 @@ /* Return attribute code of given attribute. */ __libdw_extern_inline unsigned int dwarf_whatattr (Dwarf_Attribute *attr) ---- elfutils/libdwfl/ChangeLog -+++ elfutils/libdwfl/ChangeLog -@@ -283,6 +283,21 @@ +diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog +index 69e59a6..15c2987 100644 +--- a/libdwfl/ChangeLog ++++ b/libdwfl/ChangeLog +@@ -571,6 +571,21 @@ (dwfl_module_addrsym) (i_to_symfile): New function. (dwfl_module_addrsym) (search_table): Use it. @@ -461,7 +511,7 @@ 2013-11-07 Jan Kratochvil <jan.kratochvil@redhat.com> Mark Wielaard <mjw@redhat.com> -@@ -2048,6 +2063,11 @@ +@@ -2336,6 +2351,11 @@ 2005-07-21 Roland McGrath <roland@redhat.com> @@ -473,8 +523,10 @@ * Makefile.am (noinst_HEADERS): Add loc2c.c. * test2.c (main): Check sscanf result to quiet warning. ---- elfutils/libdwfl/linux-core-attach.c -+++ elfutils/libdwfl/linux-core-attach.c +diff --git a/libdwfl/linux-core-attach.c b/libdwfl/linux-core-attach.c +index 5a7b3b3..d05ac7e 100644 +--- a/libdwfl/linux-core-attach.c ++++ b/libdwfl/linux-core-attach.c @@ -29,6 +29,35 @@ #include "libdwflP.h" #include <fcntl.h> @@ -509,42 +561,45 @@ +# endif +#endif - #ifndef MIN - # define MIN(a, b) ((a) < (b) ? (a) : (b)) ---- elfutils/libdwfl/linux-pid-attach.c -+++ elfutils/libdwfl/linux-pid-attach.c -@@ -268,13 +268,24 @@ pid_thread_detach (Dwfl_Thread *thread, - pid_arg->tid_attached = 0; - if (! pid_arg->assume_ptrace_stopped) - { -+ // Older kernels (tested kernel-2.6.18-348.12.1.el5.x86_64) need special -+ // handling of the detachment to keep the process State: T (stopped). -+ if (pid_arg->tid_was_stopped) -+ syscall (__NR_tkill, tid, SIGSTOP); - /* This handling is needed only on older Linux kernels such as -- 2.6.32-358.23.2.el6.ppc64. Later kernels such as -- 3.11.7-200.fc19.x86_64 remember the T (stopped) state -- themselves and no longer need to pass SIGSTOP during -- PTRACE_DETACH. */ -+ 2.6.32-358.23.2.el6.ppc64. Later kernels such as 3.11.7-200.fc19.x86_64 -+ remember the T (stopped) state themselves and no longer need to pass -+ SIGSTOP during PTRACE_DETACH. */ - ptrace (PTRACE_DETACH, tid, NULL, - (void *) (intptr_t) (pid_arg->tid_was_stopped ? SIGSTOP : 0)); -+ if (pid_arg->tid_was_stopped) -+ { -+ // Wait till the SIGSTOP settles down. -+ int i; -+ for (i = 0; i < 100000; i++) -+ if (linux_proc_pid_is_stopped (tid)) -+ break; -+ } - } + #include "../libdw/memory-access.h" + +diff --git a/libdwfl/linux-pid-attach.c b/libdwfl/linux-pid-attach.c +index efbcf03..ae5af38 100644 +--- a/libdwfl/linux-pid-attach.c ++++ b/libdwfl/linux-pid-attach.c +@@ -255,6 +255,11 @@ void + internal_function + __libdwfl_ptrace_detach (pid_t tid, bool tid_was_stopped) + { ++ // Older kernels (tested kernel-2.6.18-348.12.1.el5.x86_64) need special ++ // handling of the detachment to keep the process State: T (stopped). ++ if (tid_was_stopped) ++ syscall (__NR_tkill, tid, SIGSTOP); ++ + /* This handling is needed only on older Linux kernels such as + 2.6.32-358.23.2.el6.ppc64. Later kernels such as + 3.11.7-200.fc19.x86_64 remember the T (stopped) state +@@ -262,6 +267,15 @@ __libdwfl_ptrace_detach (pid_t tid, bool tid_was_stopped) + PTRACE_DETACH. */ + ptrace (PTRACE_DETACH, tid, NULL, + (void *) (intptr_t) (tid_was_stopped ? SIGSTOP : 0)); ++ ++ if (tid_was_stopped) ++ { ++ // Wait till the SIGSTOP settles down. ++ int i; ++ for (i = 0; i < 100000; i++) ++ if (linux_proc_pid_is_stopped (tid)) ++ break; ++ } } ---- elfutils/libebl/ChangeLog -+++ elfutils/libebl/ChangeLog -@@ -738,6 +738,11 @@ + static void +diff --git a/libebl/ChangeLog b/libebl/ChangeLog +index 5e635f2..998544f 100644 +--- a/libebl/ChangeLog ++++ b/libebl/ChangeLog +@@ -765,6 +765,11 @@ * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency tracking works right. @@ -556,9 +611,11 @@ 2005-05-21 Ulrich Drepper <drepper@redhat.com> * libebl_x86_64.map: Add x86_64_core_note. ---- elfutils/libelf/ChangeLog -+++ elfutils/libelf/ChangeLog -@@ -85,6 +85,11 @@ +diff --git a/libelf/ChangeLog b/libelf/ChangeLog +index 3b88d03..cb6cad5 100644 +--- a/libelf/ChangeLog ++++ b/libelf/ChangeLog +@@ -244,6 +244,11 @@ * elf-knowledge.h (SECTION_STRIP_P): Remove < SHT_NUM check. @@ -570,7 +627,7 @@ 2011-02-26 Mark Wielaard <mjw@redhat.com> * elf_end.c (elf_end): Call rwlock_unlock before rwlock_fini. -@@ -762,6 +767,11 @@ +@@ -921,6 +926,11 @@ * elf.h: Update from glibc. @@ -582,8 +639,10 @@ 2005-05-08 Roland McGrath <roland@redhat.com> * elf_begin.c (read_file) [_MUDFLAP]: Don't use mmap for now. ---- elfutils/libelf/common.h -+++ elfutils/libelf/common.h +diff --git a/libelf/common.h b/libelf/common.h +index 744f1bb..185ea59 100644 +--- a/libelf/common.h ++++ b/libelf/common.h @@ -139,7 +139,7 @@ libelf_release_all (Elf *elf) (Var) = (sizeof (Var) == 1 \ ? (unsigned char) (Var) \ @@ -602,8 +661,10 @@ : (sizeof (Var) == 4 \ ? bswap_32 (Var) \ : bswap_64 (Var)))) ---- elfutils/libelf/gnuhash_xlate.h -+++ elfutils/libelf/gnuhash_xlate.h +diff --git a/libelf/gnuhash_xlate.h b/libelf/gnuhash_xlate.h +index 04d9ca1..3e25936 100644 +--- a/libelf/gnuhash_xlate.h ++++ b/libelf/gnuhash_xlate.h @@ -1,5 +1,5 @@ /* Conversion functions for versioning information. - Copyright (C) 2006, 2007 Red Hat, Inc. @@ -611,7 +672,7 @@ This file is part of elfutils. Written by Ulrich Drepper <drepper@redhat.com>, 2006. -@@ -68,7 +68,9 @@ elf_cvt_gnuhash (void *dest, const void +@@ -69,7 +69,9 @@ elf_cvt_gnuhash (void *dest, const void *src, size_t len, int encode) dest32 = (Elf32_Word *) &dest64[bitmask_words]; while (len >= 4) { @@ -622,24 +683,11 @@ len -= 4; } } ---- elfutils/src/addr2line.c -+++ elfutils/src/addr2line.c -@@ -540,10 +540,10 @@ handle_address (const char *string, Dwfl - bool parsed = false; - int i, j; - char *name = NULL; -- if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2 -+ if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2 - && string[i] == '\0') - parsed = adjust_to_section (name, &addr, dwfl); -- switch (sscanf (string, "%m[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j)) -+ switch (sscanf (string, "%a[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j)) - { - default: - break; ---- elfutils/src/ChangeLog -+++ elfutils/src/ChangeLog -@@ -964,8 +964,16 @@ +diff --git a/src/ChangeLog b/src/ChangeLog +index 0ae863e..1162f6e 100644 +--- a/src/ChangeLog ++++ b/src/ChangeLog +@@ -1371,8 +1371,16 @@ * readelf.c (attr_callback): Use print_block only when we don't use print_ops. @@ -656,7 +704,7 @@ * ar.c (do_oper_extract): Use pathconf instead of statfs. 2009-08-01 Ulrich Drepper <drepper@redhat.com> -@@ -1129,6 +1137,8 @@ +@@ -1536,6 +1544,8 @@ * readelf.c (print_debug_frame_section): Use t instead of j formats for ptrdiff_t OFFSET. @@ -665,7 +713,7 @@ 2009-01-21 Ulrich Drepper <drepper@redhat.com> * elflint.c (check_program_header): Fix typo in .eh_frame_hdr section -@@ -1312,6 +1322,11 @@ +@@ -1719,6 +1729,11 @@ that matches its PT_LOAD's p_flags &~ PF_W. On sparc, PF_X really is valid in RELRO. @@ -677,7 +725,7 @@ 2008-02-29 Roland McGrath <roland@redhat.com> * readelf.c (print_attributes): Add a cast. -@@ -1563,6 +1578,8 @@ +@@ -1970,6 +1985,8 @@ * readelf.c (hex_dump): Fix rounding error in whitespace calculation. @@ -686,7 +734,7 @@ 2007-10-15 Roland McGrath <roland@redhat.com> * make-debug-archive.in: New file. -@@ -2002,6 +2019,10 @@ +@@ -2409,6 +2426,10 @@ * elflint.c (valid_e_machine): Add EM_ALPHA. Reported by Christian Aichinger <Greek0@gmx.net>. @@ -697,7 +745,7 @@ 2006-08-08 Ulrich Drepper <drepper@redhat.com> * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB. -@@ -2078,6 +2099,10 @@ +@@ -2485,6 +2506,10 @@ * Makefile.am: Add hacks to create dependency files for non-generic linker. @@ -708,7 +756,7 @@ 2006-06-12 Ulrich Drepper <drepper@redhat.com> * ldgeneric.c (ld_generic_generate_sections): Don't create .interp -@@ -2426,6 +2451,11 @@ +@@ -2833,6 +2858,11 @@ * readelf.c (print_debug_loc_section): Fix indentation for larger address size. @@ -720,9 +768,44 @@ 2005-05-30 Roland McGrath <roland@redhat.com> * readelf.c (print_debug_line_section): Print section offset of each ---- elfutils/src/findtextrel.c -+++ elfutils/src/findtextrel.c -@@ -496,7 +496,11 @@ ptrcompare (const void *p1, const void * +diff --git a/src/Makefile.am b/src/Makefile.am +index 4f198da..a612cf6 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -89,6 +89,11 @@ endif + # XXX While the file is not finished, don't warn about this + ldgeneric_no_Wunused = yes + ++# Buggy old compilers or libc headers. ++readelf_no_Werror = yes ++strings_no_Werror = yes ++addr2line_no_Wformat = yes ++ + readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl + nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl \ + $(demanglelib) +diff --git a/src/addr2line.c b/src/addr2line.c +index de80294..e982982 100644 +--- a/src/addr2line.c ++++ b/src/addr2line.c +@@ -540,10 +540,10 @@ handle_address (const char *string, Dwfl *dwfl) + bool parsed = false; + int i, j; + char *name = NULL; +- if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2 ++ if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2 + && string[i] == '\0') + parsed = adjust_to_section (name, &addr, dwfl); +- switch (sscanf (string, "%m[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j)) ++ switch (sscanf (string, "%a[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j)) + { + default: + break; +diff --git a/src/findtextrel.c b/src/findtextrel.c +index 264a06b..d7de202 100644 +--- a/src/findtextrel.c ++++ b/src/findtextrel.c +@@ -502,7 +502,11 @@ ptrcompare (const void *p1, const void *p2) static void @@ -735,8 +818,10 @@ GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw, const char *fname, bool more_than_one, void **knownsrcs) { ---- elfutils/src/ld.h -+++ elfutils/src/ld.h +diff --git a/src/ld.h b/src/ld.h +index 29f4031..8695c31 100644 +--- a/src/ld.h ++++ b/src/ld.h @@ -1114,6 +1114,7 @@ extern bool dynamically_linked_p (void); /* Checked whether the symbol is undefined and referenced from a DSO. */ @@ -745,28 +830,18 @@ #ifdef __GNUC_STDC_INLINE__ __attribute__ ((__gnu_inline__)) #endif -@@ -1131,5 +1132,6 @@ linked_from_dso_p (struct scninfo *scnin +@@ -1131,5 +1132,6 @@ linked_from_dso_p (struct scninfo *scninfo, size_t symidx) return sym->defined && sym->in_dso; } +#endif /* Optimizing and not GCC 4.2. */ #endif /* ld.h */ ---- elfutils/src/Makefile.am -+++ elfutils/src/Makefile.am -@@ -95,6 +95,9 @@ addr2line_no_Wformat = yes - # XXX While the file is not finished, don't warn about this - ldgeneric_no_Wunused = yes - -+# Buggy old compilers. -+readelf_no_Werror = yes -+ - readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl - nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \ - $(demanglelib) ---- elfutils/src/readelf.c -+++ elfutils/src/readelf.c -@@ -4171,10 +4171,12 @@ listptr_base (struct listptr *p) +diff --git a/src/readelf.c b/src/readelf.c +index d49544f..15dbe62 100644 +--- a/src/readelf.c ++++ b/src/readelf.c +@@ -4368,10 +4368,12 @@ listptr_base (struct listptr *p) return base; } @@ -781,7 +856,7 @@ struct listptr *p1 = (void *) a; struct listptr *p2 = (void *) b; -@@ -4263,8 +4265,11 @@ static void +@@ -4467,8 +4469,11 @@ static void sort_listptr (struct listptr_table *table, const char *name) { if (table->n > 0) @@ -795,7 +870,7 @@ } static bool -@@ -9151,7 +9156,7 @@ dump_archive_index (Elf *elf, const char +@@ -9540,7 +9545,7 @@ dump_archive_index (Elf *elf, const char *fname) if (unlikely (elf_rand (elf, as_off) == 0) || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf)) == NULL)) @@ -804,8 +879,10 @@ while (1) #endif error (EXIT_FAILURE, 0, ---- elfutils/src/strings.c -+++ elfutils/src/strings.c +diff --git a/src/strings.c b/src/strings.c +index f60e4b4..dae6ab2 100644 +--- a/src/strings.c ++++ b/src/strings.c @@ -43,6 +43,10 @@ #include <system.h> @@ -817,7 +894,7 @@ /* Prototypes of local functions. */ static int read_fd (int fd, const char *fname, off64_t fdlen); -@@ -483,8 +487,13 @@ map_file (int fd, off64_t start_off, off +@@ -489,8 +493,13 @@ map_file (int fd, off64_t start_off, off64_t fdlen, size_t *map_sizep) fd, start_off); if (mem != MAP_FAILED) { @@ -831,7 +908,7 @@ break; } if (errno != EINVAL && errno != ENOMEM) -@@ -576,9 +585,11 @@ read_block (int fd, const char *fname, o +@@ -581,9 +590,11 @@ read_block (int fd, const char *fname, off64_t fdlen, off64_t from, off64_t to) elfmap_off = from & ~(ps - 1); elfmap_base = elfmap = map_file (fd, elfmap_off, fdlen, &elfmap_size); @@ -843,8 +920,10 @@ } if (unlikely (elfmap == MAP_FAILED)) ---- elfutils/src/strip.c -+++ elfutils/src/strip.c +diff --git a/src/strip.c b/src/strip.c +index 2b21799..1b34eee 100644 +--- a/src/strip.c ++++ b/src/strip.c @@ -45,6 +45,12 @@ #include <libebl.h> #include <system.h> @@ -877,7 +956,7 @@ } /* Open the file. */ -@@ -2060,7 +2076,7 @@ while computing checksum for debug infor +@@ -2091,7 +2107,7 @@ while computing checksum for debug information")); /* If requested, preserve the timestamp. */ if (tvp != NULL) { @@ -886,7 +965,7 @@ { error (0, errno, gettext ("\ cannot set access and modification date of '%s'"), -@@ -2117,7 +2133,7 @@ handle_ar (int fd, Elf *elf, const char +@@ -2148,7 +2164,7 @@ handle_ar (int fd, Elf *elf, const char *prefix, const char *fname, if (tvp != NULL) { @@ -895,19 +974,11 @@ { error (0, errno, gettext ("\ cannot set access and modification date of '%s'"), fname); ---- elfutils/tests/backtrace.c -+++ elfutils/tests/backtrace.c -@@ -36,6 +36,7 @@ - #include <fcntl.h> - #include <string.h> - #include <argp.h> -+#include <sys/syscall.h> - #include ELFUTILS_HEADER(dwfl) - - static int ---- elfutils/tests/ChangeLog -+++ elfutils/tests/ChangeLog -@@ -123,6 +123,13 @@ +diff --git a/tests/ChangeLog b/tests/ChangeLog +index 59048f6..02eccfc 100644 +--- a/tests/ChangeLog ++++ b/tests/ChangeLog +@@ -421,6 +421,13 @@ 2013-12-02 Jan Kratochvil <jan.kratochvil@redhat.com> @@ -921,7 +992,7 @@ * Makefile.am (check_PROGRAMS): Add backtrace, backtrace-child, backtrace-data and backtrace-dwarf. (BUILT_SOURCES, clean-local, backtrace-child-biarch): New. -@@ -987,6 +994,8 @@ +@@ -1285,6 +1292,8 @@ 2008-01-21 Roland McGrath <roland@redhat.com> @@ -930,7 +1001,7 @@ * testfile45.S.bz2: Add tests for cltq, cqto. * testfile45.expect.bz2: Adjust. -@@ -1695,6 +1704,11 @@ +@@ -1993,6 +2002,11 @@ * Makefile.am (TESTS): Add run-elflint-test.sh. (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. @@ -942,8 +1013,34 @@ 2005-05-24 Ulrich Drepper <drepper@redhat.com> * get-files.c (main): Use correct format specifier. ---- elfutils/tests/line2addr.c -+++ elfutils/tests/line2addr.c +diff --git a/tests/Makefile.am b/tests/Makefile.am +index f32e4d0..2652fb8 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -365,6 +365,7 @@ get_lines_LDADD = $(libdw) $(libelf) + get_files_LDADD = $(libdw) $(libelf) + get_aranges_LDADD = $(libdw) $(libelf) + allfcts_LDADD = $(libdw) $(libelf) ++line2addr_no_Wformat = yes + line2addr_LDADD = $(libdw) + addrscopes_LDADD = $(libdw) + funcscopes_LDADD = $(libdw) +diff --git a/tests/backtrace.c b/tests/backtrace.c +index 331ba0f..46af9b5 100644 +--- a/tests/backtrace.c ++++ b/tests/backtrace.c +@@ -36,6 +36,7 @@ + #include <fcntl.h> + #include <string.h> + #include <argp.h> ++#include <sys/syscall.h> + #include ELFUTILS_HEADER(dwfl) + + #ifndef __linux__ +diff --git a/tests/line2addr.c b/tests/line2addr.c +index e0d65d3..7c171b9 100644 +--- a/tests/line2addr.c ++++ b/tests/line2addr.c @@ -124,7 +124,7 @@ main (int argc, char *argv[]) { struct args a = { .arg = argv[cnt] }; @@ -953,3 +1050,6 @@ { default: case 0: +-- +1.9.1 + diff --git a/meta/recipes-devtools/elfutils/elfutils-0.158/scanf-format.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/scanf-format.patch index c08519cf53..c08519cf53 100644 --- a/meta/recipes-devtools/elfutils/elfutils-0.158/scanf-format.patch +++ b/meta/recipes-devtools/elfutils/elfutils-0.161/scanf-format.patch diff --git a/meta/recipes-devtools/elfutils/elfutils-0.158/testsuite-ignore-elflint.diff b/meta/recipes-devtools/elfutils/elfutils-0.161/testsuite-ignore-elflint.diff index eae5796de3..eae5796de3 100644 --- a/meta/recipes-devtools/elfutils/elfutils-0.158/testsuite-ignore-elflint.diff +++ b/meta/recipes-devtools/elfutils/elfutils-0.161/testsuite-ignore-elflint.diff diff --git a/meta/recipes-devtools/elfutils/elfutils/Fix_elf_cvt_gunhash.patch b/meta/recipes-devtools/elfutils/elfutils/Fix_elf_cvt_gunhash.patch index 5a98f6b9d0..374cba555e 100644 --- a/meta/recipes-devtools/elfutils/elfutils/Fix_elf_cvt_gunhash.patch +++ b/meta/recipes-devtools/elfutils/elfutils/Fix_elf_cvt_gunhash.patch @@ -15,15 +15,15 @@ index 6faf113..04d9ca1 100644 Elf32_Word *dest32 = dest; const Elf32_Word *src32 = src; + Elf32_Word save_src32_2 = src32[2]; // dest could be equal to src - + /* First four control words, 32 bits. */ for (unsigned int cnt = 0; cnt < 4; ++cnt) @@ -50,7 +51,7 @@ elf_cvt_gnuhash (void *dest, const void *src, size_t len, int encode) len -= 4; } - + - Elf32_Word bitmask_words = encode ? src32[2] : dest32[2]; + Elf32_Word bitmask_words = encode ? save_src32_2 : dest32[2]; - + /* Now the 64 bit words. */ Elf64_Xword *dest64 = (Elf64_Xword *) &dest32[4]; diff --git a/meta/recipes-devtools/elfutils/elfutils_0.148.bb b/meta/recipes-devtools/elfutils/elfutils_0.148.bb index ab956390b3..16db6b2746 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.148.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.148.bb @@ -8,7 +8,7 @@ DEPENDS = "libtool bzip2 zlib virtual/libintl" PR = "r11" -SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/elfutils-${PV}.tar.bz2" +SRC_URI = "https://fedorahosted.org/releases/e/l/${BPN}/${BP}.tar.bz2" SRC_URI[md5sum] = "a0bed1130135f17ad27533b0034dba8d" SRC_URI[sha256sum] = "8aebfa4a745db21cf5429c9541fe482729b62efc7e53e9110151b4169fe887da" @@ -25,14 +25,15 @@ SRC_URI += "\ file://m68k_backend.diff \ file://testsuite-ignore-elflint.diff \ file://elf_additions.diff \ - file://elfutils-fsize.patch \ - file://remove-unused.patch \ - file://mempcpy.patch \ - file://fix_for_gcc-4.7.patch \ - file://dso-link-change.patch \ - file://nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch \ - file://elfutils-ar-c-fix-num-passed-to-memset.patch \ - file://Fix_elf_cvt_gunhash.patch \ + file://elfutils-fsize.patch \ + file://remove-unused.patch \ + file://mempcpy.patch \ + file://fix_for_gcc-4.7.patch \ + file://dso-link-change.patch \ + file://nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch \ + file://elfutils-ar-c-fix-num-passed-to-memset.patch \ + file://Fix_elf_cvt_gunhash.patch \ + file://elf_begin.c-CVE-2014-9447-fix.patch \ " # Only apply when building uclibc based target recipe SRC_URI_append_libc-uclibc = " file://uclibc-support.patch" @@ -52,9 +53,9 @@ EXTRA_OECONF_append_class-native = " --without-bzlib" EXTRA_OECONF_append_libc-uclibc = " --enable-uclibc" do_configure_prepend() { - sed -i '/^i386_dis.h:/,+4 {/.*/d}' ${S}/libcpu/Makefile.am + sed -i '/^i386_dis.h:/,+4 {/.*/d}' ${S}/libcpu/Makefile.am - cp ${WORKDIR}/*dis.h ${S}/libcpu + cp ${WORKDIR}/*dis.h ${S}/libcpu } # we can not build complete elfutils when using uclibc diff --git a/meta/recipes-devtools/elfutils/elfutils_0.158.bb b/meta/recipes-devtools/elfutils/elfutils_0.161.bb index 42724a1590..d8c27f57b1 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.158.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.161.bb @@ -7,14 +7,21 @@ DEPENDS = "libtool bzip2 zlib virtual/libintl" SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/${PV}/elfutils-${PV}.tar.bz2" -SRC_URI[md5sum] = "050a4909e452d01ab4747fd69d4036e0" -SRC_URI[sha256sum] = "be27af5c21352f53e010342bf1c68e0b9e18232dbf3adec7e2f9b41f6bbe397d" +SRC_URI[md5sum] = "e1b9847c9a6a1ad340de8d47a863ec52" +SRC_URI[sha256sum] = "570c91a1783fa5386aaa2dfdd08dda1de777c2b63bf3b9c1437d635ffdd7a070" -# Pick patches from debian -# http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.158-2.debian.tar.xz +SRC_URI += "\ + file://mempcpy.patch \ + file://dso-link-change.patch \ + file://Fix_elf_cvt_gunhash.patch \ + file://fixheadercheck.patch \ + file://0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch \ +" + +# pick the patch from debian +# http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.159-4.debian.tar.xz SRC_URI += "\ file://redhat-portability.diff \ - file://redhat-robustify.diff \ file://hppa_backend.diff \ file://arm_backend.diff \ file://mips_backend.diff \ @@ -22,15 +29,9 @@ SRC_URI += "\ file://testsuite-ignore-elflint.diff \ file://scanf-format.patch \ file://mips_readelf_w.patch \ - file://core_filename.patch \ - file://CVE-2014-0172.patch \ - file://unwind_non_linux.patch \ - file://elf_additions.diff \ - file://mempcpy.patch \ - file://dso-link-change.patch \ - file://m4-biarch.m4-tweak-AC_RUN_IFELSE-for-cross-compiling.patch \ - file://fixheadercheck.patch \ - file://Fix_elf_cvt_gunhash.patch \ + file://arm_func_value.patch \ + file://arm_unwind_ret_mask.patch \ + file://non_linux.patch \ " # Only apply when building uclibc based target recipe diff --git a/meta/recipes-devtools/expect/expect_5.45.bb b/meta/recipes-devtools/expect/expect_5.45.bb index 3e839a2fe3..264f00718b 100644 --- a/meta/recipes-devtools/expect/expect_5.45.bb +++ b/meta/recipes-devtools/expect/expect_5.45.bb @@ -16,7 +16,9 @@ LIC_FILES_CHKSUM = "file://license.terms;md5=fbf2de7e9102505b1439db06fc36ce5c" DEPENDS += "tcl" RDEPENDS_${PN} = "tcl" -inherit autotools-brokensep +inherit autotools + +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \ file://0001-configure.in.patch \ diff --git a/meta/recipes-devtools/fdisk/gptfdisk_git.bb b/meta/recipes-devtools/fdisk/gptfdisk_git.bb new file mode 100644 index 0000000000..477c1d986f --- /dev/null +++ b/meta/recipes-devtools/fdisk/gptfdisk_git.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "GPT fdisk is a disk partitioning tool loosely modeled on Linux fdisk, but used for modifying GUID Partition Table (GPT) disks. The related FixParts utility fixes some common problems on Master Boot Record (MBR) disks." + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +DEPENDS = "util-linux popt ncurses" + +PV = "0.8.10+git${SRCPV}" +SRCREV = "a920398fa393f9d6301b32b191bc01e086ab8bc8" +SRC_URI = "git://git.code.sf.net/p/gptfdisk/code" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${sbindir} + install -m 0755 cgdisk ${D}${sbindir} + install -m 0755 gdisk ${D}${sbindir} + install -m 0755 sgdisk ${D}${sbindir} + install -m 0755 fixparts ${D}${sbindir} +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/file/file/debian-742262.patch b/meta/recipes-devtools/file/file/debian-742262.patch index d57258c56b..1ef485e93c 100644 --- a/meta/recipes-devtools/file/file/debian-742262.patch +++ b/meta/recipes-devtools/file/file/debian-742262.patch @@ -9,10 +9,10 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> diff --git a/magic/Magdir/commands b/magic/Magdir/commands --- a/magic/Magdir/commands +++ b/magic/Magdir/commands -@@ -50,6 +50,7 @@ +@@ -57,6 +57,7 @@ 0 string/wt #!\ /usr/bin/awk awk script text executable !:mime text/x-awk - 0 regex =^\\s{0,100}BEGIN\\s{0,100}[{] awk script text + 0 regex/4096 =^\\s{0,100}BEGIN\\s{0,100}[{] awk or perl script text +!:strength - 12 # AT&T Bell Labs' Plan 9 shell diff --git a/meta/recipes-devtools/file/file_5.18.bb b/meta/recipes-devtools/file/file_5.22.bb index 9068b9314a..9c6bb38d71 100644 --- a/meta/recipes-devtools/file/file_5.18.bb +++ b/meta/recipes-devtools/file/file_5.22.bb @@ -15,8 +15,8 @@ SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ file://debian-742262.patch \ " -SRC_URI[md5sum] = "d420d8f2990cd344673acfbf8d76ff5a" -SRC_URI[sha256sum] = "6519fb706d583231c2419592ebecdbb21d33c62eaf7a1a0b24ddfcb80c08bf07" +SRC_URI[md5sum] = "8fb13e5259fe447e02c4a37bc7225add" +SRC_URI[sha256sum] = "c4e3a8e44cb888c5e4b476e738503e37fb9de3b25a38c143e214bfc12109fc0b" inherit autotools diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc index 18a6692687..06e6982d93 100644 --- a/meta/recipes-devtools/gcc/gcc-4.8.inc +++ b/meta/recipes-devtools/gcc/gcc-4.8.inc @@ -73,6 +73,7 @@ SRC_URI = "\ file://0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch \ file://0050-PR-target-58595.patch \ file://0052-PR-rtl-optimization-61801.patch \ + file://target-gcc-includedir.patch \ " SRC_URI[md5sum] = "a3d7d63b9cb6b6ea049469a0c4a43c9d" SRC_URI[sha256sum] = "09dc2276c73424bbbfda1dbddc62bbbf900c9f185acf7f3e1d773ce2d7e3cdc8" diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0051-fix-unwind-race.patch b/meta/recipes-devtools/gcc/gcc-4.8/0051-fix-unwind-race.patch deleted file mode 100644 index e4fff127b3..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.8/0051-fix-unwind-race.patch +++ /dev/null @@ -1,33 +0,0 @@ -These is a race over the installation of files into the include/ directory between: - -| (cd `${PWDCMD-pwd}`/include ; \| tar -cf - .; exit 0) | (cd /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-oecore/build/build/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gcc-cross-initial/4.8.2-r0/image/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-oecore/build/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/armv5te-oe-linux-gnueabi.gcc-cross-initial/gcc/arm-oe-linux-gnueabi/4.8.2/include; tar xpf - ) - -and - -| /bin/install -c -m 644 unwind.h /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-oecore/build/build/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gcc-cross-initial/4.8.2-r0/image/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-oecore/build/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/armv5te-oe-linux-gnueabi.gcc-cross-initial/gcc/arm-oe-linux-gnueabi/4.8.2/include -| /bin/install: cannot create regular file '/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-oecore/build/build/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gcc-cross-initial/4.8.2-r0/image/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-oecore/build/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/armv5te-oe-linux-gnueabi.gcc-cross-initial/gcc/arm-oe-linux-gnueabi/4.8.2/include/unwind.h': File exists -| make[1]: *** [install-unwind_h] Error 1 - -which under the right circumstances leads to the above build failure. Since we don't -need two copies of this file and we don't use install-no-fixincludes, we can disable -the libgcc installation. - -RP 2014/04/10 - -Upstream-Status: Pending [would need a rewrite into an acceptable patch form] - -Index: gcc-4.8.2/libgcc/Makefile.in -=================================================================== ---- gcc-4.8.2.orig/libgcc/Makefile.in 2013-02-04 19:06:20.000000000 +0000 -+++ gcc-4.8.2/libgcc/Makefile.in 2014-04-10 09:58:33.018748787 +0000 -@@ -1020,8 +1020,8 @@ - # This is however useful for "install-no-fixincludes" case, when only the gcc - # internal headers are copied by gcc's install. - install-unwind_h: -- $(mkinstalldirs) $(DESTDIR)$(libsubdir)/include -- $(INSTALL_DATA) unwind.h $(DESTDIR)$(libsubdir)/include -+# $(mkinstalldirs) $(DESTDIR)$(libsubdir)/include -+# $(INSTALL_DATA) unwind.h $(DESTDIR)$(libsubdir)/include - - all: install-unwind_h-forbuild - diff --git a/meta/recipes-devtools/gcc/gcc-4.8/target-gcc-includedir.patch b/meta/recipes-devtools/gcc/gcc-4.8/target-gcc-includedir.patch new file mode 100644 index 0000000000..f48c66dcac --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.8/target-gcc-includedir.patch @@ -0,0 +1,81 @@ +Ensure target gcc headers can be included + +There are a few headers installed as part of the OpenEmbedded +gcc-runtime target (omp.h, ssp/*.h). Being installed from a recipe +built for the target architecture, these are within the target +sysroot and not cross/nativesdk; thus they weren't able to be +found by gcc with the existing search paths. Add support for +picking up these headers under the sysroot supplied on the gcc +command line in order to resolve this. + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> + +Upstream-Status: Pending + +--- a/gcc/Makefile.in 2014-12-23 11:57:33.327873331 +0000 ++++ b/gcc/Makefile.in 2015-01-21 11:32:35.447305394 +0000 +@@ -587,6 +587,7 @@ + + # Directory in which the compiler finds libraries etc. + libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(version) ++libsubdir_target = gcc/$(target_noncanonical)/$(version) + # Directory in which the compiler finds executables + libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(version) + # Directory in which all plugin resources are installed +@@ -2534,6 +2535,7 @@ + + PREPROCESSOR_DEFINES = \ + -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ ++ -DGCC_INCLUDE_SUBDIR_TARGET=\"$(libsubdir_target)/include\" \ + -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \ + -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ + -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ +--- a/gcc/cppdefault.c 2015-01-13 17:40:26.131012725 +0000 ++++ b/gcc/cppdefault.c 2015-01-21 11:30:08.928426492 +0000 +@@ -59,6 +59,10 @@ + /* This is the dir for gcc's private headers. */ + { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, + #endif ++#ifdef GCC_INCLUDE_SUBDIR_TARGET ++ /* This is the dir for gcc's private headers under the specified sysroot. */ ++ { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0 }, ++#endif + #ifdef LOCAL_INCLUDE_DIR + /* /usr/local/include comes before the fixincluded header files. */ + { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, +diff --git a/gcc/defaults.h b/gcc/defaults.h +index f94ae17..d98b40b 100644 +--- a/gcc/defaults.h ++++ b/gcc/defaults.h +@@ -1390,4 +1390,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + + #endif /* GCC_INSN_FLAGS_H */ + ++/* Default prefixes to attach to command names. */ ++ ++#ifndef STANDARD_STARTFILE_PREFIX_1 ++#define STANDARD_STARTFILE_PREFIX_1 "/lib/" ++#endif ++#ifndef STANDARD_STARTFILE_PREFIX_2 ++#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" ++#endif ++ + #endif /* ! GCC_DEFAULTS_H */ +diff --git a/gcc/gcc.c b/gcc/gcc.c +index 9f0b781..174fca8 100644 +--- a/gcc/gcc.c ++++ b/gcc/gcc.c +@@ -1189,13 +1189,6 @@ static const char *gcc_libexec_prefix; + + /* Default prefixes to attach to command names. */ + +-#ifndef STANDARD_STARTFILE_PREFIX_1 +-#define STANDARD_STARTFILE_PREFIX_1 "/lib/" +-#endif +-#ifndef STANDARD_STARTFILE_PREFIX_2 +-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" +-#endif +- + #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ + #undef MD_EXEC_PREFIX + #undef MD_STARTFILE_PREFIX diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc index 87691289c3..3af87d1cc6 100644 --- a/meta/recipes-devtools/gcc/gcc-4.9.inc +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc @@ -2,11 +2,11 @@ require gcc-common.inc # Third digit in PV should be incremented after a minor release -PV = "4.9.1" +PV = "4.9.2" # BINV should be incremented to a revision after a minor gcc release -BINV = "4.9.1" +BINV = "4.9.2" FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-4.9:" @@ -67,15 +67,19 @@ SRC_URI = "\ file://0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch \ file://0050-Revert-Use-dbx_reg_number-for-spanning-registers.patch \ file://0051-eabispe.patch \ + file://0052-Add-target-hook-to-override-DWARF2-frame-register-si.patch \ file://0053-gcc-fix-segfault-from-calling-free-on-non-malloc-d-a.patch \ file://0054-gcc-Makefile.in-fix-parallel-building-failure.patch \ - file://0055-PR-rtl-optimization-61801.patch \ - file://0056-top-level-reorder_gcc-bug-61144.patch \ + file://0055-dwarf-reg-processing-helper.patch \ + file://0056-define-default-cfa-register-mapping.patch \ + file://0057-aarch64-config.patch \ file://0058-gcc-r212171.patch \ file://0059-gcc-PR-rtl-optimization-63348.patch \ + file://0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch \ + file://0061-target-gcc-includedir.patch \ " -SRC_URI[md5sum] = "fddf71348546af523353bd43d34919c1" -SRC_URI[sha256sum] = "d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e" +SRC_URI[md5sum] = "4df8ee253b7f3863ad0b86359cd39c43" +SRC_URI[sha256sum] = "2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd" S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" @@ -123,10 +127,8 @@ EXTRA_OECONF_INTERMEDIATE = "\ EXTRA_OECONF_append_libc-uclibc = " --disable-decimal-float " -EXTRA_OECONF_PATHS = "\ - --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++/${BINV} \ - --with-sysroot=${STAGING_DIR_TARGET} \ +EXTRA_OECONF_PATHS = "\ + --with-gxx-include-dir=/not/exist{target_includedir}/c++/${BINV} \ + --with-sysroot=/not/exist \ --with-build-sysroot=${STAGING_DIR_TARGET} \ " - - diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch b/meta/recipes-devtools/gcc/gcc-4.9/0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch index ba0a2278b7..37c46fc2e2 100644 --- a/meta/recipes-devtools/gcc/gcc-4.9/0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch +++ b/meta/recipes-devtools/gcc/gcc-4.9/0015-arm-Use-TARGET_ENDIAN_OPTION-for-determining-MULTILI.patch @@ -11,26 +11,34 @@ Upstream-Status: Pending gcc/config/arm/linux-elf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: gcc-4.9-20140316/gcc/config/arm/coff.h +Index: gcc-4.9.2/gcc/config/arm/coff.h =================================================================== ---- gcc-4.9-20140316.orig/gcc/config/arm/coff.h -+++ gcc-4.9-20140316/gcc/config/arm/coff.h -@@ -33,7 +33,7 @@ +--- gcc-4.9.2.orig/gcc/config/arm/coff.h ++++ gcc-4.9.2/gcc/config/arm/coff.h +@@ -32,8 +32,11 @@ + #define TARGET_DEFAULT (MASK_APCS_FRAME) #ifndef MULTILIB_DEFAULTS ++#ifndef TARGET_ENDIAN_OPTION ++#define TARGET_ENDIAN_OPTION "mlittle-endian" ++#endif #define MULTILIB_DEFAULTS \ - { "marm", "mlittle-endian", "mfloat-abi=soft", "mno-thumb-interwork" } + { "marm", TARGET_ENDIAN_OPTION, "mfloat-abi=soft", "mno-thumb-interwork" } #endif /* This is COFF, but prefer stabs. */ -Index: gcc-4.9-20140316/gcc/config/arm/elf.h +Index: gcc-4.9.2/gcc/config/arm/elf.h =================================================================== ---- gcc-4.9-20140316.orig/gcc/config/arm/elf.h -+++ gcc-4.9-20140316/gcc/config/arm/elf.h -@@ -112,7 +112,7 @@ +--- gcc-4.9.2.orig/gcc/config/arm/elf.h ++++ gcc-4.9.2/gcc/config/arm/elf.h +@@ -116,8 +116,11 @@ + #endif #ifndef MULTILIB_DEFAULTS ++#ifndef TARGET_ENDIAN_OPTION ++#define TARGET_ENDIAN_OPTION "mlittle-endian" ++#endif #define MULTILIB_DEFAULTS \ - { "marm", "mlittle-endian", "mfloat-abi=soft", "mno-thumb-interwork", "fno-leading-underscore" } + { "marm", TARGET_ENDIAN_OPTION, "mfloat-abi=soft", "mno-thumb-interwork", "fno-leading-underscore" } diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0052-Add-target-hook-to-override-DWARF2-frame-register-si.patch b/meta/recipes-devtools/gcc/gcc-4.9/0052-Add-target-hook-to-override-DWARF2-frame-register-si.patch new file mode 100644 index 0000000000..f6958b32c9 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0052-Add-target-hook-to-override-DWARF2-frame-register-si.patch @@ -0,0 +1,138 @@ +From d626297e87e19251a284ea1e9360e831b48999ca Mon Sep 17 00:00:00 2001 +From: mpf <mpf@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Thu, 4 Sep 2014 08:32:05 +0000 +Subject: [PATCH] Add target hook to override DWARF2 frame register size + +gcc/ + + * target.def (TARGET_DWARF_FRAME_REG_MODE): New target hook. + * targhooks.c (default_dwarf_frame_reg_mode): New function. + * targhooks.h (default_dwarf_frame_reg_mode): New prototype. + * doc/tm.texi.in (TARGET_DWARF_FRAME_REG_MODE): Document. + * doc/tm.texi: Regenerate. + * dwarf2cfi.c (expand_builtin_init_dwarf_reg_sizes): Abstract mode + selection logic to default_dwarf_frame_reg_mode. + + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@214898 138bc75d-0d04-0410-961f-82ee72b054a4 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Backport [gcc 5.0] + +--- + gcc/ChangeLog | 10 ++++++++++ + gcc/doc/tm.texi | 7 +++++++ + gcc/doc/tm.texi.in | 2 ++ + gcc/dwarf2cfi.c | 4 +--- + gcc/target.def | 11 +++++++++++ + gcc/targhooks.c | 13 +++++++++++++ + gcc/targhooks.h | 1 + + 7 files changed, 45 insertions(+), 3 deletions(-) + +Index: gcc-4.9.2/gcc/doc/tm.texi +=================================================================== +--- gcc-4.9.2.orig/gcc/doc/tm.texi ++++ gcc-4.9.2/gcc/doc/tm.texi +@@ -9017,6 +9017,13 @@ register in Dwarf. Otherwise, this hook + If not defined, the default is to return @code{NULL_RTX}. + @end deftypefn + ++@deftypefn {Target Hook} {enum machine_mode} TARGET_DWARF_FRAME_REG_MODE (int @var{regno}) ++Given a register, this hook should return the mode which the ++corresponding Dwarf frame register should have. This is normally ++used to return a smaller mode than the raw mode to prevent call ++clobbered parts of a register altering the frame register size ++@end deftypefn ++ + @deftypefn {Target Hook} void TARGET_INIT_DWARF_REG_SIZES_EXTRA (tree @var{address}) + If some registers are represented in Dwarf-2 unwind information in + multiple pieces, define this hook to fill in information about the +Index: gcc-4.9.2/gcc/doc/tm.texi.in +=================================================================== +--- gcc-4.9.2.orig/gcc/doc/tm.texi.in ++++ gcc-4.9.2/gcc/doc/tm.texi.in +@@ -6745,6 +6745,8 @@ the target supports DWARF 2 frame unwind + + @hook TARGET_DWARF_REGISTER_SPAN + ++@hook TARGET_DWARF_FRAME_REG_MODE ++ + @hook TARGET_INIT_DWARF_REG_SIZES_EXTRA + + @hook TARGET_ASM_TTYPE +Index: gcc-4.9.2/gcc/dwarf2cfi.c +=================================================================== +--- gcc-4.9.2.orig/gcc/dwarf2cfi.c ++++ gcc-4.9.2/gcc/dwarf2cfi.c +@@ -271,11 +271,9 @@ expand_builtin_init_dwarf_reg_sizes (tre + if (rnum < DWARF_FRAME_REGISTERS) + { + HOST_WIDE_INT offset = rnum * GET_MODE_SIZE (mode); +- enum machine_mode save_mode = reg_raw_mode[i]; + HOST_WIDE_INT size; ++ enum machine_mode save_mode = targetm.dwarf_frame_reg_mode (i); + +- if (HARD_REGNO_CALL_PART_CLOBBERED (i, save_mode)) +- save_mode = choose_hard_reg_mode (i, 1, true); + if (dnum == DWARF_FRAME_RETURN_COLUMN) + { + if (save_mode == VOIDmode) +Index: gcc-4.9.2/gcc/target.def +=================================================================== +--- gcc-4.9.2.orig/gcc/target.def ++++ gcc-4.9.2/gcc/target.def +@@ -3218,6 +3218,17 @@ If not defined, the default is to return + rtx, (rtx reg), + hook_rtx_rtx_null) + ++/* Given a register return the mode of the corresponding DWARF frame ++ register. */ ++DEFHOOK ++(dwarf_frame_reg_mode, ++ "Given a register, this hook should return the mode which the\n\ ++corresponding Dwarf frame register should have. This is normally\n\ ++used to return a smaller mode than the raw mode to prevent call\n\ ++clobbered parts of a register altering the frame register size", ++ enum machine_mode, (int regno), ++ default_dwarf_frame_reg_mode) ++ + /* If expand_builtin_init_dwarf_reg_sizes needs to fill in table + entries not corresponding directly to registers below + FIRST_PSEUDO_REGISTER, this hook should generate the necessary +Index: gcc-4.9.2/gcc/targhooks.c +=================================================================== +--- gcc-4.9.2.orig/gcc/targhooks.c ++++ gcc-4.9.2/gcc/targhooks.c +@@ -1438,6 +1438,19 @@ default_debug_unwind_info (void) + return UI_NONE; + } + ++/* Determine the correct mode for a Dwarf frame register that represents ++ register REGNO. */ ++ ++enum machine_mode ++default_dwarf_frame_reg_mode (int regno) ++{ ++ enum machine_mode save_mode = reg_raw_mode[regno]; ++ ++ if (HARD_REGNO_CALL_PART_CLOBBERED (regno, save_mode)) ++ save_mode = choose_hard_reg_mode (regno, 1, true); ++ return save_mode; ++} ++ + /* To be used by targets where reg_raw_mode doesn't return the right + mode for registers used in apply_builtin_return and apply_builtin_arg. */ + +Index: gcc-4.9.2/gcc/targhooks.h +=================================================================== +--- gcc-4.9.2.orig/gcc/targhooks.h ++++ gcc-4.9.2/gcc/targhooks.h +@@ -194,6 +194,7 @@ extern int default_label_align_max_skip + extern int default_jump_align_max_skip (rtx); + extern section * default_function_section(tree decl, enum node_frequency freq, + bool startup, bool exit); ++extern enum machine_mode default_dwarf_frame_reg_mode (int); + extern enum machine_mode default_get_reg_raw_mode (int); + + extern void *default_get_pch_validity (size_t *); diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0055-PR-rtl-optimization-61801.patch b/meta/recipes-devtools/gcc/gcc-4.9/0055-PR-rtl-optimization-61801.patch deleted file mode 100644 index b27abdef38..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.9/0055-PR-rtl-optimization-61801.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 556537c4ad0df4cbebb74197bb2bdea75cf5dd35 Mon Sep 17 00:00:00 2001 -From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Thu, 17 Jul 2014 07:48:49 +0000 -Subject: [PATCH] 2014-07-17 Richard Biener <rguenther@suse.de> - - PR rtl-optimization/61801 - * sched-deps.c (sched_analyze_2): For ASM_OPERANDS and - ASM_INPUT don't set reg_pending_barrier if it appears in a - debug-insn. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@212739 138bc75d-0d04-0410-961f-82ee72b054a4 - -Upstream-Status: Backport [https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61801] -Signed-off-by: Peter A. Bigot <pab@pabigot.com> - ---- - gcc/sched-deps.c | 3 ++- - -diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c -index efc4223..df29bd3 100644 ---- a/gcc/sched-deps.c -+++ b/gcc/sched-deps.c -@@ -2750,7 +2750,8 @@ sched_analyze_2 (struct deps_desc *deps, rtx x, rtx insn) - Consider for instance a volatile asm that changes the fpu rounding - mode. An insn should not be moved across this even if it only uses - pseudo-regs because it might give an incorrectly rounded result. */ -- if (code != ASM_OPERANDS || MEM_VOLATILE_P (x)) -+ if ((code != ASM_OPERANDS || MEM_VOLATILE_P (x)) -+ && !DEBUG_INSN_P (insn)) - reg_pending_barrier = TRUE_BARRIER; - - /* For all ASM_OPERANDS, we must traverse the vector of input operands. --- -1.8.5.5 - diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0055-dwarf-reg-processing-helper.patch b/meta/recipes-devtools/gcc/gcc-4.9/0055-dwarf-reg-processing-helper.patch new file mode 100644 index 0000000000..557dab0f31 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0055-dwarf-reg-processing-helper.patch @@ -0,0 +1,148 @@ +From 4fd39f1329379e00f958394adde6be96f0caf21f Mon Sep 17 00:00:00 2001 +From: hainque <hainque@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Fri, 5 Dec 2014 16:53:22 +0000 +Subject: [PATCH] 2014-12-05 Olivier Hainque <hainque@adacore.com> + + * dwarf2cfi.c (init_one_dwarf_reg_size): New helper, processing + one particular reg for expand_builtin_init_dwarf_reg_sizes. + (expand_builtin_init_dwarf_reg_sizes): Rework to use helper and + account for dwarf register spans. + + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218428 138bc75d-0d04-0410-961f-82ee72b054a4 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Backport [gcc 5.0] + +--- + gcc/ChangeLog | 7 +++++ + gcc/dwarf2cfi.c | 98 +++++++++++++++++++++++++++++++++++++++++++++------------ + 2 files changed, 85 insertions(+), 20 deletions(-) + +Index: gcc-4.9.2/gcc/dwarf2cfi.c +=================================================================== +--- gcc-4.9.2.orig/gcc/dwarf2cfi.c ++++ gcc-4.9.2/gcc/dwarf2cfi.c +@@ -252,7 +252,59 @@ init_return_column_size (enum machine_mo + gen_int_mode (size, mode)); + } + +-/* Generate code to initialize the register size table. */ ++/* Datastructure used by expand_builtin_init_dwarf_reg_sizes and ++ init_one_dwarf_reg_size to communicate on what has been done by the ++ latter. */ ++ ++typedef struct ++{ ++ /* Whether the dwarf return column was initialized. */ ++ bool wrote_return_column; ++ ++ /* For each hard register REGNO, whether init_one_dwarf_reg_size ++ was given REGNO to process already. */ ++ bool processed_regno [FIRST_PSEUDO_REGISTER]; ++ ++} init_one_dwarf_reg_state; ++ ++/* Helper for expand_builtin_init_dwarf_reg_sizes. Generate code to ++ initialize the dwarf register size table entry corresponding to register ++ REGNO in REGMODE. TABLE is the table base address, SLOTMODE is the mode to ++ use for the size entry to initialize, and INIT_STATE is the communication ++ datastructure conveying what we're doing to our caller. */ ++ ++static ++void init_one_dwarf_reg_size (int regno, machine_mode regmode, ++ rtx table, machine_mode slotmode, ++ init_one_dwarf_reg_state *init_state) ++{ ++ const unsigned int dnum = DWARF_FRAME_REGNUM (regno); ++ const unsigned int rnum = DWARF2_FRAME_REG_OUT (dnum, 1); ++ ++ const HOST_WIDE_INT slotoffset = rnum * GET_MODE_SIZE (slotmode); ++ const HOST_WIDE_INT regsize = GET_MODE_SIZE (regmode); ++ ++ init_state->processed_regno[regno] = true; ++ ++ if (rnum >= DWARF_FRAME_REGISTERS) ++ return; ++ ++ if (dnum == DWARF_FRAME_RETURN_COLUMN) ++ { ++ if (regmode == VOIDmode) ++ return; ++ init_state->wrote_return_column = true; ++ } ++ ++ if (slotoffset < 0) ++ return; ++ ++ emit_move_insn (adjust_address (table, slotmode, slotoffset), ++ gen_int_mode (regsize, slotmode)); ++} ++ ++/* Generate code to initialize the dwarf register size table located ++ at the provided ADDRESS. */ + + void + expand_builtin_init_dwarf_reg_sizes (tree address) +@@ -261,35 +313,40 @@ expand_builtin_init_dwarf_reg_sizes (tre + enum machine_mode mode = TYPE_MODE (char_type_node); + rtx addr = expand_normal (address); + rtx mem = gen_rtx_MEM (BLKmode, addr); +- bool wrote_return_column = false; ++ ++ init_one_dwarf_reg_state init_state; ++ ++ memset ((char *)&init_state, 0, sizeof (init_state)); + + for (i = 0; i < FIRST_PSEUDO_REGISTER; i++) + { +- unsigned int dnum = DWARF_FRAME_REGNUM (i); +- unsigned int rnum = DWARF2_FRAME_REG_OUT (dnum, 1); +- +- if (rnum < DWARF_FRAME_REGISTERS) +- { +- HOST_WIDE_INT offset = rnum * GET_MODE_SIZE (mode); +- HOST_WIDE_INT size; +- enum machine_mode save_mode = targetm.dwarf_frame_reg_mode (i); ++ machine_mode save_mode; ++ rtx span; + +- if (dnum == DWARF_FRAME_RETURN_COLUMN) ++ /* No point in processing a register multiple times. This could happen ++ with register spans, e.g. when a reg is first processed as a piece of ++ a span, then as a register on its own later on. */ ++ ++ if (init_state.processed_regno[i]) ++ continue; ++ ++ save_mode = targetm.dwarf_frame_reg_mode (i); ++ span = targetm.dwarf_register_span (gen_rtx_REG (save_mode, i)); ++ if (!span) ++ init_one_dwarf_reg_size (i, save_mode, mem, mode, &init_state); ++ else ++ { ++ for (int si = 0; si < XVECLEN (span, 0); si++) + { +- if (save_mode == VOIDmode) +- continue; +- wrote_return_column = true; +- } +- size = GET_MODE_SIZE (save_mode); +- if (offset < 0) +- continue; ++ rtx reg = XVECEXP (span, 0, si); ++ init_one_dwarf_reg_size ++ (REGNO (reg), GET_MODE (reg), mem, mode, &init_state); ++ } + +- emit_move_insn (adjust_address (mem, mode, offset), +- gen_int_mode (size, mode)); + } + } + +- if (!wrote_return_column) ++ if (!init_state.wrote_return_column) + init_return_column_size (mode, mem, DWARF_FRAME_RETURN_COLUMN); + + #ifdef DWARF_ALT_FRAME_RETURN_COLUMN diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0056-define-default-cfa-register-mapping.patch b/meta/recipes-devtools/gcc/gcc-4.9/0056-define-default-cfa-register-mapping.patch new file mode 100644 index 0000000000..3b6c94c492 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0056-define-default-cfa-register-mapping.patch @@ -0,0 +1,75 @@ +From c0235a33de8c4f78cce35b2a8c2035c83fe1bd14 Mon Sep 17 00:00:00 2001 +From: hainque <hainque@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Fri, 5 Dec 2014 17:01:42 +0000 +Subject: [PATCH] 2014-12-05 Olivier Hainque <hainque@adacore.com> + + gcc/ + * defaults.h: (DWARF_REG_TO_UNWIND_COLUMN): Define default. + * dwarf2cfi.c (init_one_dwarf_reg_size): Honor + DWARF_REG_TO_UNWIND_COLUMN. + + libgcc/ + * unwind-dw2.c (DWARF_REG_TO_UNWIND_COLUMN): Remove default def, + now provided by defaults.h. + + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218429 138bc75d-0d04-0410-961f-82ee72b054a4 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Backport [gcc 5.0] + +--- + gcc/ChangeLog | 6 ++++++ + gcc/defaults.h | 5 +++++ + gcc/dwarf2cfi.c | 3 ++- + libgcc/ChangeLog | 5 +++++ + libgcc/unwind-dw2.c | 4 ---- + 5 files changed, 18 insertions(+), 5 deletions(-) + +Index: gcc-4.9.2/gcc/defaults.h +=================================================================== +--- gcc-4.9.2.orig/gcc/defaults.h ++++ gcc-4.9.2/gcc/defaults.h +@@ -438,6 +438,11 @@ see the files COPYING3 and COPYING.RUNTI + #define DWARF_FRAME_REGNUM(REG) DBX_REGISTER_NUMBER (REG) + #endif + ++/* The mapping from dwarf CFA reg number to internal dwarf reg numbers. */ ++#ifndef DWARF_REG_TO_UNWIND_COLUMN ++#define DWARF_REG_TO_UNWIND_COLUMN(REGNO) (REGNO) ++#endif ++ + /* Map register numbers held in the call frame info that gcc has + collected using DWARF_FRAME_REGNUM to those that should be output in + .debug_frame and .eh_frame. */ +Index: gcc-4.9.2/gcc/dwarf2cfi.c +=================================================================== +--- gcc-4.9.2.orig/gcc/dwarf2cfi.c ++++ gcc-4.9.2/gcc/dwarf2cfi.c +@@ -280,8 +280,9 @@ void init_one_dwarf_reg_size (int regno, + { + const unsigned int dnum = DWARF_FRAME_REGNUM (regno); + const unsigned int rnum = DWARF2_FRAME_REG_OUT (dnum, 1); ++ const unsigned int dcol = DWARF_REG_TO_UNWIND_COLUMN (rnum); + +- const HOST_WIDE_INT slotoffset = rnum * GET_MODE_SIZE (slotmode); ++ const HOST_WIDE_INT slotoffset = dcol * GET_MODE_SIZE (slotmode); + const HOST_WIDE_INT regsize = GET_MODE_SIZE (regmode); + + init_state->processed_regno[regno] = true; +Index: gcc-4.9.2/libgcc/unwind-dw2.c +=================================================================== +--- gcc-4.9.2.orig/libgcc/unwind-dw2.c ++++ gcc-4.9.2/libgcc/unwind-dw2.c +@@ -55,10 +55,6 @@ + #define PRE_GCC3_DWARF_FRAME_REGISTERS DWARF_FRAME_REGISTERS + #endif + +-#ifndef DWARF_REG_TO_UNWIND_COLUMN +-#define DWARF_REG_TO_UNWIND_COLUMN(REGNO) (REGNO) +-#endif +- + /* ??? For the public function interfaces, we tend to gcc_assert that the + column numbers are in range. For the dwarf2 unwind info this does happen, + although so far in a case that doesn't actually matter. diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0056-top-level-reorder_gcc-bug-61144.patch b/meta/recipes-devtools/gcc/gcc-4.9/0056-top-level-reorder_gcc-bug-61144.patch deleted file mode 100644 index f44893251c..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.9/0056-top-level-reorder_gcc-bug-61144.patch +++ /dev/null @@ -1,31 +0,0 @@ - -Upstream-Status: Backport - -Originally-submitted-by: Peter Urbanec <openembedded-devel@urbanec.net> -Signed-off-by: Saul Wold <sgw@linux.intel.com> - ---- /dev/null -+++ b/meta/recipes-devtools/gcc/gcc-4.9/0056-top-level-reorder_gcc-bug-61144.patch -@@ -0,0 +1,21 @@ -+--- a/gcc/varpool.c 2014/10/05 02:50:01 215895 -++++ b/gcc/varpool.c 2014/10/05 04:52:19 215896 -+@@ -329,8 +329,16 @@ -+ -+ /* Variables declared 'const' without an initializer -+ have zero as the initializer if they may not be -+- overridden at link or run time. */ -+- if (!DECL_INITIAL (real_decl) -++ overridden at link or run time. -++ -++ It is actually requirement for C++ compiler to optimize const variables -++ consistently. As a GNU extension, do not enfore this rule for user defined -++ weak variables, so we support interposition on: -++ static const int dummy = 0; -++ extern const int foo __attribute__((__weak__, __alias__("dummy"))); -++ */ -++ if ((!DECL_INITIAL (real_decl) -++ || (DECL_WEAK (decl) && !DECL_COMDAT (decl))) -+ && (DECL_EXTERNAL (decl) || decl_replaceable_p (decl))) -+ return error_mark_node; -+ - diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0057-aarch64-config.patch b/meta/recipes-devtools/gcc/gcc-4.9/0057-aarch64-config.patch new file mode 100644 index 0000000000..f29559698a --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0057-aarch64-config.patch @@ -0,0 +1,32 @@ +Disable the MULTILIB_OSDIRNAMES and other multilib options. + +Hard coding the MULTILIB_OSDIRNAMES with ../lib64 is causing problems on +systems where the libdir is NOT set to /lib64. This is allowed by the ABI, as +long as the dynamic loader is present in /lib. + +We simply want to use the default rules in gcc to find and configure the +normal libdir. + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +Index: gcc-4.9.1/gcc/config/aarch64/t-aarch64-linux +=================================================================== +--- gcc-4.9.1.orig/gcc/config/aarch64/t-aarch64-linux ++++ gcc-4.9.1/gcc/config/aarch64/t-aarch64-linux +@@ -21,11 +21,11 @@ + LIB1ASMSRC = aarch64/lib1funcs.asm + LIB1ASMFUNCS = _aarch64_sync_cache_range + +-AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be) +-MULTILIB_OSDIRNAMES = .=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu) +-MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) ++#AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be) ++#MULTILIB_OSDIRNAMES = .=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu) ++#MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) + + # Disable the multilib for linux-gnu targets for the time being; focus + # on the baremetal targets. +-MULTILIB_OPTIONS = +-MULTILIB_DIRNAMES = ++#MULTILIB_OPTIONS = ++#MULTILIB_DIRNAMES = diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0058-gcc-r212171.patch b/meta/recipes-devtools/gcc/gcc-4.9/0058-gcc-r212171.patch index 8a205b750b..4b312d4fa9 100644 --- a/meta/recipes-devtools/gcc/gcc-4.9/0058-gcc-r212171.patch +++ b/meta/recipes-devtools/gcc/gcc-4.9/0058-gcc-r212171.patch @@ -5,8 +5,8 @@ Subject: [PATCH] r212171 * except.c (emit_note_eh_region_end): New helper function. (convert_to_eh_region_ranges): Use - emit_note_eh_region_end to emit EH_REGION_END note. - * jump.c (cleanup_barriers): Do not split a call and its + emit_note_eh_region_end to emit EH_REGION_END note. + * jump.c (cleanup_barriers): Do not split a call and its corresponding CALL_ARG_LOCATION note. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212171 138bc75d-0d04-0410-961f-82ee72b054a4 @@ -25,7 +25,7 @@ index dc5c1d2..7ac114f 100644 @@ -2466,6 +2466,20 @@ add_call_site (rtx landing_pad, int action, int section) return call_site_base + crtl->eh.call_site_record_v[section]->length () - 1; } - + +static rtx +emit_note_eh_region_end (rtx insn) +{ @@ -44,35 +44,35 @@ index dc5c1d2..7ac114f 100644 The new note numbers will not refer to region numbers, but instead to call site entries. */ @@ -2544,8 +2558,8 @@ convert_to_eh_region_ranges (void) - note = emit_note_before (NOTE_INSN_EH_REGION_BEG, - first_no_action_insn_before_switch); - NOTE_EH_HANDLER (note) = call_site; + note = emit_note_before (NOTE_INSN_EH_REGION_BEG, + first_no_action_insn_before_switch); + NOTE_EH_HANDLER (note) = call_site; - note = emit_note_after (NOTE_INSN_EH_REGION_END, - last_no_action_insn_before_switch); + note + = emit_note_eh_region_end (last_no_action_insn_before_switch); - NOTE_EH_HANDLER (note) = call_site; - gcc_assert (last_action != -3 - || (last_action_insn + NOTE_EH_HANDLER (note) = call_site; + gcc_assert (last_action != -3 + || (last_action_insn @@ -2569,8 +2583,7 @@ convert_to_eh_region_ranges (void) - first_no_action_insn = NULL_RTX; - } - + first_no_action_insn = NULL_RTX; + } + - note = emit_note_after (NOTE_INSN_EH_REGION_END, - last_action_insn); + note = emit_note_eh_region_end (last_action_insn); - NOTE_EH_HANDLER (note) = call_site; - } - + NOTE_EH_HANDLER (note) = call_site; + } + @@ -2617,7 +2630,7 @@ convert_to_eh_region_ranges (void) - + if (last_action >= -1 && ! first_no_action_insn) { - note = emit_note_after (NOTE_INSN_EH_REGION_END, last_action_insn); + note = emit_note_eh_region_end (last_action_insn); NOTE_EH_HANDLER (note) = call_site; } - + diff --git a/gcc/jump.c b/gcc/jump.c index 9418f65..a5e5f52 100644 --- a/gcc/jump.c @@ -88,11 +88,11 @@ index 9418f65..a5e5f52 100644 { - next = NEXT_INSN (insn); if (BARRIER_P (insn)) - { + { - prev = prev_nonnote_insn (insn); + rtx prev = prev_nonnote_insn (insn); - if (!prev) - continue; + if (!prev) + continue; + + if (CALL_P (prev)) + { @@ -105,8 +105,9 @@ index 9418f65..a5e5f52 100644 + prev = next; + } + - if (BARRIER_P (prev)) - delete_insn (insn); - else if (prev != PREV_INSN (insn)) --- + if (BARRIER_P (prev)) + delete_insn (insn); + else if (prev != PREV_INSN (insn)) +-- 1.7.9.5 + diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0059-gcc-PR-rtl-optimization-63348.patch b/meta/recipes-devtools/gcc/gcc-4.9/0059-gcc-PR-rtl-optimization-63348.patch index 77f6be33d1..6d24aa4572 100644 --- a/meta/recipes-devtools/gcc/gcc-4.9/0059-gcc-PR-rtl-optimization-63348.patch +++ b/meta/recipes-devtools/gcc/gcc-4.9/0059-gcc-PR-rtl-optimization-63348.patch @@ -2,7 +2,7 @@ From 6eae3e637fcc22d21b51d44d61e3a9cb4825e776 Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Thu, 30 Oct 2014 20:37:14 -0700 Subject: [PATCH]PR rtl-optimization/63348 - + PR rtl-optimization/63348 * emit-rtl.c (try_split): Do not emit extra barrier. @@ -31,9 +31,9 @@ index 4736f8d..ae69dbd 100644 int probability; rtx insn_last, insn; @@ -3441,14 +3440,6 @@ try_split (rtx pat, rtx trial, int last) - + split_branch_probability = -1; - + - /* If we are splitting a JUMP_INSN, it might be followed by a BARRIER. - We may need to handle this specially. */ - if (after && BARRIER_P (after)) @@ -44,15 +44,16 @@ index 4736f8d..ae69dbd 100644 - if (!seq) return trial; - + @@ -3594,8 +3585,6 @@ try_split (rtx pat, rtx trial, int last) tem = emit_insn_after_setloc (seq, trial, INSN_LOCATION (trial)); - + delete_insn (trial); - if (has_barrier) - emit_barrier_after (tem); - + /* Recursively call try_split for each new insn created; by the time control returns here that insn will be fully split, so --- +-- 1.7.1 + diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch b/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch new file mode 100644 index 0000000000..75a9fdd441 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch @@ -0,0 +1,55 @@ +From 5c0092070253113cf0d9c45eacc884b3ecc34d81 Mon Sep 17 00:00:00 2001 +From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Sat, 25 Oct 2014 00:23:17 +0000 +Subject: [PATCH] Only allow e500 double in SPE_SIMD_REGNO_P registers. + +rs6000_hard_regno_nregs_internal allows SPE vectors in single +registers satisfying SPE_SIMD_REGNO_P (i.e. register numbers 0 to +31). However, the corresponding test for e500 double treats all +registers as being able to store a 64-bit value, rather than just +those GPRs. + +Logically this inconsistency is wrong; in addition, it causes problems +unwinding from signal handlers. linux-unwind.h uses +ARG_POINTER_REGNUM as a place to store the return address from a +signal handler, but this logic in rs6000_hard_regno_nregs_internal +results in that being considered an 8-byte register, resulting in +assertion failures. +(<https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02625.html> first +needs to be applied for unwinding to work in general on e500.) This +patch makes rs6000_hard_regno_nregs_internal handle the e500 double +case consistently with SPE vectors. + +Tested with no regressions with cross to powerpc-linux-gnuspe (given +the aforementioned patch applied). Failures of signal handling +unwinding tests such as gcc.dg/cleanup-{8,9,10,11}.c are fixed by this +patch. + + * config/rs6000/rs6000.c (rs6000_hard_regno_nregs_internal): Do + not allow e500 double in registers not satisyfing + SPE_SIMD_REGNO_P. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@216688 138bc75d-0d04-0410-961f-82ee72b054a4 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Backport [gcc 5.0] + +--- + gcc/ChangeLog | 6 ++++++ + gcc/config/rs6000/rs6000.c | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +Index: gcc-4.9.2/gcc/config/rs6000/rs6000.c +=================================================================== +--- gcc-4.9.2.orig/gcc/config/rs6000/rs6000.c ++++ gcc-4.9.2/gcc/config/rs6000/rs6000.c +@@ -1703,7 +1703,7 @@ rs6000_hard_regno_nregs_internal (int re + SCmode so as to pass the value correctly in a pair of + registers. */ + else if (TARGET_E500_DOUBLE && FLOAT_MODE_P (mode) && mode != SCmode +- && !DECIMAL_FLOAT_MODE_P (mode)) ++ && !DECIMAL_FLOAT_MODE_P (mode) && SPE_SIMD_REGNO_P (regno)) + reg_size = UNITS_PER_FP_WORD; + + else diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0061-target-gcc-includedir.patch b/meta/recipes-devtools/gcc/gcc-4.9/0061-target-gcc-includedir.patch new file mode 100644 index 0000000000..f48c66dcac --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0061-target-gcc-includedir.patch @@ -0,0 +1,81 @@ +Ensure target gcc headers can be included + +There are a few headers installed as part of the OpenEmbedded +gcc-runtime target (omp.h, ssp/*.h). Being installed from a recipe +built for the target architecture, these are within the target +sysroot and not cross/nativesdk; thus they weren't able to be +found by gcc with the existing search paths. Add support for +picking up these headers under the sysroot supplied on the gcc +command line in order to resolve this. + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> + +Upstream-Status: Pending + +--- a/gcc/Makefile.in 2014-12-23 11:57:33.327873331 +0000 ++++ b/gcc/Makefile.in 2015-01-21 11:32:35.447305394 +0000 +@@ -587,6 +587,7 @@ + + # Directory in which the compiler finds libraries etc. + libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(version) ++libsubdir_target = gcc/$(target_noncanonical)/$(version) + # Directory in which the compiler finds executables + libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(version) + # Directory in which all plugin resources are installed +@@ -2534,6 +2535,7 @@ + + PREPROCESSOR_DEFINES = \ + -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ ++ -DGCC_INCLUDE_SUBDIR_TARGET=\"$(libsubdir_target)/include\" \ + -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \ + -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ + -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ +--- a/gcc/cppdefault.c 2015-01-13 17:40:26.131012725 +0000 ++++ b/gcc/cppdefault.c 2015-01-21 11:30:08.928426492 +0000 +@@ -59,6 +59,10 @@ + /* This is the dir for gcc's private headers. */ + { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, + #endif ++#ifdef GCC_INCLUDE_SUBDIR_TARGET ++ /* This is the dir for gcc's private headers under the specified sysroot. */ ++ { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0 }, ++#endif + #ifdef LOCAL_INCLUDE_DIR + /* /usr/local/include comes before the fixincluded header files. */ + { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, +diff --git a/gcc/defaults.h b/gcc/defaults.h +index f94ae17..d98b40b 100644 +--- a/gcc/defaults.h ++++ b/gcc/defaults.h +@@ -1390,4 +1390,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + + #endif /* GCC_INSN_FLAGS_H */ + ++/* Default prefixes to attach to command names. */ ++ ++#ifndef STANDARD_STARTFILE_PREFIX_1 ++#define STANDARD_STARTFILE_PREFIX_1 "/lib/" ++#endif ++#ifndef STANDARD_STARTFILE_PREFIX_2 ++#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" ++#endif ++ + #endif /* ! GCC_DEFAULTS_H */ +diff --git a/gcc/gcc.c b/gcc/gcc.c +index 9f0b781..174fca8 100644 +--- a/gcc/gcc.c ++++ b/gcc/gcc.c +@@ -1189,13 +1189,6 @@ static const char *gcc_libexec_prefix; + + /* Default prefixes to attach to command names. */ + +-#ifndef STANDARD_STARTFILE_PREFIX_1 +-#define STANDARD_STARTFILE_PREFIX_1 "/lib/" +-#endif +-#ifndef STANDARD_STARTFILE_PREFIX_2 +-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" +-#endif +- + #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ + #undef MD_EXEC_PREFIX + #undef MD_STARTFILE_PREFIX diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index 9d41f651ed..04c701a974 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc @@ -79,19 +79,6 @@ ${GNU_MIRROR}/gcc http://mirrors.rcn.net/pub/sourceware/gcc/releases/ \n \ ${GNU_MIRROR}/gcc http://gcc.get-software.com/releases/ \n \ ${GNU_MIRROR}/gcc http://gcc.get-software.com/releases/ \n \ " - -python do_preconfigure () { - import subprocess - cmd = d.expand('PATH=${PATH} cd ${S} && gnu-configize') - subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) - # See 0044-gengtypes.patch, we need to regenerate this file - bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.c")) - cmd = d.expand("sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure") - subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) -} -addtask do_preconfigure after do_patch before do_configure -do_preconfigure[depends] += "gnu-config-native:do_populate_sysroot autoconf-native:do_populate_sysroot" - # # Set some default values # @@ -101,48 +88,12 @@ BINV = "${PV}" S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" -# SS means Shared Stamps directory -SS = "${TMPDIR}/stamps/work-shared/gcc-${PV}-${PR}" -do_fetch[stamp-base] = "${SS}" -do_unpack[stamp-base] = "${SS}" -do_patch[stamp-base] = "${SS}" -do_preconfigure[stamp-base] = "${SS}" -SSCLEAN = "${TMPDIR}/stamps/work-shared/gcc-[0-9]*-*" -do_fetch[stamp-base-clean] = "${SSCLEAN}" -do_unpack[stamp-base-clean] = "${SSCLEAN}" -do_unpack[umask] = "022" -do_patch[stamp-base-clean] = "${SSCLEAN}" -do_preconfigure[stamp-base-clean] = "${SSCLEAN}" - -# SW means Shared Work directory -SW = "${TMPDIR}/work-shared/gcc-${PV}-${PR}" -SSTATE_SWSPEC = "sstate:gcc::${PV}:${PR}::${SSTATE_VERSION}:" -WORKDIR_task-unpack = "${SW}" -WORKDIR_task-patch = "${SW}" -WORKDIR_task-preconfigure = "${SW}" - target_includedir ?= "${includedir}" target_libdir ?= "${libdir}" target_base_libdir ?= "${base_libdir}" target_prefix ?= "${prefix}" -CLEANFUNCS += "workshared_clean" -# The do_clean should be exclusive since share ${S} -do_clean[lockfiles] = "${SW}.clean.lock" - -python workshared_clean () { - """clear the source directory""" - dir = d.expand("${SW}") - bb.note("Removing " + dir) - oe.path.remove(dir) - - """clear the the stamps in work-shared""" - dir = "%s.*" % bb.data.expand(d.getVarFlag('do_fetch', 'stamp-base', True), d) - bb.note("Removing " + dir) - oe.path.remove(dir) -} - -# We need to ensure that for the shared work directory, the do_patch singatures match +# We need to ensure that for the shared work directory, the do_patch signatures match # The real WORKDIR location isn't a dependency for the shared workdir. src_patches[vardepsexclude] = "WORKDIR" should_apply[vardepsexclude] += "PN" diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc index f33678c75a..6c60cf97f6 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc @@ -1,4 +1,5 @@ require gcc-multilib-config.inc +require gcc-shared-source.inc # # Build the list of lanaguages to build. # @@ -51,7 +52,6 @@ EXTRA_OECONF = "\ ${@get_gcc_multiarch_setting(bb, d)} \ " -export ac_cv_path_SED = 'sed' export gcc_cv_collect2_libs = 'none required' # We need to set gcc_cv_collect2_libs else there is cross-compilation badness # in the config.log files (which might not get generated until do_compile @@ -63,6 +63,8 @@ EXTRA_OECONF_append_libc-uclibc = " --enable-__cxa_atexit" EXTRA_OECONF_append_mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" EXTRA_OECONF_append_mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" +EXTRA_OECONF_append_mips64n32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" +EXTRA_OECONF_append_mips64eln32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" # ARMv6+ adds atomic instructions that affect the ABI in libraries built # with TUNE_CCARGS in gcc-runtime. Make the compiler default to a diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index ba001a9118..750a4f2113 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc @@ -10,9 +10,9 @@ GCCMULTILIB = "--enable-multilib" require gcc-configure-common.inc EXTRA_OECONF_PATHS = "\ - --with-gxx-include-dir=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}${target_includedir}/c++/${BINV} \ + --with-gxx-include-dir=/not/exist${target_includedir}/c++/${BINV} \ --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \ - --with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \ + --with-sysroot=/not/exist \ --with-build-sysroot=${STAGING_DIR_TARGET} \ " # We have to point gcc at a sysroot but we don't need to rebuild if this changes @@ -62,12 +62,10 @@ do_compile () { oe_runmake all-host configure-target-libgcc } -INHIBIT_PACKAGE_STRIP = "1" - # Having anything auto depending on gcc-cross-sdk is a really bad idea... EXCLUDE_FROM_SHLIBS = "1" -PACKAGES = "${PN} ${PN}-doc" +PACKAGES = "${PN}-dbg ${PN} ${PN}-doc" FILES_${PN} = "\ ${exec_prefix}/bin/* \ @@ -86,6 +84,11 @@ FILES_${PN} = "\ " INSANE_SKIP_${PN} += "dev-so" +FILES_${PN}-dbg += " \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/.debug \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/.debug \ +" + FILES_${PN}-doc = "\ ${infodir} \ ${mandir} \ diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc index 6e2f25b562..7197447080 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc @@ -21,7 +21,7 @@ EXTRA_OECONF = "\ --enable-languages=c \ ${OPTSPACE} \ --program-prefix=${TARGET_PREFIX} \ - --with-sysroot=${STAGING_DIR_TARGET} \ + --with-sysroot=/not/exist \ --with-build-sysroot=${GCCCROSS_BUILDSYSROOT} \ ${EXTRA_OECONF_INITIAL} \ ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \ diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index 4cae160e78..97929501e8 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc @@ -25,8 +25,8 @@ EXTRA_OECONF += "\ " EXTRA_OECONF_PATHS = "\ - --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++/${BINV} \ - --with-sysroot=${STAGING_DIR_TARGET} \ + --with-gxx-include-dir=/not/exist${target_includedir}/c++/${BINV} \ + --with-sysroot=/not/exist \ --with-build-sysroot=${STAGING_DIR_TARGET} \ " diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc index 167869e1f2..09757e6ccc 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime.inc +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc @@ -4,7 +4,7 @@ CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}" EXTRA_OECONF_PATHS = "\ --with-gxx-include-dir=${includedir}/c++/${BINV} \ - --with-sysroot=${STAGING_DIR_TARGET} \ + --with-sysroot=/not/exist \ --with-build-sysroot=${STAGING_DIR_TARGET} \ " @@ -76,9 +76,6 @@ PACKAGES = "\ libssp \ libssp-dev \ libssp-staticdev \ - libgfortran \ - libgfortran-dev \ - libgfortran-staticdev \ libmudflap \ libmudflap-dev \ libmudflap-staticdev \ @@ -92,6 +89,37 @@ PACKAGES = "\ libatomic-dev \ libatomic-staticdev \ " + +# Most libraries are licensed with the exception, but +# one library is really GPLv3. +# +LICENSE_${PN}-dbg = "GPL-3.0-with-GCC-exception & GPLv3" +LICENSE_libstdc++ = "GPL-3.0-with-GCC-exception" +LICENSE_libstdc++-precompile-dev = "GPL-3.0-with-GCC-exception" +LICENSE_libstdc++-dev = "GPL-3.0-with-GCC-exception" +LICENSE_libstdc++-staticdev = "GPL-3.0-with-GCC-exception" +LICENSE_libg2c = "GPL-3.0-with-GCC-exception" +LICENSE_libg2c-dev = "GPL-3.0-with-GCC-exception" +LICENSE_libssp = "GPL-3.0-with-GCC-exception" +LICENSE_libssp-dev = "GPL-3.0-with-GCC-exception" +LICENSE_libssp-staticdev = "GPL-3.0-with-GCC-exception" +LICENSE_libgfortran = "GPL-3.0-with-GCC-exception" +LICENSE_libgfortran-dev = "GPL-3.0-with-GCC-exception" +LICENSE_libgfortran-staticdev = "GPL-3.0-with-GCC-exception" +LICENSE_libmudflap = "GPL-3.0-with-GCC-exception" +LICENSE_libmudflap-dev = "GPL-3.0-with-GCC-exception" +LICENSE_libmudflap-staticdev = "GPL-3.0-with-GCC-exception" +LICENSE_libquadmath = "GPL-3.0-with-GCC-exception" +LICENSE_libquadmath-dev = "GPL-3.0-with-GCC-exception" +LICENSE_libquadmath-staticdev = "GPL-3.0-with-GCC-exception" +LICENSE_libatomic = "GPL-3.0-with-GCC-exception" +LICENSE_libatomic-dev = "GPL-3.0-with-GCC-exception" +LICENSE_libatomic-staticdev = "GPL-3.0-with-GCC-exception" + +LICENSE_libgomp = "GPLv3" +LICENSE_libgomp-dev = "GPLv3" +LICENSE_libgomp-staticdev = "GPLv3" + # The base package doesn't exist, so we clear the recommends. RRECOMMENDS_${PN}-dbg = "" @@ -131,18 +159,6 @@ FILES_libssp-dev = "\ " FILES_libssp-staticdev = "${libdir}/libssp*.a" -FILES_libgfortran = "${libdir}/libgfortran.so.*" -FILES_libgfortran-dev = "\ - ${libdir}/libgfortran*.so \ - ${libdir}/libgfortran.spec \ - ${libdir}/libgfortran.la \ - ${libdir}/gcc/${TARGET_SYS}/${BINV}/libgfortranbegin.* \ - ${libdir}/gcc/${TARGET_SYS}/${BINV}/libcaf_single* \ -" -FILES_libgfortran-staticdev = "${libdir}/libgfortran.a" - -INSANE_SKIP_${MLPREFIX}libgfortran-dev = "staticdev" - FILES_libquadmath = "${libdir}/libquadmath*.so.*" FILES_libquadmath-dev = "\ ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/quadmath* \ diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers.inc b/meta/recipes-devtools/gcc/gcc-sanitizers.inc new file mode 100644 index 0000000000..c987ccb589 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-sanitizers.inc @@ -0,0 +1,119 @@ +require gcc-configure-common.inc + +LICENSE = "NCSA | MIT" + +LIC_FILES_CHKSUM = "\ + file://libsanitizer/LICENSE.TXT;md5=0249c37748936faf5b1efd5789587909 \ +" + +EXTRA_OECONF_PATHS = "\ + --with-sysroot=/not/exist \ + --with-build-sysroot=${STAGING_DIR_TARGET} \ +" + +do_configure () { + mtarget=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` + target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` + if [ -d ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget ]; then + hardlinkdir ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget ${B} + fi + + echo "Configuring libsanitizer" + rm -rf ${B}/$target/libsanitizer/ + mkdir -p ${B}/$target/libsanitizer/ + # This is kind of gross, but it's an easy way to make configure happy + # without hacking it up to use the system stdc++ instead of the one it + # expects to be newly built. + rm -rf ${B}/$target/libstdc++-v3/ + mkdir -p ${B}/$target/libstdc++-v3/src/ + ln -s ${STAGING_LIBDIR}/libstdc++.la ${B}/$target/libstdc++-v3/src/ + ln -s ${STAGING_LIBDIR}/libstdc++.so ${B}/$target/libstdc++-v3/src/ + cd ${B}/$target/libsanitizer/ + chmod a+x ${S}/libsanitizer/configure + ${S}/libsanitizer/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} + # Easiest way to stop bad RPATHs getting into the library since we have a + # broken libtool here + sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${B}/$target/libsanitizer/libtool +} + +do_compile () { + target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` + cd ${B}/$target/libsanitizer/ + oe_runmake MULTIBUILDTOP=${B}/$target/libsanitizer/ +} + +do_install () { + target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` + cd ${B}/$target/libsanitizer/ + oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/libsanitizer/ install + if [ -d ${D}${infodir} ]; then + rmdir --ignore-fail-on-non-empty -p ${D}${infodir} + fi + chown -R root:root ${D} +} + +INHIBIT_DEFAULT_DEPS = "1" +ALLOW_EMPTY_${PN} = "1" +DEPENDS = "gcc-runtime" + +BBCLASSEXTEND = "nativesdk" + +PACKAGES = "${PN}" +PACKAGES += "libasan libubsan liblsan libtsan" +PACKAGES += "libasan-dev libubsan-dev liblsan-dev libtsan-dev" +PACKAGES += "libasan-dbg libubsan-dbg liblsan-dbg libtsan-dbg" +PACKAGES += "libasan-staticdev libubsan-staticdev liblsan-staticdev libtsan-staticdev" + +RDEPENDS_libasan += "libstdc++" +RDEPENDS_libubsan += "libstdc++" +RDEPENDS_liblsan += "libstdc++" +RDEPENDS_libtsan += "libstdc++" +RDEPENDS_libasan-dev += "${PN}" +RDEPENDS_libubsan-dev += "${PN}" +RDEPENDS_liblsan-dev += "${PN}" +RDEPENDS_libtsan-dev += "${PN}" +RRECOMMENDS_${PN} += "libasan libubsan" +RRECOMMENDS_${PN}_append_x86-64 = " liblsan libtsan" +RRECOMMENDS_${PN}_append_x86 = " liblsan" + +do_package_write_ipk[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata" +do_package_write_deb[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata" +do_package_write_rpm[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata" + +# MIPS, aarch64, and SPARC are broken. +COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm).*-linux' + +FILES_libasan += "${libdir}/libasan.so.*" +FILES_libasan-dbg += "${libdir}/.debug/libasan.so.*" +FILES_libasan-dev += "\ + ${libdir}/libasan_preinit.o \ + ${libdir}/libasan.so \ + ${libdir}/libasan.la \ +" +FILES_libasan-staticdev += "${libdir}/libasan.a" + +FILES_libubsan += "${libdir}/libubsan.so.*" +FILES_libubsan-dbg += "${libdir}/.debug/libubsan.so.*" +FILES_libubsan-dev += "\ + ${libdir}/libubsan.so \ + ${libdir}/libubsan.la \ +" +FILES_libubsan-staticdev += "${libdir}/libubsan.a" + +FILES_liblsan += "${libdir}/liblsan.so.*" +FILES_liblsan-dbg += "${libdir}/.debug/liblsan.so.*" +FILES_liblsan-dev += "\ + ${libdir}/liblsan.so \ + ${libdir}/liblsan.la \ +" +FILES_liblsan-staticdev += "${libdir}/liblsan.a" + +FILES_libtsan += "${libdir}/libtsan.so.*" +FILES_libtsan-dbg += "${libdir}/.debug/libtsan.so.*" +FILES_libtsan-dev += "\ + ${libdir}/libtsan.so \ + ${libdir}/libtsan.la \ +" +FILES_libtsan-staticdev += "${libdir}/libtsan.a" + +FILES_${PN} = "${libdir}/*.spec ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/sanitizer/*.h" diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers_4.8.bb b/meta/recipes-devtools/gcc/gcc-sanitizers_4.8.bb new file mode 100644 index 0000000000..601f666023 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-sanitizers_4.8.bb @@ -0,0 +1,2 @@ +require recipes-devtools/gcc/gcc-${PV}.inc +require gcc-sanitizers.inc diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers_4.9.bb b/meta/recipes-devtools/gcc/gcc-sanitizers_4.9.bb new file mode 100644 index 0000000000..601f666023 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-sanitizers_4.9.bb @@ -0,0 +1,2 @@ +require recipes-devtools/gcc/gcc-${PV}.inc +require gcc-sanitizers.inc diff --git a/meta/recipes-devtools/gcc/gcc-shared-source.inc b/meta/recipes-devtools/gcc/gcc-shared-source.inc new file mode 100644 index 0000000000..cb5d9071b6 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-shared-source.inc @@ -0,0 +1,9 @@ +do_fetch() { + : +} +do_fetch[noexec] = "1" +deltask do_unpack +deltask do_patch + +do_configure[depends] += "gcc-source:do_preconfigure" +do_populate_lic[depends] += "gcc-source:do_unpack" diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc new file mode 100644 index 0000000000..10e9285c44 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-source.inc @@ -0,0 +1,35 @@ +deltask do_configure +deltask do_compile +deltask do_package +deltask do_package_write_rpm +deltask do_package_write_ipk +deltask do_package_write_deb +deltask do_install +deltask do_populate_sysroot +deltask do_populate_lic +deltask do_package_qa +deltask do_packagedata +deltask do_rm_work + +WORKDIR = "${TMPDIR}/work-shared/gcc-${PV}-${PR}" +SSTATE_SWSPEC = "sstate:gcc::${PV}:${PR}::${SSTATE_VERSION}:" + +STAMP = "${STAMPS_DIR}/work-shared/gcc-${PV}-${PR}" +STAMPCLEAN = "${STAMPS_DIR}/work-shared/gcc-[0-9]*-*" + +INHIBIT_DEFAULT_DEPS = "1" +DEPENDS = "" +PACKAGES = "" + +python do_preconfigure () { + import subprocess + cmd = d.expand('PATH=${PATH} cd ${S} && gnu-configize') + subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) + # See 0044-gengtypes.patch, we need to regenerate this file + bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.c")) + cmd = d.expand("sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure") + subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) +} +addtask do_preconfigure after do_patch +do_preconfigure[depends] += "gnu-config-native:do_populate_sysroot autoconf-native:do_populate_sysroot" + diff --git a/meta/recipes-devtools/gcc/gcc-source_4.8.bb b/meta/recipes-devtools/gcc/gcc-source_4.8.bb new file mode 100644 index 0000000000..234b82efc6 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-source_4.8.bb @@ -0,0 +1,2 @@ +require recipes-devtools/gcc/gcc-${PV}.inc +require recipes-devtools/gcc/gcc-source.inc diff --git a/meta/recipes-devtools/gcc/gcc-source_4.9.bb b/meta/recipes-devtools/gcc/gcc-source_4.9.bb new file mode 100644 index 0000000000..234b82efc6 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-source_4.9.bb @@ -0,0 +1,2 @@ +require recipes-devtools/gcc/gcc-${PV}.inc +require recipes-devtools/gcc/gcc-source.inc diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc index a266f16edf..4c3eea6851 100644 --- a/meta/recipes-devtools/gcc/gcc-target.inc +++ b/meta/recipes-devtools/gcc/gcc-target.inc @@ -166,3 +166,12 @@ do_install () { chown -R root:root ${D} } + +# Installing /usr/lib/gcc/* means we'd have two copies, one from gcc-cross +# and one from here. These can confuse gcc cross where includes use #include_next +# and builds track file dependencies (e.g. perl and its makedepends code). +# For determinism we don't install this ever and rely on the copy from gcc-cross. +# [YOCTO #7287] +sysroot_stage_dirs_append () { + rm -rf $to${libdir}/gcc +} diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc index c81a80c6de..3101762b02 100644 --- a/meta/recipes-devtools/gcc/libgcc-common.inc +++ b/meta/recipes-devtools/gcc/libgcc-common.inc @@ -1,5 +1,7 @@ BPN = "libgcc" +require gcc-shared-source.inc + INHIBIT_DEFAULT_DEPS = "1" do_configure () { @@ -52,7 +54,7 @@ addtask multilib_install after do_install before do_package do_populate_sysroot # by creating this symlink to it # /usr/lib64/x86_64-poky-linux/4.7/32 -python do_multilib_install() { +fakeroot python do_multilib_install() { import re multilibs = d.getVar('MULTILIB_VARIANTS', True) @@ -115,7 +117,7 @@ python do_multilib_install() { } addtask extra_symlinks after do_multilib_install before do_package do_populate_sysroot -python do_extra_symlinks() { +fakeroot python do_extra_symlinks() { targetsysnoext = d.getVar('TARGET_SYS_NO_EXTENSION', True) if targetsysnoext != d.getVar('TARGET_SYS', True): diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/meta/recipes-devtools/gcc/libgcc.inc index 22c42d5eca..21cb8c1084 100644 --- a/meta/recipes-devtools/gcc/libgcc.inc +++ b/meta/recipes-devtools/gcc/libgcc.inc @@ -9,6 +9,13 @@ PACKAGES = "\ libgcov-dev \ " +# All libgcc source is marked with the exception. +# +LICENSE_${PN} = "GPL-3.0-with-GCC-exception" +LICENSE_${PN}-dev = "GPL-3.0-with-GCC-exception" +LICENSE_${PN}-dbg = "GPL-3.0-with-GCC-exception" + + FILES_${PN} = "${base_libdir}/libgcc*.so.*" FILES_${PN}-dev = "\ ${base_libdir}/libgcc*.so \ diff --git a/meta/recipes-devtools/gcc/libgfortran.inc b/meta/recipes-devtools/gcc/libgfortran.inc index cf7942f41d..e42843d2f1 100644 --- a/meta/recipes-devtools/gcc/libgfortran.inc +++ b/meta/recipes-devtools/gcc/libgfortran.inc @@ -1,7 +1,7 @@ require gcc-configure-common.inc EXTRA_OECONF_PATHS = "\ - --with-sysroot=${STAGING_DIR_TARGET} \ + --with-sysroot=/not/exist \ --with-build-sysroot=${STAGING_DIR_TARGET} \ " diff --git a/meta/recipes-devtools/gdb/gdb-7.7.1.inc b/meta/recipes-devtools/gdb/gdb-7.8.1.inc index aa16d5a09f..510ea18945 100644 --- a/meta/recipes-devtools/gdb/gdb-7.7.1.inc +++ b/meta/recipes-devtools/gdb/gdb-7.8.1.inc @@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" -S = "${WORKDIR}/${BPN}-${PV}" +SRC_URI[md5sum] = "997492cc3475c96f35ecc8775248c9b1" +SRC_URI[sha256sum] = "d7a923d876ecfa1cec4c1c79c014c9d8e58783a25855a95cf260275f61990647" -SRC_URI[md5sum] = "45b07b53d81832d32ccd4829465d4886" -SRC_URI[sha256sum] = "eefadb9831e3695d1eaef34e98b8f1fb441df6fe5071317ea49c6bd6ba213eff" diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc index 599b405e03..81af42f323 100644 --- a/meta/recipes-devtools/gdb/gdb-common.inc +++ b/meta/recipes-devtools/gdb/gdb-common.inc @@ -11,6 +11,8 @@ LTTNGUST_mips = "" LTTNGUST_mipsel = "" LTTNGUST_mips64 = "" LTTNGUST_mips64el = "" +LTTNGUST_mips64n32 = "" +LTTNGUST_mips64eln32 = "" LTTNGUST_sh4 = "" INC_PR = "r0" @@ -38,7 +40,7 @@ EXPAT = "--with-expat --with-libexpat-prefix=${STAGING_DIR_HOST}" EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x --disable-werror \ --with-curses --disable-multilib --with-system-readline --disable-sim \ - --without-lzma \ + --without-lzma --without-guile \ ${GDBPROPREFIX} ${EXPAT} \ ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)} \ --disable-rpath \ diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc index 844dce9451..4fd60a615e 100644 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc @@ -11,7 +11,7 @@ RDEPENDS_${PN} += "nativesdk-python-core nativesdk-python-lang nativesdk-python- GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" -EXTRA_OECONF_append = "--with-python=${WORKDIR}/python" +EXTRA_OECONF_append = " --with-python=${WORKDIR}/python" SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.8.1.bb index 301035940c..301035940c 100644 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.8.1.bb diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.7.1.bb b/meta/recipes-devtools/gdb/gdb-cross_7.8.1.bb index f9da486d7d..f9da486d7d 100644 --- a/meta/recipes-devtools/gdb/gdb-cross_7.7.1.bb +++ b/meta/recipes-devtools/gdb/gdb-cross_7.8.1.bb diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc index 7b3e59af62..2c95e03b1b 100644 --- a/meta/recipes-devtools/gdb/gdb.inc +++ b/meta/recipes-devtools/gdb/gdb.inc @@ -2,10 +2,8 @@ require gdb-common.inc inherit gettext -SRC_URI += "file://kill_arm_map_symbols.patch \ - file://gdbserver-cflags-last.diff;striplevel=0 \ +SRC_URI += "file://gdbserver-cflags-last.diff;striplevel=0 \ file://renesas-sh-native-support.patch \ - file://include_asm_ptrace.patch \ " #LDFLAGS_append = " -s" #export CFLAGS_append=" -L${STAGING_LIBDIR}" diff --git a/meta/recipes-devtools/gdb/gdb/include_asm_ptrace.patch b/meta/recipes-devtools/gdb/gdb/include_asm_ptrace.patch deleted file mode 100644 index 85e0147665..0000000000 --- a/meta/recipes-devtools/gdb/gdb/include_asm_ptrace.patch +++ /dev/null @@ -1,30 +0,0 @@ -gdb: include asm/ptrace.h in two aarch64 source files - -Both sys/ptrace.h and asm/ptrace.h need to be included. - -Upstream-Status: Pending - -Signed-off-by: joe.slater@windriver.com - - ---- a/gdb/aarch64-linux-nat.c -+++ b/gdb/aarch64-linux-nat.c -@@ -32,6 +32,8 @@ - #include "elf/common.h" - - #include <sys/ptrace.h> -+#include <asm/ptrace.h> -+ - #include <sys/utsname.h> - - #include "gregset.h" ---- a/gdb/gdbserver/linux-aarch64-low.c -+++ b/gdb/gdbserver/linux-aarch64-low.c -@@ -26,6 +26,7 @@ - #include <signal.h> - #include <sys/user.h> - #include <sys/ptrace.h> -+#include <asm/ptrace.h> - #include <sys/uio.h> - - #include "gdb_proc_service.h" diff --git a/meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch b/meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch deleted file mode 100644 index 9fc45b9f2a..0000000000 --- a/meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch +++ /dev/null @@ -1,26 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Index: gdb-7.3/gdb/arm-tdep.c -=================================================================== ---- gdb-7.3.orig/gdb/arm-tdep.c 2011-05-17 14:27:01.000000000 -0700 -+++ gdb-7.3/gdb/arm-tdep.c 2011-08-05 22:29:58.784201850 -0700 -@@ -7806,6 +7806,19 @@ - static void - arm_elf_make_msymbol_special(asymbol *sym, struct minimal_symbol *msym) - { -+ -+ /* FIXME: We want gdb to ignore the ARM ELF mapping symbols when -+ displaying disassembly so we use this horrible hack here to -+ artifically set their address to the highest possible value. -+ This is wrong of course, and it prevents the symbols from being -+ used for their intended purpose - to distinguish between ARM -+ and THUMB code. So we ought to find a better way to do this. */ -+ if (bfd_asymbol_name (sym) -+ && bfd_asymbol_name (sym)[0] == '$' -+ && bfd_asymbol_name (sym)[1] != 0 -+ && bfd_asymbol_name (sym)[2] == 0) -+ SYMBOL_VALUE_ADDRESS(msym) = (CORE_ADDR) 0x7ffffffc; -+ - if (ARM_SYM_BRANCH_TYPE (&((elf_symbol_type *)sym)->internal_elf_sym) - == ST_BRANCH_TO_THUMB) - MSYMBOL_SET_SPECIAL (msym); diff --git a/meta/recipes-devtools/gdb/gdb_7.7.1.bb b/meta/recipes-devtools/gdb/gdb_7.8.1.bb index 1abc9d8e76..1abc9d8e76 100644 --- a/meta/recipes-devtools/gdb/gdb_7.7.1.bb +++ b/meta/recipes-devtools/gdb/gdb_7.8.1.bb diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 5396628790..4da4a2754f 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -1,11 +1,14 @@ SUMMARY = "Distributed version control system" +HOMEPAGE = "http://git-scm.com" SECTION = "console/utils" LICENSE = "GPLv2" DEPENDS = "openssl curl zlib expat" PROVIDES_append_class-native = " git-replacement-native" -SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz" +SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ + ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages" + S = "${WORKDIR}/git-${PV}" LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1" @@ -30,6 +33,14 @@ do_install () { oe_runmake install DESTDIR="${D}" bindir=${bindir} \ template_dir=${datadir}/git-core/templates \ GIT_PYTHON_DIR=${D}${datadir}/git-core/python + install -d ${D}/${mandir}/man1 + install -d ${D}/${mandir}/man5 + install -d ${D}/${mandir}/man7 + install -t ${D}/${mandir}/man1 ${WORKDIR}/man1/* + install -t ${D}/${mandir}/man5 ${WORKDIR}/man5/* + install -t ${D}/${mandir}/man7 ${WORKDIR}/man7/* + install -d ${D}/${datadir}/bash-completion/completions/ + install -m 644 ${S}/contrib/completion/git-completion.bash ${D}/${datadir}/bash-completion/completions/git } perl_native_fixup () { @@ -86,6 +97,10 @@ PERLTOOLS = " \ ${datadir}/git-core/templates/hooks/pre-rebase.sample \ " +# Basic tab completion support +PACKAGES =+ "${PN}-bash-completion" +FILES_${PN}-bash-completion = "${datadir}/bash-completion/completions/*" + # Git tools requiring perl PACKAGES =+ "${PN}-perltools" FILES_${PN}-perltools += " \ diff --git a/meta/recipes-devtools/git/git_2.0.1.bb b/meta/recipes-devtools/git/git_2.0.1.bb deleted file mode 100644 index dbf32e1a03..0000000000 --- a/meta/recipes-devtools/git/git_2.0.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require git.inc - -SRC_URI[md5sum] = "981f5937840716cb563be1cc6292c8d7" -SRC_URI[sha256sum] = "02609a06fb40db1f6a968867c0e82bcb959b85902747830de0fda53228712daf" - -EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \ - ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ - " -EXTRA_OEMAKE += "NO_GETTEXT=1" diff --git a/meta/recipes-devtools/git/git_2.3.0.bb b/meta/recipes-devtools/git/git_2.3.0.bb new file mode 100644 index 0000000000..1611f6421b --- /dev/null +++ b/meta/recipes-devtools/git/git_2.3.0.bb @@ -0,0 +1,11 @@ +require git.inc + +SRC_URI[tarball.md5sum] = "edf994cf34cd3354dadcdfa6b4292335" +SRC_URI[tarball.sha256sum] = "ba2fe814e709a5d0f034ebe82083fce7feed0899b3a8c8b3adf1c5a85d1ce9ac" +SRC_URI[manpages.md5sum] = "620797eb73b281d0706979ae8038bbd7" +SRC_URI[manpages.sha256sum] = "8aa4d1e5d7bbf5641a9de92279369d9b20cc266ba7b2888104efa40e80b53559" + +EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \ + ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ + " +EXTRA_OEMAKE += "NO_GETTEXT=1" diff --git a/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb b/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb index d67466ae79..f5fce6f020 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb +++ b/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb @@ -17,6 +17,8 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/gnu-config/gnu-config-${PV SRC_URI[md5sum] = "bcfca5a2bb39edad4aae5a65efc84094" SRC_URI[sha256sum] = "44f99a8e76f3e8e4fec0bb5ad4762f8e44366168554ce66cb85afbe2ed3efd8b" +CLEANBROKEN = "1" + do_compile() { : } diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb index 00fa759176..754a99a4b0 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb +++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb @@ -17,6 +17,8 @@ SRC_URI = "git://git.sv.gnu.org/config.git \ S = "${WORKDIR}/git" +CLEANBROKEN = "1" + do_compile() { : } diff --git a/meta/recipes-devtools/guile/files/arm_aarch64.patch b/meta/recipes-devtools/guile/files/arm_aarch64.patch new file mode 100644 index 0000000000..f1788b62fb --- /dev/null +++ b/meta/recipes-devtools/guile/files/arm_aarch64.patch @@ -0,0 +1,19 @@ +guile: add aarch64 recognition + +Assume little-endian. + +Upstream-Status: Pending + +Signed-off-by: joe.slater@windriver.com + +--- a/module/system/base/target.scm ++++ b/module/system/base/target.scm +@@ -70,6 +70,8 @@ + ((member cpu '("sparc" "sparc64" "powerpc" "powerpc64" "spu" + "mips" "mips64")) + (endianness big)) ++ ((string-match "^aarch64" cpu) ++ (endianness little)) + ((string-match "^arm.*eb" cpu) + (endianness big)) + ((string-match "^arm.*" cpu) diff --git a/meta/recipes-devtools/guile/files/libguile-Makefile.am-hook.patch b/meta/recipes-devtools/guile/files/libguile-Makefile.am-hook.patch new file mode 100644 index 0000000000..290b9d447d --- /dev/null +++ b/meta/recipes-devtools/guile/files/libguile-Makefile.am-hook.patch @@ -0,0 +1,42 @@ +From 9c4e120a7a87db34d22a50883a5a525170b480d7 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Tue, 6 Jan 2015 23:10:51 -0800 +Subject: [PATCH] libguile/Makefile.am: install-data-hook -> install-exec-hook + +It may install such a file: +/usr/lib64/libguile-2.0*-gdb.scm + +This is because when there is no file in the directory: +for f in libguile-2.0*; do + [snip] +done + +The f would be libguile-2.0* itself, use install-exec-hook will fix the +problem since it depends on install-libLTLIBRARIES. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + libguile/Makefile.am | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/libguile/Makefile.am b/libguile/Makefile.am +index 5decd99..52645b7 100644 +--- a/libguile/Makefile.am ++++ b/libguile/Makefile.am +@@ -446,10 +446,8 @@ EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = _scm.h \ + ## delete guile-snarf.awk from the installation bindir, in case it's + ## lingering there due to an earlier guile version not having been + ## wiped out. +-install-exec-hook: ++install-exec-hook: libguile-2.0-gdb.scm + rm -f $(DESTDIR)$(bindir)/guile-snarf.awk +- +-install-data-hook: libguile-2.0-gdb.scm + @$(MKDIR_P) $(DESTDIR)$(libdir) + ## We want to install libguile-2.0-gdb.scm as SOMETHING-gdb.scm. + ## SOMETHING is the full name of the final library. We want to ignore +-- +1.7.9.5 + diff --git a/meta/recipes-devtools/guile/guile_2.0.11.bb b/meta/recipes-devtools/guile/guile_2.0.11.bb index bd23c2b918..d1578e08cf 100644 --- a/meta/recipes-devtools/guile/guile_2.0.11.bb +++ b/meta/recipes-devtools/guile/guile_2.0.11.bb @@ -19,7 +19,9 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \ file://opensuse/guile-64bit.patch \ file://guile_2.0.6_fix_sed_error.patch \ file://arm_endianness.patch \ + file://arm_aarch64.patch \ file://workaround-ice-ssa-corruption.patch \ + file://libguile-Makefile.am-hook.patch \ " # file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch diff --git a/meta/recipes-devtools/help2man/help2man-native_1.46.1.bb b/meta/recipes-devtools/help2man/help2man-native_1.46.4.bb index a51c81f99c..5b90da9afa 100644 --- a/meta/recipes-devtools/help2man/help2man-native_1.46.1.bb +++ b/meta/recipes-devtools/help2man/help2man-native_1.46.4.bb @@ -6,8 +6,8 @@ DEPENDS = "autoconf-native automake-native" SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "63b8f14a81ce28ba119d588d00c63f43" -SRC_URI[sha256sum] = "3dfd02a026149aad06887c1cb6062471779c100e00aecb79b8f9d01cf1581c47" +SRC_URI[md5sum] = "a1b7fe49eddae8a2537ed74ee9ef11cb" +SRC_URI[sha256sum] = "1ae7f15f53b0cc55b070ae49df2ee5caa942c71529054e157599427bba3c5633" inherit autotools native diff --git a/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb b/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb index 18e7fc0062..6b356b0d44 100644 --- a/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb +++ b/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb @@ -10,7 +10,7 @@ and names that can be used to make icon themes work in a desktop \ environment or application that implements the naming specification. " LICENSE = "GPLv2" DEPENDS = "libxml-simple-perl-native" -PR = "r4" +PR = "r5" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" @@ -18,7 +18,7 @@ SRC_URI = "http://tango.freedesktop.org/releases/icon-naming-utils-${PV}.tar.gz" SRC_URI[md5sum] = "2c5c7a418e5eb3268f65e21993277fba" SRC_URI[sha256sum] = "044ab2199ed8c6a55ce36fd4fcd8b8021a5e21f5bab028c0a7cdcf52a5902e1c" -inherit autotools-brokensep allarch perlnative +inherit autotools allarch perlnative do_configure_append() { # Make sure we use our nativeperl wrapper. diff --git a/meta/recipes-devtools/json-c/json-c_0.11.bb b/meta/recipes-devtools/json-c/json-c_0.12.bb index 389e0f9ebf..e9c5b31745 100644 --- a/meta/recipes-devtools/json-c/json-c_0.11.bb +++ b/meta/recipes-devtools/json-c/json-c_0.12.bb @@ -6,16 +6,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2" SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "aa02367d2f7a830bf1e3376f77881e98" -SRC_URI[sha256sum] = "28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c" +SRC_URI[md5sum] = "3ca4bbb881dfc4017e8021b5e0a8c491" +SRC_URI[sha256sum] = "000c01b2b3f82dcb4261751eb71f1b084404fb7d6a282f06074d3c17078b9f3f" RPROVIDES_${PN} = "libjson" -PARALLEL_MAKE = "" - inherit autotools do_configure_prepend() { # Clean up autoconf cruft that should not be in the tarball rm -f ${S}/config.status } + +CFLAGS += "-Wno-error=unused-but-set-variable" diff --git a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb index ef0019fc7d..48a2f935be 100644 --- a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb +++ b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb @@ -18,8 +18,6 @@ SRC_URI = "http://ymorin.is-a-geek.org/download/${BPN}/${BP}.tar.xz" SRC_URI[md5sum] = "b939280dcc83f8feabd87a1d5f9b00c2" SRC_URI[sha256sum] = "ea2615a62c74bea6ce3b38402f00c7513858f307f6ba7aa9fdbf0bbc12bcf407" -S = "${WORKDIR}/${BPN}-${PV}" - inherit autotools do_configure_prepend () { mkdir -p scripts/.autostuff/m4 diff --git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc b/meta/recipes-devtools/libtool/libtool-2.4.6.inc index 0f1964b57b..2125de32f9 100644 --- a/meta/recipes-devtools/libtool/libtool-2.4.2.inc +++ b/meta/recipes-devtools/libtool/libtool-2.4.6.inc @@ -5,31 +5,29 @@ Libtool hides the complexity of generating special library types \ HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html" SECTION = "devel" LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" - -INC_PR = "r6" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://libltdl/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c " SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ file://trailingslash.patch \ file://rename-with-sysroot.patch \ file://use-sysroot-in-libpath.patch \ file://fix-final-rpath.patch \ - file://avoid_absolute_paths_for_general_utils.patch \ file://fix-rpath.patch \ - file://respect-fstack-protector.patch \ file://norm-rpath.patch \ file://dont-depend-on-help2man.patch \ file://fix-resolve-lt-sysroot.patch \ + file://nohardcodepaths.patch \ + file://unwind-opt-parsing.patch \ " -SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50" -SRC_URI[sha256sum] = "b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918" +SRC_URI[md5sum] = "addf44b646ddb4e3919805aa88fa7c5e" +SRC_URI[sha256sum] = "e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3" do_compile_prepend () { # Sometimes this file doesn't get rebuilt, force the issue - rm -f ${S}/libltdl/config/ltmain.sh - make libltdl/config/ltmain.sh + rm -f ${S}/build-aux/ltmain.sh + make build-aux/ltmain.sh ./config.status } @@ -47,6 +45,7 @@ FILES_${PN}-dev = "${includedir} ${FILES_SOLIBSDEV} ${libdir}/*.la \ #FILES_${PN}-dev := "${@oe_filter_out('${datadir}/aclocal', '${FILES_libtool-dev}', d)}" FILES_libltdl = "${libdir}/libltdl${SOLIBS}" FILES_libltdl-dev = "${libdir}/libltdl${SOLIBSDEV} ${includedir}" +FILES_libltdl-dev =+ "${libdir}/libltdl.la" FILES_libltdl-staticdev = "${libdir}/libltdl.a" FILES_libltdl-dbg = "${libdir}/.debug/" diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb index 34aae0bf13..847880270d 100644 --- a/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb +++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb @@ -1,6 +1,5 @@ require libtool-${PV}.inc -PR = "${INC_PR}.1" PACKAGES = "" SRC_URI += "file://prefix.patch" SRC_URI += "file://fixinstall.patch" @@ -18,17 +17,18 @@ do_install () { install -d ${D}${bindir_crossscripts}/ install -m 0755 ${HOST_SYS}-libtool ${D}${bindir_crossscripts}/${HOST_SYS}-libtool install -d ${D}${bindir_crossscripts}/ - install -m 0755 libtoolize ${D}${bindir_crossscripts}/ - install -d ${D}${target_datadir}/libtool/config/ + GREP='/bin/grep' SED='sed' ${S}/build-aux/inline-source libtoolize > ${D}${bindir_crossscripts}/libtoolize + chmod 0755 ${D}${bindir_crossscripts}/libtoolize + install -d ${D}${target_datadir}/libtool/build-aux/ install -d ${D}${target_datadir}/aclocal/ - install -c ${S}/libltdl/config/compile ${D}${target_datadir}/libtool/config/ - install -c ${S}/libltdl/config/config.guess ${D}${target_datadir}/libtool/config/ - install -c ${S}/libltdl/config/config.sub ${D}${target_datadir}/libtool/config/ - install -c ${S}/libltdl/config/depcomp ${D}${target_datadir}/libtool/config/ - install -c ${S}/libltdl/config/install-sh ${D}${target_datadir}/libtool/config/ - install -c ${S}/libltdl/config/missing ${D}${target_datadir}/libtool/config/ - install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${D}${target_datadir}/libtool/config/ - install -c -m 0644 ${S}/libltdl/m4/*.m4 ${D}${target_datadir}/aclocal/ + install -c ${S}/build-aux/compile ${D}${target_datadir}/libtool/build-aux/ + install -c ${S}/build-aux/config.guess ${D}${target_datadir}/libtool/build-aux/ + install -c ${S}/build-aux/config.sub ${D}${target_datadir}/libtool/build-aux/ + install -c ${S}/build-aux/depcomp ${D}${target_datadir}/libtool/build-aux/ + install -c ${S}/build-aux/install-sh ${D}${target_datadir}/libtool/build-aux/ + install -c ${S}/build-aux/missing ${D}${target_datadir}/libtool/build-aux/ + install -c -m 0644 ${S}/build-aux/ltmain.sh ${D}${target_datadir}/libtool/build-aux/ + install -c -m 0644 ${S}/m4/*.m4 ${D}${target_datadir}/aclocal/ } SYSROOT_PREPROCESS_FUNCS += "libtoolcross_sysroot_preprocess" diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb index f03859e061..4c5218ade0 100644 --- a/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb +++ b/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb @@ -2,7 +2,6 @@ require libtool-${PV}.inc DEPENDS = "" -PR = "${INC_PR}.1" SRC_URI += "file://prefix.patch" inherit native diff --git a/meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch b/meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch deleted file mode 100644 index 3c751ed0e2..0000000000 --- a/meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch +++ /dev/null @@ -1,39 +0,0 @@ -Upstream-Status: Pending - -On some distro the path of utils like sed, grep etc are different than the -buildhost system. - This was causing runtime issue while running libtoolize from the -libtool-nativesdk package. - This patch takes out the absolute paths of these utils, and put -responsibility on the end-user to set correct paths for these utilities to be -found out. - -Nitin A Kamble <nitin.a.kamble@intel.com> -2011/02/18 - - -Index: libtool-2.4.2/libltdl/config/general.m4sh -=================================================================== ---- libtool-2.4.2.orig/libltdl/config/general.m4sh -+++ libtool-2.4.2/libltdl/config/general.m4sh -@@ -45,15 +45,15 @@ progpath="$0" - M4SH_VERBATIM([[ - : ${CP="cp -f"} - test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} --: ${EGREP="@EGREP@"} --: ${FGREP="@FGREP@"} --: ${GREP="@GREP@"} --: ${LN_S="@LN_S@"} -+: ${EGREP="egrep"} -+: ${FGREP="fgrep"} -+: ${GREP="grep"} -+: ${LN_S="ln -s"} - : ${MAKE="make"} - : ${MKDIR="mkdir"} - : ${MV="mv -f"} - : ${RM="rm -f"} --: ${SED="@SED@"} -+: ${SED="sed"} - : ${SHELL="${CONFIG_SHELL-/bin/sh}"} - : ${Xsed="$SED -e 1s/^X//"} - diff --git a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch b/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch index 67552b0ff5..fd4084c859 100644 --- a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch +++ b/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch @@ -1,24 +1,30 @@ Upstream-Status: Inappropriate Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd libtool-2.4.2/Makefile.am libtool-2.4.2/Makefile.am ---- libtool-2.4.2/Makefile.am 2011-10-17 13:17:04.000000000 +0300 -+++ libtool-2.4.2/Makefile.am 2013-01-01 22:03:36.865586811 +0200 -@@ -327,17 +327,6 @@ - cd $(srcdir)/doc && \ - $(MAKEINFO) --no-headers $(MAKEINFOFLAGS) -o notes.txt notes.texi +Updated by: Robert Yang <liezhi.yang@windriver.com> --dist_man1_MANS = $(srcdir)/doc/libtool.1 $(srcdir)/doc/libtoolize.1 +diff --git a/Makefile.am b/Makefile.am +--- a/Makefile.am ++++ b/Makefile.am +@@ -404,21 +404,6 @@ $(notes_txt): $(notes_texi) + $(AM_V_GEN)$(MAKEINFO) -P '$(srcdir)/doc' --no-headers \ + $(MAKEINFOFLAGS) -o '$@' '$(notes_texi)' + +-dist_man1_MANS = $(libtool_1) $(libtoolize_1) -MAINTAINERCLEANFILES += $(dist_man1_MANS) -update_mans = \ - PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \ -- $(HELP2MAN) --output=$@ --$(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh -- $(update_mans) --help-option=--help-all libtool --$(srcdir)/doc/libtoolize.1: $(srcdir)/libtoolize.in -- $(update_mans) libtoolize +- $(HELP2MAN) --output='$@' - +-# It's wrong to make distributed files (e.g. $(libtool_1)) rely on +-# files created in the build tree, so instead we regenerate the +-# manual pages if the sources for the build-tree files we want to +-# run have changed. +-$(libtool_1): $(ltmain_sh) +- $(AM_V_GEN)$(update_mans) --help-option=--help-all libtool +-$(libtoolize_1): $(libtoolize_in) +- $(AM_V_GEN)$(update_mans) libtoolize - + ## ------------- ## ## Installation. ## - ## ------------- ## diff --git a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch index 5c275ffd32..5c9f8cc9c0 100644 --- a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch +++ b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch @@ -6,13 +6,14 @@ This works around the issue until it gets sorted out upstream. Fix suggested by Richard Purdie <richard.purdie@intel.com> Signed-off-by: Scott Garman <scott.a.garman@intel.com> +Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> +Updated by: Robert Yang <liezhi.yang@windriver.com> -Index: libtool-2.4.2/libltdl/config/ltmain.m4sh -=================================================================== ---- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh -+++ libtool-2.4.2/libltdl/config/ltmain.m4sh -@@ -7268,9 +7268,11 @@ EOF - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" +diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in +--- a/build-aux/ltmain.in ++++ b/build-aux/ltmain.in +@@ -7569,9 +7569,11 @@ EOF + test relink = "$opt_mode" || rpath=$compile_rpath$rpath for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then + func_replace_sysroot "$libdir" @@ -23,9 +24,9 @@ Index: libtool-2.4.2/libltdl/config/ltmain.m4sh - func_replace_sysroot "$libdir" - libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else -@@ -7999,6 +8001,10 @@ EOF +@@ -8301,6 +8303,10 @@ EOF hardcode_libdirs= for libdir in $compile_rpath $finalize_rpath; do if test -n "$hardcode_libdir_flag_spec"; then @@ -35,4 +36,15 @@ Index: libtool-2.4.2/libltdl/config/ltmain.m4sh + libdir=$func_stripname_result if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir +@@ -8352,6 +8358,10 @@ EOF + hardcode_libdirs= + for libdir in $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then ++ func_replace_sysroot "$libdir" ++ libdir=$func_replace_sysroot_result ++ func_stripname '=' '' "$libdir" ++ libdir=$func_stripname_result + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs=$libdir diff --git a/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch b/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch index 44e9fe17ae..1bd95980c0 100644 --- a/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch +++ b/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch @@ -10,17 +10,18 @@ I have also reported the problem to libtool here http://lists.gnu.org/archive/html/bug-libtool/2013-09/msg00005.html Signed-off-by: Hans Beckerus <hans.beckerus at gmail.com> +Updated by: Robert Yang <liezhi.yang@windriver.com> --- -diff -ur libtool-2.4.2.orig/libltdl/m4/libtool.m4 libtool-2.4.2/libltdl/m4/libtool.m4 ---- libtool-2.4.2.orig/libltdl/m4/libtool.m4 2013-09-13 22:37:43.647282945 +0200 -+++ libtool-2.4.2/libltdl/m4/libtool.m4 2013-09-14 10:27:37.168178605 +0200 -@@ -1234,16 +1234,21 @@ +diff --git a/m4/libtool.m4 b/m4/libtool.m4 +--- a/m4/libtool.m4 ++++ b/m4/libtool.m4 +@@ -1225,16 +1225,21 @@ dnl lt_sysroot will always be passed unquoted. We quote it here dnl in case the user passed a directory name. lt_sysroot= - case ${with_libtool_sysroot} in #( + case $with_libtool_sysroot in #( - yes) + no) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` + # Treat "/" the same a an unset sysroot. It seems to be more + # compatible across host platforms that way!? @@ -37,5 +38,5 @@ diff -ur libtool-2.4.2.orig/libltdl/m4/libtool.m4 libtool-2.4.2/libltdl/m4/libto - no|'') - ;; #( *) - AC_MSG_RESULT([${with_libtool_sysroot}]) + AC_MSG_RESULT([$with_libtool_sysroot]) AC_MSG_ERROR([The sysroot must be an absolute path.]) diff --git a/meta/recipes-devtools/libtool/libtool/fix-rpath.patch b/meta/recipes-devtools/libtool/libtool/fix-rpath.patch index 1571178a6a..a2ec9473e7 100644 --- a/meta/recipes-devtools/libtool/libtool/fix-rpath.patch +++ b/meta/recipes-devtools/libtool/libtool/fix-rpath.patch @@ -6,10 +6,12 @@ RP 23/9/2011 Upstream-Status: Pending -Index: libtool-2.4.2/libltdl/config/ltmain.m4sh +Updated by: Robert Yang <liezhi.yang@windriver.com> + +Index: libtool-2.4.2/build-aux/ltmain.in =================================================================== ---- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh -+++ libtool-2.4.2/libltdl/config/ltmain.m4sh +--- libtool-2.4.2.orig/build-aux/ltmain.in ++++ libtool-2.4.2/build-aux/ltmain.in @@ -7286,8 +7286,14 @@ EOF esac fi diff --git a/meta/recipes-devtools/libtool/libtool/fixinstall.patch b/meta/recipes-devtools/libtool/libtool/fixinstall.patch index 279c07be37..8f343bf436 100644 --- a/meta/recipes-devtools/libtool/libtool/fixinstall.patch +++ b/meta/recipes-devtools/libtool/libtool/fixinstall.patch @@ -16,12 +16,13 @@ Upstream-Status: Inappropriate [upstream are unlikely to take a patch like this] RP 2011/11/16 -Index: libtool-2.4/libltdl/config/ltmain.m4sh -=================================================================== ---- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2011-11-16 14:50:01.070383779 +0000 -+++ libtool-2.4/libltdl/config/ltmain.m4sh 2011-11-16 15:27:13.582310413 +0000 -@@ -2163,7 +2163,7 @@ - dir="$func_dirname_result" +Updated by: Robert Yang <liezhi.yang@windriver.com> + +diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in +--- a/build-aux/ltmain.in ++++ b/build-aux/ltmain.in +@@ -2355,7 +2355,7 @@ func_mode_install () + dir=$func_dirname_result func_append dir "$objdir" - if test -n "$relink_command"; then @@ -29,16 +30,16 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh # Strip any trailing slash from the destination. func_stripname '' '/' "$libdir" destlibdir=$func_stripname_result -@@ -2202,7 +2202,7 @@ +@@ -2394,7 +2394,7 @@ func_mode_install () shift - srcname="$realname" -- test -n "$relink_command" && srcname="$realname"T + srcname=$realname +- test -n "$relink_command" && srcname=${realname}T + test "$fast_install" = no && test -n "$relink_command" && srcname="$realname"T # Install the shared library and build the symlinks. func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ -@@ -5856,15 +5856,15 @@ +@@ -6162,15 +6162,15 @@ func_mode_link () # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -63,7 +64,7 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh case " $sys_lib_dlsearch_path " in *" $libdir "*) ;; *) -@@ -5930,15 +5930,15 @@ +@@ -6236,15 +6236,15 @@ func_mode_link () # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -88,14 +89,14 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh case " $sys_lib_dlsearch_path " in *" $libdir "*) ;; *) -@@ -6284,8 +6284,8 @@ - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` +@@ -6590,8 +6590,8 @@ func_mode_link () + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" - test "$absdir" != "$libdir" && \ -- func_warning "\`$deplib' seems to be moved" +- func_warning "'$deplib' seems to be moved" + #test "$absdir" != "$libdir" && \ -+ # func_warning "\`$deplib' seems to be moved" ++ # func_warning "'$deplib' seems to be moved" - path="-L$absdir" + path=-L$absdir fi diff --git a/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch b/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch new file mode 100644 index 0000000000..b2239fbade --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch @@ -0,0 +1,27 @@ +If for example you build on a machine with /bin/grep, then restore that sstate +onto a machine with /usr/bin/grep, things will fail. Simply don't bother +hardcoding paths. + +RP 2015/2/3 + +Index: libtool-2.4.5/libtoolize.in +=================================================================== +--- libtool-2.4.5.orig/libtoolize.in ++++ libtool-2.4.5/libtoolize.in +@@ -40,11 +40,11 @@ + + : ${AUTOCONF="autoconf"} + : ${AUTOMAKE="automake"} +-: ${EGREP="@EGREP@"} +-: ${FGREP="@FGREP@"} +-: ${GREP="@GREP@"} +-: ${LN_S="@LN_S@"} +-: ${SED="@SED@"} ++: ${EGREP="egrep"} ++: ${FGREP="fgrep"} ++: ${GREP="grep"} ++: ${LN_S="ln -s"} ++: ${SED="sed"} + + + ## -------------------------- ## diff --git a/meta/recipes-devtools/libtool/libtool/norm-rpath.patch b/meta/recipes-devtools/libtool/libtool/norm-rpath.patch index dce1576c41..1e4c65e024 100644 --- a/meta/recipes-devtools/libtool/libtool/norm-rpath.patch +++ b/meta/recipes-devtools/libtool/libtool/norm-rpath.patch @@ -7,9 +7,11 @@ RPATH in the generated binary. Normalize before comparision. Signed-off-by: Andy Ross <andy.ross@windriver.com> Upstream-Status: Pending -diff -ur a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh ---- a/libltdl/config/ltmain.m4sh 2012-08-16 13:58:55.058900363 -0700 -+++ b/libltdl/config/ltmain.m4sh 2012-08-22 11:01:34.191345989 -0700 +Updated by: Robert Yang <liezhi.yang@windriver.com> + +diff -ur a/build-aux/ltmain.in b/build-aux/ltmain.in +--- a/build-aux/ltmain.in 2012-08-16 13:58:55.058900363 -0700 ++++ b/build-aux/ltmain.in 2012-08-22 11:01:34.191345989 -0700 @@ -7288,8 +7288,10 @@ else # We only want to hardcode in an rpath if it isn't in the diff --git a/meta/recipes-devtools/libtool/libtool/prefix.patch b/meta/recipes-devtools/libtool/libtool/prefix.patch index 5e46e68f03..a73df2e4a7 100644 --- a/meta/recipes-devtools/libtool/libtool/prefix.patch +++ b/meta/recipes-devtools/libtool/libtool/prefix.patch @@ -18,35 +18,13 @@ the simplest fix is just to remove $SHELL. Updated: Date: 2011/11/09 RP -Index: libtool-2.4.2/libltdl/m4/libtool.m4 -=================================================================== ---- libtool-2.4.2.orig/libltdl/m4/libtool.m4 -+++ libtool-2.4.2/libltdl/m4/libtool.m4 -@@ -94,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) - LIBTOOL_DEPS="$ltmain" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - AC_SUBST(LIBTOOL)dnl - - _LT_SETUP -@@ -206,7 +207,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a `.a' archive for static linking (except MSVC, -Index: libtool-2.4.2/Makefile.am -=================================================================== ---- libtool-2.4.2.orig/Makefile.am -+++ libtool-2.4.2/Makefile.am -@@ -31,7 +31,7 @@ AM_LDFLAGS = - DIST_SUBDIRS = . +Updated by: Robert Yang <liezhi.yang@windriver.com> + +diff --git a/Makefile.am b/Makefile.am +--- a/Makefile.am ++++ b/Makefile.am +@@ -31,7 +31,7 @@ SUBDIRS = . + DIST_SUBDIRS = $(SUBDIRS) EXTRA_DIST = -BUILT_SOURCES = libtool libtoolize @@ -54,58 +32,67 @@ Index: libtool-2.4.2/Makefile.am CLEANFILES = MOSTLYCLEANFILES = -@@ -72,7 +72,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li - ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \ - ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \ - ChangeLog.2008 ChangeLog.2009 ChangeLog.2010 --CLEANFILES += libtool libtoolize libtoolize.tmp \ -+CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \ - $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp +@@ -67,7 +67,7 @@ build_scripts = $(srcdir)/$(aux_dir)/announce-gen \ + + EXTRA_DIST += bootstrap bootstrap.conf $(build_scripts) cfg.mk maint.mk \ + GNUmakefile +-CLEANFILES += libtool libtoolize ++CLEANFILES += $(host_alias)-libtool libtoolize - ## These are the replacements that need to be made at bootstrap time, -@@ -231,7 +231,7 @@ configure_edit = sed \ - -e 's,@SED\@,$(SED),g' + ## If a file is named several times below, and especially if it + ## is a distributed file created during Libtool bootstrap, we +@@ -276,7 +276,7 @@ configure_edit = $(bootstrap_edit) \ + -e 's|@srcdir\@|$(srcdir)|g' # The libtool distributor and the standalone libtool script. --bin_SCRIPTS = libtoolize libtool -+bin_SCRIPTS = libtoolize $(host_alias)-libtool +-bin_SCRIPTS = libtool ++bin_SCRIPTS = $(host_alias)-libtool - libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status - rm -f libtoolize.tmp libtoolize -@@ -244,8 +244,8 @@ libtoolize: $(srcdir)/libtoolize.in $(to + libtoolize: $(libtoolize_in) $(config_status) + $(AM_V_at)rm -f '$@' +@@ -287,7 +287,7 @@ libtoolize: $(libtoolize_in) $(config_status) # We used to do this with a 'stamp-vcl' file, but non-gmake builds # would rerun configure on every invocation, so now we manually # check the version numbers from the build rule when necessary. --libtool: $(top_builddir)/config.status $(srcdir)/$(auxdir)/ltmain.sh ChangeLog -- @target=libtool; $(rebuild); \ -+$(host_alias)-libtool: $(top_builddir)/config.status $(srcdir)/$(auxdir)/ltmain.sh ChangeLog -+ @target=$(host_alias)-libtool; $(rebuild); \ - if test -f "$$target"; then \ - set dummy `./$$target --version | sed 1q`; actualver="$$5"; \ - test "$$actualver" = "$$correctver" && rebuild=false; \ -@@ -254,8 +254,8 @@ libtool: $(top_builddir)/config.status $ - case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \ - done; \ - if $$rebuild; then \ -- echo $(SHELL) ./config.status $$target; \ -- cd $(top_builddir) && $(SHELL) ./config.status $$target; \ -+ echo $(SHELL) ./config.status libtool; \ -+ cd $(top_builddir) && $(SHELL) ./config.status libtool; \ - fi - - .PHONY: configure-subdirs -@@ -535,12 +535,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$ +-libtool: $(ltmain_sh) $(config_status) $(dotversion) ++$(host_alias)-libtool: $(ltmain_sh) $(config_status) $(dotversion) + @$(rebuild); \ + if test -f '$@'; then \ + eval `'$(SED)' -n '/^package_revision=/p' '$@'`; \ +@@ -731,12 +731,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \ BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \ LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \ - LIBTOOL="$(abs_top_builddir)/libtool" \ + LIBTOOL="$(abs_top_builddir)/$(host_alias)-libtool" \ - tst_aclocaldir="$(abs_top_srcdir)/libltdl/m4" + tst_aclocaldir="$(abs_top_srcdir)/m4" INSTALLCHECK_ENVIRONMENT = \ - LIBTOOLIZE="$(bindir)/`echo libtoolize | sed '$(program_transform_name)'`" \ -- LIBTOOL="$(bindir)/`echo libtool | sed '$(program_transform_name)'`" \ -+ LIBTOOL="$(bindir)/`echo $(host_alias)-libtool | sed '$(program_transform_name)'`" \ + LIBTOOLIZE="$(bindir)/`echo libtoolize |$(SED) '$(program_transform_name)'`" \ +- LIBTOOL="$(bindir)/`echo libtool |$(SED) '$(program_transform_name)'`" \ ++ LIBTOOL="$(bindir)/`echo $(host_alias)-libtool |$(SED) '$(program_transform_name)'`" \ LTDLINCL="-I$(includedir)" \ LIBLTDL="$(libdir)/libltdl.la" \ tst_aclocaldir="$(aclocaldir)" +diff --git a/m4/libtool.m4 b/m4/libtool.m4 +--- a/m4/libtool.m4 ++++ b/m4/libtool.m4 +@@ -86,7 +86,8 @@ _LT_SET_OPTIONS([$0], [$1]) + LIBTOOL_DEPS=$ltmain + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(top_builddir)' ++LIBTOOL="$LIBTOOL/${host_alias}-libtool" + AC_SUBST(LIBTOOL)dnl + + _LT_SETUP +@@ -199,7 +200,7 @@ aix3*) + esac + + # Global variables: +-ofile=libtool ++ofile=${host_alias}-libtool + can_build_shared=yes + + # All known linkers require a '.a' archive for static linking (except MSVC, diff --git a/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch b/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch index c3e3e867aa..ad2b110530 100644 --- a/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch +++ b/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch @@ -10,29 +10,31 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html -Khem Raj <raj.khem@gmail.com> -Index: libtool-2.4.2/libltdl/m4/libtool.m4 -=================================================================== ---- libtool-2.4.2.orig/libltdl/m4/libtool.m4 -+++ libtool-2.4.2/libltdl/m4/libtool.m4 -@@ -1224,27 +1224,27 @@ _LT_DECL([], [ECHO], [1], [An echo progr +Updated by: Robert Yang <liezhi.yang@windriver.com> + +diff --git a/m4/libtool.m4 b/m4/libtool.m4 +--- a/m4/libtool.m4 ++++ b/m4/libtool.m4 +@@ -1215,28 +1215,28 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], [AC_MSG_CHECKING([for sysroot]) -AC_ARG_WITH([sysroot], --[ --with-sysroot[=DIR] Search for dependent libraries within DIR +-[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], +AC_ARG_WITH([libtool-sysroot], -+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], ++[AS_HELP_STRING([--with-libtool-sysroot@<:@=DIR@:>@], + [Search for dependent libraries within DIR (or the compiler's sysroot + if not specified).])], -[], [with_sysroot=no]) +[], [with_libtool_sysroot=no]) dnl lt_sysroot will always be passed unquoted. We quote it here dnl in case the user passed a directory name. lt_sysroot= --case ${with_sysroot} in #( -+case ${with_libtool_sysroot} in #( +-case $with_sysroot in #( ++case $with_libtool_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -43,15 +45,14 @@ Index: libtool-2.4.2/libltdl/m4/libtool.m4 no|'') ;; #( *) -- AC_MSG_RESULT([${with_sysroot}]) -+ AC_MSG_RESULT([${with_libtool_sysroot}]) +- AC_MSG_RESULT([$with_sysroot]) ++ AC_MSG_RESULT([$with_libtool_sysroot]) AC_MSG_ERROR([The sysroot must be an absolute path.]) ;; esac -Index: libtool-2.4.2/tests/sysroot.at -=================================================================== ---- libtool-2.4.2.orig/tests/sysroot.at -+++ libtool-2.4.2/tests/sysroot.at +diff --git a/tests/sysroot.at b/tests/sysroot.at +--- a/tests/sysroot.at ++++ b/tests/sysroot.at @@ -64,7 +64,7 @@ while read file; do done]) @@ -60,7 +61,7 @@ Index: libtool-2.4.2/tests/sysroot.at +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" #??? - if test "$shlibpath_var" = PATH; then + if test PATH = "$shlibpath_var"; then @@ -114,7 +114,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([lib2.c]) @@ -79,11 +80,10 @@ Index: libtool-2.4.2/tests/sysroot.at AC_SUBST([sysroot]) AC_OUTPUT(Makefile) ]]) -Index: libtool-2.4.2/tests/testsuite -=================================================================== ---- libtool-2.4.2.orig/tests/testsuite -+++ libtool-2.4.2/tests/testsuite -@@ -26676,7 +26676,7 @@ $at_traceon; } +diff --git a/tests/testsuite b/tests/testsuite +--- a/tests/testsuite ++++ b/tests/testsuite +@@ -48945,7 +48945,7 @@ $at_traceon; } LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" @@ -91,8 +91,8 @@ Index: libtool-2.4.2/tests/testsuite +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" #??? - if test "$shlibpath_var" = PATH; then -@@ -26874,7 +26874,7 @@ AM_INIT_AUTOMAKE([foreign]) + if test PATH = "$shlibpath_var"; then +@@ -49154,7 +49154,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([lib2.c]) LT_INIT @@ -101,7 +101,7 @@ Index: libtool-2.4.2/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -27051,7 +27051,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -49342,7 +49342,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([prog.c]) LT_INIT @@ -110,7 +110,7 @@ Index: libtool-2.4.2/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -27392,7 +27392,7 @@ $at_traceon; } +@@ -49694,7 +49694,7 @@ $at_traceon; } LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" @@ -118,8 +118,8 @@ Index: libtool-2.4.2/tests/testsuite +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" #??? - if test "$shlibpath_var" = PATH; then -@@ -27590,7 +27590,7 @@ AM_INIT_AUTOMAKE([foreign]) + if test PATH = "$shlibpath_var"; then +@@ -49903,7 +49903,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([lib2.c]) LT_INIT @@ -128,7 +128,7 @@ Index: libtool-2.4.2/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -27767,7 +27767,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -50091,7 +50091,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([prog.c]) LT_INIT @@ -137,7 +137,7 @@ Index: libtool-2.4.2/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -28108,7 +28108,7 @@ $at_traceon; } +@@ -50443,7 +50443,7 @@ $at_traceon; } LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" @@ -145,8 +145,8 @@ Index: libtool-2.4.2/tests/testsuite +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" #??? - if test "$shlibpath_var" = PATH; then -@@ -28306,7 +28306,7 @@ AM_INIT_AUTOMAKE([foreign]) + if test PATH = "$shlibpath_var"; then +@@ -50652,7 +50652,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([lib2.c]) LT_INIT @@ -155,7 +155,7 @@ Index: libtool-2.4.2/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -28483,7 +28483,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -50840,7 +50840,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([prog.c]) LT_INIT diff --git a/meta/recipes-devtools/libtool/libtool/respect-fstack-protector.patch b/meta/recipes-devtools/libtool/libtool/respect-fstack-protector.patch deleted file mode 100644 index a82b2ec5a1..0000000000 --- a/meta/recipes-devtools/libtool/libtool/respect-fstack-protector.patch +++ /dev/null @@ -1,53 +0,0 @@ -Source: http://permalink.gmane.org/gmane.comp.gnu.libtool.bugs/7341 - -Bug confirmed. When code is compiled with -fstack-protector{,-all}, -GCC "emits extra code to check for buffer overflows, such as stack -smashing attacks". This extra code uses symbols from libssp, and -therefore (at least) Cygwin's GCC specs contain: - -*link_ssp: -%{fstack-protector|fstack-protector-all:-lssp_nonshared -lssp} - -Therefore, when libtool fails to pass -fstack-protector{,-all} at link -stage, the link fails. - -Patch attached. (Yes, I have a copyright assignment on file.) - -Yaakov -Cygwin/X - -From b79f4e117b6f73cc461a2e232063e08481d33300 Mon Sep 17 00:00:00 2001 -From: Yaakov Selkowitz <yselkowitz <at> users.sourceforge.net> -Date: Tue, 1 Jun 2010 22:18:51 -0500 -Subject: [PATCH] Fix linking with -fstack-protector - -* libltdl/config/ltmain.m4sh (func_mode_link): Pass -fstack-protector* -to the linker as it is required at link time to resolve libssp symbols. - -Signed-off-by: Yaakov Selkowitz <yselkowitz <at> users.sourceforge.net> ---- - libltdl/config/ltmain.m4sh | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending -Index: libtool-2.4.2/libltdl/config/ltmain.m4sh -=================================================================== ---- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh 2012-06-01 12:35:44.089638130 -0700 -+++ libtool-2.4.2/libltdl/config/ltmain.m4sh 2012-06-01 12:37:25.789643055 -0700 -@@ -5067,13 +5067,14 @@ - # -m*, -t[45]*, -txscale* architecture-specific flags for GCC - # -F/path path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* profiling flags for GCC -+ # -fstack-protector* stack protector flags for GCC - # @file GCC response files - # -tp=* Portland pgcc target processor selection - # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/meta/recipes-devtools/libtool/libtool/trailingslash.patch b/meta/recipes-devtools/libtool/libtool/trailingslash.patch index bb7a761e25..e8824d7db9 100644 --- a/meta/recipes-devtools/libtool/libtool/trailingslash.patch +++ b/meta/recipes-devtools/libtool/libtool/trailingslash.patch @@ -11,11 +11,12 @@ Merged a patch received from Gary Thomas <gary@mlbassoc.com> Date: 2010/07/12 Nitin A Kamble <nitin.a.kamble@intel.com> -Index: libtool-2.4.2/libltdl/config/ltmain.m4sh -=================================================================== ---- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh -+++ libtool-2.4.2/libltdl/config/ltmain.m4sh -@@ -2167,8 +2167,15 @@ func_mode_install () +Updated by: Robert Yang <liezhi.yang@windriver.com> + +diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in +--- a/build-aux/ltmain.in ++++ b/build-aux/ltmain.in +@@ -2356,8 +2356,15 @@ func_mode_install () func_append dir "$objdir" if test -n "$relink_command"; then diff --git a/meta/recipes-devtools/libtool/libtool/unwind-opt-parsing.patch b/meta/recipes-devtools/libtool/libtool/unwind-opt-parsing.patch new file mode 100644 index 0000000000..b633bc41bb --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/unwind-opt-parsing.patch @@ -0,0 +1,179 @@ +Cut and paste the pieces of build-aux/options-parser inline into the main +ltmain.sh code. This removes a performance degradation caused by the +repeated calls to func_quote_for_eval, the mechanism funclib uses +to construct the functions used for option parsing. + +Upstream-Status: Submitted [Being discussed on mailing list Feb 2015] + +diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in +index d5cf07a..0f54303 100644 +--- a/build-aux/ltmain.in ++++ b/build-aux/ltmain.in +@@ -342,11 +342,15 @@ _LT_EOF + # libtool_options_prep [ARG]... + # ----------------------------- + # Preparation for options parsed by libtool. +-libtool_options_prep () +-{ ++#libtool_options_prep () ++#{ + $debug_mode + + # Option defaults: ++ opt_verbose=false ++ opt_warning_types= ++ ++ # Option defaults: + opt_config=false + opt_dlopen= + opt_dry_run=false +@@ -382,19 +386,14 @@ libtool_options_prep () + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac +- +- # Pass back the list of options. +- func_quote_for_eval ${1+"$@"} +- libtool_options_prep_result=$func_quote_for_eval_result +-} +-func_add_hook func_options_prep libtool_options_prep ++#} + + + # libtool_parse_options [ARG]... + # --------------------------------- + # Provide handling for libtool specific options. +-libtool_parse_options () +-{ ++#libtool_parse_options () ++#{ + $debug_cmd + + # Perform our own loop to consume as many options as possible in +@@ -474,29 +473,90 @@ libtool_parse_options () + func_append preserve_args " $_G_opt" + ;; + +- # An option not handled by this hook function: +- *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; +- esac +- done ++ --debug|-x) debug_cmd='set -x' ++ func_echo "enabling shell trace mode" ++ $debug_cmd ++ ;; + ++ --no-warnings|--no-warning|--no-warn) ++ set dummy --warnings none ${1+"$@"} ++ shift ++ ;; + +- # save modified positional parameters for caller +- func_quote_for_eval ${1+"$@"} +- libtool_parse_options_result=$func_quote_for_eval_result +-} +-func_add_hook func_parse_options libtool_parse_options ++ --warnings|--warning|-W) ++ test $# = 0 && func_missing_arg $_G_opt && break ++ case " $warning_categories $1" in ++ *" $1 "*) ++ # trailing space prevents matching last $1 above ++ func_append_uniq opt_warning_types " $1" ++ ;; ++ *all) ++ opt_warning_types=$warning_categories ++ ;; ++ *none) ++ opt_warning_types=none ++ warning_func=: ++ ;; ++ *error) ++ opt_warning_types=$warning_categories ++ warning_func=func_fatal_error ++ ;; ++ *) ++ func_fatal_error \ ++ "unsupported warning category: '$1'" ++ ;; ++ esac ++ shift ++ ;; ++ ++ --verbose|-v) opt_verbose=: ;; ++ --version) func_version ;; ++ -\?|-h) func_usage ;; ++ --help) func_help ;; ++ ++ # Separate optargs to long options (plugins may need this): ++ --*=*) func_split_equals "$_G_opt" ++ set dummy "$func_split_equals_lhs" \ ++ "$func_split_equals_rhs" ${1+"$@"} ++ shift ++ ;; ++ ++ # Separate optargs to short options: ++ -W*) ++ func_split_short_opt "$_G_opt" ++ set dummy "$func_split_short_opt_name" \ ++ "$func_split_short_opt_arg" ${1+"$@"} ++ shift ++ ;; ++ ++ # Separate non-argument short options: ++ -\?*|-h*|-v*|-x*) ++ func_split_short_opt "$_G_opt" ++ set dummy "$func_split_short_opt_name" \ ++ "-$func_split_short_opt_arg" ${1+"$@"} ++ shift ++ ;; ++ ++ --) break ;; ++ -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; ++ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; ++ esac ++ done ++#} + ++# Display all warnings if -W was not given. ++test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" + + + # libtool_validate_options [ARG]... + # --------------------------------- + # Perform any sanity checks on option settings and/or unconsumed + # arguments. +-libtool_validate_options () +-{ ++#libtool_validate_options () ++#{ + # save first non-option argument + if test 0 -lt $#; then +- nonopt=$1 ++ nonopt=$_G_opt + shift + fi + +@@ -537,20 +597,10 @@ libtool_validate_options () + generic_help=$help + help="Try '$progname --help --mode=$opt_mode' for more information." + } ++#} + +- # Pass back the unparsed argument list +- func_quote_for_eval ${1+"$@"} +- libtool_validate_options_result=$func_quote_for_eval_result +-} +-func_add_hook func_validate_options libtool_validate_options +- +- +-# Process options as early as possible so that --help and --version +-# can return quickly. +-func_options ${1+"$@"} +-eval set dummy "$func_options_result"; shift +- +- ++# Bail if the options were screwed! ++$exit_cmd $EXIT_FAILURE + + ## ----------- ## + ## Main. ## diff --git a/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch b/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch index 0cd66ad524..6af99f327c 100644 --- a/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch +++ b/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch @@ -6,16 +6,16 @@ i.e. when lt_sysroot is not set, it will still behave the same and add -L/usr/lib to the relink command. -Khem Raj <raj.khem@gmail.com> +Updated by: Robert Yang <liezhi.yang@windriver.com> -Index: libtool-2.4.2/libltdl/config/ltmain.m4sh -=================================================================== ---- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh -+++ libtool-2.4.2/libltdl/config/ltmain.m4sh -@@ -6138,7 +6138,7 @@ func_mode_link () +diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in +--- a/build-aux/ltmain.in ++++ b/build-aux/ltmain.in +@@ -6421,7 +6421,7 @@ func_mode_link () fi else # We cannot seem to hardcode it, guess we'll fake it. -- add_dir="-L$libdir" +- add_dir=-L$libdir + add_dir="-L$lt_sysroot$libdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then diff --git a/meta/recipes-devtools/libtool/libtool_2.4.2.bb b/meta/recipes-devtools/libtool/libtool_2.4.6.bb index 60643129be..45f1b2f3a9 100644 --- a/meta/recipes-devtools/libtool/libtool_2.4.2.bb +++ b/meta/recipes-devtools/libtool/libtool_2.4.6.bb @@ -1,7 +1,5 @@ require libtool-${PV}.inc -PR = "${INC_PR}.0" - RDEPENDS_${PN} += "bash" # @@ -23,6 +21,6 @@ do_install_append () { libtool_sysroot_preprocess () { rm -rf ${SYSROOT_DESTDIR}${bindir}/* rm -rf ${SYSROOT_DESTDIR}${datadir}/aclocal/* - rm -rf ${SYSROOT_DESTDIR}${datadir}/libtool/config/* + rm -rf ${SYSROOT_DESTDIR}${datadir}/libtool/build-aux/* } diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.2.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb index 7b5c97a97a..508eade326 100644 --- a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.2.bb +++ b/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb @@ -1,7 +1,5 @@ require libtool-${PV}.inc -PR = "${INC_PR}.0" - FILESEXTRAPATHS =. "${FILE_DIRNAME}/libtool:" SRC_URI += "file://prefix.patch" diff --git a/meta/recipes-devtools/m4/m4-1.4.17.inc b/meta/recipes-devtools/m4/m4-1.4.17.inc index 790678e288..3133e99c33 100644 --- a/meta/recipes-devtools/m4/m4-1.4.17.inc +++ b/meta/recipes-devtools/m4/m4-1.4.17.inc @@ -1,5 +1,7 @@ require m4.inc +EXTRA_OECONF += "--without-libsigsegv-prefix" + LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ diff --git a/meta/recipes-devtools/m4/m4-native_1.4.9.bb b/meta/recipes-devtools/m4/m4-native_1.4.9.bb deleted file mode 100644 index 23a21d0939..0000000000 --- a/meta/recipes-devtools/m4/m4-native_1.4.9.bb +++ /dev/null @@ -1,12 +0,0 @@ -require m4-${PV}.inc - -INHIBIT_AUTOTOOLS_DEPS = "1" -DEPENDS += "gnu-config-native" - -do_configure() { - install -m 0644 ${STAGING_DATADIR}/gnu-config/config.sub . - install -m 0644 ${STAGING_DATADIR}/gnu-config/config.guess . - oe_runconf -} - -inherit native diff --git a/meta/recipes-devtools/make/make_4.0.bb b/meta/recipes-devtools/make/make_4.1.bb index 38d328c8a5..a1b0d7c45f 100644 --- a/meta/recipes-devtools/make/make_4.0.bb +++ b/meta/recipes-devtools/make/make_4.1.bb @@ -6,7 +6,7 @@ require make.inc EXTRA_OECONF += "--without-guile" -SRC_URI[md5sum] = "571d470a7647b455e3af3f92d79f1c18" -SRC_URI[sha256sum] = "e60686c7afede62cc8c86ad3012cf081ea4887daf9d223ce7115703b2bb2dbdb" +SRC_URI[md5sum] = "57a7a224a822f94789a587ccbcedff69" +SRC_URI[sha256sum] = "0bc7613389650ee6a24554b52572a272f7356164fd2c4132b0bcf13123e4fca5" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb b/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb index dd9bea2619..92d5870f42 100644 --- a/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb +++ b/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb @@ -5,11 +5,9 @@ SECTION = "base" SRC_URI = "file://makedevs.c \ file://COPYING.patch" -FILES_${PN}_append_class-nativesdk = " ${datadir}" +S = "${WORKDIR}" -do_configure() { - install -m 0644 ${WORKDIR}/makedevs.c ${S}/ -} +FILES_${PN}_append_class-nativesdk = " ${datadir}" do_compile() { ${CC} ${CFLAGS} ${LDFLAGS} -o ${S}/makedevs ${S}/makedevs.c diff --git a/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb b/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb index bcf68a8e37..28aff9124e 100644 --- a/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb +++ b/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb @@ -14,6 +14,8 @@ SRC_URI = "git://review.coreboot.org/p/coreboot;protocol=http \ file://fix-makefile-to-find-libz.patch \ " +CLEANBROKEN = "1" + S = "${WORKDIR}/git/util/mkelfImage" CFLAGS += "-fno-stack-protector" diff --git a/meta/recipes-devtools/mklibs/mklibs-native_0.1.39.bb b/meta/recipes-devtools/mklibs/mklibs-native_0.1.40.bb index 9885561fe3..b2fcae576a 100644 --- a/meta/recipes-devtools/mklibs/mklibs-native_0.1.39.bb +++ b/meta/recipes-devtools/mklibs/mklibs-native_0.1.40.bb @@ -12,11 +12,7 @@ SRC_URI = "http://ftp.de.debian.org/debian/pool/main/m/mklibs/${BPN}_${PV}.tar.x file://sysrooted-ldso.patch \ " -SRC_URI[md5sum] = "38a579a531401eb76f4bab4ccfb774a2" -SRC_URI[sha256sum] = "fa2881ab4fe72b0504878357f1fc6b17920459b56e8a60dfb083ca28fb64e733" +SRC_URI[md5sum] = "e1dafe5f962caa9dc5f2651c0723812a" +SRC_URI[sha256sum] = "1db24ae779d21ccfed49f22e49a2b7ee43ec0e9197bc206d81cd02f96e91e125" inherit autotools gettext native pythonnative - -do_configure_prepend() { - sed "s+MKLIBS_VERSION+${PV}+" ${S}/configure.ac -} diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb index d88520c786..bdb4fed181 100644 --- a/meta/recipes-devtools/mmc/mmc-utils_git.bb +++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb @@ -4,11 +4,11 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=17;md5=d7747fc87f1eb22b946ef819969503f0" BRANCH ?= "master" -SRCREV = "11f2ceabc4ad3f0dd568e0ce68166e4803e0615b" +SRCREV = "f4eb241519f8d500ce6068a70d2389be39ac5189" PV = "0.1" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;protocol=git;branch=${BRANCH} \ +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${BRANCH} \ file://0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch" S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch b/meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch index 44b25d164a..05f1629d58 100644 --- a/meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch +++ b/meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch @@ -16,16 +16,16 @@ index d3a02d4..e7e9218 100644 { - union ubifs_key *t = to; + __le32 x[2]; - + - t->j32[0] = cpu_to_le32(from->u32[0]); - t->j32[1] = cpu_to_le32(from->u32[1]); + x[0] = cpu_to_le32(from->u32[0]); + x[1] = cpu_to_le32(from->u32[1]); + + memcpy(to, &x, 8); - memset(to + 8, 0, UBIFS_MAX_KEY_LEN - 8); + memset(to + 8, 0, UBIFS_MAX_KEY_LEN - 8); } - + @@ -156,10 +158,12 @@ static inline void key_write(const union ubifs_key *from, void *to) */ static inline void key_write_idx(const union ubifs_key *from, void *to) @@ -35,10 +35,10 @@ index d3a02d4..e7e9218 100644 + + x[0] = cpu_to_le32(from->u32[0]); + x[1] = cpu_to_le32(from->u32[1]); - + - t->j32[0] = cpu_to_le32(from->u32[0]); - t->j32[1] = cpu_to_le32(from->u32[1]); + memcpy(to, &x, 8); } - + /** diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb index 52297c63ba..12daffec47 100644 --- a/meta/recipes-devtools/mtd/mtd-utils_git.bb +++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb @@ -1,20 +1,20 @@ SUMMARY = "Tools for managing memory technology devices" -SECTION = "base" -DEPENDS = "zlib lzo e2fsprogs util-linux" HOMEPAGE = "http://www.linux-mtd.infradead.org/" +SECTION = "base" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c" -# Use the latest version at 26 Oct, 2013 +DEPENDS = "zlib lzo e2fsprogs util-linux" + +PV = "1.5.1+git${SRCPV}" + SRCREV = "9f107132a6a073cce37434ca9cda6917dd8d866b" SRC_URI = "git://git.infradead.org/mtd-utils.git \ - file://add-exclusion-to-mkfs-jffs2-git-2.patch \ - file://fix-armv7-neon-alignment.patch \ + file://add-exclusion-to-mkfs-jffs2-git-2.patch \ + file://fix-armv7-neon-alignment.patch \ " -PV = "1.5.1+git${SRCPV}" - S = "${WORKDIR}/git/" EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'BUILDDIR=${S}'" @@ -29,6 +29,8 @@ FILES_mtd-utils-jffs2 = "${sbindir}/mkfs.jffs2 ${sbindir}/jffs2dump ${sbindir}/j FILES_mtd-utils-ubifs = "${sbindir}/mkfs.ubifs ${sbindir}/ubi*" FILES_mtd-utils-misc = "${sbindir}/nftl* ${sbindir}/ftl* ${sbindir}/rfd* ${sbindir}/doc* ${sbindir}/serve_image ${sbindir}/recv_image" -PARALLEL_MAKE = "" - BBCLASSEXTEND = "native" + +# git/.compr.c.dep:46: warning: NUL character seen; rest of line ignored +# git/.compr.c.dep:47: *** missing separator. Stop. +PARALLEL_MAKE = "" diff --git a/meta/recipes-devtools/mtools/mtools_3.9.9.bb b/meta/recipes-devtools/mtools/mtools_3.9.9.bb index f6dd3361c9..9cd1c5726c 100644 --- a/meta/recipes-devtools/mtools/mtools_3.9.9.bb +++ b/meta/recipes-devtools/mtools/mtools_3.9.9.bb @@ -44,6 +44,10 @@ inherit autotools texinfo EXTRA_OECONF = "--without-x" -PARALLEL_MAKEINST = "" - BBCLASSEXTEND = "native nativesdk" + +do_install_prepend () { + # Create bindir to fix parallel installation issues + mkdir -p ${D}/${bindir} + mkdir -p ${D}/${datadir} +} diff --git a/meta/recipes-devtools/mtools/mtools_4.0.18.bb b/meta/recipes-devtools/mtools/mtools_4.0.18.bb index 6c71f0ab1f..b2cfe9ad9a 100644 --- a/meta/recipes-devtools/mtools/mtools_4.0.18.bb +++ b/meta/recipes-devtools/mtools/mtools_4.0.18.bb @@ -35,6 +35,10 @@ inherit autotools texinfo EXTRA_OECONF = "--without-x" -PARALLEL_MAKEINST = "" - BBCLASSEXTEND = "native nativesdk" + +do_install_prepend () { + # Create bindir to fix parallel installation issues + mkdir -p ${D}/${bindir} + mkdir -p ${D}/${datadir} +} diff --git a/meta/recipes-devtools/nasm/nasm_2.11.05.bb b/meta/recipes-devtools/nasm/nasm_2.11.06.bb index fbfd5853b8..4a69a6a92e 100644 --- a/meta/recipes-devtools/nasm/nasm_2.11.05.bb +++ b/meta/recipes-devtools/nasm/nasm_2.11.06.bb @@ -6,8 +6,8 @@ COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)' SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 " -SRC_URI[md5sum] = "f6b1db2858cad82bbb0c8c6f3e2b0fb2" -SRC_URI[sha256sum] = "4a417bcf5cde5d203e228feea3f428a6ff4d700d558e4d79d50a30a695bdfae9" +SRC_URI[md5sum] = "9d93e8df5f5c005567f47ed6ca3a93d4" +SRC_URI[sha256sum] = "87b6d97d6981ca468f9dafda44cf1bb1ba122cec329d4d389af5db04fa0c3e6c" inherit autotools-brokensep diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb index 693c216ce4..2800a5deb7 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083" PROVIDES += "virtual/update-alternatives" -SRCREV = "eae0d8fa44e8594aa90eadf06e5f4fbeef314509" +SRCREV = "53274f087565fd45d8452c5367997ba6a682a37a" PV = "0.1.8+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/opkg-utils" diff --git a/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb b/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb index acbe1296bf..4540de2daf 100644 --- a/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb +++ b/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb @@ -1,4 +1,4 @@ -SUMMARY = "Base configuration files for opkg" +SUMMARY = "Architecture-dependent configuration for opkg" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -28,3 +28,6 @@ FILES_${PN} = "${sysconfdir}/opkg/ " CONFFILES_${PN} += "${sysconfdir}/opkg/arch.conf" +RREPLACES_${PN} = "opkg-config-base" +RCONFLICTS_${PN} = "opkg-config-base" +RPROVIDES_${PN} = "opkg-config-base" diff --git a/meta/recipes-devtools/opkg/opkg-collateral.bb b/meta/recipes-devtools/opkg/opkg-collateral.bb deleted file mode 100644 index b121827ac7..0000000000 --- a/meta/recipes-devtools/opkg/opkg-collateral.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Constructs the main configuration file for opkg" -SECTION = "base" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r2" - -SRC_URI = "file://opkg.conf.comments \ - file://dest \ - file://src " - -OPKGLIBDIR = "${localstatedir}/lib" -do_compile () { - cat ${WORKDIR}/opkg.conf.comments >${WORKDIR}/opkg.conf - cat ${WORKDIR}/src >>${WORKDIR}/opkg.conf - cat ${WORKDIR}/dest >>${WORKDIR}/opkg.conf - echo "lists_dir ext ${OPKGLIBDIR}/opkg" >>${WORKDIR}/opkg.conf -} - -do_install () { - install -d ${D}${sysconfdir}/opkg - install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf -} - -CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf" diff --git a/meta/recipes-devtools/opkg/opkg-collateral/dest b/meta/recipes-devtools/opkg/opkg-collateral/dest deleted file mode 100644 index 088ca403da..0000000000 --- a/meta/recipes-devtools/opkg/opkg-collateral/dest +++ /dev/null @@ -1 +0,0 @@ -dest root / diff --git a/meta/recipes-devtools/opkg/opkg-collateral/src b/meta/recipes-devtools/opkg/opkg-collateral/src deleted file mode 100644 index e69de29bb2..0000000000 --- a/meta/recipes-devtools/opkg/opkg-collateral/src +++ /dev/null diff --git a/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb b/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb new file mode 100644 index 0000000000..18d6abdded --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb @@ -0,0 +1,48 @@ +SUMMARY = "Keyrings for verifying opkg packages and feeds" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +# Distro-specific keys can be added to this package in two ways: +# +# 1) In a .bbappend, add .gpg and/or .asc files to SRC_URI and install them to +# ${D}${datadir}/opkg/keyrings/ in a do_install_append function. These +# files should not be named 'key-$name.gpg' to ensure they don't conflict +# with keys exported as per (2). +# +# 2) In a .bbappend, distro config or local.conf, override the variable +# OPKG_KEYRING_KEYS to contain a space-separated list of key names. For +# each name, 'gpg --export $name' will be ran to export the public key to a +# file named 'key-$name.gpg'. The public key must therefore be in the gpg +# keyrings on the build machine. + +OPKG_KEYRING_KEYS ?= "" + +do_compile() { + for name in ${OPKG_KEYRING_KEYS}; do + gpg --export ${name} > ${B}/key-${name}.gpg + done +} + +do_install () { + install -d ${D}${datadir}/opkg/keyrings/ + for name in ${OPKG_KEYRING_KEYS}; do + install -m 0644 ${B}/key-${name}.gpg ${D}${datadir}/opkg/keyrings/ + done +} + +FILES_${PN} = "${datadir}/opkg/keyrings" + +# We need 'opkg-key' to run the postinst script +RDEPENDS_${PN} = "opkg" + +pkg_postinst_${PN} () { +#! /bin/sh +set -e + +if [ x"$D" = "x" ]; then + # On target + opkg-key populate +else + exit 1 +fi +} diff --git a/meta/recipes-devtools/opkg/opkg/0001-opkg-key-Backport-improvements.patch b/meta/recipes-devtools/opkg/opkg/0001-opkg-key-Backport-improvements.patch new file mode 100644 index 0000000000..ae319ce2bb --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg/0001-opkg-key-Backport-improvements.patch @@ -0,0 +1,78 @@ +From 87bec8300a1122829b2ed565db7da5bacfa88919 Mon Sep 17 00:00:00 2001 +From: Paul Barker <paul@paulbarker.me.uk> +Date: Sun, 12 Oct 2014 09:59:53 +0000 +Subject: [PATCH] opkg-key: Backport improvements + +The improvements to opkg-key made for v0.3.0 are backported. The rest of v0.3.0 +needs further testing and bugfixing prior to release, but the improvements to +opkg-key have been tested and work well. + + 1) opkg-key: Add 'reset' option + + This option removes the keyrings used to verify package signatures, + effectively resetting opkg to the initial state where it recognises no + keys. + + 2) opkg-key: Add 'populate' option + + This option causes all keyrings in /usr/share/opkg/keyrings to be + imported. Thus distributions may install their keys into this directory + and use 'opkg-key populate' to ensure the correct keys are loaded. + + 3) opkg-key: Improve usage output + +Signed-off-by: Paul Barker <paul@paulbarker.me.uk> +Upstream-status: Backport +--- + utils/opkg-key | 26 ++++++++++++++++++++++---- + 1 file changed, 22 insertions(+), 4 deletions(-) + +diff --git a/utils/opkg-key b/utils/opkg-key +index 266bb66..085f1e8 100755 +--- a/utils/opkg-key ++++ b/utils/opkg-key +@@ -10,12 +10,17 @@ usage() { + echo + echo "Manage opkg's list of trusted keys" + echo +- echo " opkg-key add <file> - add the key contained in <file> ('-' for stdin)" +- echo " opkg-key del <keyid> - remove the key <keyid>" +- echo " opkg-key list - list keys" ++ echo "Commands and arguments:" ++ echo " add <file> - Add the key contained in <file> ('-' for stdin)" ++ echo " del <keyid> - Remove the key <keyid>" ++ echo " list - List keys" ++ echo " fingerprint - List keys with fingerprints" ++ echo " reset - Remove all keys, resetting the keyring" ++ echo " populate - Import keys from /usr/share/opkg/keyrings" ++ echo " help - Print this usage message and exit" + echo + echo "Options:" +- echo " -o <root> Use <root> as the offline root directory" ++ echo " -o <root> - Use <root> as the offline root directory" + echo + } + +@@ -64,6 +69,19 @@ case "$command" in + echo "Executing: $GPG $*" + $GPG $* + ;; ++ reset) ++ rm -f $ROOT/etc/opkg/trusted.gpg $ROOT/etc/opkg/trusted.gpg~ ++ rm -f $ROOT/etc/opkg/secring.gpg $ROOT/etc/opkg/secring.gpg~ ++ rm -f $ROOT/etc/opkg/trustdb.gpg $ROOT/etc/opkg/trustdb.gpg~ ++ echo "OK" ++ ;; ++ populate) ++ for f in $ROOT/usr/share/opkg/keyrings/*.gpg; do ++ echo "Importing keys from '`basename $f`'..." ++ $GPG --quiet --batch --import "$f" ++ done ++ echo "OK" ++ ;; + help) + usage + ;; +-- +1.9.1 + diff --git a/meta/recipes-devtools/opkg/opkg/add-exclude.patch b/meta/recipes-devtools/opkg/opkg/add-exclude.patch index c684534efb..48de923590 100644 --- a/meta/recipes-devtools/opkg/opkg/add-exclude.patch +++ b/meta/recipes-devtools/opkg/opkg/add-exclude.patch @@ -1,4 +1,4 @@ -From 5d707bbfcafd88b8b5b5821972c8c958fc3b2039 Mon Sep 17 00:00:00 2001 +From 60c3f93e95a3ca54ef0a7eebc5ef29a5d92d3110 Mon Sep 17 00:00:00 2001 From: Paul Barker <paul@paulbarker.me.uk> Date: Fri, 28 Mar 2014 15:20:22 +0000 Subject: [PATCH 2/2] opkg-0.2.x: add-exclude @@ -15,7 +15,7 @@ so there is no need to free the data. v2: Use xmalloc instead of malloc and xrealloc instead of realloc. In opkg, these functions are guaranteed not to return NULL. -Upstream-Status: Pending +Upstream-Status: Accepted for v0.3.0 release with modifications Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Jonathan Liu <net147@gmail.com> @@ -28,10 +28,10 @@ Signed-off-by: Paul Barker <paul@paulbarker.me.uk> 4 files changed, 34 insertions(+) diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c -index 1e65bad..9c4c854 100644 +index 4eee37b..1ab63fb 100644 --- a/libopkg/opkg_conf.c +++ b/libopkg/opkg_conf.c -@@ -442,6 +442,7 @@ opkg_conf_init(void) +@@ -447,6 +447,7 @@ opkg_conf_init(void) pkg_dest_list_init(&conf->pkg_dest_list); pkg_dest_list_init(&conf->tmp_dest_list); nv_pair_list_init(&conf->arch_list); @@ -40,7 +40,7 @@ index 1e65bad..9c4c854 100644 return 0; } diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h -index 6045a58..ad58849 100644 +index 2f189e0..6d6e613 100644 --- a/libopkg/opkg_conf.h +++ b/libopkg/opkg_conf.h @@ -51,6 +51,8 @@ struct opkg_conf @@ -53,10 +53,10 @@ index 6045a58..ad58849 100644 int restrict_to_default_dest; pkg_dest_t *default_dest; diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c -index d2d279e..b572e18 100644 +index 41bf206..eb630d1 100644 --- a/libopkg/pkg_depends.c +++ b/libopkg/pkg_depends.c -@@ -212,6 +212,22 @@ pkg_hash_fetch_unsatisfied_dependencies(pkg_t * pkg, pkg_vec_t *unsatisfied, +@@ -204,6 +204,22 @@ pkg_hash_fetch_unsatisfied_dependencies(pkg_t * pkg, pkg_vec_t *unsatisfied, continue; } @@ -80,7 +80,7 @@ index d2d279e..b572e18 100644 if (satisfying_pkg != NULL) { satisfier_entry_pkg = satisfying_pkg; diff --git a/src/opkg-cl.c b/src/opkg-cl.c -index 0315d41..67366b9 100644 +index 6378380..f10d10b 100644 --- a/src/opkg-cl.c +++ b/src/opkg-cl.c @@ -45,6 +45,7 @@ enum { @@ -91,7 +91,7 @@ index 0315d41..67366b9 100644 ARGS_OPT_NOACTION, ARGS_OPT_DOWNLOAD_ONLY, ARGS_OPT_NODEPS, -@@ -95,6 +96,7 @@ static struct option long_options[] = { +@@ -97,6 +98,7 @@ static struct option long_options[] = { {"offline-root", 1, 0, 'o'}, {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH}, {"add-dest", 1, 0, ARGS_OPT_ADD_DEST}, @@ -99,7 +99,7 @@ index 0315d41..67366b9 100644 {"test", 0, 0, ARGS_OPT_NOACTION}, {"tmp-dir", 1, 0, 't'}, {"tmp_dir", 1, 0, 't'}, -@@ -198,6 +200,18 @@ args_parse(int argc, char *argv[]) +@@ -200,6 +202,18 @@ args_parse(int argc, char *argv[]) } free(tuple); break; @@ -118,7 +118,7 @@ index 0315d41..67366b9 100644 case ARGS_OPT_NOACTION: conf->noaction = 1; break; -@@ -282,6 +296,7 @@ usage() +@@ -287,6 +301,7 @@ usage() printf("\t--offline-root <dir> offline installation of packages.\n"); printf("\t--add-arch <arch>:<prio> Register architecture with given priority\n"); printf("\t--add-dest <name>:<path> Register destination with given path\n"); @@ -127,5 +127,5 @@ index 0315d41..67366b9 100644 printf("\t than the higher version one if more\n"); printf("\t than one candidate is found.\n"); -- -2.0.4 +2.1.3 diff --git a/meta/recipes-devtools/opkg/opkg/libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch b/meta/recipes-devtools/opkg/opkg/libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch deleted file mode 100644 index d618206a62..0000000000 --- a/meta/recipes-devtools/opkg/opkg/libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 41425d67d3589b1912416a17f740d6407c7834f2 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 8 Oct 2014 19:53:13 +0800 -Subject: [PATCH] libopkg/opkg_remove.c: avoid remove pkg repeatly with option - --force-removal-of-dependent-packages - -While remove pkg with '--force-removal-of-dependent-packages', -pkg may be added to pkgs remove list multiple times, add status -check to make sure pkg only be removed once. - -Upstream-Status: Backport -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - ---- - libopkg/opkg_remove.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/libopkg/opkg_remove.c b/libopkg/opkg_remove.c -index 34f9154..a225e41 100644 ---- a/libopkg/opkg_remove.c -+++ b/libopkg/opkg_remove.c -@@ -250,6 +250,14 @@ opkg_remove_pkg(pkg_t *pkg, int from_upgrade) - if ((parent_pkg = pkg->parent) == NULL) - return 0; - -+ /* While remove pkg with '--force-removal-of-dependent-packages', -+ pkg may be added to remove list multiple times, add status -+ check to make sure pkg only be removed once. */ -+ if (conf->force_removal_of_dependent_packages && -+ pkg->state_flag & SF_FILELIST_CHANGED && -+ pkg->state_status == SS_NOT_INSTALLED) -+ return 0; -+ - /* only attempt to remove dependent installed packages if - * force_depends is not specified or the package is being - * replaced. --- -1.9.1 diff --git a/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch b/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch index bcca56c6ce..c2d244d26e 100644 --- a/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch +++ b/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch @@ -1,11 +1,11 @@ -From 610207c9bc82f20c77d6f234465e36857c997ea0 Mon Sep 17 00:00:00 2001 +From 2e2ccc7e7fc81a7eee2d004d3644efbc1be1ad73 Mon Sep 17 00:00:00 2001 From: Paul Barker <paul@paulbarker.me.uk> Date: Fri, 28 Mar 2014 15:19:08 +0000 Subject: [PATCH 1/2] opkg-0.2.x: no-install-recommends Add the ability to not install ANY recommended packages. -Upstream-Status: Pending +Upstream-Status: Accepted for v0.3.0 release with modifications Signed-off-by: Mark Hatle <mark.hatle@windriver.com> --- @@ -15,7 +15,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h -index 38fa375..6045a58 100644 +index e0e045a..2f189e0 100644 --- a/libopkg/opkg_conf.h +++ b/libopkg/opkg_conf.h @@ -82,6 +82,7 @@ struct opkg_conf @@ -27,10 +27,10 @@ index 38fa375..6045a58 100644 char *overlay_root; int query_all; diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c -index a4df7de..d2d279e 100644 +index 8ab6508..41bf206 100644 --- a/libopkg/pkg_depends.c +++ b/libopkg/pkg_depends.c -@@ -19,6 +19,7 @@ +@@ -21,6 +21,7 @@ #include <ctype.h> #include "pkg.h" @@ -38,7 +38,7 @@ index a4df7de..d2d279e 100644 #include "opkg_utils.h" #include "pkg_hash.h" #include "opkg_message.h" -@@ -204,7 +205,7 @@ pkg_hash_fetch_unsatisfied_dependencies(pkg_t * pkg, pkg_vec_t *unsatisfied, +@@ -196,7 +197,7 @@ pkg_hash_fetch_unsatisfied_dependencies(pkg_t * pkg, pkg_vec_t *unsatisfied, /* user request overrides package recommendation */ if (satisfying_pkg != NULL && (compound_depend->type == RECOMMEND || compound_depend->type == SUGGEST) @@ -48,18 +48,18 @@ index a4df7de..d2d279e 100644 "%s at user request\n", pkg->name, satisfying_pkg->name); diff --git a/src/opkg-cl.c b/src/opkg-cl.c -index b711511..0315d41 100644 +index a1d121f..6378380 100644 --- a/src/opkg-cl.c +++ b/src/opkg-cl.c -@@ -50,6 +50,7 @@ enum { - ARGS_OPT_NODEPS, +@@ -51,6 +51,7 @@ enum { ARGS_OPT_AUTOREMOVE, ARGS_OPT_CACHE, + ARGS_OPT_COMBINE, + ARGS_OPT_NOINSTALL_RECOMMENDS, }; static struct option long_options[] = { -@@ -89,6 +90,7 @@ static struct option long_options[] = { +@@ -91,6 +92,7 @@ static struct option long_options[] = { {"noaction", 0, 0, ARGS_OPT_NOACTION}, {"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY}, {"nodeps", 0, 0, ARGS_OPT_NODEPS}, @@ -67,7 +67,7 @@ index b711511..0315d41 100644 {"offline", 1, 0, 'o'}, {"offline-root", 1, 0, 'o'}, {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH}, -@@ -199,6 +201,9 @@ args_parse(int argc, char *argv[]) +@@ -201,6 +203,9 @@ args_parse(int argc, char *argv[]) case ARGS_OPT_NOACTION: conf->noaction = 1; break; @@ -77,7 +77,7 @@ index b711511..0315d41 100644 case ARGS_OPT_DOWNLOAD_ONLY: conf->download_only = 1; break; -@@ -293,6 +298,8 @@ usage() +@@ -300,6 +305,8 @@ usage() printf("\t--noaction No action -- test only\n"); printf("\t--download-only No action -- download only\n"); printf("\t--nodeps Do not follow dependencies\n"); @@ -87,5 +87,5 @@ index b711511..0315d41 100644 printf("\t Remove package and all dependencies\n"); printf("\t--autoremove Remove packages that were installed\n"); -- -1.9.1 +2.1.3 diff --git a/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments b/meta/recipes-devtools/opkg/opkg/opkg.conf index e1fdada9b5..c2e9e92f95 100644 --- a/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments +++ b/meta/recipes-devtools/opkg/opkg/opkg.conf @@ -24,3 +24,5 @@ # Offline mode (for use in constructing flash images offline) #option offline_root target +# Default destination for installed packages +dest root / diff --git a/meta/recipes-devtools/opkg/opkg/remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch b/meta/recipes-devtools/opkg/opkg/remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch new file mode 100644 index 0000000000..8bde02af0d --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg/remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch @@ -0,0 +1,32 @@ +From d480d837ff57e855d1cf0b63054d6b1ad7aaf2ee Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Tue, 6 Jan 2015 17:54:43 -0800 +Subject: [PATCH] Makefile.am: remove ACLOCAL_AMFLAGS = -I shave -I m4 + +Fixed: +libtoolize: error: AC_CONFIG_MACRO_DIRS([m4]) conflicts with ACLOCAL_AMFLAGS=-I shave. + +They are already included by configure.ac: +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_MACRO_DIR([shave]) + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 8baa62c..6679f77 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,3 @@ +-ACLOCAL_AMFLAGS = -I shave -I m4 +- + SUBDIRS = libbb libopkg src tests utils man + + +-- +1.7.9.5 + diff --git a/meta/recipes-devtools/opkg/opkg_0.2.2.bb b/meta/recipes-devtools/opkg/opkg_0.2.2.bb deleted file mode 100644 index 867ff7a8ee..0000000000 --- a/meta/recipes-devtools/opkg/opkg_0.2.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -require opkg.inc - -SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ - file://no-install-recommends.patch \ - file://add-exclude.patch \ - file://opkg-configure.service \ - file://libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch \ -" - -S = "${WORKDIR}/${BPN}-${PV}" - -SRC_URI[md5sum] = "b3ecef90d67d2aed2a14c2116a027482" -SRC_URI[sha256sum] = "aa554ce7538544aac4f69e8274a0f9b8b433b8c3b1d00704bd393f713303a12b" diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg_0.2.4.bb index 56c54b6ab7..23a32e61cd 100644 --- a/meta/recipes-devtools/opkg/opkg.inc +++ b/meta/recipes-devtools/opkg/opkg_0.2.4.bb @@ -9,18 +9,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ PE = "1" -# Werror gives all kinds bounds issuses with gcc 4.3.3 -do_configure_prepend() { - sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am -} +SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ + file://no-install-recommends.patch \ + file://add-exclude.patch \ + file://remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch \ + file://opkg-configure.service \ + file://opkg.conf \ + file://0001-opkg-key-Backport-improvements.patch \ +" + +SRC_URI[md5sum] = "40ed2aee15abc8d550539449630091bd" +SRC_URI[sha256sum] = "0f40c7e457d81edf9aedc07c778f4697111ab163a38ef95999faece015453086" inherit autotools pkgconfig systemd -python () { - if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): - pn = d.getVar('PN', True) - d.setVar('SYSTEMD_SERVICE_%s' % (pn), 'opkg-configure.service') -} +SYSTEMD_SERVICE_${PN} = "opkg-configure.service" target_localstatedir := "${localstatedir}" OPKGLIBDIR = "${target_localstatedir}/lib" @@ -38,23 +41,20 @@ EXTRA_OECONF = "\ --with-opkglibdir=${OPKGLIBDIR} \ " -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base run-postinsts" -RDEPENDS_${PN}_class-native = "" -RDEPENDS_${PN}_class-nativesdk = "" -RREPLACES_${PN} = "opkg-nogpg" +# Werror gives all kinds bounds issuses with gcc 4.3.3 +do_configure_prepend() { + sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am +} -PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg" +do_install_append () { + install -d ${D}${sysconfdir}/opkg + install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf + echo "option lists_dir ${OPKGLIBDIR}/opkg" >>${D}${sysconfdir}/opkg/opkg.conf -FILES_libopkg-dev = "${libdir}/*.la ${libdir}/*.so ${includedir}/libopkg" -FILES_libopkg-staticdev = "${libdir}/*.a" -FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" -FILES_${PN} += "${systemd_unitdir}/system/" - -do_install_append() { # We need to create the lock directory install -d ${D}${OPKGLIBDIR}/opkg - if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)};then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/opkg-configure.service ${D}${systemd_unitdir}/system/ sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ @@ -67,10 +67,24 @@ do_install_append() { # The installed binary is 'opkg-cl' but people and scripts often expect # it to just be 'opkg' ln -sf opkg-cl ${D}${bindir}/opkg -} -do_install_append() { rm ${D}${bindir}/update-alternatives } +RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config run-postinsts" +RDEPENDS_${PN}_class-native = "" +RDEPENDS_${PN}_class-nativesdk = "" +RREPLACES_${PN} = "opkg-nogpg opkg-collateral" +RCONFLICTS_${PN} = "opkg-collateral" +RPROVIDES_${PN} = "opkg-collateral" + +PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg" + +FILES_libopkg-dev = "${libdir}/*.la ${libdir}/*.so ${includedir}/libopkg" +FILES_libopkg-staticdev = "${libdir}/*.a" +FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" +FILES_${PN} += "${systemd_unitdir}/system/" + BBCLASSEXTEND = "native nativesdk" + +CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf" diff --git a/meta/recipes-devtools/orc/orc_0.4.18.bb b/meta/recipes-devtools/orc/orc_0.4.18.bb deleted file mode 100644 index 2375d8c696..0000000000 --- a/meta/recipes-devtools/orc/orc_0.4.18.bb +++ /dev/null @@ -1,6 +0,0 @@ -require orc.inc - -PR = "${INC_PR}.0" - -SRC_URI[orc.md5sum] = "1a2552e8d127526c48d644fe6437b377" -SRC_URI[orc.sha256sum] = "34d3c8a7259f42bed4dcfbc106c5e3d0cc8e17eeaa73128d1c5eaf92883a6a24" diff --git a/meta/recipes-devtools/orc/orc.inc b/meta/recipes-devtools/orc/orc_0.4.23.bb index b1348310ab..0e07731ac6 100644 --- a/meta/recipes-devtools/orc/orc.inc +++ b/meta/recipes-devtools/orc/orc_0.4.23.bb @@ -3,9 +3,9 @@ HOMEPAGE = "http://code.entropywave.com/projects/orc/" LICENSE = "BSD-2-Clause & BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=1400bd9d09e8af56b9ec982b3d85797e" -INC_PR = "r2" - -SRC_URI = "http://code.entropywave.com/download/orc/orc-${PV}.tar.gz;name=orc" +SRC_URI = "http://gstreamer.freedesktop.org/src/orc/orc-${PV}.tar.xz;name=orc" +SRC_URI[orc.md5sum] = "72e0612ace54d77aa2f7a006348ee81a" +SRC_URI[orc.sha256sum] = "767eaebce2941737b43368225ec54598b3055ca78b4dc50c4092f5fcdc0bdfe7" inherit autotools pkgconfig diff --git a/meta/recipes-devtools/patch/patch.inc b/meta/recipes-devtools/patch/patch.inc index b49226a1b2..332b97a85e 100644 --- a/meta/recipes-devtools/patch/patch.inc +++ b/meta/recipes-devtools/patch/patch.inc @@ -9,8 +9,5 @@ S = "${WORKDIR}/patch-${PV}" inherit autotools update-alternatives -PACKAGECONFIG ??= "" -PACKAGECONFIG[attr] = "--enable-xattr,--disable-xattr,attr" - ALTERNATIVE_${PN} = "patch" ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-devtools/patch/patch/patch-CVE-2015-1196.patch b/meta/recipes-devtools/patch/patch/patch-CVE-2015-1196.patch new file mode 100644 index 0000000000..d408346ac2 --- /dev/null +++ b/meta/recipes-devtools/patch/patch/patch-CVE-2015-1196.patch @@ -0,0 +1,200 @@ +From 4e9269a5fc1fe80a1095a92593dd85db871e1fd3 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher <andreas.gruenbacher@gmail.com> +Date: Mon, 19 Jan 2015 23:18:30 +0100 +Subject: [PATCH] Make sure symlinks don't point outside working directory + (CVE-2015-1196) + +When creating symlinks from git-style patches, make sure the symlinks don't +point above the current working directory. Otherwise, a subsequent patch could +use the symlink to write outside the working directory. + +* src/pch.c (symlink_target_is_valid): New function to check for valid symlink +targets. +* src/util.c (move_file): Use symlink_target_is_valid() here. +* tests/symlinks: Add valid and invalid symlink test cases. + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + +Upstream-Status: Backport + +--- + NEWS | 3 ++ + src/pch.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/pch.h | 1 + + src/util.c | 7 +++++++ + tests/symlinks | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 117 insertions(+) + +diff --git a/NEWS b/NEWS +index 42afed7..d3f1c2d 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,6 @@ ++* With git-style patches, symlinks that point outside the working directory ++ will no longer be created. ++ + Changes in version 2.7.1: + + * Two critical bug fixes in the "diff --git" format support. +diff --git a/src/pch.c b/src/pch.c +index 55e1504..f05ef83 100644 +--- a/src/pch.c ++++ b/src/pch.c +@@ -454,6 +454,60 @@ name_is_valid (char const *name) + return is_valid; + } + ++bool ++symlink_target_is_valid (char const *target, char const *to) ++{ ++ bool is_valid; ++ ++ if (IS_ABSOLUTE_FILE_NAME (to)) ++ is_valid = true; ++ else if (IS_ABSOLUTE_FILE_NAME (target)) ++ is_valid = false; ++ else ++ { ++ unsigned int depth = 0; ++ char const *t; ++ ++ is_valid = true; ++ t = to; ++ while (*t) ++ { ++ while (*t && ! ISSLASH (*t)) ++ t++; ++ if (ISSLASH (*t)) ++ { ++ while (ISSLASH (*t)) ++ t++; ++ depth++; ++ } ++ } ++ ++ t = target; ++ while (*t) ++ { ++ if (*t == '.' && *++t == '.' && (! *++t || ISSLASH (*t))) ++ { ++ if (! depth--) ++ { ++ is_valid = false; ++ break; ++ } ++ } ++ else ++ { ++ while (*t && ! ISSLASH (*t)) ++ t++; ++ depth++; ++ } ++ while (ISSLASH (*t)) ++ t++; ++ } ++ } ++ ++ /* Allow any symlink target if we are in the filesystem root. */ ++ return is_valid || cwd_is_root (to); ++} ++ + /* Determine what kind of diff is in the remaining part of the patch file. */ + + static enum diff +diff --git a/src/pch.h b/src/pch.h +index 0c7ff62..58861b0 100644 +--- a/src/pch.h ++++ b/src/pch.h +@@ -37,6 +37,7 @@ bool pch_write_line (lin, FILE *); + bool there_is_another_patch (bool, mode_t *); + char *pfetch (lin) _GL_ATTRIBUTE_PURE; + char pch_char (lin) _GL_ATTRIBUTE_PURE; ++bool symlink_target_is_valid (char const *, char const *); + int another_hunk (enum diff, bool); + int pch_says_nonexistent (bool) _GL_ATTRIBUTE_PURE; + size_t pch_line_len (lin) _GL_ATTRIBUTE_PURE; +diff --git a/src/util.c b/src/util.c +index 66ae90f..636eded 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -470,6 +470,13 @@ move_file (char const *from, bool *from_needs_removal, + read_fatal (); + buffer[size] = 0; + ++ if (! symlink_target_is_valid (buffer, to)) ++ { ++ fprintf (stderr, "symbolic link target '%s' is invalid\n", ++ buffer); ++ fatal_exit (0); ++ } ++ + if (! backup) + { + if (unlink (to) == 0) +diff --git a/tests/symlinks b/tests/symlinks +index 96626b3..6211026 100644 +--- a/tests/symlinks ++++ b/tests/symlinks +@@ -146,6 +146,59 @@ ncheck 'test ! -L symlink' + + # -------------------------------------------------------------- + ++# Patch should not create symlinks which point outside the working directory. ++ ++cat > symlink-target.diff <<EOF ++diff --git a/dir/foo b/dir/foo ++new file mode 120000 ++index 0000000..cad2309 ++--- /dev/null +++++ b/dir/foo ++@@ -0,0 +1 @@ +++../foo ++\ No newline at end of file ++EOF ++ ++check 'patch -p1 < symlink-target.diff || echo "Status: $?"' <<EOF ++patching symbolic link dir/foo ++EOF ++ ++cat > bad-symlink-target1.diff <<EOF ++diff --git a/bar b/bar ++new file mode 120000 ++index 0000000..cad2309 ++--- /dev/null +++++ b/bar ++@@ -0,0 +1 @@ +++/bar ++\ No newline at end of file ++EOF ++ ++check 'patch -p1 < bad-symlink-target1.diff || echo "Status: $?"' <<EOF ++patching symbolic link bar ++symbolic link target '/bar' is invalid ++Status: 2 ++EOF ++ ++cat > bad-symlink-target2.diff <<EOF ++diff --git a/baz b/baz ++new file mode 120000 ++index 0000000..cad2309 ++--- /dev/null +++++ b/baz ++@@ -0,0 +1 @@ +++../baz ++\ No newline at end of file ++EOF ++ ++check 'patch -p1 < bad-symlink-target2.diff || echo "Status: $?"' <<EOF ++patching symbolic link baz ++symbolic link target '../baz' is invalid ++Status: 2 ++EOF ++ ++# -------------------------------------------------------------- ++ + # The backup file of a new symlink is an empty regular file. + + check 'patch -p1 --backup < create-symlink.diff || echo "Status: $?"' <<EOF +-- +2.1.4 + diff --git a/meta/recipes-devtools/patch/patch_2.7.1.bb b/meta/recipes-devtools/patch/patch_2.7.1.bb index 3db318a7ec..1a3b9b1201 100644 --- a/meta/recipes-devtools/patch/patch_2.7.1.bb +++ b/meta/recipes-devtools/patch/patch_2.7.1.bb @@ -1,6 +1,7 @@ require patch.inc LICENSE = "GPLv3" +SRC_URI += "file://patch-CVE-2015-1196.patch" SRC_URI[md5sum] = "95dd8d7e41dcbcecdd5cd88ef915378d" SRC_URI[sha256sum] = "c05f28668c3474bc63adcd48abae921d15e71c254fbebdbaeda40456d64039d5" diff --git a/meta/recipes-devtools/pax-utils/pax-utils_0.8.1.bb b/meta/recipes-devtools/pax-utils/pax-utils_0.9.2.bb index 79e58ba261..ea3d78ebaa 100644 --- a/meta/recipes-devtools/pax-utils/pax-utils_0.8.1.bb +++ b/meta/recipes-devtools/pax-utils/pax-utils_0.9.2.bb @@ -9,10 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" SRC_URI = "http://gentoo.osuosl.org/distfiles/pax-utils-${PV}.tar.xz" -SRC_URI[md5sum] = "bc42279c5aff3682c12be40f72805cec" -SRC_URI[sha256sum] = "844ff25b1a11bcef92ef34b22f576f226a772b67196818656f8874513438f5b9" +SRC_URI[md5sum] = "34c41888cec67759c21333bef13e950c" +SRC_URI[sha256sum] = "578801df0661b1b7b8fed0ce4a9859239f919fd37529907681e51091a1bcb4de" -RDEPENDS_${PN} += "bash" +RDEPENDS_${PN} += "bash python" do_install() { oe_runmake PREFIX=${D}${prefix} DESTDIR=${D} install diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb b/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb index 26241e884c..9ccd417398 100644 --- a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb +++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb @@ -1,15 +1,13 @@ SUMMARY = "XML::Parser - A perl module for parsing XML documents" SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0" +LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://README;beginline=2;endline=6;md5=c8767d7516229f07b26e42d1cf8b51f1" DEPENDS += "expat expat-native" -PR = "r3" - SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz" -SRC_URI[md5sum] = "c320d2ffa459e6cdc6f9f59c1185855e" -SRC_URI[sha256sum] = "b48197cd2265a26c5f016489f11a7b450d8833cb8b3d6a46ee15975740894de9" +SRC_URI[md5sum] = "af4813fe3952362451201ced6fbce379" +SRC_URI[sha256sum] = "1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216" S = "${WORKDIR}/XML-Parser-${PV}" diff --git a/meta/recipes-devtools/perl/libxml-simple-perl_2.20.bb b/meta/recipes-devtools/perl/libxml-simple-perl_2.20.bb index 1fcb3224e8..b72afc0ca4 100644 --- a/meta/recipes-devtools/perl/libxml-simple-perl_2.20.bb +++ b/meta/recipes-devtools/perl/libxml-simple-perl_2.20.bb @@ -6,7 +6,7 @@ on top of an underlying XML parsing module to maintain XML files \ where the original uses plain Perl or SAX parsers." HOMEPAGE = "http://search.cpan.org/~markov/XML-LibXML-Simple-0.93/lib/XML/LibXML/Simple.pod" SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0" +LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=e7dbb3e2241fac8457967053fc1a1ddb" DEPENDS += "libxml-parser-perl" diff --git a/meta/recipes-devtools/perl/perl-5.20.0/fix-FF_MORE-crash.patch b/meta/recipes-devtools/perl/perl-5.20.0/fix-FF_MORE-crash.patch new file mode 100644 index 0000000000..9ec041c833 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.20.0/fix-FF_MORE-crash.patch @@ -0,0 +1,21 @@ +Upstream-Status: Backport +Reference: https://rt.perl.org/Public/Bug/Display.html?id=123591 + From 62db6ea5fed19611596cbc5fc0b8a4df2c604e58 Mon Sep 17 00:00:00 2001 + From: Tony Cook <tony@develop-help.com> + Date: Mon, 19 Jan 2015 16:03:18 +1100 + Subject: [PATCH 1/1] [perl #123538] always set chophere and itembytes at the same time + + Previously this would crash in FF_MORE because chophere was still NULL. + +Signed-off-by: Gary Thomas <gary@mlbassoc.com> +Index: perl-5.20.0/pp_ctl.c +=================================================================== +--- perl-5.20.0.orig/pp_ctl.c ++++ perl-5.20.0/pp_ctl.c +@@ -590,6 +590,7 @@ PP(pp_formline) + break; + } + itembytes = s - item; ++ chophere = s; + break; + } diff --git a/meta/recipes-devtools/perl/perl-native_5.20.0.bb b/meta/recipes-devtools/perl/perl-native_5.20.0.bb index 01d40fcff2..586a347c0f 100644 --- a/meta/recipes-devtools/perl/perl-native_5.20.0.bb +++ b/meta/recipes-devtools/perl/perl-native_5.20.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Perl scripting language" HOMEPAGE = "http://www.perl.org/" SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0" +LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \ file://Artistic;md5=2e6fd2475335af892494fe1f7327baf3" diff --git a/meta/recipes-devtools/perl/perl-rdepends_5.20.0.inc b/meta/recipes-devtools/perl/perl-rdepends_5.20.0.inc index 041471a046..e39663c7d6 100644 --- a/meta/recipes-devtools/perl/perl-rdepends_5.20.0.inc +++ b/meta/recipes-devtools/perl/perl-rdepends_5.20.0.inc @@ -1841,6 +1841,7 @@ RDEPENDS_${PN}-module-overloading += "${PN}-module-warnings" RDEPENDS_${PN}-module-overload += "${PN}-module-mro" RDEPENDS_${PN}-module-overload += "${PN}-module-scalar-util" RDEPENDS_${PN}-module-overload += "${PN}-module-warnings-register" +RDEPENDS_${PN}-module-overload += "${PN}-module-overloading" RDEPENDS_${PN}-module-package-constants += "${PN}-module-if" RDEPENDS_${PN}-module-package-constants += "${PN}-module-strict" RDEPENDS_${PN}-module-package-constants += "${PN}-module-vars" diff --git a/meta/recipes-devtools/perl/perl_5.20.0.bb b/meta/recipes-devtools/perl/perl_5.20.0.bb index 3ca0f53964..db65202ec8 100644 --- a/meta/recipes-devtools/perl/perl_5.20.0.bb +++ b/meta/recipes-devtools/perl/perl_5.20.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Perl scripting language" HOMEPAGE = "http://www.perl.org/" SECTION = "devel" -LICENSE = "Artistic-1.0 | GPL-1.0" +LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \ file://Artistic;md5=2e6fd2475335af892494fe1f7327baf3" # We need gnugrep (for -I) @@ -63,6 +63,7 @@ SRC_URI += " \ file://fix_bad_rpath.patch \ file://perl-archlib-exp.patch \ file://dynaloaderhack.patch \ + file://fix-FF_MORE-crash.patch \ \ \ file://config.sh \ diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/0001-Strip-system-library-directories-reliably.patch b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/0001-Strip-system-library-directories-reliably.patch new file mode 100644 index 0000000000..84d0dd8ca7 --- /dev/null +++ b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/0001-Strip-system-library-directories-reliably.patch @@ -0,0 +1,30 @@ +Upstream-Status: Backport (will be in 0.29) +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From ce1a2416ce0f0bd9a8a8a5caaf7dad20cda4d47d Mon Sep 17 00:00:00 2001 +From: Andrew Oakley <aoakley@espial.com> +Date: Tue, 29 Apr 2014 13:14:35 +0100 +Subject: [PATCH] Strip system library directories reliably + +This loop was changed from a while loop to a for loop in commit +9bf6277b, but the iterator is now advanced twice each time round the +loop. +--- + pkg.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/pkg.c b/pkg.c +index 3697fec..c847c95 100644 +--- a/pkg.c ++++ b/pkg.c +@@ -917,7 +917,6 @@ verify_package (Package *pkg) + } + system_dir_iter = system_dir_iter->next; + } +- iter = iter->next; + } + g_list_free (system_directories); + +-- +1.7.10.4 + diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb index 3070da99d3..57a22d4c78 100644 --- a/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb +++ b/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb @@ -4,6 +4,7 @@ SRC_URI += " \ file://pkg-config-native.in \ file://fix-glib-configure-libtool-usage.patch \ file://obsolete_automake_macros.patch \ + file://0001-Strip-system-library-directories-reliably.patch \ " SRC_URI[md5sum] = "aa3c86e67551adc3ac865160e34a2a0d" diff --git a/meta/recipes-devtools/postinst-intercept/postinst-intercept_1.0.bb b/meta/recipes-devtools/postinst-intercept/nativesdk-postinst-intercept_1.0.bb index 41b9a6e49e..7dc45c68f2 100644 --- a/meta/recipes-devtools/postinst-intercept/postinst-intercept_1.0.bb +++ b/meta/recipes-devtools/postinst-intercept/nativesdk-postinst-intercept_1.0.bb @@ -2,12 +2,12 @@ SUMMARY = "Postinstall scriptlets" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -FILES_${PN}_append_class-nativesdk = " ${datadir}/postinst-intercepts/*" +FILES_${PN}_append = " ${datadir}/postinst-intercepts/*" do_configure[noexec] = "1" do_compile[noexec] = "1" -do_install_append_class-nativesdk() { +do_install() { install -d ${D}${datadir}/postinst-intercepts install -m 755 ${COREBASE}/scripts/postinst-intercepts/postinst_intercept ${D}${datadir}/postinst-intercepts/ install -m 755 ${COREBASE}/scripts/postinst-intercepts/update_font_cache ${D}${datadir}/postinst-intercepts/ @@ -15,5 +15,5 @@ do_install_append_class-nativesdk() { install -m 755 ${COREBASE}/scripts/postinst-intercepts/update_pixbuf_cache ${D}${datadir}/postinst-intercepts/ } -BBCLASSEXTEND = "nativesdk" +inherit nativesdk INHIBIT_DEFAULT_DEPS = "1" diff --git a/meta/recipes-devtools/pseudo/files/0001-pseudo_has_unload-add-function.patch b/meta/recipes-devtools/pseudo/files/0001-pseudo_has_unload-add-function.patch deleted file mode 100644 index b5c81c9d3e..0000000000 --- a/meta/recipes-devtools/pseudo/files/0001-pseudo_has_unload-add-function.patch +++ /dev/null @@ -1,190 +0,0 @@ -From be97cb958f2934fa398fc8e344b25b84ebd4e90c Mon Sep 17 00:00:00 2001 -From: "Peter A. Bigot" <pab@pabigot.com> -Date: Sun, 25 Aug 2013 19:22:09 -0500 -Subject: [PATCH] pseudo_has_unload: add function - -Various wrappers checked for a non-null pseudo_get_value("PSEUDO_UNLOAD") to -determine whether the environment should include the pseudo variables. None -of those checks freed the returned value when it was not null. The new -check function does. - -The new check function also sees whether PSEUDO_UNLOAD was defined in the -environment that should be used in the wrapped system call. This allows -pkg_postinst scripts to strip out the LD_PRELOAD setting, for example before -invoking qemu to execute commands in an environment that does not have -libpseudo.so. - -[YOCTO #4843] - -Upstream-Status: Pending -Signed-off-by: Peter A. Bigot <pab@pabigot.com> ---- - ports/common/guts/execv.c | 2 +- - ports/common/guts/execve.c | 2 +- - ports/common/guts/execvp.c | 2 +- - ports/common/guts/fork.c | 2 +- - ports/linux/newclone/pseudo_wrappers.c | 2 +- - ports/linux/oldclone/pseudo_wrappers.c | 2 +- - ports/unix/guts/popen.c | 2 +- - ports/unix/guts/system.c | 2 +- - pseudo.h | 1 + - pseudo_util.c | 27 +++++++++++++++++++++++++++ - 10 files changed, 36 insertions(+), 8 deletions(-) - -diff --git a/ports/common/guts/execv.c b/ports/common/guts/execv.c -index 763e1f9..3e1f820 100644 ---- a/ports/common/guts/execv.c -+++ b/ports/common/guts/execv.c -@@ -19,7 +19,7 @@ - } - - pseudo_setupenv(); -- if (pseudo_get_value("PSEUDO_UNLOAD")) -+ if (pseudo_has_unload(NULL)) - pseudo_dropenv(); - - /* if exec() fails, we may end up taking signals unexpectedly... -diff --git a/ports/common/guts/execve.c b/ports/common/guts/execve.c -index a003657..ff6a44e 100644 ---- a/ports/common/guts/execve.c -+++ b/ports/common/guts/execve.c -@@ -20,7 +20,7 @@ - } - - new_environ = pseudo_setupenvp(envp); -- if (pseudo_get_value("PSEUDO_UNLOAD")) -+ if (pseudo_has_unload(new_environ)) - new_environ = pseudo_dropenvp(new_environ); - - /* if exec() fails, we may end up taking signals unexpectedly... -diff --git a/ports/common/guts/execvp.c b/ports/common/guts/execvp.c -index 5e75be7..04253c3 100644 ---- a/ports/common/guts/execvp.c -+++ b/ports/common/guts/execvp.c -@@ -20,7 +20,7 @@ - } - - pseudo_setupenv(); -- if (pseudo_get_value("PSEUDO_UNLOAD")) -+ if (pseudo_has_unload(NULL)) - pseudo_dropenv(); - - /* if exec() fails, we may end up taking signals unexpectedly... -diff --git a/ports/common/guts/fork.c b/ports/common/guts/fork.c -index df8abd7..bebe3b0 100644 ---- a/ports/common/guts/fork.c -+++ b/ports/common/guts/fork.c -@@ -12,7 +12,7 @@ - */ - if (rc == 0) { - pseudo_setupenv(); -- if (!pseudo_get_value("PSEUDO_UNLOAD")) { -+ if (!pseudo_has_unload(NULL)) { - pseudo_reinit_libpseudo(); - } else { - pseudo_dropenv(); -diff --git a/ports/linux/newclone/pseudo_wrappers.c b/ports/linux/newclone/pseudo_wrappers.c -index 9dbac42..257e8bb 100644 ---- a/ports/linux/newclone/pseudo_wrappers.c -+++ b/ports/linux/newclone/pseudo_wrappers.c -@@ -28,7 +28,7 @@ int wrap_clone_child(void *args) { - - if (!(flags & CLONE_VM)) { - pseudo_setupenv(); -- if (!pseudo_get_value("PSEUDO_UNLOAD")) { -+ if (!pseudo_has_unload(NULL)) { - pseudo_reinit_libpseudo(); - } else { - pseudo_dropenv(); -diff --git a/ports/linux/oldclone/pseudo_wrappers.c b/ports/linux/oldclone/pseudo_wrappers.c -index c0ce5dd..598d966 100644 ---- a/ports/linux/oldclone/pseudo_wrappers.c -+++ b/ports/linux/oldclone/pseudo_wrappers.c -@@ -22,7 +22,7 @@ int wrap_clone_child(void *args) { - - if (!(flags & CLONE_VM)) { - pseudo_setupenv(); -- if (!pseudo_get_value("PSEUDO_UNLOAD")) { -+ if (!pseudo_has_unload(NULL)) { - pseudo_reinit_libpseudo(); - } else { - pseudo_dropenv(); -diff --git a/ports/unix/guts/popen.c b/ports/unix/guts/popen.c -index 0ca16b0..5d44c0e 100644 ---- a/ports/unix/guts/popen.c -+++ b/ports/unix/guts/popen.c -@@ -9,7 +9,7 @@ - * in ways that avoid our usual enforcement of the environment. - */ - pseudo_setupenv(); -- if (pseudo_get_value("PSEUDO_UNLOAD")) -+ if (pseudo_has_unload(NULL)) - pseudo_dropenv(); - - rc = real_popen(command, mode); -diff --git a/ports/unix/guts/system.c b/ports/unix/guts/system.c -index 028b372..6351592 100644 ---- a/ports/unix/guts/system.c -+++ b/ports/unix/guts/system.c -@@ -9,7 +9,7 @@ - return 1; - - pseudo_setupenv(); -- if (pseudo_get_value("PSEUDO_UNLOAD")) -+ if (pseudo_has_unload(NULL)) - pseudo_dropenv(); - - rc = real_system(command); -diff --git a/pseudo.h b/pseudo.h -index 56760a4..f600793 100644 ---- a/pseudo.h -+++ b/pseudo.h -@@ -28,6 +28,7 @@ extern void pseudo_init_client(void); - void pseudo_dump_env(char **envp); - int pseudo_set_value(const char *key, const char *value); - char *pseudo_get_value(const char *key); -+int pseudo_has_unload(char * const *envp); - - #include "pseudo_tables.h" - -diff --git a/pseudo_util.c b/pseudo_util.c -index 8d0969e..16c70e0 100644 ---- a/pseudo_util.c -+++ b/pseudo_util.c -@@ -95,6 +95,33 @@ dump_env(char **envp) { - } - #endif - -+int -+pseudo_has_unload(char * const *envp) { -+ static const char unload[] = "PSEUDO_UNLOAD"; -+ static size_t unload_len = strlen(unload); -+ size_t i = 0; -+ -+ /* Is it in the caller environment? */ -+ if (NULL != getenv(unload)) -+ return 1; -+ -+ /* Is it in the environment cache? */ -+ if (pseudo_util_initted == -1) -+ pseudo_init_util(); -+ while (pseudo_env[i].key && strcmp(pseudo_env[i].key, unload)) -+ ++i; -+ if (pseudo_env[i].key && pseudo_env[i].value) -+ return 1; -+ -+ /* Is it in the operational environment? */ -+ while (envp && *envp) { -+ if ((!strncmp(*envp, unload, unload_len)) && ('=' == (*envp)[unload_len])) -+ return 1; -+ ++envp; -+ } -+ return 0; -+} -+ - /* Caller must free memory! */ - char * - pseudo_get_value(const char *key) { --- -1.7.9.5 - diff --git a/meta/recipes-devtools/pseudo/files/pseudo-1.5.1-install-directory-mode.patch b/meta/recipes-devtools/pseudo/files/pseudo-1.5.1-install-directory-mode.patch deleted file mode 100644 index e8eaf13f74..0000000000 --- a/meta/recipes-devtools/pseudo/files/pseudo-1.5.1-install-directory-mode.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream-Status: Backport - -when install command sets the created directory mode, pseudo will change -the mode of the directory to 0700 incorrectly. - -Signed-off-by: yanjun.zhu <yanjun.zhu@windriver.com> -Signed-off-by: Kai Kang <kai.kang@windriver.com> - ---- a/ports/unix/guts/mkdirat.c -+++ b/ports/unix/guts/mkdirat.c -@@ -25,6 +25,7 @@ - stat_rc = base_fstatat(dirfd, path, &buf, AT_SYMLINK_NOFOLLOW); - #endif - if (stat_rc != -1) { -+ buf.st_mode = PSEUDO_DB_MODE(buf.st_mode, mode); - pseudo_client_op(OP_MKDIR, 0, -1, dirfd, path, &buf); - } else { - pseudo_debug(1, "mkdir of %s succeeded, but stat failed: %s\n", diff --git a/meta/recipes-devtools/pseudo/files/pseudo-fchmodat-permissions.patch b/meta/recipes-devtools/pseudo/files/pseudo-fchmodat-permissions.patch deleted file mode 100644 index 7b1f82d577..0000000000 --- a/meta/recipes-devtools/pseudo/files/pseudo-fchmodat-permissions.patch +++ /dev/null @@ -1,264 +0,0 @@ -commit 7e67d082737b3df4788caf85fedd607b3acd9786 -Author: Peter Seebach <peter.seebach@windriver.com> -Date: Fri May 16 15:53:06 2014 -0500 - - permissions updates: improve fchmodat, mask out write bits - - Upstream-Status: Backport of several patches from 1.6 branch, - combined. - - Backport from pseudo 1.6 of improvements to fchmodat (handle - AT_SYMLINK_NOFOLLOW by rejecting it if the host system does, - to make GNU tar happier), also mask out write bits from filesystem - modes to avoid security problems. - - Also start tracking umask so we can use the right modes for - open, mkdir, and mknod. - - The 1.6 patches are: - - 87c53ea58befef48677846693aab445df1850e16 - 3c716e0bab4f0cfe4be84caa9ce5fd5e3f5e2a23 - c98e4f43b5d6499748a5057134408f4ba4854fb4 - 2f71a021b725c1aa415439209a89327f0b997d02 - 14925786b55202d8147b0af719038e8a23ef73c0 - -diff --git a/ChangeLog.txt b/ChangeLog.txt -index 113f675..cc966ce 100644 ---- a/ChangeLog.txt -+++ b/ChangeLog.txt -@@ -1,3 +1,18 @@ -+2014-05-27: -+ * (seebs) start noticing umask, mask it out from open or mkdir -+ calls rather than relying on underlying open/mkdir to do it. -+ -+2014-05-16: -+ * (seebs) fchmodat: don't drop flags, report failures, to improve -+ compatibility/consistency. Cache the knowledge that -+ AT_SYMLINK_NOFOLLOW gets ENOTSUP. -+ * (seebs) mask out group/other write bits in real filesystem to -+ reduce risks when assembling a rootfs including world-writeable -+ directories. -+ -+2014-05-15: -+ * (seebs) drop flags when calling fchmodat() to appease GNU tar. -+ - 2013-02-27: - * (seebs) Oh, hey, what if I took out my debug messages? - * (seebs) update docs a bit to reduce bitrot -diff --git a/makewrappers b/makewrappers -index e87cc56..0127766 100755 ---- a/makewrappers -+++ b/makewrappers -@@ -204,6 +204,7 @@ class Function: - 'uid_t': '0', - 'int': '-1', - 'long': '-1', -+ 'mode_t': '0', - 'ssize_t': '-1' - } - -diff --git a/ports/darwin/guts/open.c b/ports/darwin/guts/open.c -index c66cc15..520bb70 100644 ---- a/ports/darwin/guts/open.c -+++ b/ports/darwin/guts/open.c -@@ -9,6 +9,9 @@ - struct stat buf = { }; - int existed = 1; - int save_errno; -+ -+ /* mask out mode bits appropriately */ -+ mode = mode & ~pseudo_umask; - #ifdef PSEUDO_FORCE_ASYNCH - flags &= ~O_SYNC; - #endif -diff --git a/ports/linux/guts/__xmknodat.c b/ports/linux/guts/__xmknodat.c -index 59b4f2f..0888b8a 100644 ---- a/ports/linux/guts/__xmknodat.c -+++ b/ports/linux/guts/__xmknodat.c -@@ -9,6 +9,9 @@ - pseudo_msg_t *msg; - struct stat64 buf; - -+ /* mask out mode bits appropriately */ -+ mode = mode & ~pseudo_umask; -+ - /* we don't use underlying call, so _ver is irrelevant to us */ - (void) ver; - -diff --git a/ports/linux/guts/openat.c b/ports/linux/guts/openat.c -index 8460073..4053549 100644 ---- a/ports/linux/guts/openat.c -+++ b/ports/linux/guts/openat.c -@@ -10,6 +10,9 @@ - int existed = 1; - int save_errno; - -+ /* mask out mode bits appropriately */ -+ mode = mode & ~pseudo_umask; -+ - #ifdef PSEUDO_NO_REAL_AT_FUNCTIONS - if (dirfd != AT_FDCWD) { - errno = ENOSYS; -diff --git a/ports/unix/guts/fchmodat.c b/ports/unix/guts/fchmodat.c -index 59a92ce..69a953c 100644 ---- a/ports/unix/guts/fchmodat.c -+++ b/ports/unix/guts/fchmodat.c -@@ -8,6 +8,7 @@ - */ - PSEUDO_STATBUF buf; - int save_errno = errno; -+ static int picky_fchmodat = 0; - - #ifdef PSEUDO_NO_REAL_AT_FUNCTIONS - if (dirfd != AT_FDCWD) { -@@ -15,6 +16,16 @@ - return -1; - } - if (flags & AT_SYMLINK_NOFOLLOW) { -+ /* Linux, as of this writing, will always reject this. -+ * GNU tar relies on getting the rejection. To cut down -+ * on traffic, we check for the failure, and if we saw -+ * a failure previously, we reject it right away and tell -+ * the caller to retry. -+ */ -+ if (picky_fchmodat) { -+ errno = ENOTSUP; -+ return -1; -+ } - rc = base_lstat(path, &buf); - } else { - rc = base_stat(path, &buf); -@@ -50,13 +61,22 @@ - - /* user bits added so "root" can always access files. */ - #ifdef PSEUDO_NO_REAL_AT_FUNCTIONS -- /* note: if path was a symlink, and AT_NOFOLLOW_SYMLINKS was -+ /* note: if path was a symlink, and AT_SYMLINK_NOFOLLOW was - * specified, we already bailed previously. */ - real_chmod(path, PSEUDO_FS_MODE(mode, S_ISDIR(buf.st_mode))); - #else -- real_fchmodat(dirfd, path, PSEUDO_FS_MODE(mode, S_ISDIR(buf.st_mode)), flags); -+ rc = real_fchmodat(dirfd, path, PSEUDO_FS_MODE(mode, S_ISDIR(buf.st_mode)), flags); -+ /* AT_SYMLINK_NOFOLLOW isn't supported by fchmodat. GNU tar -+ * tries to use it anyway, figuring it can just retry if that -+ * fails. So we want to report that *particular* failure instead -+ * of doing the fallback. -+ */ -+ if (rc == -1 && errno == ENOTSUP && (flags & AT_SYMLINK_NOFOLLOW)) { -+ picky_fchmodat = 1; -+ return -1; -+ } - #endif -- /* we ignore a failure from underlying fchmod, because pseudo -+ /* we otherwise ignore failures from underlying fchmod, because pseudo - * may believe you are permitted to change modes that the filesystem - * doesn't. Note that we also don't need to know whether the - * file might be a (pseudo) block device or some such; pseudo -diff --git a/ports/unix/guts/mkdirat.c b/ports/unix/guts/mkdirat.c -index e846b70..e0b6af9 100644 ---- a/ports/unix/guts/mkdirat.c -+++ b/ports/unix/guts/mkdirat.c -@@ -6,11 +6,14 @@ - * wrap_mkdirat(int dirfd, const char *path, mode_t mode) { - * int rc = -1; - */ -+ /* mask out mode bits appropriately */ -+ mode = mode & ~pseudo_umask; - #ifdef PSEUDO_NO_REAL_AT_FUNCTIONS - if (dirfd != AT_FDCWD) { - errno = ENOSYS; - return -1; - } -+ - rc = real_mkdir(path, PSEUDO_FS_MODE(mode, 1)); - #else - rc = real_mkdirat(dirfd, path, PSEUDO_FS_MODE(mode, 1)); -diff --git a/ports/unix/guts/mknodat.c b/ports/unix/guts/mknodat.c -index 6fd5b42..5d8d47c 100644 ---- a/ports/unix/guts/mknodat.c -+++ b/ports/unix/guts/mknodat.c -@@ -10,6 +10,9 @@ - PSEUDO_STATBUF buf; - int save_errno = errno; - -+ /* mask out mode bits appropriately */ -+ mode = mode & ~pseudo_umask; -+ - #ifdef PSEUDO_NO_REAL_AT_FUNCTIONS - if (dirfd != AT_FDCWD) { - errno = ENOSYS; -diff --git a/ports/unix/guts/umask.c b/ports/unix/guts/umask.c -new file mode 100644 -index 0000000..6b060d3 ---- /dev/null -+++ b/ports/unix/guts/umask.c -@@ -0,0 +1,14 @@ -+/* -+ * Copyright (c) 2014 Wind River Systems; see -+ * guts/COPYRIGHT for information. -+ * -+ * mode_t umask(mode_t mask) -+ * mode_t rc = 0; -+ */ -+ -+ pseudo_umask = mask; -+ rc = real_umask(mask); -+ -+/* return rc; -+ * } -+ */ -diff --git a/ports/unix/wrapfuncs.in b/ports/unix/wrapfuncs.in -index 8460a65..e0e9739 100644 ---- a/ports/unix/wrapfuncs.in -+++ b/ports/unix/wrapfuncs.in -@@ -67,3 +67,4 @@ void sync(void); /* async_skip= */ - int syncfs(int fd); /* async_skip=0 */ - int sync_file_range(int fd, off64_t offset, off64_t nbytes, unsigned int flags); /* async_skip=0 */ - int msync(void *addr, size_t length, int flags); /* async_skip=0 */ -+mode_t umask(mode_t mask); -diff --git a/pseudo_client.c b/pseudo_client.c -index b6d11a6..535c810 100644 ---- a/pseudo_client.c -+++ b/pseudo_client.c -@@ -71,6 +71,8 @@ int pseudo_disabled = 0; - int pseudo_allow_fsync = 0; - static int pseudo_local_only = 0; - -+int pseudo_umask = 022; -+ - static char **fd_paths = NULL; - static int nfds = 0; - static int messages = 0; -@@ -219,6 +221,9 @@ pseudo_init_client(void) { - if (!pseudo_disabled && !pseudo_inited) { - char *pseudo_path = 0; - -+ pseudo_umask = umask(022); -+ umask(pseudo_umask); -+ - pseudo_path = pseudo_prefix_path(NULL); - if (pseudo_prefix_dir_fd == -1) { - if (pseudo_path) { -diff --git a/pseudo_client.h b/pseudo_client.h -index f36a772..5bf820e 100644 ---- a/pseudo_client.h -+++ b/pseudo_client.h -@@ -72,6 +72,8 @@ extern char *pseudo_passwd; - extern size_t pseudo_chroot_len; - extern int pseudo_nosymlinkexp; - -+extern int pseudo_umask; -+ - /* Root can read and write files, and enter directories which have no - * read, write, or execute permissions. (But can't execute files without - * execute permissions!) -@@ -85,6 +87,6 @@ extern int pseudo_nosymlinkexp; - * None of this will behave very sensibly if umask has 0700 bits in it; - * this is a known limitation. - */ --#define PSEUDO_FS_MODE(mode, isdir) ((mode) | S_IRUSR | S_IWUSR | ((isdir) ? S_IXUSR : 0)) --#define PSEUDO_DB_MODE(fs_mode, user_mode) (((fs_mode) & ~0700) | ((user_mode & 0700))) -+#define PSEUDO_FS_MODE(mode, isdir) (((mode) | S_IRUSR | S_IWUSR | ((isdir) ? S_IXUSR : 0)) & ~(S_IWGRP | S_IWOTH)) -+#define PSEUDO_DB_MODE(fs_mode, user_mode) (((fs_mode) & ~0722) | ((user_mode & 0722))) - diff --git a/meta/recipes-devtools/pseudo/files/shutdownping.patch b/meta/recipes-devtools/pseudo/files/shutdownping.patch deleted file mode 100644 index 8af8e0b594..0000000000 --- a/meta/recipes-devtools/pseudo/files/shutdownping.patch +++ /dev/null @@ -1,53 +0,0 @@ -There is a potential issue with the fastop code in pseudo since a process may -exit and allow some other function to run before the server has processed -the commands run by the process. Issues have been see with unpredictable -file permissions. - -To avoid this, we ping the server before exitting which guarantees it has -processed the current command queue. - -Debugged-by: RP -Fix written by peter.seebach@windriver.com - -Upstream-Status: Submitted - -[YOCTO #5132] - -diff --git a/pseudo_client.c b/pseudo_client.c -index f58ce4c..20943b6 100644 ---- a/pseudo_client.c -+++ b/pseudo_client.c -@@ -75,6 +75,9 @@ static int nfds = 0; - static int messages = 0; - static struct timeval message_time = { .tv_sec = 0 }; - static int pseudo_inited = 0; -+ -+static int sent_messages = 0; -+ - int pseudo_nosymlinkexp = 0; - - /* note: these are int, not uid_t/gid_t, so I can use 'em with scanf */ -@@ -711,6 +714,11 @@ client_ping(void) { - return 0; - } - -+static void -+void_client_ping(void) { -+ client_ping(); -+} -+ - int - pseudo_fd(int fd, int how) { - int newfd; -@@ -1043,6 +1051,11 @@ pseudo_client_op(pseudo_op_t op, int access, int fd, int dirfd, const char *path - /* disable wrappers */ - pseudo_antimagic(); - -+ if (!sent_messages) { -+ sent_messages = 1; -+ atexit(void_client_ping); -+ } -+ - if (op == OP_RENAME) { - va_list ap; - va_start(ap, buf); diff --git a/meta/recipes-devtools/pseudo/files/symver.patch b/meta/recipes-devtools/pseudo/files/symver.patch deleted file mode 100644 index 8d1b377ec0..0000000000 --- a/meta/recipes-devtools/pseudo/files/symver.patch +++ /dev/null @@ -1,26 +0,0 @@ -When running as pseudo-nativesdk, we might need to run host binaries -linked against the host libc. Having a 2.14 libc dependency from memcpy is -problematic so instruct the linker to use older symbols. - -Upstream-Status: Pending - -RP 2012/4/22 - -Index: pseudo-1.3/pseudo.h -=================================================================== ---- pseudo-1.3.orig/pseudo.h 2012-04-22 12:17:59.078909060 +0000 -+++ pseudo-1.3/pseudo.h 2012-04-22 12:32:42.954888587 +0000 -@@ -29,6 +29,13 @@ - int pseudo_set_value(const char *key, const char *value); - char *pseudo_get_value(const char *key); - -+#ifdef __amd64__ -+#define GLIBC_COMPAT_SYMBOL(SYM) __asm__(".symver " #SYM "," #SYM "@GLIBC_2.2.5") -+#else -+#define GLIBC_COMPAT_SYMBOL(SYM) __asm__(".symver " #SYM "," #SYM "@GLIBC_2.0") -+#endif -+GLIBC_COMPAT_SYMBOL(memcpy); -+ - #include "pseudo_tables.h" - - extern void pseudo_debug_verbose(void); diff --git a/meta/recipes-devtools/pseudo/pseudo-1.6.2/0001-pseudo_client.c-protect-pwd_lck-against-magic.patch b/meta/recipes-devtools/pseudo/pseudo-1.6.2/0001-pseudo_client.c-protect-pwd_lck-against-magic.patch deleted file mode 100644 index b1bb9fb59c..0000000000 --- a/meta/recipes-devtools/pseudo/pseudo-1.6.2/0001-pseudo_client.c-protect-pwd_lck-against-magic.patch +++ /dev/null @@ -1,55 +0,0 @@ -From e11468a47369596f57c5e99bd0a3dd58b2c6d5e0 Mon Sep 17 00:00:00 2001 -From: "Peter A. Bigot" <pab@pabigot.com> -Date: Sun, 12 Oct 2014 08:27:14 -0500 -Subject: [PATCH 1/3] pseudo_client.c: protect pwd_lck against magic - -While attempting to diagnose unexpected uid/gid assignment I added ---without-passwd-fallback to the pseudo build. This caused build -failures due to inability to lock /etc/passwd. - -Instrumentation revealed that attempts to create the lock file ended up -with pseudo_etc_file() creating the correct lock name, but the -subsequent open had an extra PSEUDO_PASSWD directory prefix causing -it to fail. - -Inspection of pseudo_client shows the only other use of PSEUDO_ETC_FILE -to be protected against magic. Applying the same shield to the -unprotected calls in pseudo_pwd_lck_{open,close} fixes the issue. - -Upstream-Status: Pending -Signed-off-by: Peter A. Bigot <pab@pabigot.com> ---- - pseudo_client.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/pseudo_client.c b/pseudo_client.c -index 8deaa1b..442dd19 100644 ---- a/pseudo_client.c -+++ b/pseudo_client.c -@@ -416,20 +416,24 @@ pseudo_pwd_lck_open(void) { - } - } - pseudo_pwd_lck_close(); -+ pseudo_antimagic(); - pseudo_pwd_lck_fd = PSEUDO_ETC_FILE(".pwd.lock", - pseudo_pwd_lck_name, O_RDWR | O_CREAT); -+ pseudo_magic(); - return pseudo_pwd_lck_fd; - } - - int - pseudo_pwd_lck_close(void) { - if (pseudo_pwd_lck_fd != -1) { -+ pseudo_antimagic(); - close(pseudo_pwd_lck_fd); - if (pseudo_pwd_lck_name) { - unlink(pseudo_pwd_lck_name); - free(pseudo_pwd_lck_name); - pseudo_pwd_lck_name = 0; - } -+ pseudo_magic(); - pseudo_pwd_lck_fd = -1; - return 0; - } else { --- -1.8.5.5 diff --git a/meta/recipes-devtools/pseudo/pseudo-1.6.2/0002-pseudo_util-modify-interface-to-pseudo_etc_file.patch b/meta/recipes-devtools/pseudo/pseudo-1.6.2/0002-pseudo_util-modify-interface-to-pseudo_etc_file.patch deleted file mode 100644 index f3fef26d48..0000000000 --- a/meta/recipes-devtools/pseudo/pseudo-1.6.2/0002-pseudo_util-modify-interface-to-pseudo_etc_file.patch +++ /dev/null @@ -1,69 +0,0 @@ -From f05def2bbd5507084672bc9072ffe0e5101e9b47 Mon Sep 17 00:00:00 2001 -From: "Peter A. Bigot" <pab@pabigot.com> -Date: Sun, 12 Oct 2014 11:35:57 -0500 -Subject: [PATCH 2/3] pseudo_util: modify interface to pseudo_etc_file - -* Make the search directory pointers const: there is no reason why this - function should be allowed to mutate the directories. - -* Change the search directory argument from an array of pointers to a - pointer-to-pointers to prepare for an upcoming enhancement. - -Upstream-Status: Pending -Signed-off-by: Peter A. Bigot <pab@pabigot.com> ---- - pseudo.h | 2 +- - pseudo_client.c | 2 +- - pseudo_util.c | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/pseudo.h b/pseudo.h -index 92020e4..05813c1 100644 ---- a/pseudo.h -+++ b/pseudo.h -@@ -86,7 +86,7 @@ extern int pseudo_logfile(char *defname); - extern ssize_t pseudo_sys_path_max(void); - extern ssize_t pseudo_path_max(void); - #define PSEUDO_PWD_MAX 4096 --extern int pseudo_etc_file(const char *filename, char *realname, int flags, char *path[], int dircount); -+extern int pseudo_etc_file(const char *filename, char *realname, int flags, const char **search_dirs, int dircount); - extern void pseudo_stat32_from64(struct stat *, const struct stat64 *); - extern void pseudo_stat64_from32(struct stat64 *, const struct stat *); - -diff --git a/pseudo_client.c b/pseudo_client.c -index 442dd19..7a4d7fa 100644 ---- a/pseudo_client.c -+++ b/pseudo_client.c -@@ -93,7 +93,7 @@ gid_t pseudo_egid; - gid_t pseudo_sgid; - gid_t pseudo_fgid; - --#define PSEUDO_ETC_FILE(filename, realname, flags) pseudo_etc_file(filename, realname, flags, (char *[]) { pseudo_chroot, pseudo_passwd, PSEUDO_PASSWD_FALLBACK }, PSEUDO_PASSWD_FALLBACK ? 3 : 2) -+#define PSEUDO_ETC_FILE(filename, realname, flags) pseudo_etc_file(filename, realname, flags, (const char *[]) { pseudo_chroot, pseudo_passwd, PSEUDO_PASSWD_FALLBACK }, PSEUDO_PASSWD_FALLBACK ? 3 : 2) - - /* helper function to make a directory, just like mkdir -p. - * Can't use system() because the child shell would end up trying -diff --git a/pseudo_util.c b/pseudo_util.c -index e4e1fc8..647d3ad 100644 ---- a/pseudo_util.c -+++ b/pseudo_util.c -@@ -1264,7 +1264,7 @@ FILE *pseudo_host_etc_group_file = &pseudo_fake_group_file; - #endif - - int --pseudo_etc_file(const char *file, char *realname, int flags, char *search_dirs[], int dircount) { -+pseudo_etc_file(const char *file, char *realname, int flags, const char **search_dirs, int dircount) { - char filename[pseudo_path_max()]; - int rc = -1; - -@@ -1280,7 +1280,7 @@ pseudo_etc_file(const char *file, char *realname, int flags, char *search_dirs[] - return -1; - } - for (i = 0; i < dircount; ++i) { -- char *s = search_dirs[i]; -+ const char *s = search_dirs[i]; - if (!s) - continue; - #if PSEUDO_PORT_DARWIN --- -1.8.5.5 diff --git a/meta/recipes-devtools/pseudo/pseudo-1.6.2/0003-pseudo_client.c-support-multiple-directories-in-PSEU.patch b/meta/recipes-devtools/pseudo/pseudo-1.6.2/0003-pseudo_client.c-support-multiple-directories-in-PSEU.patch deleted file mode 100644 index 8303b5ce5f..0000000000 --- a/meta/recipes-devtools/pseudo/pseudo-1.6.2/0003-pseudo_client.c-support-multiple-directories-in-PSEU.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 09f04dc36f21c179235109b3dcddce9dda9a8ba8 Mon Sep 17 00:00:00 2001 -From: "Peter A. Bigot" <pab@pabigot.com> -Date: Sun, 12 Oct 2014 12:17:48 -0500 -Subject: [PATCH 3/3] pseudo_client.c: support multiple directories in - PSEUDO_PASSWD - -For OpenEmbedded it is highly unlikely that using the build host passwd -file is the right approach. Most packages can be built with a pseudo -that was configured --without-passwd-fallback, since -PSEUDO_PASSWD=${STAGING_DIR_TARGET} suffices. - -This fails when building images, because image.bbclass (correctly) -overrides to PSEUDO_PASSWD=${IMAGE_ROOTFS}. However, the rootfs -/etc/passwd is not created until the post-install phase of base-passwd, -which is long after a passwd file is required. For example, the smart -RPM interface wants to look up uid 0 right away. The right solution -here is to look first in ${IMAGE_ROOTFS}, then fallback to -a location holding immutable files with the minimum user/group settings -necessary to successfully get base-passwd onto the target. - -Rather than rework pseudo to change PSEUDO_PASSWD_FALLBACK to be a -run-time rather than compile-time specification, rework the handling of -PSEUDO_PASSWD so that it is a colon-separated list of directories that -are processed in order. - -Upstream-Status: Pending -Signed-off-by: Peter A. Bigot <pab@pabigot.com> ---- - pseudo_client.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 49 insertions(+), 1 deletion(-) - -diff --git a/pseudo_client.c b/pseudo_client.c -index 7a4d7fa..b52b86a 100644 ---- a/pseudo_client.c -+++ b/pseudo_client.c -@@ -75,6 +75,8 @@ int pseudo_umask = 022; - - static char **fd_paths = NULL; - static int nfds = 0; -+static const char **passwd_paths = NULL; -+static int npasswd_paths = 0; - static int messages = 0; - static struct timeval message_time = { .tv_sec = 0 }; - static int pseudo_inited = 0; -@@ -93,7 +95,7 @@ gid_t pseudo_egid; - gid_t pseudo_sgid; - gid_t pseudo_fgid; - --#define PSEUDO_ETC_FILE(filename, realname, flags) pseudo_etc_file(filename, realname, flags, (const char *[]) { pseudo_chroot, pseudo_passwd, PSEUDO_PASSWD_FALLBACK }, PSEUDO_PASSWD_FALLBACK ? 3 : 2) -+#define PSEUDO_ETC_FILE(filename, realname, flags) pseudo_etc_file(filename, realname, flags, passwd_paths, npasswd_paths) - - /* helper function to make a directory, just like mkdir -p. - * Can't use system() because the child shell would end up trying -@@ -117,6 +119,42 @@ mkdir_p(char *path) { - (void) mkdir(path, 0755); - } - -+static int -+build_passwd_paths(const char **paths) -+{ -+ int np = 0; -+ -+ if (pseudo_chroot) { -+ if (paths) { -+ paths[np] = pseudo_chroot; -+ } -+ ++np; -+ } -+ if (pseudo_passwd) { -+ const char *cp = pseudo_passwd; -+ const char *next = strchr(cp, ':'); -+ while (next) { -+ if (paths) { -+ paths[np] = strndup(cp, next-cp); -+ } -+ ++np; -+ cp = next+1; -+ next = strchr(cp, ':'); -+ } -+ if (paths) { -+ paths[np] = strdup(cp); -+ } -+ ++np; -+ } -+ if (PSEUDO_PASSWD_FALLBACK) { -+ if (paths) { -+ paths[np] = PSEUDO_PASSWD_FALLBACK; -+ } -+ ++np; -+ } -+ return np; -+} -+ - void - pseudo_init_client(void) { - char *env; -@@ -329,6 +367,16 @@ pseudo_init_client(void) { - } - free(env); - -+ npasswd_paths = build_passwd_paths(NULL); -+ if (npasswd_paths) { -+ passwd_paths = malloc(npasswd_paths * sizeof(*passwd_paths)); -+ if (!passwd_paths) { -+ pseudo_diag("couldn't allocate space for passwd paths.\n"); -+ exit(1); -+ } -+ build_passwd_paths(passwd_paths); -+ } -+ - pseudo_inited = 1; - } - if (!pseudo_disabled) --- -1.8.5.5 diff --git a/meta/recipes-devtools/pseudo/pseudo_1.5.1.bb b/meta/recipes-devtools/pseudo/pseudo_1.5.1.bb deleted file mode 100644 index 8d562ecbf7..0000000000 --- a/meta/recipes-devtools/pseudo/pseudo_1.5.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -require pseudo.inc - -PR = "r5" - -SRC_URI = " \ - http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://0001-pseudo_has_unload-add-function.patch \ - file://shutdownping.patch \ - file://pseudo-1.5.1-install-directory-mode.patch \ - file://pseudo-fchmodat-permissions.patch \ -" - -SRC_URI_append_class-nativesdk = " file://symver.patch" - -SRC_URI_append_class-native = " file://symver.patch" - -SRC_URI[md5sum] = "5ec67c7bff5fe68c56de500859c19172" -SRC_URI[sha256sum] = "3b896f592f4d568569bd02323fad2d6b8c398e16ca36ee5a8947d2ff6c1d3d52" - -PSEUDO_EXTRA_OPTS ?= "--enable-force-async" diff --git a/meta/recipes-devtools/pseudo/pseudo_1.6.2.bb b/meta/recipes-devtools/pseudo/pseudo_1.6.4.bb index 261c8d3abd..3d5b1fbd3e 100644 --- a/meta/recipes-devtools/pseudo/pseudo_1.6.2.bb +++ b/meta/recipes-devtools/pseudo/pseudo_1.6.4.bb @@ -2,15 +2,12 @@ require pseudo.inc SRC_URI = " \ http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://0001-pseudo_client.c-protect-pwd_lck-against-magic.patch \ - file://0002-pseudo_util-modify-interface-to-pseudo_etc_file.patch \ - file://0003-pseudo_client.c-support-multiple-directories-in-PSEU.patch \ file://fallback-passwd \ file://fallback-group \ " -SRC_URI[md5sum] = "4d7b4f9d1b4aafa680ce94a5a9a52f1f" -SRC_URI[sha256sum] = "c72be92689511ced7c419149c6aaa1b1a9e4dfc6409d1f16ab72cc35bc1e376a" +SRC_URI[md5sum] = "2fb800c90d643bfce55e1ce5ca67f3b3" +SRC_URI[sha256sum] = "25a7528f9191f74cceccc08a90c00086f2b3a9f6b900ea419a4f092de9a06775" PSEUDO_EXTRA_OPTS ?= "--enable-force-async --without-passwd-fallback" diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index 8c6f06ab46..b505910fb5 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -1,7 +1,7 @@ require pseudo.inc -SRCREV = "0dc29e7c67f25d0978a7da5cd8965514912c5b36" -PV = "1.6.2+git${SRCPV}" +SRCREV = "41389d4279d6a5f694615906217f481605b183b7" +PV = "1.6.4+git${SRCPV}" DEFAULT_PREFERENCE = "-1" diff --git a/meta/recipes-devtools/python/python-2.7-manifest.inc b/meta/recipes-devtools/python/python-2.7-manifest.inc index 5c2629e851..12f775efeb 100644 --- a/meta/recipes-devtools/python/python-2.7-manifest.inc +++ b/meta/recipes-devtools/python/python-2.7-manifest.inc @@ -1,18 +1,22 @@ # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file. -# Generator: 'scripts/contrib/python/generate-manifest-2.7.py' Version 20110222.2 (C) 2002-2010 Michael 'Mickey' Lauer <mlauer@vanille-media.de> +# Generator: '../../../scripts/contrib/python/generate-manifest-2.7.py' Version 20110222.2 (C) 2002-2010 Michael 'Mickey' Lauer <mlauer@vanille-media.de> # Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy -PROVIDES+="${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-distutils-staticdev ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib " +PROVIDES+="${PN}-2to3 ${PN}-argparse ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-contextlib ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-distutils-staticdev ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib " -PACKAGES="${PN}-dbg ${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils-staticdev ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib ${PN}-modules" +PACKAGES="${PN}-dbg ${PN}-2to3 ${PN}-argparse ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-contextlib ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils-staticdev ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib ${PN}-modules" SUMMARY_${PN}-2to3="Python automated Python 2 to 3 code translator" RDEPENDS_${PN}-2to3="${PN}-core" FILES_${PN}-2to3="${bindir}/2to3 ${libdir}/python2.7/lib2to3 " +SUMMARY_${PN}-argparse="Python command line argument parser" +RDEPENDS_${PN}-argparse="${PN}-core ${PN}-codecs ${PN}-textutils" +FILES_${PN}-argparse="${libdir}/python2.7/argparse.* " + SUMMARY_${PN}-audio="Python Audio Handling" RDEPENDS_${PN}-audio="${PN}-core" FILES_${PN}-audio="${libdir}/python2.7/wave.* ${libdir}/python2.7/chunk.* ${libdir}/python2.7/sndhdr.* ${libdir}/python2.7/lib-dynload/ossaudiodev.so ${libdir}/python2.7/lib-dynload/audioop.so ${libdir}/python2.7/audiodev.* ${libdir}/python2.7/sunaudio.* ${libdir}/python2.7/sunau.* ${libdir}/python2.7/toaiff.* " @@ -37,9 +41,13 @@ SUMMARY_${PN}-compression="Python high-level compression support" RDEPENDS_${PN}-compression="${PN}-core ${PN}-zlib" FILES_${PN}-compression="${libdir}/python2.7/gzip.* ${libdir}/python2.7/zipfile.* ${libdir}/python2.7/tarfile.* ${libdir}/python2.7/lib-dynload/bz2.so " +SUMMARY_${PN}-contextlib="Python utilities for with-statementcontexts." +RDEPENDS_${PN}-contextlib="${PN}-core" +FILES_${PN}-contextlib="${libdir}/python${PYTHON_MAJMIN}/contextlib.* " + SUMMARY_${PN}-core="Python interpreter and core modules" RDEPENDS_${PN}-core="${PN}-lang ${PN}-re" -FILES_${PN}-core="${libdir}/python2.7/__future__.* ${libdir}/python2.7/_abcoll.* ${libdir}/python2.7/abc.* ${libdir}/python2.7/copy.* ${libdir}/python2.7/copy_reg.* ${libdir}/python2.7/ConfigParser.* ${libdir}/python2.7/genericpath.* ${libdir}/python2.7/getopt.* ${libdir}/python2.7/linecache.* ${libdir}/python2.7/new.* ${libdir}/python2.7/os.* ${libdir}/python2.7/posixpath.* ${libdir}/python2.7/struct.* ${libdir}/python2.7/warnings.* ${libdir}/python2.7/site.* ${libdir}/python2.7/stat.* ${libdir}/python2.7/UserDict.* ${libdir}/python2.7/UserList.* ${libdir}/python2.7/UserString.* ${libdir}/python2.7/lib-dynload/binascii.so ${libdir}/python2.7/lib-dynload/_struct.so ${libdir}/python2.7/lib-dynload/time.so ${libdir}/python2.7/lib-dynload/xreadlines.so ${libdir}/python2.7/types.* ${libdir}/python2.7/platform.* ${bindir}/python* ${libdir}/python2.7/_weakrefset.* ${libdir}/python2.7/sysconfig.* ${libdir}/python2.7/config/Makefile ${includedir}/python${PYTHON_MAJMIN}/pyconfig*.h ${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py " +FILES_${PN}-core="${libdir}/python2.7/__future__.* ${libdir}/python2.7/_abcoll.* ${libdir}/python2.7/abc.* ${libdir}/python2.7/copy.* ${libdir}/python2.7/copy_reg.* ${libdir}/python2.7/ConfigParser.* ${libdir}/python2.7/genericpath.* ${libdir}/python2.7/getopt.* ${libdir}/python2.7/linecache.* ${libdir}/python2.7/new.* ${libdir}/python2.7/os.* ${libdir}/python2.7/posixpath.* ${libdir}/python2.7/struct.* ${libdir}/python2.7/warnings.* ${libdir}/python2.7/site.* ${libdir}/python2.7/stat.* ${libdir}/python2.7/UserDict.* ${libdir}/python2.7/UserList.* ${libdir}/python2.7/UserString.* ${libdir}/python2.7/lib-dynload/binascii.so ${libdir}/python2.7/lib-dynload/_struct.so ${libdir}/python2.7/lib-dynload/time.so ${libdir}/python2.7/lib-dynload/xreadlines.so ${libdir}/python2.7/types.* ${libdir}/python2.7/platform.* ${bindir}/python* ${libdir}/python2.7/_weakrefset.* ${libdir}/python2.7/sysconfig.* ${libdir}/python2.7/_sysconfigdata.* ${libdir}/python2.7/config/Makefile ${includedir}/python${PYTHON_MAJMIN}/pyconfig*.h ${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py " SUMMARY_${PN}-crypt="Python basic cryptographic and hashing support" RDEPENDS_${PN}-crypt="${PN}-core" @@ -274,7 +282,7 @@ RDEPENDS_${PN}-zlib="${PN}-core" FILES_${PN}-zlib="${libdir}/python2.7/lib-dynload/zlib.so " SUMMARY_${PN}-modules="All Python modules" -RDEPENDS_${PN}-modules="${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib " +RDEPENDS_${PN}-modules="${PN}-2to3 ${PN}-argparse ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-contextlib ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib " ALLOW_EMPTY_${PN}-modules = "1" diff --git a/meta/recipes-devtools/python/python-argparse_1.2.1.bb b/meta/recipes-devtools/python/python-argparse_1.2.1.bb deleted file mode 100644 index b2850a3831..0000000000 --- a/meta/recipes-devtools/python/python-argparse_1.2.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Python command-line parsing library" -SECTION = "devel/python" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=09d08bb5b7047e2688ea3faad6408aa8" -SRCNAME = "argparse" -PR = "r4" -RDEPENDS_${PN} += "python-codecs python-textutils" - -SRC_URI = "http://argparse.googlecode.com/files/${SRCNAME}-${PV}.tar.gz" -SRC_URI[md5sum] = "2fbef8cb61e506c706957ab6e135840c" -SRC_URI[sha256sum] = "ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit setuptools - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/python/python-distribute_0.6.32.bb b/meta/recipes-devtools/python/python-distribute_0.6.32.bb index 70001457e0..aa0763377d 100644 --- a/meta/recipes-devtools/python/python-distribute_0.6.32.bb +++ b/meta/recipes-devtools/python/python-distribute_0.6.32.bb @@ -50,6 +50,14 @@ RDEPENDS_${PN} = "\ python-compression \ " +RDEPENDS_${PN}_class-target = "\ + python-distutils \ + python-compression \ + python-netclient \ + python-email \ + python-shell \ +" + RPROVIDES_${PN} += "python-setuptools" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/python/python-git_0.3.2.RC1.bb b/meta/recipes-devtools/python/python-git_0.3.6.bb index 02a0eac040..80cdd7cde0 100644 --- a/meta/recipes-devtools/python/python-git_0.3.2.RC1.bb +++ b/meta/recipes-devtools/python/python-git_0.3.6.bb @@ -10,8 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8b8d26c37c1d5a04f9b0186edbebc183" DEPENDS = "python-gitdb" SRC_URI = "http://pypi.python.org/packages/source/G/GitPython/GitPython-${PV}.tar.gz" -SRC_URI[md5sum] = "849082fe29adc653a3621465213cab96" -SRC_URI[sha256sum] = "fd6786684a0d0dd7ebb961da754e3312fafe0c8e88f55ceb09858aa0af6094e0" + +SRC_URI[md5sum] = "87404ab9e0fcee81e660e932b3d9f2c6" +SRC_URI[sha256sum] = "f3f42ca085eedbd3a9956b5e639de58bbe77a119f6b3d5c3af27669a2322c4a9" S = "${WORKDIR}/GitPython-${PV}" diff --git a/meta/recipes-devtools/python/python-gitdb_0.5.4.bb b/meta/recipes-devtools/python/python-gitdb_0.6.4.bb index 9e961528b9..f0083bdb1a 100644 --- a/meta/recipes-devtools/python/python-gitdb_0.5.4.bb +++ b/meta/recipes-devtools/python/python-gitdb_0.6.4.bb @@ -6,8 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=59e5ecb13339a936eedf83282eaf4528" DEPENDS = "python-async python-smmap" SRC_URI = "https://pypi.python.org/packages/source/g/gitdb/gitdb-${PV}.tar.gz" -SRC_URI[md5sum] = "25353bb8d3ea527ba443dd88cd4e8a1c" -SRC_URI[sha256sum] = "de5d2dac0daec4a9cd7bb1ae1cd42d53510dcf597397c608c12a154b69ad3783" + +SRC_URI[md5sum] = "44e4366b8bdfd306b075c3a52c96ae1a" +SRC_URI[sha256sum] = "a3ebbc27be035a2e874ed904df516e35f4a29a778a764385de09de9e0f139658" S = "${WORKDIR}/gitdb-${PV}" diff --git a/meta/recipes-devtools/python/python-native/avoid_parallel_make_races_on_pgen.patch b/meta/recipes-devtools/python/python-native/avoid_parallel_make_races_on_pgen.patch new file mode 100644 index 0000000000..5279e7c3b4 --- /dev/null +++ b/meta/recipes-devtools/python/python-native/avoid_parallel_make_races_on_pgen.patch @@ -0,0 +1,27 @@ +Upstream-Status: Pending + +Avoids parallel make races linking errors when making Parser/PGEN + +- Implements Richard Purdie's idea + +Signed-Off-By: Richard Purdie <richard.purdie@linuxfoundation.org> +Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> + +Index: Python-2.7.9/Makefile.pre.in +=================================================================== +--- Python-2.7.9.orig/Makefile.pre.in ++++ Python-2.7.9/Makefile.pre.in +@@ -610,12 +610,10 @@ Modules/grpmodule.o: $(srcdir)/Modules/g + + Modules/pwdmodule.o: $(srcdir)/Modules/pwdmodule.c $(srcdir)/Modules/posixmodule.h + +-$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) ++$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) $(PGEN) + @$(MKDIR_P) Include +- $(MAKE) $(PGEN) + $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) + $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS) +- $(MAKE) $(GRAMMAR_H) + touch $(GRAMMAR_C) + + $(PGEN): $(PGENOBJS) diff --git a/meta/recipes-devtools/python/python-native/multilib.patch b/meta/recipes-devtools/python/python-native/multilib.patch index 0526031ada..8ca89e7c51 100644 --- a/meta/recipes-devtools/python/python-native/multilib.patch +++ b/meta/recipes-devtools/python/python-native/multilib.patch @@ -1,15 +1,6 @@ -commit 248279e54467a8cd5cde98fc124d1d1384703513 -Author: Yu Ke <ke.yu@intel.com> -Date: Tue Jun 28 21:21:29 2011 +0800 - - SUSE patch for the lib64 issue - - see detail in http://bugs.python.org/issue1294959 - - also rebased a bit for Yocto python 2.6.6 - - Picked-by: Yu Ke <ke.yu@intel.com> +Rebased for Python 2.7.9 +Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> 2011/09/29 The python recipe building was failing because python-native @@ -21,10 +12,10 @@ Upstream-Status: Inappropriate [oe-specific] Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> -Index: Python-2.7.2/Include/pythonrun.h +Index: Python-2.7.9/Include/pythonrun.h =================================================================== ---- Python-2.7.2.orig/Include/pythonrun.h -+++ Python-2.7.2/Include/pythonrun.h +--- Python-2.7.9.orig/Include/pythonrun.h ++++ Python-2.7.9/Include/pythonrun.h @@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); /* In their own files */ PyAPI_FUNC(const char *) Py_GetVersion(void); @@ -33,10 +24,10 @@ Index: Python-2.7.2/Include/pythonrun.h PyAPI_FUNC(const char *) Py_GetCopyright(void); PyAPI_FUNC(const char *) Py_GetCompiler(void); PyAPI_FUNC(const char *) Py_GetBuildInfo(void); -Index: Python-2.7.2/Lib/distutils/command/install.py +Index: Python-2.7.9/Lib/distutils/command/install.py =================================================================== ---- Python-2.7.2.orig/Lib/distutils/command/install.py -+++ Python-2.7.2/Lib/distutils/command/install.py +--- Python-2.7.9.orig/Lib/distutils/command/install.py ++++ Python-2.7.9/Lib/distutils/command/install.py @@ -22,6 +22,8 @@ from site import USER_BASE from site import USER_SITE @@ -55,11 +46,11 @@ Index: Python-2.7.2/Lib/distutils/command/install.py 'headers': '$base/include/python$py_version_short/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -Index: Python-2.7.2/Lib/pydoc.py +Index: Python-2.7.9/Lib/pydoc.py =================================================================== ---- Python-2.7.2.orig/Lib/pydoc.py -+++ Python-2.7.2/Lib/pydoc.py -@@ -352,7 +352,7 @@ class Doc: +--- Python-2.7.9.orig/Lib/pydoc.py ++++ Python-2.7.9/Lib/pydoc.py +@@ -383,7 +383,7 @@ class Doc: docloc = os.environ.get("PYTHONDOCS", "http://docs.python.org/library") @@ -68,11 +59,11 @@ Index: Python-2.7.2/Lib/pydoc.py "python"+sys.version[0:3]) if (isinstance(object, type(os)) and (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', -Index: Python-2.7.2/Lib/site.py +Index: Python-2.7.9/Lib/site.py =================================================================== ---- Python-2.7.2.orig/Lib/site.py -+++ Python-2.7.2/Lib/site.py -@@ -300,13 +300,19 @@ def getsitepackages(): +--- Python-2.7.9.orig/Lib/site.py ++++ Python-2.7.9/Lib/site.py +@@ -288,13 +288,19 @@ def getsitepackages(): if sys.platform in ('os2emx', 'riscos'): sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) elif os.sep == '/': @@ -95,11 +86,11 @@ Index: Python-2.7.2/Lib/site.py if sys.platform == "darwin": # for framework builds *only* we add the standard Apple # locations. -Index: Python-2.7.2/Lib/test/test_dl.py +Index: Python-2.7.9/Lib/test/test_dl.py =================================================================== ---- Python-2.7.2.orig/Lib/test/test_dl.py -+++ Python-2.7.2/Lib/test/test_dl.py -@@ -5,10 +5,11 @@ +--- Python-2.7.9.orig/Lib/test/test_dl.py ++++ Python-2.7.9/Lib/test/test_dl.py +@@ -4,10 +4,11 @@ import unittest from test.test_support import verbose, import_module dl = import_module('dl', deprecated=True) @@ -113,11 +104,11 @@ Index: Python-2.7.2/Lib/test/test_dl.py ('/usr/bin/cygwin1.dll', 'getpid'), ('/usr/lib/libc.dylib', 'getpid'), ] -Index: Python-2.7.2/Lib/trace.py +Index: Python-2.7.9/Lib/trace.py =================================================================== ---- Python-2.7.2.orig/Lib/trace.py -+++ Python-2.7.2/Lib/trace.py -@@ -762,10 +762,10 @@ def main(argv=None): +--- Python-2.7.9.orig/Lib/trace.py ++++ Python-2.7.9/Lib/trace.py +@@ -754,10 +754,10 @@ def main(argv=None): # should I also call expanduser? (after all, could use $HOME) s = s.replace("$prefix", @@ -130,19 +121,19 @@ Index: Python-2.7.2/Lib/trace.py "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) -Index: Python-2.7.2/Makefile.pre.in +Index: Python-2.7.9/Makefile.pre.in =================================================================== ---- Python-2.7.2.orig/Makefile.pre.in -+++ Python-2.7.2/Makefile.pre.in -@@ -81,6 +81,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG +--- Python-2.7.9.orig/Makefile.pre.in ++++ Python-2.7.9/Makefile.pre.in +@@ -87,6 +87,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG # Machine-dependent subdirectories MACHDEP= @MACHDEP@ +LIB= @LIB@ - # Install prefix for architecture-independent files - prefix= @prefix@ -@@ -97,7 +98,7 @@ LIBDIR= @libdir@ + # Multiarch directory (may be empty) + MULTIARCH= @MULTIARCH@ +@@ -106,7 +107,7 @@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include @@ -151,7 +142,7 @@ Index: Python-2.7.2/Makefile.pre.in # Detailed destination directories BINLIBDEST= $(LIBDIR)/python$(VERSION) -@@ -532,6 +533,7 @@ Modules/getpath.o: $(srcdir)/Modules/get +@@ -597,6 +598,7 @@ Modules/getpath.o: $(srcdir)/Modules/get -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ @@ -159,7 +150,7 @@ Index: Python-2.7.2/Makefile.pre.in -o $@ $(srcdir)/Modules/getpath.c Modules/python.o: $(srcdir)/Modules/python.c -@@ -566,7 +568,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) +@@ -639,7 +641,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) Python/getplatform.o: $(srcdir)/Python/getplatform.c @@ -168,10 +159,10 @@ Index: Python-2.7.2/Makefile.pre.in Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c -Index: Python-2.7.2/Modules/getpath.c +Index: Python-2.7.9/Modules/getpath.c =================================================================== ---- Python-2.7.2.orig/Modules/getpath.c -+++ Python-2.7.2/Modules/getpath.c +--- Python-2.7.9.orig/Modules/getpath.c ++++ Python-2.7.9/Modules/getpath.c @@ -116,9 +116,11 @@ #define EXEC_PREFIX PREFIX #endif @@ -195,10 +186,10 @@ Index: Python-2.7.2/Modules/getpath.c static void reduce(char *dir) -Index: Python-2.7.2/Python/getplatform.c +Index: Python-2.7.9/Python/getplatform.c =================================================================== ---- Python-2.7.2.orig/Python/getplatform.c -+++ Python-2.7.2/Python/getplatform.c +--- Python-2.7.9.orig/Python/getplatform.c ++++ Python-2.7.9/Python/getplatform.c @@ -10,3 +10,13 @@ Py_GetPlatform(void) { return PLATFORM; @@ -213,11 +204,11 @@ Index: Python-2.7.2/Python/getplatform.c +{ + return LIB; +} -Index: Python-2.7.2/Python/sysmodule.c +Index: Python-2.7.9/Python/sysmodule.c =================================================================== ---- Python-2.7.2.orig/Python/sysmodule.c -+++ Python-2.7.2/Python/sysmodule.c -@@ -1416,6 +1416,8 @@ _PySys_Init(void) +--- Python-2.7.9.orig/Python/sysmodule.c ++++ Python-2.7.9/Python/sysmodule.c +@@ -1437,6 +1437,8 @@ _PySys_Init(void) PyString_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", PyString_FromString(Py_GetPlatform())); @@ -226,11 +217,11 @@ Index: Python-2.7.2/Python/sysmodule.c SET_SYS_FROM_STRING("executable", PyString_FromString(Py_GetProgramFullPath())); SET_SYS_FROM_STRING("prefix", -Index: Python-2.7.2/configure.in +Index: Python-2.7.9/configure.ac =================================================================== ---- Python-2.7.2.orig/configure.in -+++ Python-2.7.2/configure.in -@@ -629,6 +629,10 @@ SunOS*) +--- Python-2.7.9.orig/configure.ac ++++ Python-2.7.9/configure.ac +@@ -736,6 +736,11 @@ SunOS*) ;; esac @@ -238,6 +229,7 @@ Index: Python-2.7.2/configure.in +AC_MSG_CHECKING(LIB) +LIB=`basename ${libdir}` +AC_MSG_RESULT($LIB) ++ AC_SUBST(LIBRARY) AC_MSG_CHECKING(LIBRARY) diff --git a/meta/recipes-devtools/python/python-native/nohostlibs.patch b/meta/recipes-devtools/python/python-native/nohostlibs.patch index 09c3fb808a..8a452e94dc 100644 --- a/meta/recipes-devtools/python/python-native/nohostlibs.patch +++ b/meta/recipes-devtools/python/python-native/nohostlibs.patch @@ -1,25 +1,28 @@ Upstream-Status: Inappropriate [embedded specific] -2011/09/29 -rebased for python-2.7.2 +2014/12/15 +Rebased for python-2.7.9 Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> +Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> -Index: Python-2.7.2/setup.py +Index: Python-2.7.9/setup.py =================================================================== ---- Python-2.7.2.orig/setup.py -+++ Python-2.7.2/setup.py -@@ -369,8 +369,8 @@ class PyBuildExt(build_ext): +--- Python-2.7.9.orig/setup.py ++++ Python-2.7.9/setup.py +@@ -439,9 +439,9 @@ class PyBuildExt(build_ext): def detect_modules(self): # Ensure that /usr/local is always used -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -+ #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -+ #add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') +- if not cross_compiling: +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') +- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') ++ # if not cross_compiling: ++ # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') ++ # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + if cross_compiling: + self.add_gcc_paths() self.add_multiarch_paths() - - # Add paths specified in the environment variables LDFLAGS and -@@ -407,15 +407,15 @@ class PyBuildExt(build_ext): +@@ -480,15 +480,15 @@ class PyBuildExt(build_ext): for directory in reversed(options.dirs): add_dir_to_list(dir_list, directory) @@ -39,29 +42,13 @@ Index: Python-2.7.2/setup.py sysconfig.get_config_var("INCLUDEDIR")) try: -@@ -426,11 +426,8 @@ class PyBuildExt(build_ext): - # lib_dirs and inc_dirs are used to search for files; - # if a file is found in one of those directories, it can - # be assumed that no additional -I,-L directives are needed. -- lib_dirs = self.compiler.library_dirs + [ -- '/lib64', '/usr/lib64', -- '/lib', '/usr/lib', -- ] -- inc_dirs = self.compiler.include_dirs + ['/usr/include'] -+ lib_dirs = self.compiler.library_dirs -+ inc_dirs = self.compiler.include_dirs - exts = [] - missing = [] - -@@ -676,9 +673,8 @@ class PyBuildExt(build_ext): +@@ -761,8 +761,7 @@ class PyBuildExt(build_ext): pass # Issue 7384: Already linked against curses or tinfo. elif curses_library: readline_libs.append(curses_library) - elif self.compiler.find_library_file(lib_dirs + - ['/usr/lib/termcap'], -- 'termcap'): + elif self.compiler.find_library_file(lib_dirs, -+ 'termcap'): + 'termcap'): readline_libs.append('termcap') exts.append( Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'], diff --git a/meta/recipes-devtools/python/python-native/revert_use_of_sysconfigdata.patch b/meta/recipes-devtools/python/python-native/revert_use_of_sysconfigdata.patch new file mode 100644 index 0000000000..202aaf1069 --- /dev/null +++ b/meta/recipes-devtools/python/python-native/revert_use_of_sysconfigdata.patch @@ -0,0 +1,86 @@ +On older versions of Python, sysconfig read the data from both the Makefile and +the Python.h file generated at build time, created dictionaries with their variables +and used those when using get_config_var(), now it uses _sysconfigdata.build_time_vars[] +which contains information from the HOST, erroneous in our case, this patch reverts this +behavior and uses Python.h and Makefile to get information. + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> + +Index: Python-2.7.9/Lib/distutils/sysconfig.py +=================================================================== +--- Python-2.7.9.orig/Lib/distutils/sysconfig.py ++++ Python-2.7.9/Lib/distutils/sysconfig.py +@@ -401,12 +401,66 @@ _config_vars = None + + def _init_posix(): + """Initialize the module as appropriate for POSIX systems.""" +- # _sysconfigdata is generated at build time, see the sysconfig module +- from _sysconfigdata import build_time_vars +- global _config_vars +- _config_vars = {} +- _config_vars.update(build_time_vars) ++ g = {} ++ # load the installed Makefile: ++ try: ++ filename = get_makefile_filename() ++ parse_makefile(filename, g) ++ except IOError, msg: ++ my_msg = "invalid Python installation: unable to open %s" % filename ++ if hasattr(msg, "strerror"): ++ my_msg = my_msg + " (%s)" % msg.strerror ++ ++ raise DistutilsPlatformError(my_msg) ++ ++ # load the installed pyconfig.h: ++ try: ++ filename = get_config_h_filename() ++ parse_config_h(file(filename), g) ++ except IOError, msg: ++ my_msg = "invalid Python installation: unable to open %s" % filename ++ if hasattr(msg, "strerror"): ++ my_msg = my_msg + " (%s)" % msg.strerror ++ ++ raise DistutilsPlatformError(my_msg) ++ ++ # On AIX, there are wrong paths to the linker scripts in the Makefile ++ # -- these paths are relative to the Python source, but when installed ++ # the scripts are in another directory. ++ if python_build: ++ g['LDSHARED'] = g['BLDSHARED'] + ++ elif get_python_version() < '2.1': ++ # The following two branches are for 1.5.2 compatibility. ++ if sys.platform == 'aix4': # what about AIX 3.x ? ++ # Linker script is in the config directory, not in Modules as the ++ # Makefile says. ++ python_lib = get_python_lib(standard_lib=1) ++ ld_so_aix = os.path.join(python_lib, 'config', 'ld_so_aix') ++ python_exp = os.path.join(python_lib, 'config', 'python.exp') ++ ++ g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp) ++ ++ elif sys.platform == 'beos': ++ # Linker script is in the config directory. In the Makefile it is ++ # relative to the srcdir, which after installation no longer makes ++ # sense. ++ python_lib = get_python_lib(standard_lib=1) ++ linkerscript_path = string.split(g['LDSHARED'])[0] ++ linkerscript_name = os.path.basename(linkerscript_path) ++ linkerscript = os.path.join(python_lib, 'config', ++ linkerscript_name) ++ ++ # XXX this isn't the right place to do this: adding the Python ++ # library to the link, if needed, should be in the "build_ext" ++ # command. (It's also needed for non-MS compilers on Windows, and ++ # it's taken care of for them by the 'build_ext.get_libraries()' ++ # method.) ++ g['LDSHARED'] = ("%s -L%s/lib -lpython%s" % ++ (linkerscript, PREFIX, get_python_version())) ++ ++ global _config_vars ++ _config_vars = g + + def _init_nt(): + """Initialize the module as appropriate for NT""" diff --git a/meta/recipes-devtools/python/python-native_2.7.3.bb b/meta/recipes-devtools/python/python-native_2.7.9.bb index e55f5feac2..34f5c2914e 100644 --- a/meta/recipes-devtools/python/python-native_2.7.3.bb +++ b/meta/recipes-devtools/python/python-native_2.7.9.bb @@ -5,21 +5,19 @@ DEPENDS = "openssl-native bzip2-replacement-native zlib-native readline-native s PR = "${INC_PR}.1" SRC_URI += "\ - file://05-enable-ctypes-cross-build.patch \ - file://06-ctypes-libffi-fix-configure.patch \ - file://10-distutils-fix-swig-parameter.patch \ - file://11-distutils-never-modify-shebang-line.patch \ - file://12-distutils-prefix-is-inside-staging-area.patch \ - file://debug.patch \ - file://unixccompiler.patch \ - file://nohostlibs.patch \ - file://multilib.patch \ - file://add-md5module-support.patch \ - file://builddir.patch \ - file://parallel-makeinst-create-bindir.patch \ - file://python-fix-build-error-with-Readline-6.3.patch \ - file://gcc-4.8-fix-configure-Wformat.patch \ - file://json-flaw-fix.patch \ + file://05-enable-ctypes-cross-build.patch \ + file://10-distutils-fix-swig-parameter.patch \ + file://11-distutils-never-modify-shebang-line.patch \ + file://12-distutils-prefix-is-inside-staging-area.patch \ + file://debug.patch \ + file://unixccompiler.patch \ + file://nohostlibs.patch \ + file://multilib.patch \ + file://add-md5module-support.patch \ + file://builddir.patch \ + file://parallel-makeinst-create-bindir.patch \ + file://revert_use_of_sysconfigdata.patch \ + file://avoid_parallel_make_races_on_pgen.patch \ " S = "${WORKDIR}/Python-${PV}" @@ -39,8 +37,8 @@ EXTRA_OEMAKE = '\ STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \ ' -do_configure_prepend() { - autoreconf --verbose --install --force --exclude=autopoint Modules/_ctypes/libffi || bbnote "_ctypes failed to autoreconf" +do_configure_append() { + autoreconf --verbose --install --force --exclude=autopoint ../Python-${PV}/Modules/_ctypes/libffi } do_install() { @@ -58,7 +56,7 @@ do_install() { # (these often end up too long for the #! parser in the kernel as the # buffer is 128 bytes long). ln -s python-native/python ${D}${bindir}/nativepython - + # We don't want modules in ~/.local being used in preference to those # installed in the native sysroot, so disable user site support. sed -i -e 's,^\(ENABLE_USER_SITE = \).*,\1False,' ${D}${libdir}/python${PYTHON_MAJMIN}/site.py diff --git a/meta/recipes-devtools/python/python-numpy/mips64n32/_numpyconfig.h b/meta/recipes-devtools/python/python-numpy/mips64n32/_numpyconfig.h new file mode 100644 index 0000000000..be57ac27bf --- /dev/null +++ b/meta/recipes-devtools/python/python-numpy/mips64n32/_numpyconfig.h @@ -0,0 +1,30 @@ +#define NPY_HAVE_ENDIAN_H 1 +#define NPY_SIZEOF_SHORT SIZEOF_SHORT +#define NPY_SIZEOF_INT SIZEOF_INT +#define NPY_SIZEOF_LONG SIZEOF_LONG +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_COMPLEX_FLOAT 8 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_COMPLEX_DOUBLE 16 +#define NPY_SIZEOF_LONGDOUBLE 16 +#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 +#define NPY_SIZEOF_PY_INTPTR_T 8 +#define NPY_SIZEOF_PY_LONG_LONG 8 +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_NO_SMP 0 +#define NPY_HAVE_DECL_ISNAN +#define NPY_HAVE_DECL_ISINF +#define NPY_HAVE_DECL_ISFINITE +#define NPY_HAVE_DECL_SIGNBIT +#define NPY_USE_C99_COMPLEX 1 +#define NPY_HAVE_COMPLEX_DOUBLE 1 +#define NPY_HAVE_COMPLEX_FLOAT 1 +#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1 +#define NPY_USE_C99_FORMATS 1 +#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) +#define NPY_ABI_VERSION 0x01000009 +#define NPY_API_VERSION 0x00000007 + +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS 1 +#endif diff --git a/meta/recipes-devtools/python/python-numpy/mips64n32/config.h b/meta/recipes-devtools/python/python-numpy/mips64n32/config.h new file mode 100644 index 0000000000..c30b868f2f --- /dev/null +++ b/meta/recipes-devtools/python/python-numpy/mips64n32/config.h @@ -0,0 +1,139 @@ +#define HAVE_ENDIAN_H 1 +#define SIZEOF_PY_INTPTR_T 8 +#define SIZEOF_PY_LONG_LONG 8 +#define MATHLIB m +#define HAVE_SIN 1 +#define HAVE_COS 1 +#define HAVE_TAN 1 +#define HAVE_SINH 1 +#define HAVE_COSH 1 +#define HAVE_TANH 1 +#define HAVE_FABS 1 +#define HAVE_FLOOR 1 +#define HAVE_CEIL 1 +#define HAVE_SQRT 1 +#define HAVE_LOG10 1 +#define HAVE_LOG 1 +#define HAVE_EXP 1 +#define HAVE_ASIN 1 +#define HAVE_ACOS 1 +#define HAVE_ATAN 1 +#define HAVE_FMOD 1 +#define HAVE_MODF 1 +#define HAVE_FREXP 1 +#define HAVE_LDEXP 1 +#define HAVE_RINT 1 +#define HAVE_TRUNC 1 +#define HAVE_EXP2 1 +#define HAVE_LOG2 1 +#define HAVE_ATAN2 1 +#define HAVE_POW 1 +#define HAVE_NEXTAFTER 1 +#define HAVE_SINF 1 +#define HAVE_COSF 1 +#define HAVE_TANF 1 +#define HAVE_SINHF 1 +#define HAVE_COSHF 1 +#define HAVE_TANHF 1 +#define HAVE_FABSF 1 +#define HAVE_FLOORF 1 +#define HAVE_CEILF 1 +#define HAVE_RINTF 1 +#define HAVE_TRUNCF 1 +#define HAVE_SQRTF 1 +#define HAVE_LOG10F 1 +#define HAVE_LOGF 1 +#define HAVE_LOG1PF 1 +#define HAVE_EXPF 1 +#define HAVE_EXPM1F 1 +#define HAVE_ASINF 1 +#define HAVE_ACOSF 1 +#define HAVE_ATANF 1 +#define HAVE_ASINHF 1 +#define HAVE_ACOSHF 1 +#define HAVE_ATANHF 1 +#define HAVE_HYPOTF 1 +#define HAVE_ATAN2F 1 +#define HAVE_POWF 1 +#define HAVE_FMODF 1 +#define HAVE_MODFF 1 +#define HAVE_FREXPF 1 +#define HAVE_LDEXPF 1 +#define HAVE_EXP2F 1 +#define HAVE_LOG2F 1 +#define HAVE_COPYSIGNF 1 +#define HAVE_NEXTAFTERF 1 +#define HAVE_SINL 1 +#define HAVE_COSL 1 +#define HAVE_TANL 1 +#define HAVE_SINHL 1 +#define HAVE_COSHL 1 +#define HAVE_TANHL 1 +#define HAVE_FABSL 1 +#define HAVE_FLOORL 1 +#define HAVE_CEILL 1 +#define HAVE_RINTL 1 +#define HAVE_TRUNCL 1 +#define HAVE_SQRTL 1 +#define HAVE_LOG10L 1 +#define HAVE_LOGL 1 +#define HAVE_LOG1PL 1 +#define HAVE_EXPL 1 +#define HAVE_EXPM1L 1 +#define HAVE_ASINL 1 +#define HAVE_ACOSL 1 +#define HAVE_ATANL 1 +#define HAVE_ASINHL 1 +#define HAVE_ACOSHL 1 +#define HAVE_ATANHL 1 +#define HAVE_HYPOTL 1 +#define HAVE_ATAN2L 1 +#define HAVE_POWL 1 +#define HAVE_FMODL 1 +#define HAVE_MODFL 1 +#define HAVE_FREXPL 1 +#define HAVE_LDEXPL 1 +#define HAVE_EXP2L 1 +#define HAVE_LOG2L 1 +#define HAVE_COPYSIGNL 1 +#define HAVE_NEXTAFTERL 1 +#define HAVE_DECL_SIGNBIT +#define HAVE_COMPLEX_H 1 +#define HAVE_CREAL 1 +#define HAVE_CIMAG 1 +#define HAVE_CABS 1 +#define HAVE_CARG 1 +#define HAVE_CEXP 1 +#define HAVE_CSQRT 1 +#define HAVE_CLOG 1 +#define HAVE_CCOS 1 +#define HAVE_CSIN 1 +#define HAVE_CPOW 1 +#define HAVE_CREALF 1 +#define HAVE_CIMAGF 1 +#define HAVE_CABSF 1 +#define HAVE_CARGF 1 +#define HAVE_CEXPF 1 +#define HAVE_CSQRTF 1 +#define HAVE_CLOGF 1 +#define HAVE_CCOSF 1 +#define HAVE_CSINF 1 +#define HAVE_CPOWF 1 +#define HAVE_CREALL 1 +#define HAVE_CIMAGL 1 +#define HAVE_CABSL 1 +#define HAVE_CARGL 1 +#define HAVE_CEXPL 1 +#define HAVE_CSQRTL 1 +#define HAVE_CLOGL 1 +#define HAVE_CCOSL 1 +#define HAVE_CSINL 1 +#define HAVE_CPOWL 1 +#define HAVE_LDOUBLE_IEEE_QUAD_LE 1 +#ifndef __cplusplus +/* #undef inline */ +#endif + +#ifndef _NPY_NPY_CONFIG_H_ +#error config.h should never be included directly, include npy_config.h instead +#endif diff --git a/meta/recipes-devtools/python/python-numpy_1.7.0.bb b/meta/recipes-devtools/python/python-numpy_1.7.0.bb index 6cb14c9432..d4fd279230 100644 --- a/meta/recipes-devtools/python/python-numpy_1.7.0.bb +++ b/meta/recipes-devtools/python/python-numpy_1.7.0.bb @@ -50,6 +50,10 @@ CONFIGFILESURI_mips64 = " \ file://config.h \ file://_numpyconfig.h \ " +CONFIGFILESURI_mips64n32 = " \ + file://config.h \ + file://_numpyconfig.h \ +" S = "${WORKDIR}/numpy-${PV}" diff --git a/meta/recipes-devtools/python/python-pexpect_3.3.bb b/meta/recipes-devtools/python/python-pexpect_3.3.bb new file mode 100644 index 0000000000..cd80aeb2f1 --- /dev/null +++ b/meta/recipes-devtools/python/python-pexpect_3.3.bb @@ -0,0 +1,23 @@ +SUMMARY = "A Pure Python Expect like Module for Python" +HOMEPAGE = "http://pexpect.readthedocs.org/" +SECTION = "devel/python" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c25d9a0770ba69a9965acc894e9f3644" + +SRC_URI = "https://pypi.python.org/packages/source/p/pexpect/pexpect-${PV}.tar.gz" +SRC_URI[md5sum] = "0de72541d3f1374b795472fed841dce8" +SRC_URI[sha256sum] = "dfea618d43e83cfff21504f18f98019ba520f330e4142e5185ef7c73527de5ba" + +S = "${WORKDIR}/pexpect-${PV}" + +inherit distutils + +RDEPENDS_${PN} = "\ + python-core \ + python-io \ + python-terminal \ + python-resource \ + python-fcntl \ +" + +BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-devtools/python/python-pycurl_7.19.3.1.bb b/meta/recipes-devtools/python/python-pycurl_7.19.5.1.bb index 02d0ae9be0..0d0effef60 100644 --- a/meta/recipes-devtools/python/python-pycurl_7.19.3.1.bb +++ b/meta/recipes-devtools/python/python-pycurl_7.19.5.1.bb @@ -2,7 +2,7 @@ SUMMARY = "Python bindings for libcurl" HOMEPAGE = "http://pycurl.sourceforge.net/" SECTION = "devel/python" LICENSE = "LGPLv2.1+ | MIT" -LIC_FILES_CHKSUM = "file://README.rst;beginline=148;endline=163;md5=57e5ab0c0f964533fc59d93dec5695bb \ +LIC_FILES_CHKSUM = "file://README.rst;beginline=166;endline=181;md5=57e5ab0c0f964533fc59d93dec5695bb \ file://COPYING-LGPL;md5=3579a9fd0221d49a237aaa33492f988c \ file://COPYING-MIT;md5=e8200955c773b2a0fd6cea36ea5e87be" @@ -15,8 +15,8 @@ SRC_URI = "\ file://no-static-link.patch \ " -SRC_URI[archive.md5sum] = "6df8fa7fe8b680d93248da1f8d4fcd12" -SRC_URI[archive.sha256sum] = "c0d673fe99a9de07239eabe77c798f1b043f60c02afaec1430ceaf59d7501a4f" +SRC_URI[archive.md5sum] = "f44cd54256d7a643ab7b16e3f409b26b" +SRC_URI[archive.sha256sum] = "6e9770f80459757f73bd71af82fbb29cd398b38388cdf1beab31ea91a331bc6c" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils @@ -29,6 +29,11 @@ export STAGING_LIBDIR BBCLASSEXTEND = "native" +# Ensure the docstrings are generated as make clean will remove them +do_compile_prepend() { + ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py docstrings +} + do_install_append() { rm -rf ${D}${datadir}/share } diff --git a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb index 45a0603eb7..f4359bb257 100644 --- a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb +++ b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb @@ -12,14 +12,25 @@ SRC_URI = "${GNOME_MIRROR}/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \ file://obsolete_automake_macros.patch \ " +# libtool-native doesn't have fixinstall.patch applied which means +# that libs get relinked at installation time. This triggers a +# relinking along the lines of: +# gcc -L/tmp/foo/media/build1/poky/build/tmp/sysroots/x86_64-linux/usr/lib -lpyglib-2.0-python -o .libs/_glib.so +# where /tmp/foo is DESTDIR and pyglib-2.0-python may be installed/reinstalled +# at the same time as the gcc command runs. +# If this happens between the handoff between gcc and ld, you can see: +# /bin/ld: cannot find -lpyglib-2.0-python +# Adding a dependency rule like install-pyglibLTLIBRARIES: install-libLTLIBRARIES +# would be ideal but automake can't cope with that without manually +# defining the whole function. Give up and disable parallel make in native builds. +PARALLEL_MAKEINST_class-native = "" + SRC_URI[md5sum] = "aa64900b274c4661a5c32e52922977f9" SRC_URI[sha256sum] = "7da88c169a56efccc516cebd9237da3fe518a343095a664607b368fe21df95b6" S = "${WORKDIR}/pygobject-${PV}" EXTRA_OECONF += "--disable-introspection" -PARALLEL_MAKEINST = "" - inherit autotools distutils-base pkgconfig # necessary to let the call for python-config succeed diff --git a/meta/recipes-devtools/python/python-pygtk_2.24.0.bb b/meta/recipes-devtools/python/python-pygtk_2.24.0.bb index ff84be2bbc..053f37fcbe 100644 --- a/meta/recipes-devtools/python/python-pygtk_2.24.0.bb +++ b/meta/recipes-devtools/python/python-pygtk_2.24.0.bb @@ -49,7 +49,7 @@ do_install_append() { for i in `find ${D} -name "*.la"` ; do \ sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i done - + if test -e ${D}${bindir} ; then for i in ${D}${bindir}/* ; do \ sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i diff --git a/meta/recipes-devtools/python/python-scons-native_2.3.2.bb b/meta/recipes-devtools/python/python-scons-native_2.3.4.bb index dae89ab5d2..dae89ab5d2 100644 --- a/meta/recipes-devtools/python/python-scons-native_2.3.2.bb +++ b/meta/recipes-devtools/python/python-scons-native_2.3.4.bb diff --git a/meta/recipes-devtools/python/python-scons_2.3.2.bb b/meta/recipes-devtools/python/python-scons_2.3.4.bb index fc5b302aae..9b828fac9d 100644 --- a/meta/recipes-devtools/python/python-scons_2.3.2.bb +++ b/meta/recipes-devtools/python/python-scons_2.3.4.bb @@ -6,8 +6,8 @@ SRCNAME = "scons" SRC_URI = "${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz" -SRC_URI[md5sum] = "bbd428da35ec176575a2b0be1f8d7162" -SRC_URI[sha256sum] = "f993320c5e9515e6567fcce73df0a7a8808414bf1223c69123d3dcf339a449d4" +SRC_URI[md5sum] = "91fbbb67c2c65b03c746601baac4a6a5" +SRC_URI[sha256sum] = "4b57d72066fed3b6ff65a7dd9f73633c9b1c09f87520e9b3aae84b3e4864b441" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/meta/recipes-devtools/python/python-smartpm/smart-add-for-rpm-ignoresize-check.patch b/meta/recipes-devtools/python/python-smartpm/smart-add-for-rpm-ignoresize-check.patch new file mode 100644 index 0000000000..8a27f2583a --- /dev/null +++ b/meta/recipes-devtools/python/python-smartpm/smart-add-for-rpm-ignoresize-check.patch @@ -0,0 +1,37 @@ +python-smartpm: Add checking for "rpm-ignoresize" option + +The do_rootfs takes a very long time when build host has mounted many NFS +devices. syscall lstat() was being called on every filesystem mounted on the +build host during building. +The reason for the lstat() is that rpm is verifying that enough free disk space +is available to do the install. However, since the install is into the target +rootfs it should not matter how much free space there is in the host mounts. +Add checking for "rpm-ignoresize", by it, smart can make whether RPM skip +checking for diskspace when install a rpm package. + +Upstream-Status: Pending + +Signed-off-by: wenlin.kang <wenlin.kang@windriver.com> +Signed-off-by: Chong Lu <Chong.Lu@windriver.com> +--- + smart/backends/rpm/pm.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/smart/backends/rpm/pm.py b/smart/backends/rpm/pm.py +index 5da9ee6..f0488ec 100644 +--- a/smart/backends/rpm/pm.py ++++ b/smart/backends/rpm/pm.py +@@ -241,6 +241,10 @@ class RPMPackageManager(PackageManager): + except AttributeError: + probfilter |= rpm.RPMPROB_FILTER_IGNOREARCH + ++ if sysconf.get("rpm-ignoresize", False): ++ probfilter |= rpm.RPMPROB_FILTER_DISKNODES ++ probfilter |= rpm.RPMPROB_FILTER_DISKSPACE ++ + if force or reinstall: + probfilter |= rpm.RPMPROB_FILTER_REPLACEPKG + probfilter |= rpm.RPMPROB_FILTER_REPLACEOLDFILES +-- +1.9.1 + diff --git a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch index 45f794787c..82d2e6cf31 100644 --- a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch +++ b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch @@ -9,40 +9,24 @@ failures (usually conflicts). This option only works for the install operation. +If a complementary install fails, an actual error occurred, one that +we can't ignore without losing the entire attempted transaction. Keep +this as an error so that we can catch these cases in the futre. + Upstream-Status: Pending Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> - -For complementary and 'attemptonly' package processing, we should -make sure the warn rather than error reported. -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- smart.py | 5 +++- smart/commands/install.py | 5 ++++ smart/transaction.py | 65 +++++++++++++++++++++++++++++++++++------------ 3 files changed, 58 insertions(+), 17 deletions(-) -diff --git a/smart.py b/smart.py -index c5c7a02..7e7fd34 100755 ---- a/smart.py -+++ b/smart.py -@@ -179,7 +179,10 @@ def main(argv): - if opts and opts.log_level == "debug": - import traceback - traceback.print_exc() -- if iface.object: -+ if iface.object and sysconf.has("attempt-install", soft=True): -+ iface.warning(unicode(e)) -+ exitcode = 0 -+ elif iface.object: - iface.error(unicode(e)) - else: - sys.stderr.write(_("error: %s\n") % e) -diff --git a/smart/commands/install.py b/smart/commands/install.py -index 590222c..6ef9682 100644 ---- a/smart/commands/install.py -+++ b/smart/commands/install.py +Index: smart-1.4.1/smart/commands/install.py +=================================================================== +--- smart-1.4.1.orig/smart/commands/install.py ++++ smart-1.4.1/smart/commands/install.py @@ -50,6 +50,8 @@ def option_parser(): parser = OptionParser(usage=USAGE, description=DESCRIPTION, @@ -62,10 +46,10 @@ index 590222c..6ef9682 100644 if opts.explain: sysconf.set("explain-changesets", True, soft=True) -diff --git a/smart/transaction.py b/smart/transaction.py -index 5730a42..e3e61c6 100644 ---- a/smart/transaction.py -+++ b/smart/transaction.py +Index: smart-1.4.1/smart/transaction.py +=================================================================== +--- smart-1.4.1.orig/smart/transaction.py ++++ smart-1.4.1/smart/transaction.py @@ -555,6 +555,8 @@ class Transaction(object): changeset.set(pkg, INSTALL) isinst = changeset.installed @@ -183,6 +167,57 @@ index 5730a42..e3e61c6 100644 elif op is REMOVE: self._remove(pkg, changeset, locked, pending) elif op is UPGRADE: --- -1.9.1 - +Index: smart-1.4.1/smart/backends/rpm/pm.py +=================================================================== +--- smart-1.4.1.orig/smart/backends/rpm/pm.py ++++ smart-1.4.1/smart/backends/rpm/pm.py +@@ -243,15 +253,48 @@ class RPMPackageManager(PackageManager): + cb = RPMCallback(prog, upgradednames) + cb.grabOutput(True) + probs = None ++ retry = 0 + try: + probs = ts.run(cb, None) + finally: + del getTS.ts + cb.grabOutput(False) ++ if probs and sysconf.has("attempt-install", soft=True): ++ def remove_conflict(pkgNEVR): ++ for key in changeset.keys(): ++ if pkgNEVR == str(key): ++ del changeset[key] ++ del pkgpaths[key] ++ iface.warning("Removing %s due to file %s conflicting with %s" % (pkgNEVR, fname, altNEVR)) ++ break ++ ++ retry = 1 ++ for prob in probs: ++ if prob[1][0] == rpm.RPMPROB_NEW_FILE_CONFLICT: ++ msg = prob[0].split() ++ fname = msg[1] ++ pkgNEVR = msg[7] ++ altNEVR = msg[9] ++ pkgNEVR = pkgNEVR.rsplit('.', 1)[0] + '@' + pkgNEVR.rsplit('.', 1)[1] ++ altNEVR = altNEVR.rsplit('.', 1)[0] + '@' + altNEVR.rsplit('.', 1)[1] ++ remove_conflict(pkgNEVR) ++ elif prob[1][0] == rpm.RPMPROB_FILE_CONFLICT: ++ msg = prob[0].split() ++ fname = msg[1] ++ pkgNEVR = msg[5] ++ altNEVR = msg[11] ++ pkgNEVR = pkgNEVR.rsplit('.', 1)[0] + '@' + pkgNEVR.rsplit('.', 1)[1] ++ altNEVR = altNEVR.rsplit('.', 1)[0] + '@' + altNEVR.rsplit('.', 1)[1] ++ remove_conflict(pkgNEVR) ++ else: ++ retry = 0 ++ + prog.setDone() +- if probs: ++ if probs and (not retry): + raise Error, "\n".join([x[0] for x in probs]) + prog.stop() ++ if retry and len(changeset): ++ self.commit(changeset, pkgpaths) + + class RPMCallback: + def __init__(self, prog, upgradednames): diff --git a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb index f2eb33d3a3..c75f10fbf3 100644 --- a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb +++ b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb @@ -33,6 +33,7 @@ SRC_URI = "\ file://smart-attempt.patch \ file://smart-filename-NAME_MAX.patch \ file://smart-rpm4-fixes.patch \ + file://smart-add-for-rpm-ignoresize-check.patch \ " SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6" diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc index 19942baeb0..e18ab8e99a 100644 --- a/meta/recipes-devtools/python/python.inc +++ b/meta/recipes-devtools/python/python.inc @@ -3,18 +3,18 @@ HOMEPAGE = "http://www.python.org" LICENSE = "PSFv2" SECTION = "devel/python" # bump this on every change in contrib/python/generate-manifest-2.7.py -INC_PR = "r0" +INC_PR = "r1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ed3abfd1059e2d3a36a8cff3986f9bb6" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dff3d00f049545862992d2d097831a13" -SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2" - -SRC_URI[md5sum] = "c57477edd6d18bd9eeca2f21add73919" -SRC_URI[sha256sum] = "726457e11cb153adc3f428aaf1901fc561a374c30e5e7da6742c0742a338663c" +SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz" + +SRC_URI[md5sum] = "38d530f7efc373d64a8fb1637e3baaa7" +SRC_URI[sha256sum] = "90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916" PYTHON_MAJMIN = "2.7" -inherit autotools-brokensep +inherit autotools PYTHONLSBOPTS = "--with-wctype-functions" PYTHONLSBOPTS_linuxstdbase = "ac_cv_sizeof_off_t=8" diff --git a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch index 691beada03..1257ca6557 100644 --- a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch +++ b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch @@ -1,102 +1,83 @@ +We need to ensure our host tools get run during build, not the freshly +built cross-tools (this will not work), so we introduce HOSTPYTHON and HOSTPGEN. + Upstream-Status: Inappropriate [embedded specific] -# We need to ensure our host tools get run during build, not the freshly -# built cross-tools (this will not work), so we introduce HOSTPYTHON and HOSTPGEN. -# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de> +Signed-off-by: Michael 'Mickey' Lauer <mickey@vanille-media.de> +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> + +Rebased for python-2.7.9 +Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> -Index: Python-2.7.2/Makefile.pre.in +Index: Python-2.7.9/Makefile.pre.in =================================================================== ---- Python-2.7.2.orig/Makefile.pre.in -+++ Python-2.7.2/Makefile.pre.in -@@ -182,6 +182,7 @@ UNICODE_OBJS= @UNICODE_OBJS@ - - PYTHON= python$(EXE) - BUILDPYTHON= python$(BUILDEXE) -+HOSTPYTHON= $(BUILDPYTHON) - - # The task to run while instrument when building the profile-opt target - PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck -@@ -214,7 +215,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ +--- Python-2.7.9.orig/Makefile.pre.in ++++ Python-2.7.9/Makefile.pre.in +@@ -234,6 +234,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ ########################################################################## # Parser PGEN= Parser/pgen$(EXE) -- +HOSTPGEN= $(PGEN)$(EXE) - POBJS= \ - Parser/acceler.o \ - Parser/grammar1.o \ -@@ -401,14 +402,14 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA - $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) - - platform: $(BUILDPYTHON) -- $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform -+ $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform + PSRCS= \ + Parser/acceler.c \ +@@ -445,7 +446,7 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA + $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) - # Build the shared modules - sharedmods: $(BUILDPYTHON) - @case $$MAKEFLAGS in \ -- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ -- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ -+ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ -+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ - esac + platform: $(BUILDPYTHON) pybuilddir.txt +- $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform ++ $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform - # Build static library -@@ -542,7 +543,7 @@ Modules/python.o: $(srcdir)/Modules/pyth - $(GRAMMAR_H) $(GRAMMAR_C): Parser/pgen.stamp - Parser/pgen.stamp: $(PGEN) $(GRAMMAR_INPUT) - -@$(INSTALL) -d Include + # Create build directory and generate the sysconfig build-time data there. + # pybuilddir.txt contains the name of the build dir and is used for +@@ -611,7 +612,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/p + $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) + @$(MKDIR_P) Include + $(MAKE) $(PGEN) - $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) + $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) - -touch Parser/pgen.stamp - - $(PGEN): $(PGENOBJS) -@@ -926,25 +927,25 @@ libinstall: build_all $(srcdir)/Lib/$(PL - done - $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt + $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS) + $(MAKE) $(GRAMMAR_H) + touch $(GRAMMAR_C) +@@ -1043,27 +1044,27 @@ libinstall: build_all $(srcdir)/Lib/$(PL + $(DESTDIR)$(LIBDEST)/distutils/tests ; \ + fi PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ +- $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ + $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST) -f \ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ $(DESTDIR)$(LIBDEST) PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ +- $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ ++ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST) -f \ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ $(DESTDIR)$(LIBDEST) -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ +- $(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ ++ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ +- $(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ ++ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" -+ $(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" +- $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt ++ $(HOSTPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt ++ $(HOSTPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt # Create the PLATDIR source directory, if one wasn't distributed.. $(srcdir)/Lib/$(PLATDIR): -@@ -1049,7 +1050,7 @@ libainstall: all python-config - # Install the dynamically loadable modules - # This goes into $(exec_prefix) - sharedinstall: sharedmods -- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \ -+ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \ - --prefix=$(prefix) \ - --install-scripts=$(BINDIR) \ - --install-platlib=$(DESTSHARED) \ -Index: Python-2.7.2/setup.py +Index: Python-2.7.9/setup.py =================================================================== ---- Python-2.7.2.orig/setup.py -+++ Python-2.7.2/setup.py -@@ -313,6 +313,7 @@ class PyBuildExt(build_ext): +--- Python-2.7.9.orig/setup.py ++++ Python-2.7.9/setup.py +@@ -334,6 +334,7 @@ class PyBuildExt(build_ext): self.failed.append(ext.name) self.announce('*** WARNING: renaming "%s" since importing it' ' failed: %s' % (ext.name, why), level=3) @@ -104,18 +85,7 @@ Index: Python-2.7.2/setup.py assert not self.inplace basename, tail = os.path.splitext(ext_filename) newname = basename + "_failed" + tail -@@ -369,8 +370,8 @@ class PyBuildExt(build_ext): - - def detect_modules(self): - # Ensure that /usr/local is always used -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -+ #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -+ #add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - self.add_multiarch_paths() - - # Add paths specified in the environment variables LDFLAGS and -@@ -475,6 +476,9 @@ class PyBuildExt(build_ext): +@@ -558,6 +559,9 @@ class PyBuildExt(build_ext): # XXX Omitted modules: gl, pure, dl, SGI-specific modules @@ -125,14 +95,3 @@ Index: Python-2.7.2/setup.py # # The following modules are all pretty straightforward, and compile # on pretty much any POSIXish platform. -@@ -677,8 +681,8 @@ class PyBuildExt(build_ext): - elif curses_library: - readline_libs.append(curses_library) - elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -- 'termcap'): -+ ['/usr/lib/termcap'], -+ 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'], diff --git a/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch b/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch index d74e4b1776..650ceb5951 100644 --- a/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch +++ b/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch @@ -1,14 +1,18 @@ Upstream-Status: Inappropriate [embedded specific] -# We need to supply STAGING_INCDIR here, otherwise the Tk headers -# will not be found. -# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille.de> +We need to supply STAGING_INCDIR here, otherwise the Tk headers +will not be found. -Index: Python-2.6.1/setup.py -=================================================================== ---- Python-2.6.1.orig/setup.py -+++ Python-2.6.1/setup.py -@@ -1543,7 +1543,7 @@ class PyBuildExt(build_ext): +Signed-off-by: Michael 'Mickey' Lauer <mickey@vanille.de> +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> + +Rebased for python-2.7.9 + +diff --git a/setup.py b/setup.py +index 8fe1fb8..67eda74 100644 +--- a/setup.py ++++ b/setup.py +@@ -1892,7 +1892,7 @@ class PyBuildExt(build_ext): dotversion = dotversion[:-1] + '.' + dotversion[-1] tcl_include_sub = [] tk_include_sub = [] @@ -17,12 +21,12 @@ Index: Python-2.6.1/setup.py tcl_include_sub += [dir + os.sep + "tcl" + dotversion] tk_include_sub += [dir + os.sep + "tk" + dotversion] tk_include_sub += tcl_include_sub -@@ -1562,22 +1562,6 @@ class PyBuildExt(build_ext): +@@ -1911,22 +1911,6 @@ class PyBuildExt(build_ext): if dir not in include_dirs: include_dirs.append(dir) - # Check for various platform-specific directories -- if platform == 'sunos5': +- if host_platform == 'sunos5': - include_dirs.append('/usr/openwin/include') - added_lib_dirs.append('/usr/openwin/lib') - elif os.path.exists('/usr/X11R6/include'): @@ -38,5 +42,5 @@ Index: Python-2.6.1/setup.py - added_lib_dirs.append('/usr/X11/lib') - # If Cygwin, then verify that X is installed before proceeding - if platform == 'cygwin': + if host_platform == 'cygwin': x11_inc = find_file('X11/Xlib.h', [], include_dirs) diff --git a/meta/recipes-devtools/python/python/05-enable-ctypes-cross-build.patch b/meta/recipes-devtools/python/python/05-enable-ctypes-cross-build.patch index a68a20620a..5cc8742462 100644 --- a/meta/recipes-devtools/python/python/05-enable-ctypes-cross-build.patch +++ b/meta/recipes-devtools/python/python/05-enable-ctypes-cross-build.patch @@ -1,25 +1,22 @@ +Rebased for python 2.7.9 + Upstream-Status: Inappropriate [embedded specific] # CTypes need to know the actual host we are building on. # Signed-Off: Michael Dietrich <mdt@emdete.de> -Index: Python-2.6.1/setup.py +Index: Python-2.7.9/setup.py =================================================================== ---- Python-2.6.1.orig/setup.py -+++ Python-2.6.1/setup.py -@@ -1656,16 +1656,16 @@ class PyBuildExt(build_ext): - ffi_configfile): - from distutils.dir_util import mkpath - mkpath(ffi_builddir) -- config_args = [] -+ config_args = ['--host=%s' % os.environ["HOST_SYS"], ] +--- Python-2.7.9.orig/setup.py ++++ Python-2.7.9/setup.py +@@ -2028,12 +2028,12 @@ class PyBuildExt(build_ext): # Pass empty CFLAGS because we'll just append the resulting # CFLAGS to Python's; -g or -O2 is to be avoided. - cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \ - % (ffi_builddir, ffi_srcdir, " ".join(config_args)) + cmd = "(cd %s && autoconf -W cross) && (cd %s && env CFLAGS='' '%s/configure' %s)" \ -+ % (ffi_srcdir, ffi_builddir, ffi_srcdir, " ".join(config_args)) ++ % (ffi_srcdir, ffi_builddir, ffi_srcdir, " ".join(config_args)) res = os.system(cmd) if res or not os.path.exists(ffi_configfile): diff --git a/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch b/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch index f8ab0e71e9..e452cb6ac4 100644 --- a/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch +++ b/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch @@ -13,18 +13,20 @@ Nitin A Kamble <nitin.a.kamble@intel.com> Rebased for python 2.7.2 Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> -Index: Python-2.7.2/setup.py -=================================================================== ---- Python-2.7.2.orig/setup.py -+++ Python-2.7.2/setup.py -@@ -680,12 +680,10 @@ class PyBuildExt(build_ext): +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> + +diff --git a/setup.py b/setup.py +index 67eda74..59c537e 100644 +--- a/setup.py ++++ b/setup.py +@@ -761,12 +761,10 @@ class PyBuildExt(build_ext): pass # Issue 7384: Already linked against curses or tinfo. elif curses_library: readline_libs.append(curses_library) - elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], +- ['/usr/lib/termcap'], + elif self.compiler.find_library_file(lib_dirs, - 'termcap'): + 'termcap'): readline_libs.append('termcap') exts.append( Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'], diff --git a/meta/recipes-devtools/python/python/06-ctypes-libffi-fix-configure.patch b/meta/recipes-devtools/python/python/06-ctypes-libffi-fix-configure.patch deleted file mode 100644 index abd63d2a96..0000000000 --- a/meta/recipes-devtools/python/python/06-ctypes-libffi-fix-configure.patch +++ /dev/null @@ -1,44 +0,0 @@ -This fixes configure issues with recent autoconf, e.g: - autoreconf: Entering directory `Modules/_ctypes/libffi' - autoreconf: configure.ac: not using Gettext - autoreconf: running: aclocal --force - configure.ac:26: error: m4_copy: won't overwrite defined macro: _AC_ARG_VAR_PRECIOUS - configure.ac:26: the top level - -The problem is still present in python-2.6.5 but fixed in python-svn. - -Upstream-Status: Accepted [python-svn] - -Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> -Acked-by: Martin Jansa <Martin.Jansa@gmail.com> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> -Signed-off-by: Saul Wold <sgw@linux.intel.com> - - -2011/09/29 -Rebased for python 2.7.2 -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> - - -Index: Python-2.7.2/Modules/_ctypes/libffi/Makefile.am -=================================================================== ---- Python-2.7.2.orig/Modules/_ctypes/libffi/Makefile.am -+++ Python-2.7.2/Modules/_ctypes/libffi/Makefile.am -@@ -2,7 +2,7 @@ - - AUTOMAKE_OPTIONS = foreign subdir-objects - --SUBDIRS = include testsuite man -+SUBDIRS = include - - EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \ - src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \ -@@ -34,8 +34,6 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change - libtool-version ChangeLog.libffi m4/libtool.m4 \ - m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 - --info_TEXINFOS = doc/libffi.texi -- - ## ################################################################ - - ## diff --git a/meta/recipes-devtools/python/python/CVE-2013-4073_py27.patch b/meta/recipes-devtools/python/python/CVE-2013-4073_py27.patch deleted file mode 100644 index 0d17463052..0000000000 --- a/meta/recipes-devtools/python/python/CVE-2013-4073_py27.patch +++ /dev/null @@ -1,251 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -diff -r 9ddc63c039ba Lib/test/nullbytecert.pem ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/Lib/test/nullbytecert.pem Sun Aug 11 18:13:17 2013 +0200 -@@ -0,0 +1,90 @@ -+Certificate: -+ Data: -+ Version: 3 (0x2) -+ Serial Number: 0 (0x0) -+ Signature Algorithm: sha1WithRSAEncryption -+ Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org -+ Validity -+ Not Before: Aug 7 13:11:52 2013 GMT -+ Not After : Aug 7 13:12:52 2013 GMT -+ Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org -+ Subject Public Key Info: -+ Public Key Algorithm: rsaEncryption -+ Public-Key: (2048 bit) -+ Modulus: -+ 00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3: -+ 03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97: -+ 16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2: -+ 88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1: -+ 32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4: -+ 56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8: -+ a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02: -+ 45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75: -+ ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91: -+ 90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d: -+ 7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30: -+ 68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7: -+ f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12: -+ f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5: -+ ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb: -+ d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f: -+ 9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da: -+ 2f:85 -+ Exponent: 65537 (0x10001) -+ X509v3 extensions: -+ X509v3 Basic Constraints: critical -+ CA:FALSE -+ X509v3 Subject Key Identifier: -+ 88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C -+ X509v3 Key Usage: -+ Digital Signature, Non Repudiation, Key Encipherment -+ X509v3 Subject Alternative Name: -+ ************************************************************* -+ WARNING: The values for DNS, email and URI are WRONG. OpenSSL -+ doesn't print the text after a NULL byte. -+ ************************************************************* -+ DNS:altnull.python.org, email:null@python.org, URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1 -+ Signature Algorithm: sha1WithRSAEncryption -+ ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5: -+ a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44: -+ 3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37: -+ 86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3: -+ 56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86: -+ de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac: -+ 3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4: -+ 60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60: -+ d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5: -+ 25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60: -+ 1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6: -+ 4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d: -+ 0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e: -+ 5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6: -+ c1:ca:a9:94 -+-----BEGIN CERTIFICATE----- -+MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx -+DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ -+eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg -+RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y -+ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw -+NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI -+DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv -+ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt -+ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq -+hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB -+BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j -+pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P -+vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv -+KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA -+oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL -+08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV -+HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E -+BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu -+Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251 -+bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA -+AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9 -+i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j -+HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk -+kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx -+VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW -+RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ= -+-----END CERTIFICATE----- -diff -r 9ddc63c039ba Lib/test/test_ssl.py ---- a/Lib/test/test_ssl.py Sun Aug 11 13:04:50 2013 +0300 -+++ b/Lib/test/test_ssl.py Sun Aug 11 18:13:17 2013 +0200 -@@ -25,6 +25,7 @@ - HOST = test_support.HOST - CERTFILE = None - SVN_PYTHON_ORG_ROOT_CERT = None -+NULLBYTECERT = None - - def handle_error(prefix): - exc_format = ' '.join(traceback.format_exception(*sys.exc_info())) -@@ -123,6 +124,27 @@ - ('DNS', 'projects.forum.nokia.com')) - ) - -+ def test_parse_cert_CVE_2013_4073(self): -+ p = ssl._ssl._test_decode_cert(NULLBYTECERT) -+ if test_support.verbose: -+ sys.stdout.write("\n" + pprint.pformat(p) + "\n") -+ subject = ((('countryName', 'US'),), -+ (('stateOrProvinceName', 'Oregon'),), -+ (('localityName', 'Beaverton'),), -+ (('organizationName', 'Python Software Foundation'),), -+ (('organizationalUnitName', 'Python Core Development'),), -+ (('commonName', 'null.python.org\x00example.org'),), -+ (('emailAddress', 'python-dev@python.org'),)) -+ self.assertEqual(p['subject'], subject) -+ self.assertEqual(p['issuer'], subject) -+ self.assertEqual(p['subjectAltName'], -+ (('DNS', 'altnull.python.org\x00example.com'), -+ ('email', 'null@python.org\x00user@example.org'), -+ ('URI', 'http://null.python.org\x00http://example.org'), -+ ('IP Address', '192.0.2.1'), -+ ('IP Address', '2001:DB8:0:0:0:0:0:1\n')) -+ ) -+ - def test_DER_to_PEM(self): - with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f: - pem = f.read() -@@ -1360,7 +1382,7 @@ - - - def test_main(verbose=False): -- global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT -+ global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT, NULLBYTECERT - CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir, - "keycert.pem") - SVN_PYTHON_ORG_ROOT_CERT = os.path.join( -@@ -1368,10 +1390,13 @@ - "https_svn_python_org_root.pem") - NOKIACERT = os.path.join(os.path.dirname(__file__) or os.curdir, - "nokia.pem") -+ NULLBYTECERT = os.path.join(os.path.dirname(__file__) or os.curdir, -+ "nullbytecert.pem") - - if (not os.path.exists(CERTFILE) or - not os.path.exists(SVN_PYTHON_ORG_ROOT_CERT) or -- not os.path.exists(NOKIACERT)): -+ not os.path.exists(NOKIACERT) or -+ not os.path.exists(NULLBYTECERT)): - raise test_support.TestFailed("Can't read certificate files!") - - tests = [BasicTests, BasicSocketTests] -diff -r 9ddc63c039ba Modules/_ssl.c ---- a/Modules/_ssl.c Sun Aug 11 13:04:50 2013 +0300 -+++ b/Modules/_ssl.c Sun Aug 11 18:13:17 2013 +0200 -@@ -741,8 +741,13 @@ - - /* get a rendering of each name in the set of names */ - -+ int gntype; -+ ASN1_STRING *as = NULL; -+ - name = sk_GENERAL_NAME_value(names, j); -- if (name->type == GEN_DIRNAME) { -+ gntype = name-> type; -+ switch (gntype) { -+ case GEN_DIRNAME: - - /* we special-case DirName as a tuple of tuples of attributes */ - -@@ -764,11 +769,61 @@ - goto fail; - } - PyTuple_SET_ITEM(t, 1, v); -+ break; - -- } else { -+ case GEN_EMAIL: -+ case GEN_DNS: -+ case GEN_URI: -+ /* GENERAL_NAME_print() doesn't handle NUL bytes in ASN1_string -+ correctly. */ -+ t = PyTuple_New(2); -+ if (t == NULL) -+ goto fail; -+ switch (gntype) { -+ case GEN_EMAIL: -+ v = PyUnicode_FromString("email"); -+ as = name->d.rfc822Name; -+ break; -+ case GEN_DNS: -+ v = PyUnicode_FromString("DNS"); -+ as = name->d.dNSName; -+ break; -+ case GEN_URI: -+ v = PyUnicode_FromString("URI"); -+ as = name->d.uniformResourceIdentifier; -+ break; -+ } -+ if (v == NULL) { -+ Py_DECREF(t); -+ goto fail; -+ } -+ PyTuple_SET_ITEM(t, 0, v); -+ v = PyString_FromStringAndSize((char *)ASN1_STRING_data(as), -+ ASN1_STRING_length(as)); -+ if (v == NULL) { -+ Py_DECREF(t); -+ goto fail; -+ } -+ PyTuple_SET_ITEM(t, 1, v); -+ break; - -+ default: - /* for everything else, we use the OpenSSL print form */ -- -+ switch (gntype) { -+ /* check for new general name type */ -+ case GEN_OTHERNAME: -+ case GEN_X400: -+ case GEN_EDIPARTY: -+ case GEN_IPADD: -+ case GEN_RID: -+ break; -+ default: -+ if (PyErr_Warn(PyExc_RuntimeWarning, -+ "Unknown general name type") == -1) { -+ goto fail; -+ } -+ break; -+ } - (void) BIO_reset(biobuf); - GENERAL_NAME_print(biobuf, name); - len = BIO_gets(biobuf, buf, sizeof(buf)-1); -@@ -794,6 +849,7 @@ - goto fail; - } - PyTuple_SET_ITEM(t, 1, v); -+ break; - } - - /* and add that rendering to the list */ diff --git a/meta/recipes-devtools/python/python/avoid_parallel_make_races_on_pgen.patch b/meta/recipes-devtools/python/python/avoid_parallel_make_races_on_pgen.patch new file mode 100644 index 0000000000..e9bae324f7 --- /dev/null +++ b/meta/recipes-devtools/python/python/avoid_parallel_make_races_on_pgen.patch @@ -0,0 +1,27 @@ +Upstream-Status: Pending + +Avoids parallel make races linking errors when making Parser/PGEN + +- Implements Richard Purdie's idea + +Signed-Off-By: Richard Purdie <richard.purdie@linuxfoundation.org> +Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> + +Index: Python-2.7.9/Makefile.pre.in +=================================================================== +--- Python-2.7.9.orig/Makefile.pre.in ++++ Python-2.7.9/Makefile.pre.in +@@ -611,12 +611,10 @@ Modules/grpmodule.o: $(srcdir)/Modules/g + + Modules/pwdmodule.o: $(srcdir)/Modules/pwdmodule.c $(srcdir)/Modules/posixmodule.h + +-$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) ++$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) $(PGEN) + @$(MKDIR_P) Include +- $(MAKE) $(PGEN) + $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) + $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS) +- $(MAKE) $(GRAMMAR_H) + touch $(GRAMMAR_C) + + $(PGEN): $(PGENOBJS) diff --git a/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch b/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch index bedc3909d8..208c57c822 100644 --- a/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch +++ b/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch @@ -2,22 +2,17 @@ _tkinter module needs tk module along with tcl. tk is not yet integrated in yocto so we skip the check for this module. Avoid a warning by not adding this module to missing variable. -Also simply disable the tk module since its not in DEPENDS. - Upstream-Status: Inappropriate [distribution] Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> -Index: Python-2.7.3/setup.py +Index: Python-2.7.2/setup.py =================================================================== ---- Python-2.7.3.orig/setup.py 2014-07-07 13:45:15.056233820 +0000 -+++ Python-2.7.3/setup.py 2014-07-16 16:06:37.145656284 +0000 -@@ -1639,10 +1639,12 @@ - self.extensions.extend(exts) - +--- Python-2.7.2.orig/setup.py 2012-04-05 23:18:38.500136647 +0300 ++++ Python-2.7.2/setup.py 2012-04-05 23:19:35.888134969 +0300 +@@ -1634,8 +1634,10 @@ # Call the method for detecting whether _tkinter can be compiled -- self.detect_tkinter(inc_dirs, lib_dirs) -+ #self.detect_tkinter(inc_dirs, lib_dirs) + self.detect_tkinter(inc_dirs, lib_dirs) - if '_tkinter' not in [e.name for e in self.extensions]: - missing.append('_tkinter') diff --git a/meta/recipes-devtools/python/python/builddir.patch b/meta/recipes-devtools/python/python/builddir.patch index 930170b95a..ad629a022e 100644 --- a/meta/recipes-devtools/python/python/builddir.patch +++ b/meta/recipes-devtools/python/python/builddir.patch @@ -7,11 +7,11 @@ python recipe. Upstream-Status: Inappropriate RP 2012/11/13 -Index: Python-2.7.3/Lib/sysconfig.py +Index: Python-2.7.9/Lib/sysconfig.py =================================================================== ---- Python-2.7.3.orig/Lib/sysconfig.py 2012-11-13 14:36:08.429167199 +0000 -+++ Python-2.7.3/Lib/sysconfig.py 2012-11-13 21:58:31.788551800 +0000 -@@ -93,6 +93,7 @@ +--- Python-2.7.9.orig/Lib/sysconfig.py ++++ Python-2.7.9/Lib/sysconfig.py +@@ -93,6 +93,7 @@ _PREFIX = os.path.normpath(sys.prefix) _EXEC_PREFIX = os.path.normpath(sys.exec_prefix) _CONFIG_VARS = None _USER_BASE = None @@ -19,7 +19,7 @@ Index: Python-2.7.3/Lib/sysconfig.py def _safe_realpath(path): try: -@@ -100,7 +102,9 @@ +@@ -100,7 +101,9 @@ def _safe_realpath(path): except OSError: return path @@ -30,11 +30,11 @@ Index: Python-2.7.3/Lib/sysconfig.py _PROJECT_BASE = os.path.dirname(_safe_realpath(sys.executable)) else: # sys.executable can be empty if argv[0] has been changed and Python is -Index: Python-2.7.3/Lib/distutils/sysconfig.py +Index: Python-2.7.9/Lib/distutils/sysconfig.py =================================================================== ---- Python-2.7.3.orig/Lib/distutils/sysconfig.py 2012-11-13 14:36:08.005167209 +0000 -+++ Python-2.7.3/Lib/distutils/sysconfig.py 2012-11-13 22:07:05.644540695 +0000 -@@ -26,6 +26,9 @@ +--- Python-2.7.9.orig/Lib/distutils/sysconfig.py ++++ Python-2.7.9/Lib/distutils/sysconfig.py +@@ -26,6 +26,9 @@ EXEC_PREFIX = os.path.normpath(sys.exec_ # live in project/PCBuild9. If we're dealing with an x64 Windows build, # it'll live in project/PCbuild/amd64. project_base = os.path.dirname(os.path.abspath(sys.executable)) @@ -44,12 +44,3 @@ Index: Python-2.7.3/Lib/distutils/sysconfig.py if os.name == "nt" and "pcbuild" in project_base[-8:].lower(): project_base = os.path.abspath(os.path.join(project_base, os.path.pardir)) # PC/VS7.1 -@@ -247,7 +250,7 @@ - def get_makefile_filename(): - """Return full pathname of installed Makefile from the Python build.""" - if python_build: -- return os.path.join(os.path.dirname(sys.executable), "Makefile") -+ return os.path.join(project_base, "Makefile") - lib_dir = get_python_lib(plat_specific=1, standard_lib=1) - return os.path.join(lib_dir, "config", "Makefile") - diff --git a/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch b/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch index 50d3915425..e4262d9ef0 100644 --- a/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch +++ b/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch @@ -11,72 +11,67 @@ Updated for python 2.7.3 Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> Date: 2012/05/01 -Index: Python-2.7.3/Lib/sysconfig.py +Rebased for python-2.7.9 +Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> + + +Index: Python-2.7.9/Lib/sysconfig.py =================================================================== ---- Python-2.7.3.orig/Lib/sysconfig.py -+++ Python-2.7.3/Lib/sysconfig.py -@@ -7,10 +7,10 @@ from os.path import pardir, realpath - - _INSTALL_SCHEMES = { +--- Python-2.7.9.orig/Lib/sysconfig.py ++++ Python-2.7.9/Lib/sysconfig.py +@@ -9,7 +9,7 @@ _INSTALL_SCHEMES = { 'posix_prefix': { -- 'stdlib': '{base}/lib/python{py_version_short}', -- 'platstdlib': '{platbase}/lib/python{py_version_short}', + 'stdlib': '{base}/'+sys.lib+'/python{py_version_short}', + 'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}', - 'purelib': '{base}/lib/python{py_version_short}/site-packages', -- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', -+ 'stdlib': '{base}/'+sys.lib+'/python{py_version_short}', -+ 'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}', + 'purelib': '{base}/'+sys.lib+'/python{py_version_short}/site-packages', -+ 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages', + 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages', 'include': '{base}/include/python{py_version_short}', 'platinclude': '{platbase}/include/python{py_version_short}', - 'scripts': '{base}/bin', -@@ -65,10 +65,10 @@ _INSTALL_SCHEMES = { - 'data' : '{userbase}', - }, +@@ -67,7 +67,7 @@ _INSTALL_SCHEMES = { 'posix_user': { -- 'stdlib': '{userbase}/lib/python{py_version_short}', -- 'platstdlib': '{userbase}/lib/python{py_version_short}', + 'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', + 'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', - 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', -- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', -+ 'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', -+ 'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', + 'purelib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', -+ 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', + 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', - 'data' : '{userbase}', -Index: Python-2.7.3/Makefile.pre.in +Index: Python-2.7.9/Makefile.pre.in =================================================================== ---- Python-2.7.3.orig/Makefile.pre.in -+++ Python-2.7.3/Makefile.pre.in -@@ -941,25 +941,25 @@ libinstall: build_all $(srcdir)/Lib/$(PL +--- Python-2.7.9.orig/Makefile.pre.in ++++ Python-2.7.9/Makefile.pre.in +@@ -1046,27 +1046,27 @@ libinstall: build_all $(srcdir)/Lib/$(PL $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ ++ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST) -f \ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ $(DESTDIR)$(LIBDEST) - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ - $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ ++ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH}$(RUNSHARED) \ + $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST) -f \ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ $(DESTDIR)$(LIBDEST) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ - $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ ++ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ + $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ - $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ + $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ - $(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" + $(HOSTPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ ++ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ + $(HOSTPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt # Create the PLATDIR source directory, if one wasn't distributed.. diff --git a/meta/recipes-devtools/python/python/gcc-4.8-fix-configure-Wformat.patch b/meta/recipes-devtools/python/python/gcc-4.8-fix-configure-Wformat.patch deleted file mode 100644 index b5d9d5d424..0000000000 --- a/meta/recipes-devtools/python/python/gcc-4.8-fix-configure-Wformat.patch +++ /dev/null @@ -1,20 +0,0 @@ -backport bug 17547 from http://hg.python.org/cpython/rev/9d50af4c482f/ - --Wformat is needed by gcc 4.8 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Backport -Index: Python-2.7.3/configure.in -=================================================================== ---- Python-2.7.3.orig/configure.in 2013-06-11 02:22:04.186529212 -0700 -+++ Python-2.7.3/configure.in 2013-06-13 02:17:06.324403327 -0700 -@@ -1196,7 +1196,7 @@ - then - AC_MSG_CHECKING(whether gcc supports ParseTuple __format__) - save_CFLAGS=$CFLAGS -- CFLAGS="$CFLAGS -Werror" -+ CFLAGS="$CFLAGS -Werror -Wformat" - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[void f(char*,...)__attribute((format(PyArg_ParseTuple, 1, 2)));]], [[]]) - ],[ diff --git a/meta/recipes-devtools/python/python/host_include_contamination.patch b/meta/recipes-devtools/python/python/host_include_contamination.patch index 62cb8b16da..e0aafb218b 100644 --- a/meta/recipes-devtools/python/python/host_include_contamination.patch +++ b/meta/recipes-devtools/python/python/host_include_contamination.patch @@ -12,16 +12,17 @@ so we add a check here. Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: Python-2.7.2/setup.py -=================================================================== ---- Python-2.7.2.orig/setup.py 2012-02-03 12:10:42.307057756 -0800 -+++ Python-2.7.2/setup.py 2012-02-03 12:11:12.363059210 -0800 -@@ -360,6 +360,8 @@ - # https://wiki.ubuntu.com/MultiarchSpec + +diff --git a/setup.py b/setup.py +index ba2d242..bf859be 100644 +--- a/setup.py ++++ b/setup.py +@@ -393,6 +393,8 @@ class PyBuildExt(build_ext): + if not find_executable('dpkg-architecture'): return -+ if os.environ.get('CROSS_COMPILE') is not None: -+ return - tmpfile = os.path.join(self.build_temp, 'multiarch') - if not os.path.exists(self.build_temp): - os.makedirs(self.build_temp) ++ if os.environ.get('CROSS_COMPILE') is not None: ++ return + opt = '' + if cross_compiling: + opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE') diff --git a/meta/recipes-devtools/python/python/json-flaw-fix.patch b/meta/recipes-devtools/python/python/json-flaw-fix.patch deleted file mode 100644 index e9a6cca017..0000000000 --- a/meta/recipes-devtools/python/python/json-flaw-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ - -python: fix _json module arbitrary process memory read vulnerability - -Upstream-Status: submitted - -Signed-off-by: Daniel BORNAZ <daniel.bornaz@enea.com> - ---- a/Modules/_json.c 2014-07-15 15:37:17.151046356 +0200 -+++ b/Modules/_json.c 2014-07-15 15:38:37.335605042 +0200 -@@ -1491,7 +1491,7 @@ scan_once_str(PyScannerObject *s, PyObje - PyObject *res; - char *str = PyString_AS_STRING(pystr); - Py_ssize_t length = PyString_GET_SIZE(pystr); -- if (idx >= length) { -+ if ( idx < 0 || idx >= length) { - PyErr_SetNone(PyExc_StopIteration); - return NULL; - } -@@ -1578,7 +1578,7 @@ scan_once_unicode(PyScannerObject *s, Py - PyObject *res; - Py_UNICODE *str = PyUnicode_AS_UNICODE(pystr); - Py_ssize_t length = PyUnicode_GET_SIZE(pystr); -- if (idx >= length) { -+ if ( idx < 0 || idx >= length) { - PyErr_SetNone(PyExc_StopIteration); - return NULL; - } diff --git a/meta/recipes-devtools/python/python/multilib.patch b/meta/recipes-devtools/python/python/multilib.patch index df470f7c09..0bfa0d2cf4 100644 --- a/meta/recipes-devtools/python/python/multilib.patch +++ b/meta/recipes-devtools/python/python/multilib.patch @@ -1,26 +1,25 @@ -commit 248279e54467a8cd5cde98fc124d1d1384703513 -Author: Yu Ke <ke.yu@intel.com> -Date: Tue Jun 28 21:21:29 2011 +0800 +Rebased for python-2.7.9 +Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> - SUSE patch for the lib64 issue - - see detail in http://bugs.python.org/issue1294959 - - also rebased a bit for Yocto python 2.6.6 - - Picked-by: Yu Ke <ke.yu@intel.com> - -2011/09/29 -Rebased for python 2.7.2 - -Upstream-Status: Inappropriate [configuration] - -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> - -Index: Python-2.7.2/Include/pythonrun.h +Index: Python-2.7.9/configure.ac =================================================================== ---- Python-2.7.2.orig/Include/pythonrun.h -+++ Python-2.7.2/Include/pythonrun.h +--- Python-2.7.9.orig/configure.ac ++++ Python-2.7.9/configure.ac +@@ -736,6 +736,10 @@ SunOS*) + ;; + esac + ++AC_SUBST(LIB) ++AC_MSG_CHECKING(LIB) ++LIB=`basename ${libdir}` ++AC_MSG_RESULT($LIB) + + AC_SUBST(LIBRARY) + AC_MSG_CHECKING(LIBRARY) +Index: Python-2.7.9/Include/pythonrun.h +=================================================================== +--- Python-2.7.9.orig/Include/pythonrun.h ++++ Python-2.7.9/Include/pythonrun.h @@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); /* In their own files */ PyAPI_FUNC(const char *) Py_GetVersion(void); @@ -29,10 +28,10 @@ Index: Python-2.7.2/Include/pythonrun.h PyAPI_FUNC(const char *) Py_GetCopyright(void); PyAPI_FUNC(const char *) Py_GetCompiler(void); PyAPI_FUNC(const char *) Py_GetBuildInfo(void); -Index: Python-2.7.2/Lib/distutils/command/install.py +Index: Python-2.7.9/Lib/distutils/command/install.py =================================================================== ---- Python-2.7.2.orig/Lib/distutils/command/install.py -+++ Python-2.7.2/Lib/distutils/command/install.py +--- Python-2.7.9.orig/Lib/distutils/command/install.py ++++ Python-2.7.9/Lib/distutils/command/install.py @@ -22,6 +22,8 @@ from site import USER_BASE from site import USER_SITE @@ -51,11 +50,11 @@ Index: Python-2.7.2/Lib/distutils/command/install.py 'headers': '$base/include/python$py_version_short/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -Index: Python-2.7.2/Lib/distutils/sysconfig.py +Index: Python-2.7.9/Lib/distutils/sysconfig.py =================================================================== ---- Python-2.7.2.orig/Lib/distutils/sysconfig.py -+++ Python-2.7.2/Lib/distutils/sysconfig.py -@@ -114,8 +114,11 @@ def get_python_lib(plat_specific=0, stan +--- Python-2.7.9.orig/Lib/distutils/sysconfig.py ++++ Python-2.7.9/Lib/distutils/sysconfig.py +@@ -119,8 +119,11 @@ def get_python_lib(plat_specific=0, stan prefix = plat_specific and EXEC_PREFIX or PREFIX if os.name == "posix": @@ -69,11 +68,11 @@ Index: Python-2.7.2/Lib/distutils/sysconfig.py if standard_lib: return libpython else: -Index: Python-2.7.2/Lib/pydoc.py +Index: Python-2.7.9/Lib/pydoc.py =================================================================== ---- Python-2.7.2.orig/Lib/pydoc.py -+++ Python-2.7.2/Lib/pydoc.py -@@ -352,7 +352,7 @@ class Doc: +--- Python-2.7.9.orig/Lib/pydoc.py ++++ Python-2.7.9/Lib/pydoc.py +@@ -383,7 +383,7 @@ class Doc: docloc = os.environ.get("PYTHONDOCS", "http://docs.python.org/library") @@ -82,11 +81,11 @@ Index: Python-2.7.2/Lib/pydoc.py "python"+sys.version[0:3]) if (isinstance(object, type(os)) and (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', -Index: Python-2.7.2/Lib/site.py +Index: Python-2.7.9/Lib/site.py =================================================================== ---- Python-2.7.2.orig/Lib/site.py -+++ Python-2.7.2/Lib/site.py -@@ -300,13 +300,19 @@ def getsitepackages(): +--- Python-2.7.9.orig/Lib/site.py ++++ Python-2.7.9/Lib/site.py +@@ -288,13 +288,18 @@ def getsitepackages(): if sys.platform in ('os2emx', 'riscos'): sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) elif os.sep == '/': @@ -95,12 +94,11 @@ Index: Python-2.7.2/Lib/site.py "python" + sys.version[:3], "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", "site-python")) -+ if sys.lib != "lib": -+ sitepackages.append(os.path.join(prefix, "lib", -+ "python" + sys.version[:3], -+ "site-packages")) + sitepackages.append(os.path.join(prefix, sys.lib, "site-python")) + if sys.lib != "lib": ++ sitepackages.append(os.path.join(prefix, "lib", ++ "python" + sys.version[:3], ++ "site-packages")) + sitepackages.append(os.path.join(prefix, "lib", "site-python")) else: sitepackages.append(prefix) @@ -109,11 +107,43 @@ Index: Python-2.7.2/Lib/site.py if sys.platform == "darwin": # for framework builds *only* we add the standard Apple # locations. -Index: Python-2.7.2/Lib/test/test_dl.py +Index: Python-2.7.9/Lib/sysconfig.py +=================================================================== +--- Python-2.7.9.orig/Lib/sysconfig.py ++++ Python-2.7.9/Lib/sysconfig.py +@@ -7,10 +7,10 @@ from os.path import pardir, realpath + + _INSTALL_SCHEMES = { + 'posix_prefix': { +- 'stdlib': '{base}/lib/python{py_version_short}', +- 'platstdlib': '{platbase}/lib/python{py_version_short}', ++ 'stdlib': '{base}/'+sys.lib+'/python{py_version_short}', ++ 'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}', + 'purelib': '{base}/lib/python{py_version_short}/site-packages', +- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', ++ 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages', + 'include': '{base}/include/python{py_version_short}', + 'platinclude': '{platbase}/include/python{py_version_short}', + 'scripts': '{base}/bin', +@@ -65,10 +65,10 @@ _INSTALL_SCHEMES = { + 'data' : '{userbase}', + }, + 'posix_user': { +- 'stdlib': '{userbase}/lib/python{py_version_short}', +- 'platstdlib': '{userbase}/lib/python{py_version_short}', ++ 'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', ++ 'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', + 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', +- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', ++ 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', + 'include': '{userbase}/include/python{py_version_short}', + 'scripts': '{userbase}/bin', + 'data' : '{userbase}', +Index: Python-2.7.9/Lib/test/test_dl.py =================================================================== ---- Python-2.7.2.orig/Lib/test/test_dl.py -+++ Python-2.7.2/Lib/test/test_dl.py -@@ -5,10 +5,11 @@ +--- Python-2.7.9.orig/Lib/test/test_dl.py ++++ Python-2.7.9/Lib/test/test_dl.py +@@ -4,10 +4,11 @@ import unittest from test.test_support import verbose, import_module dl = import_module('dl', deprecated=True) @@ -127,11 +157,35 @@ Index: Python-2.7.2/Lib/test/test_dl.py ('/usr/bin/cygwin1.dll', 'getpid'), ('/usr/lib/libc.dylib', 'getpid'), ] -Index: Python-2.7.2/Lib/trace.py +Index: Python-2.7.9/Lib/test/test_site.py =================================================================== ---- Python-2.7.2.orig/Lib/trace.py -+++ Python-2.7.2/Lib/trace.py -@@ -762,10 +762,10 @@ def main(argv=None): +--- Python-2.7.9.orig/Lib/test/test_site.py ++++ Python-2.7.9/Lib/test/test_site.py +@@ -241,12 +241,16 @@ class HelperFunctionsTests(unittest.Test + self.assertEqual(dirs[2], wanted) + elif os.sep == '/': + # OS X non-framwework builds, Linux, FreeBSD, etc +- self.assertEqual(len(dirs), 2) + wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], + 'site-packages') +- self.assertEqual(dirs[0], wanted) ++ self.assertTrue(wanted in dirs) + wanted = os.path.join('xoxo', 'lib', 'site-python') +- self.assertEqual(dirs[1], wanted) ++ self.assertTrue(wanted in dirs) ++ wanted = os.path.join('xoxo', sys.lib, 'python' + sys.version[:3], ++ 'site-packages') ++ self.assertTrue(wanted in dirs) ++ wanted = os.path.join('xoxo', sys.lib, 'site-python') ++ self.assertTrue(wanted in dirs) + else: + # other platforms + self.assertEqual(len(dirs), 2) +Index: Python-2.7.9/Lib/trace.py +=================================================================== +--- Python-2.7.9.orig/Lib/trace.py ++++ Python-2.7.9/Lib/trace.py +@@ -754,10 +754,10 @@ def main(argv=None): # should I also call expanduser? (after all, could use $HOME) s = s.replace("$prefix", @@ -144,19 +198,19 @@ Index: Python-2.7.2/Lib/trace.py "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) -Index: Python-2.7.2/Makefile.pre.in +Index: Python-2.7.9/Makefile.pre.in =================================================================== ---- Python-2.7.2.orig/Makefile.pre.in -+++ Python-2.7.2/Makefile.pre.in -@@ -81,6 +81,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG +--- Python-2.7.9.orig/Makefile.pre.in ++++ Python-2.7.9/Makefile.pre.in +@@ -87,6 +87,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG # Machine-dependent subdirectories MACHDEP= @MACHDEP@ +LIB= @LIB@ - # Install prefix for architecture-independent files - prefix= @prefix@ -@@ -97,7 +98,7 @@ LIBDIR= @libdir@ + # Multiarch directory (may be empty) + MULTIARCH= @MULTIARCH@ +@@ -106,7 +107,7 @@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include @@ -165,7 +219,7 @@ Index: Python-2.7.2/Makefile.pre.in # Detailed destination directories BINLIBDEST= $(LIBDIR)/python$(VERSION) -@@ -533,6 +534,7 @@ Modules/getpath.o: $(srcdir)/Modules/get +@@ -598,6 +599,7 @@ Modules/getpath.o: $(srcdir)/Modules/get -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ @@ -173,7 +227,7 @@ Index: Python-2.7.2/Makefile.pre.in -o $@ $(srcdir)/Modules/getpath.c Modules/python.o: $(srcdir)/Modules/python.c -@@ -567,7 +569,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) +@@ -640,7 +642,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) Python/getplatform.o: $(srcdir)/Python/getplatform.c @@ -182,10 +236,10 @@ Index: Python-2.7.2/Makefile.pre.in Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c -Index: Python-2.7.2/Modules/getpath.c +Index: Python-2.7.9/Modules/getpath.c =================================================================== ---- Python-2.7.2.orig/Modules/getpath.c -+++ Python-2.7.2/Modules/getpath.c +--- Python-2.7.9.orig/Modules/getpath.c ++++ Python-2.7.9/Modules/getpath.c @@ -116,9 +116,11 @@ #define EXEC_PREFIX PREFIX #endif @@ -209,10 +263,10 @@ Index: Python-2.7.2/Modules/getpath.c static void reduce(char *dir) -Index: Python-2.7.2/Python/getplatform.c +Index: Python-2.7.9/Python/getplatform.c =================================================================== ---- Python-2.7.2.orig/Python/getplatform.c -+++ Python-2.7.2/Python/getplatform.c +--- Python-2.7.9.orig/Python/getplatform.c ++++ Python-2.7.9/Python/getplatform.c @@ -10,3 +10,13 @@ Py_GetPlatform(void) { return PLATFORM; @@ -227,31 +281,16 @@ Index: Python-2.7.2/Python/getplatform.c +{ + return LIB; +} -Index: Python-2.7.2/Python/sysmodule.c +Index: Python-2.7.9/Python/sysmodule.c =================================================================== ---- Python-2.7.2.orig/Python/sysmodule.c -+++ Python-2.7.2/Python/sysmodule.c -@@ -1416,6 +1416,8 @@ _PySys_Init(void) +--- Python-2.7.9.orig/Python/sysmodule.c ++++ Python-2.7.9/Python/sysmodule.c +@@ -1437,6 +1437,8 @@ _PySys_Init(void) PyString_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", PyString_FromString(Py_GetPlatform())); + SET_SYS_FROM_STRING("lib", -+ PyString_FromString(Py_GetLib())); ++ PyString_FromString(Py_GetLib())); SET_SYS_FROM_STRING("executable", PyString_FromString(Py_GetProgramFullPath())); SET_SYS_FROM_STRING("prefix", -Index: Python-2.7.2/configure.in -=================================================================== ---- Python-2.7.2.orig/configure.in -+++ Python-2.7.2/configure.in -@@ -629,6 +629,10 @@ SunOS*) - ;; - esac - -+AC_SUBST(LIB) -+AC_MSG_CHECKING(LIB) -+LIB=`basename ${libdir}` -+AC_MSG_RESULT($LIB) - - AC_SUBST(LIBRARY) - AC_MSG_CHECKING(LIBRARY) diff --git a/meta/recipes-devtools/python/python/posix_close.patch b/meta/recipes-devtools/python/python/posix_close.patch deleted file mode 100644 index 725531a240..0000000000 --- a/meta/recipes-devtools/python/python/posix_close.patch +++ /dev/null @@ -1,43 +0,0 @@ -backport from http://bugs.python.org/issue20594 - -- Issue #20594: Avoid name clash with the libc function posix_close. - -Upstream-Status: Backport -Signed-off-by: Khem Raj <raj.khem@gmail.com> - - -# HG changeset patch -# User Benjamin Peterson <benjamin@python.org> -# Date 1392131776 18000 -# Node ID 1d253360d5a6d8d987fb2480e26f4fcc2d730932 -# Parent 41e49f1c5bd8ff48a6c18804c958e82c659daab3 -avoid name clash with posix_close (closes #20594) - -diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c ---- a/Modules/posixmodule.c -+++ b/Modules/posixmodule.c -@@ -6581,8 +6581,12 @@ PyDoc_STRVAR(posix_close__doc__, - "close(fd)\n\n\ - Close a file descriptor (for low level IO)."); - --static PyObject * --posix_close(PyObject *self, PyObject *args) -+/* -+The underscore at end of function name avoids a name clash with the libc -+function posix_close. -+*/ -+static PyObject * -+posix_close_(PyObject *self, PyObject *args) - { - int fd, res; - if (!PyArg_ParseTuple(args, "i:close", &fd)) -@@ -8960,7 +8964,7 @@ static PyMethodDef posix_methods[] = { - {"tcsetpgrp", posix_tcsetpgrp, METH_VARARGS, posix_tcsetpgrp__doc__}, - #endif /* HAVE_TCSETPGRP */ - {"open", posix_open, METH_VARARGS, posix_open__doc__}, -- {"close", posix_close, METH_VARARGS, posix_close__doc__}, -+ {"close", posix_close_, METH_VARARGS, posix_close__doc__}, - {"closerange", posix_closerange, METH_VARARGS, posix_closerange__doc__}, - {"dup", posix_dup, METH_VARARGS, posix_dup__doc__}, - {"dup2", posix_dup2, METH_VARARGS, posix_dup2__doc__}, - diff --git a/meta/recipes-devtools/python/python/pypirc-secure.patch b/meta/recipes-devtools/python/python/pypirc-secure.patch deleted file mode 100644 index 8e2df677b6..0000000000 --- a/meta/recipes-devtools/python/python/pypirc-secure.patch +++ /dev/null @@ -1,35 +0,0 @@ -# HG changeset patch -# User Philip Jenvey <pjenvey@underboss.org> -# Date 1322701507 28800 -# Branch 2.7 -# Node ID e7c20a8476a0e2ca18f8040864cbc400818d8f24 -# Parent 3ecddf168f1f554a17a047384fe0b02f2d688277 -create the .pypirc securely - -Upstream-Status: Backport - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - - -diff -r 3ecddf168f1f -r e7c20a8476a0 Lib/distutils/config.py ---- a/Lib/distutils/config.py Tue Nov 29 00:53:09 2011 +0100 -+++ b/Lib/distutils/config.py Wed Nov 30 17:05:07 2011 -0800 -@@ -42,16 +42,8 @@ - def _store_pypirc(self, username, password): - """Creates a default .pypirc file.""" - rc = self._get_rc_file() -- f = open(rc, 'w') -- try: -- f.write(DEFAULT_PYPIRC % (username, password)) -- finally: -- f.close() -- try: -- os.chmod(rc, 0600) -- except OSError: -- # should do something better here -- pass -+ with os.fdopen(os.open(rc, os.O_CREAT | os.O_WRONLY, 0600), 'w') as fp: -+ fp.write(DEFAULT_PYPIRC % (username, password)) - - def _read_pypirc(self): - """Reads the .pypirc file.""" diff --git a/meta/recipes-devtools/python/python/python-2.7.3-CVE-2012-2135.patch b/meta/recipes-devtools/python/python/python-2.7.3-CVE-2012-2135.patch deleted file mode 100644 index 3afdbc0f6e..0000000000 --- a/meta/recipes-devtools/python/python/python-2.7.3-CVE-2012-2135.patch +++ /dev/null @@ -1,73 +0,0 @@ -Upstream-Status: Backport - -Reference:http://bugs.python.org/issue14579 - -The utf-16 decoder in Python 3.1 through 3.3 does not update the -aligned_end variable after calling the unicode_decode_call_errorhandler -function, which allows remote attackers to obtain sensitive information -(process memory) or cause a denial of service (memory corruption and crash) -via unspecified vectors. - -http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-2135 - -diff -urpN a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py ---- a/Lib/test/test_codecs.py -+++ b/Lib/test/test_codecs.py -@@ -495,8 +495,21 @@ class UTF16LETest(ReadTest): - ) - - def test_errors(self): -- self.assertRaises(UnicodeDecodeError, codecs.utf_16_le_decode, "\xff", "strict", True) -- -+ tests = [ -+ (b'\xff', u'\ufffd'), -+ (b'A\x00Z', u'A\ufffd'), -+ (b'A\x00B\x00C\x00D\x00Z', u'ABCD\ufffd'), -+ (b'\x00\xd8', u'\ufffd'), -+ (b'\x00\xd8A', u'\ufffd'), -+ (b'\x00\xd8A\x00', u'\ufffdA'), -+ (b'\x00\xdcA\x00', u'\ufffdA'), -+ ] -+ for raw, expected in tests: -+ print('*****', raw, expected) -+ self.assertRaises(UnicodeDecodeError, codecs.utf_16_le_decode, -+ raw, 'strict', True) -+ self.assertEqual(raw.decode('utf-16le', 'replace'), expected) -+ - class UTF16BETest(ReadTest): - encoding = "utf-16-be" - -@@ -516,7 +529,20 @@ class UTF16BETest(ReadTest): - ) - - def test_errors(self): -- self.assertRaises(UnicodeDecodeError, codecs.utf_16_be_decode, "\xff", "strict", True) -+ tests = [ -+ (b'\xff', u'\ufffd'), -+ (b'\x00A\xff', u'A\ufffd'), -+ (b'\x00A\x00B\x00C\x00DZ', u'ABCD\ufffd'), -+ (b'\xd8\x00', u'\ufffd'), -+ (b'\xd8\x00\xdc', u'\ufffd'), -+ (b'\xd8\x00\x00A', u'\ufffdA'), -+ (b'\xdc\x00\x00A', u'\ufffdA'), -+ ] -+ for raw, expected in tests: -+ print('*****', raw, expected) -+ self.assertRaises(UnicodeDecodeError, codecs.utf_16_be_decode, -+ raw, 'strict', True) -+ self.assertEqual(raw.decode('utf-16be', 'replace'), expected) - - class UTF8Test(ReadTest): - encoding = "utf-8" -diff -urpN a/Objects/unicodeobject.c b/Objects/unicodeobject.c ---- a/Objects/unicodeobject.c 2013-03-04 11:34:34.000000000 +0800 -+++ b/Objects/unicodeobject.c 2013-03-04 11:36:01.000000000 +0800 -@@ -2564,7 +2564,7 @@ PyUnicode_DecodeUTF16Stateful(const char - } - - /* UTF-16 code pair: */ -- if (q >= e) { -+ if (e - q < 2) { - errmsg = "unexpected end of data"; - startinpos = (((const char *)q)-2)-starts; - endinpos = ((const char *)e)-starts; diff --git a/meta/recipes-devtools/python/python/python-2.7.3-CVE-2013-1752-smtplib-fix.patch b/meta/recipes-devtools/python/python/python-2.7.3-CVE-2013-1752-smtplib-fix.patch deleted file mode 100644 index f34ff40ea5..0000000000 --- a/meta/recipes-devtools/python/python/python-2.7.3-CVE-2013-1752-smtplib-fix.patch +++ /dev/null @@ -1,101 +0,0 @@ -Upstream-Status: Backport - -Reference: http://bugs.python.org/issue16042 - -CVE-2013-1752: smtplib: Limit amount of data read by limiting the -call to readline(). Original patch by Christian Heimes - -Signed-off-by: Maxin B. John <maxin.john@enea.com> ---- -diff -Naur Python-2.7.3-orig/Lib/smtplib.py Python-2.7.3/Lib/smtplib.py ---- Python-2.7.3-orig/Lib/smtplib.py 2012-04-10 01:07:31.000000000 +0200 -+++ Python-2.7.3/Lib/smtplib.py 2014-02-27 14:15:24.444198465 +0100 -@@ -57,6 +57,7 @@ - SMTP_PORT = 25 - SMTP_SSL_PORT = 465 - CRLF = "\r\n" -+_MAXLINE = 8192 # more than 8 times larger than RFC 821, 4.5.3 - - OLDSTYLE_AUTH = re.compile(r"auth=(.*)", re.I) - -@@ -179,10 +180,14 @@ - def __init__(self, sslobj): - self.sslobj = sslobj - -- def readline(self): -+ def readline(self, size=-1): -+ if size < 0: -+ size = None - str = "" - chr = None - while chr != "\n": -+ if size is not None and len(str) >= size: -+ break - chr = self.sslobj.read(1) - if not chr: - break -@@ -351,7 +356,7 @@ - self.file = self.sock.makefile('rb') - while 1: - try: -- line = self.file.readline() -+ line = self.file.readline(_MAXLINE + 1) - except socket.error as e: - self.close() - raise SMTPServerDisconnected("Connection unexpectedly closed: " -@@ -361,6 +366,8 @@ - raise SMTPServerDisconnected("Connection unexpectedly closed") - if self.debuglevel > 0: - print>>stderr, 'reply:', repr(line) -+ if len(line) > _MAXLINE: -+ raise SMTPResponseException(500, "Line too long.") - resp.append(line[4:].strip()) - code = line[:3] - # Check that the error code is syntactically correct. -diff -Naur Python-2.7.3-orig/Lib/test/test_smtplib.py Python-2.7.3/Lib/test/test_smtplib.py ---- Python-2.7.3-orig/Lib/test/test_smtplib.py 2012-04-10 01:07:32.000000000 +0200 -+++ Python-2.7.3/Lib/test/test_smtplib.py 2014-02-27 14:15:24.448198293 +0100 -@@ -292,6 +292,33 @@ - HOST, self.port, 'localhost', 3) - - -+@unittest.skipUnless(threading, 'Threading required for this test.') -+class TooLongLineTests(unittest.TestCase): -+ respdata = '250 OK' + ('.' * smtplib._MAXLINE * 2) + '\n' -+ -+ def setUp(self): -+ self.old_stdout = sys.stdout -+ self.output = StringIO.StringIO() -+ sys.stdout = self.output -+ -+ self.evt = threading.Event() -+ self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) -+ self.sock.settimeout(15) -+ self.port = test_support.bind_port(self.sock) -+ servargs = (self.evt, self.respdata, self.sock) -+ threading.Thread(target=server, args=servargs).start() -+ self.evt.wait() -+ self.evt.clear() -+ -+ def tearDown(self): -+ self.evt.wait() -+ sys.stdout = self.old_stdout -+ -+ def testLineTooLong(self): -+ self.assertRaises(smtplib.SMTPResponseException, smtplib.SMTP, -+ HOST, self.port, 'localhost', 3) -+ -+ - sim_users = {'Mr.A@somewhere.com':'John A', - 'Ms.B@somewhere.com':'Sally B', - 'Mrs.C@somewhereesle.com':'Ruth C', -@@ -511,7 +538,8 @@ - def test_main(verbose=None): - test_support.run_unittest(GeneralTests, DebuggingServerTests, - NonConnectingTests, -- BadHELOServerTests, SMTPSimTests) -+ BadHELOServerTests, SMTPSimTests, -+ TooLongLineTests) - - if __name__ == '__main__': - test_main() diff --git a/meta/recipes-devtools/python/python/python-2.7.3-CVE-2014-1912.patch b/meta/recipes-devtools/python/python/python-2.7.3-CVE-2014-1912.patch deleted file mode 100644 index 02cc83d314..0000000000 --- a/meta/recipes-devtools/python/python/python-2.7.3-CVE-2014-1912.patch +++ /dev/null @@ -1,26 +0,0 @@ -Upstream-Status: Backport - -Reference: http://bugs.python.org/issue20246 - -CVE-2014-1912: Python buffer overflow in socket.recvfrom_into() -lets remote users execute arbitrary code.Original patch by Benjamin Peterson - -Signed-off-by: Maxin B. John <maxin.john@enea.com> ---- -diff -r 40fb60df4755 Modules/socketmodule.c ---- a/Modules/socketmodule.c Sun Jan 12 12:11:47 2014 +0200 -+++ b/Modules/socketmodule.c Mon Jan 13 16:36:35 2014 -0800 -@@ -2744,6 +2744,13 @@ - recvlen = buflen; - } - -+ /* Check if the buffer is large enough */ -+ if (buflen < recvlen) { -+ PyErr_SetString(PyExc_ValueError, -+ "buffer too small for requested bytes"); -+ goto error; -+ } -+ - readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr); - if (readlen < 0) { - /* Return an error */ diff --git a/meta/recipes-devtools/python/python/python-2.7.3-CVE-2014-7185.patch b/meta/recipes-devtools/python/python/python-2.7.3-CVE-2014-7185.patch deleted file mode 100644 index 60ef145c7c..0000000000 --- a/meta/recipes-devtools/python/python/python-2.7.3-CVE-2014-7185.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 104eb318283dde5203aa6cf7384287bef181e308 Mon Sep 17 00:00:00 2001 -From: Wenzong Fan <wenzong.fan@windriver.com> -Date: Wed, 12 Nov 2014 01:58:02 -0500 -Subject: [PATCH] python: fix CVE-2014-7185 - -Reference: http://bugs.python.org/issue21831 - -CVE-2014-7185: Integer overflow in bufferobject.c in Python before -2.7.8 allows context-dependent attackers to obtain sensitive -information from process memory via a large size and offset in a -"buffer" function. - -Upstream-Status: Backport - -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> ---- - Lib/test/test_buffer.py | 6 ++++++ - Misc/NEWS | 3 +++ - Objects/bufferobject.c | 2 +- - 3 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/Lib/test/test_buffer.py b/Lib/test/test_buffer.py -index 6bdc34d..3ac1f8c 100644 ---- a/Lib/test/test_buffer.py -+++ b/Lib/test/test_buffer.py -@@ -4,6 +4,7 @@ For now, tests just new or changed functionality. - - """ - -+import sys - import unittest - from test import test_support - -@@ -21,6 +22,11 @@ class BufferTests(unittest.TestCase): - self.assertEqual(b[start:stop:step], - s[start:stop:step]) - -+ def test_large_buffer_size_and_offset(self): -+ data = bytearray('hola mundo') -+ buf = buffer(data, sys.maxsize, sys.maxsize) -+ self.assertEqual(buf[:4096], "") -+ - - def test_main(): - with test_support.check_py3k_warnings(("buffer.. not supported", -diff --git a/Misc/NEWS b/Misc/NEWS -index e8778ad..77396c5 100644 ---- a/Misc/NEWS -+++ b/Misc/NEWS -@@ -1896,6 +1896,9 @@ What's New in Python 2.7 Release Candidate 1? - Core and Builtins - ----------------- - -+- Issue #21831: Avoid integer overflow when large sizes and offsets are given to -+ the buffer type. CVE-2014-7185. -+ - - Issue #8271: during the decoding of an invalid UTF-8 byte sequence, only the - start byte and the continuation byte(s) are now considered invalid, instead - of the number of bytes specified by the start byte. -diff --git a/Objects/bufferobject.c b/Objects/bufferobject.c -index c52f0bc..c542506 100644 ---- a/Objects/bufferobject.c -+++ b/Objects/bufferobject.c -@@ -88,7 +88,7 @@ get_buf(PyBufferObject *self, void **ptr, Py_ssize_t *size, - *size = count; - else - *size = self->b_size; -- if (offset + *size > count) -+ if (*size > count - offset) - *size = count - offset; - } - return 1; --- -1.7.9.5 - diff --git a/meta/recipes-devtools/python/python/python-2.7.3-berkeley-db-5.3.patch b/meta/recipes-devtools/python/python/python-2.7.3-berkeley-db-5.3.patch deleted file mode 100644 index 3df33368ec..0000000000 --- a/meta/recipes-devtools/python/python/python-2.7.3-berkeley-db-5.3.patch +++ /dev/null @@ -1,1572 +0,0 @@ -Upstream-Status: Inappropriate [not author] - -Fix to support db 5.3 for bsddb module in python 2.7.2 - -This patch is made from the db5.1.diff in -http://archive.ubuntu.com/ubuntu/pool/main/p/python2.7/python2.7_2.7.3-0ubuntu3.diff.gz - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - Lib/bsddb/__init__.py | 2 +- - Lib/bsddb/test/test_all.py | 5 +- - Lib/bsddb/test/test_dbenv.py | 29 +++- - Modules/_bsddb.c | 439 +++++++++++++++++++++++------------------- - Modules/bsddb.h | 20 +- - setup.py | 25 +++- - 6 files changed, 307 insertions(+), 213 deletions(-) - -diff --git a/Lib/bsddb/__init__.py b/Lib/bsddb/__init__.py -index ed4deea..1b1c388 100644 ---- a/Lib/bsddb/__init__.py -+++ b/Lib/bsddb/__init__.py -@@ -33,7 +33,7 @@ - #---------------------------------------------------------------------- - - --"""Support for Berkeley DB 4.1 through 4.8 with a simple interface. -+"""Support for Berkeley DB 4.2 through 5.3 with a simple interface. - - For the full featured object oriented interface use the bsddb.db module - instead. It mirrors the Oracle Berkeley DB C API. -diff --git a/Lib/bsddb/test/test_all.py b/Lib/bsddb/test/test_all.py -index e9fe618..6a25f4a 100644 ---- a/Lib/bsddb/test/test_all.py -+++ b/Lib/bsddb/test/test_all.py -@@ -484,6 +484,8 @@ def print_versions(): - print '-=' * 38 - print db.DB_VERSION_STRING - print 'bsddb.db.version(): %s' % (db.version(), ) -+ if db.version() >= (5, 0) : -+ print 'bsddb.db.full_version(): %s' %repr(db.full_version()) - print 'bsddb.db.__version__: %s' % db.__version__ - print 'bsddb.db.cvsid: %s' % db.cvsid - -@@ -528,7 +530,8 @@ def get_new_database_path() : - - # This path can be overriden via "set_test_path_prefix()". - import os, os.path --get_new_path.prefix=os.path.join(os.sep,"tmp","z-Berkeley_DB") -+get_new_path.prefix=os.path.join(os.environ.get("TMPDIR", -+ os.path.join(os.sep,"tmp")), "z-Berkeley_DB") - get_new_path.num=0 - - def get_test_path_prefix() : -diff --git a/Lib/bsddb/test/test_dbenv.py b/Lib/bsddb/test/test_dbenv.py -index 37281df..6ac1e54 100644 ---- a/Lib/bsddb/test/test_dbenv.py -+++ b/Lib/bsddb/test/test_dbenv.py -@@ -25,12 +25,31 @@ class DBEnv(unittest.TestCase): - test_support.rmtree(self.homeDir) - - class DBEnv_general(DBEnv) : -+ def test_get_open_flags(self) : -+ flags = db.DB_CREATE | db.DB_INIT_MPOOL -+ self.env.open(self.homeDir, flags) -+ self.assertEqual(flags, self.env.get_open_flags()) -+ -+ def test_get_open_flags2(self) : -+ flags = db.DB_CREATE | db.DB_INIT_MPOOL | \ -+ db.DB_INIT_LOCK | db.DB_THREAD -+ self.env.open(self.homeDir, flags) -+ self.assertEqual(flags, self.env.get_open_flags()) -+ - if db.version() >= (4, 7) : - def test_lk_partitions(self) : - for i in [10, 20, 40] : - self.env.set_lk_partitions(i) - self.assertEqual(i, self.env.get_lk_partitions()) - -+ def test_getset_intermediate_dir_mode(self) : -+ self.assertEqual(None, self.env.get_intermediate_dir_mode()) -+ for mode in ["rwx------", "rw-rw-rw-", "rw-r--r--"] : -+ self.env.set_intermediate_dir_mode(mode) -+ self.assertEqual(mode, self.env.get_intermediate_dir_mode()) -+ self.assertRaises(db.DBInvalidArgError, -+ self.env.set_intermediate_dir_mode, "abcde") -+ - if db.version() >= (4, 6) : - def test_thread(self) : - for i in [16, 100, 1000] : -@@ -115,7 +134,7 @@ class DBEnv_general(DBEnv) : - self.assertEqual(i, self.env.get_lk_max_lockers()) - - def test_lg_regionmax(self) : -- for i in [128, 256, 1024] : -+ for i in [128, 256, 1000] : - i = i*1024*1024 - self.env.set_lg_regionmax(i) - j = self.env.get_lg_regionmax() -@@ -172,8 +191,12 @@ class DBEnv_general(DBEnv) : - self.env.open(self.homeDir, db.DB_CREATE | db.DB_INIT_MPOOL) - cachesize = (0, 2*1024*1024, 1) - self.assertRaises(db.DBInvalidArgError, -- self.env.set_cachesize, *cachesize) -- self.assertEqual(cachesize2, self.env.get_cachesize()) -+ self.env.set_cachesize, *cachesize) -+ cachesize3 = self.env.get_cachesize() -+ self.assertEqual(cachesize2[0], cachesize3[0]) -+ self.assertEqual(cachesize2[2], cachesize3[2]) -+ # In Berkeley DB 5.3, the cachesize can change when opening the Env -+ self.assertTrue(cachesize2[1] <= cachesize3[1]) - - def test_set_cachesize_dbenv_db(self) : - # You can not configure the cachesize using -diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c -index d2d12ff..e98e4bc 100644 ---- a/Modules/_bsddb.c -+++ b/Modules/_bsddb.c -@@ -187,8 +187,10 @@ static PyObject* DBOldVersionError; /* DB_OLD_VERSION */ - static PyObject* DBRunRecoveryError; /* DB_RUNRECOVERY */ - static PyObject* DBVerifyBadError; /* DB_VERIFY_BAD */ - static PyObject* DBNoServerError; /* DB_NOSERVER */ -+#if (DBVER < 52) - static PyObject* DBNoServerHomeError; /* DB_NOSERVER_HOME */ - static PyObject* DBNoServerIDError; /* DB_NOSERVER_ID */ -+#endif - static PyObject* DBPageNotFoundError; /* DB_PAGE_NOTFOUND */ - static PyObject* DBSecondaryBadError; /* DB_SECONDARY_BAD */ - -@@ -202,9 +204,7 @@ static PyObject* DBFileExistsError; /* EEXIST */ - static PyObject* DBNoSuchFileError; /* ENOENT */ - static PyObject* DBPermissionsError; /* EPERM */ - --#if (DBVER >= 42) - static PyObject* DBRepHandleDeadError; /* DB_REP_HANDLE_DEAD */ --#endif - #if (DBVER >= 44) - static PyObject* DBRepLockoutError; /* DB_REP_LOCKOUT */ - #endif -@@ -696,8 +696,10 @@ static int makeDBError(int err) - case DB_RUNRECOVERY: errObj = DBRunRecoveryError; break; - case DB_VERIFY_BAD: errObj = DBVerifyBadError; break; - case DB_NOSERVER: errObj = DBNoServerError; break; -+#if (DBVER < 52) - case DB_NOSERVER_HOME: errObj = DBNoServerHomeError; break; - case DB_NOSERVER_ID: errObj = DBNoServerIDError; break; -+#endif - case DB_PAGE_NOTFOUND: errObj = DBPageNotFoundError; break; - case DB_SECONDARY_BAD: errObj = DBSecondaryBadError; break; - case DB_BUFFER_SMALL: errObj = DBNoMemoryError; break; -@@ -715,9 +717,7 @@ static int makeDBError(int err) - case ENOENT: errObj = DBNoSuchFileError; break; - case EPERM : errObj = DBPermissionsError; break; - --#if (DBVER >= 42) - case DB_REP_HANDLE_DEAD : errObj = DBRepHandleDeadError; break; --#endif - #if (DBVER >= 44) - case DB_REP_LOCKOUT : errObj = DBRepLockoutError; break; - #endif -@@ -2132,7 +2132,7 @@ DB_get_size(DBObject* self, PyObject* args, PyObject* kwargs) - MYDB_BEGIN_ALLOW_THREADS; - err = self->db->get(self->db, txn, &key, &data, flags); - MYDB_END_ALLOW_THREADS; -- if (err == DB_BUFFER_SMALL) { -+ if ((err == DB_BUFFER_SMALL) || (err == 0)) { - retval = NUMBER_FromLong((long)data.size); - err = 0; - } -@@ -2385,9 +2385,7 @@ DB_open(DBObject* self, PyObject* args, PyObject* kwargs) - return NULL; - } - --#if (DBVER >= 42) - self->db->get_flags(self->db, &self->setflags); --#endif - - self->flags = flags; - -@@ -2539,6 +2537,37 @@ DB_get_priority(DBObject* self) - #endif - - static PyObject* -+DB_get_dbname(DBObject* self) -+{ -+ int err; -+ const char *filename, *dbname; -+ -+ CHECK_DB_NOT_CLOSED(self); -+ -+ MYDB_BEGIN_ALLOW_THREADS; -+ err = self->db->get_dbname(self->db, &filename, &dbname); -+ MYDB_END_ALLOW_THREADS; -+ RETURN_IF_ERR(); -+ /* If "dbname==NULL", it is correctly converted to "None" */ -+ return Py_BuildValue("(ss)", filename, dbname); -+} -+ -+static PyObject* -+DB_get_open_flags(DBObject* self) -+{ -+ int err; -+ unsigned int flags; -+ -+ CHECK_DB_NOT_CLOSED(self); -+ -+ MYDB_BEGIN_ALLOW_THREADS; -+ err = self->db->get_open_flags(self->db, &flags); -+ MYDB_END_ALLOW_THREADS; -+ RETURN_IF_ERR(); -+ return NUMBER_FromLong(flags); -+} -+ -+static PyObject* - DB_set_q_extentsize(DBObject* self, PyObject* args) - { - int err; -@@ -2555,7 +2584,6 @@ DB_set_q_extentsize(DBObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DB_get_q_extentsize(DBObject* self) - { -@@ -2570,7 +2598,6 @@ DB_get_q_extentsize(DBObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(extentsize); - } --#endif - - static PyObject* - DB_set_bt_minkey(DBObject* self, PyObject* args) -@@ -2588,7 +2615,6 @@ DB_set_bt_minkey(DBObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DB_get_bt_minkey(DBObject* self) - { -@@ -2603,7 +2629,6 @@ DB_get_bt_minkey(DBObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(bt_minkey); - } --#endif - - static int - _default_cmp(const DBT *leftKey, -@@ -2759,7 +2784,6 @@ DB_set_cachesize(DBObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DB_get_cachesize(DBObject* self) - { -@@ -2777,7 +2801,6 @@ DB_get_cachesize(DBObject* self) - - return Py_BuildValue("(iii)", gbytes, bytes, ncache); - } --#endif - - static PyObject* - DB_set_flags(DBObject* self, PyObject* args) -@@ -2797,7 +2820,6 @@ DB_set_flags(DBObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DB_get_flags(DBObject* self) - { -@@ -2812,6 +2834,35 @@ DB_get_flags(DBObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(flags); - } -+ -+#if (DBVER >= 43) -+static PyObject* -+DB_get_transactional(DBObject* self) -+{ -+ int err; -+ -+ CHECK_DB_NOT_CLOSED(self); -+ -+ MYDB_BEGIN_ALLOW_THREADS; -+ err = self->db->get_transactional(self->db); -+ MYDB_END_ALLOW_THREADS; -+ -+ if(err == 0) { -+ Py_INCREF(Py_False); -+ return Py_False; -+ } else if(err == 1) { -+ Py_INCREF(Py_True); -+ return Py_True; -+ } -+ -+ /* -+ ** If we reach there, there was an error. The -+ ** "return" should be unreachable. -+ */ -+ RETURN_IF_ERR(); -+ assert(0); /* This coude SHOULD be unreachable */ -+ return NULL; -+} - #endif - - static PyObject* -@@ -2830,7 +2881,6 @@ DB_set_h_ffactor(DBObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DB_get_h_ffactor(DBObject* self) - { -@@ -2845,7 +2895,6 @@ DB_get_h_ffactor(DBObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(ffactor); - } --#endif - - static PyObject* - DB_set_h_nelem(DBObject* self, PyObject* args) -@@ -2863,7 +2912,6 @@ DB_set_h_nelem(DBObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DB_get_h_nelem(DBObject* self) - { -@@ -2878,7 +2926,6 @@ DB_get_h_nelem(DBObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(nelem); - } --#endif - - static PyObject* - DB_set_lorder(DBObject* self, PyObject* args) -@@ -2896,7 +2943,6 @@ DB_set_lorder(DBObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DB_get_lorder(DBObject* self) - { -@@ -2911,7 +2957,6 @@ DB_get_lorder(DBObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(lorder); - } --#endif - - static PyObject* - DB_set_pagesize(DBObject* self, PyObject* args) -@@ -2929,7 +2974,6 @@ DB_set_pagesize(DBObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DB_get_pagesize(DBObject* self) - { -@@ -2944,7 +2988,6 @@ DB_get_pagesize(DBObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(pagesize); - } --#endif - - static PyObject* - DB_set_re_delim(DBObject* self, PyObject* args) -@@ -2967,7 +3010,6 @@ DB_set_re_delim(DBObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DB_get_re_delim(DBObject* self) - { -@@ -2981,7 +3023,6 @@ DB_get_re_delim(DBObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(re_delim); - } --#endif - - static PyObject* - DB_set_re_len(DBObject* self, PyObject* args) -@@ -2999,7 +3040,6 @@ DB_set_re_len(DBObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DB_get_re_len(DBObject* self) - { -@@ -3014,7 +3054,6 @@ DB_get_re_len(DBObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(re_len); - } --#endif - - static PyObject* - DB_set_re_pad(DBObject* self, PyObject* args) -@@ -3036,7 +3075,6 @@ DB_set_re_pad(DBObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DB_get_re_pad(DBObject* self) - { -@@ -3050,7 +3088,6 @@ DB_get_re_pad(DBObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(re_pad); - } --#endif - - static PyObject* - DB_set_re_source(DBObject* self, PyObject* args) -@@ -3069,7 +3106,6 @@ DB_set_re_source(DBObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DB_get_re_source(DBObject* self) - { -@@ -3084,7 +3120,6 @@ DB_get_re_source(DBObject* self) - RETURN_IF_ERR(); - return PyBytes_FromString(source); - } --#endif - - static PyObject* - DB_stat(DBObject* self, PyObject* args, PyObject* kwargs) -@@ -3381,7 +3416,6 @@ DB_set_encrypt(DBObject* self, PyObject* args, PyObject* kwargs) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DB_get_encrypt_flags(DBObject* self) - { -@@ -3396,7 +3430,6 @@ DB_get_encrypt_flags(DBObject* self) - - return NUMBER_FromLong(flags); - } --#endif - - - -@@ -4987,7 +5020,6 @@ DBEnv_set_encrypt(DBEnvObject* self, PyObject* args, PyObject* kwargs) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DBEnv_get_encrypt_flags(DBEnvObject* self) - { -@@ -5025,7 +5057,6 @@ DBEnv_get_timeout(DBEnvObject* self, PyObject* args, PyObject* kwargs) - RETURN_IF_ERR(); - return NUMBER_FromLong(timeout); - } --#endif - - - static PyObject* -@@ -5064,7 +5095,6 @@ DBEnv_set_shm_key(DBEnvObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DBEnv_get_shm_key(DBEnvObject* self) - { -@@ -5081,7 +5111,6 @@ DBEnv_get_shm_key(DBEnvObject* self) - - return NUMBER_FromLong(shm_key); - } --#endif - - #if (DBVER >= 46) - static PyObject* -@@ -5170,7 +5199,6 @@ DBEnv_set_cachesize(DBEnvObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DBEnv_get_cachesize(DBEnvObject* self) - { -@@ -5188,7 +5216,6 @@ DBEnv_get_cachesize(DBEnvObject* self) - - return Py_BuildValue("(iii)", gbytes, bytes, ncache); - } --#endif - - - static PyObject* -@@ -5208,7 +5235,6 @@ DBEnv_set_flags(DBEnvObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DBEnv_get_flags(DBEnvObject* self) - { -@@ -5223,7 +5249,6 @@ DBEnv_get_flags(DBEnvObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(flags); - } --#endif - - #if (DBVER >= 47) - static PyObject* -@@ -5423,7 +5448,6 @@ DBEnv_set_data_dir(DBEnvObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DBEnv_get_data_dirs(DBEnvObject* self) - { -@@ -5463,7 +5487,6 @@ DBEnv_get_data_dirs(DBEnvObject* self) - } - return tuple; - } --#endif - - #if (DBVER >= 44) - static PyObject* -@@ -5513,7 +5536,6 @@ DBEnv_set_lg_bsize(DBEnvObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DBEnv_get_lg_bsize(DBEnvObject* self) - { -@@ -5528,7 +5550,6 @@ DBEnv_get_lg_bsize(DBEnvObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(lg_bsize); - } --#endif - - static PyObject* - DBEnv_set_lg_dir(DBEnvObject* self, PyObject* args) -@@ -5547,7 +5568,6 @@ DBEnv_set_lg_dir(DBEnvObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DBEnv_get_lg_dir(DBEnvObject* self) - { -@@ -5562,7 +5582,6 @@ DBEnv_get_lg_dir(DBEnvObject* self) - RETURN_IF_ERR(); - return PyBytes_FromString(dirp); - } --#endif - - static PyObject* - DBEnv_set_lg_max(DBEnvObject* self, PyObject* args) -@@ -5580,7 +5599,6 @@ DBEnv_set_lg_max(DBEnvObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DBEnv_get_lg_max(DBEnvObject* self) - { -@@ -5595,8 +5613,6 @@ DBEnv_get_lg_max(DBEnvObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(lg_max); - } --#endif -- - - static PyObject* - DBEnv_set_lg_regionmax(DBEnvObject* self, PyObject* args) -@@ -5614,7 +5630,6 @@ DBEnv_set_lg_regionmax(DBEnvObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DBEnv_get_lg_regionmax(DBEnvObject* self) - { -@@ -5629,7 +5644,6 @@ DBEnv_get_lg_regionmax(DBEnvObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(lg_regionmax); - } --#endif - - #if (DBVER >= 47) - static PyObject* -@@ -5680,7 +5694,6 @@ DBEnv_set_lk_detect(DBEnvObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DBEnv_get_lk_detect(DBEnvObject* self) - { -@@ -5695,8 +5708,6 @@ DBEnv_get_lk_detect(DBEnvObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(lk_detect); - } --#endif -- - - #if (DBVER < 45) - static PyObject* -@@ -5734,7 +5745,6 @@ DBEnv_set_lk_max_locks(DBEnvObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DBEnv_get_lk_max_locks(DBEnvObject* self) - { -@@ -5749,7 +5759,6 @@ DBEnv_get_lk_max_locks(DBEnvObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(lk_max); - } --#endif - - static PyObject* - DBEnv_set_lk_max_lockers(DBEnvObject* self, PyObject* args) -@@ -5767,7 +5776,6 @@ DBEnv_set_lk_max_lockers(DBEnvObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DBEnv_get_lk_max_lockers(DBEnvObject* self) - { -@@ -5782,7 +5790,6 @@ DBEnv_get_lk_max_lockers(DBEnvObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(lk_max); - } --#endif - - static PyObject* - DBEnv_set_lk_max_objects(DBEnvObject* self, PyObject* args) -@@ -5800,7 +5807,6 @@ DBEnv_set_lk_max_objects(DBEnvObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DBEnv_get_lk_max_objects(DBEnvObject* self) - { -@@ -5815,9 +5821,7 @@ DBEnv_get_lk_max_objects(DBEnvObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(lk_max); - } --#endif - --#if (DBVER >= 42) - static PyObject* - DBEnv_get_mp_mmapsize(DBEnvObject* self) - { -@@ -5832,8 +5836,6 @@ DBEnv_get_mp_mmapsize(DBEnvObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(mmapsize); - } --#endif -- - - static PyObject* - DBEnv_set_mp_mmapsize(DBEnvObject* self, PyObject* args) -@@ -5869,8 +5871,6 @@ DBEnv_set_tmp_dir(DBEnvObject* self, PyObject* args) - RETURN_NONE(); - } - -- --#if (DBVER >= 42) - static PyObject* - DBEnv_get_tmp_dir(DBEnvObject* self) - { -@@ -5887,8 +5887,6 @@ DBEnv_get_tmp_dir(DBEnvObject* self) - - return PyBytes_FromString(dirpp); - } --#endif -- - - static PyObject* - DBEnv_txn_recover(DBEnvObject* self) -@@ -5899,7 +5897,7 @@ DBEnv_txn_recover(DBEnvObject* self) - DBTxnObject *txn; - #define PREPLIST_LEN 16 - DB_PREPLIST preplist[PREPLIST_LEN]; --#if (DBVER < 48) -+#if (DBVER < 48 || DBVER > 51) - long retp; - #else - u_int32_t retp; -@@ -6003,8 +6001,6 @@ DBEnv_txn_checkpoint(DBEnvObject* self, PyObject* args) - RETURN_NONE(); - } - -- --#if (DBVER >= 42) - static PyObject* - DBEnv_get_tx_max(DBEnvObject* self) - { -@@ -6019,8 +6015,6 @@ DBEnv_get_tx_max(DBEnvObject* self) - RETURN_IF_ERR(); - return PyLong_FromUnsignedLong(max); - } --#endif -- - - static PyObject* - DBEnv_set_tx_max(DBEnvObject* self, PyObject* args) -@@ -6038,8 +6032,6 @@ DBEnv_set_tx_max(DBEnvObject* self, PyObject* args) - RETURN_NONE(); - } - -- --#if (DBVER >= 42) - static PyObject* - DBEnv_get_tx_timestamp(DBEnvObject* self) - { -@@ -6054,7 +6046,6 @@ DBEnv_get_tx_timestamp(DBEnvObject* self) - RETURN_IF_ERR(); - return NUMBER_FromLong(timestamp); - } --#endif - - static PyObject* - DBEnv_set_tx_timestamp(DBEnvObject* self, PyObject* args) -@@ -6756,6 +6747,55 @@ DBEnv_set_private(DBEnvObject* self, PyObject* private_obj) - RETURN_NONE(); - } - -+#if (DBVER >= 47) -+static PyObject* -+DBEnv_set_intermediate_dir_mode(DBEnvObject* self, PyObject* args) -+{ -+ int err; -+ const char *mode; -+ -+ if (!PyArg_ParseTuple(args,"s:set_intermediate_dir_mode", &mode)) -+ return NULL; -+ -+ CHECK_ENV_NOT_CLOSED(self); -+ -+ MYDB_BEGIN_ALLOW_THREADS; -+ err = self->db_env->set_intermediate_dir_mode(self->db_env, mode); -+ MYDB_END_ALLOW_THREADS; -+ RETURN_IF_ERR(); -+ RETURN_NONE(); -+} -+ -+static PyObject* -+DBEnv_get_intermediate_dir_mode(DBEnvObject* self) -+{ -+ int err; -+ const char *mode; -+ -+ CHECK_ENV_NOT_CLOSED(self); -+ -+ MYDB_BEGIN_ALLOW_THREADS; -+ err = self->db_env->get_intermediate_dir_mode(self->db_env, &mode); -+ MYDB_END_ALLOW_THREADS; -+ RETURN_IF_ERR(); -+ return Py_BuildValue("s", mode); -+} -+#endif -+ -+static PyObject* -+DBEnv_get_open_flags(DBEnvObject* self) -+{ -+ int err; -+ unsigned int flags; -+ -+ CHECK_ENV_NOT_CLOSED(self); -+ -+ MYDB_BEGIN_ALLOW_THREADS; -+ err = self->db_env->get_open_flags(self->db_env, &flags); -+ MYDB_END_ALLOW_THREADS; -+ RETURN_IF_ERR(); -+ return NUMBER_FromLong(flags); -+} - - #if (DBVER < 48) - static PyObject* -@@ -6875,7 +6915,6 @@ DBEnv_set_verbose(DBEnvObject* self, PyObject* args) - RETURN_NONE(); - } - --#if (DBVER >= 42) - static PyObject* - DBEnv_get_verbose(DBEnvObject* self, PyObject* args) - { -@@ -6893,7 +6932,6 @@ DBEnv_get_verbose(DBEnvObject* self, PyObject* args) - RETURN_IF_ERR(); - return PyBool_FromLong(verbose); - } --#endif - - #if (DBVER >= 45) - static void -@@ -6975,9 +7013,7 @@ DBEnv_rep_process_message(DBEnvObject* self, PyObject* args) - PyObject *control_py, *rec_py; - DBT control, rec; - int envid; --#if (DBVER >= 42) - DB_LSN lsn; --#endif - - if (!PyArg_ParseTuple(args, "OOi:rep_process_message", &control_py, - &rec_py, &envid)) -@@ -6994,13 +7030,8 @@ DBEnv_rep_process_message(DBEnvObject* self, PyObject* args) - err = self->db_env->rep_process_message(self->db_env, &control, &rec, - envid, &lsn); - #else --#if (DBVER >= 42) - err = self->db_env->rep_process_message(self->db_env, &control, &rec, - &envid, &lsn); --#else -- err = self->db_env->rep_process_message(self->db_env, &control, &rec, -- &envid); --#endif - #endif - MYDB_END_ALLOW_THREADS; - switch (err) { -@@ -7029,12 +7060,10 @@ DBEnv_rep_process_message(DBEnvObject* self, PyObject* args) - return r; - break; - } --#if (DBVER >= 42) - case DB_REP_NOTPERM : - case DB_REP_ISPERM : - return Py_BuildValue("(i(ll))", err, lsn.file, lsn.offset); - break; --#endif - } - RETURN_IF_ERR(); - return Py_BuildValue("(OO)", Py_None, Py_None); -@@ -7086,20 +7115,6 @@ _DBEnv_rep_transportCallback(DB_ENV* db_env, const DBT* control, const DBT* rec, - return ret; - } - --#if (DBVER <= 41) --static int --_DBEnv_rep_transportCallbackOLD(DB_ENV* db_env, const DBT* control, const DBT* rec, -- int envid, u_int32_t flags) --{ -- DB_LSN lsn; -- -- lsn.file = -1; /* Dummy values */ -- lsn.offset = -1; -- return _DBEnv_rep_transportCallback(db_env, control, rec, &lsn, envid, -- flags); --} --#endif -- - static PyObject* - DBEnv_rep_set_transport(DBEnvObject* self, PyObject* args) - { -@@ -7120,13 +7135,8 @@ DBEnv_rep_set_transport(DBEnvObject* self, PyObject* args) - err = self->db_env->rep_set_transport(self->db_env, envid, - &_DBEnv_rep_transportCallback); - #else --#if (DBVER >= 42) - err = self->db_env->set_rep_transport(self->db_env, envid, - &_DBEnv_rep_transportCallback); --#else -- err = self->db_env->set_rep_transport(self->db_env, envid, -- &_DBEnv_rep_transportCallbackOLD); --#endif - #endif - MYDB_END_ALLOW_THREADS; - RETURN_IF_ERR(); -@@ -7608,6 +7618,7 @@ DBEnv_repmgr_start(DBEnvObject* self, PyObject* args, PyObject* - RETURN_NONE(); - } - -+#if (DBVER < 52) - static PyObject* - DBEnv_repmgr_set_local_site(DBEnvObject* self, PyObject* args, PyObject* - kwargs) -@@ -7654,6 +7665,7 @@ DBEnv_repmgr_add_remote_site(DBEnvObject* self, PyObject* args, PyObject* - RETURN_IF_ERR(); - return NUMBER_FromLong(eidp); - } -+#endif - - static PyObject* - DBEnv_repmgr_set_ack_policy(DBEnvObject* self, PyObject* args) -@@ -8482,65 +8494,43 @@ static PyMethodDef DB_methods[] = { - {"remove", (PyCFunction)DB_remove, METH_VARARGS|METH_KEYWORDS}, - {"rename", (PyCFunction)DB_rename, METH_VARARGS}, - {"set_bt_minkey", (PyCFunction)DB_set_bt_minkey, METH_VARARGS}, --#if (DBVER >= 42) - {"get_bt_minkey", (PyCFunction)DB_get_bt_minkey, METH_NOARGS}, --#endif - {"set_bt_compare", (PyCFunction)DB_set_bt_compare, METH_O}, - {"set_cachesize", (PyCFunction)DB_set_cachesize, METH_VARARGS}, --#if (DBVER >= 42) - {"get_cachesize", (PyCFunction)DB_get_cachesize, METH_NOARGS}, --#endif - {"set_encrypt", (PyCFunction)DB_set_encrypt, METH_VARARGS|METH_KEYWORDS}, --#if (DBVER >= 42) - {"get_encrypt_flags", (PyCFunction)DB_get_encrypt_flags, METH_NOARGS}, --#endif -- - {"set_flags", (PyCFunction)DB_set_flags, METH_VARARGS}, --#if (DBVER >= 42) - {"get_flags", (PyCFunction)DB_get_flags, METH_NOARGS}, -+#if (DBVER >= 43) -+ {"get_transactional", (PyCFunction)DB_get_transactional, METH_NOARGS}, - #endif - {"set_h_ffactor", (PyCFunction)DB_set_h_ffactor, METH_VARARGS}, --#if (DBVER >= 42) - {"get_h_ffactor", (PyCFunction)DB_get_h_ffactor, METH_NOARGS}, --#endif - {"set_h_nelem", (PyCFunction)DB_set_h_nelem, METH_VARARGS}, --#if (DBVER >= 42) - {"get_h_nelem", (PyCFunction)DB_get_h_nelem, METH_NOARGS}, --#endif - {"set_lorder", (PyCFunction)DB_set_lorder, METH_VARARGS}, --#if (DBVER >= 42) - {"get_lorder", (PyCFunction)DB_get_lorder, METH_NOARGS}, --#endif - {"set_pagesize", (PyCFunction)DB_set_pagesize, METH_VARARGS}, --#if (DBVER >= 42) - {"get_pagesize", (PyCFunction)DB_get_pagesize, METH_NOARGS}, --#endif - {"set_re_delim", (PyCFunction)DB_set_re_delim, METH_VARARGS}, --#if (DBVER >= 42) - {"get_re_delim", (PyCFunction)DB_get_re_delim, METH_NOARGS}, --#endif - {"set_re_len", (PyCFunction)DB_set_re_len, METH_VARARGS}, --#if (DBVER >= 42) - {"get_re_len", (PyCFunction)DB_get_re_len, METH_NOARGS}, --#endif - {"set_re_pad", (PyCFunction)DB_set_re_pad, METH_VARARGS}, --#if (DBVER >= 42) - {"get_re_pad", (PyCFunction)DB_get_re_pad, METH_NOARGS}, --#endif - {"set_re_source", (PyCFunction)DB_set_re_source, METH_VARARGS}, --#if (DBVER >= 42) - {"get_re_source", (PyCFunction)DB_get_re_source, METH_NOARGS}, --#endif - {"set_q_extentsize",(PyCFunction)DB_set_q_extentsize, METH_VARARGS}, --#if (DBVER >= 42) - {"get_q_extentsize",(PyCFunction)DB_get_q_extentsize, METH_NOARGS}, --#endif - {"set_private", (PyCFunction)DB_set_private, METH_O}, - {"get_private", (PyCFunction)DB_get_private, METH_NOARGS}, - #if (DBVER >= 46) - {"set_priority", (PyCFunction)DB_set_priority, METH_VARARGS}, - {"get_priority", (PyCFunction)DB_get_priority, METH_NOARGS}, - #endif -+ {"get_dbname", (PyCFunction)DB_get_dbname, METH_NOARGS}, -+ {"get_open_flags", (PyCFunction)DB_get_open_flags, METH_NOARGS}, - {"stat", (PyCFunction)DB_stat, METH_VARARGS|METH_KEYWORDS}, - #if (DBVER >= 43) - {"stat_print", (PyCFunction)DB_stat_print, -@@ -8639,24 +8629,18 @@ static PyMethodDef DBEnv_methods[] = { - {"get_thread_count", (PyCFunction)DBEnv_get_thread_count, METH_NOARGS}, - #endif - {"set_encrypt", (PyCFunction)DBEnv_set_encrypt, METH_VARARGS|METH_KEYWORDS}, --#if (DBVER >= 42) - {"get_encrypt_flags", (PyCFunction)DBEnv_get_encrypt_flags, METH_NOARGS}, - {"get_timeout", (PyCFunction)DBEnv_get_timeout, - METH_VARARGS|METH_KEYWORDS}, --#endif - {"set_timeout", (PyCFunction)DBEnv_set_timeout, METH_VARARGS|METH_KEYWORDS}, - {"set_shm_key", (PyCFunction)DBEnv_set_shm_key, METH_VARARGS}, --#if (DBVER >= 42) - {"get_shm_key", (PyCFunction)DBEnv_get_shm_key, METH_NOARGS}, --#endif - #if (DBVER >= 46) - {"set_cache_max", (PyCFunction)DBEnv_set_cache_max, METH_VARARGS}, - {"get_cache_max", (PyCFunction)DBEnv_get_cache_max, METH_NOARGS}, - #endif - {"set_cachesize", (PyCFunction)DBEnv_set_cachesize, METH_VARARGS}, --#if (DBVER >= 42) - {"get_cachesize", (PyCFunction)DBEnv_get_cachesize, METH_NOARGS}, --#endif - {"memp_trickle", (PyCFunction)DBEnv_memp_trickle, METH_VARARGS}, - {"memp_sync", (PyCFunction)DBEnv_memp_sync, METH_VARARGS}, - {"memp_stat", (PyCFunction)DBEnv_memp_stat, -@@ -8685,33 +8669,21 @@ static PyMethodDef DBEnv_methods[] = { - #endif - #endif - {"set_data_dir", (PyCFunction)DBEnv_set_data_dir, METH_VARARGS}, --#if (DBVER >= 42) - {"get_data_dirs", (PyCFunction)DBEnv_get_data_dirs, METH_NOARGS}, --#endif --#if (DBVER >= 42) - {"get_flags", (PyCFunction)DBEnv_get_flags, METH_NOARGS}, --#endif - {"set_flags", (PyCFunction)DBEnv_set_flags, METH_VARARGS}, - #if (DBVER >= 47) - {"log_set_config", (PyCFunction)DBEnv_log_set_config, METH_VARARGS}, - {"log_get_config", (PyCFunction)DBEnv_log_get_config, METH_VARARGS}, - #endif - {"set_lg_bsize", (PyCFunction)DBEnv_set_lg_bsize, METH_VARARGS}, --#if (DBVER >= 42) - {"get_lg_bsize", (PyCFunction)DBEnv_get_lg_bsize, METH_NOARGS}, --#endif - {"set_lg_dir", (PyCFunction)DBEnv_set_lg_dir, METH_VARARGS}, --#if (DBVER >= 42) - {"get_lg_dir", (PyCFunction)DBEnv_get_lg_dir, METH_NOARGS}, --#endif - {"set_lg_max", (PyCFunction)DBEnv_set_lg_max, METH_VARARGS}, --#if (DBVER >= 42) - {"get_lg_max", (PyCFunction)DBEnv_get_lg_max, METH_NOARGS}, --#endif - {"set_lg_regionmax",(PyCFunction)DBEnv_set_lg_regionmax, METH_VARARGS}, --#if (DBVER >= 42) - {"get_lg_regionmax",(PyCFunction)DBEnv_get_lg_regionmax, METH_NOARGS}, --#endif - #if (DBVER >= 44) - {"set_lg_filemode", (PyCFunction)DBEnv_set_lg_filemode, METH_VARARGS}, - {"get_lg_filemode", (PyCFunction)DBEnv_get_lg_filemode, METH_NOARGS}, -@@ -8721,36 +8693,24 @@ static PyMethodDef DBEnv_methods[] = { - {"get_lk_partitions", (PyCFunction)DBEnv_get_lk_partitions, METH_NOARGS}, - #endif - {"set_lk_detect", (PyCFunction)DBEnv_set_lk_detect, METH_VARARGS}, --#if (DBVER >= 42) - {"get_lk_detect", (PyCFunction)DBEnv_get_lk_detect, METH_NOARGS}, --#endif - #if (DBVER < 45) - {"set_lk_max", (PyCFunction)DBEnv_set_lk_max, METH_VARARGS}, - #endif - {"set_lk_max_locks", (PyCFunction)DBEnv_set_lk_max_locks, METH_VARARGS}, --#if (DBVER >= 42) - {"get_lk_max_locks", (PyCFunction)DBEnv_get_lk_max_locks, METH_NOARGS}, --#endif - {"set_lk_max_lockers", (PyCFunction)DBEnv_set_lk_max_lockers, METH_VARARGS}, --#if (DBVER >= 42) - {"get_lk_max_lockers", (PyCFunction)DBEnv_get_lk_max_lockers, METH_NOARGS}, --#endif - {"set_lk_max_objects", (PyCFunction)DBEnv_set_lk_max_objects, METH_VARARGS}, --#if (DBVER >= 42) - {"get_lk_max_objects", (PyCFunction)DBEnv_get_lk_max_objects, METH_NOARGS}, --#endif - #if (DBVER >= 43) - {"stat_print", (PyCFunction)DBEnv_stat_print, - METH_VARARGS|METH_KEYWORDS}, - #endif - {"set_mp_mmapsize", (PyCFunction)DBEnv_set_mp_mmapsize, METH_VARARGS}, --#if (DBVER >= 42) - {"get_mp_mmapsize", (PyCFunction)DBEnv_get_mp_mmapsize, METH_NOARGS}, --#endif - {"set_tmp_dir", (PyCFunction)DBEnv_set_tmp_dir, METH_VARARGS}, --#if (DBVER >= 42) - {"get_tmp_dir", (PyCFunction)DBEnv_get_tmp_dir, METH_NOARGS}, --#endif - {"txn_begin", (PyCFunction)DBEnv_txn_begin, METH_VARARGS|METH_KEYWORDS}, - {"txn_checkpoint", (PyCFunction)DBEnv_txn_checkpoint, METH_VARARGS}, - {"txn_stat", (PyCFunction)DBEnv_txn_stat, METH_VARARGS}, -@@ -8758,10 +8718,8 @@ static PyMethodDef DBEnv_methods[] = { - {"txn_stat_print", (PyCFunction)DBEnv_txn_stat_print, - METH_VARARGS|METH_KEYWORDS}, - #endif --#if (DBVER >= 42) - {"get_tx_max", (PyCFunction)DBEnv_get_tx_max, METH_NOARGS}, - {"get_tx_timestamp", (PyCFunction)DBEnv_get_tx_timestamp, METH_NOARGS}, --#endif - {"set_tx_max", (PyCFunction)DBEnv_set_tx_max, METH_VARARGS}, - {"set_tx_timestamp", (PyCFunction)DBEnv_set_tx_timestamp, METH_VARARGS}, - {"lock_detect", (PyCFunction)DBEnv_lock_detect, METH_VARARGS}, -@@ -8804,11 +8762,16 @@ static PyMethodDef DBEnv_methods[] = { - {"get_mp_max_write", (PyCFunction)DBEnv_get_mp_max_write, METH_NOARGS}, - #endif - {"set_verbose", (PyCFunction)DBEnv_set_verbose, METH_VARARGS}, --#if (DBVER >= 42) -- {"get_verbose", (PyCFunction)DBEnv_get_verbose, METH_VARARGS}, -+ {"get_verbose", (PyCFunction)DBEnv_get_verbose, METH_VARARGS}, -+ {"set_private", (PyCFunction)DBEnv_set_private, METH_O}, -+ {"get_private", (PyCFunction)DBEnv_get_private, METH_NOARGS}, -+ {"get_open_flags", (PyCFunction)DBEnv_get_open_flags, METH_NOARGS}, -+#if (DBVER >= 47) -+ {"set_intermediate_dir_mode", (PyCFunction)DBEnv_set_intermediate_dir_mode, -+ METH_VARARGS}, -+ {"get_intermediate_dir_mode", (PyCFunction)DBEnv_get_intermediate_dir_mode, -+ METH_NOARGS}, - #endif -- {"set_private", (PyCFunction)DBEnv_set_private, METH_O}, -- {"get_private", (PyCFunction)DBEnv_get_private, METH_NOARGS}, - {"rep_start", (PyCFunction)DBEnv_rep_start, - METH_VARARGS|METH_KEYWORDS}, - {"rep_set_transport", (PyCFunction)DBEnv_rep_set_transport, METH_VARARGS}, -@@ -8855,10 +8818,12 @@ static PyMethodDef DBEnv_methods[] = { - #if (DBVER >= 45) - {"repmgr_start", (PyCFunction)DBEnv_repmgr_start, - METH_VARARGS|METH_KEYWORDS}, -+#if (DBVER < 52) - {"repmgr_set_local_site", (PyCFunction)DBEnv_repmgr_set_local_site, - METH_VARARGS|METH_KEYWORDS}, - {"repmgr_add_remote_site", (PyCFunction)DBEnv_repmgr_add_remote_site, - METH_VARARGS|METH_KEYWORDS}, -+#endif - {"repmgr_set_ack_policy", (PyCFunction)DBEnv_repmgr_set_ack_policy, - METH_VARARGS}, - {"repmgr_get_ack_policy", (PyCFunction)DBEnv_repmgr_get_ack_policy, -@@ -8922,13 +8887,9 @@ DBEnv_db_home_get(DBEnvObject* self) - - CHECK_ENV_NOT_CLOSED(self); - --#if (DBVER >= 42) - MYDB_BEGIN_ALLOW_THREADS; - self->db_env->get_home(self->db_env, &home); - MYDB_END_ALLOW_THREADS; --#else -- home=self->db_env->db_home; --#endif - - if (home == NULL) { - RETURN_NONE(); -@@ -9298,10 +9259,25 @@ bsddb_version(PyObject* self) - { - int major, minor, patch; - -+ /* This should be instantaneous, no need to release the GIL */ - db_version(&major, &minor, &patch); - return Py_BuildValue("(iii)", major, minor, patch); - } - -+#if (DBVER >= 50) -+static PyObject* -+bsddb_version_full(PyObject* self) -+{ -+ char *version_string; -+ int family, release, major, minor, patch; -+ -+ /* This should be instantaneous, no need to release the GIL */ -+ version_string = db_full_version(&family, &release, &major, &minor, &patch); -+ return Py_BuildValue("(siiiii)", -+ version_string, family, release, major, minor, patch); -+} -+#endif -+ - - /* List of functions defined in the module */ - static PyMethodDef bsddb_methods[] = { -@@ -9311,6 +9287,9 @@ static PyMethodDef bsddb_methods[] = { - {"DBSequence", (PyCFunction)DBSequence_construct, METH_VARARGS | METH_KEYWORDS }, - #endif - {"version", (PyCFunction)bsddb_version, METH_NOARGS, bsddb_version_doc}, -+#if (DBVER >= 50) -+ {"full_version", (PyCFunction)bsddb_version_full, METH_NOARGS}, -+#endif - {NULL, NULL} /* sentinel */ - }; - -@@ -9328,6 +9307,11 @@ static BSDDB_api bsddb_api; - */ - #define ADD_INT(dict, NAME) _addIntToDict(dict, #NAME, NAME) - -+/* -+** We can rename the module at import time, so the string allocated -+** must be big enough, and any use of the name must use this particular -+** string. -+*/ - #define MODULE_NAME_MAX_LEN 11 - static char _bsddbModuleName[MODULE_NAME_MAX_LEN+1] = "_bsddb"; - -@@ -9428,16 +9412,10 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */ - ADD_INT(d, DB_MAX_RECORDS); - - #if (DBVER < 48) --#if (DBVER >= 42) - ADD_INT(d, DB_RPCCLIENT); --#else -- ADD_INT(d, DB_CLIENT); -- /* allow apps to be written using DB_RPCCLIENT on older Berkeley DB */ -- _addIntToDict(d, "DB_RPCCLIENT", DB_CLIENT); --#endif - #endif - --#if (DBVER < 48) -+#if (DBVER < 48 || DBVER > 51) - ADD_INT(d, DB_XA_CREATE); - #endif - -@@ -9477,6 +9455,14 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */ - ADD_INT(d, DB_TXN_SYNC); - ADD_INT(d, DB_TXN_NOWAIT); - -+#if (DBVER >= 51) -+ ADD_INT(d, DB_TXN_BULK); -+#endif -+ -+#if (DBVER >= 48) -+ ADD_INT(d, DB_CURSOR_BULK); -+#endif -+ - #if (DBVER >= 46) - ADD_INT(d, DB_TXN_WAIT); - #endif -@@ -9561,9 +9547,7 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */ - ADD_INT(d, DB_ARCH_ABS); - ADD_INT(d, DB_ARCH_DATA); - ADD_INT(d, DB_ARCH_LOG); --#if (DBVER >= 42) - ADD_INT(d, DB_ARCH_REMOVE); --#endif - - ADD_INT(d, DB_BTREE); - ADD_INT(d, DB_HASH); -@@ -9591,9 +9575,6 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */ - ADD_INT(d, DB_CACHED_COUNTS); - #endif - --#if (DBVER <= 41) -- ADD_INT(d, DB_COMMIT); --#endif - ADD_INT(d, DB_CONSUME); - ADD_INT(d, DB_CONSUME_WAIT); - ADD_INT(d, DB_CURRENT); -@@ -9651,8 +9632,10 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */ - ADD_INT(d, DB_LOCK_DEADLOCK); - ADD_INT(d, DB_LOCK_NOTGRANTED); - ADD_INT(d, DB_NOSERVER); -+#if (DBVER < 52) - ADD_INT(d, DB_NOSERVER_HOME); - ADD_INT(d, DB_NOSERVER_ID); -+#endif - ADD_INT(d, DB_NOTFOUND); - ADD_INT(d, DB_OLD_VERSION); - ADD_INT(d, DB_RUNRECOVERY); -@@ -9671,6 +9654,10 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */ - #if (DBVER >= 43) - ADD_INT(d, DB_STAT_SUBSYSTEM); - ADD_INT(d, DB_STAT_MEMP_HASH); -+ ADD_INT(d, DB_STAT_LOCK_CONF); -+ ADD_INT(d, DB_STAT_LOCK_LOCKERS); -+ ADD_INT(d, DB_STAT_LOCK_OBJECTS); -+ ADD_INT(d, DB_STAT_LOCK_PARAMS); - #endif - - #if (DBVER >= 48) -@@ -9690,7 +9677,6 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */ - ADD_INT(d, DB_EID_INVALID); - ADD_INT(d, DB_EID_BROADCAST); - --#if (DBVER >= 42) - ADD_INT(d, DB_TIME_NOTGRANTED); - ADD_INT(d, DB_TXN_NOT_DURABLE); - ADD_INT(d, DB_TXN_WRITE_NOSYNC); -@@ -9698,9 +9684,8 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */ - ADD_INT(d, DB_INIT_REP); - ADD_INT(d, DB_ENCRYPT); - ADD_INT(d, DB_CHKSUM); --#endif - --#if (DBVER >= 42) && (DBVER < 47) -+#if (DBVER < 47) - ADD_INT(d, DB_LOG_AUTOREMOVE); - ADD_INT(d, DB_DIRECT_LOG); - #endif -@@ -9733,6 +9718,20 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */ - ADD_INT(d, DB_VERB_REPLICATION); - ADD_INT(d, DB_VERB_WAITSFOR); - -+#if (DBVER >= 50) -+ ADD_INT(d, DB_VERB_REP_SYSTEM); -+#endif -+ -+#if (DBVER >= 47) -+ ADD_INT(d, DB_VERB_REP_ELECT); -+ ADD_INT(d, DB_VERB_REP_LEASE); -+ ADD_INT(d, DB_VERB_REP_MISC); -+ ADD_INT(d, DB_VERB_REP_MSGS); -+ ADD_INT(d, DB_VERB_REP_SYNC); -+ ADD_INT(d, DB_VERB_REPMGR_CONNFAIL); -+ ADD_INT(d, DB_VERB_REPMGR_MISC); -+#endif -+ - #if (DBVER >= 45) - ADD_INT(d, DB_EVENT_PANIC); - ADD_INT(d, DB_EVENT_REP_CLIENT); -@@ -9748,16 +9747,25 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */ - ADD_INT(d, DB_EVENT_WRITE_FAILED); - #endif - -+#if (DBVER >= 50) -+ ADD_INT(d, DB_REPMGR_CONF_ELECTIONS); -+ ADD_INT(d, DB_EVENT_REP_MASTER_FAILURE); -+ ADD_INT(d, DB_EVENT_REP_DUPMASTER); -+ ADD_INT(d, DB_EVENT_REP_ELECTION_FAILED); -+#endif -+#if (DBVER >= 48) -+ ADD_INT(d, DB_EVENT_REG_ALIVE); -+ ADD_INT(d, DB_EVENT_REG_PANIC); -+#endif -+ - ADD_INT(d, DB_REP_DUPMASTER); - ADD_INT(d, DB_REP_HOLDELECTION); - #if (DBVER >= 44) - ADD_INT(d, DB_REP_IGNORE); - ADD_INT(d, DB_REP_JOIN_FAILURE); - #endif --#if (DBVER >= 42) - ADD_INT(d, DB_REP_ISPERM); - ADD_INT(d, DB_REP_NOTPERM); --#endif - ADD_INT(d, DB_REP_NEWSITE); - - ADD_INT(d, DB_REP_MASTER); -@@ -9766,7 +9774,13 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */ - ADD_INT(d, DB_REP_PERMANENT); - - #if (DBVER >= 44) -+#if (DBVER >= 50) -+ ADD_INT(d, DB_REP_CONF_AUTOINIT); -+#else - ADD_INT(d, DB_REP_CONF_NOAUTOINIT); -+#endif /* 5.0 */ -+#endif /* 4.4 */ -+#if (DBVER >= 44) - ADD_INT(d, DB_REP_CONF_DELAYCLIENT); - ADD_INT(d, DB_REP_CONF_BULK); - ADD_INT(d, DB_REP_CONF_NOWAIT); -@@ -9774,9 +9788,7 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */ - ADD_INT(d, DB_REP_REREQUEST); - #endif - --#if (DBVER >= 42) - ADD_INT(d, DB_REP_NOBUFFER); --#endif - - #if (DBVER >= 46) - ADD_INT(d, DB_REP_LEASE_EXPIRED); -@@ -9819,6 +9831,28 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */ - ADD_INT(d, DB_STAT_ALL); - #endif - -+#if (DBVER >= 51) -+ ADD_INT(d, DB_REPMGR_ACKS_ALL_AVAILABLE); -+#endif -+ -+#if (DBVER >= 48) -+ ADD_INT(d, DB_REP_CONF_INMEM); -+#endif -+ -+ ADD_INT(d, DB_TIMEOUT); -+ -+#if (DBVER >= 50) -+ ADD_INT(d, DB_FORCESYNC); -+#endif -+ -+#if (DBVER >= 48) -+ ADD_INT(d, DB_FAILCHK); -+#endif -+ -+#if (DBVER >= 51) -+ ADD_INT(d, DB_HOTBACKUP_IN_PROGRESS); -+#endif -+ - #if (DBVER >= 43) - ADD_INT(d, DB_BUFFER_SMALL); - ADD_INT(d, DB_SEQ_DEC); -@@ -9856,6 +9890,10 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */ - ADD_INT(d, DB_SET_LOCK_TIMEOUT); - ADD_INT(d, DB_SET_TXN_TIMEOUT); - -+#if (DBVER >= 48) -+ ADD_INT(d, DB_SET_REG_TIMEOUT); -+#endif -+ - /* The exception name must be correct for pickled exception * - * objects to unpickle properly. */ - #ifdef PYBSDDB_STANDALONE /* different value needed for standalone pybsddb */ -@@ -9912,8 +9950,10 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */ - MAKE_EX(DBRunRecoveryError); - MAKE_EX(DBVerifyBadError); - MAKE_EX(DBNoServerError); -+#if (DBVER >= 44 && DBVER < 52) - MAKE_EX(DBNoServerHomeError); - MAKE_EX(DBNoServerIDError); -+#endif - MAKE_EX(DBPageNotFoundError); - MAKE_EX(DBSecondaryBadError); - -@@ -9927,9 +9967,7 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */ - MAKE_EX(DBNoSuchFileError); - MAKE_EX(DBPermissionsError); - --#if (DBVER >= 42) - MAKE_EX(DBRepHandleDeadError); --#endif - #if (DBVER >= 44) - MAKE_EX(DBRepLockoutError); - #endif -@@ -9947,6 +9985,7 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */ - #undef MAKE_EX - - /* Initialise the C API structure and add it to the module */ -+ bsddb_api.api_version = PYBSDDB_API_VERSION; - bsddb_api.db_type = &DB_Type; - bsddb_api.dbcursor_type = &DBCursor_Type; - bsddb_api.dblogcursor_type = &DBLogCursor_Type; -@@ -9955,19 +9994,25 @@ PyMODINIT_FUNC PyInit__bsddb(void) /* Note the two underscores */ - bsddb_api.dblock_type = &DBLock_Type; - #if (DBVER >= 43) - bsddb_api.dbsequence_type = &DBSequence_Type; -+#else -+ bsddb_api.dbsequence_type = NULL; - #endif - bsddb_api.makeDBError = makeDBError; - - /* -- ** Capsules exist from Python 3.1, but I -- ** don't want to break the API compatibility -- ** for already published Python versions. -+ ** Capsules exist from Python 2.7 and 3.1. -+ ** We don't support Python 3.0 anymore, so... -+ ** #if (PY_VERSION_HEX < ((PY_MAJOR_VERSION < 3) ? 0x02070000 : 0x03020000)) - */ --#if (PY_VERSION_HEX < 0x03020000) -+#if (PY_VERSION_HEX < 0x02070000) - py_api = PyCObject_FromVoidPtr((void*)&bsddb_api, NULL); - #else - { -- char py_api_name[250]; -+ /* -+ ** The data must outlive the call!!. So, the static definition. -+ ** The buffer must be big enough... -+ */ -+ static char py_api_name[MODULE_NAME_MAX_LEN+10]; - - strcpy(py_api_name, _bsddbModuleName); - strcat(py_api_name, ".api"); -diff --git a/Modules/bsddb.h b/Modules/bsddb.h -index a3a687b..c1d862a 100644 ---- a/Modules/bsddb.h -+++ b/Modules/bsddb.h -@@ -109,7 +109,7 @@ - #error "eek! DBVER can't handle minor versions > 9" - #endif - --#define PY_BSDDB_VERSION "4.8.4.2" -+#define PY_BSDDB_VERSION "5.3.15" - - /* Python object definitions */ - -@@ -236,7 +236,7 @@ typedef struct DBSequenceObject { - /* To access the structure from an external module, use code like the - following (error checking missed out for clarity): - -- // If you are using Python before 3.2: -+ // If you are using Python before 2.7: - BSDDB_api* bsddb_api; - PyObject* mod; - PyObject* cobj; -@@ -249,7 +249,7 @@ typedef struct DBSequenceObject { - Py_DECREF(mod); - - -- // If you are using Python 3.2 or up: -+ // If you are using Python 2.7 or up: (except Python 3.0, unsupported) - BSDDB_api* bsddb_api; - - // Use "bsddb3._pybsddb.api" if you're using -@@ -257,10 +257,14 @@ typedef struct DBSequenceObject { - bsddb_api = (void **)PyCapsule_Import("bsddb._bsddb.api", 1); - - -+ Check "api_version" number before trying to use the API. -+ - The structure's members must not be changed. - */ - -+#define PYBSDDB_API_VERSION 1 - typedef struct { -+ unsigned int api_version; - /* Type objects */ - PyTypeObject* db_type; - PyTypeObject* dbcursor_type; -@@ -268,9 +272,7 @@ typedef struct { - PyTypeObject* dbenv_type; - PyTypeObject* dbtxn_type; - PyTypeObject* dblock_type; --#if (DBVER >= 43) -- PyTypeObject* dbsequence_type; --#endif -+ PyTypeObject* dbsequence_type; /* If DBVER < 43 -> NULL */ - - /* Functions */ - int (*makeDBError)(int err); -@@ -289,9 +291,9 @@ typedef struct { - #define DBEnvObject_Check(v) ((v)->ob_type == bsddb_api->dbenv_type) - #define DBTxnObject_Check(v) ((v)->ob_type == bsddb_api->dbtxn_type) - #define DBLockObject_Check(v) ((v)->ob_type == bsddb_api->dblock_type) --#if (DBVER >= 43) --#define DBSequenceObject_Check(v) ((v)->ob_type == bsddb_api->dbsequence_type) --#endif -+#define DBSequenceObject_Check(v) \ -+ ((bsddb_api->dbsequence_type) && \ -+ ((v)->ob_type == bsddb_api->dbsequence_type)) - - #endif /* COMPILING_BSDDB_C */ - -diff --git a/setup.py b/setup.py -index 6b47451..e8ac96c 100644 ---- a/setup.py -+++ b/setup.py -@@ -799,7 +799,7 @@ class PyBuildExt(build_ext): - # a release. Most open source OSes come with one or more - # versions of BerkeleyDB already installed. - -- max_db_ver = (4, 8) -+ max_db_ver = (5, 3) - min_db_ver = (4, 1) - db_setup_debug = False # verbose debug prints from this script? - -@@ -821,7 +821,11 @@ class PyBuildExt(build_ext): - return True - - def gen_db_minor_ver_nums(major): -- if major == 4: -+ if major == 5: -+ for x in range(max_db_ver[1]+1): -+ if allow_db_ver((5, x)): -+ yield x -+ elif major == 4: - for x in range(max_db_ver[1]+1): - if allow_db_ver((4, x)): - yield x -@@ -835,6 +839,9 @@ class PyBuildExt(build_ext): - # construct a list of paths to look for the header file in on - # top of the normal inc_dirs. - db_inc_paths = [ -+ '/usr/include/db5', -+ '/usr/local/include/db5', -+ '/opt/sfw/include/db5', - '/usr/include/db4', - '/usr/local/include/db4', - '/opt/sfw/include/db4', -@@ -845,6 +852,16 @@ class PyBuildExt(build_ext): - '/sw/include/db4', - '/sw/include/db3', - ] -+ # 5.x minor number specific paths -+ for x in gen_db_minor_ver_nums(5): -+ db_inc_paths.append('/usr/include/db5%d' % x) -+ db_inc_paths.append('/usr/include/db5.%d' % x) -+ db_inc_paths.append('/usr/local/BerkeleyDB.5.%d/include' % x) -+ db_inc_paths.append('/usr/local/include/db5%d' % x) -+ db_inc_paths.append('/pkg/db-5.%d/include' % x) -+ db_inc_paths.append('/opt/db-5.%d/include' % x) -+ # MacPorts default (http://www.macports.org/) -+ db_inc_paths.append('/opt/local/include/db5%d' % x) - # 4.x minor number specific paths - for x in gen_db_minor_ver_nums(4): - db_inc_paths.append('/usr/include/db4%d' % x) -@@ -871,6 +888,10 @@ class PyBuildExt(build_ext): - for dn in inc_dirs: - std_variants.append(os.path.join(dn, 'db3')) - std_variants.append(os.path.join(dn, 'db4')) -+ std_variants.append(os.path.join(dn, 'db5')) -+ for x in gen_db_minor_ver_nums(5): -+ std_variants.append(os.path.join(dn, "db5%d"%x)) -+ std_variants.append(os.path.join(dn, "db5.%d"%x)) - for x in gen_db_minor_ver_nums(4): - std_variants.append(os.path.join(dn, "db4%d"%x)) - std_variants.append(os.path.join(dn, "db4.%d"%x)) --- -1.7.7 - diff --git a/meta/recipes-devtools/python/python/python-fix-build-error-with-Readline-6.3.patch b/meta/recipes-devtools/python/python/python-fix-build-error-with-Readline-6.3.patch deleted file mode 100644 index b84f8c3461..0000000000 --- a/meta/recipes-devtools/python/python/python-fix-build-error-with-Readline-6.3.patch +++ /dev/null @@ -1,62 +0,0 @@ -python: fix build error with Readline 6.3 - -Backport two patches from upstream: - -use new readline function types (closes #20374) -Issue #20374: Avoid compiler warnings when compiling readline with libedit. - -Upstream-Status: Backport - -Signed-off-by: Chong Lu <Chong.Lu@windriver.com> ---- - Modules/readline.c | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - -diff --git a/Modules/readline.c b/Modules/readline.c -index b5e258d..d3f52aa 100644 ---- a/Modules/readline.c -+++ b/Modules/readline.c -@@ -735,15 +735,24 @@ on_hook(PyObject *func) - return result; - } - -+ - static int -+#if defined(_RL_FUNCTION_TYPEDEF) - on_startup_hook(void) -+#else -+on_startup_hook() -+#endif - { - return on_hook(startup_hook); - } - - #ifdef HAVE_RL_PRE_INPUT_HOOK - static int -+#if defined(_RL_FUNCTION_TYPEDEF) - on_pre_input_hook(void) -+#else -+on_pre_input_hook() -+#endif - { - return on_hook(pre_input_hook); - } -@@ -886,12 +895,12 @@ setup_readline(void) - rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap); - rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap); - /* Set our hook functions */ -- rl_startup_hook = (Function *)on_startup_hook; -+ rl_startup_hook = (rl_hook_func_t *)on_startup_hook; - #ifdef HAVE_RL_PRE_INPUT_HOOK -- rl_pre_input_hook = (Function *)on_pre_input_hook; -+ rl_pre_input_hook = (rl_hook_func_t *)on_pre_input_hook; - #endif - /* Set our completion function */ -- rl_attempted_completion_function = (CPPFunction *)flex_complete; -+ rl_attempted_completion_function = (rl_completion_func_t *)flex_complete; - /* Set Python word break characters */ - rl_completer_word_break_characters = - strdup(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?"); --- -1.7.9.5 - diff --git a/meta/recipes-devtools/python/python/remove_sqlite_rpath.patch b/meta/recipes-devtools/python/python/remove_sqlite_rpath.patch deleted file mode 100644 index 4ec627ea51..0000000000 --- a/meta/recipes-devtools/python/python/remove_sqlite_rpath.patch +++ /dev/null @@ -1,19 +0,0 @@ -This patch removes the RPATH setting which contains a pointer to -the target relocated sysroot, which is incorrect. - -Upstream-Status: Inappropriate [Embedded Specific] - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Index: Python-2.6.6/setup.py -=================================================================== ---- Python-2.6.6.orig/setup.py 2011-09-28 14:22:57.000000000 -0700 -+++ Python-2.6.6/setup.py 2011-09-28 16:11:25.147279633 -0700 -@@ -1079,7 +1079,6 @@ - include_dirs=["Modules/_sqlite", - sqlite_incdir], - library_dirs=sqlite_libdir, -- runtime_library_dirs=sqlite_libdir, - extra_link_args=sqlite_extra_link_args, - libraries=["sqlite3",])) - else: diff --git a/meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch b/meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch index 0c1f1741cb..dacb552ec7 100644 --- a/meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch +++ b/meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch @@ -6,26 +6,21 @@ Upstream-Status: Inappropriate [distribution] Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> -Index: Python-2.7.2/setup.py -=================================================================== ---- Python-2.7.2.orig/setup.py 2012-04-05 22:27:22.437199989 +0300 -+++ Python-2.7.2/setup.py 2012-04-05 22:26:38.000000000 +0300 -@@ -1141,12 +1141,12 @@ + +diff --git a/setup.py b/setup.py +index b887808..ae51607 100644 +--- a/setup.py ++++ b/setup.py +@@ -1237,6 +1237,8 @@ class PyBuildExt(build_ext): # the more recent berkeleydb's db.h file first in the include path # when attempting to compile and it will fail. f = "/usr/include/db.h" -- + if len(inc_dirs) != 0: + f = os.path.join(inc_dirs[0], "db.h") - if sys.platform == 'darwin': + + if host_platform == 'darwin': if is_macosx_sdk_path(f): - sysroot = macosx_sdk_root() - f = os.path.join(sysroot, f[1:]) -- - if os.path.exists(f) and not db_incs: - data = open(f).read() - m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data) -@@ -1161,8 +1161,10 @@ +@@ -1257,8 +1259,10 @@ class PyBuildExt(build_ext): libraries=libraries)) else: exts.append(Extension('bsddb185', ['bsddbmodule.c'])) diff --git a/meta/recipes-devtools/python/python/use_sysroot_ncurses_instead_of_host.patch b/meta/recipes-devtools/python/python/use_sysroot_ncurses_instead_of_host.patch new file mode 100644 index 0000000000..2c657861c8 --- /dev/null +++ b/meta/recipes-devtools/python/python/use_sysroot_ncurses_instead_of_host.patch @@ -0,0 +1,20 @@ +Python tries to use ncursesw from the host, +if it is not found causes an error on configure, +we should use ncursesw from sysroot instead + + +Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> + +Index: Python-2.7.9/configure.ac +=================================================================== +--- Python-2.7.9.orig/configure.ac ++++ Python-2.7.9/configure.ac +@@ -4311,7 +4311,7 @@ fi + + # first curses configure check + ac_save_cppflags="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" ++CPPFLAGS="$CPPFLAGS -I=/usr/include/ncursesw" + + AC_CHECK_HEADERS(curses.h ncurses.h) + diff --git a/meta/recipes-devtools/python/python3-native_3.3.3.bb b/meta/recipes-devtools/python/python3-native_3.3.3.bb index 9ae2a0b373..73ce0952bd 100644 --- a/meta/recipes-devtools/python/python3-native_3.3.3.bb +++ b/meta/recipes-devtools/python/python3-native_3.3.3.bb @@ -27,6 +27,8 @@ file://fix-ast.h-dependency.patch \ file://makerace.patch \ ${DISTRO_SRC_URI} \ file://python3-fix-build-error-with-Readline-6.3.patch \ +file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \ +file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ " SRC_URI[md5sum] = "f3ebe34d4d8695bf889279b54673e10c" SRC_URI[sha256sum] = "e526e9b612f623888364d30cc9f3dfc34dcef39065c713bdbcddf47df84d8dcb" diff --git a/meta/recipes-devtools/python/python3/python3-setup.py-no-host-headers-libs.patch b/meta/recipes-devtools/python/python3/python3-setup.py-no-host-headers-libs.patch index 8b6476037f..2bc8b8c460 100644 --- a/meta/recipes-devtools/python/python3/python3-setup.py-no-host-headers-libs.patch +++ b/meta/recipes-devtools/python/python3/python3-setup.py-no-host-headers-libs.patch @@ -26,7 +26,8 @@ index f020b28..e8339cd 100644 self.add_gcc_paths() - if not cross_compiling: self.add_multiarch_paths() - + # Add paths specified in the environment variables LDFLAGS and --- +-- 2.0.0 + diff --git a/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch b/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch index bf0a56f220..74490d93a5 100644 --- a/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch +++ b/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch @@ -15,13 +15,14 @@ index 989baf9..2890c96 100644 --- a/configure.ac +++ b/configure.ac @@ -67,7 +67,7 @@ if test "$cross_compiling" = yes; then - AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) - fi + AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) + fi AC_MSG_RESULT($interp) - PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp + PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH) '$interp fi elif test "$cross_compiling" = maybe; then AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) --- +-- 2.0.1 + diff --git a/meta/recipes-devtools/python/python3/setup.py-check-cross_compiling-when-get-FLAGS.patch b/meta/recipes-devtools/python/python3/setup.py-check-cross_compiling-when-get-FLAGS.patch new file mode 100644 index 0000000000..fc2e12dfe5 --- /dev/null +++ b/meta/recipes-devtools/python/python3/setup.py-check-cross_compiling-when-get-FLAGS.patch @@ -0,0 +1,50 @@ +From 8dad810f3a3d073f09ad72e1a3ee0a895eab2ca1 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Sun, 18 Jan 2015 19:05:36 -0800 +Subject: [PATCH] setup.py:check cross_compiling when get FLAGS + +Fixed when compile target pythnon3: +gcc -isystem/path/to/sysroots/x86_64-linux/usr/include \ + -L=/path/to/sysroots/x86_64-linux/usr/lib + +This is incorrect, the native sysroot should not be used by target +python3. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + setup.py | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index e8339cd..83fd31f 100644 +--- a/setup.py ++++ b/setup.py +@@ -238,7 +238,10 @@ class PyBuildExt(build_ext): + # unfortunately, distutils doesn't let us provide separate C and C++ + # compilers + if compiler is not None: +- (ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS') ++ if cross_compiling: ++ (ccshared,cflags) = (os.environ.get('CCSHARED') or '', os.environ.get('CFLAGS') or '') ++ else: ++ (ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS') + args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags + self.compiler.set_executables(**args) + +@@ -457,7 +460,10 @@ class PyBuildExt(build_ext): + ('LDFLAGS', '-R', self.compiler.runtime_library_dirs), + ('LDFLAGS', '-L', self.compiler.library_dirs), + ('CPPFLAGS', '-I', self.compiler.include_dirs)): +- env_val = sysconfig.get_config_var(env_var) ++ if cross_compiling: ++ env_val = os.environ.get(env_var) ++ else: ++ env_val = sysconfig.get_config_var(env_var) + if env_val: + # To prevent optparse from raising an exception about any + # options in env_val that it doesn't know about we strip out +-- +1.7.9.5 + diff --git a/meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch b/meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch new file mode 100644 index 0000000000..de07643f2b --- /dev/null +++ b/meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch @@ -0,0 +1,54 @@ +From fc93b3cc23b4f9698ae92a42986dbb02b6f19588 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Sun, 18 Jan 2015 06:29:50 -0800 +Subject: [PATCH] sysconfig.py: add _PYTHON_PROJECT_SRC + +python3 has introduced _PYTHON_PROJECT_BASE which is used for separate B +and S, but it doesn't work when compile Modules, the target python3 runs +python3-native's sysconfig to get srcdir which is the native's, there +would be errors when native's srcdir has been removed, add +_PYTHON_PROJECT_SRC to fix the problem. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Lib/distutils/sysconfig.py | 5 ++++- + Lib/sysconfig.py | 5 ++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index a545ab9..74317d1 100644 +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -554,7 +554,10 @@ def get_config_vars(*args): + _config_vars['exec_prefix'] = EXEC_PREFIX + + # Always convert srcdir to an absolute path +- srcdir = _config_vars.get('srcdir', project_base) ++ if "_PYTHON_PROJECT_SRC" in os.environ: ++ srcdir = os.path.abspath(os.environ["_PYTHON_PROJECT_SRC"]) ++ else: ++ srcdir = _config_vars.get('srcdir', project_base) + if os.name == 'posix': + if python_build: + # If srcdir is a relative path (typically '.' or '..') +diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py +index 7287f11..cc92998 100644 +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py +@@ -562,7 +562,10 @@ def get_config_vars(*args): + _CONFIG_VARS['userbase'] = _getuserbase() + + # Always convert srcdir to an absolute path +- srcdir = _CONFIG_VARS.get('srcdir', _PROJECT_BASE) ++ if "_PYTHON_PROJECT_SRC" in os.environ: ++ srcdir = os.path.abspath(os.environ["_PYTHON_PROJECT_SRC"]) ++ else: ++ srcdir = _CONFIG_VARS.get('srcdir', _PROJECT_BASE) + if os.name == 'posix': + if _PYTHON_BUILD: + # If srcdir is a relative path (typically '.' or '..') +-- +1.7.9.5 + diff --git a/meta/recipes-devtools/python/python3_3.3.3.bb b/meta/recipes-devtools/python/python3_3.3.3.bb index 2c1f63f5b8..6147408937 100644 --- a/meta/recipes-devtools/python/python3_3.3.3.bb +++ b/meta/recipes-devtools/python/python3_3.3.3.bb @@ -39,6 +39,8 @@ SRC_URI += "\ file://avoid-ncursesw-include-path.patch \ file://python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch \ file://python3-setup.py-no-host-headers-libs.patch \ + file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \ + file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ " SRC_URI[md5sum] = "f3ebe34d4d8695bf889279b54673e10c" SRC_URI[sha256sum] = "e526e9b612f623888364d30cc9f3dfc34dcef39065c713bdbcddf47df84d8dcb" @@ -66,6 +68,10 @@ TARGET_CC_ARCH += "-DNDEBUG -fno-inline" EXTRA_OEMAKE += "CROSS_COMPILE=yes" EXTRA_OECONF += "CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/" +export CROSS_COMPILE = "${TARGET_PREFIX}" +export _PYTHON_PROJECT_BASE = "${B}" +export _PYTHON_PROJECT_SRC = "${S}" + # No ctypes option for python 3 PYTHONLSBOPTS = "" @@ -76,7 +82,7 @@ do_configure_prepend() { do_compile() { # regenerate platform specific files, because they depend on system headers - cd Lib/plat-linux* + cd ${S}/Lib/plat-linux* include=${STAGING_INCDIR} ${STAGING_BINDIR_NATIVE}/python3-native/python3 \ ${S}/Tools/scripts/h2py.py -i '(u_long)' \ ${STAGING_INCDIR}/dlfcn.h \ @@ -107,8 +113,6 @@ do_compile() { # then call do_install twice we get Makefile.orig == Makefile.sysroot install -m 0644 Makefile Makefile.sysroot - export CROSS_COMPILE="${TARGET_PREFIX}" - export PYTHONBUILDDIR="${S}" oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python3-native/pgen \ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python3-native/python3 \ STAGING_LIBDIR=${STAGING_LIBDIR} \ @@ -135,8 +139,6 @@ do_install() { # go to ${D}${STAGING...}/... install -m 0644 Makefile.orig Makefile - export CROSS_COMPILE="${TARGET_PREFIX}" - export PYTHONBUILDDIR="${S}" install -d ${D}${libdir}/pkgconfig install -d ${D}${libdir}/python${PYTHON_MAJMIN}/config diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.9.bb index 2547ea41c8..7918550eae 100644 --- a/meta/recipes-devtools/python/python_2.7.3.bb +++ b/meta/recipes-devtools/python/python_2.7.9.bb @@ -1,19 +1,16 @@ require python.inc -DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib" -PR = "${INC_PR}.3" +DEPENDS = "python-native libffi bzip2 db gdbm openssl readline sqlite3 zlib" +PR = "${INC_PR}" DISTRO_SRC_URI ?= "file://sitecustomize.py" DISTRO_SRC_URI_linuxstdbase = "" SRC_URI += "\ file://01-use-proper-tools-for-cross-build.patch \ file://03-fix-tkinter-detection.patch \ - file://05-enable-ctypes-cross-build.patch \ - file://06-ctypes-libffi-fix-configure.patch \ file://06-avoid_usr_lib_termcap_path_in_linking.patch \ ${DISTRO_SRC_URI} \ file://multilib.patch \ file://cgi_py.patch \ - file://remove_sqlite_rpath.patch \ file://setup_py_skip_cross_import_check.patch \ file://add-md5module-support.patch \ file://host_include_contamination.patch \ @@ -23,44 +20,36 @@ SRC_URI += "\ file://search_db_h_in_inc_dirs_and_avoid_warning.patch \ file://avoid_warning_about_tkinter.patch \ file://avoid_warning_for_sunos_specific_module.patch \ - file://python-2.7.3-berkeley-db-5.3.patch \ file://python-2.7.3-remove-bsdb-rpath.patch \ - file://builddir.patch \ - file://python-2.7.3-CVE-2012-2135.patch \ - file://gcc-4.8-fix-configure-Wformat.patch \ file://fix-makefile-for-ptest.patch \ file://run-ptest \ - file://CVE-2013-4073_py27.patch \ - file://pypirc-secure.patch \ file://parallel-makeinst-create-bindir.patch \ - file://python-2.7.3-CVE-2013-1752-smtplib-fix.patch \ - file://python-fix-build-error-with-Readline-6.3.patch \ - file://python-2.7.3-CVE-2014-1912.patch \ - file://json-flaw-fix.patch \ - file://posix_close.patch \ - file://python-2.7.3-CVE-2014-7185.patch \ + file://use_sysroot_ncurses_instead_of_host.patch \ + file://avoid_parallel_make_races_on_pgen.patch \ " S = "${WORKDIR}/Python-${PV}" inherit autotools multilib_header python-dir pythonnative +CONFIGUREOPTS += " --with-system-ffi " + # The 3 lines below are copied from the libffi recipe, ctypes ships its own copy of the libffi sources #Somehow gcc doesn't set __SOFTFP__ when passing -mfloatabi=softp :( TARGET_CC_ARCH_append_armv6 = " -D__SOFTFP__" TARGET_CC_ARCH_append_armv7a = " -D__SOFTFP__" # The following is a hack until we drop ac_cv_sizeof_off_t from site files -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'ac_cv_sizeof_off_t=8', '', d)}" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'ac_cv_sizeof_off_t=8', '', d)} ac_cv_file__dev_ptmx=yes ac_cv_file__dev_ptc=no" -do_configure_prepend() { +do_configure_append() { rm -f ${S}/Makefile.orig - autoreconf -Wcross --verbose --install --force --exclude=autopoint Modules/_ctypes/libffi || bbnote "_ctypes failed to autoreconf" + autoreconf -Wcross --verbose --install --force --exclude=autopoint ../Python-${PV}/Modules/_ctypes/libffi } do_compile() { # regenerate platform specific files, because they depend on system headers - cd Lib/plat-linux2 + cd ${S}/Lib/plat-linux2 include=${STAGING_INCDIR} ${STAGING_BINDIR_NATIVE}/python-native/python \ ${S}/Tools/scripts/h2py.py -i '(u_long)' \ ${STAGING_INCDIR}/dlfcn.h \ @@ -92,7 +81,7 @@ do_compile() { install -m 0644 Makefile Makefile.sysroot export CROSS_COMPILE="${TARGET_PREFIX}" - export PYTHONBUILDDIR="${S}" + export PYTHONBUILDDIR="${B}" oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \ @@ -109,7 +98,7 @@ do_install() { install -m 0644 Makefile.orig Makefile export CROSS_COMPILE="${TARGET_PREFIX}" - export PYTHONBUILDDIR="${S}" + export PYTHONBUILDDIR="${B}" # After swizzling the makefile, we need to run the build again. # install can race with the build so we have to run this first, then install @@ -160,8 +149,8 @@ require python-${PYTHON_MAJMIN}-manifest.inc # manual dependency additions RPROVIDES_${PN}-core = "${PN}" RRECOMMENDS_${PN}-core = "${PN}-readline" +RRECOMMENDS_${PN}-core_append_class-nativesdk = " nativesdk-python-modules" RRECOMMENDS_${PN}-crypt = "openssl" -RRECOMMENDS_${PN}-crypt_class-nativesdk = "nativesdk-openssl" # package libpython2 PACKAGES =+ "lib${BPN}2" diff --git a/meta/recipes-devtools/qemu/files/0001-Back-porting-security-fix-CVE-2014-5388.patch b/meta/recipes-devtools/qemu/files/0001-Back-porting-security-fix-CVE-2014-5388.patch deleted file mode 100644 index ec541fa668..0000000000 --- a/meta/recipes-devtools/qemu/files/0001-Back-porting-security-fix-CVE-2014-5388.patch +++ /dev/null @@ -1,30 +0,0 @@ -Prevent out-of-bounds array access on -acpi_pcihp_pci_status. - -Upstream-Status: Backport - -Signed-off-by: Gonglei <arei.gonglei@huawei.com> -Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> ---- -v2: - - change commit message. - - add 'Reviewed-by' ---- - hw/acpi/pcihp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c -index fae663a..34dedf1 100644 ---- a/hw/acpi/pcihp.c -+++ b/hw/acpi/pcihp.c -@@ -231,7 +231,7 @@ static uint64_t pci_read(void *opaque, hwaddr addr, unsigned int size) - uint32_t val = 0; - int bsel = s->hotplug_select; - -- if (bsel < 0 || bsel > ACPI_PCIHP_MAX_HOTPLUG_BUS) { -+ if (bsel < 0 || bsel >= ACPI_PCIHP_MAX_HOTPLUG_BUS) { - return 0; - } - --- -1.7.12.4 diff --git a/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch b/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch index 7f1c5a9058..b0c2ea5be9 100644 --- a/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch +++ b/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch @@ -14,6 +14,10 @@ Signed-off-by: Jiang Lu <lu.jiang@windriver.com> Updated it on 2014-01-15 for rebasing Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + +Update it when upgrade qemu to 2.2.0 + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- hw/arm/versatilepb.c | 6 ++++++ 1 file changed, 6 insertions(+) @@ -22,7 +26,7 @@ diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index b48d84c..ad2cd5a 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c -@@ -199,6 +199,12 @@ static void versatile_init(QEMUMachineInitArgs *args, int board_id) +@@ -198,6 +198,12 @@ static void versatile_init(MachineState *machine, int board_id) fprintf(stderr, "Unable to find CPU definition\n"); exit(1); } @@ -32,9 +36,9 @@ index b48d84c..ad2cd5a 100644 + ((unsigned int)ram_size / (1 << 20))); + exit(1); + } - memory_region_init_ram(ram, NULL, "versatile.ram", machine->ram_size); + memory_region_init_ram(ram, NULL, "versatile.ram", machine->ram_size, + &error_abort); vmstate_register_ram_global(ram); - /* ??? RAM should repeat to fill physical memory space. */ -- 1.7.10.4 diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 3f68a56bd3..4225db7573 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -5,9 +5,11 @@ DEPENDS = "glib-2.0 zlib pixman" RDEPENDS_${PN}_class-target += "bash python" require qemu-targets.inc -inherit autotools-brokensep +inherit autotools BBCLASSEXTEND = "native nativesdk" +PR = "r1" + # QEMU_TARGETS is overridable variable QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc sh4 x86_64" @@ -37,13 +39,13 @@ do_configure_prepend_class-native() { fi # Undo the -lX11 added by linker-flags.patch, don't assume that host has libX11 installed - sed -i 's/-lX11//g' Makefile.target + sed -i 's/-lX11//g' ${S}/Makefile.target } do_configure_prepend_class-nativesdk() { if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then # Undo the -lX11 added by linker-flags.patch - sed -i 's/-lX11//g' Makefile.target + sed -i 's/-lX11//g' ${S}/Makefile.target fi } @@ -84,7 +86,10 @@ do_install_append() { } # END of qemu-mips workaround -PACKAGECONFIG ??= "fdt sdl alsa" +PACKAGECONFIG ??= " \ + fdt sdl alsa \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'xen', '', d)} \ + " PACKAGECONFIG_class-native ??= "fdt alsa" PACKAGECONFIG_class-nativesdk ??= "fdt sdl" NATIVEDEPS = "" @@ -93,7 +98,7 @@ PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl ${NATIVEDEPS}," PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr,--disable-virtfs,libcap attr," PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," PACKAGECONFIG[xfs] = "--enable-xfsctl,--disable-xfsctl,xfsprogs," -PACKAGECONFIG[xen] = "--enable-xen, --disable-xen,," +PACKAGECONFIG[xen] = "--enable-xen,--disable-xen,xen,xen-libxenstore xen-libxenctrl xen-libxenguest" PACKAGECONFIG[quorum] = "--enable-quorum, --disable-quorum, gnutls," PACKAGECONFIG[vnc-tls] = "--enable-vnc --enable-vnc-tls,--disable-vnc-tls, gnutls," PACKAGECONFIG[vnc-ws] = "--enable-vnc --enable-vnc-ws,--disable-vnc-ws, gnutls," @@ -104,7 +109,7 @@ PACKAGECONFIG[libcurl] = "--enable-curl,--disable-curl,libcurl," PACKAGECONFIG[nss] = "--enable-smartcard-nss,--disable-smartcard-nss,nss," PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux," PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses," -PACKAGECONFIG[gtk+] = "--enable-gtk,--disable-gtk,gtk+ libvte," +PACKAGECONFIG[gtk+] = "--enable-gtk --enable-vte,--disable-gtk --disable-vte,gtk+ libvte," PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng," PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2," PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1" diff --git a/meta/recipes-devtools/qemu/qemu/37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch b/meta/recipes-devtools/qemu/qemu/37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch new file mode 100644 index 0000000000..8609e3fe99 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch @@ -0,0 +1,59 @@ +Without this patch, x86_64 images would show invalid EDSCA key errors +with sshd from openssh (but not dropbear) during init. + +This would cause problems with operation with some distros where EDSCA +keys were mandatory. The issue was present in qemu 2.2.1 and not in +2.3.0-rc0, bisected to this commit which was then backported. + +From 37ed3bf1ee07bb1a26adca0df8718f601f231c0b Mon Sep 17 00:00:00 2001 +From: Richard Henderson <rth@twiddle.net> +Date: Fri, 20 Feb 2015 11:13:50 -0800 +Subject: [PATCH] tcg: Complete handling of ALWAYS and NEVER + +Missing from movcond + +Signed-off-by: Richard Henderson <rth@twiddle.net> +--- + tcg/tcg-op.c | 22 +++++++++++++++++----- + 1 files changed, 17 insertions(+), 5 deletions(-) + +Upstream-Status: Backport +RP 2015/3/24 + +Index: qemu-2.2.0/tcg/tcg-op.h +=================================================================== +--- qemu-2.2.0.orig/tcg/tcg-op.h ++++ qemu-2.2.0/tcg/tcg-op.h +@@ -2186,7 +2186,11 @@ static inline void tcg_gen_movcond_i32(T + TCGv_i32 c1, TCGv_i32 c2, + TCGv_i32 v1, TCGv_i32 v2) + { +- if (TCG_TARGET_HAS_movcond_i32) { ++ if (cond == TCG_COND_ALWAYS) { ++ tcg_gen_mov_i32(ret, v1); ++ } else if (cond == TCG_COND_NEVER) { ++ tcg_gen_mov_i32(ret, v2); ++ } else if (TCG_TARGET_HAS_movcond_i32) { + tcg_gen_op6i_i32(INDEX_op_movcond_i32, ret, c1, c2, v1, v2, cond); + } else { + TCGv_i32 t0 = tcg_temp_new_i32(); +@@ -2205,6 +2209,11 @@ static inline void tcg_gen_movcond_i64(T + TCGv_i64 c1, TCGv_i64 c2, + TCGv_i64 v1, TCGv_i64 v2) + { ++ if (cond == TCG_COND_ALWAYS) { ++ tcg_gen_mov_i64(ret, v1); ++ } else if (cond == TCG_COND_NEVER) { ++ tcg_gen_mov_i64(ret, v2); ++ } else { + #if TCG_TARGET_REG_BITS == 32 + TCGv_i32 t0 = tcg_temp_new_i32(); + TCGv_i32 t1 = tcg_temp_new_i32(); +@@ -2246,6 +2255,7 @@ static inline void tcg_gen_movcond_i64(T + tcg_temp_free_i64(t1); + } + #endif ++ } + } + + static inline void tcg_gen_add2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 al, diff --git a/meta/recipes-devtools/qemu/qemu/wacom.patch b/meta/recipes-devtools/qemu/qemu/wacom.patch index fd1b4a6963..cd06aa4ac6 100644 --- a/meta/recipes-devtools/qemu/qemu/wacom.patch +++ b/meta/recipes-devtools/qemu/qemu/wacom.patch @@ -1,7 +1,7 @@ The USB wacom device is missing a HID descriptor which causes it to fail to operate with recent kernels (e.g. 3.17). -This patch adds a HID desriptor to the device, based upon one from +This patch adds a HID desriptor to the device, based upon one from real wcom device. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> @@ -16,12 +16,12 @@ Index: qemu-2.1.0/hw/usb/dev-wacom.c @@ -68,6 +68,89 @@ [STR_SERIALNUMBER] = "1", }; - + +static const uint8_t qemu_tablet_hid_report_descriptor[] = { + 0x05, 0x01, /* Usage Page (Generic Desktop) */ + 0x09, 0x02, /* Usage (Mouse) */ + 0xa1, 0x01, /* Collection (Application) */ -+ 0x85, 0x01, /* Report ID (1) */ ++ 0x85, 0x01, /* Report ID (1) */ + 0x09, 0x01, /* Usage (Pointer) */ + 0xa1, 0x00, /* Collection (Physical) */ + 0x05, 0x09, /* Usage Page (Button) */ @@ -48,7 +48,7 @@ Index: qemu-2.1.0/hw/usb/dev-wacom.c + 0x05, 0x0d, /* Usage Page (Digitizer) */ + 0x09, 0x01, /* Usage (Digitizer) */ + 0xa1, 0x01, /* Collection (Application) */ -+ 0x85, 0x02, /* Report ID (2) */ ++ 0x85, 0x02, /* Report ID (2) */ + 0xa1, 0x00, /* Collection (Physical) */ + 0x06, 0x00, 0xff, /* Usage Page (Vendor 0xff00) */ + 0x09, 0x01, /* Usage (Digitizer) */ @@ -59,14 +59,14 @@ Index: qemu-2.1.0/hw/usb/dev-wacom.c + 0x81, 0x02, /* Input (Data, Variable, Absolute) */ + 0xc0, /* End Collection */ + 0x09, 0x01, /* Usage (Digitizer) */ -+ 0x85, 0x02, /* Report ID (2) */ ++ 0x85, 0x02, /* Report ID (2) */ + 0x95, 0x01, /* Report Count (1) */ + 0xb1, 0x02, /* FEATURE (2) */ + 0xc0, /* End Collection */ + 0x06, 0x00, 0xff, /* Usage Page (Vendor 0xff00) */ + 0x09, 0x01, /* Usage (Digitizer) */ + 0xa1, 0x01, /* Collection (Application) */ -+ 0x85, 0x02, /* Report ID (2) */ ++ 0x85, 0x02, /* Report ID (2) */ + 0x05, 0x0d, /* Usage Page (Digitizer) */ + 0x09, 0x22, /* Usage (Finger) */ + 0xa1, 0x00, /* Collection (Physical) */ @@ -95,7 +95,7 @@ Index: qemu-2.1.0/hw/usb/dev-wacom.c + 0x75, 0x08, /* Report Size (8) */ + 0x95, 0x0d, /* Report Count (13) */ + 0x81, 0x02, /* Input (Data, Variable, Absolute) */ -+ 0xc0, /* End Collection */ ++ 0xc0, /* End Collection */ + 0xc0, /* End Collection */ +}; + @@ -114,7 +114,7 @@ Index: qemu-2.1.0/hw/usb/dev-wacom.c }, @@ -265,6 +350,15 @@ } - + switch (request) { + case InterfaceRequest | USB_REQ_GET_DESCRIPTOR: + switch (value >> 8) { diff --git a/meta/recipes-devtools/qemu/qemu_2.1.0.bb b/meta/recipes-devtools/qemu/qemu_2.2.0.bb index a82d0529b9..757de89640 100644 --- a/meta/recipes-devtools/qemu/qemu_2.1.0.bb +++ b/meta/recipes-devtools/qemu/qemu_2.2.0.bb @@ -6,22 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \ file://qemu-enlarge-env-entry-size.patch \ file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \ - file://0001-Back-porting-security-fix-CVE-2014-5388.patch \ + file://37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch \ " SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" -SRC_URI[md5sum] = "6726977292b448cbc7f89998fac6983b" -SRC_URI[sha256sum] = "397e23184f4bf613589a8fe0c6542461dc2afdf17ed337e97e6fd2f31e8f8802" +SRC_URI[md5sum] = "f7a5e2da22d057eb838a91da7aff43c8" +SRC_URI[sha256sum] = "b68c9b6c7c694f5489b5a6bffe993cd976ffbb78e7d178eb3bc016caf460039c" COMPATIBLE_HOST_class-target_mips64 = "null" -do_sanitize_sources() { - # These .git files point to a nonexistent path "../.git/modules" and will confuse git - # if it tries to recurse into those directories. - rm -f ${S}/dtc/.git ${S}/pixman/.git -} - -addtask sanitize_sources after do_unpack before do_patch - do_install_append() { # Prevent QA warnings about installed ${localstatedir}/run if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi diff --git a/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb b/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb index d2981b5575..959cd6fba0 100644 --- a/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb +++ b/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb @@ -9,7 +9,7 @@ do_install () { echo "#!/bin/sh" > ${D}${bindir_crossscripts}/qemuwrapper qemu_binary=${@qemu_target_binary(d)} - qemu_options='${@d.getVar("QEMU_OPTIONS_%s" % d.getVar('PACKAGE_ARCH', True), True) or d.getVar('QEMU_OPTIONS', True) or ""}' + qemu_options='${QEMU_OPTIONS}' echo "$qemu_binary $qemu_options \"\$@\"" >> ${D}${bindir_crossscripts}/qemuwrapper fallback_qemu_bin= case $qemu_binary in diff --git a/meta/recipes-devtools/quilt/quilt-native_0.63.bb b/meta/recipes-devtools/quilt/quilt-native_0.64.bb index a089a83aba..6bc7dcdb7a 100644 --- a/meta/recipes-devtools/quilt/quilt-native_0.63.bb +++ b/meta/recipes-devtools/quilt/quilt-native_0.64.bb @@ -1,2 +1,2 @@ -require quilt-${PV}.inc +require quilt.inc require quilt-native.inc diff --git a/meta/recipes-devtools/quilt/quilt-0.63.inc b/meta/recipes-devtools/quilt/quilt.inc index 433d6b4089..ac7ef93e1e 100644 --- a/meta/recipes-devtools/quilt/quilt-0.63.inc +++ b/meta/recipes-devtools/quilt/quilt.inc @@ -10,8 +10,8 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \ file://Makefile \ " -SRC_URI[md5sum] = "c0ef4beb58a6fa72563b955e70624b6e" -SRC_URI[sha256sum] = "2846788221aa8844c54f10239c7cbc5e88031859162bcc285449446c3cfffe52" +SRC_URI[md5sum] = "fc0310db5868a0873d602d4332a76d43" +SRC_URI[sha256sum] = "c4bfd3282214a288e8d3e921ae4d52e73e24c4fead72b5446752adee99a7affd" inherit autotools-brokensep ptest @@ -19,6 +19,8 @@ EXTRA_OECONF_darwin += "--without-date \ --without-getopt \ " +CLEANBROKEN = "1" + PACKAGES += "guards guards-doc" FILES_${PN} = "${sysconfdir} ${datadir}/quilt \ ${bindir}/quilt ${libdir}/quilt" diff --git a/meta/recipes-devtools/quilt/quilt_0.63.bb b/meta/recipes-devtools/quilt/quilt_0.64.bb index 3a08d13eaf..00f900a112 100644 --- a/meta/recipes-devtools/quilt/quilt_0.63.bb +++ b/meta/recipes-devtools/quilt/quilt_0.64.bb @@ -1,4 +1,4 @@ -require quilt-${PV}.inc +require quilt.inc inherit gettext RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" SRC_URI += "file://aclocal.patch \ diff --git a/meta/recipes-devtools/rpm/rpm/0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch b/meta/recipes-devtools/rpm/rpm/0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch index d8ecf0f7bd..23bc3361d9 100644 --- a/meta/recipes-devtools/rpm/rpm/0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch +++ b/meta/recipes-devtools/rpm/rpm/0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch @@ -36,13 +36,14 @@ index c35e0ab..016e8d1 100644 --- a/rpmdb/signature.c +++ b/rpmdb/signature.c @@ -529,7 +529,7 @@ int rpmCheckPassPhrase(const char * passPhrase) - (void) setenv("GNUPGHOME", gpg_path, 1); - - cmd = rpmExpand("%{?__gpg_check_password_cmd}", NULL); + (void) setenv("GNUPGHOME", gpg_path, 1); + + cmd = rpmExpand("%{?__gpg_check_password_cmd}", NULL); - rc = argvSplit(&av, cmd, NULL); + rc = poptParseArgvString(cmd, NULL, (const char ***)&av); - if (!rc) - rc = execve(av[0], (char *const *)av+1, environ); - --- + if (!rc) + rc = execve(av[0], (char *const *)av+1, environ); + +-- 1.9.1 + diff --git a/meta/recipes-devtools/rpm/rpm/no-ldflags-in-pkgconfig.patch b/meta/recipes-devtools/rpm/rpm/no-ldflags-in-pkgconfig.patch new file mode 100644 index 0000000000..410623fab2 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/no-ldflags-in-pkgconfig.patch @@ -0,0 +1,14 @@ +Don't put LDFLAGS into the Libs.private, all it generally contains is a linker +hash selection (harmless) and the absolute path to the libdir in the sysroot +(actively harmful). + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/scripts/rpm.pc.in b/scripts/rpm.pc.in +index 8293471..2ea469c 100644 +--- a/scripts/rpm.pc.in ++++ b/scripts/rpm.pc.in +@@ -17 +17 @@ Libs: -L${libdir} -lrpmbuild${suffix} -lrpm${suffix} -lrpmdb${suffix} -lrpmio${s +-Libs.private: @LDFLAGS@ @LIBS@ ++Libs.private: @LIBS@ diff --git a/meta/recipes-devtools/rpm/rpm/rpm-realpath.patch b/meta/recipes-devtools/rpm/rpm/rpm-realpath.patch index 58863774f6..d2d9b09845 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-realpath.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-realpath.patch @@ -14,11 +14,11 @@ diff -urpN a/rpmio/rpmrpc.c b/rpmio/rpmrpc.c @@ -257,7 +257,9 @@ int Open(const char * path, int flags, m /* XXX if the open(2) fails, try to strip a possible chroot(2) prefix. */ if (fdno < 0 && errno == ENOENT) { - const char *dbpath = rpmExpand("%{?_dbpath}/", NULL); + const char *dbpath = rpmExpand("%{?_dbpath}/", NULL); - const char * fn = strstr(path + 1, dbpath); + char resolved_dbpath[PATH_MAX]; + realpath(dbpath, resolved_dbpath); + const char * fn = strstr(path + 1, resolved_dbpath); - if (fn) - fdno = open(fn, flags, mode); - dbpath = _free(dbpath); + if (fn) + fdno = open(fn, flags, mode); + dbpath = _free(dbpath); diff --git a/meta/recipes-devtools/rpm/rpm_4.11.2.bb b/meta/recipes-devtools/rpm/rpm_4.11.2.bb index 86a14fae50..4e44bc4fec 100644 --- a/meta/recipes-devtools/rpm/rpm_4.11.2.bb +++ b/meta/recipes-devtools/rpm/rpm_4.11.2.bb @@ -39,7 +39,9 @@ SRC_URI += "http://rpm.org/releases/rpm-4.11.x/${BP}.tar.bz2 \ SRC_URI[md5sum] = "876ac9948a88367054f8ddb5c0e87173" SRC_URI[sha256sum] = "403f8de632b33846ce5746f429c21a60f40dff9dcb56f1b4118f37a0652a48d4" -inherit autotools-brokensep +PR = "r1" + +inherit autotools inherit pythonnative inherit pkgconfig inherit gettext diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb index d99a300285..03a24f08be 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb @@ -95,6 +95,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e file://rpmqv_cc_b_gone.patch \ file://rpm-realpath.patch \ file://0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch \ + file://no-ldflags-in-pkgconfig.patch \ " # Uncomment the following line to enable platform score debugging diff --git a/meta/recipes-devtools/rsync/rsync_3.1.0.bb b/meta/recipes-devtools/rsync/rsync_3.1.1.bb index a4a5c102d4..5ff8ae8bb4 100644 --- a/meta/recipes-devtools/rsync/rsync_3.1.0.bb +++ b/meta/recipes-devtools/rsync/rsync_3.1.1.bb @@ -3,8 +3,8 @@ require rsync.inc SRC_URI += "file://acinclude.m4" -SRC_URI[md5sum] = "3be148772a33224771a8d4d2a028b132" -SRC_URI[sha256sum] = "81ca23f77fc9b957eb9845a6024f41af0ff0c619b7f38576887c63fa38e2394e" +SRC_URI[md5sum] = "43bd6676f0b404326eee2d63be3cdcfe" +SRC_URI[sha256sum] = "7de4364fcf5fe42f3bdb514417f1c40d10bbca896abe7e7f2c581c6ea08a2621" PACKAGECONFIG ??= "acl attr" PACKAGECONFIG[acl] = "--enable-acl-support,--disable-acl-support,acl," diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb index 64f85c262d..d126132a87 100644 --- a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb +++ b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb @@ -9,6 +9,8 @@ SRC_URI = "file://run-postinsts \ file://run-postinsts.init \ file://run-postinsts.service" +S = "${WORKDIR}" + inherit allarch systemd update-rc.d INITSCRIPT_NAME = "run-postinsts" diff --git a/meta/recipes-devtools/strace/strace-4.8/0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch b/meta/recipes-devtools/strace/strace-4.8/0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch deleted file mode 100644 index 5a0090eb6d..0000000000 --- a/meta/recipes-devtools/strace/strace-4.8/0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch +++ /dev/null @@ -1,108 +0,0 @@ -Upstream-Status: Backport - -From 0b4060f61f1bb101b5d8d084714b7d2feacdb199 Mon Sep 17 00:00:00 2001 -From: Ali Polatel <alip@exherbo.org> -Date: Tue, 24 Sep 2013 20:04:32 +0300 -Subject: [PATCH] Work around conflict between <sys/ptrace.h> and - <linux/ptrace.h> - -Since glibc-2.18~39 <sys/ptrace.h> defines ptrace_peeksiginfo_args -which collides with <linux/ptrace.h>. - -* configure.ac: Check for `struct ptrace_peeksiginfo_args' in -<sys/ptrace.h>. -* process.c: Work around potential conflict between <sys/ptrace.h> -and <linux/ptrace.h> by redefining ptrace_peeksiginfo_args. -* signal.c: Likewise. -* syscall.c: Likewise. -* util.c: Likewise. - -Signed-off-by: Ali Polatel <alip@exherbo.org> ---- - configure.ac | 2 +- - process.c | 4 ++++ - signal.c | 4 ++++ - syscall.c | 4 ++++ - util.c | 4 ++++ - 5 files changed, 17 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index f19e4f2..aa4923a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -257,7 +257,7 @@ AC_CHECK_MEMBERS([struct T_conn_res.QUEUE_ptr, - - AC_CHECK_TYPES([struct __old_kernel_stat],,, [#include <asm/stat.h>]) - --AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg],,, -+AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg, struct ptrace_peeksiginfo_args],,, - [#include <sys/ptrace.h>]) - - AC_CHECK_TYPES([struct user_desc],,, [#include <asm/ldt.h>]) -diff --git a/process.c b/process.c -index 1a2181b..59428a4 100644 ---- a/process.c -+++ b/process.c -@@ -63,7 +63,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args -+# endif - # include <linux/ptrace.h> -+# undef ptrace_peeksiginfo_args - # undef ia64_fpreg - # undef pt_all_user_regs - #endif -diff --git a/signal.c b/signal.c -index 7fb9abf..3411ddd 100644 ---- a/signal.c -+++ b/signal.c -@@ -51,7 +51,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args -+# endif - # include <linux/ptrace.h> -+# undef ptrace_peeksiginfo_args - # undef ia64_fpreg - # undef pt_all_user_regs - #endif -diff --git a/syscall.c b/syscall.c -index 83a95bd..3477dcd 100644 ---- a/syscall.c -+++ b/syscall.c -@@ -48,7 +48,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args -+# endif - # include <linux/ptrace.h> -+# undef ptrace_peeksiginfo_args - # undef ia64_fpreg - # undef pt_all_user_regs - #endif -diff --git a/util.c b/util.c -index 0dab902..30a7f19 100644 ---- a/util.c -+++ b/util.c -@@ -55,7 +55,11 @@ - # ifdef HAVE_STRUCT_PT_ALL_USER_REGS - # define pt_all_user_regs XXX_pt_all_user_regs - # endif -+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS -+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args -+# endif - # include <linux/ptrace.h> -+# undef ptrace_peeksiginfo_args - # undef ia64_fpreg - # undef pt_all_user_regs - #endif --- -1.8.2.1 - diff --git a/meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patch b/meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patch deleted file mode 100644 index a6579df598..0000000000 --- a/meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patch +++ /dev/null @@ -1,34 +0,0 @@ -powerpc64: fix 64-bit process detection on embedded - -* syscall.c (get_scno) [POWERPC64]: Fix 64-bit process detection -on embedded powerpc. - -Upstream-Status: Backport - -Signed-off-by: James Yang <james.yang@freescale.com> -Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> - -diff --git a/syscall.c.orig b/syscall.c -index 7efee0e..72d9453 100644 ---- a/syscall.c.orig -+++ b/syscall.c -@@ -1207,11 +1207,14 @@ get_scno(struct tcb *tcp) - /* Check for 64/32 bit mode. */ - if (upeek(tcp, sizeof(unsigned long)*PT_MSR, &val) < 0) - return -1; -- /* SF is bit 0 of MSR */ -- if (val < 0) -- currpers = 0; -- else -- currpers = 1; -+ -+ /* -+ * Check for 64/32 bit mode. -+ * Embedded implementations covered by Book E extension of PPC use -+ * bit 0 (CM) of 32-bit Machine state register (MSR). -+ * Other implementations use bit 0 (SF) of 64-bit MSR. -+ */ -+ currpers = (val & 0x8000000080000000) ? 0 : 1; - update_personality(tcp, currpers); - # endif - #elif defined(AVR32) diff --git a/meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace-4.9/Makefile-ptest.patch index 3a0eb39375..df013102d7 100644 --- a/meta/recipes-devtools/strace/strace-4.8/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace-4.9/Makefile-ptest.patch @@ -4,13 +4,32 @@ Upstream-Status: Inappropriate Signed-off-by: Gabriel Barbu <gabriel.barbu@enea.com> Signed-off-by: Chong Lu <Chong.Lu@windriver.com> +--- + configure.ac | 2 +- + tests/Makefile.am | 18 ++++++++++++++++++ + 2 files changed, 19 insertions(+), 1 deletion(-) ---- old/tests/Makefile.am 2013-07-23 13:44:24.660481381 +0200 -+++ new/tests/Makefile.am 2013-07-23 16:22:42.937654391 +0200 -@@ -9,3 +9,21 @@ - EXTRA_DIST = init.sh $(TESTS) +diff --git a/configure.ac b/configure.ac +index 054f85b..9aec566 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -6,7 +6,7 @@ AC_INIT([strace], + AC_CONFIG_SRCDIR([strace.c]) + AC_CONFIG_AUX_DIR([.]) + AC_CONFIG_HEADERS([config.h]) +-AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules parallel-tests]) ++AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules serial-tests]) + AM_MAINTAINER_MODE + AC_CANONICAL_HOST + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 922452a..b17837f 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -37,3 +37,21 @@ TEST_LOG_COMPILER = $(srcdir)/run.sh + EXTRA_DIST = init.sh run.sh sigaction.awk $(TESTS) - CLEANFILES = check.log + CLEANFILES = $(TESTS:=.tmp) + +buildtest-TESTS: $(check_PROGRAMS) $(TESTS) + @@ -28,14 +47,7 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com> + install $(srcdir)/$$file $(DESTDIR)/$(TESTDIR); \ + sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ + done -+ sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/net ---- a/configure.ac -+++ b/configure.ac -@@ -6,7 +6,7 @@ AC_INIT([strace], - AC_CONFIG_SRCDIR([strace.c]) - AC_CONFIG_AUX_DIR([.]) - AC_CONFIG_HEADERS([config.h]) --AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules]) -+AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules serial-tests]) - AM_MAINTAINER_MODE - AC_CANONICAL_HOST ++ for i in net net-fd scm_rights-fd sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done +-- +1.9.1 + diff --git a/meta/recipes-devtools/strace/strace-4.8/git-version-gen b/meta/recipes-devtools/strace/strace-4.9/git-version-gen index 8fee74e121..8fee74e121 100755 --- a/meta/recipes-devtools/strace/strace-4.8/git-version-gen +++ b/meta/recipes-devtools/strace/strace-4.9/git-version-gen diff --git a/meta/recipes-devtools/strace/strace-4.8/run-ptest b/meta/recipes-devtools/strace/strace-4.9/run-ptest index 133cf92d02..133cf92d02 100755 --- a/meta/recipes-devtools/strace/strace-4.8/run-ptest +++ b/meta/recipes-devtools/strace/strace-4.9/run-ptest diff --git a/meta/recipes-devtools/strace/strace-4.8/strace-add-configure-options.patch b/meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch index 27266d9052..15e37bce03 100644 --- a/meta/recipes-devtools/strace/strace-4.8/strace-add-configure-options.patch +++ b/meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch @@ -3,18 +3,24 @@ Add options "aio" and "acl" to enable/disable libaio and acl support. Upstream-Status: Pending Signed-off-by: Kai Kang <kai.kang@windriver.com> +Signed-off-by: Chong Lu <Chong.Lu@windriver.com> +--- + configure.ac | 27 ++++++++++++++++++++++++++- + 1 file changed, 26 insertions(+), 1 deletion(-) ---- strace-4.8/configure.ac.orig 2013-06-21 15:37:52.145892182 +0800 -+++ strace-4.8/configure.ac 2013-06-21 15:45:49.029909004 +0800 -@@ -219,7 +219,6 @@ AC_CHECK_HEADERS(m4_normalize([ - netinet/sctp.h +diff --git a/configure.ac b/configure.ac +index 054f85b..8ed49f1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -238,7 +238,6 @@ AC_CHECK_HEADERS(m4_normalize([ poll.h + scsi/sg.h stropts.h - sys/acl.h sys/asynch.h sys/conf.h sys/epoll.h -@@ -231,6 +230,19 @@ AC_CHECK_HEADERS(m4_normalize([ +@@ -250,6 +249,18 @@ AC_CHECK_HEADERS(m4_normalize([ sys/uio.h sys/vfs.h ])) @@ -22,30 +28,25 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> +AC_ARG_ENABLE([acl], + [AS_HELP_STRING([--enable-acl], [turn on acl support])], + [case $enableval in -+ yes) ++ yes) + AC_CHECK_HEADERS([sys/acl.h]) + ;; + no) ;; + *) AC_MSG_ERROR([bad value $enableval for aio option]) ;; + esac] -+ +) + AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], [], [], [#include <stddef.h> #include <sys/socket.h> -@@ -301,10 +313,19 @@ AC_CHECK_SIZEOF([long]) - AC_CHECK_SIZEOF([long long]) - AC_CHECK_SIZEOF([rlim_t],,[#include <sys/resource.h>]) +@@ -649,6 +660,20 @@ if test "x$st_cv_have___builtin_popcount" = xyes; then + [Define to 1 if the system provides __builtin_popcount function]) + fi --AC_CHECK_HEADERS([libaio.h], [ -- AC_CHECK_MEMBERS([struct iocb.u.c.flags],,, [#include <libaio.h>]) -- AC_CHECK_DECLS([IO_CMD_PWRITE, IO_CMD_PWRITEV],,, [#include <libaio.h>]) --]) +AC_ARG_ENABLE([aio], + [AS_HELP_STRING([--enable-aio], [turn on libaio support])], + [case $enableval in -+ yes) ++ yes) + AC_CHECK_HEADERS([libaio.h], [ + AC_CHECK_MEMBERS([struct iocb.u.c.flags],,, [#include <libaio.h>]) + AC_CHECK_DECLS([IO_CMD_PWRITE, IO_CMD_PWRITEV],,, [#include <libaio.h>]) @@ -55,6 +56,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> + *) AC_MSG_ERROR([bad value $enableval for aio option]) ;; + esac] +) - ++ AC_PATH_PROG([PERL], [perl]) + dnl stack trace with libunwind +-- +1.9.1 + diff --git a/meta/recipes-devtools/strace/strace_4.8.bb b/meta/recipes-devtools/strace/strace_4.9.bb index ed738eaad7..cce130d58c 100644 --- a/meta/recipes-devtools/strace/strace_4.8.bb +++ b/meta/recipes-devtools/strace/strace_4.9.bb @@ -8,21 +8,20 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ file://git-version-gen \ file://strace-add-configure-options.patch \ file://Makefile-ptest.patch \ - file://strace-fix-64-bit-process-detection.patch \ file://run-ptest \ - file://0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch \ " -SRC_URI[md5sum] = "c575ef43829586801f514fd91bfe7575" -SRC_URI[sha256sum] = "f492291f07a7c805c07a8395cce1ea054a6401ad414f4cc12185672215e1d7f8" +SRC_URI[md5sum] = "885eafadb10f6c60464a266d3929a2a4" +SRC_URI[sha256sum] = "095bfea5c540b91d297ccac73b21b92fd54a24599fd70395db87ff9eb7fd6f65" inherit autotools ptest -RDEPENDS_${PN}-ptest += "make" +RDEPENDS_${PN}-ptest += "make coreutils grep gawk" PACKAGECONFIG_class-target ?= "libaio ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" PACKAGECONFIG[libaio] = "--enable-aio,--disable-aio,libaio" PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" +PACKAGECONFIG[libunwind] = "--with-libunwind, --without-libunwind, libunwind" export INCLUDES = "-I. -I./linux" diff --git a/meta/recipes-devtools/subversion/subversion-1.8.9/disable_macos.patch b/meta/recipes-devtools/subversion/subversion-1.8.11/disable_macos.patch index ec3be496f3..ec3be496f3 100644 --- a/meta/recipes-devtools/subversion/subversion-1.8.9/disable_macos.patch +++ b/meta/recipes-devtools/subversion/subversion-1.8.11/disable_macos.patch diff --git a/meta/recipes-devtools/subversion/subversion-1.8.9/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.8.11/libtool2.patch index 5cd572bfc8..5cd572bfc8 100644 --- a/meta/recipes-devtools/subversion/subversion-1.8.9/libtool2.patch +++ b/meta/recipes-devtools/subversion/subversion-1.8.11/libtool2.patch diff --git a/meta/recipes-devtools/subversion/subversion-1.8.9/subversion-CVE-2014-3522.patch b/meta/recipes-devtools/subversion/subversion-1.8.9/subversion-CVE-2014-3522.patch deleted file mode 100644 index f259e5490a..0000000000 --- a/meta/recipes-devtools/subversion/subversion-1.8.9/subversion-CVE-2014-3522.patch +++ /dev/null @@ -1,444 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> - -Index: subversion/include/private/svn_cert.h -=================================================================== ---- subversion/include/private/svn_cert.h (nonexistent) -+++ subversion/include/private/svn_cert.h (working copy) -@@ -0,0 +1,68 @@ -+/** -+ * @copyright -+ * ==================================================================== -+ * Licensed to the Apache Software Foundation (ASF) under one -+ * or more contributor license agreements. See the NOTICE file -+ * distributed with this work for additional information -+ * regarding copyright ownership. The ASF licenses this file -+ * to you under the Apache License, Version 2.0 (the -+ * "License"); you may not use this file except in compliance -+ * with the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, -+ * software distributed under the License is distributed on an -+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -+ * KIND, either express or implied. See the License for the -+ * specific language governing permissions and limitations -+ * under the License. -+ * ==================================================================== -+ * @endcopyright -+ * -+ * @file svn_cert.h -+ * @brief Implementation of certificate validation functions -+ */ -+ -+#ifndef SVN_CERT_H -+#define SVN_CERT_H -+ -+#include <apr.h> -+ -+#include "svn_types.h" -+#include "svn_string.h" -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+ -+/* Return TRUE iff @a pattern matches @a hostname as defined -+ * by the matching rules of RFC 6125. In the context of RFC -+ * 6125 the pattern is the domain name portion of the presented -+ * identifier (which comes from the Common Name or a DNSName -+ * portion of the subjectAltName of an X.509 certificate) and -+ * the hostname is the source domain (i.e. the host portion -+ * of the URI the user entered). -+ * -+ * @note With respect to wildcards we only support matching -+ * wildcards in the left-most label and as the only character -+ * in the left-most label (i.e. we support RFC 6125 s. 6.4.3 -+ * Rule 1 and 2 but not the optional Rule 3). This may change -+ * in the future. -+ * -+ * @note Subversion does not at current support internationalized -+ * domain names. Both values are presumed to be in NR-LDH label -+ * or A-label form (see RFC 5890 for the definition). -+ * -+ * @since New in 1.9. -+ */ -+svn_boolean_t -+svn_cert__match_dns_identity(svn_string_t *pattern, svn_string_t *hostname); -+ -+ -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ -+ -+#endif /* SVN_CERT_H */ -Index: subversion/libsvn_ra_serf/util.c -=================================================================== ---- subversion/libsvn_ra_serf/util.c (revision 1615128) -+++ subversion/libsvn_ra_serf/util.c (working copy) -@@ -28,7 +28,6 @@ - #define APR_WANT_STRFUNC - #include <apr.h> - #include <apr_want.h> --#include <apr_fnmatch.h> - - #include <serf.h> - #include <serf_bucket_types.h> -@@ -49,6 +48,7 @@ - #include "private/svn_fspath.h" - #include "private/svn_subr_private.h" - #include "private/svn_auth_private.h" -+#include "private/svn_cert.h" - - #include "ra_serf.h" - -@@ -274,7 +274,6 @@ ssl_server_cert(void *baton, int failures, - apr_hash_t *subject = NULL; - apr_hash_t *serf_cert = NULL; - void *creds; -- int found_matching_hostname = 0; - - svn_failures = (ssl_convert_serf_failures(failures) - | conn->server_cert_failures); -@@ -286,26 +285,37 @@ ssl_server_cert(void *baton, int failures, - ### This should really be handled by serf, which should pass an error - for this case, but that has backwards compatibility issues. */ - apr_array_header_t *san; -+ svn_boolean_t found_san_entry = FALSE; -+ svn_boolean_t found_matching_hostname = FALSE; -+ svn_string_t *actual_hostname = -+ svn_string_create(conn->session->session_url.hostname, scratch_pool); - - serf_cert = serf_ssl_cert_certificate(cert, scratch_pool); - - san = svn_hash_gets(serf_cert, "subjectAltName"); - /* Try to find matching server name via subjectAltName first... */ -- if (san) { -+ if (san) -+ { - int i; -- for (i = 0; i < san->nelts; i++) { -+ found_san_entry = san->nelts > 0; -+ for (i = 0; i < san->nelts; i++) -+ { - const char *s = APR_ARRAY_IDX(san, i, const char*); -- if (apr_fnmatch(s, conn->session->session_url.hostname, -- APR_FNM_PERIOD | APR_FNM_CASE_BLIND) == APR_SUCCESS) -- { -- found_matching_hostname = 1; -+ svn_string_t *cert_hostname = svn_string_create(s, scratch_pool); -+ -+ if (svn_cert__match_dns_identity(cert_hostname, actual_hostname)) -+ { -+ found_matching_hostname = TRUE; - break; -- } -- } -- } -+ } -+ } -+ } - -- /* Match server certificate CN with the hostname of the server */ -- if (!found_matching_hostname) -+ /* Match server certificate CN with the hostname of the server iff -+ * we didn't find any subjectAltName fields and try to match them. -+ * Per RFC 2818 they are authoritative if present and CommonName -+ * should be ignored. */ -+ if (!found_matching_hostname && !found_san_entry) - { - const char *hostname = NULL; - -@@ -314,13 +324,20 @@ ssl_server_cert(void *baton, int failures, - if (subject) - hostname = svn_hash_gets(subject, "CN"); - -- if (!hostname -- || apr_fnmatch(hostname, conn->session->session_url.hostname, -- APR_FNM_PERIOD | APR_FNM_CASE_BLIND) != APR_SUCCESS) -- { -- svn_failures |= SVN_AUTH_SSL_CNMISMATCH; -- } -- } -+ if (hostname) -+ { -+ svn_string_t *cert_hostname = svn_string_create(hostname, -+ scratch_pool); -+ -+ if (svn_cert__match_dns_identity(cert_hostname, actual_hostname)) -+ { -+ found_matching_hostname = TRUE; -+ } -+ } -+ } -+ -+ if (!found_matching_hostname) -+ svn_failures |= SVN_AUTH_SSL_CNMISMATCH; - } - - if (!svn_failures) -Index: subversion/libsvn_subr/dirent_uri.c -=================================================================== ---- subversion/libsvn_subr/dirent_uri.c (revision 1615128) -+++ subversion/libsvn_subr/dirent_uri.c (working copy) -@@ -38,6 +38,7 @@ - - #include "dirent_uri.h" - #include "private/svn_fspath.h" -+#include "private/svn_cert.h" - - /* The canonical empty path. Can this be changed? Well, change the empty - test below and the path library will work, not so sure about the fs/wc -@@ -2597,3 +2598,81 @@ svn_urlpath__canonicalize(const char *uri, - } - return uri; - } -+ -+ -+/* -------------- The cert API (see private/svn_cert.h) ------------- */ -+ -+svn_boolean_t -+svn_cert__match_dns_identity(svn_string_t *pattern, svn_string_t *hostname) -+{ -+ apr_size_t pattern_pos = 0, hostname_pos = 0; -+ -+ /* support leading wildcards that composed of the only character in the -+ * left-most label. */ -+ if (pattern->len >= 2 && -+ pattern->data[pattern_pos] == '*' && -+ pattern->data[pattern_pos + 1] == '.') -+ { -+ while (hostname_pos < hostname->len && -+ hostname->data[hostname_pos] != '.') -+ { -+ hostname_pos++; -+ } -+ /* Assume that the wildcard must match something. Rule 2 says -+ * that *.example.com should not match example.com. If the wildcard -+ * ends up not matching anything then it matches .example.com which -+ * seems to be essentially the same as just example.com */ -+ if (hostname_pos == 0) -+ return FALSE; -+ -+ pattern_pos++; -+ } -+ -+ while (pattern_pos < pattern->len && hostname_pos < hostname->len) -+ { -+ char pattern_c = pattern->data[pattern_pos]; -+ char hostname_c = hostname->data[hostname_pos]; -+ -+ /* fold case as described in RFC 4343. -+ * Note: We actually convert to lowercase, since our URI -+ * canonicalization code converts to lowercase and generally -+ * most certs are issued with lowercase DNS names, meaning -+ * this avoids the fold operation in most cases. The RFC -+ * suggests the opposite transformation, but doesn't require -+ * any specific implementation in any case. It is critical -+ * that this folding be locale independent so you can't use -+ * tolower(). */ -+ pattern_c = canonicalize_to_lower(pattern_c); -+ hostname_c = canonicalize_to_lower(hostname_c); -+ -+ if (pattern_c != hostname_c) -+ { -+ /* doesn't match */ -+ return FALSE; -+ } -+ else -+ { -+ /* characters match so skip both */ -+ pattern_pos++; -+ hostname_pos++; -+ } -+ } -+ -+ /* ignore a trailing period on the hostname since this has no effect on the -+ * security of the matching. See the following for the long explanation as -+ * to why: -+ * https://bugzilla.mozilla.org/show_bug.cgi?id=134402#c28 -+ */ -+ if (pattern_pos == pattern->len && -+ hostname_pos == hostname->len - 1 && -+ hostname->data[hostname_pos] == '.') -+ hostname_pos++; -+ -+ if (pattern_pos != pattern->len || hostname_pos != hostname->len) -+ { -+ /* end didn't match */ -+ return FALSE; -+ } -+ -+ return TRUE; -+} -Index: subversion/tests/libsvn_subr/dirent_uri-test.c -=================================================================== ---- subversion/tests/libsvn_subr/dirent_uri-test.c (revision 1615128) -+++ subversion/tests/libsvn_subr/dirent_uri-test.c (working copy) -@@ -37,6 +37,7 @@ - #include "svn_pools.h" - #include "svn_dirent_uri.h" - #include "private/svn_fspath.h" -+#include "private/svn_cert.h" - - #include "../svn_test.h" - -@@ -2714,6 +2715,145 @@ test_fspath_get_longest_ancestor(apr_pool_t *pool) - return SVN_NO_ERROR; - } - -+struct cert_match_dns_test { -+ const char *pattern; -+ const char *hostname; -+ svn_boolean_t expected; -+}; -+ -+static svn_error_t * -+run_cert_match_dns_tests(struct cert_match_dns_test *tests, apr_pool_t *pool) -+{ -+ struct cert_match_dns_test *ct; -+ apr_pool_t *iterpool = svn_pool_create(pool); -+ -+ for (ct = tests; ct->pattern; ct++) -+ { -+ svn_boolean_t result; -+ svn_string_t *pattern, *hostname; -+ -+ svn_pool_clear(iterpool); -+ -+ pattern = svn_string_create(ct->pattern, iterpool); -+ hostname = svn_string_create(ct->hostname, iterpool); -+ -+ result = svn_cert__match_dns_identity(pattern, hostname); -+ if (result != ct->expected) -+ return svn_error_createf(SVN_ERR_TEST_FAILED, NULL, -+ "Expected %s but got %s for pattern '%s' on " -+ "hostname '%s'", -+ ct->expected ? "match" : "no match", -+ result ? "match" : "no match", -+ pattern->data, hostname->data); -+ -+ } -+ -+ svn_pool_destroy(iterpool); -+ -+ return SVN_NO_ERROR; -+} -+ -+static struct cert_match_dns_test cert_match_dns_tests[] = { -+ { "foo.example.com", "foo.example.com", TRUE }, /* exact match */ -+ { "foo.example.com", "FOO.EXAMPLE.COM", TRUE }, /* case differences */ -+ { "FOO.EXAMPLE.COM", "foo.example.com", TRUE }, -+ { "*.example.com", "FoO.ExAmPlE.CoM", TRUE }, -+ { "*.ExAmPlE.CoM", "foo.example.com", TRUE }, -+ { "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz", TRUE }, -+ { "abcdefghijklmnopqrstuvwxyz", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", TRUE }, -+ { "foo.example.com", "bar.example.com", FALSE }, /* difference at start */ -+ { "foo.example.com", "foo.example.net", FALSE }, /* difference at end */ -+ { "foo.example.com", "foo.example.commercial", FALSE }, /* hostname longer */ -+ { "foo.example.commercial", "foo.example.com", FALSE }, /* pattern longer */ -+ { "foo.example.comcom", "foo.example.com", FALSE }, /* repeated suffix */ -+ { "foo.example.com", "foo.example.comcom", FALSE }, -+ { "foo.example.com.com", "foo.example.com", FALSE }, -+ { "foo.example.com", "foo.example.com.com", FALSE }, -+ { "foofoo.example.com", "foo.example.com", FALSE }, /* repeated prefix */ -+ { "foo.example.com", "foofoo.example.com", FALSE }, -+ { "foo.foo.example.com", "foo.example.com", FALSE }, -+ { "foo.example.com", "foo.foo.example.com", FALSE }, -+ { "foo.*.example.com", "foo.bar.example.com", FALSE }, /* RFC 6125 s. 6.4.3 -+ Rule 1 */ -+ { "*.example.com", "foo.example.com", TRUE }, /* RFC 6125 s. 6.4.3 Rule 2 */ -+ { "*.example.com", "bar.foo.example.com", FALSE }, /* Rule 2 */ -+ { "*.example.com", "example.com", FALSE }, /* Rule 2 */ -+ { "*.example.com", ".example.com", FALSE }, /* RFC doesn't say what to do -+ here and a leading period on -+ a hostname doesn't make sense -+ so we'll just reject this. */ -+ { "*", "foo.example.com", FALSE }, /* wildcard must be left-most label, -+ implies that there must be more than -+ one label. */ -+ { "*", "example.com", FALSE }, -+ { "*", "com", FALSE }, -+ { "*.example.com", "foo.example.net", FALSE }, /* difference in literal text -+ with a wildcard. */ -+ { "*.com", "example.com", TRUE }, /* See Errata ID 3090 for RFC 6125, -+ probably shouldn't allow this but -+ we do for now. */ -+ { "*.", "example.com", FALSE }, /* test some dubious 2 character wildcard -+ patterns */ -+ { "*.", "example.", TRUE }, /* This one feels questionable */ -+ { "*.", "example", FALSE }, -+ { "*.", ".", FALSE }, -+ { "a", "a", TRUE }, /* check that single letter exact matches work */ -+ { "a", "b", FALSE }, /* and single letter not matches shouldn't */ -+ { "*.*.com", "foo.example.com", FALSE }, /* unsupported wildcards */ -+ { "*.*.com", "example.com", FALSE }, -+ { "**.example.com", "foo.example.com", FALSE }, -+ { "**.example.com", "example.com", FALSE }, -+ { "f*.example.com", "foo.example.com", FALSE }, -+ { "f*.example.com", "bar.example.com", FALSE }, -+ { "*o.example.com", "foo.example.com", FALSE }, -+ { "*o.example.com", "bar.example.com", FALSE }, -+ { "f*o.example.com", "foo.example.com", FALSE }, -+ { "f*o.example.com", "bar.example.com", FALSE }, -+ { "foo.e*.com", "foo.example.com", FALSE }, -+ { "foo.*e.com", "foo.example.com", FALSE }, -+ { "foo.e*e.com", "foo.example.com", FALSE }, -+ { "foo.example.com", "foo.example.com.", TRUE }, /* trailing dot */ -+ { "*.example.com", "foo.example.com.", TRUE }, -+ { "foo", "foo.", TRUE }, -+ { "foo.example.com.", "foo.example.com", FALSE }, -+ { "*.example.com.", "foo.example.com", FALSE }, -+ { "foo.", "foo", FALSE }, -+ { "foo.example.com", "foo.example.com..", FALSE }, -+ { "*.example.com", "foo.example.com..", FALSE }, -+ { "foo", "foo..", FALSE }, -+ { "foo.example.com..", "foo.example.com", FALSE }, -+ { "*.example.com..", "foo.example.com", FALSE }, -+ { "foo..", "foo", FALSE }, -+ { NULL } -+}; -+ -+static svn_error_t * -+test_cert_match_dns_identity(apr_pool_t *pool) -+{ -+ return run_cert_match_dns_tests(cert_match_dns_tests, pool); -+} -+ -+/* This test table implements results that should happen if we supported -+ * RFC 6125 s. 6.4.3 Rule 3. We don't so it's expected to fail for now. */ -+static struct cert_match_dns_test rule3_tests[] = { -+ { "baz*.example.net", "baz1.example.net", TRUE }, -+ { "*baz.example.net", "foobaz.example.net", TRUE }, -+ { "b*z.example.net", "buuz.example.net", TRUE }, -+ { "b*z.example.net", "bz.example.net", FALSE }, /* presume wildcard can't -+ match nothing */ -+ { "baz*.example.net", "baz.example.net", FALSE }, -+ { "*baz.example.net", "baz.example.net", FALSE }, -+ { "b*z.example.net", "buuzuuz.example.net", TRUE }, /* presume wildcard -+ should be greedy */ -+ { NULL } -+}; -+ -+static svn_error_t * -+test_rule3(apr_pool_t *pool) -+{ -+ return run_cert_match_dns_tests(rule3_tests, pool); -+} -+ - - /* The test table. */ - -@@ -2812,5 +2952,9 @@ struct svn_test_descriptor_t test_funcs[] = - "test svn_fspath__dirname/basename/split"), - SVN_TEST_PASS2(test_fspath_get_longest_ancestor, - "test svn_fspath__get_longest_ancestor"), -+ SVN_TEST_PASS2(test_cert_match_dns_identity, -+ "test svn_cert__match_dns_identity"), -+ SVN_TEST_XFAIL2(test_rule3, -+ "test match with RFC 6125 s. 6.4.3 Rule 3"), - SVN_TEST_NULL - }; diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.6.15.bb index b135bb7a3f..28163e5644 100644 --- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb +++ b/meta/recipes-devtools/subversion/subversion_1.6.15.bb @@ -30,7 +30,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2a69fef414e2cb907b4544298569300b" PACKAGECONFIG[sasl] = "--with-sasl,--without-sasl,cyrus-sasl" EXTRA_OECONF = " \ - --without-berkeley-db --without-apxs --without-apache \ + --without-berkeley-db --without-apxs \ --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ --with-apr-util=${STAGING_BINDIR_CROSS} \ ac_cv_path_RUBY=none" diff --git a/meta/recipes-devtools/subversion/subversion_1.8.9.bb b/meta/recipes-devtools/subversion/subversion_1.8.11.bb index 1ef59a0c00..8e4cd9df08 100644 --- a/meta/recipes-devtools/subversion/subversion_1.8.9.bb +++ b/meta/recipes-devtools/subversion/subversion_1.8.11.bb @@ -12,11 +12,9 @@ inherit gettext SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://libtool2.patch \ file://disable_macos.patch \ - file://subversion-CVE-2014-3522.patch;striplevel=0 \ - file://subversion-CVE-2014-3528.patch \ " -SRC_URI[md5sum] = "bd495517a760ddd764ce449a891971db" -SRC_URI[sha256sum] = "45d708a5c3ffbef4b2a1044c4716a053e680763743d1f7ba99d0369f6da49e33" +SRC_URI[md5sum] = "766a89bbbb388f8eb76166672d3b9e49" +SRC_URI[sha256sum] = "10b056420e1f194c12840368f6bf58842e6200f9cb8cc5ebbf9be2e89e56e4d9" LIC_FILES_CHKSUM = "file://LICENSE;md5=1c2f0119e478700b5428e26386cff923" diff --git a/meta/recipes-devtools/syslinux/files/0001-movebits-Add-SMT_TERMINAL-a-last-resort-region-type.patch b/meta/recipes-devtools/syslinux/files/0001-movebits-Add-SMT_TERMINAL-a-last-resort-region-type.patch deleted file mode 100644 index fb03bbfe2c..0000000000 --- a/meta/recipes-devtools/syslinux/files/0001-movebits-Add-SMT_TERMINAL-a-last-resort-region-type.patch +++ /dev/null @@ -1,50 +0,0 @@ -Upstream-Status: Backport [ba638fd9bf72b0c786c88909014136cfa641a147] -Signed-off-by: Jonathan Liu <net147@gmail.com> - -From b663fd7257481438256f8267831dc10b06363b22 Mon Sep 17 00:00:00 2001 -From: Matt Fleming <matt.fleming@intel.com> -Date: Tue, 16 Jul 2013 22:16:11 +0100 -Subject: [PATCH 1/4] movebits: Add SMT_TERMINAL - a last resort region type - -Some memory regions are usable, but only as a last resort just before we -hand over control to a kernel image. Add the necessary movebits -infrastructure to use these regions when all other options have been -exhausted. - -Signed-off-by: Matt Fleming <matt.fleming@intel.com> - -Conflicts: - com32/lib/syslinux/zonelist.c ---- - com32/include/syslinux/movebits.h | 1 + - com32/lib/syslinux/movebits.c | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/com32/include/syslinux/movebits.h b/com32/include/syslinux/movebits.h -index 8bcdf3e..114a896 100644 ---- a/com32/include/syslinux/movebits.h -+++ b/com32/include/syslinux/movebits.h -@@ -34,6 +34,7 @@ enum syslinux_memmap_types { - SMT_RESERVED, /* Unusable memory */ - SMT_ALLOC, /* Memory allocated by user */ - SMT_ZERO, /* Memory that should be zeroed */ -+ SMT_TERMINAL, /* Memory to be used as a last resort */ - }; - - struct syslinux_memmap { -diff --git a/com32/lib/syslinux/movebits.c b/com32/lib/syslinux/movebits.c -index 7a05f3c..8ffdc63 100644 ---- a/com32/lib/syslinux/movebits.c -+++ b/com32/lib/syslinux/movebits.c -@@ -160,7 +160,7 @@ static const struct syslinux_memmap *is_free_zone(const struct syslinux_memmap - if (list->start <= start) { - if (llast >= last) { - /* Chunk has a single, well-defined type */ -- if (list->type == SMT_FREE) { -+ if (list->type == SMT_FREE || list->type == SMT_TERMINAL) { - dprintf("F: 0x%08x bytes at 0x%08x\n", - list->next->start, list->start); - return list; /* It's free */ --- -1.8.5.3 - diff --git a/meta/recipes-devtools/syslinux/files/0002-memscan-build-a-linked-list-of-memory-scanners.patch b/meta/recipes-devtools/syslinux/files/0002-memscan-build-a-linked-list-of-memory-scanners.patch deleted file mode 100644 index 48d3955910..0000000000 --- a/meta/recipes-devtools/syslinux/files/0002-memscan-build-a-linked-list-of-memory-scanners.patch +++ /dev/null @@ -1,450 +0,0 @@ -Upstream-Status: Backport [787d7e568fe08d7080d2cd03cd9ee27c327eca67] -Signed-off-by: Jonathan Liu <net147@gmail.com> - -From 2e05f34c0c5bc0144bb203a169009dfb6837b4e3 Mon Sep 17 00:00:00 2001 -From: Matt Fleming <matt.fleming@intel.com> -Date: Wed, 17 Jul 2013 12:15:16 +0100 -Subject: [PATCH 2/4] memscan: build a linked list of memory scanners - -By registering memory scanners at runtime we can support multiple memory -scanner functions, which helps us to isolate them and keep things -modular, only registering them for specific platform/derivative -combinations. This is preparation for adding a memory scanner that is -specific to PXELINUX on bios and understands when the memory region -occupied by the PXE stack can be reused. - -Signed-off-by: Matt Fleming <matt.fleming@intel.com> - -Conflicts: - com32/include/syslinux/memscan.h - com32/lib/syslinux/memscan.c ---- - com32/include/syslinux/firmware.h | 4 +- - com32/include/syslinux/memscan.h | 14 +++- - com32/lib/syslinux/memscan.c | 143 +++++++------------------------------- - core/bios.c | 125 ++++++++++++++++++++++++++++++++- - efi/main.c | 14 ++-- - 5 files changed, 173 insertions(+), 127 deletions(-) - -diff --git a/com32/include/syslinux/firmware.h b/com32/include/syslinux/firmware.h -index 4a43c86..6cc06a0 100644 ---- a/com32/include/syslinux/firmware.h -+++ b/com32/include/syslinux/firmware.h -@@ -1,7 +1,8 @@ - #ifndef _SYSLINUX_FIRMWARE_H - #define _SYSLINUX_FIRMWARE_H - --#include <syslinux/memscan.h> -+#include <inttypes.h> -+#include <stdbool.h> - - struct term_state; - -@@ -42,7 +43,6 @@ struct mem_ops { - void *(*malloc)(size_t, enum heap, size_t); - void *(*realloc)(void *, size_t); - void (*free)(void *); -- int (*scan_memory)(scan_memory_callback_t, void *); - }; - - struct initramfs; -diff --git a/com32/include/syslinux/memscan.h b/com32/include/syslinux/memscan.h -index c3ebf84..ab78e28 100644 ---- a/com32/include/syslinux/memscan.h -+++ b/com32/include/syslinux/memscan.h -@@ -29,11 +29,19 @@ - #ifndef _SYSLINUX_MEMSCAN_H - #define _SYSLINUX_MEMSCAN_H - --#include <stdbool.h> -+#include <linux/list.h> - #include <syslinux/movebits.h> /* addr_t */ - --typedef int (*scan_memory_callback_t) (void *, addr_t, addr_t, bool); -+typedef int (*scan_memory_callback_t) (void *, addr_t, addr_t, -+ enum syslinux_memmap_types type); -+ -+struct syslinux_memscan { -+ int (*func)(scan_memory_callback_t callback, void *data); -+ struct list_head next; -+}; -+ -+void syslinux_memscan_add(struct syslinux_memscan *entry); -+int syslinux_memscan_new(int (*func)(scan_memory_callback_t cb, void *data)); - int syslinux_scan_memory(scan_memory_callback_t callback, void *data); --int bios_scan_memory(scan_memory_callback_t callback, void *data); - - #endif /* _SYSLINUX_MEMSCAN_H */ -diff --git a/com32/lib/syslinux/memscan.c b/com32/lib/syslinux/memscan.c -index 0ff25d7..fdb7274 100644 ---- a/com32/lib/syslinux/memscan.c -+++ b/com32/lib/syslinux/memscan.c -@@ -32,133 +32,44 @@ - * Query the system for free memory - */ - --#include <assert.h> --#include <stdbool.h> --#include <stdlib.h> --#include <string.h> --#include <inttypes.h> --#include <com32.h> -- - #include <syslinux/memscan.h> --#include <syslinux/firmware.h> - --struct e820_entry { -- uint64_t start; -- uint64_t len; -- uint32_t type; --}; -+static LIST_HEAD(syslinux_memscan_head); - --int bios_scan_memory(scan_memory_callback_t callback, void *data) -+/* -+ * Add a memscan entry to the list. -+ */ -+void syslinux_memscan_add(struct syslinux_memscan *entry) - { -- static com32sys_t ireg; -- com32sys_t oreg; -- struct e820_entry *e820buf; -- uint64_t start, len, maxlen; -- int memfound = 0; -- int rv; -- addr_t dosmem; -- const addr_t bios_data = 0x510; /* Amount to reserve for BIOS data */ -+ list_add(&entry->next, &syslinux_memscan_head); -+} - -- /* Use INT 12h to get DOS memory */ -- __intcall(0x12, &__com32_zero_regs, &oreg); -- dosmem = oreg.eax.w[0] << 10; -- if (dosmem < 32 * 1024 || dosmem > 640 * 1024) { -- /* INT 12h reports nonsense... now what? */ -- uint16_t ebda_seg = *(uint16_t *) 0x40e; -- if (ebda_seg >= 0x8000 && ebda_seg < 0xa000) -- dosmem = ebda_seg << 4; -- else -- dosmem = 640 * 1024; /* Hope for the best... */ -- } -- rv = callback(data, bios_data, dosmem - bios_data, true); -- if (rv) -- return rv; -+/* -+ * Build a new memscan entry and add it to the list. -+ */ -+int syslinux_memscan_new(int func(scan_memory_callback_t, void *data)) -+{ -+ struct syslinux_memscan *entry; - -- /* First try INT 15h AX=E820h */ -- e820buf = lzalloc(sizeof *e820buf); -- if (!e820buf) -+ entry = malloc(sizeof *entry); -+ if (!entry) - return -1; - -- ireg.eax.l = 0xe820; -- ireg.edx.l = 0x534d4150; -- ireg.ebx.l = 0; -- ireg.ecx.l = sizeof(*e820buf); -- ireg.es = SEG(e820buf); -- ireg.edi.w[0] = OFFS(e820buf); -- -- do { -- __intcall(0x15, &ireg, &oreg); -- -- if ((oreg.eflags.l & EFLAGS_CF) || -- (oreg.eax.l != 0x534d4150) || (oreg.ecx.l < 20)) -- break; -- -- start = e820buf->start; -- len = e820buf->len; -- -- if (start < 0x100000000ULL) { -- /* Don't rely on E820 being valid for low memory. Doing so -- could mean stuff like overwriting the PXE stack even when -- using "keeppxe", etc. */ -- if (start < 0x100000ULL) { -- if (len > 0x100000ULL - start) -- len -= 0x100000ULL - start; -- else -- len = 0; -- start = 0x100000ULL; -- } -- -- maxlen = 0x100000000ULL - start; -- if (len > maxlen) -- len = maxlen; -- -- if (len) { -- rv = callback(data, (addr_t) start, (addr_t) len, -- e820buf->type == 1); -- if (rv) -- return rv; -- memfound = 1; -- } -- } -- -- ireg.ebx.l = oreg.ebx.l; -- } while (oreg.ebx.l); -- -- lfree(e820buf); -- -- if (memfound) -- return 0; -- -- /* Next try INT 15h AX=E801h */ -- ireg.eax.w[0] = 0xe801; -- __intcall(0x15, &ireg, &oreg); -- -- if (!(oreg.eflags.l & EFLAGS_CF) && oreg.ecx.w[0]) { -- rv = callback(data, (addr_t) 1 << 20, oreg.ecx.w[0] << 10, true); -- if (rv) -- return rv; -- -- if (oreg.edx.w[0]) { -- rv = callback(data, (addr_t) 16 << 20, oreg.edx.w[0] << 16, true); -- if (rv) -- return rv; -- } -- -- return 0; -- } -- -- /* Finally try INT 15h AH=88h */ -- ireg.eax.w[0] = 0x8800; -- if (!(oreg.eflags.l & EFLAGS_CF) && oreg.eax.w[0]) { -- rv = callback(data, (addr_t) 1 << 20, oreg.ecx.w[0] << 10, true); -- if (rv) -- return rv; -- } -- -+ entry->func = func; -+ syslinux_memscan_add(entry); - return 0; - } - - int syslinux_scan_memory(scan_memory_callback_t callback, void *data) - { -- return firmware->mem->scan_memory(callback, data); -+ struct syslinux_memscan *entry; -+ int rv = 0; -+ -+ list_for_each_entry(entry, &syslinux_memscan_head, next) { -+ rv = entry->func(callback, data); -+ if (rv) -+ break; -+ } -+ -+ return rv; - } -diff --git a/core/bios.c b/core/bios.c -index 53223e8..5344833 100644 ---- a/core/bios.c -+++ b/core/bios.c -@@ -501,6 +501,129 @@ static inline void bios_timer_init(void) - - extern uint16_t *bios_free_mem; - -+struct e820_entry { -+ uint64_t start; -+ uint64_t len; -+ uint32_t type; -+}; -+ -+static int bios_scan_memory(scan_memory_callback_t callback, void *data) -+{ -+ static com32sys_t ireg; -+ com32sys_t oreg; -+ struct e820_entry *e820buf; -+ uint64_t start, len, maxlen; -+ int memfound = 0; -+ int rv; -+ addr_t dosmem; -+ const addr_t bios_data = 0x510; /* Amount to reserve for BIOS data */ -+ -+ /* Use INT 12h to get DOS memory */ -+ __intcall(0x12, &__com32_zero_regs, &oreg); -+ dosmem = oreg.eax.w[0] << 10; -+ if (dosmem < 32 * 1024 || dosmem > 640 * 1024) { -+ /* INT 12h reports nonsense... now what? */ -+ uint16_t ebda_seg = *(uint16_t *) 0x40e; -+ if (ebda_seg >= 0x8000 && ebda_seg < 0xa000) -+ dosmem = ebda_seg << 4; -+ else -+ dosmem = 640 * 1024; /* Hope for the best... */ -+ } -+ rv = callback(data, bios_data, dosmem - bios_data, SMT_FREE); -+ if (rv) -+ return rv; -+ -+ /* First try INT 15h AX=E820h */ -+ e820buf = lzalloc(sizeof *e820buf); -+ if (!e820buf) -+ return -1; -+ -+ ireg.eax.l = 0xe820; -+ ireg.edx.l = 0x534d4150; -+ ireg.ebx.l = 0; -+ ireg.ecx.l = sizeof(*e820buf); -+ ireg.es = SEG(e820buf); -+ ireg.edi.w[0] = OFFS(e820buf); -+ -+ do { -+ __intcall(0x15, &ireg, &oreg); -+ -+ if ((oreg.eflags.l & EFLAGS_CF) || -+ (oreg.eax.l != 0x534d4150) || (oreg.ecx.l < 20)) -+ break; -+ -+ start = e820buf->start; -+ len = e820buf->len; -+ -+ if (start < 0x100000000ULL) { -+ /* Don't rely on E820 being valid for low memory. Doing so -+ could mean stuff like overwriting the PXE stack even when -+ using "keeppxe", etc. */ -+ if (start < 0x100000ULL) { -+ if (len > 0x100000ULL - start) -+ len -= 0x100000ULL - start; -+ else -+ len = 0; -+ start = 0x100000ULL; -+ } -+ -+ maxlen = 0x100000000ULL - start; -+ if (len > maxlen) -+ len = maxlen; -+ -+ if (len) { -+ enum syslinux_memmap_types type; -+ -+ type = e820buf->type == 1 ? SMT_FREE : SMT_RESERVED; -+ rv = callback(data, (addr_t) start, (addr_t) len, type); -+ if (rv) -+ return rv; -+ memfound = 1; -+ } -+ } -+ -+ ireg.ebx.l = oreg.ebx.l; -+ } while (oreg.ebx.l); -+ -+ lfree(e820buf); -+ -+ if (memfound) -+ return 0; -+ -+ /* Next try INT 15h AX=E801h */ -+ ireg.eax.w[0] = 0xe801; -+ __intcall(0x15, &ireg, &oreg); -+ -+ if (!(oreg.eflags.l & EFLAGS_CF) && oreg.ecx.w[0]) { -+ rv = callback(data, (addr_t) 1 << 20, oreg.ecx.w[0] << 10, SMT_FREE); -+ if (rv) -+ return rv; -+ -+ if (oreg.edx.w[0]) { -+ rv = callback(data, (addr_t) 16 << 20, -+ oreg.edx.w[0] << 16, SMT_FREE); -+ if (rv) -+ return rv; -+ } -+ -+ return 0; -+ } -+ -+ /* Finally try INT 15h AH=88h */ -+ ireg.eax.w[0] = 0x8800; -+ if (!(oreg.eflags.l & EFLAGS_CF) && oreg.eax.w[0]) { -+ rv = callback(data, (addr_t) 1 << 20, oreg.ecx.w[0] << 10, SMT_FREE); -+ if (rv) -+ return rv; -+ } -+ -+ return 0; -+} -+ -+static struct syslinux_memscan bios_memscan = { -+ .func = bios_scan_memory, -+}; -+ - void bios_init(void) - { - int i; -@@ -515,6 +638,7 @@ void bios_init(void) - - /* Init the memory subsystem */ - bios_free_mem = (uint16_t *)0x413; -+ syslinux_memscan_add(&bios_memscan); - mem_init(); - - /* CPU-dependent initialization and related checks. */ -@@ -534,7 +658,6 @@ struct mem_ops bios_mem_ops = { - .malloc = bios_malloc, - .realloc = bios_realloc, - .free = bios_free, -- .scan_memory = bios_scan_memory, - }; - - struct firmware bios_fw = { -diff --git a/efi/main.c b/efi/main.c -index 13b9403..fb8cf05 100644 ---- a/efi/main.c -+++ b/efi/main.c -@@ -296,21 +296,21 @@ int efi_scan_memory(scan_memory_callback_t callback, void *data) - for (i = 0; i < nr_entries; bufpos += desc_sz, i++) { - EFI_MEMORY_DESCRIPTOR *m; - UINT64 region_sz; -- int valid; -+ enum syslinux_memmap_types type; - - m = (EFI_MEMORY_DESCRIPTOR *)bufpos; - region_sz = m->NumberOfPages * EFI_PAGE_SIZE; - - switch (m->Type) { - case EfiConventionalMemory: -- valid = 1; -+ type = SMT_FREE; - break; - default: -- valid = 0; -+ type = SMT_RESERVED; - break; - } - -- rv = callback(data, m->PhysicalStart, region_sz, valid); -+ rv = callback(data, m->PhysicalStart, region_sz, type); - if (rv) - break; - } -@@ -319,11 +319,16 @@ int efi_scan_memory(scan_memory_callback_t callback, void *data) - return rv; - } - -+static struct syslinux_memscan efi_memscan = { -+ .func = efi_scan_memory, -+}; -+ - extern uint16_t *bios_free_mem; - void efi_init(void) - { - /* XXX timer */ - *bios_free_mem = 0; -+ syslinux_memscan_add(&efi_memscan); - mem_init(); - } - -@@ -1103,7 +1108,6 @@ struct mem_ops efi_mem_ops = { - .malloc = efi_malloc, - .realloc = efi_realloc, - .free = efi_free, -- .scan_memory = efi_scan_memory, - }; - - struct firmware efi_fw = { --- -1.8.5.3 - diff --git a/meta/recipes-devtools/syslinux/files/0003-PXELINUX-Add-bios-memscan-function.patch b/meta/recipes-devtools/syslinux/files/0003-PXELINUX-Add-bios-memscan-function.patch deleted file mode 100644 index 70d65fd71d..0000000000 --- a/meta/recipes-devtools/syslinux/files/0003-PXELINUX-Add-bios-memscan-function.patch +++ /dev/null @@ -1,87 +0,0 @@ -Upstream-Status: Backport [d2f94e74fbd60bf491753895d2474105efb3dedf] -Signed-off-by: Jonathan Liu <net147@gmail.com> - -From 5d57e8eb46f209481069d70eaa778481f6fa3edb Mon Sep 17 00:00:00 2001 -From: Matt Fleming <matt.fleming@intel.com> -Date: Wed, 17 Jul 2013 13:04:30 +0100 -Subject: [PATCH 3/4] PXELINUX: Add bios memscan function - -We can mark the memory region occupied by the PXE stack as SMT_TERMINAL -provided that KeepPXE isn't set. Historically some very old -non-relocatable kernel images (memtest86+) have a load address that -falls within the PXE stack region, so we need to attempt to load into -that region if at all possible. - -Signed-off-by: Matt Fleming <matt.fleming@intel.com> ---- - core/fs/pxe/bios.c | 35 +++++++++++++++++++++++++++++++++++ - 1 file changed, 35 insertions(+) - -diff --git a/core/fs/pxe/bios.c b/core/fs/pxe/bios.c -index 81aa715..5f61824 100644 ---- a/core/fs/pxe/bios.c -+++ b/core/fs/pxe/bios.c -@@ -1,4 +1,5 @@ - #include <syslinux/firmware.h> -+#include <syslinux/memscan.h> - #include <core.h> - #include "pxe.h" - #include <net.h> -@@ -10,6 +11,9 @@ static uint16_t real_base_mem; /* Amount of DOS memory after freeing */ - static bool has_gpxe; - static uint32_t gpxe_funcs; - -+static addr_t pxe_code_start, pxe_code_size; -+static addr_t pxe_data_start, pxe_data_size; -+ - /* - * Validity check on possible !PXE structure in buf - * return 1 for success, 0 for failure. -@@ -88,6 +92,29 @@ static const struct pxenv_t *memory_scan_for_pxenv_struct(void) - return memory_scan(0x10000, is_pxenv); - } - -+static int pxelinux_scan_memory(scan_memory_callback_t callback, void *data) -+{ -+ int rv = 0; -+ -+ /* -+ * If we are planning on calling unload_pxe() and unmapping the PXE -+ * region before we transfer control away from PXELINUX we can mark -+ * that region as SMT_TERMINAL to indicate that the region will -+ * become free at some point in the future. -+ */ -+ if (!KeepPXE) { -+ dprintf("Marking PXE code region 0x%x - 0x%x as SMT_TERMINAL\n", -+ pxe_code_start, pxe_code_start + pxe_code_size); -+ rv = callback(data, pxe_code_start, pxe_code_size, SMT_TERMINAL); -+ -+ dprintf("Marking PXE data region 0x%x - 0x%x as SMT_TERMINAL\n", -+ pxe_data_start, pxe_data_start + pxe_data_size); -+ rv = callback(data, pxe_data_start, pxe_data_size, SMT_TERMINAL); -+ } -+ -+ return rv; -+} -+ - /* - * Find the !PXE structure; we search for the following, in order: - * -@@ -204,6 +231,14 @@ int pxe_init(bool quiet) - printf("UNDI data segment at %04X len %04X\n", data_seg, data_len); - } - -+ pxe_code_start = code_seg << 4; -+ pxe_code_size = code_len; -+ -+ pxe_data_start = data_seg << 4; -+ pxe_data_size = data_len; -+ -+ syslinux_memscan_new(pxelinux_scan_memory); -+ - code_seg = code_seg + ((code_len + 15) >> 4); - data_seg = data_seg + ((data_len + 15) >> 4); - --- -1.8.5.3 - diff --git a/meta/recipes-devtools/syslinux/files/0004-pxe-use-bios_fbm-and-real_base_mem-to-calculate-free.patch b/meta/recipes-devtools/syslinux/files/0004-pxe-use-bios_fbm-and-real_base_mem-to-calculate-free.patch deleted file mode 100644 index ee0a77237d..0000000000 --- a/meta/recipes-devtools/syslinux/files/0004-pxe-use-bios_fbm-and-real_base_mem-to-calculate-free.patch +++ /dev/null @@ -1,65 +0,0 @@ -Upstream-Status: Backport [c0ea15936de8378d1da6843d3dbddd8dddba1011] -Signed-off-by: Jonathan Liu <net147@gmail.com> - -From f3347f9b09135d71a4effae1614b22dcdf16a7e2 Mon Sep 17 00:00:00 2001 -From: Matt Fleming <matt.fleming@intel.com> -Date: Wed, 24 Jul 2013 18:33:14 +0100 -Subject: [PATCH 4/4] pxe: use bios_fbm() and real_base_mem to calculate free - space - -We don't need to individually add the PXE regions, we already have two -symbols that denote the memory region that will be freed when calling -unload_pxe(). - -This essentially reverts commit 03dda0f1 ("pxe: mark all PXE regions as -SMT_TERMINAL"). - -Signed-off-by: Matt Fleming <matt.fleming@intel.com> - -Conflicts: - core/fs/pxe/bios.c ---- - core/fs/pxe/bios.c | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/core/fs/pxe/bios.c b/core/fs/pxe/bios.c -index 5f61824..ffdffaf 100644 ---- a/core/fs/pxe/bios.c -+++ b/core/fs/pxe/bios.c -@@ -94,24 +94,24 @@ static const struct pxenv_t *memory_scan_for_pxenv_struct(void) - - static int pxelinux_scan_memory(scan_memory_callback_t callback, void *data) - { -+ addr_t start, size; - int rv = 0; - -+ if (KeepPXE) -+ return 0; -+ - /* - * If we are planning on calling unload_pxe() and unmapping the PXE - * region before we transfer control away from PXELINUX we can mark - * that region as SMT_TERMINAL to indicate that the region will - * become free at some point in the future. - */ -- if (!KeepPXE) { -- dprintf("Marking PXE code region 0x%x - 0x%x as SMT_TERMINAL\n", -- pxe_code_start, pxe_code_start + pxe_code_size); -- rv = callback(data, pxe_code_start, pxe_code_size, SMT_TERMINAL); -- -- dprintf("Marking PXE data region 0x%x - 0x%x as SMT_TERMINAL\n", -- pxe_data_start, pxe_data_start + pxe_data_size); -- rv = callback(data, pxe_data_start, pxe_data_size, SMT_TERMINAL); -- } -+ start = bios_fbm() << 10; -+ size = (real_base_mem - bios_fbm()) << 10; -+ dprintf("Marking PXE region 0x%x - 0x%x as SMT_TERMINAL\n", -+ start, start + size); - -+ callback(data, start, size, SMT_TERMINAL); - return rv; - } - --- -1.8.5.3 - diff --git a/meta/recipes-devtools/syslinux/files/isohybrid-fix-overflow-on-32-bit-system.patch b/meta/recipes-devtools/syslinux/files/isohybrid-fix-overflow-on-32-bit-system.patch deleted file mode 100644 index 09a6945ba9..0000000000 --- a/meta/recipes-devtools/syslinux/files/isohybrid-fix-overflow-on-32-bit-system.patch +++ /dev/null @@ -1,40 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -From bc360f8dbdf27bff07bb5db8d0ea9a7b10d8e3d1 Mon Sep 17 00:00:00 2001 -From: Kai Kang <kai.kang@windriver.com> -Date: Fri, 20 Jun 2014 11:32:11 +0800 -Subject: [PATCH 1/2] isohybrid: fix overflow on 32 bit system - -When call isohybrid with option '-u', it overflows on a 32 bits host. It -seeks to 512 bytes before the end of the image to install gpt header. If -the size of image is larger than LONG_MAX, it overflows fseek() and -cause error: - -isohybrid: image-x86-64-20140505110100.iso: seek error - 8: Invalid argument - -Replace fseek with fseeko to fix this issue. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> -Signed-off-by: H. Peter Anvin <hpa@zytor.com> ---- - utils/isohybrid.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/utils/isohybrid.c b/utils/isohybrid.c -index 410bb60..23fc6c0 100644 ---- a/utils/isohybrid.c -+++ b/utils/isohybrid.c -@@ -1126,7 +1126,7 @@ main(int argc, char *argv[]) - * end of the image - */ - -- if (fseek(fp, (isostat.st_size + padding) - orig_gpt_size - 512, -+ if (fseeko(fp, (isostat.st_size + padding) - orig_gpt_size - 512, - SEEK_SET)) - err(1, "%s: seek error - 8", argv[0]); - --- -1.9.1 - diff --git a/meta/recipes-devtools/syslinux/syslinux/0001-linux-syslinux-support-ext2-3-4-device.patch b/meta/recipes-devtools/syslinux/syslinux/0001-linux-syslinux-support-ext2-3-4-device.patch new file mode 100644 index 0000000000..3ab7875274 --- /dev/null +++ b/meta/recipes-devtools/syslinux/syslinux/0001-linux-syslinux-support-ext2-3-4-device.patch @@ -0,0 +1,84 @@ +From 60f3833ab2b5899771b4eab654e88f9888b99501 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Wed, 31 Dec 2014 16:01:55 +0800 +Subject: [PATCH 1/9] linux/syslinux: support ext2/3/4 device + +* Support ext2/3/4 deivce. +* The open_ext2_fs() checks whether it is an ext2/3/4 device, + do the ext2/3/4 installation (install_to_ext2()) if yes, otherwise go + on to the fat/ntfs. +* The ext2/3/4 support doesn't require root privileges since it doesn't need + mount (but write permission is required). + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +Tested-by: Du Dolpher <dolpher.du@intel.com> +--- + linux/syslinux.c | 36 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 36 insertions(+) + +diff --git a/linux/syslinux.c b/linux/syslinux.c +index 912de71..36fc202 100755 +--- a/linux/syslinux.c ++++ b/linux/syslinux.c +@@ -256,6 +256,23 @@ int do_open_file(char *name) + return fd; + } + ++/* ++ * Check whether the device contains an ext2, ext3 or ext4 fs and open it if ++ * true. ++ * return value: ++ * 0: Everything is OK ++ * 1: Not an ext2, ext3 or ext4 ++ * -1: unexpected error ++ */ ++static int open_ext2_fs(const char *device, const char *subdir) ++{ ++} ++ ++/* The install func for ext2, ext3 and ext4 */ ++static int install_to_ext2(const char *device, int dev_fd, const char *subdir) ++{ ++} ++ + int main(int argc, char *argv[]) + { + static unsigned char sectbuf[SECTOR_SIZE]; +@@ -313,6 +330,24 @@ int main(int argc, char *argv[]) + die("can't combine an offset with a block device"); + } + ++ /* ++ * Check if it is an ext2, ext3 or ext4 ++ */ ++ rv = open_ext2_fs(opt.device, subdir); ++ if (rv == 0) { ++ if (install_to_ext2(opt.device, dev_fd, subdir)) { ++ fprintf(stderr, "%s: installation failed\n", opt.device); ++ exit(1); ++ } ++ return 0; ++ /* Unexpected errors */ ++ } else if (rv == -1) { ++ exit(1); ++ } ++ ++ /* Reset rv */ ++ rv = 0; ++ + xpread(dev_fd, sectbuf, SECTOR_SIZE, opt.offset); + fsync(dev_fd); + +@@ -322,6 +357,7 @@ int main(int argc, char *argv[]) + */ + if ((errmsg = syslinux_check_bootsect(sectbuf, &fs_type))) { + fprintf(stderr, "%s: %s\n", opt.device, errmsg); ++ fprintf(stderr, "%s: supported fs: fat/ntfs/ext2/ex3/ext4\n", program); + exit(1); + } + +-- +1.9.1 + diff --git a/meta/recipes-devtools/syslinux/syslinux/0002-linux-syslinux-implement-open_ext2_fs.patch b/meta/recipes-devtools/syslinux/syslinux/0002-linux-syslinux-implement-open_ext2_fs.patch new file mode 100644 index 0000000000..77cf060451 --- /dev/null +++ b/meta/recipes-devtools/syslinux/syslinux/0002-linux-syslinux-implement-open_ext2_fs.patch @@ -0,0 +1,141 @@ +From 07fb737fb60c08eaaa41989d531fc23009523546 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Wed, 31 Dec 2014 16:09:18 +0800 +Subject: [PATCH 2/9] linux/syslinux: implement open_ext2_fs() + +The open_ext2_fs() checks whether it is an ext2/ext3/ext4 device, and +return: +0: It is an ext2, ext3 or ext4. +1: Not an ext2, ext3 or ext4. +-1: unexpected error. + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +Tested-by: Du Dolpher <dolpher.du@intel.com> +--- + linux/Makefile | 2 +- + linux/syslinux.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 81 insertions(+), 1 deletion(-) + +diff --git a/linux/Makefile b/linux/Makefile +index 11667e1..ac1ac58 100644 +--- a/linux/Makefile ++++ b/linux/Makefile +@@ -51,7 +51,7 @@ spotless: clean + installer: syslinux syslinux-nomtools + + syslinux: $(OBJS) +- $(CC) $(LDFLAGS) -o $@ $^ ++ $(CC) $(LDFLAGS) -o $@ $^ -lext2fs + + syslinux-nomtools: syslinux + ln -f $< $@ +diff --git a/linux/syslinux.c b/linux/syslinux.c +index 36fc202..cc4e7da 100755 +--- a/linux/syslinux.c ++++ b/linux/syslinux.c +@@ -72,6 +72,7 @@ + #include "syslxfs.h" + #include "setadv.h" + #include "syslxopt.h" /* unified options */ ++#include <ext2fs/ext2fs.h> + + extern const char *program; /* Name of program */ + +@@ -82,6 +83,9 @@ char *mntpath = NULL; /* Path on which to mount */ + int loop_fd = -1; /* Loop device */ + #endif + ++ext2_filsys e2fs = NULL; /* Ext2/3/4 filesystem */ ++ext2_ino_t root, cwd; /* The root and cwd of e2fs */ ++ + void __attribute__ ((noreturn)) die(const char *msg) + { + fprintf(stderr, "%s: %s\n", program, msg); +@@ -266,6 +270,82 @@ int do_open_file(char *name) + */ + static int open_ext2_fs(const char *device, const char *subdir) + { ++ int retval; ++ int open_flag = EXT2_FLAG_RW, mount_flags; ++ ext2_ino_t dirino; ++ char opt_string[40]; ++ ++ if (opt.offset) { ++ sprintf(opt_string, "offset=%llu", (unsigned long long)opt.offset); ++ retval = ext2fs_open2(device, opt_string, open_flag, 0, 0, unix_io_manager, &e2fs); ++ } else ++ retval = ext2fs_open(device, open_flag, 0, 0, unix_io_manager, &e2fs); ++ if (retval) { ++ /* It might not be an extN fs, so we need check magic firstly */ ++ if (retval == EXT2_ET_BAD_MAGIC) { ++ /* Do nothing, return silently */ ++ return 1; ++ } else { ++ fprintf(stderr, "%s: error while trying to open: %s\n", ++ program, device); ++ return -1; ++ } ++ } ++ ++ /* Stop if it is mounted */ ++ retval = ext2fs_check_if_mounted(device, &mount_flags); ++ if (retval) { ++ fprintf(stderr, "%s: ext2fs_check_if_mount() error on %s\n", ++ program, device); ++ goto fail; ++ } ++ ++ if (mount_flags & EXT2_MF_MOUNTED) { ++ fprintf(stderr, "%s: %s is mounted\n", program, device); ++ goto fail; ++ } ++ ++ e2fs->default_bitmap_type = EXT2FS_BMAP64_RBTREE; ++ ++ /* Read the inode map */ ++ retval = ext2fs_read_inode_bitmap(e2fs); ++ if (retval) { ++ fprintf(stderr, "%s: while reading inode bitmap: %s\n", ++ program, device); ++ goto fail; ++ } ++ ++ /* Read the block map */ ++ retval = ext2fs_read_block_bitmap(e2fs); ++ if (retval) { ++ fprintf(stderr, "%s: while reading block bitmap: %s\n", ++ program, device); ++ goto fail; ++ } ++ ++ root = cwd = EXT2_ROOT_INO; ++ /* Check the subdir */ ++ if (strcmp(subdir, "/")) { ++ retval = ext2fs_namei(e2fs, root, cwd, subdir, &dirino); ++ if (retval) { ++ fprintf(stderr, "%s: failed to find dir %s on %s\n", ++ program, subdir, device); ++ goto fail; ++ } ++ ++ retval = ext2fs_check_directory(e2fs, dirino); ++ if (retval) { ++ fprintf(stderr, "%s: failed to cd to: %s\n", program, subdir); ++ goto fail; ++ } ++ cwd = dirino; ++ } ++ ++ return 0; ++ ++fail: ++ (void) ext2fs_close(e2fs); ++ return -1; + } + + /* The install func for ext2, ext3 and ext4 */ +-- +1.9.1 + diff --git a/meta/recipes-devtools/syslinux/syslinux/0003-linux-syslinux-implement-install_to_ext2.patch b/meta/recipes-devtools/syslinux/syslinux/0003-linux-syslinux-implement-install_to_ext2.patch new file mode 100644 index 0000000000..84ba10526a --- /dev/null +++ b/meta/recipes-devtools/syslinux/syslinux/0003-linux-syslinux-implement-install_to_ext2.patch @@ -0,0 +1,116 @@ +From 64d856b243812907068776b204a003a3a8fa122a Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Wed, 31 Dec 2014 16:17:42 +0800 +Subject: [PATCH 3/9] linux/syslinux: implement install_to_ext2() + +* The handle_adv_on_ext() checks whether we only need update adv. +* The write_to_ext() installs files (ldlinux.sys or ldlinux.c32) to the + device. +* The install_bootblock() installs the boot block. + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +Tested-by: Du Dolpher <dolpher.du@intel.com> +--- + linux/syslinux.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 79 insertions(+) + +diff --git a/linux/syslinux.c b/linux/syslinux.c +index cc4e7da..45f080d 100755 +--- a/linux/syslinux.c ++++ b/linux/syslinux.c +@@ -346,11 +346,90 @@ static int open_ext2_fs(const char *device, const char *subdir) + fail: + (void) ext2fs_close(e2fs); + return -1; ++ ++} ++ ++/* ++ * Install the boot block on the specified device. ++ * Must be run AFTER file installed. ++ */ ++int install_bootblock(int fd, const char *device) ++{ ++} ++ ++static int handle_adv_on_ext(void) ++{ ++} ++ ++/* Write files, adv, boot sector */ ++static int write_to_ext(const char *filename, const char *str, int length, ++ int i_flags, int dev_fd, const char *subdir) ++{ + } + + /* The install func for ext2, ext3 and ext4 */ + static int install_to_ext2(const char *device, int dev_fd, const char *subdir) + { ++ int retval; ++ ext2_ino_t oldino; ++ ++ const char *file = "ldlinux.sys"; ++ const char *oldfile = "extlinux.sys"; ++ const char *c32file = "ldlinux.c32"; ++ ++ /* Handle the adv */ ++ if (handle_adv_on_ext() < 0) { ++ fprintf(stderr, "%s: error while handling ADV on %s\n", ++ program, device); ++ retval = 1; ++ goto fail; ++ } ++ ++ /* Return if only need update the adv */ ++ if (opt.update_only == -1) { ++ return ext2fs_close(e2fs); ++ } ++ ++ /* Write ldlinux.sys, adv, boot sector */ ++ retval = write_to_ext(file, (const char _force *)boot_image, ++ boot_image_len, EXT2_IMMUTABLE_FL, dev_fd, subdir); ++ if (retval) { ++ fprintf(stderr, "%s: ERROR: while writing: %s.\n", ++ program, file); ++ goto fail; ++ } ++ ++ /* Write ldlinux.c32 */ ++ retval = write_to_ext(c32file, ++ (const char _force *)syslinux_ldlinuxc32, ++ syslinux_ldlinuxc32_len, 0, dev_fd, subdir); ++ if (retval) { ++ fprintf(stderr, "%s: ERROR: while writing: %s.\n", ++ program, c32file); ++ goto fail; ++ } ++ ++ /* Look if we have the extlinux.sys and remove it*/ ++ retval = ext2fs_namei(e2fs, root, cwd, oldfile, &oldino); ++ if (retval == 0) { ++ retval = ext2fs_unlink(e2fs, cwd, oldfile, oldino, 0); ++ if (retval) { ++ fprintf(stderr, "%s: ERROR: failed to unlink: %s\n", ++ program, oldfile); ++ goto fail; ++ } ++ } else { ++ retval = 0; ++ } ++ ++ sync(); ++ retval = install_bootblock(dev_fd, device); ++ close(dev_fd); ++ sync(); ++ ++fail: ++ (void) ext2fs_close(e2fs); ++ return retval; + } + + int main(int argc, char *argv[]) +-- +1.9.1 + diff --git a/meta/recipes-devtools/syslinux/syslinux/0004-linux-syslinux-add-ext_file_read-and-ext_file_write.patch b/meta/recipes-devtools/syslinux/syslinux/0004-linux-syslinux-add-ext_file_read-and-ext_file_write.patch new file mode 100644 index 0000000000..64b56d92e0 --- /dev/null +++ b/meta/recipes-devtools/syslinux/syslinux/0004-linux-syslinux-add-ext_file_read-and-ext_file_write.patch @@ -0,0 +1,91 @@ +From 35d3842cc4b930c5102eed2921e0189b7f4fd069 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Wed, 31 Dec 2014 16:43:37 +0800 +Subject: [PATCH 4/9] linux/syslinux: add ext_file_read() and ext_file_write() + +Will use them to read and write on the extX device. + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +Tested-by: Du Dolpher <dolpher.du@intel.com> +--- + linux/syslinux.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 62 insertions(+) + +diff --git a/linux/syslinux.c b/linux/syslinux.c +index 45f080d..247c86a 100755 +--- a/linux/syslinux.c ++++ b/linux/syslinux.c +@@ -349,6 +349,68 @@ fail: + + } + ++/* Read from an ext2_file */ ++static int ext_file_read(ext2_file_t e2_file, void *buf, size_t count, ++ off_t offset, const char *msg) ++{ ++ int retval; ++ char *ptr = (char *) buf; ++ unsigned int got = 0; ++ size_t done = 0; ++ ++ /* Always lseek since e2_file is uncontrolled by this func */ ++ if (ext2fs_file_lseek(e2_file, offset, EXT2_SEEK_SET, NULL)) { ++ fprintf(stderr, "%s: ext2fs_file_lseek() failed.\n", ++ program); ++ return -1; ++ } ++ ++ while (1) { ++ retval = ext2fs_file_read(e2_file, ptr, count, &got); ++ if (retval) { ++ fprintf(stderr, "%s: error while reading %s\n", ++ program, msg); ++ return -1; ++ } ++ count -= got; ++ ptr += got; ++ done += got; ++ if (got == 0 || count == 0) ++ break; ++ } ++ ++ return done; ++} ++ ++/* Write to an ext2_file */ ++static int ext_file_write(ext2_file_t e2_file, const void *buf, size_t count, ++ off_t offset) ++{ ++ const char *ptr = (const char *) buf; ++ unsigned int written = 0; ++ size_t done = 0; ++ ++ /* Always lseek since e2_file is uncontrolled by this func */ ++ if (ext2fs_file_lseek(e2_file, offset, EXT2_SEEK_SET, NULL)) { ++ fprintf(stderr, "%s: ext2fs_file_lseek() failed.\n", ++ program); ++ return -1; ++ } ++ ++ while (count > 0) { ++ if (ext2fs_file_write(e2_file, ptr, count, &written)) { ++ fprintf(stderr, "%s: failed to write syslinux adv.\n", ++ program); ++ return -1; ++ } ++ count -= written; ++ ptr += written; ++ done += written; ++ } ++ ++ return done; ++} ++ + /* + * Install the boot block on the specified device. + * Must be run AFTER file installed. +-- +1.9.1 + diff --git a/meta/recipes-devtools/syslinux/syslinux/0005-linux-syslinux-implement-handle_adv_on_ext.patch b/meta/recipes-devtools/syslinux/syslinux/0005-linux-syslinux-implement-handle_adv_on_ext.patch new file mode 100644 index 0000000000..829e7c4ca1 --- /dev/null +++ b/meta/recipes-devtools/syslinux/syslinux/0005-linux-syslinux-implement-handle_adv_on_ext.patch @@ -0,0 +1,127 @@ +From cdb980b37f40dc2c41891434c7736e49da53756e Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Wed, 31 Dec 2014 16:47:52 +0800 +Subject: [PATCH 5/9] linux/syslinux: implement handle_adv_on_ext() + +It reads adv if found on the device, or resets syslinux_adv, or update +the adv if update adv only. + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +Tested-by: Du Dolpher <dolpher.du@intel.com> +--- + linux/syslinux.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 97 insertions(+) + +diff --git a/linux/syslinux.c b/linux/syslinux.c +index 247c86a..de5d272 100755 +--- a/linux/syslinux.c ++++ b/linux/syslinux.c +@@ -421,6 +421,103 @@ int install_bootblock(int fd, const char *device) + + static int handle_adv_on_ext(void) + { ++ int i, retval, found_file; ++ int need_close = 2; /* 2 means no need extra close */ ++ char *filenames[2] = {"ldlinux.sys", "extlinux.sys"}; ++ char *filename; ++ ext2_ino_t newino; ++ ext2_file_t e2_file; ++ struct ext2_inode inode; ++ ++ for (i = 0; i < 2; i++) { ++ filename = filenames[i]; ++ found_file = 0; ++ retval = ext2fs_namei(e2fs, root, cwd, filename, &newino); ++ if (retval == 0) { ++ found_file = 1; ++ } else ++ continue; ++ ++ need_close = i; ++ ++ retval = ext2fs_file_open(e2fs, newino, EXT2_FLAG_RW, &e2_file); ++ if (retval) { ++ fprintf(stderr, "%s: failed to open %s\n", ++ program, filename); ++ goto fail; ++ } ++ ++ retval = ext2fs_read_inode(e2fs, newino, &inode); ++ if (retval) { ++ fprintf(stderr, "%s: error while reading inode: %u, file: %s\n", ++ program, newino, filename); ++ goto fail; ++ } ++ ++ /* Check the size to see if too small to read */ ++ if (inode.i_size < 2 * ADV_SIZE) { ++ if (opt.update_only == -1) { ++ fprintf(stderr, "%s: failed to write auxilliary data\n\ ++ the size of %s is too small (need --update)?\n", ++ program, filename); ++ retval = -1; ++ goto fail; ++ } ++ syslinux_reset_adv(syslinux_adv); ++ found_file = 0; ++ break; ++ } ++ ++ /* Read the adv */ ++ retval = ext_file_read(e2_file, syslinux_adv, 2 * ADV_SIZE, ++ inode.i_size - 2 * ADV_SIZE, "ADV"); ++ if (retval == -1) ++ goto fail; ++ if (retval == 2 * ADV_SIZE) { ++ retval = syslinux_validate_adv(syslinux_adv); ++ /* Read the adv successfully */ ++ if (retval == 0) ++ break; ++ } ++ ++ /* Close the file if reaches here, otherwise we leave the file ++ * open in case we need write it */ ++ need_close = 2; ++ retval = ext2fs_file_close(e2_file); ++ if (retval) { ++ fprintf(stderr, "%s: error while closing %s\n", ++ program, filename); ++ return retval; ++ } ++ } ++ ++ if (!found_file) { ++ if (opt.update_only == -1) { ++ fprintf(stderr, "%s: no ldlinux.sys or extlinux.sys found on the device\n", ++ program); ++ return -1; ++ } ++ syslinux_reset_adv(syslinux_adv); ++ } ++ ++ /* The modify_adv will reset the adv if opt.reset_adv */ ++ if (modify_adv() < 0) { ++ fprintf(stderr, "%s: error while modifying adv\n", program); ++ retval = -1; ++ goto fail; ++ } ++ ++ /* Write adv if update_only == -1 and found file */ ++ if (opt.update_only == -1 && found_file) { ++ if (ext_file_write(e2_file, syslinux_adv, 2 * ADV_SIZE , ++ inode.i_size - 2 * ADV_SIZE) == -1) ++ goto fail; ++ } ++ ++fail: ++ if (need_close != 2) ++ (void) ext2fs_file_close(e2_file); ++ return retval; + } + + /* Write files, adv, boot sector */ +-- +1.9.1 + diff --git a/meta/recipes-devtools/syslinux/syslinux/0006-linux-syslinux-implement-write_to_ext-and-add-syslin.patch b/meta/recipes-devtools/syslinux/syslinux/0006-linux-syslinux-implement-write_to_ext-and-add-syslin.patch new file mode 100644 index 0000000000..cba87252a5 --- /dev/null +++ b/meta/recipes-devtools/syslinux/syslinux/0006-linux-syslinux-implement-write_to_ext-and-add-syslin.patch @@ -0,0 +1,215 @@ +From 922e56c10e36d876777580c84daef9a66bea6525 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Wed, 31 Dec 2014 17:20:43 +0800 +Subject: [PATCH 6/9] linux/syslinux: implement write_to_ext() and add + syslinuxext.c + +* The write_to_ext() write file to the extX device, and handle the boot + sector. +* The syslinuxext.c is used for placing the code which are used by + extlinux and syslinux (which is syslinux_patch_bootsect()). + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +Tested-by: Du Dolpher <dolpher.du@intel.com> +--- + libinstaller/syslinuxext.c | 7 +++ + libinstaller/syslinuxext.h | 5 ++ + linux/Makefile | 3 +- + linux/syslinux.c | 118 +++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 132 insertions(+), 1 deletion(-) + create mode 100644 libinstaller/syslinuxext.c + create mode 100644 libinstaller/syslinuxext.h + +diff --git a/libinstaller/syslinuxext.c b/libinstaller/syslinuxext.c +new file mode 100644 +index 0000000..bb54cef +--- /dev/null ++++ b/libinstaller/syslinuxext.c +@@ -0,0 +1,7 @@ ++#define _GNU_SOURCE ++ ++/* Patch syslinux_bootsect */ ++void syslinux_patch_bootsect(int dev_fd) ++{ ++} ++ +diff --git a/libinstaller/syslinuxext.h b/libinstaller/syslinuxext.h +new file mode 100644 +index 0000000..8abd8b9 +--- /dev/null ++++ b/libinstaller/syslinuxext.h +@@ -0,0 +1,5 @@ ++#ifndef EXT2_SUPER_OFFSET ++#define EXT2_SUPER_OFFSET 1024 ++#endif ++ ++void syslinux_patch_bootsect(int dev_fd); +diff --git a/linux/Makefile b/linux/Makefile +index ac1ac58..3b23867 100644 +--- a/linux/Makefile ++++ b/linux/Makefile +@@ -30,7 +30,8 @@ SRCS = syslinux.c \ + ../libinstaller/syslxmod.c \ + ../libinstaller/bootsect_bin.c \ + ../libinstaller/ldlinuxc32_bin.c \ +- ../libinstaller/ldlinux_bin.c ++ ../libinstaller/ldlinux_bin.c \ ++ ../libinstaller/syslinuxext.c + OBJS = $(patsubst %.c,%.o,$(notdir $(SRCS))) + + .SUFFIXES: .c .o .i .s .S +diff --git a/linux/syslinux.c b/linux/syslinux.c +index de5d272..f0c97a8 100755 +--- a/linux/syslinux.c ++++ b/linux/syslinux.c +@@ -46,6 +46,7 @@ + #include <sys/types.h> + #include <sys/wait.h> + #include <sys/mount.h> ++#include <time.h> + + #include "linuxioctl.h" + +@@ -72,6 +73,7 @@ + #include "syslxfs.h" + #include "setadv.h" + #include "syslxopt.h" /* unified options */ ++#include "syslinuxext.h" + #include <ext2fs/ext2fs.h> + + extern const char *program; /* Name of program */ +@@ -419,6 +421,12 @@ int install_bootblock(int fd, const char *device) + { + } + ++/* Construct the boot file map */ ++int ext_construct_sectmap_fs(ext2_filsys fs, ext2_ino_t newino, ++ sector_t *sectors, int nsect) ++{ ++} ++ + static int handle_adv_on_ext(void) + { + int i, retval, found_file; +@@ -524,6 +532,116 @@ fail: + static int write_to_ext(const char *filename, const char *str, int length, + int i_flags, int dev_fd, const char *subdir) + { ++ ext2_ino_t newino; ++ struct ext2_inode inode; ++ int retval, i, modbytes, nsect; ++ ext2_file_t e2_file; ++ sector_t *sectors; ++ ++ /* Remove it if it is already exists */ ++ retval = ext2fs_namei(e2fs, root, cwd, filename, &newino); ++ if (retval == 0) { ++ retval = ext2fs_unlink(e2fs, cwd, filename, newino, 0); ++ if (retval) { ++ fprintf(stderr, "%s: failed to unlink: %s\n", program, filename); ++ return retval; ++ } ++ } ++ ++ /* Create new inode */ ++ retval = ext2fs_new_inode(e2fs, cwd, 010755, 0, &newino); ++ if (retval) { ++ fprintf(stderr, "%s: ERROR: failed to create inode for: %s\n", ++ program, filename); ++ return retval; ++ } ++ ++ /* Link the inode and the filename */ ++ retval = ext2fs_link(e2fs, cwd, filename, newino, EXT2_FT_REG_FILE); ++ if (retval) { ++ fprintf(stderr, "%s: ERROR: failed to link inode for: %s.\n", ++ program, filename); ++ return retval; ++ } ++ ++ if (ext2fs_test_inode_bitmap2(e2fs->inode_map, newino)) ++ fprintf(stderr, "%s: warning: inode already set %s.\n", ++ program, filename); ++ ++ ext2fs_inode_alloc_stats2(e2fs, newino, +1, 0); ++ memset(&inode, 0, sizeof(inode)); ++ inode.i_mode = LINUX_S_IFREG | LINUX_S_IRUSR | LINUX_S_IRGRP ++ | LINUX_S_IROTH; ++ inode.i_flags |= i_flags; ++ inode.i_atime = inode.i_ctime = inode.i_mtime = ++ e2fs->now ? e2fs->now : time(0); ++ inode.i_links_count = 1; ++ if (e2fs->super->s_feature_incompat & ++ EXT3_FEATURE_INCOMPAT_EXTENTS) { ++ struct ext3_extent_header *eh; ++ ++ eh = (struct ext3_extent_header *) &inode.i_block[0]; ++ eh->eh_depth = 0; ++ eh->eh_entries = 0; ++ eh->eh_magic = ext2fs_cpu_to_le16(EXT3_EXT_MAGIC); ++ i = (sizeof(inode.i_block) - sizeof(*eh)) / ++ sizeof(struct ext3_extent); ++ eh->eh_max = ext2fs_cpu_to_le16(i); ++ inode.i_flags |= EXT4_EXTENTS_FL; ++ } ++ ++ retval = ext2fs_write_new_inode(e2fs, newino, &inode); ++ if (retval) { ++ fprintf(stderr, "%s: ERROR: while writting inode %d.\n", ++ program, newino); ++ return 1; ++ } ++ ++ retval = ext2fs_file_open(e2fs, newino, EXT2_FILE_WRITE, &e2_file); ++ if (retval) { ++ fprintf(stderr, "%s: ERROR: failed to open %s.\n", ++ program, filename); ++ return 1; ++ } ++ ++ /* Write to file */ ++ if (ext_file_write(e2_file, str, length, 0) == -1) ++ goto fail; ++ ++ if (strcmp(filename, "ldlinux.sys") == 0) { ++ /* Write ADV */ ++ if (ext_file_write(e2_file, syslinux_adv, 2 * ADV_SIZE, ++ boot_image_len) == -1) ++ goto fail; ++ ++ /* Patch syslinux_bootsect */ ++ syslinux_patch_bootsect(dev_fd); ++ ++ /* Patch ldlinux.sys */ ++ nsect = (boot_image_len + SECTOR_SIZE - 1) >> SECTOR_SHIFT; ++ nsect += 2; /* Two sectors for the ADV */ ++ sectors = alloca(sizeof(sector_t) * nsect); ++ memset(sectors, 0, nsect * sizeof *sectors); ++ /* The sectors will be modified and used by syslinux_patch() */ ++ retval = ext_construct_sectmap_fs(e2fs, newino, sectors, nsect); ++ if (retval) ++ goto fail; ++ ++ /* Create the modified image in memory */ ++ modbytes = syslinux_patch(sectors, nsect, opt.stupid_mode, ++ opt.raid_mode, subdir, NULL); ++ ++ /* Rewrite the first modbytes of ldlinux.sys */ ++ if (ext_file_write(e2_file, str, modbytes, 0) == -1) { ++ fprintf(stderr, "%s: ERROR: failed to patch %s.\n", program, ++ filename); ++ goto fail; ++ } ++ } ++ ++fail: ++ (void) ext2fs_file_close(e2_file); ++ return retval; + } + + /* The install func for ext2, ext3 and ext4 */ +-- +1.9.1 + diff --git a/meta/recipes-devtools/syslinux/syslinux/0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch b/meta/recipes-devtools/syslinux/syslinux/0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch new file mode 100644 index 0000000000..3913811917 --- /dev/null +++ b/meta/recipes-devtools/syslinux/syslinux/0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch @@ -0,0 +1,84 @@ +From a95b831e18dd123f859bc5e6c4cecdcc0184ee37 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Fri, 2 Jan 2015 12:18:02 +0800 +Subject: [PATCH 7/9] linux/syslinux: implement ext_construct_sectmap_fs() + +The ext_construct_sectmap_fs() constucts the sector according to the +bmap. + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +Tested-by: Du Dolpher <dolpher.du@intel.com> +--- + linux/syslinux.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 50 insertions(+) + +diff --git a/linux/syslinux.c b/linux/syslinux.c +index f0c97a8..c741750 100755 +--- a/linux/syslinux.c ++++ b/linux/syslinux.c +@@ -421,10 +421,60 @@ int install_bootblock(int fd, const char *device) + { + } + ++/* The file's block count */ ++int block_count = 0; ++static int get_block_count(ext2_filsys fs EXT2FS_ATTR((unused)), ++ blk64_t *blocknr EXT2FS_ATTR((unused)), ++ e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)), ++ blk64_t ref_block EXT2FS_ATTR((unused)), ++ int ref_offset EXT2FS_ATTR((unused)), ++ void *private EXT2FS_ATTR((unused))) ++{ ++ block_count++; ++ return 0; ++} ++ + /* Construct the boot file map */ + int ext_construct_sectmap_fs(ext2_filsys fs, ext2_ino_t newino, + sector_t *sectors, int nsect) + { ++ blk64_t pblk, blksize, blk = 0; ++ sector_t sec; ++ unsigned int i; ++ int retval; ++ ++ blksize = fs->blocksize; ++ blksize >>= SECTOR_SHIFT; ++ ++ /* Get the total blocks no. */ ++ retval = ext2fs_block_iterate3(fs, newino, BLOCK_FLAG_READ_ONLY, ++ NULL, get_block_count, NULL); ++ if (retval) { ++ fprintf(stderr, "%s: ERROR: ext2fs_block_iterate3() failed.\n", program); ++ return -1; ++ } ++ ++ while (nsect) { ++ if (block_count-- == 0) ++ break; ++ ++ /* Get the physical block no. (bmap) */ ++ retval = ext2fs_bmap2(fs, newino, 0, 0, 0, blk, 0, &pblk); ++ if (retval) { ++ fprintf(stderr, "%s: ERROR: ext2fs_bmap2() failed.\n", program); ++ return -1; ++ } ++ ++ blk++; ++ sec = (sector_t)pblk * blksize; ++ for (i = 0; i < blksize; i++) { ++ *sectors++ = sec++; ++ if (! --nsect) ++ break; ++ } ++ } ++ ++ return 0; + } + + static int handle_adv_on_ext(void) +-- +1.9.1 + diff --git a/meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch b/meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch new file mode 100644 index 0000000000..2400c98d6a --- /dev/null +++ b/meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch @@ -0,0 +1,427 @@ +From 78d76b87a4b855e6b661ae457283a63f385c04c9 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Fri, 2 Jan 2015 12:26:46 +0800 +Subject: [PATCH 8/9] libinstaller/syslinuxext: implement + syslinux_patch_bootsect() + +Move the related from extlinux/main.c to libinstaller/syslinuxext.c, the +syslinux_patch_bootsect() are used by both extlinux/main.c and +linux/syslinux.c. + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +Tested-by: Du Dolpher <dolpher.du@intel.com> +--- + extlinux/Makefile | 3 +- + extlinux/main.c | 167 +------------------------------------------- + libinstaller/syslinuxext.c | 170 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 175 insertions(+), 165 deletions(-) + +diff --git a/extlinux/Makefile b/extlinux/Makefile +index 02d1db5..90dd92f 100644 +--- a/extlinux/Makefile ++++ b/extlinux/Makefile +@@ -31,7 +31,8 @@ SRCS = main.c \ + ../libinstaller/advio.c \ + ../libinstaller/bootsect_bin.c \ + ../libinstaller/ldlinuxc32_bin.c \ +- ../libinstaller/ldlinux_bin.c ++ ../libinstaller/ldlinux_bin.c \ ++ ../libinstaller/syslinuxext.c + OBJS = $(patsubst %.c,%.o,$(notdir $(SRCS))) + + .SUFFIXES: .c .o .i .s .S +diff --git a/extlinux/main.c b/extlinux/main.c +index 09740bd..6fe026e 100644 +--- a/extlinux/main.c ++++ b/extlinux/main.c +@@ -60,6 +60,7 @@ + #include "setadv.h" + #include "syslxopt.h" /* unified options */ + #include "mountinfo.h" ++#include "syslinuxext.h" + + #ifdef DEBUG + # define dprintf printf +@@ -67,10 +68,6 @@ + # define dprintf(...) ((void)0) + #endif + +-#ifndef EXT2_SUPER_OFFSET +-#define EXT2_SUPER_OFFSET 1024 +-#endif +- + /* Since we have unused 2048 bytes in the primary AG of an XFS partition, + * we will use the first 0~512 bytes starting from 2048 for the Syslinux + * boot sector. +@@ -92,136 +89,6 @@ static char subvol[BTRFS_SUBVOL_MAX]; + - 2*ADV_SIZE) + + /* +- * Get the size of a block device +- */ +-static uint64_t get_size(int devfd) +-{ +- uint64_t bytes; +- uint32_t sects; +- struct stat st; +- +-#ifdef BLKGETSIZE64 +- if (!ioctl(devfd, BLKGETSIZE64, &bytes)) +- return bytes; +-#endif +- if (!ioctl(devfd, BLKGETSIZE, §s)) +- return (uint64_t) sects << 9; +- else if (!fstat(devfd, &st) && st.st_size) +- return st.st_size; +- else +- return 0; +-} +- +-/* +- * Get device geometry and partition offset +- */ +-struct geometry_table { +- uint64_t bytes; +- struct hd_geometry g; +-}; +- +-static int sysfs_get_offset(int devfd, unsigned long *start) +-{ +- struct stat st; +- char sysfs_name[128]; +- FILE *f; +- int rv; +- +- if (fstat(devfd, &st)) +- return -1; +- +- if ((size_t)snprintf(sysfs_name, sizeof sysfs_name, +- "/sys/dev/block/%u:%u/start", +- major(st.st_rdev), minor(st.st_rdev)) +- >= sizeof sysfs_name) +- return -1; +- +- f = fopen(sysfs_name, "r"); +- if (!f) +- return -1; +- +- rv = fscanf(f, "%lu", start); +- fclose(f); +- +- return (rv == 1) ? 0 : -1; +-} +- +-/* Standard floppy disk geometries, plus LS-120. Zipdisk geometry +- (x/64/32) is the final fallback. I don't know what LS-240 has +- as its geometry, since I don't have one and don't know anyone that does, +- and Google wasn't helpful... */ +-static const struct geometry_table standard_geometries[] = { +- {360 * 1024, {2, 9, 40, 0}}, +- {720 * 1024, {2, 9, 80, 0}}, +- {1200 * 1024, {2, 15, 80, 0}}, +- {1440 * 1024, {2, 18, 80, 0}}, +- {1680 * 1024, {2, 21, 80, 0}}, +- {1722 * 1024, {2, 21, 80, 0}}, +- {2880 * 1024, {2, 36, 80, 0}}, +- {3840 * 1024, {2, 48, 80, 0}}, +- {123264 * 1024, {8, 32, 963, 0}}, /* LS120 */ +- {0, {0, 0, 0, 0}} +-}; +- +-int get_geometry(int devfd, uint64_t totalbytes, struct hd_geometry *geo) +-{ +- struct floppy_struct fd_str; +- struct loop_info li; +- struct loop_info64 li64; +- const struct geometry_table *gp; +- int rv = 0; +- +- memset(geo, 0, sizeof *geo); +- +- if (!ioctl(devfd, HDIO_GETGEO, geo)) { +- goto ok; +- } else if (!ioctl(devfd, FDGETPRM, &fd_str)) { +- geo->heads = fd_str.head; +- geo->sectors = fd_str.sect; +- geo->cylinders = fd_str.track; +- geo->start = 0; +- goto ok; +- } +- +- /* Didn't work. Let's see if this is one of the standard geometries */ +- for (gp = standard_geometries; gp->bytes; gp++) { +- if (gp->bytes == totalbytes) { +- memcpy(geo, &gp->g, sizeof *geo); +- goto ok; +- } +- } +- +- /* Didn't work either... assign a geometry of 64 heads, 32 sectors; this is +- what zipdisks use, so this would help if someone has a USB key that +- they're booting in USB-ZIP mode. */ +- +- geo->heads = opt.heads ? : 64; +- geo->sectors = opt.sectors ? : 32; +- geo->cylinders = totalbytes / (geo->heads * geo->sectors << SECTOR_SHIFT); +- geo->start = 0; +- +- if (!opt.sectors && !opt.heads) { +- fprintf(stderr, +- "Warning: unable to obtain device geometry (defaulting to %d heads, %d sectors)\n" +- " (on hard disks, this is usually harmless.)\n", +- geo->heads, geo->sectors); +- rv = 1; /* Suboptimal result */ +- } +- +-ok: +- /* If this is a loopback device, try to set the start */ +- if (!ioctl(devfd, LOOP_GET_STATUS64, &li64)) +- geo->start = li64.lo_offset >> SECTOR_SHIFT; +- else if (!ioctl(devfd, LOOP_GET_STATUS, &li)) +- geo->start = (unsigned int)li.lo_offset >> SECTOR_SHIFT; +- else if (!sysfs_get_offset(devfd, &geo->start)) { +- /* OK */ +- } +- +- return rv; +-} +- +-/* + * Query the device geometry and put it into the boot sector. + * Map the file and put the map in the boot sector and file. + * Stick the "current directory" inode number into the file. +@@ -231,11 +98,8 @@ ok: + static int patch_file_and_bootblock(int fd, const char *dir, int devfd) + { + struct stat dirst, xdst; +- struct hd_geometry geo; + sector_t *sectp; +- uint64_t totalbytes, totalsectors; + int nsect; +- struct fat_boot_sector *sbs; + char *dirpath, *subpath, *xdirpath; + int rv; + +@@ -279,33 +143,8 @@ static int patch_file_and_bootblock(int fd, const char *dir, int devfd) + /* Now subpath should contain the path relative to the fs base */ + dprintf("subpath = %s\n", subpath); + +- totalbytes = get_size(devfd); +- get_geometry(devfd, totalbytes, &geo); +- +- if (opt.heads) +- geo.heads = opt.heads; +- if (opt.sectors) +- geo.sectors = opt.sectors; +- +- /* Patch this into a fake FAT superblock. This isn't because +- FAT is a good format in any way, it's because it lets the +- early bootstrap share code with the FAT version. */ +- dprintf("heads = %u, sect = %u\n", geo.heads, geo.sectors); +- +- sbs = (struct fat_boot_sector *)syslinux_bootsect; +- +- totalsectors = totalbytes >> SECTOR_SHIFT; +- if (totalsectors >= 65536) { +- set_16(&sbs->bsSectors, 0); +- } else { +- set_16(&sbs->bsSectors, totalsectors); +- } +- set_32(&sbs->bsHugeSectors, totalsectors); +- +- set_16(&sbs->bsBytesPerSec, SECTOR_SIZE); +- set_16(&sbs->bsSecPerTrack, geo.sectors); +- set_16(&sbs->bsHeads, geo.heads); +- set_32(&sbs->bsHiddenSecs, geo.start); ++ /* Patch syslinux_bootsect */ ++ syslinux_patch_bootsect(devfd); + + /* Construct the boot file map */ + +diff --git a/libinstaller/syslinuxext.c b/libinstaller/syslinuxext.c +index bb54cef..5a4423b 100644 +--- a/libinstaller/syslinuxext.c ++++ b/libinstaller/syslinuxext.c +@@ -1,7 +1,177 @@ + #define _GNU_SOURCE + ++#include <sys/stat.h> ++#include <sys/types.h> ++#include <getopt.h> ++#include <ext2fs/ext2fs.h> ++ ++#include "linuxioctl.h" ++#include "syslinux.h" ++#include "syslxint.h" ++#include "syslxopt.h" ++ ++/* ++ * Get the size of a block device ++ */ ++static uint64_t get_size(int dev_fd) ++{ ++ uint64_t bytes; ++ uint32_t sects; ++ struct stat st; ++ ++#ifdef BLKGETSIZE64 ++ if (!ioctl(dev_fd, BLKGETSIZE64, &bytes)) ++ return bytes; ++#endif ++ if (!ioctl(dev_fd, BLKGETSIZE, §s)) ++ return (uint64_t) sects << 9; ++ else if (!fstat(dev_fd, &st) && st.st_size) ++ return st.st_size; ++ else ++ return 0; ++} ++ ++/* ++ * Get device geometry and partition offset ++ */ ++static struct geometry_table { ++ uint64_t bytes; ++ struct hd_geometry g; ++}; ++ ++static int sysfs_get_offset(int dev_fd, unsigned long *start) ++{ ++ struct stat st; ++ char sysfs_name[128]; ++ FILE *f; ++ int rv; ++ ++ if (fstat(dev_fd, &st)) ++ return -1; ++ ++ if ((size_t)snprintf(sysfs_name, sizeof sysfs_name, ++ "/sys/dev/block/%u:%u/start", ++ major(st.st_rdev), minor(st.st_rdev)) ++ >= sizeof sysfs_name) ++ return -1; ++ ++ f = fopen(sysfs_name, "r"); ++ if (!f) ++ return -1; ++ ++ rv = fscanf(f, "%lu", start); ++ fclose(f); ++ ++ return (rv == 1) ? 0 : -1; ++} ++ ++/* Standard floppy disk geometries, plus LS-120. Zipdisk geometry ++ (x/64/32) is the final fallback. I don't know what LS-240 has ++ as its geometry, since I don't have one and don't know anyone that does, ++ and Google wasn't helpful... */ ++static const struct geometry_table standard_geometries[] = { ++ {360 * 1024, {2, 9, 40, 0}}, ++ {720 * 1024, {2, 9, 80, 0}}, ++ {1200 * 1024, {2, 15, 80, 0}}, ++ {1440 * 1024, {2, 18, 80, 0}}, ++ {1680 * 1024, {2, 21, 80, 0}}, ++ {1722 * 1024, {2, 21, 80, 0}}, ++ {2880 * 1024, {2, 36, 80, 0}}, ++ {3840 * 1024, {2, 48, 80, 0}}, ++ {123264 * 1024, {8, 32, 963, 0}}, /* LS120 */ ++ {0, {0, 0, 0, 0}} ++}; ++ ++static int get_geometry(int dev_fd, uint64_t totalbytes, struct hd_geometry *geo) ++{ ++ struct floppy_struct fd_str; ++ struct loop_info li; ++ struct loop_info64 li64; ++ const struct geometry_table *gp; ++ int rv = 0; ++ ++ memset(geo, 0, sizeof *geo); ++ ++ if (!ioctl(dev_fd, HDIO_GETGEO, geo)) { ++ goto ok; ++ } else if (!ioctl(dev_fd, FDGETPRM, &fd_str)) { ++ geo->heads = fd_str.head; ++ geo->sectors = fd_str.sect; ++ geo->cylinders = fd_str.track; ++ geo->start = 0; ++ goto ok; ++ } ++ ++ /* Didn't work. Let's see if this is one of the standard geometries */ ++ for (gp = standard_geometries; gp->bytes; gp++) { ++ if (gp->bytes == totalbytes) { ++ memcpy(geo, &gp->g, sizeof *geo); ++ goto ok; ++ } ++ } ++ ++ /* Didn't work either... assign a geometry of 64 heads, 32 sectors; this is ++ what zipdisks use, so this would help if someone has a USB key that ++ they're booting in USB-ZIP mode. */ ++ ++ geo->heads = opt.heads ? : 64; ++ geo->sectors = opt.sectors ? : 32; ++ geo->cylinders = totalbytes / (geo->heads * geo->sectors << SECTOR_SHIFT); ++ geo->start = 0; ++ ++ if (!opt.sectors && !opt.heads) { ++ fprintf(stderr, ++ "Warning: unable to obtain device geometry (defaulting to %d heads, %d sectors)\n" ++ " (on hard disks, this is usually harmless.)\n", ++ geo->heads, geo->sectors); ++ rv = 1; /* Suboptimal result */ ++ } ++ ++ok: ++ /* If this is a loopback device, try to set the start */ ++ if (!ioctl(dev_fd, LOOP_GET_STATUS64, &li64)) ++ geo->start = li64.lo_offset >> SECTOR_SHIFT; ++ else if (!ioctl(dev_fd, LOOP_GET_STATUS, &li)) ++ geo->start = (unsigned int)li.lo_offset >> SECTOR_SHIFT; ++ else if (!sysfs_get_offset(dev_fd, &geo->start)) { ++ /* OK */ ++ } ++ ++ return rv; ++} ++ ++ + /* Patch syslinux_bootsect */ + void syslinux_patch_bootsect(int dev_fd) + { ++ uint64_t totalbytes, totalsectors; ++ struct hd_geometry geo; ++ struct fat_boot_sector *sbs; ++ ++ totalbytes = get_size(dev_fd); ++ get_geometry(dev_fd, totalbytes, &geo); ++ ++ if (opt.heads) ++ geo.heads = opt.heads; ++ if (opt.sectors) ++ geo.sectors = opt.sectors; ++ ++ /* Patch this into a fake FAT superblock. This isn't because ++ FAT is a good format in any way, it's because it lets the ++ early bootstrap share code with the FAT version. */ ++ sbs = (struct fat_boot_sector *)syslinux_bootsect; ++ ++ totalsectors = totalbytes >> SECTOR_SHIFT; ++ if (totalsectors >= 65536) { ++ set_16(&sbs->bsSectors, 0); ++ } else { ++ set_16(&sbs->bsSectors, totalsectors); ++ } ++ set_32(&sbs->bsHugeSectors, totalsectors); ++ ++ set_16(&sbs->bsBytesPerSec, SECTOR_SIZE); ++ set_16(&sbs->bsSecPerTrack, geo.sectors); ++ set_16(&sbs->bsHeads, geo.heads); ++ set_32(&sbs->bsHiddenSecs, geo.start); + } + +-- +1.9.1 + diff --git a/meta/recipes-devtools/syslinux/syslinux/0009-linux-syslinux-implement-install_bootblock.patch b/meta/recipes-devtools/syslinux/syslinux/0009-linux-syslinux-implement-install_bootblock.patch new file mode 100644 index 0000000000..cd89d92485 --- /dev/null +++ b/meta/recipes-devtools/syslinux/syslinux/0009-linux-syslinux-implement-install_bootblock.patch @@ -0,0 +1,50 @@ +From 76c465e87312dbc6cffd05427f1f4d2ebdee4f13 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Fri, 2 Jan 2015 12:28:35 +0800 +Subject: [PATCH 9/9] linux/syslinux: implement install_bootblock() + +Refer to the install_bootblock() in extlinux/main.c to make +linux/syslinux.c's install_bootblock() which only supports ext2/3/4. + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +Tested-by: Du Dolpher <dolpher.du@intel.com> +--- + linux/syslinux.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/linux/syslinux.c b/linux/syslinux.c +index c741750..917f83a 100755 +--- a/linux/syslinux.c ++++ b/linux/syslinux.c +@@ -419,6 +419,26 @@ static int ext_file_write(ext2_file_t e2_file, const void *buf, size_t count, + */ + int install_bootblock(int fd, const char *device) + { ++ struct ext2_super_block sb; ++ ++ if (xpread(fd, &sb, sizeof sb, EXT2_SUPER_OFFSET + opt.offset) != sizeof sb) { ++ perror("reading superblock"); ++ return 1; ++ } ++ ++ if (sb.s_magic != EXT2_SUPER_MAGIC) { ++ fprintf(stderr, ++ "no ext2/3/4 superblock found on %s\n", device); ++ return 1; ++ } ++ ++ if (xpwrite(fd, syslinux_bootsect, syslinux_bootsect_len, 0) ++ != (signed)syslinux_bootsect_len) { ++ perror("writing bootblock"); ++ return 1; ++ } ++ ++ return 0; + } + + /* The file's block count */ +-- +1.9.1 + diff --git a/meta/recipes-devtools/syslinux/files/syslinux-fix-parallel-building-issue.patch b/meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch index 6b695791cd..312b1e8aed 100644 --- a/meta/recipes-devtools/syslinux/files/syslinux-fix-parallel-building-issue.patch +++ b/meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch @@ -24,15 +24,12 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com> com32/Makefile | 1 + 1 file changed, 1 insertion(+) -diff --git a/com32/Makefile b/com32/Makefile -index 7ea1b01..9a1721b 100644 ---- a/com32/Makefile -+++ b/com32/Makefile -@@ -20,3 +20,4 @@ modules: lib libutil gpllib - rosh: lib libutil +Index: syslinux-6.03/com32/Makefile +=================================================================== +--- syslinux-6.03.orig/com32/Makefile ++++ syslinux-6.03/com32/Makefile +@@ -21,3 +21,4 @@ rosh: lib libutil samples: libutil elflink/ldlinux - sysdump: libupload gpllib + sysdump: lib libutil libupload gpllib + lua/src: cmenu modules +gpllib: lib --- -1.7.9.5 - diff --git a/meta/recipes-devtools/syslinux/files/syslinux-libupload-depend-lib.patch b/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch index c0714b5175..c0714b5175 100644 --- a/meta/recipes-devtools/syslinux/files/syslinux-libupload-depend-lib.patch +++ b/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch diff --git a/meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch b/meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch new file mode 100644 index 0000000000..7c003e165b --- /dev/null +++ b/meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch @@ -0,0 +1,17 @@ +This script try to call git submodule, since we are downloading +the tarball it seems in-correct to do this. + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Saul Wold <sgw@linux.intel.com> +Index: syslinux-6.03/efi/Makefile +=================================================================== +--- syslinux-6.03.orig/efi/Makefile ++++ syslinux-6.03/efi/Makefile +@@ -101,7 +101,6 @@ tidy dist: + rm -f *.so *.o wrapper + find . \( -name \*.o -o -name \*.a -o -name .\*.d -o -name \*.tmp \) -print0 | \ + xargs -0r rm -f +- $(topdir)/efi/clean-gnu-efi.sh $(EFI_SUBARCH) $(objdir) + + clean: tidy + diff --git a/meta/recipes-devtools/syslinux/syslinux_6.01.bb b/meta/recipes-devtools/syslinux/syslinux_6.03.bb index 20afae95da..33dd776f1b 100644 --- a/meta/recipes-devtools/syslinux/syslinux_6.01.bb +++ b/meta/recipes-devtools/syslinux/syslinux_6.03.bb @@ -6,20 +6,25 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ # If you really want to run syslinux, you need mtools. We just want the # ldlinux.* stuff for now, so skip mtools-native -DEPENDS = "nasm-native util-linux" +DEPENDS = "nasm-native util-linux e2fsprogs" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/6.xx/syslinux-${PV}.tar.bz2 \ - file://0001-movebits-Add-SMT_TERMINAL-a-last-resort-region-type.patch \ - file://0002-memscan-build-a-linked-list-of-memory-scanners.patch \ - file://0003-PXELINUX-Add-bios-memscan-function.patch \ - file://0004-pxe-use-bios_fbm-and-real_base_mem-to-calculate-free.patch \ +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/6.xx/syslinux-${PV}.tar.xz \ file://syslinux-fix-parallel-building-issue.patch \ - file://isohybrid-fix-overflow-on-32-bit-system.patch \ file://syslinux-libupload-depend-lib.patch \ + file://syslinux-remove-clean-script.patch \ + file://0001-linux-syslinux-support-ext2-3-4-device.patch \ + file://0002-linux-syslinux-implement-open_ext2_fs.patch \ + file://0003-linux-syslinux-implement-install_to_ext2.patch \ + file://0004-linux-syslinux-add-ext_file_read-and-ext_file_write.patch \ + file://0005-linux-syslinux-implement-handle_adv_on_ext.patch \ + file://0006-linux-syslinux-implement-write_to_ext-and-add-syslin.patch \ + file://0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch \ + file://0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch \ + file://0009-linux-syslinux-implement-install_bootblock.patch \ " -SRC_URI[md5sum] = "6945ee89e29119d459baed4937bbc534" -SRC_URI[sha256sum] = "83a04cf81e6a46b80ee5a321926eea095af3498b04317e3674b46c125c7a5b43" +SRC_URI[md5sum] = "92a253df9211e9c20172796ecf388f13" +SRC_URI[sha256sum] = "26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e" COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)' # Don't let the sanity checker trip on the 32 bit real mode BIOS binaries diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.1.bb b/meta/recipes-devtools/tcltk/tcl_8.6.3.bb index 27f73f2ce2..73c0d25567 100644 --- a/meta/recipes-devtools/tcltk/tcl_8.6.1.bb +++ b/meta/recipes-devtools/tcltk/tcl_8.6.3.bb @@ -24,8 +24,8 @@ SRC_URI = "${BASE_SRC_URI} \ file://alter-includedir.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "aae4b701ee527c6e4e1a6f9c7399882e" -SRC_URI[sha256sum] = "16ee769248e64ba1cae6b4834fcc4e4edd7470d881410e8d58f7dd1434343514" +SRC_URI[md5sum] = "db382feca91754b7f93da16dc4cdad1f" +SRC_URI[sha256sum] = "6ce0778de0d50daaa9c345d7c1fd1288fb658f674028812e7eeee992e3051005" SRC_URI_class-native = "${BASE_SRC_URI}" @@ -81,6 +81,7 @@ FILES_${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh" # isn't getting picked up by shlibs code RDEPENDS_${PN} += "tcl-lib" RDEPENDS_${PN}_class-native = "" +RDEPENDS_${PN}-ptest += "libgcc" BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/unifdef/files/unifdef.c b/meta/recipes-devtools/unifdef/files/unifdef.c deleted file mode 100644 index 5cbac15608..0000000000 --- a/meta/recipes-devtools/unifdef/files/unifdef.c +++ /dev/null @@ -1,1005 +0,0 @@ -/* - * Copyright (c) 2002 - 2005 Tony Finch <dot@dotat.at>. All rights reserved. - * - * This code is derived from software contributed to Berkeley by Dave Yost. - * It was rewritten to support ANSI C by Tony Finch. The original version of - * unifdef carried the following copyright notice. None of its code remains - * in this version (though some of the names remain). - * - * Copyright (c) 1985, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <sys/cdefs.h> - -#ifndef lint -#if 0 -static const char copyright[] = -"@(#) Copyright (c) 1985, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif -#ifdef __IDSTRING -__IDSTRING(Berkeley, "@(#)unifdef.c 8.1 (Berkeley) 6/6/93"); -__IDSTRING(NetBSD, "$NetBSD: unifdef.c,v 1.8 2000/07/03 02:51:36 matt Exp $"); -__IDSTRING(dotat, "$dotat: things/unifdef.c,v 1.171 2005/03/08 12:38:48 fanf2 Exp $"); -#endif -#endif /* not lint */ -#ifdef __FBSDID -__FBSDID("$FreeBSD: /repoman/r/ncvs/src/usr.bin/unifdef/unifdef.c,v 1.20 2005/05/21 09:55:09 ru Exp $"); -#endif - -/* - * unifdef - remove ifdef'ed lines - * - * Wishlist: - * provide an option which will append the name of the - * appropriate symbol after #else's and #endif's - * provide an option which will check symbols after - * #else's and #endif's to see that they match their - * corresponding #ifdef or #ifndef - * - * The first two items above require better buffer handling, which would - * also make it possible to handle all "dodgy" directives correctly. - */ - -#include <ctype.h> -#include <err.h> -#include <stdarg.h> -#include <stdbool.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -size_t strlcpy(char *dst, const char *src, size_t siz); - -/* types of input lines: */ -typedef enum { - LT_TRUEI, /* a true #if with ignore flag */ - LT_FALSEI, /* a false #if with ignore flag */ - LT_IF, /* an unknown #if */ - LT_TRUE, /* a true #if */ - LT_FALSE, /* a false #if */ - LT_ELIF, /* an unknown #elif */ - LT_ELTRUE, /* a true #elif */ - LT_ELFALSE, /* a false #elif */ - LT_ELSE, /* #else */ - LT_ENDIF, /* #endif */ - LT_DODGY, /* flag: directive is not on one line */ - LT_DODGY_LAST = LT_DODGY + LT_ENDIF, - LT_PLAIN, /* ordinary line */ - LT_EOF, /* end of file */ - LT_COUNT -} Linetype; - -static char const * const linetype_name[] = { - "TRUEI", "FALSEI", "IF", "TRUE", "FALSE", - "ELIF", "ELTRUE", "ELFALSE", "ELSE", "ENDIF", - "DODGY TRUEI", "DODGY FALSEI", - "DODGY IF", "DODGY TRUE", "DODGY FALSE", - "DODGY ELIF", "DODGY ELTRUE", "DODGY ELFALSE", - "DODGY ELSE", "DODGY ENDIF", - "PLAIN", "EOF" -}; - -/* state of #if processing */ -typedef enum { - IS_OUTSIDE, - IS_FALSE_PREFIX, /* false #if followed by false #elifs */ - IS_TRUE_PREFIX, /* first non-false #(el)if is true */ - IS_PASS_MIDDLE, /* first non-false #(el)if is unknown */ - IS_FALSE_MIDDLE, /* a false #elif after a pass state */ - IS_TRUE_MIDDLE, /* a true #elif after a pass state */ - IS_PASS_ELSE, /* an else after a pass state */ - IS_FALSE_ELSE, /* an else after a true state */ - IS_TRUE_ELSE, /* an else after only false states */ - IS_FALSE_TRAILER, /* #elifs after a true are false */ - IS_COUNT -} Ifstate; - -static char const * const ifstate_name[] = { - "OUTSIDE", "FALSE_PREFIX", "TRUE_PREFIX", - "PASS_MIDDLE", "FALSE_MIDDLE", "TRUE_MIDDLE", - "PASS_ELSE", "FALSE_ELSE", "TRUE_ELSE", - "FALSE_TRAILER" -}; - -/* state of comment parser */ -typedef enum { - NO_COMMENT = false, /* outside a comment */ - C_COMMENT, /* in a comment like this one */ - CXX_COMMENT, /* between // and end of line */ - STARTING_COMMENT, /* just after slash-backslash-newline */ - FINISHING_COMMENT, /* star-backslash-newline in a C comment */ - CHAR_LITERAL, /* inside '' */ - STRING_LITERAL /* inside "" */ -} Comment_state; - -static char const * const comment_name[] = { - "NO", "C", "CXX", "STARTING", "FINISHING", "CHAR", "STRING" -}; - -/* state of preprocessor line parser */ -typedef enum { - LS_START, /* only space and comments on this line */ - LS_HASH, /* only space, comments, and a hash */ - LS_DIRTY /* this line can't be a preprocessor line */ -} Line_state; - -static char const * const linestate_name[] = { - "START", "HASH", "DIRTY" -}; - -/* - * Minimum translation limits from ISO/IEC 9899:1999 5.2.4.1 - */ -#define MAXDEPTH 64 /* maximum #if nesting */ -#define MAXLINE 4096 /* maximum length of line */ -#define MAXSYMS 4096 /* maximum number of symbols */ - -/* - * Sometimes when editing a keyword the replacement text is longer, so - * we leave some space at the end of the tline buffer to accommodate this. - */ -#define EDITSLOP 10 - -/* - * Globals. - */ - -static bool complement; /* -c: do the complement */ -static bool debugging; /* -d: debugging reports */ -static bool iocccok; /* -e: fewer IOCCC errors */ -static bool killconsts; /* -k: eval constant #ifs */ -static bool lnblank; /* -l: blank deleted lines */ -static bool lnnum; /* -n: add #line directives */ -static bool symlist; /* -s: output symbol list */ -static bool text; /* -t: this is a text file */ - -static const char *symname[MAXSYMS]; /* symbol name */ -static const char *value[MAXSYMS]; /* -Dsym=value */ -static bool ignore[MAXSYMS]; /* -iDsym or -iUsym */ -static int nsyms; /* number of symbols */ - -static FILE *input; /* input file pointer */ -static const char *filename; /* input file name */ -static int linenum; /* current line number */ - -static char tline[MAXLINE+EDITSLOP];/* input buffer plus space */ -static char *keyword; /* used for editing #elif's */ - -static Comment_state incomment; /* comment parser state */ -static Line_state linestate; /* #if line parser state */ -static Ifstate ifstate[MAXDEPTH]; /* #if processor state */ -static bool ignoring[MAXDEPTH]; /* ignore comments state */ -static int stifline[MAXDEPTH]; /* start of current #if */ -static int depth; /* current #if nesting */ -static int delcount; /* count of deleted lines */ -static bool keepthis; /* don't delete constant #if */ - -static int exitstat; /* program exit status */ - -static void addsym(bool, bool, char *); -static void debug(const char *, ...); -static void done(void); -static void error(const char *); -static int findsym(const char *); -static void flushline(bool); -static Linetype getline34(void); -static Linetype ifeval(const char **); -static void ignoreoff(void); -static void ignoreon(void); -static void keywordedit(const char *); -static void nest(void); -static void process(void); -static const char *skipcomment(const char *); -static const char *skipsym(const char *); -static void state(Ifstate); -static int strlcmp(const char *, const char *, size_t); -static void unnest(void); -static void usage(void); - -#define endsym(c) (!isalpha((unsigned char)c) && !isdigit((unsigned char)c) && c != '_') - -/* - * The main program. - */ -int -main(int argc, char *argv[]) -{ - int opt; - - while ((opt = getopt(argc, argv, "i:D:U:I:cdeklnst")) != -1) - switch (opt) { - case 'i': /* treat stuff controlled by these symbols as text */ - /* - * For strict backwards-compatibility the U or D - * should be immediately after the -i but it doesn't - * matter much if we relax that requirement. - */ - opt = *optarg++; - if (opt == 'D') - addsym(true, true, optarg); - else if (opt == 'U') - addsym(true, false, optarg); - else - usage(); - break; - case 'D': /* define a symbol */ - addsym(false, true, optarg); - break; - case 'U': /* undef a symbol */ - addsym(false, false, optarg); - break; - case 'I': - /* no-op for compatibility with cpp */ - break; - case 'c': /* treat -D as -U and vice versa */ - complement = true; - break; - case 'd': - debugging = true; - break; - case 'e': /* fewer errors from dodgy lines */ - iocccok = true; - break; - case 'k': /* process constant #ifs */ - killconsts = true; - break; - case 'l': /* blank deleted lines instead of omitting them */ - lnblank = true; - break; - case 'n': /* add #line directive after deleted lines */ - lnnum = true; - break; - case 's': /* only output list of symbols that control #ifs */ - symlist = true; - break; - case 't': /* don't parse C comments */ - text = true; - break; - default: - usage(); - } - argc -= optind; - argv += optind; - if (argc > 1) { - errx(2, "can only do one file"); - } else if (argc == 1 && strcmp(*argv, "-") != 0) { - filename = *argv; - input = fopen(filename, "r"); - if (input == NULL) - err(2, "can't open %s", filename); - } else { - filename = "[stdin]"; - input = stdin; - } - process(); - abort(); /* bug */ -} - -static void -usage(void) -{ - fprintf(stderr, "usage: unifdef [-cdeklnst] [-Ipath]" - " [-Dsym[=val]] [-Usym] [-iDsym[=val]] [-iUsym] ... [file]\n"); - exit(2); -} - -/* - * A state transition function alters the global #if processing state - * in a particular way. The table below is indexed by the current - * processing state and the type of the current line. - * - * Nesting is handled by keeping a stack of states; some transition - * functions increase or decrease the depth. They also maintain the - * ignore state on a stack. In some complicated cases they have to - * alter the preprocessor directive, as follows. - * - * When we have processed a group that starts off with a known-false - * #if/#elif sequence (which has therefore been deleted) followed by a - * #elif that we don't understand and therefore must keep, we edit the - * latter into a #if to keep the nesting correct. - * - * When we find a true #elif in a group, the following block will - * always be kept and the rest of the sequence after the next #elif or - * #else will be discarded. We edit the #elif into a #else and the - * following directive to #endif since this has the desired behaviour. - * - * "Dodgy" directives are split across multiple lines, the most common - * example being a multi-line comment hanging off the right of the - * directive. We can handle them correctly only if there is no change - * from printing to dropping (or vice versa) caused by that directive. - * If the directive is the first of a group we have a choice between - * failing with an error, or passing it through unchanged instead of - * evaluating it. The latter is not the default to avoid questions from - * users about unifdef unexpectedly leaving behind preprocessor directives. - */ -typedef void state_fn(void); - -/* report an error */ -static void Eelif (void) { error("Inappropriate #elif"); } -static void Eelse (void) { error("Inappropriate #else"); } -static void Eendif(void) { error("Inappropriate #endif"); } -static void Eeof (void) { error("Premature EOF"); } -static void Eioccc(void) { error("Obfuscated preprocessor control line"); } -/* plain line handling */ -static void print (void) { flushline(true); } -static void drop (void) { flushline(false); } -/* output lacks group's start line */ -static void Strue (void) { drop(); ignoreoff(); state(IS_TRUE_PREFIX); } -static void Sfalse(void) { drop(); ignoreoff(); state(IS_FALSE_PREFIX); } -static void Selse (void) { drop(); state(IS_TRUE_ELSE); } -/* print/pass this block */ -static void Pelif (void) { print(); ignoreoff(); state(IS_PASS_MIDDLE); } -static void Pelse (void) { print(); state(IS_PASS_ELSE); } -static void Pendif(void) { print(); unnest(); } -/* discard this block */ -static void Dfalse(void) { drop(); ignoreoff(); state(IS_FALSE_TRAILER); } -static void Delif (void) { drop(); ignoreoff(); state(IS_FALSE_MIDDLE); } -static void Delse (void) { drop(); state(IS_FALSE_ELSE); } -static void Dendif(void) { drop(); unnest(); } -/* first line of group */ -static void Fdrop (void) { nest(); Dfalse(); } -static void Fpass (void) { nest(); Pelif(); } -static void Ftrue (void) { nest(); Strue(); } -static void Ffalse(void) { nest(); Sfalse(); } -/* variable pedantry for obfuscated lines */ -static void Oiffy (void) { if (!iocccok) Eioccc(); Fpass(); ignoreon(); } -static void Oif (void) { if (!iocccok) Eioccc(); Fpass(); } -static void Oelif (void) { if (!iocccok) Eioccc(); Pelif(); } -/* ignore comments in this block */ -static void Idrop (void) { Fdrop(); ignoreon(); } -static void Itrue (void) { Ftrue(); ignoreon(); } -static void Ifalse(void) { Ffalse(); ignoreon(); } -/* edit this line */ -static void Mpass (void) { strncpy(keyword, "if ", 4); Pelif(); } -static void Mtrue (void) { keywordedit("else\n"); state(IS_TRUE_MIDDLE); } -static void Melif (void) { keywordedit("endif\n"); state(IS_FALSE_TRAILER); } -static void Melse (void) { keywordedit("endif\n"); state(IS_FALSE_ELSE); } - -static state_fn * const trans_table[IS_COUNT][LT_COUNT] = { -/* IS_OUTSIDE */ -{ Itrue, Ifalse,Fpass, Ftrue, Ffalse,Eelif, Eelif, Eelif, Eelse, Eendif, - Oiffy, Oiffy, Fpass, Oif, Oif, Eelif, Eelif, Eelif, Eelse, Eendif, - print, done }, -/* IS_FALSE_PREFIX */ -{ Idrop, Idrop, Fdrop, Fdrop, Fdrop, Mpass, Strue, Sfalse,Selse, Dendif, - Idrop, Idrop, Fdrop, Fdrop, Fdrop, Mpass, Eioccc,Eioccc,Eioccc,Eioccc, - drop, Eeof }, -/* IS_TRUE_PREFIX */ -{ Itrue, Ifalse,Fpass, Ftrue, Ffalse,Dfalse,Dfalse,Dfalse,Delse, Dendif, - Oiffy, Oiffy, Fpass, Oif, Oif, Eioccc,Eioccc,Eioccc,Eioccc,Eioccc, - print, Eeof }, -/* IS_PASS_MIDDLE */ -{ Itrue, Ifalse,Fpass, Ftrue, Ffalse,Pelif, Mtrue, Delif, Pelse, Pendif, - Oiffy, Oiffy, Fpass, Oif, Oif, Pelif, Oelif, Oelif, Pelse, Pendif, - print, Eeof }, -/* IS_FALSE_MIDDLE */ -{ Idrop, Idrop, Fdrop, Fdrop, Fdrop, Pelif, Mtrue, Delif, Pelse, Pendif, - Idrop, Idrop, Fdrop, Fdrop, Fdrop, Eioccc,Eioccc,Eioccc,Eioccc,Eioccc, - drop, Eeof }, -/* IS_TRUE_MIDDLE */ -{ Itrue, Ifalse,Fpass, Ftrue, Ffalse,Melif, Melif, Melif, Melse, Pendif, - Oiffy, Oiffy, Fpass, Oif, Oif, Eioccc,Eioccc,Eioccc,Eioccc,Pendif, - print, Eeof }, -/* IS_PASS_ELSE */ -{ Itrue, Ifalse,Fpass, Ftrue, Ffalse,Eelif, Eelif, Eelif, Eelse, Pendif, - Oiffy, Oiffy, Fpass, Oif, Oif, Eelif, Eelif, Eelif, Eelse, Pendif, - print, Eeof }, -/* IS_FALSE_ELSE */ -{ Idrop, Idrop, Fdrop, Fdrop, Fdrop, Eelif, Eelif, Eelif, Eelse, Dendif, - Idrop, Idrop, Fdrop, Fdrop, Fdrop, Eelif, Eelif, Eelif, Eelse, Eioccc, - drop, Eeof }, -/* IS_TRUE_ELSE */ -{ Itrue, Ifalse,Fpass, Ftrue, Ffalse,Eelif, Eelif, Eelif, Eelse, Dendif, - Oiffy, Oiffy, Fpass, Oif, Oif, Eelif, Eelif, Eelif, Eelse, Eioccc, - print, Eeof }, -/* IS_FALSE_TRAILER */ -{ Idrop, Idrop, Fdrop, Fdrop, Fdrop, Dfalse,Dfalse,Dfalse,Delse, Dendif, - Idrop, Idrop, Fdrop, Fdrop, Fdrop, Dfalse,Dfalse,Dfalse,Delse, Eioccc, - drop, Eeof } -/*TRUEI FALSEI IF TRUE FALSE ELIF ELTRUE ELFALSE ELSE ENDIF - TRUEI FALSEI IF TRUE FALSE ELIF ELTRUE ELFALSE ELSE ENDIF (DODGY) - PLAIN EOF */ -}; - -/* - * State machine utility functions - */ -static void -done(void) -{ - if (incomment) - error("EOF in comment"); - exit(exitstat); -} -static void -ignoreoff(void) -{ - if (depth == 0) - abort(); /* bug */ - ignoring[depth] = ignoring[depth-1]; -} -static void -ignoreon(void) -{ - ignoring[depth] = true; -} -static void -keywordedit(const char *replacement) -{ - size_t size = tline + sizeof(tline) - keyword; - char *dst = keyword; - const char *src = replacement; - if (size != 0) { - while ((--size != 0) && (*src != '\0')) - *dst++ = *src++; - *dst = '\0'; - } - print(); -} -static void -nest(void) -{ - depth += 1; - if (depth >= MAXDEPTH) - error("Too many levels of nesting"); - stifline[depth] = linenum; -} -static void -unnest(void) -{ - if (depth == 0) - abort(); /* bug */ - depth -= 1; -} -static void -state(Ifstate is) -{ - ifstate[depth] = is; -} - -/* - * Write a line to the output or not, according to command line options. - */ -static void -flushline(bool keep) -{ - if (symlist) - return; - if (keep ^ complement) { - if (lnnum && delcount > 0) - printf("#line %d\n", linenum); - fputs(tline, stdout); - delcount = 0; - } else { - if (lnblank) - putc('\n', stdout); - exitstat = 1; - delcount += 1; - } -} - -/* - * The driver for the state machine. - */ -static void -process(void) -{ - Linetype lineval; - - for (;;) { - linenum++; - lineval = getline34(); - trans_table[ifstate[depth]][lineval](); - debug("process %s -> %s depth %d", - linetype_name[lineval], - ifstate_name[ifstate[depth]], depth); - } -} - -/* - * Parse a line and determine its type. We keep the preprocessor line - * parser state between calls in the global variable linestate, with - * help from skipcomment(). - */ -static Linetype -getline34(void) -{ - const char *cp; - int cursym; - int kwlen; - Linetype retval; - Comment_state wascomment; - - if (fgets(tline, MAXLINE, input) == NULL) - return (LT_EOF); - retval = LT_PLAIN; - wascomment = incomment; - cp = skipcomment(tline); - if (linestate == LS_START) { - if (*cp == '#') { - linestate = LS_HASH; - cp = skipcomment(cp + 1); - } else if (*cp != '\0') - linestate = LS_DIRTY; - } - if (!incomment && linestate == LS_HASH) { - keyword = tline + (cp - tline); - cp = skipsym(cp); - kwlen = cp - keyword; - /* no way can we deal with a continuation inside a keyword */ - if (strncmp(cp, "\\\n", 2) == 0) - Eioccc(); - if (strlcmp("ifdef", keyword, kwlen) == 0 || - strlcmp("ifndef", keyword, kwlen) == 0) { - cp = skipcomment(cp); - if ((cursym = findsym(cp)) < 0) - retval = LT_IF; - else { - retval = (keyword[2] == 'n') - ? LT_FALSE : LT_TRUE; - if (value[cursym] == NULL) - retval = (retval == LT_TRUE) - ? LT_FALSE : LT_TRUE; - if (ignore[cursym]) - retval = (retval == LT_TRUE) - ? LT_TRUEI : LT_FALSEI; - } - cp = skipsym(cp); - } else if (strlcmp("if", keyword, kwlen) == 0) - retval = ifeval(&cp); - else if (strlcmp("elif", keyword, kwlen) == 0) - retval = ifeval(&cp) - LT_IF + LT_ELIF; - else if (strlcmp("else", keyword, kwlen) == 0) - retval = LT_ELSE; - else if (strlcmp("endif", keyword, kwlen) == 0) - retval = LT_ENDIF; - else { - linestate = LS_DIRTY; - retval = LT_PLAIN; - } - cp = skipcomment(cp); - if (*cp != '\0') { - linestate = LS_DIRTY; - if (retval == LT_TRUE || retval == LT_FALSE || - retval == LT_TRUEI || retval == LT_FALSEI) - retval = LT_IF; - if (retval == LT_ELTRUE || retval == LT_ELFALSE) - retval = LT_ELIF; - } - if (retval != LT_PLAIN && (wascomment || incomment)) { - retval += LT_DODGY; - if (incomment) - linestate = LS_DIRTY; - } - /* skipcomment should have changed the state */ - if (linestate == LS_HASH) - abort(); /* bug */ - } - if (linestate == LS_DIRTY) { - while (*cp != '\0') - cp = skipcomment(cp + 1); - } - debug("parser %s comment %s line", - comment_name[incomment], linestate_name[linestate]); - return (retval); -} - -/* - * These are the binary operators that are supported by the expression - * evaluator. Note that if support for division is added then we also - * need short-circuiting booleans because of divide-by-zero. - */ -static int op_lt(int a, int b) { return (a < b); } -static int op_gt(int a, int b) { return (a > b); } -static int op_le(int a, int b) { return (a <= b); } -static int op_ge(int a, int b) { return (a >= b); } -static int op_eq(int a, int b) { return (a == b); } -static int op_ne(int a, int b) { return (a != b); } -static int op_or(int a, int b) { return (a || b); } -static int op_and(int a, int b) { return (a && b); } - -/* - * An evaluation function takes three arguments, as follows: (1) a pointer to - * an element of the precedence table which lists the operators at the current - * level of precedence; (2) a pointer to an integer which will receive the - * value of the expression; and (3) a pointer to a char* that points to the - * expression to be evaluated and that is updated to the end of the expression - * when evaluation is complete. The function returns LT_FALSE if the value of - * the expression is zero, LT_TRUE if it is non-zero, or LT_IF if the - * expression could not be evaluated. - */ -struct ops; - -typedef Linetype eval_fn(const struct ops *, int *, const char **); - -static eval_fn eval_table, eval_unary; - -/* - * The precedence table. Expressions involving binary operators are evaluated - * in a table-driven way by eval_table. When it evaluates a subexpression it - * calls the inner function with its first argument pointing to the next - * element of the table. Innermost expressions have special non-table-driven - * handling. - */ -static const struct ops { - eval_fn *inner; - struct op { - const char *str; - int (*fn)(int, int); - } op[5]; -} eval_ops[] = { - { eval_table, { { "||", op_or } } }, - { eval_table, { { "&&", op_and } } }, - { eval_table, { { "==", op_eq }, - { "!=", op_ne } } }, - { eval_unary, { { "<=", op_le }, - { ">=", op_ge }, - { "<", op_lt }, - { ">", op_gt } } } -}; - -/* - * Function for evaluating the innermost parts of expressions, - * viz. !expr (expr) defined(symbol) symbol number - * We reset the keepthis flag when we find a non-constant subexpression. - */ -static Linetype -eval_unary(const struct ops *ops, int *valp, const char **cpp) -{ - const char *cp; - char *ep; - int sym; - - cp = skipcomment(*cpp); - if (*cp == '!') { - debug("eval%d !", ops - eval_ops); - cp++; - if (eval_unary(ops, valp, &cp) == LT_IF) - return (LT_IF); - *valp = !*valp; - } else if (*cp == '(') { - cp++; - debug("eval%d (", ops - eval_ops); - if (eval_table(eval_ops, valp, &cp) == LT_IF) - return (LT_IF); - cp = skipcomment(cp); - if (*cp++ != ')') - return (LT_IF); - } else if (isdigit((unsigned char)*cp)) { - debug("eval%d number", ops - eval_ops); - *valp = strtol(cp, &ep, 0); - cp = skipsym(cp); - } else if (strncmp(cp, "defined", 7) == 0 && endsym(cp[7])) { - cp = skipcomment(cp+7); - debug("eval%d defined", ops - eval_ops); - if (*cp++ != '(') - return (LT_IF); - cp = skipcomment(cp); - sym = findsym(cp); - if (sym < 0) - return (LT_IF); - *valp = (value[sym] != NULL); - cp = skipsym(cp); - cp = skipcomment(cp); - if (*cp++ != ')') - return (LT_IF); - keepthis = false; - } else if (!endsym(*cp)) { - debug("eval%d symbol", ops - eval_ops); - sym = findsym(cp); - if (sym < 0) - return (LT_IF); - if (value[sym] == NULL) - *valp = 0; - else { - *valp = strtol(value[sym], &ep, 0); - if (*ep != '\0' || ep == value[sym]) - return (LT_IF); - } - cp = skipsym(cp); - keepthis = false; - } else { - debug("eval%d bad expr", ops - eval_ops); - return (LT_IF); - } - - *cpp = cp; - debug("eval%d = %d", ops - eval_ops, *valp); - return (*valp ? LT_TRUE : LT_FALSE); -} - -/* - * Table-driven evaluation of binary operators. - */ -static Linetype -eval_table(const struct ops *ops, int *valp, const char **cpp) -{ - const struct op *op; - const char *cp; - int val; - - debug("eval%d", ops - eval_ops); - cp = *cpp; - if (ops->inner(ops+1, valp, &cp) == LT_IF) - return (LT_IF); - for (;;) { - cp = skipcomment(cp); - for (op = ops->op; op->str != NULL; op++) - if (strncmp(cp, op->str, strlen(op->str)) == 0) - break; - if (op->str == NULL) - break; - cp += strlen(op->str); - debug("eval%d %s", ops - eval_ops, op->str); - if (ops->inner(ops+1, &val, &cp) == LT_IF) - return (LT_IF); - *valp = op->fn(*valp, val); - } - - *cpp = cp; - debug("eval%d = %d", ops - eval_ops, *valp); - return (*valp ? LT_TRUE : LT_FALSE); -} - -/* - * Evaluate the expression on a #if or #elif line. If we can work out - * the result we return LT_TRUE or LT_FALSE accordingly, otherwise we - * return just a generic LT_IF. - */ -static Linetype -ifeval(const char **cpp) -{ - int ret; - int val; - - debug("eval %s", *cpp); - keepthis = killconsts ? false : true; - ret = eval_table(eval_ops, &val, cpp); - debug("eval = %d", val); - return (keepthis ? LT_IF : ret); -} - -/* - * Skip over comments, strings, and character literals and stop at the - * next character position that is not whitespace. Between calls we keep - * the comment state in the global variable incomment, and we also adjust - * the global variable linestate when we see a newline. - * XXX: doesn't cope with the buffer splitting inside a state transition. - */ -static const char * -skipcomment(const char *cp) -{ - if (text || ignoring[depth]) { - for (; isspace((unsigned char)*cp); cp++) - if (*cp == '\n') - linestate = LS_START; - return (cp); - } - while (*cp != '\0') - /* don't reset to LS_START after a line continuation */ - if (strncmp(cp, "\\\n", 2) == 0) - cp += 2; - else switch (incomment) { - case NO_COMMENT: - if (strncmp(cp, "/\\\n", 3) == 0) { - incomment = STARTING_COMMENT; - cp += 3; - } else if (strncmp(cp, "/*", 2) == 0) { - incomment = C_COMMENT; - cp += 2; - } else if (strncmp(cp, "//", 2) == 0) { - incomment = CXX_COMMENT; - cp += 2; - } else if (strncmp(cp, "\'", 1) == 0) { - incomment = CHAR_LITERAL; - linestate = LS_DIRTY; - cp += 1; - } else if (strncmp(cp, "\"", 1) == 0) { - incomment = STRING_LITERAL; - linestate = LS_DIRTY; - cp += 1; - } else if (strncmp(cp, "\n", 1) == 0) { - linestate = LS_START; - cp += 1; - } else if (strchr(" \t", *cp) != NULL) { - cp += 1; - } else - return (cp); - continue; - case CXX_COMMENT: - if (strncmp(cp, "\n", 1) == 0) { - incomment = NO_COMMENT; - linestate = LS_START; - } - cp += 1; - continue; - case CHAR_LITERAL: - case STRING_LITERAL: - if ((incomment == CHAR_LITERAL && cp[0] == '\'') || - (incomment == STRING_LITERAL && cp[0] == '\"')) { - incomment = NO_COMMENT; - cp += 1; - } else if (cp[0] == '\\') { - if (cp[1] == '\0') - cp += 1; - else - cp += 2; - } else if (strncmp(cp, "\n", 1) == 0) { - if (incomment == CHAR_LITERAL) - error("unterminated char literal"); - else - error("unterminated string literal"); - } else - cp += 1; - continue; - case C_COMMENT: - if (strncmp(cp, "*\\\n", 3) == 0) { - incomment = FINISHING_COMMENT; - cp += 3; - } else if (strncmp(cp, "*/", 2) == 0) { - incomment = NO_COMMENT; - cp += 2; - } else - cp += 1; - continue; - case STARTING_COMMENT: - if (*cp == '*') { - incomment = C_COMMENT; - cp += 1; - } else if (*cp == '/') { - incomment = CXX_COMMENT; - cp += 1; - } else { - incomment = NO_COMMENT; - linestate = LS_DIRTY; - } - continue; - case FINISHING_COMMENT: - if (*cp == '/') { - incomment = NO_COMMENT; - cp += 1; - } else - incomment = C_COMMENT; - continue; - default: - abort(); /* bug */ - } - return (cp); -} - -/* - * Skip over an identifier. - */ -static const char * -skipsym(const char *cp) -{ - while (!endsym(*cp)) - ++cp; - return (cp); -} - -/* - * Look for the symbol in the symbol table. If is is found, we return - * the symbol table index, else we return -1. - */ -static int -findsym(const char *str) -{ - const char *cp; - int symind; - - cp = skipsym(str); - if (cp == str) - return (-1); - if (symlist) { - printf("%.*s\n", (int)(cp-str), str); - /* we don't care about the value of the symbol */ - return (0); - } - for (symind = 0; symind < nsyms; ++symind) { - if (strlcmp(symname[symind], str, cp-str) == 0) { - debug("findsym %s %s", symname[symind], - value[symind] ? value[symind] : ""); - return (symind); - } - } - return (-1); -} - -/* - * Add a symbol to the symbol table. - */ -static void -addsym(bool ignorethis, bool definethis, char *sym) -{ - int symind; - char *val; - - symind = findsym(sym); - if (symind < 0) { - if (nsyms >= MAXSYMS) - errx(2, "too many symbols"); - symind = nsyms++; - } - symname[symind] = sym; - ignore[symind] = ignorethis; - val = sym + (skipsym(sym) - sym); - if (definethis) { - if (*val == '=') { - value[symind] = val+1; - *val = '\0'; - } else if (*val == '\0') - value[symind] = ""; - else - usage(); - } else { - if (*val != '\0') - usage(); - value[symind] = NULL; - } -} - -/* - * Compare s with n characters of t. - * The same as strncmp() except that it checks that s[n] == '\0'. - */ -static int -strlcmp(const char *s, const char *t, size_t n) -{ - while (n-- && *t != '\0') - if (*s != *t) - return ((unsigned char)*s - (unsigned char)*t); - else - ++s, ++t; - return ((unsigned char)*s); -} - -/* - * Diagnostics. - */ -static void -debug(const char *msg, ...) -{ - va_list ap; - - if (debugging) { - va_start(ap, msg); - vwarnx(msg, ap); - va_end(ap); - } -} - -static void -error(const char *msg) -{ - if (depth == 0) - warnx("%s: %d: %s", filename, linenum, msg); - else - warnx("%s: %d: %s (#if line %d depth %d)", - filename, linenum, msg, stifline[depth], depth); - errx(2, "output may be truncated"); -} diff --git a/meta/recipes-devtools/unifdef/unifdef-native_2.6.18+git.bb b/meta/recipes-devtools/unifdef/unifdef-native_2.6.18+git.bb deleted file mode 100644 index 9a28684236..0000000000 --- a/meta/recipes-devtools/unifdef/unifdef-native_2.6.18+git.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Kernel header preprocessor" -SECTION = "devel" -LICENSE = "BSD-2-Clause" - -PR = "r1" - -LIC_FILES_CHKSUM = "file://${WORKDIR}/unifdef.c;endline=32;md5=1a33f5c39aa718a89058721df61979bd" - -SRC_URI = "file://unifdef.c" - -inherit native - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -o unifdef ${WORKDIR}/unifdef.c -} - -do_install() { - install -d ${D}${bindir} - install -m 0755 unifdef ${D}${bindir} -} - diff --git a/meta/recipes-devtools/unifdef/unifdef_2.10.bb b/meta/recipes-devtools/unifdef/unifdef_2.10.bb new file mode 100644 index 0000000000..b8a0079840 --- /dev/null +++ b/meta/recipes-devtools/unifdef/unifdef_2.10.bb @@ -0,0 +1,15 @@ +SUMMARY = "Selectively remove #ifdef statements from sources" +SECTION = "devel" +LICENSE = "BSD-2-Clause" + +LIC_FILES_CHKSUM = "file://unifdef.c;endline=32;md5=2cc23f0382a6f560f6a9ecf4e040c0da" + +SRC_URI = "http://dotat.at/prog/${BPN}/${BP}.tar.xz" +SRC_URI[md5sum] = "bb5d895e5ebbba5c5cc0c2771cf97ebe" +SRC_URI[sha256sum] = "3b9b2b6b1952e9b9c1b9f734edec270689a35bdbf33ae66b50e19b2ed0d2df06" + +do_install() { + oe_runmake install DESTDIR=${D} prefix=${prefix} +} + +BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc index 64e7daffe1..63056fde4c 100644 --- a/meta/recipes-devtools/vala/vala.inc +++ b/meta/recipes-devtools/vala/vala.inc @@ -7,14 +7,12 @@ BBCLASSEXTEND = "native" HOMEPAGE = "http://vala-project.org" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -INC_PR = "r1" SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz" -inherit autotools-brokensep pkgconfig - -EXTRA_OECONF = "--disable-vapigen" +inherit autotools pkgconfig +FILES_${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi ${libdir}/${BPN}-${SHRT_VER}/" FILES_${PN}-doc += "${datadir}/devhelp" -FILES_${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi" +FILES_${PN}-dbg += "${libdir}/${BPN}-${SHRT_VER}/.debug" diff --git a/meta/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch b/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch index e6c7941a77..ac9dc8c83a 100644 --- a/meta/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch +++ b/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch @@ -7,6 +7,8 @@ Subject: [PATCH] git-version-gen: don't append -dirty if we're not in git * for example if we have some dirty directory and we unpack clean vala tarball in it, then it will append -dirty Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +Upstream-Status: Inappropriate [OE-Specific] --- build-aux/git-version-gen | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/meta/recipes-devtools/vala/vala_0.16.0.bb b/meta/recipes-devtools/vala/vala_0.16.0.bb deleted file mode 100644 index 92120b4a36..0000000000 --- a/meta/recipes-devtools/vala/vala_0.16.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require ${BPN}.inc - -PR = "${INC_PR}.1" - -SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch" - -SRC_URI[md5sum] = "84b742e9cca4c90fde3026c3793c03c1" -SRC_URI[sha256sum] = "3adb37aa2b35e2e2daed47552e85dbcbf752c0f7768b269d856993620073a657" diff --git a/meta/recipes-devtools/vala/vala_0.26.1.bb b/meta/recipes-devtools/vala/vala_0.26.1.bb new file mode 100644 index 0000000000..3df9cd4bae --- /dev/null +++ b/meta/recipes-devtools/vala/vala_0.26.1.bb @@ -0,0 +1,6 @@ +require ${BPN}.inc + +SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch" + +SRC_URI[md5sum] = "723a03b822d4cc47abc4019685970a3e" +SRC_URI[sha256sum] = "8407abb19ab3a58bbfc0d288abb47666ef81f76d0540258c03965e7545f59e6b" diff --git a/meta/recipes-devtools/valgrind/valgrind/enable.building.on.4.x.kernel.patch b/meta/recipes-devtools/valgrind/valgrind/enable.building.on.4.x.kernel.patch new file mode 100644 index 0000000000..300f2f19fa --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/enable.building.on.4.x.kernel.patch @@ -0,0 +1,37 @@ +Enable building valgrind on host with 4.x kernel. + +For OpenEmbedded builds we should be checking something like +OLDEST_KERNEL instead of `uname -r`, but this is good enough for now. + +Building on 4.x* currently fails with: + configure:5556: checking for the kernel version + configure:5579: result: unsupported (4.0.0-rc3-00111-gaffb817) + configure:5581: error: Valgrind works on kernels 2.4, 2.6 + +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +--- valgrind-3.9.0/configure.ac.orig 2015-03-13 19:17:01.247310868 +0100 ++++ valgrind-3.9.0/configure.ac 2015-03-13 19:19:27.388316108 +0100 +@@ -276,9 +276,9 @@ + kernel=`uname -r` + + case "${kernel}" in +- 2.6.*|3.*) +- AC_MSG_RESULT([2.6.x/3.x family (${kernel})]) +- AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x]) ++ 2.6.*|3.*|4.*) ++ AC_MSG_RESULT([2.6.x/3.x/4.x family (${kernel})]) ++ AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x or Linux 4.x]) + ;; + + 2.4.*) +@@ -288,7 +288,7 @@ + + *) + AC_MSG_RESULT([unsupported (${kernel})]) +- AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6]) ++ AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6, 3.x, 4.x]) + ;; + esac + diff --git a/meta/recipes-devtools/valgrind/valgrind/glibc-2.20.patch b/meta/recipes-devtools/valgrind/valgrind/glibc.patch index fab4044d17..8b902ddbff 100644 --- a/meta/recipes-devtools/valgrind/valgrind/glibc-2.20.patch +++ b/meta/recipes-devtools/valgrind/valgrind/glibc.patch @@ -1,4 +1,4 @@ -Backport of glibc 2.19 and 2.20 support. +Backport of glibc 2.19 and 2.20 and 2.21 support. Upstream-Status: Backport Signed-off-by: Ross Burton <ross.burton@intel.com> @@ -7,7 +7,7 @@ diff --git a/configure.ac b/configure.ac index 229ab98..1c18108 100644 --- a/configure.ac +++ b/configure.ac -@@ -918,6 +918,20 @@ case "${GLIBC_VERSION}" in +@@ -918,6 +918,27 @@ case "${GLIBC_VERSION}" in DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ;; @@ -25,6 +25,13 @@ index 229ab98..1c18108 100644 + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.21) ++ AC_MSG_RESULT(2.21 family) ++ AC_DEFINE([GLIBC_2_21], 1, [Define to 1 if you're using glibc 2.21.x]) ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; darwin) AC_MSG_RESULT(Darwin) AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) diff --git a/meta/recipes-devtools/valgrind/valgrind/remove-arm-variant-specific.patch b/meta/recipes-devtools/valgrind/valgrind/remove-arm-variant-specific.patch index 46dea60eb3..f84bf9ae9a 100644 --- a/meta/recipes-devtools/valgrind/valgrind/remove-arm-variant-specific.patch +++ b/meta/recipes-devtools/valgrind/valgrind/remove-arm-variant-specific.patch @@ -8,13 +8,13 @@ Upstream-Status: Pending Signed-off-by: Dave Lerner <dave.lerner@windriver.com> -diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am -index 2a19f5b..ccdeb77 100644 ---- a/none/tests/arm/Makefile.am -+++ b/none/tests/arm/Makefile.am -@@ -16,15 +16,16 @@ EXTRA_DIST = \ - vcvt_fixed_float_VFP.vgtest \ - vfp.stdout.exp vfp.stderr.exp vfp.vgtest +Index: valgrind-3.10.0/none/tests/arm/Makefile.am +=================================================================== +--- valgrind-3.10.0.orig/none/tests/arm/Makefile.am ++++ valgrind-3.10.0/none/tests/arm/Makefile.am +@@ -17,15 +17,16 @@ EXTRA_DIST = \ + vfp.stdout.exp vfp.stderr.exp vfp.vgtest \ + vfpv4_fma.stdout.exp vfpv4_fma.stderr.exp vfpv4_fma.vgtest +# For yocto: +# Only include tests that don't require Thumb. @@ -31,8 +31,8 @@ index 2a19f5b..ccdeb77 100644 - v6intThumb \ v6media \ vcvt_fixed_float_VFP \ - vfp -@@ -34,32 +35,3 @@ AM_CXXFLAGS += @FLAG_M32@ + vfp \ +@@ -36,34 +37,3 @@ AM_CXXFLAGS += @FLAG_M32@ AM_CCASFLAGS += @FLAG_M32@ allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@ @@ -65,3 +65,5 @@ index 2a19f5b..ccdeb77 100644 -intdiv_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a15 -mthumb -ldrt_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mthumb -ldrt_arm_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -marm +- +-vfpv4_fma_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a15 -mfpu=vfpv4 -marm diff --git a/meta/recipes-devtools/valgrind/valgrind/remove-ppc-tests-failing-build.patch b/meta/recipes-devtools/valgrind/valgrind/remove-ppc-tests-failing-build.patch index 2a14e1852c..1c640ffb71 100644 --- a/meta/recipes-devtools/valgrind/valgrind/remove-ppc-tests-failing-build.patch +++ b/meta/recipes-devtools/valgrind/valgrind/remove-ppc-tests-failing-build.patch @@ -36,10 +36,10 @@ Upstream-Status: Pending Signed-off-by: Dave Lerner <dave.lerner@windriver.com> -diff --git a/memcheck/tests/ppc32/Makefile.am b/memcheck/tests/ppc32/Makefile.am -index bd70eea..1436e8e 100644 ---- a/memcheck/tests/ppc32/Makefile.am -+++ b/memcheck/tests/ppc32/Makefile.am +Index: valgrind-3.10.0/memcheck/tests/ppc32/Makefile.am +=================================================================== +--- valgrind-3.10.0.orig/memcheck/tests/ppc32/Makefile.am ++++ valgrind-3.10.0/memcheck/tests/ppc32/Makefile.am @@ -7,8 +7,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ power_ISA2_05.stderr.exp power_ISA2_05.stdout.exp power_ISA2_05.vgtest \ power_ISA2_05.stdout.exp_Without_FPPO @@ -50,11 +50,11 @@ index bd70eea..1436e8e 100644 power_ISA2_05_CFLAGS = $(AM_CFLAGS) $(WERROR) -Winline -Wall -Wshadow -g \ -I$(top_srcdir)/include @FLAG_M32@ -diff --git a/none/tests/ppc32/Makefile.am b/none/tests/ppc32/Makefile.am -index 4f581b6..91ce7e7 100644 ---- a/none/tests/ppc32/Makefile.am -+++ b/none/tests/ppc32/Makefile.am -@@ -50,16 +50,8 @@ check_PROGRAMS = \ +Index: valgrind-3.10.0/none/tests/ppc32/Makefile.am +=================================================================== +--- valgrind-3.10.0.orig/none/tests/ppc32/Makefile.am ++++ valgrind-3.10.0/none/tests/ppc32/Makefile.am +@@ -52,16 +52,8 @@ check_PROGRAMS = \ allexec \ bug129390-ppc32 \ bug139050-ppc32 \ @@ -67,9 +67,9 @@ index 4f581b6..91ce7e7 100644 - test_isa_2_07_part1 \ - test_isa_2_07_part2 \ - test_tm \ -- test_touch_tm +- test_touch_tm \ + ldstrev lsw mftocrf mcrfs test_fx test_gx \ -+ twi tw xlc_dbl_u32 power6_bcmp ++ twi tw xlc_dbl_u32 power6_bcmp \ + ldst_multiple \ + data-cache-instructions - AM_CFLAGS += @FLAG_M32@ - AM_CXXFLAGS += @FLAG_M32@ diff --git a/meta/recipes-devtools/valgrind/valgrind/valgrind-remove-rpath.patch b/meta/recipes-devtools/valgrind/valgrind/valgrind-remove-rpath.patch new file mode 100644 index 0000000000..07a272633e --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/valgrind-remove-rpath.patch @@ -0,0 +1,25 @@ + +Upstream-Status: Inapporpiate [embedded config] +Signed-off-by: Saul Wold <sgw@linux.intel.com> + +Index: valgrind-3.10.0/none/tests/Makefile.am +=================================================================== +--- valgrind-3.10.0.orig/none/tests/Makefile.am ++++ valgrind-3.10.0/none/tests/Makefile.am +@@ -280,7 +280,6 @@ threaded_fork_LDADD = -lpthread + threadederrno_LDADD = -lpthread + tls_SOURCES = tls.c tls2.c + tls_DEPENDENCIES = tls.so tls2.so +-tls_LDFLAGS = -Wl,-rpath,$(abs_top_builddir)/none/tests + tls_LDADD = tls.so tls2.so -lpthread + tls_so_SOURCES = tls_so.c + tls_so_DEPENDENCIES = tls2.so +@@ -288,7 +287,7 @@ if VGCONF_OS_IS_DARWIN + tls_so_LDFLAGS = -dynamic -dynamiclib -all_load -fpic + tls_so_LDADD = `pwd`/tls2.so + else +- tls_so_LDFLAGS = -Wl,-rpath,$(abs_top_builddir)/none/tests -shared -fPIC ++ tls_so_LDFLAGS = -shared -fPIC + tls_so_LDADD = tls2.so + endif + tls_so_CFLAGS = $(AM_CFLAGS) -fPIC diff --git a/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb index c415e773a8..bf80b165af 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb @@ -8,25 +8,28 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \ file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215" X11DEPENDS = "virtual/libx11" -DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" -PR = "r8" +DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'boost', '', d)} \ + " SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ file://fixed-perl-path.patch \ file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ file://sepbuildfix.patch \ - file://glibc-2.20.patch \ + file://glibc.patch \ file://force-nostabs.patch \ file://remove-arm-variant-specific.patch \ file://remove-ppc-tests-failing-build.patch \ + file://valgrind-remove-rpath.patch \ + file://enable.building.on.4.x.kernel.patch \ file://add-ptest.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "0947de8112f946b9ce64764af7be6df2" -SRC_URI[sha256sum] = "e6af71a06bc2534541b07743e1d58dc3caf744f38205ca3e5b5a0bdf372ed6f0" +SRC_URI[md5sum] = "60ddae962bc79e7c95cfc4667245707f" +SRC_URI[sha256sum] = "fa253dc26ddb661b6269df58144eff607ea3f76a9bcfe574b0c7726e1dfcb997" -COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64).*-linux' +COMPATIBLE_HOST = '(i.86|x86_64|mips|powerpc|powerpc64).*-linux' COMPATIBLE_HOST_armv7a = 'arm.*-linux' inherit autotools ptest @@ -34,7 +37,6 @@ inherit autotools ptest EXTRA_OECONF = "--enable-tls --without-mpicc" EXTRA_OECONF_armv7a = "--enable-tls -host=armv7-none-linux-gnueabi --without-mpicc" EXTRA_OEMAKE = "-w" -PARALLEL_MAKE = "" do_install_append () { install -m 644 ${B}/default.supp ${D}/${libdir}/valgrind/ @@ -48,7 +50,7 @@ FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug/*" # redirect functions like strlen. RRECOMMENDS_${PN} += "${TCLIBC}-dbg" -RDEPENDS_${PN}-ptest += " sed perl glibc-utils" +RDEPENDS_${PN}-ptest += " sed perl glibc-utils perl-module-file-glob" do_compile_ptest() { oe_runmake check diff --git a/meta/recipes-devtools/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch b/meta/recipes-devtools/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch deleted file mode 100644 index faa8acce89..0000000000 --- a/meta/recipes-devtools/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nurd xmlto-0.0.25/configure.in xmlto-0.0.25/configure.in ---- xmlto-0.0.25/configure.in 2011-12-01 17:49:00.000000000 +0200 -+++ xmlto-0.0.25/configure.in 2013-01-07 05:24:16.169953519 +0200 -@@ -1,7 +1,7 @@ - AC_INIT(xmlto, 0.0.25) - AC_CONFIG_SRCDIR(xmlto.spec.in) - AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6]) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - AC_PROG_CC - AM_PROG_CC_C_O diff --git a/meta/recipes-devtools/xmlto/xmlto-0.0.25/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch b/meta/recipes-devtools/xmlto/xmlto-0.0.26/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch index 69ca43221c..69ca43221c 100644 --- a/meta/recipes-devtools/xmlto/xmlto-0.0.25/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch +++ b/meta/recipes-devtools/xmlto/xmlto-0.0.26/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.25.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb index 2698b1c258..a7a01830ae 100644 --- a/meta/recipes-devtools/xmlto/xmlto_0.0.25.bb +++ b/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb @@ -6,12 +6,11 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SRC_URI = "https://fedorahosted.org/releases/x/m/xmlto/xmlto-${PV}.tar.gz \ - file://obsolete_automake_macros.patch \ file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \ file://catalog.xml \ " -SRC_URI[md5sum] = "a88cd3f08789b4825d1ac89fa065170d" -SRC_URI[sha256sum] = "c52b56d929e8d20fc19cd3b7ec238f8d039730c56ee311cc352e843147e3e31a" +SRC_URI[md5sum] = "0cca8be787ba01e00c618cb390c988b9" +SRC_URI[sha256sum] = "cfd8d2a26077be1d5566dfe22dd66099ae4f4600dea97d6e113a2cc5b8708977" inherit autotools @@ -36,3 +35,4 @@ do_install_append() { create_wrapper ${D}/${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog.xml } +do_populate_sysroot[rdeptask] = "do_populate_sysroot" diff --git a/meta/recipes-extended/at/at/makefile-fix-parallel.patch b/meta/recipes-extended/at/at/makefile-fix-parallel.patch new file mode 100644 index 0000000000..932a4c0bfe --- /dev/null +++ b/meta/recipes-extended/at/at/makefile-fix-parallel.patch @@ -0,0 +1,35 @@ +From 150b63a936af71b992a3a7b0fc2d2497e51fc800 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Wed, 28 Jan 2015 23:52:00 -0800 +Subject: [PATCH] Makefile: fix for parallel build + +Fixed: +y.tab.c:1001:0: error: unterminated #if + +Let "$(YACC) -d parsetime.y" only run once will fix the problem. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 2a9b918..aa7c04a 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -75,7 +75,9 @@ at: $(ATOBJECTS) + atd: $(RUNOBJECTS) + $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) + +-y.tab.c y.tab.h: parsetime.y ++y.tab.h: y.tab.c ++ ++y.tab.c: parsetime.y + $(YACC) -d parsetime.y + + lex.yy.c: parsetime.l +-- +1.7.9.5 + diff --git a/meta/recipes-extended/at/at_3.1.15.bb b/meta/recipes-extended/at/at_3.1.16.bb index 0c37d6d912..cee9fde967 100644 --- a/meta/recipes-extended/at/at_3.1.15.bb +++ b/meta/recipes-extended/at/at_3.1.16.bb @@ -22,13 +22,15 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ file://file_replacement_with_gplv2.patch \ file://atd.init \ file://atd.service \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ + file://makefile-fix-parallel.patch \ + " PAM_SRC_URI = "file://pam.conf.patch \ file://configure-add-enable-pam.patch" -SRC_URI[md5sum] = "f0f96db22e3a174b53ce4beeeb848839" -SRC_URI[sha256sum] = "03a84f5293d5a95ef4231b7faf5578f141f0c76a2b304dd655bc7e90e97bf7fc" +SRC_URI[md5sum] = "d05da75d9b75d93917ffb16ab48b1e19" +SRC_URI[sha256sum] = "cb9af59c6a54edce9536ba629841055409d1f89d8ae26494727a97141fb4d5c1" EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ --with-daemon_username=root \ @@ -44,7 +46,6 @@ INITSCRIPT_PARAMS = "defaults" SYSTEMD_SERVICE_${PN} = "atd.service" -PARALLEL_MAKE = "" do_compile_prepend () { cp -f ${WORKDIR}/posixtm.[ch] ${S} diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc index d35d25cc92..d7b28cfffe 100644 --- a/meta/recipes-extended/bash/bash.inc +++ b/meta/recipes-extended/bash/bash.inc @@ -4,10 +4,9 @@ SECTION = "base/shell" DEPENDS = "ncurses bison-native" -inherit autotools-brokensep gettext texinfo update-alternatives ptest - -PARALLEL_MAKE = "" +inherit autotools gettext texinfo update-alternatives ptest +EXTRA_AUTORECONF += "--exclude=autoheader" EXTRA_OECONF = "--enable-job-control" ALTERNATIVE_${PN} = "sh" @@ -15,8 +14,6 @@ ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" ALTERNATIVE_TARGET[sh] = "${base_bindir}/bash" ALTERNATIVE_PRIORITY = "100" -export AUTOHEADER = "true" - RDEPENDS_${PN} += "base-files" RDEPENDS_${PN}_class-nativesdk = "" RDEPENDS_${PN}-ptest += "make" diff --git a/meta/recipes-extended/bash/bash_3.2.48.bb b/meta/recipes-extended/bash/bash_3.2.48.bb index 35e624bb8b..34272d1e25 100644 --- a/meta/recipes-extended/bash/bash_3.2.48.bb +++ b/meta/recipes-extended/bash/bash_3.2.48.bb @@ -41,3 +41,5 @@ SRC_URI[patch056.md5sum] = "222eaa3a2c26f54a15aa5e08817a534a" SRC_URI[patch056.sha256sum] = "063a8d8d74e4407bf07a32b965b8ef6d213a66abdb6af26cc3584a437a56bbb4" SRC_URI[patch057.md5sum] = "47d98e3e042892495c5efe54ec6e5913" SRC_URI[patch057.sha256sum] = "5fc689394d515990f5ea74e2df765fc6e5e42ca44b4591b2c6f9be4b0cadf0f0" + +PARALLEL_MAKE = "" diff --git a/meta/recipes-extended/bash/bash_4.3.bb b/meta/recipes-extended/bash/bash_4.3.bb index 54f21017db..23d31976bb 100644 --- a/meta/recipes-extended/bash/bash_4.3.bb +++ b/meta/recipes-extended/bash/bash_4.3.bb @@ -1,5 +1,7 @@ require bash.inc +PR = "r1" + # GPLv2+ (< 4.0), GPLv3+ (>= 4.0) LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" diff --git a/meta/recipes-extended/bc/bc_1.06.bb b/meta/recipes-extended/bc/bc_1.06.bb index b116052c7d..d8c8a860f8 100644 --- a/meta/recipes-extended/bc/bc_1.06.bb +++ b/meta/recipes-extended/bc/bc_1.06.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SECTION = "base" DEPENDS = "flex" -PR = "r2" +PR = "r3" SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz \ file://fix-segment-fault.patch " @@ -18,7 +18,7 @@ SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz \ SRC_URI[md5sum] = "d44b5dddebd8a7a7309aea6c36fda117" SRC_URI[sha256sum] = "4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33" -inherit autotools-brokensep texinfo update-alternatives +inherit autotools texinfo update-alternatives ALTERNATIVE_${PN} = "dc" ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-extended/byacc/byacc_20140422.bb b/meta/recipes-extended/byacc/byacc_20141128.bb index cf57738bea..15c14c9733 100644 --- a/meta/recipes-extended/byacc/byacc_20140422.bb +++ b/meta/recipes-extended/byacc/byacc_20141128.bb @@ -7,5 +7,5 @@ LICENSE = "PD" LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=f186cf0d59bac042b75830396ec389a3" require byacc.inc -SRC_URI[md5sum] = "e7c13c5e207dc05eab9145cc9972397b" -SRC_URI[sha256sum] = "2f104c7e200dd86844d5f3521e12cb55fc48a9c3da3480a65fde2ca8c053bdcc" +SRC_URI[md5sum] = "acb0ff0fb6cc414a6b50c799794b2425" +SRC_URI[sha256sum] = "f517fc21f08c1a1f010177357df58fc64eb1131011e5dcd48c19fe44c47198d0" diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb index 9dd9e6a1f9..ed12277566 100644 --- a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb +++ b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb @@ -8,10 +8,10 @@ LICENSE = "bzip2" LIC_FILES_CHKSUM = "file://LICENSE;beginline=8;endline=37;md5=40d9d1eb05736d1bfc86cfdd9106e6b2" PR = "r5" -SRC_URI = "http://www.bzip.org/${PV}/${BPN}-${PV}.tar.gz \ - file://configure.ac \ - file://run-ptest \ - file://Makefile.am" +SRC_URI = "http://www.bzip.org/${PV}/${BP}.tar.gz \ + file://configure.ac;subdir=${BP} \ + file://Makefile.am;subdir=${BP} \ + file://run-ptest" SRC_URI[md5sum] = "00b516f4704d4a7cb50a1d97e6e8e15b" SRC_URI[sha256sum] = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd" @@ -27,12 +27,6 @@ ALTERNATIVE_${PN} = "bunzip2 bzcat" #install binaries to bzip2-native under sysroot for replacement-native EXTRA_OECONF_append_class-native = " --bindir=${STAGING_BINDIR_NATIVE}/${PN}" -do_extraunpack () { - cp ${WORKDIR}/configure.ac ${S}/ - cp ${WORKDIR}/Makefile.am ${S}/ -} - -addtask extraunpack after do_unpack before do_patch do_install_ptest () { cp -f ${B}/Makefile ${D}${PTEST_PATH}/Makefile diff --git a/meta/recipes-extended/cpio/cpio-2.11/cpio-CVE-2015-1197.patch b/meta/recipes-extended/cpio/cpio-2.11/cpio-CVE-2015-1197.patch new file mode 100644 index 0000000000..b54afb867f --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.11/cpio-CVE-2015-1197.patch @@ -0,0 +1,154 @@ +Description: CVE-2015-1197 + Apply patch by Vitezslav Cizek of SuSE to fix CVE-2015-1197. + Upstream is dormant or no longer existing. To restore the old + behaviour use --extract-over-symlinks (Closes: #774669) + This issue has been discovered by Alexander Cherepanov. +Author: Vitezslav Cizek <vcizek@suse.cz> +Bug-Debian: https://bugs.debian.org/774669 + +Upstream-Status: Backport + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + +--- cpio-2.11+dfsg.orig/doc/cpio.1 ++++ cpio-2.11+dfsg/doc/cpio.1 +@@ -22,6 +22,7 @@ cpio \- copy files to and from archives + [\-\-owner=[user][:.][group]] [\-\-no-preserve-owner] [\-\-message=message] + [\-\-force\-local] [\-\-no\-absolute\-filenames] [\-\-sparse] + [\-\-only\-verify\-crc] [\-\-to\-stdout] [\-\-quiet] [\-\-rsh-command=command] ++[\-\-extract\-over\-symlinks] + [\-\-help] [\-\-version] [pattern...] [< archive] + + .B cpio +--- cpio-2.11+dfsg.orig/src/copyin.c ++++ cpio-2.11+dfsg/src/copyin.c +@@ -700,6 +700,51 @@ copyin_link (struct cpio_file_stat *file + free (link_name); + } + ++ ++static int ++path_contains_symlink(char *path) ++{ ++ struct stat st; ++ char *slash; ++ char *nextslash; ++ ++ /* we got NULL pointer or empty string */ ++ if (!path || !*path) { ++ return false; ++ } ++ ++ slash = path; ++ ++ while ((nextslash = strchr(slash + 1, '/')) != NULL) { ++ slash = nextslash; ++ *slash = '\0'; ++ ++ if (lstat(path, &st) != 0) { ++ if (errno == ELOOP) { ++ /* ELOOP - too many symlinks */ ++ *slash = '/'; ++ return true; ++ } else if (errno == ENOMEM) { ++ /* No memory for lstat - terminate */ ++ xalloc_die(); ++ } else { ++ /* cannot lstat path - give up */ ++ *slash = '/'; ++ return false; ++ } ++ } ++ ++ if (S_ISLNK(st.st_mode)) { ++ *slash = '/'; ++ return true; ++ } ++ ++ *slash = '/'; ++ } ++ ++ return false; ++} ++ + static void + copyin_file (struct cpio_file_stat *file_hdr, int in_file_des) + { +@@ -1471,6 +1516,23 @@ process_copy_in () + { + /* Copy the input file into the directory structure. */ + ++ /* Can we write files over symlinks? */ ++ if (!extract_over_symlinks) ++ { ++ if (path_contains_symlink(file_hdr.c_name)) ++ { ++ /* skip the file */ ++ /* ++ fprintf(stderr, "Can't write over symlinks. Skipping %s\n", file_hdr.c_name); ++ tape_toss_input (in_file_des, file_hdr.c_filesize); ++ tape_skip_padding (in_file_des, file_hdr.c_filesize); ++ continue; ++ */ ++ /* terminate */ ++ error (1, 0, _("Can't write over symlinks: %s\n"), file_hdr.c_name); ++ } ++ } ++ + /* Do we need to rename the file? */ + if (rename_flag || rename_batch_file) + { +--- cpio-2.11+dfsg.orig/src/extern.h ++++ cpio-2.11+dfsg/src/extern.h +@@ -95,6 +95,7 @@ extern char input_is_special; + extern char output_is_special; + extern char input_is_seekable; + extern char output_is_seekable; ++extern bool extract_over_symlinks; + extern int (*xstat) (); + extern void (*copy_function) (); + +--- cpio-2.11+dfsg.orig/src/global.c ++++ cpio-2.11+dfsg/src/global.c +@@ -187,6 +187,9 @@ bool to_stdout_option = false; + /* The name this program was run with. */ + char *program_name; + ++/* Extract files over symbolic links */ ++bool extract_over_symlinks; ++ + /* A pointer to either lstat or stat, depending on whether + dereferencing of symlinks is done for input files. */ + int (*xstat) (); +--- cpio-2.11+dfsg.orig/src/main.c ++++ cpio-2.11+dfsg/src/main.c +@@ -57,7 +57,8 @@ enum cpio_options { + FORCE_LOCAL_OPTION, + DEBUG_OPTION, + BLOCK_SIZE_OPTION, +- TO_STDOUT_OPTION ++ TO_STDOUT_OPTION, ++ EXTRACT_OVER_SYMLINKS + }; + + const char *program_authors[] = +@@ -222,6 +223,8 @@ static struct argp_option options[] = { + N_("Create leading directories where needed"), GRID+1 }, + {"no-preserve-owner", NO_PRESERVE_OWNER_OPTION, 0, 0, + N_("Do not change the ownership of the files"), GRID+1 }, ++ {"extract-over-symlinks", EXTRACT_OVER_SYMLINKS, 0, 0, ++ N_("Force writing over symbolic links"), GRID+1 }, + {"unconditional", 'u', NULL, 0, + N_("Replace all files unconditionally"), GRID+1 }, + {"sparse", SPARSE_OPTION, NULL, 0, +@@ -412,6 +415,10 @@ crc newc odc bin ustar tar (all-caps als + no_chown_flag = true; + break; + ++ case EXTRACT_OVER_SYMLINKS: /* --extract-over-symlinks */ ++ extract_over_symlinks = true; ++ break; ++ + case 'o': /* Copy-out mode. */ + if (copy_function != 0) + error (PAXEXIT_FAILURE, 0, _("Mode already defined")); diff --git a/meta/recipes-extended/cpio/cpio_2.11.bb b/meta/recipes-extended/cpio/cpio_2.11.bb index c42db6f352..053888f1c0 100644 --- a/meta/recipes-extended/cpio/cpio_2.11.bb +++ b/meta/recipes-extended/cpio/cpio_2.11.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" PR = "r5" SRC_URI += "file://remove-gets.patch \ - file://fix-memory-overrun.patch \ + file://fix-memory-overrun.patch \ + file://cpio-CVE-2015-1197.patch \ " SRC_URI[md5sum] = "1112bb6c45863468b5496ba128792f6c" diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.1.bb b/meta/recipes-extended/cracklib/cracklib_2.9.2.bb index 99ccde3ba3..177ab27a2b 100644 --- a/meta/recipes-extended/cracklib/cracklib_2.9.1.bb +++ b/meta/recipes-extended/cracklib/cracklib_2.9.2.bb @@ -13,10 +13,12 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz \ file://0001-packlib.c-support-dictionary-byte-order-dependent.patch \ file://0002-craklib-fix-testnum-and-teststr-failed.patch" -SRC_URI[md5sum] = "90536219c520add2ceb3c26f0d7da404" -SRC_URI[sha256sum] = "408905c2539a97dc8cbbb6d7cd2046cb5647a345b4bda399220d9471be16d156" +SRC_URI[md5sum] = "559072fdfc095cdb763c4de3471a889e" +SRC_URI[sha256sum] = "c1c899291d443e99d1aecfbc879e4ac9c0cbc265574f47b487842da11e9759f5" -inherit autotools-brokensep gettext +PR = "r1" + +inherit autotools gettext do_install_append_class-target() { create-cracklib-dict -o ${D}${datadir}/cracklib/pw_dict ${D}${datadir}/cracklib/cracklib-small diff --git a/meta/recipes-extended/cronie/cronie/crontab b/meta/recipes-extended/cronie/cronie/crontab index cc9169eda9..22c4feb2dc 100644 --- a/meta/recipes-extended/cronie/cronie/crontab +++ b/meta/recipes-extended/cronie/cronie/crontab @@ -7,4 +7,8 @@ SHELL=/bin/sh PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -# m h dom mon dow user command +# m h dom mon dow user command +# 1 * * * * root cd / && run-parts /etc/cron.hourly +# 30 7 * * * root cd / && run-parts /etc/cron.daily +# 42 7 * * 7 root cd / && run-parts /etc/cron.weekly +# 55 7 1 * * root cd / && run-parts /etc/cron.monthly diff --git a/meta/recipes-extended/cronie/cronie/fix-out-of-tree-build.patch b/meta/recipes-extended/cronie/cronie/fix-out-of-tree-build.patch deleted file mode 100644 index 7384a0bad4..0000000000 --- a/meta/recipes-extended/cronie/cronie/fix-out-of-tree-build.patch +++ /dev/null @@ -1,31 +0,0 @@ -For an out of tree build, the cronie-common.h file was not being -found correctly, so point it to the top_srcdir - -Upstream-Status: Submitted - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Index: cronie-1.4.11/anacron/Makefile.am -=================================================================== ---- cronie-1.4.11.orig/anacron/Makefile.am -+++ cronie-1.4.11/anacron/Makefile.am -@@ -9,6 +9,7 @@ common_nodist = anacron-paths.h - nodist_anacron_SOURCES = $(common_nodist) - BUILT_SOURCES = $(common_nodist) - -+AM_CFLAGS = -I$(top_srcdir) - - LDADD = $(LIBSELINUX) $(LIBPAM) $(LIBAUDIT) - -Index: cronie-1.4.11/src/Makefile.am -=================================================================== ---- cronie-1.4.11.orig/src/Makefile.am -+++ cronie-1.4.11/src/Makefile.am -@@ -15,6 +15,7 @@ nodist_crond_SOURCES = $(common_nodist) - nodist_crontab_SOURCES = $(common_nodist) - BUILT_SOURCES = $(common_nodist) - -+AM_CFLAGS = -I$(top_srcdir) - - LDADD = $(LIBSELINUX) $(LIBPAM) $(LIBAUDIT) - diff --git a/meta/recipes-extended/cronie/cronie_1.4.11.bb b/meta/recipes-extended/cronie/cronie_1.4.12.bb index 02234f6a36..977332b3fc 100644 --- a/meta/recipes-extended/cronie/cronie_1.4.11.bb +++ b/meta/recipes-extended/cronie/cronie_1.4.12.bb @@ -7,16 +7,14 @@ HOMEPAGE = "https://fedorahosted.org/cronie/" BUGTRACKER = "mmaslano@redhat.com" # Internet Systems Consortium License -LICENSE = "ISC & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=963ea0772a2adbdcd607a9b2ec320c11 \ +LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=dd2a592170760e1386c769e1043b3722 \ file://src/cron.c;endline=20;md5=b425c334265026177128353a142633b4 \ file://src/popen.c;beginline=3;endline=31;md5=edd50742d8def712e9472dba353668a9" SECTION = "utils" - SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ - file://fix-out-of-tree-build.patch \ file://crond.init \ file://crontab \ file://crond.service \ @@ -25,18 +23,16 @@ SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ PAM_SRC_URI = "file://crond_pam_config.patch" PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" -SRC_URI[md5sum] = "2ba645cf54de17f138ef70312843862f" -SRC_URI[sha256sum] = "fd08084cedddbb42499f80ddb7f2158195c3555c2ff40ee11d4ece2f9864d7be" +SRC_URI[md5sum] = "199db91e514a4d75e3222d69874b132f" +SRC_URI[sha256sum] = "0f5c9bf32f352599451c4ca0d6bc076d19e73ecfa5a90b34ecfe47c918c8bafd" inherit autotools update-rc.d useradd systemd - PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit," PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,${PAM_DEPS}" - INITSCRIPT_NAME = "crond" INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." @@ -67,7 +63,7 @@ do_install_append () { mkdir -p ${D}${sysconfdir}/cron.weekly mkdir -p ${D}${sysconfdir}/cron.monthly touch ${D}${sysconfdir}/cron.deny - + # below setting is necessary to allow normal user using crontab # setgid for crontab binary @@ -82,4 +78,4 @@ do_install_append () { } FILES_${PN} += "${sysconfdir}/cron*" - +CONFFILES_${PN} += "${sysconfdir}/crontab" diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index fbdc48eab1..df47c81d59 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -7,7 +7,6 @@ SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \ file://use_echo_only_in_init.patch \ file://0001-don-t-try-to-run-generated-binaries.patch \ file://cups_serverbin.patch \ - file://cups-no-gcrypt.patch \ file://cups.socket \ file://cups.path \ file://cups.service \ @@ -15,6 +14,8 @@ SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \ LEAD_SONAME = "libcupsdriver.so" +CLEANBROKEN = "1" + inherit autotools-brokensep binconfig useradd systemd USERADD_PACKAGES = "${PN}" @@ -32,7 +33,6 @@ EXTRA_OECONF = " \ --enable-gnutls \ --enable-dbus \ --enable-browsing \ - --disable-openssl \ --disable-gssapi \ --enable-debug \ --disable-relro \ @@ -70,7 +70,7 @@ do_compile () { "-I." } -fakeroot do_install () { +do_install () { oe_runmake "DSTROOT=${D}" install # Remove /var/run from package as cupsd will populate it on startup diff --git a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch index e6544b5607..5379eb6aa2 100644 --- a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch +++ b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch @@ -10,13 +10,13 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> ppdc/Makefile | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) -diff --git a/ppdc/Makefile b/ppdc/Makefile -index 0288d47..fc87f1b 100644 ---- a/ppdc/Makefile -+++ b/ppdc/Makefile -@@ -243,8 +243,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/libcups.a \ +Index: cups-2.0.0/ppdc/Makefile +=================================================================== +--- cups-2.0.0.orig/ppdc/Makefile ++++ cups-2.0.0/ppdc/Makefile +@@ -242,8 +242,8 @@ genstrings: genstrings.o libcupsppdc.a $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ - libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \ + libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) - echo Generating localization strings... - ./genstrings >sample.c @@ -25,9 +25,9 @@ index 0288d47..fc87f1b 100644 # -@@ -261,9 +261,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/libcups.a foo.drv foo-fr.po +@@ -260,9 +260,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cu $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ - ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ + ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ $(COMMONLIBS) $(LIBZ) - echo Testing PPD compiler... - ./ppdc-static -l en,fr -I ../data foo.drv @@ -38,24 +38,26 @@ index 0288d47..fc87f1b 100644 # -@@ -290,16 +290,16 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/libcups.a - ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ +@@ -288,17 +288,17 @@ ppdi-static: ppdc-static ppdi.o libcups + $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \ + ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ $(COMMONLIBS) $(LIBZ) - echo Testing PPD importer... +- echo Testing PPD importer... - $(RM) -r ppd ppd2 sample-import.drv -- ./ppdc-static -I ../data sample.drv +- ./ppdc-static -l en -I ../data sample.drv - ./ppdi-static -I ../data -o sample-import.drv ppd/* -- ./ppdc-static -I ../data -d ppd2 sample-import.drv +- ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv - if diff -r ppd ppd2 >/dev/null; then \ - echo PPD import OK; \ - else \ - echo PPD import FAILED; \ - exit 1; \ - fi ++# echo Testing PPD importer... +# $(RM) -r ppd ppd2 sample-import.drv -+# ./ppdc-static -I ../data sample.drv ++# ./ppdc-static -l en -I ../data sample.drv +# ./ppdi-static -I ../data -o sample-import.drv ppd/* -+# ./ppdc-static -I ../data -d ppd2 sample-import.drv ++# ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv +# if diff -r ppd ppd2 >/dev/null; then \ +# echo PPD import OK; \ +# else \ @@ -65,6 +67,3 @@ index 0288d47..fc87f1b 100644 # --- -1.6.6.1 - diff --git a/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch b/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch deleted file mode 100644 index 8bbcf39497..0000000000 --- a/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch +++ /dev/null @@ -1,49 +0,0 @@ -Description: Don't build-depend on libgcrypt, as nothing is used from it -Author: Didier Raboud <odyx@debian.org> -Bug-Debian: https://bugs.debian.org/638416 -Bug: http://www.cups.org/str.php?L???? - -[CUPS Ticket #4399] -- http://www.cups.org/str.php?L4399 - -Backported from http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch - -Upstream-Status: Backport - -Signed-off-by: Armin Kuster <akuster@mvista.com> - -Last-Update: 2014-04-07 ---- a/config-scripts/cups-ssl.m4 -+++ b/config-scripts/cups-ssl.m4 -@@ -66,7 +66,6 @@ - dnl Then look for GNU TLS... - if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then - AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config) -- AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config) - if $PKGCONFIG --exists gnutls; then - have_ssl=1 - SSLLIBS=`$PKGCONFIG --libs gnutls` -@@ -84,14 +83,6 @@ - if test $have_ssl = 1; then - CUPS_SERVERCERT="ssl/server.crt" - CUPS_SERVERKEY="ssl/server.key" -- -- if $PKGCONFIG --exists gcrypt; then -- SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`" -- SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`" -- elif test "x$LIBGCRYPTCONFIG" != x; then -- SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`" -- SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`" -- fi - fi - fi - ---- a/cups/http-private.h -+++ b/cups/http-private.h -@@ -80,7 +80,6 @@ - # elif defined HAVE_GNUTLS - # include <gnutls/gnutls.h> - # include <gnutls/x509.h> --# include <gcrypt.h> - # elif defined(HAVE_CDSASSL) - # include <CoreFoundation/CoreFoundation.h> - # include <Security/Security.h> diff --git a/meta/recipes-extended/cups/cups_1.7.5.bb b/meta/recipes-extended/cups/cups_1.7.5.bb deleted file mode 100644 index 5538cecfd5..0000000000 --- a/meta/recipes-extended/cups/cups_1.7.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require cups.inc - -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5e50cb4b8f24b04636b719683a9102d" - -SRC_URI[md5sum] = "5d893edc2957005f78e2b2423fdace2e" -SRC_URI[sha256sum] = "18cb4c6847dbaaaa05c8b35af787f19dd5c7686970b46548e72c711c6f26bd02" diff --git a/meta/recipes-extended/cups/cups_2.0.2.bb b/meta/recipes-extended/cups/cups_2.0.2.bb new file mode 100644 index 0000000000..96c24cdcbf --- /dev/null +++ b/meta/recipes-extended/cups/cups_2.0.2.bb @@ -0,0 +1,6 @@ +require cups.inc + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6c5a350596fba02754bd96eb6df3afd0" + +SRC_URI[md5sum] = "6e0ea72dbafcf5baaa1cf4178e71096d" +SRC_URI[sha256sum] = "858720f76b66fd0441ae2a16f7cabd9554c8c64607e28ffacf16c36c53a3b18b" diff --git a/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb b/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb index 4e12169302..43ea3ce382 100644 --- a/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb +++ b/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb @@ -1,10 +1,10 @@ SUMMARY = "Collection of autoconf m4 macros" SECTION = "base" -HOMEPAGE = "http://cwautomacros.berlios.de/" +HOMEPAGE = "http://sourceforge.net/projects/cwautomacros.berlios/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" -SRC_URI = "http://download.berlios.de/cwautomacros/cwautomacros-${PV}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}.berlios/${BP}.tar.bz2" SRC_URI[md5sum] = "074afcb50d0a8bff10786a2954b2b02d" SRC_URI[sha256sum] = "3115603b891f3a163c0bbb5fea2f3742113a183fa6745ee5e89e5f6d0e9f6121" diff --git a/meta/recipes-extended/diffutils/diffutils_3.3.bb b/meta/recipes-extended/diffutils/diffutils_3.3.bb index a467f20aa4..b708962447 100644 --- a/meta/recipes-extended/diffutils/diffutils_3.3.bb +++ b/meta/recipes-extended/diffutils/diffutils_3.3.bb @@ -7,6 +7,8 @@ SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ file://run-ptest \ " +EXTRA_OECONF += "--without-libsigsegv-prefix" + do_configure_prepend () { # Need to remove gettext macros with weird mix of versions for i in codeset.m4 gettext_gl.m4 intlmacosx.m4 inttypes-pri.m4 lib-ld_gl.m4 lib-prefix_gl.m4 po_gl.m4 ssize_t.m4 wchar_t.m4 wint_t.m4; do diff --git a/meta/recipes-extended/ethtool/ethtool_3.15.bb b/meta/recipes-extended/ethtool/ethtool_3.16.bb index 8cd10dfb43..92a0704800 100644 --- a/meta/recipes-extended/ethtool/ethtool_3.15.bb +++ b/meta/recipes-extended/ethtool/ethtool_3.16.bb @@ -12,8 +12,8 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://ethtool-uint.patch \ " -SRC_URI[md5sum] = "7e94dd958bcd639aad2e5a752e108b24" -SRC_URI[sha256sum] = "562e3cc675cf5b1ac655cd060f032943a2502d4d59e5f278f02aae92562ba261" +SRC_URI[md5sum] = "3806bae34c153e2b9e2859e85c54788d" +SRC_URI[sha256sum] = "a6f1433824af7b390ed4e66dfc7cee047d6d1f56dbb8ceef9fe905d63aef5275" inherit autotools ptest RDEPENDS_${PN}-ptest += "make" diff --git a/meta/recipes-extended/findutils/findutils-4.4.2/01-27017.patch b/meta/recipes-extended/findutils/findutils-4.4.2/01-27017.patch deleted file mode 100644 index 69c1486cf7..0000000000 --- a/meta/recipes-extended/findutils/findutils-4.4.2/01-27017.patch +++ /dev/null @@ -1,781 +0,0 @@ -Upstream-Status: Backport - -commit af974034b68bf59337c7a384e488a518a77dfecd -Author: James Youngman <jay@gnu.org> -Date: Sat Jul 11 19:55:27 2009 +0100 - - Fix Savannah bug #27017: find -D opt / -fstype ext3 -print , -quit coredump. - - Fix Savannah bug #27017: find -D opt / -fstype ext3 -print , -quit - coredumps. - * find/tree.c (set_new_parent): Initialise struct - predicate->arg_text to NULL (instead of leaving it uninitialised). - (get_new_pred_noarg): Likewise. - (get_new_pred): Initialise predicate->arg_text to - "ThisShouldBeSetToSomethingElse" to make it easier to notice - bugs. - (get_new_pred_chk_op): Use get_new_pred_noarg. - (print_predicate): Use an if statement instead of - two ternary operators. - * find/util.c (insert_primary_withpred): Accept new argument, arg, - being the argument (if any) of this predicate. Pass it to - get_new_pred_chk_op. - (insert_primary): Likewise (pass arg to insert_primary_withpred). - (insert_primary_noarg): New function; calls insert_primary with - arg=NULL. - * find/parser.c (collect_arg_stat_info): Add an output parameter; - the filename from which we collected the stat information. - (parse_closeparen, parse_delete, parse_and, parse_or, - parse_comma): Use get_new_pred_noarg. - (parse_cnewer, parse_newer, parse_anewer): Use new - collect_arg_stat_info and insert_primary interface. - (parse_print, parse_prune, parse_nouser, parse_empty): Use - insert_primary_noarg. - (parse_accesscheck, parse_false): Use insert_primary_noarg. - (parse_used, parse_iname, parse_fprint, insert_fprint, - parse_fstype, parse_ilname): Use new collect_arg and - insert_primary interfaces. - (parse_ipath, parse_lname, do_parse_xmin, parse_name, parse_path, - parse_perm, parse_size, parse_user, parse_time): Use new - collect_arg and insert_primary_withpred interface. - (parse_negate, parse_openparen): Use new get_new_pred_chk_op interface. - (parse_newerXY, parse_nogroup): Use new insert_primary interface. - (insert_regex, parse_samefile): Use new insert_primary_withpred - interface. - (insert_type, insert_fprintf, new_insert_exec_ok, insert_num): Use - new insert_primary_withpred interface. - * find/defs.h (struct predicate.arg_text): make const. - Add declarations for new function get_new_pred_noarg and - insert_primary_noarg. Add 'arg' parameter to get_new_pred_chk_op - and insert_primary_withpred. - -diff --git a/ChangeLog b/ChangeLog -index 6e346b8..e8ba0f8 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,0 +1,45 @@ -+2009-07-11 James Youngman <jay@gnu.org> -+ -+ Fix Savannah bug #27017: find -D opt / -fstype ext3 -print , -quit -+ coredumps. -+ * find/tree.c (set_new_parent): Initialise struct -+ predicate->arg_text to NULL (instead of leaving it uninitialised). -+ (get_new_pred_noarg): Likewise. -+ (get_new_pred): Initialise predicate->arg_text to -+ "ThisShouldBeSetToSomethingElse" to make it easier to notice -+ bugs. -+ (get_new_pred_chk_op): Use get_new_pred_noarg. -+ (print_predicate): Use an if statement instead of -+ two ternary operators. -+ * find/util.c (insert_primary_withpred): Accept new argument, arg, -+ being the argument (if any) of this predicate. Pass it to -+ get_new_pred_chk_op. -+ (insert_primary): Likewise (pass arg to insert_primary_withpred). -+ (insert_primary_noarg): New function; calls insert_primary with -+ arg=NULL. -+ * find/parser.c (collect_arg_stat_info): Add an output parameter; -+ the filename from which we collected the stat information. -+ (parse_closeparen, parse_delete, parse_and, parse_or, -+ parse_comma): Use get_new_pred_noarg. -+ (parse_cnewer, parse_newer, parse_anewer): Use new -+ collect_arg_stat_info and insert_primary interface. -+ (parse_print, parse_prune, parse_nouser, parse_empty): Use -+ insert_primary_noarg. -+ (parse_accesscheck, parse_false): Use insert_primary_noarg. -+ (parse_used, parse_iname, parse_fprint, insert_fprint, -+ parse_fstype, parse_ilname): Use new collect_arg and -+ insert_primary interfaces. -+ (parse_ipath, parse_lname, do_parse_xmin, parse_name, parse_path, -+ parse_perm, parse_size, parse_user, parse_time): Use new -+ collect_arg and insert_primary_withpred interface. -+ (parse_negate, parse_openparen): Use new get_new_pred_chk_op interface. -+ (parse_newerXY, parse_nogroup): Use new insert_primary interface. -+ (insert_regex, parse_samefile): Use new insert_primary_withpred -+ interface. -+ (insert_type, insert_fprintf, new_insert_exec_ok, insert_num): Use -+ new insert_primary_withpred interface. -+ * find/defs.h (struct predicate.arg_text): make const. -+ Add declarations for new function get_new_pred_noarg and -+ insert_primary_noarg. Add 'arg' parameter to get_new_pred_chk_op -+ and insert_primary_withpred. -+ -diff --git a/find/defs.h b/find/defs.h -index 1708d83..4539fd9 100644 ---- a/find/defs.h -+++ b/find/defs.h -@@ -297,7 +297,7 @@ struct predicate - boolean artificial; - - /* The raw text of the argument of this predicate. */ -- char *arg_text; -+ const char *arg_text; - - /* Information needed by the predicate processor. - Next to each member are listed the predicates that use it. */ -@@ -480,13 +480,16 @@ void show_success_rates(const struct predicate *node); - /* tree.c */ - struct predicate * build_expression_tree PARAMS((int argc, char *argv[], int end_of_leading_options)); - struct predicate * get_eval_tree PARAMS((void)); -+struct predicate *get_new_pred_noarg (const struct parser_table *entry); - struct predicate *get_new_pred PARAMS((const struct parser_table *entry)); --struct predicate *get_new_pred_chk_op PARAMS((const struct parser_table *entry)); -+struct predicate *get_new_pred_chk_op PARAMS((const struct parser_table *entry, -+ const char *arg)); - float calculate_derived_rates PARAMS((struct predicate *p)); - - /* util.c */ --struct predicate *insert_primary PARAMS((const struct parser_table *entry)); --struct predicate *insert_primary_withpred PARAMS((const struct parser_table *entry, PRED_FUNC fptr)); -+struct predicate *insert_primary PARAMS((const struct parser_table *entry, const char *arg)); -+struct predicate *insert_primary_noarg PARAMS((const struct parser_table *entry)); -+struct predicate *insert_primary_withpred PARAMS((const struct parser_table *entry, PRED_FUNC fptr, const char *arg)); - void usage PARAMS((FILE *fp, int status, char *msg)); - extern boolean check_nofollow(void); - void complete_pending_execs(struct predicate *p); -diff --git a/find/parser.c b/find/parser.c -index 534b670..2e6b989 100644 ---- a/find/parser.c -+++ b/find/parser.c -@@ -640,11 +640,13 @@ collect_arg(char **argv, int *arg_ptr, const char **collected_arg) - } - - static boolean --collect_arg_stat_info(char **argv, int *arg_ptr, struct stat *p) -+collect_arg_stat_info(char **argv, int *arg_ptr, struct stat *p, -+ const char **argument) - { - const char *filename; - if (collect_arg(argv, arg_ptr, &filename)) - { -+ *argument = filename; - if (0 == (options.xstat)(filename, p)) - { - return true; -@@ -656,6 +658,7 @@ collect_arg_stat_info(char **argv, int *arg_ptr, struct stat *p) - } - else - { -+ *argument = NULL; - return false; - } - } -@@ -679,7 +682,7 @@ parse_and (const struct parser_table* entry, char **argv, int *arg_ptr) - (void) argv; - (void) arg_ptr; - -- our_pred = get_new_pred (entry); -+ our_pred = get_new_pred_noarg (entry); - our_pred->pred_func = pred_and; - our_pred->p_type = BI_OP; - our_pred->p_prec = AND_PREC; -@@ -691,11 +694,12 @@ static boolean - parse_anewer (const struct parser_table* entry, char **argv, int *arg_ptr) - { - struct stat stat_newer; -+ const char *arg; - - set_stat_placeholders(&stat_newer); -- if (collect_arg_stat_info(argv, arg_ptr, &stat_newer)) -+ if (collect_arg_stat_info(argv, arg_ptr, &stat_newer, &arg)) - { -- struct predicate *our_pred = insert_primary (entry); -+ struct predicate *our_pred = insert_primary (entry, arg); - our_pred->args.reftime.xval = XVAL_ATIME; - our_pred->args.reftime.ts = get_stat_mtime(&stat_newer); - our_pred->args.reftime.kind = COMP_GT; -@@ -713,7 +717,7 @@ parse_closeparen (const struct parser_table* entry, char **argv, int *arg_ptr) - (void) argv; - (void) arg_ptr; - -- our_pred = get_new_pred (entry); -+ our_pred = get_new_pred_noarg (entry); - our_pred->pred_func = pred_closeparen; - our_pred->p_type = CLOSE_PAREN; - our_pred->p_prec = NO_PREC; -@@ -725,11 +729,12 @@ static boolean - parse_cnewer (const struct parser_table* entry, char **argv, int *arg_ptr) - { - struct stat stat_newer; -+ const char *arg; - - set_stat_placeholders(&stat_newer); -- if (collect_arg_stat_info(argv, arg_ptr, &stat_newer)) -+ if (collect_arg_stat_info(argv, arg_ptr, &stat_newer, &arg)) - { -- struct predicate *our_pred = insert_primary (entry); -+ struct predicate *our_pred = insert_primary (entry, arg); - our_pred->args.reftime.xval = XVAL_CTIME; /* like -newercm */ - our_pred->args.reftime.ts = get_stat_mtime(&stat_newer); - our_pred->args.reftime.kind = COMP_GT; -@@ -747,7 +752,7 @@ parse_comma (const struct parser_table* entry, char **argv, int *arg_ptr) - (void) argv; - (void) arg_ptr; - -- our_pred = get_new_pred (entry); -+ our_pred = get_new_pred_noarg (entry); - our_pred->pred_func = pred_comma; - our_pred->p_type = BI_OP; - our_pred->p_prec = COMMA_PREC; -@@ -786,7 +791,7 @@ parse_delete (const struct parser_table* entry, char *argv[], int *arg_ptr) - (void) argv; - (void) arg_ptr; - -- our_pred = insert_primary (entry); -+ our_pred = insert_primary_noarg (entry); - our_pred->side_effects = our_pred->no_default_print = true; - /* -delete implies -depth */ - options.do_dir_first = false; -@@ -831,7 +836,7 @@ parse_empty (const struct parser_table* entry, char **argv, int *arg_ptr) - (void) argv; - (void) arg_ptr; - -- our_pred = insert_primary (entry); -+ our_pred = insert_primary_noarg (entry); - our_pred->est_success_rate = 0.01f; /* assume 1% of files are empty. */ - return true; - } -@@ -856,7 +861,7 @@ parse_false (const struct parser_table* entry, char **argv, int *arg_ptr) - (void) argv; - (void) arg_ptr; - -- our_pred = insert_primary (entry); -+ our_pred = insert_primary_noarg (entry); - our_pred->need_stat = our_pred->need_type = false; - our_pred->side_effects = our_pred->no_default_print = false; - our_pred->est_success_rate = 0.0f; -@@ -866,7 +871,7 @@ parse_false (const struct parser_table* entry, char **argv, int *arg_ptr) - static boolean - insert_fls (const struct parser_table* entry, const char *filename) - { -- struct predicate *our_pred = insert_primary (entry); -+ struct predicate *our_pred = insert_primary_noarg (entry); - if (filename) - open_output_file (filename, &our_pred->args.printf_vec); - else -@@ -899,7 +904,7 @@ parse_fprint (const struct parser_table* entry, char **argv, int *arg_ptr) - const char *filename; - if (collect_arg(argv, arg_ptr, &filename)) - { -- our_pred = insert_primary (entry); -+ our_pred = insert_primary (entry, filename); - open_output_file (filename, &our_pred->args.printf_vec); - our_pred->side_effects = our_pred->no_default_print = true; - our_pred->need_stat = our_pred->need_type = false; -@@ -915,7 +920,7 @@ parse_fprint (const struct parser_table* entry, char **argv, int *arg_ptr) - static boolean - insert_fprint(const struct parser_table* entry, const char *filename) - { -- struct predicate *our_pred = insert_primary (entry); -+ struct predicate *our_pred = insert_primary (entry, filename); - if (filename) - open_output_file (filename, &our_pred->args.printf_vec); - else -@@ -960,7 +965,7 @@ parse_fstype (const struct parser_table* entry, char **argv, int *arg_ptr) - const char *typename; - if (collect_arg(argv, arg_ptr, &typename)) - { -- struct predicate *our_pred = insert_primary (entry); -+ struct predicate *our_pred = insert_primary (entry, typename); - our_pred->args.str = typename; - - /* This is an expensive operation, so although there are -@@ -1090,7 +1095,7 @@ parse_group (const struct parser_table* entry, char **argv, int *arg_ptr) - return false; - } - } -- our_pred = insert_primary (entry); -+ our_pred = insert_primary (entry, groupname); - our_pred->args.gid = gid; - our_pred->est_success_rate = (our_pred->args.numinfo.l_val < 100) ? 0.99 : 0.2; - return true; -@@ -1160,7 +1165,7 @@ parse_ilname (const struct parser_table* entry, char **argv, int *arg_ptr) - const char *name; - if (collect_arg(argv, arg_ptr, &name)) - { -- struct predicate *our_pred = insert_primary (entry); -+ struct predicate *our_pred = insert_primary (entry, name); - our_pred->args.str = name; - /* Use the generic glob pattern estimator to figure out how many - * links will match, but bear in mind that most files won't be links. -@@ -1227,7 +1232,7 @@ parse_iname (const struct parser_table* entry, char **argv, int *arg_ptr) - { - if (check_name_arg("-iname", name)) - { -- struct predicate *our_pred = insert_primary (entry); -+ struct predicate *our_pred = insert_primary (entry, name); - our_pred->need_stat = our_pred->need_type = false; - our_pred->args.str = name; - our_pred->est_success_rate = estimate_pattern_match_rate(name, 0); -@@ -1268,7 +1273,7 @@ parse_ipath (const struct parser_table* entry, char **argv, int *arg_ptr) - fnmatch_sanitycheck (); - if (collect_arg (argv, arg_ptr, &name)) - { -- struct predicate *our_pred = insert_primary_withpred (entry, pred_ipath); -+ struct predicate *our_pred = insert_primary_withpred (entry, pred_ipath, name); - our_pred->need_stat = our_pred->need_type = false; - our_pred->args.str = name; - our_pred->est_success_rate = estimate_pattern_match_rate (name, 0); -@@ -1316,7 +1321,7 @@ parse_lname (const struct parser_table* entry, char **argv, int *arg_ptr) - fnmatch_sanitycheck(); - if (collect_arg(argv, arg_ptr, &name)) - { -- struct predicate *our_pred = insert_primary (entry); -+ struct predicate *our_pred = insert_primary (entry, name); - our_pred->args.str = name; - our_pred->est_success_rate = 0.1 * estimate_pattern_match_rate(name, 0); - return true; -@@ -1391,7 +1396,7 @@ do_parse_xmin (const struct parser_table* entry, - "arithmetic overflow while converting %s " - "minutes to a number of seconds")) - { -- struct predicate *our_pred = insert_primary (entry); -+ struct predicate *our_pred = insert_primary (entry, minutes); - our_pred->args.reftime = tval; - our_pred->est_success_rate = estimate_timestamp_success_rate(tval.ts.tv_sec); - return true; -@@ -1427,7 +1432,7 @@ parse_name (const struct parser_table* entry, char **argv, int *arg_ptr) - fnmatch_sanitycheck(); - if (check_name_arg("-name", name)) - { -- struct predicate *our_pred = insert_primary (entry); -+ struct predicate *our_pred = insert_primary (entry, name); - our_pred->need_stat = our_pred->need_type = false; - our_pred->args.str = name; - our_pred->est_success_rate = estimate_pattern_match_rate(name, 0); -@@ -1445,7 +1450,7 @@ parse_negate (const struct parser_table* entry, char **argv, int *arg_ptr) - (void) &argv; - (void) &arg_ptr; - -- our_pred = get_new_pred_chk_op (entry); -+ our_pred = get_new_pred_chk_op (entry, NULL); - our_pred->pred_func = pred_negate; - our_pred->p_type = UNI_OP; - our_pred->p_prec = NEGATE_PREC; -@@ -1458,11 +1463,12 @@ parse_newer (const struct parser_table* entry, char **argv, int *arg_ptr) - { - struct predicate *our_pred; - struct stat stat_newer; -+ const char *arg; - - set_stat_placeholders(&stat_newer); -- if (collect_arg_stat_info(argv, arg_ptr, &stat_newer)) -+ if (collect_arg_stat_info(argv, arg_ptr, &stat_newer, &arg)) - { -- our_pred = insert_primary (entry); -+ our_pred = insert_primary (entry, arg); - our_pred->args.reftime.ts = get_stat_mtime(&stat_newer); - our_pred->args.reftime.xval = XVAL_MTIME; - our_pred->args.reftime.kind = COMP_GT; -@@ -1530,7 +1536,7 @@ parse_newerXY (const struct parser_table* entry, char **argv, int *arg_ptr) - (*arg_ptr)++; - } - -- our_pred = insert_primary (entry); -+ our_pred = insert_primary (entry, argv[*arg_ptr]); - - - switch (x) -@@ -1623,7 +1629,7 @@ parse_nogroup (const struct parser_table* entry, char **argv, int *arg_ptr) - (void) &argv; - (void) &arg_ptr; - -- our_pred = insert_primary (entry); -+ our_pred = insert_primary (entry, NULL); - our_pred->est_success_rate = 1e-4; - #ifdef CACHE_IDS - if (gid_unused == NULL) -@@ -1660,7 +1666,7 @@ parse_nouser (const struct parser_table* entry, char **argv, int *arg_ptr) - (void) arg_ptr; - - -- our_pred = insert_primary (entry); -+ our_pred = insert_primary_noarg (entry); - our_pred->est_success_rate = 1e-3; - #ifdef CACHE_IDS - if (uid_unused == NULL) -@@ -1716,7 +1722,7 @@ parse_openparen (const struct parser_table* entry, char **argv, int *arg_ptr) - (void) argv; - (void) arg_ptr; - -- our_pred = get_new_pred_chk_op (entry); -+ our_pred = get_new_pred_chk_op (entry, NULL); - our_pred->pred_func = pred_openparen; - our_pred->p_type = OPEN_PAREN; - our_pred->p_prec = NO_PREC; -@@ -1732,7 +1738,7 @@ parse_or (const struct parser_table* entry, char **argv, int *arg_ptr) - (void) argv; - (void) arg_ptr; - -- our_pred = get_new_pred (entry); -+ our_pred = get_new_pred_noarg (entry); - our_pred->pred_func = pred_or; - our_pred->p_type = BI_OP; - our_pred->p_prec = OR_PREC; -@@ -1756,7 +1762,7 @@ parse_path (const struct parser_table* entry, char **argv, int *arg_ptr) - const char *name; - if (collect_arg(argv, arg_ptr, &name)) - { -- struct predicate *our_pred = insert_primary_withpred (entry, pred_path); -+ struct predicate *our_pred = insert_primary_withpred (entry, pred_path, name); - our_pred->need_stat = our_pred->need_type = false; - our_pred->args.str = name; - our_pred->est_success_rate = estimate_pattern_match_rate (name, 0); -@@ -1894,7 +1900,7 @@ parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr) - rate = 0.9986; /* probably matches anything but a broken symlink */ - } - -- our_pred = insert_primary (entry); -+ our_pred = insert_primary (entry, perm_expr); - our_pred->est_success_rate = rate; - if (havekind) - { -@@ -1928,7 +1934,7 @@ parse_print (const struct parser_table* entry, char **argv, int *arg_ptr) - (void) argv; - (void) arg_ptr; - -- our_pred = insert_primary (entry); -+ our_pred = insert_primary_noarg (entry); - /* -print has the side effect of printing. This prevents us - from doing undesired multiple printing when the user has - already specified -print. */ -@@ -1981,7 +1987,7 @@ parse_prune (const struct parser_table* entry, char **argv, int *arg_ptr) - (void) argv; - (void) arg_ptr; - -- our_pred = insert_primary (entry); -+ our_pred = insert_primary_noarg (entry); - if (options.do_dir_first == false) - our_pred->need_stat = our_pred->need_type = false; - /* -prune has a side effect that it does not descend into -@@ -1994,7 +2000,7 @@ parse_prune (const struct parser_table* entry, char **argv, int *arg_ptr) - static boolean - parse_quit (const struct parser_table* entry, char **argv, int *arg_ptr) - { -- struct predicate *our_pred = insert_primary (entry); -+ struct predicate *our_pred = insert_primary_noarg (entry); - (void) argv; - (void) arg_ptr; - our_pred->need_stat = our_pred->need_type = false; -@@ -2036,7 +2042,7 @@ insert_regex (char **argv, - { - struct re_pattern_buffer *re; - const char *error_message; -- struct predicate *our_pred = insert_primary_withpred (entry, pred_regex); -+ struct predicate *our_pred = insert_primary_withpred (entry, pred_regex, rx); - our_pred->need_stat = our_pred->need_type = false; - re = xmalloc (sizeof (struct re_pattern_buffer)); - our_pred->args.regex = re; -@@ -2061,6 +2067,7 @@ static boolean - parse_size (const struct parser_table* entry, char **argv, int *arg_ptr) - { - struct predicate *our_pred; -+ char *arg; - uintmax_t num; - char suffix; - enum comparison_type c_type; -@@ -2073,42 +2080,43 @@ parse_size (const struct parser_table* entry, char **argv, int *arg_ptr) - */ - if ((argv == NULL) || (argv[*arg_ptr] == NULL)) - return false; -+ arg = argv[*arg_ptr]; - -- len = strlen (argv[*arg_ptr]); -+ len = strlen (arg); - if (len == 0) - error (1, 0, _("invalid null argument to -size")); - -- suffix = argv[*arg_ptr][len - 1]; -+ suffix = arg[len - 1]; - switch (suffix) - { - case 'b': - blksize = 512; -- argv[*arg_ptr][len - 1] = '\0'; -+ arg[len - 1] = '\0'; - break; - - case 'c': - blksize = 1; -- argv[*arg_ptr][len - 1] = '\0'; -+ arg[len - 1] = '\0'; - break; - - case 'k': - blksize = 1024; -- argv[*arg_ptr][len - 1] = '\0'; -+ arg[len - 1] = '\0'; - break; - - case 'M': /* Megabytes */ - blksize = 1024*1024; -- argv[*arg_ptr][len - 1] = '\0'; -+ arg[len - 1] = '\0'; - break; - - case 'G': /* Gigabytes */ - blksize = 1024*1024*1024; -- argv[*arg_ptr][len - 1] = '\0'; -+ arg[len - 1] = '\0'; - break; - - case 'w': - blksize = 2; -- argv[*arg_ptr][len - 1] = '\0'; -+ arg[len - 1] = '\0'; - break; - - case '0': -@@ -2127,14 +2135,14 @@ parse_size (const struct parser_table* entry, char **argv, int *arg_ptr) - error (1, 0, _("invalid -size type `%c'"), argv[*arg_ptr][len - 1]); - } - /* TODO: accept fractional megabytes etc. ? */ -- if (!get_num (argv[*arg_ptr], &num, &c_type)) -+ if (!get_num (arg, &num, &c_type)) - { - error(1, 0, - _("Invalid argument `%s%c' to -size"), -- argv[*arg_ptr], (int)suffix); -+ arg, (int)suffix); - return false; - } -- our_pred = insert_primary (entry); -+our_pred = insert_primary (entry, arg); - our_pred->args.size.kind = c_type; - our_pred->args.size.blocksize = blksize; - our_pred->args.size.size = num; -@@ -2162,9 +2170,10 @@ parse_samefile (const struct parser_table* entry, char **argv, int *arg_ptr) - struct predicate *our_pred; - struct stat st, fst; - int fd, openflags; -+ const char *filename; - - set_stat_placeholders(&st); -- if (!collect_arg_stat_info(argv, arg_ptr, &st)) -+ if (!collect_arg_stat_info(argv, arg_ptr, &st, &filename)) - return false; - - set_stat_placeholders(&fst); -@@ -2289,7 +2298,7 @@ parse_samefile (const struct parser_table* entry, char **argv, int *arg_ptr) - } - } - -- our_pred = insert_primary (entry); -+ our_pred = insert_primary (entry, filename); - our_pred->args.samefileid.ino = st.st_ino; - our_pred->args.samefileid.dev = st.st_dev; - our_pred->args.samefileid.fd = fd; -@@ -2350,7 +2359,7 @@ parse_true (const struct parser_table* entry, char **argv, int *arg_ptr) - (void) argv; - (void) arg_ptr; - -- our_pred = insert_primary (entry); -+ our_pred = insert_primary_noarg (entry); - our_pred->need_stat = our_pred->need_type = false; - our_pred->est_success_rate = 1.0f; - return true; -@@ -2369,7 +2378,7 @@ parse_accesscheck (const struct parser_table* entry, char **argv, int *arg_ptr) - struct predicate *our_pred; - (void) argv; - (void) arg_ptr; -- our_pred = insert_primary (entry); -+ our_pred = insert_primary_noarg (entry); - our_pred->need_stat = our_pred->need_type = false; - our_pred->side_effects = our_pred->no_default_print = false; - if (pred_is(our_pred, pred_executable)) -@@ -2414,7 +2423,7 @@ parse_used (const struct parser_table* entry, char **argv, int *arg_ptr) - struct timespec zero = {0,0}; - if (get_relative_timestamp(offset_str, &tval, zero, DAYSECS, errmsg)) - { -- our_pred = insert_primary (entry); -+ our_pred = insert_primary (entry, offset_str); - our_pred->args.reftime = tval; - our_pred->est_success_rate = estimate_file_age_success_rate(tval.ts.tv_sec / DAYSECS); - return true; -@@ -2472,7 +2481,7 @@ parse_user (const struct parser_table* entry, char **argv, int *arg_ptr) - return false; - } - } -- our_pred = insert_primary (entry); -+ our_pred = insert_primary (entry, username); - our_pred->args.uid = uid; - our_pred->est_success_rate = (our_pred->args.uid < 100) ? 0.99 : 0.2; - return true; -@@ -2650,7 +2659,7 @@ insert_type (char **argv, int *arg_ptr, - error(1, 0, _("Unknown argument to -type: %c"), (*typeletter)); - return false; - } -- our_pred = insert_primary_withpred (entry, which_pred); -+ our_pred = insert_primary_withpred (entry, which_pred, typeletter); - our_pred->est_success_rate = rate; - - /* Figure out if we will need to stat the file, because if we don't -@@ -2706,7 +2715,7 @@ insert_fprintf (struct format_val *vec, - struct segment **segmentp; /* Address of current segment. */ - struct predicate *our_pred; - -- our_pred = insert_primary_withpred (entry, func); -+ our_pred = insert_primary_withpred (entry, func, format_const); - our_pred->side_effects = our_pred->no_default_print = true; - our_pred->args.printf_vec = *vec; - our_pred->need_type = false; -@@ -3045,7 +3054,7 @@ new_insert_exec_ok (const char *action, - if ((argv == NULL) || (argv[*arg_ptr] == NULL)) - return false; - -- our_pred = insert_primary_withpred (entry, func); -+ our_pred = insert_primary_withpred (entry, func, "(some -exec* arguments)"); - our_pred->side_effects = our_pred->no_default_print = true; - our_pred->need_type = our_pred->need_stat = false; - -@@ -3374,7 +3383,7 @@ parse_time (const struct parser_table* entry, char *argv[], int *arg_ptr) - if (!get_relative_timestamp(timearg, &tval, origin, DAYSECS, errmsg)) - return false; - -- our_pred = insert_primary (entry); -+ our_pred = insert_primary (entry, orig_timearg); - our_pred->args.reftime = tval; - our_pred->est_success_rate = estimate_timestamp_success_rate(tval.ts.tv_sec); - -@@ -3487,7 +3496,7 @@ insert_num (char **argv, int *arg_ptr, const struct parser_table *entry) - - if (get_num (numstr, &num, &c_type)) - { -- struct predicate *our_pred = insert_primary (entry); -+ struct predicate *our_pred = insert_primary (entry, numstr); - our_pred->args.numinfo.kind = c_type; - our_pred->args.numinfo.l_val = num; - -diff --git a/find/tree.c b/find/tree.c -index 7420c60..60a0601 100644 ---- a/find/tree.c -+++ b/find/tree.c -@@ -269,10 +269,14 @@ predicate_is_cost_free(const struct predicate *p) - /* Prints a predicate */ - void print_predicate(FILE *fp, const struct predicate *p) - { -- fprintf (fp, "%s%s%s", -- p->p_name, -- p->arg_text ? " " : "", -- p->arg_text ? p->arg_text : ""); -+ if (p->arg_text) -+ { -+ fprintf (fp, "%s %s", p->p_name, p->arg_text); -+ } -+ else -+ { -+ fprintf (fp, "%s", p->p_name); -+ } - } - - -@@ -832,7 +836,8 @@ set_new_parent (struct predicate *curr, enum predicate_precedence high_prec, str - new_parent->need_stat = false; - new_parent->need_type = false; - new_parent->p_cost = NeedsNothing; -- -+ new_parent->arg_text = NULL; -+ - switch (high_prec) - { - case COMMA_PREC: -@@ -1393,6 +1398,18 @@ init_pred_perf(struct predicate *pred) - p->visits = p->successes = 0; - } - -+ -+struct predicate * -+get_new_pred_noarg (const struct parser_table *entry) -+{ -+ struct predicate *p = get_new_pred(entry); -+ if (p) -+ { -+ p->arg_text = NULL; -+ } -+ return p; -+} -+ - - /* Return a pointer to a new predicate structure, which has been - linked in as the last one in the predicates list. -@@ -1433,6 +1450,8 @@ get_new_pred (const struct parser_table *entry) - last_pred->no_default_print = false; - last_pred->need_stat = true; - last_pred->need_type = true; -+ last_pred->p_cost = NeedsUnknown; -+ last_pred->arg_text = "ThisShouldBeSetToSomethingElse"; - last_pred->args.str = NULL; - last_pred->pred_next = NULL; - last_pred->pred_left = NULL; -@@ -1449,7 +1468,8 @@ get_new_pred (const struct parser_table *entry) - predicate is an operator. If it isn't, the AND operator is inserted. */ - - struct predicate * --get_new_pred_chk_op (const struct parser_table *entry) -+get_new_pred_chk_op (const struct parser_table *entry, -+ const char *arg) - { - struct predicate *new_pred; - static const struct parser_table *entry_and = NULL; -@@ -1471,13 +1491,14 @@ get_new_pred_chk_op (const struct parser_table *entry) - case PRIMARY_TYPE: - case CLOSE_PAREN: - /* We need to interpose the and operator. */ -- new_pred = get_new_pred (entry_and); -+ new_pred = get_new_pred_noarg (entry_and); - new_pred->pred_func = pred_and; - new_pred->p_name = "-a"; - new_pred->p_type = BI_OP; - new_pred->p_prec = AND_PREC; - new_pred->need_stat = false; - new_pred->need_type = false; -+ new_pred->arg_text = NULL; - new_pred->args.str = NULL; - new_pred->side_effects = false; - new_pred->no_default_print = false; -@@ -1488,6 +1509,7 @@ get_new_pred_chk_op (const struct parser_table *entry) - } - - new_pred = get_new_pred (entry); -+ new_pred->arg_text = arg; - new_pred->parser_entry = entry; - return new_pred; - } -diff --git a/find/util.c b/find/util.c -index a06eada..cc9a3eb 100644 ---- a/find/util.c -+++ b/find/util.c -@@ -89,11 +89,13 @@ static struct debug_option_assoc debugassoc[] = - operator. */ - - struct predicate * --insert_primary_withpred (const struct parser_table *entry, PRED_FUNC pred_func) -+insert_primary_withpred (const struct parser_table *entry, -+ PRED_FUNC pred_func, -+ const char *arg) - { - struct predicate *new_pred; - -- new_pred = get_new_pred_chk_op (entry); -+ new_pred = get_new_pred_chk_op (entry, arg); - new_pred->pred_func = pred_func; - new_pred->p_name = entry->parser_name; - new_pred->args.str = NULL; -@@ -118,10 +120,16 @@ insert_primary_withpred (const struct parser_table *entry, PRED_FUNC pred_func) - either not there at all (we are the very first node) or is an - operator. */ - struct predicate * --insert_primary (const struct parser_table *entry) -+insert_primary (const struct parser_table *entry, const char *arg) - { - assert (entry->pred_func != NULL); -- return insert_primary_withpred(entry, entry->pred_func); -+ return insert_primary_withpred(entry, entry->pred_func, arg); -+} -+ -+struct predicate * -+insert_primary_noarg (const struct parser_table *entry) -+{ -+ return insert_primary(entry, NULL); - } - - diff --git a/meta/recipes-extended/findutils/findutils-4.4.2/02-28824.patch b/meta/recipes-extended/findutils/findutils-4.4.2/02-28824.patch deleted file mode 100644 index c0ff3ff1c0..0000000000 --- a/meta/recipes-extended/findutils/findutils-4.4.2/02-28824.patch +++ /dev/null @@ -1,294 +0,0 @@ -Upstream-Status: Backport - -commit 76ed377d6d3e4a83a00cabd401f751b37ecd1e7b -Author: James Youngman <jay@gnu.org> -Date: Sat Feb 20 13:11:45 2010 +0000 - - Fix Savannah bug# 28824: "-ctime x" yields "missing argument to `-ctime'". - - * find/parser.c (parse_fls): If the argument is invalid, reverse - the change that collect_arg() made to *arg_ptr (that is, don't - consume the argument). - (parse_fprint0): Likewise. - (parse_gid): Likewise. - (parse_group): Likewise. - (parse_inum): Likewise. - (parse_links): Likewise. - (do_parse_xmin): Likewise. - (parse_name): Likewise. - (parse_printf): Likewise. - (parse_uid): Likewise. - (parse_used): Likewise. - (parse_time): Likewise. - - Signed-off-by: James Youngman <jay@gnu.org> - -diff --git a/ChangeLog b/ChangeLog -index d0ce1fe..13539a4 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,0 +1,19 @@ -+2010-02-20 James Youngman <jay@gnu.org> -+ -+ Fix Savannah bug# 28824: "-ctime x" yields "missing argument to -+ `-ctime'". -+ * find/parser.c (parse_fls): If the argument is invalid, reverse -+ the change that collect_arg() made to *arg_ptr (that is, don't -+ consume the argument). -+ (parse_fprint0): Likewise. -+ (parse_gid): Likewise. -+ (parse_group): Likewise. -+ (parse_inum): Likewise. -+ (parse_links): Likewise. -+ (do_parse_xmin): Likewise. -+ (parse_name): Likewise. -+ (parse_printf): Likewise. -+ (parse_uid): Likewise. -+ (parse_used): Likewise. -+ (parse_time): Likewise. -+ -diff --git a/NEWS b/NEWS -index 5394311..4e910df 100644 ---- a/NEWS -+++ b/NEWS -@@ -4,5 +4,8 @@ GNU findutils NEWS - User visible changes. -*- outline -*- (allout) - - ** Bug Fixes - -+#28824: Corrected error message for "-ctime x". -+ Likewise for -gid, -inum, -links, -mmin, -cmin, -amin, -+ -uid, -used, -atime, -mtime, -ctime. - #26537: find -prune now makes sure it has valid stat() information. - -diff --git a/find/parser.c b/find/parser.c -index 2e6b989..08758ee 100644 ---- a/find/parser.c -+++ b/find/parser.c -@@ -886,8 +886,14 @@ static boolean - parse_fls (const struct parser_table* entry, char **argv, int *arg_ptr) - { - const char *filename; -- return collect_arg(argv, arg_ptr, &filename) -- && insert_fls(entry, filename); -+ if (collect_arg(argv, arg_ptr, &filename)) -+ { -+ if (insert_fls(entry, filename)) -+ return true; -+ else -+ --*arg_ptr; /* don't consume the invalid arg. */ -+ } -+ return false; - } - - static boolean -@@ -937,9 +943,13 @@ parse_fprint0 (const struct parser_table* entry, char **argv, int *arg_ptr) - { - const char *filename; - if (collect_arg(argv, arg_ptr, &filename)) -- return insert_fprint(entry, filename); -- else -- return false; -+ { -+ if (insert_fprint(entry, filename)) -+ return true; -+ else -+ --*arg_ptr; /* don't consume the bad arg. */ -+ } -+ return false; - } - - static float estimate_fstype_success_rate(const char *fsname) -@@ -993,6 +1003,7 @@ parse_gid (const struct parser_table* entry, char **argv, int *arg_ptr) - } - else - { -+ --*arg_ptr; /* don't consume the invalid argument. */ - return false; - } - } -@@ -1049,6 +1060,7 @@ static boolean - parse_group (const struct parser_table* entry, char **argv, int *arg_ptr) - { - const char *groupname; -+ const int saved_argc = *arg_ptr; - - if (collect_arg(argv, arg_ptr, &groupname)) - { -@@ -1077,6 +1089,7 @@ parse_group (const struct parser_table* entry, char **argv, int *arg_ptr) - "because it has the unexpected suffix %s"), - quotearg_n_style(0, options.err_quoting_style, groupname), - quotearg_n_style(1, options.err_quoting_style, groupname+gid_len)); -+ *arg_ptr = saved_argc; /* don't consume the invalid argument. */ - return false; - } - } -@@ -1092,6 +1105,7 @@ parse_group (const struct parser_table* entry, char **argv, int *arg_ptr) - { - error(1, 0, _("argument to -group is empty, but should be a group name")); - } -+ *arg_ptr = saved_argc; /* don't consume the invalid argument. */ - return false; - } - } -@@ -1256,6 +1270,7 @@ parse_inum (const struct parser_table* entry, char **argv, int *arg_ptr) - } - else - { -+ --*arg_ptr; /* don't consume the invalid argument. */ - return false; - } - } -@@ -1310,6 +1325,7 @@ parse_links (const struct parser_table* entry, char **argv, int *arg_ptr) - } - else - { -+ --*arg_ptr; /* don't consume the invalid argument. */ - return false; - } - } -@@ -1358,6 +1374,7 @@ insert_depthspec(const struct parser_table* entry, char **argv, int *arg_ptr, - error(1, 0, _("Expected a positive decimal integer argument to %s, but got %s"), - predicate, - quotearg_n_style(0, options.err_quoting_style, depthstr)); -+ /* NOTREACHED */ - return false; - } - /* missing argument */ -@@ -1385,6 +1402,7 @@ do_parse_xmin (const struct parser_table* entry, - enum xval xv) - { - const char *minutes; -+ const int saved_argc = *arg_ptr; - - if (collect_arg(argv, arg_ptr, &minutes)) - { -@@ -1401,6 +1419,11 @@ do_parse_xmin (const struct parser_table* entry, - our_pred->est_success_rate = estimate_timestamp_success_rate(tval.ts.tv_sec); - return true; - } -+ else -+ { -+ /* Don't consume the invalid argument. */ -+ *arg_ptr = saved_argc; -+ } - } - return false; - } -@@ -1427,6 +1450,8 @@ static boolean - parse_name (const struct parser_table* entry, char **argv, int *arg_ptr) - { - const char *name; -+ const int saved_argc = *arg_ptr; -+ - if (collect_arg(argv, arg_ptr, &name)) - { - fnmatch_sanitycheck(); -@@ -1438,6 +1463,10 @@ parse_name (const struct parser_table* entry, char **argv, int *arg_ptr) - our_pred->est_success_rate = estimate_pattern_match_rate(name, 0); - return true; - } -+ else -+ { -+ *arg_ptr = saved_argc; /* don't consume the invalid argument. */ -+ } - } - return false; - } -@@ -1954,11 +1983,21 @@ static boolean - parse_printf (const struct parser_table* entry, char **argv, int *arg_ptr) - { - const char *format; -+ const int saved_argc = *arg_ptr; -+ - if (collect_arg(argv, arg_ptr, &format)) - { - struct format_val fmt; - open_stdout(&fmt); -- return insert_fprintf (&fmt, entry, pred_fprintf, format); -+ if (insert_fprintf (&fmt, entry, pred_fprintf, format)) -+ { -+ return true; -+ } -+ else -+ { -+ *arg_ptr = saved_argc; /* don't consume the invalid argument. */ -+ return false; -+ } - } - return false; - } -@@ -1967,15 +2006,21 @@ static boolean - parse_fprintf (const struct parser_table* entry, char **argv, int *arg_ptr) - { - const char *format, *filename; -+ int saved_argc = *arg_ptr; -+ - if (collect_arg(argv, arg_ptr, &filename)) - { - if (collect_arg(argv, arg_ptr, &format)) - { - struct format_val fmt; - open_output_file (filename, &fmt); -- return insert_fprintf (&fmt, entry, pred_fprintf, format); -+ saved_argc = *arg_ptr; -+ -+ if (insert_fprintf (&fmt, entry, pred_fprintf, format)) -+ return true; - } - } -+ *arg_ptr = saved_argc; /* don't consume the invalid argument. */ - return false; - } - -@@ -2405,6 +2450,7 @@ parse_uid (const struct parser_table* entry, char **argv, int *arg_ptr) - } - else - { -+ --*arg_ptr; /* don't consume the invalid argument. */ - return false; - } - } -@@ -2431,6 +2477,7 @@ parse_used (const struct parser_table* entry, char **argv, int *arg_ptr) - else - { - error(1, 0, _("Invalid argument %s to -used"), offset_str); -+ /*NOTREACHED*/ - return false; - } - } -@@ -2610,6 +2657,7 @@ insert_type (char **argv, int *arg_ptr, - if (strlen(typeletter) != 1u) - { - error(1, 0, _("Arguments to -type should contain only one letter")); -+ /*NOTREACHED*/ - return false; - } - -@@ -2657,6 +2705,7 @@ insert_type (char **argv, int *arg_ptr, - #endif - default: /* None of the above ... nuke 'em. */ - error(1, 0, _("Unknown argument to -type: %c"), (*typeletter)); -+ /*NOTREACHED*/ - return false; - } - our_pred = insert_primary_withpred (entry, which_pred, typeletter); -@@ -3349,6 +3398,7 @@ parse_time (const struct parser_table* entry, char *argv[], int *arg_ptr) - const char *errmsg = "arithmetic overflow while converting %s " - "days to a number of seconds"; - struct timespec origin; -+ const int saved_argc = *arg_ptr; - - if (!collect_arg(argv, arg_ptr, &timearg)) - return false; -@@ -3381,7 +3431,10 @@ parse_time (const struct parser_table* entry, char *argv[], int *arg_ptr) - timearg = orig_timearg; - - if (!get_relative_timestamp(timearg, &tval, origin, DAYSECS, errmsg)) -- return false; -+ { -+ *arg_ptr = saved_argc; /* don't consume the invalid argument */ -+ return false; -+ } - - our_pred = insert_primary (entry, orig_timearg); - our_pred->args.reftime = tval; diff --git a/meta/recipes-extended/findutils/findutils-4.4.2/03-28872.patch b/meta/recipes-extended/findutils/findutils-4.4.2/03-28872.patch deleted file mode 100644 index 940aaf6ff5..0000000000 --- a/meta/recipes-extended/findutils/findutils-4.4.2/03-28872.patch +++ /dev/null @@ -1,58 +0,0 @@ -Upstream-Status: Backport - -commit 5f5eb921765794e8fc58c4bdffa2daa2ae34800f -Author: James Youngman <jay@gnu.org> -Date: Sat Feb 20 19:53:13 2010 +0000 - - Fix Savannah bug#28872, Mistake in "Problems with -exec and filenames" - - * doc/find.texi (Problems with -exec and filenames): Add missing - $0 argument in example for sh -c 'something "$@" sh ... - * NEWS: Mention this change. - - Signed-off-by: James Youngman <jay@gnu.org> - -diff --git a/ChangeLog b/ChangeLog -index 13539a4..e94ba96 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,5 +1,10 @@ - 2010-02-20 James Youngman <jay@gnu.org> - -+ Fix Savannah bug#28872, Mistake in "Problems with -exec and filenames" -+ * doc/find.texi (Problems with -exec and filenames): Add missing -+ $0 argument in example for sh -c 'something "$@" sh ... -+ * NEWS: Mention this change. -+ - Fix Savannah bug# 28824: "-ctime x" yields "missing argument to - `-ctime'". - * find/parser.c (parse_fls): If the argument is invalid, reverse -diff --git a/NEWS b/NEWS -index 4e910df..4c97be9 100644 ---- a/NEWS -+++ b/NEWS -@@ -4,6 +4,9 @@ GNU findutils NEWS - User visible changes. -*- outline -*- (allout) - - ** Bug Fixes - -+#28872: Mistake in "#safer" example in "Problems with -exec and -+ filenames" section of the Texinfo manual. -+ - #28824: Corrected error message for "-ctime x". - Likewise for -gid, -inum, -links, -mmin, -cmin, -amin, - -uid, -used, -atime, -mtime, -ctime. -diff --git a/doc/find.texi b/doc/find.texi -index 2e5958d..391ffa0 100644 ---- a/doc/find.texi -+++ b/doc/find.texi -@@ -4830,8 +4830,8 @@ problem: - - @example - # safer --find -exec sh -c 'something "$@@"' @{@} \; --find -execdir sh -c 'something "$@@"' @{@}\; -+find -exec sh -c 'something "$@@"' sh @{@} \; -+find -execdir sh -c 'something "$@@"' sh @{@}\; - @end example - - This approach is not guaranteed to avoid every problem, but it is much diff --git a/meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_doc.patch b/meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_doc.patch deleted file mode 100644 index a48cdc221c..0000000000 --- a/meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_doc.patch +++ /dev/null @@ -1,84 +0,0 @@ -Fix documentation build errors - -This fixes the following errors building the findutils documentation: -find-maint.texi:45: misplaced { -find-maint.texi:45: misplaced } -find-maint.texi:236: warning: node next `Make the Compiler Find the Bugs' in menu `The File System Is Being Modified' and in sectioning `Factor Out Repeated Code' differ -find-maint.texi:335: warning: node `Debugging is For Users Too' is next for `Factor Out Repeated Code' in sectioning but not in menu -find-maint.texi:335: warning: node prev `Factor Out Repeated Code' in menu `Debugging is For Users Too' and in sectioning `Make the Compiler Find the Bugs' differ -find-maint.texi:378: warning: node next `Debugging is For Users Too' in menu `Factor Out Repeated Code' and in sectioning `Don't Trust the File System Contents' differ -find-maint.texi:378: warning: node prev `Debugging is For Users Too' in menu `Don't Trust the File System Contents' and in sectioning `Factor Out Repeated Code' differ -find-maint.texi:392: warning: node next `Don't Trust the File System Contents' in menu `Debugging is For Users Too' and in sectioning `The File System Is Being Modified' differ -find-maint.texi:392: warning: node prev `Don't Trust the File System Contents' in menu `The File System Is Being Modified' and in sectioning `Debugging is For Users Too' differ -find-maint.texi:417: warning: node `Don't Trust the File System Contents' is next for `The File System Is Being Modified' in menu but not in sectioning -find-maint.texi:417: warning: node prev `The File System Is Being Modified' in menu `Make the Compiler Find the Bugs' and in sectioning `Don't Trust the File System Contents' differ -find.texi:53: misplaced { -find.texi:53: misplaced } -find.texi:1862: warning: node `Formatting Flags' is next for `Time Directives' in menu but not in sectioning -find.texi:1975: warning: node `Formatting Flags' is next for `Combined Time Formats' in sectioning but not in menu -find.texi:2004: warning: node prev `Formatting Flags' in menu `Time Directives' and in sectioning `Combined Time Formats' differ -find.texi:2004: warning: node up `Formatting Flags' in menu `Format Directives' and in sectioning `Time Formats' differ -find.texi:1893: node `Time Formats' lacks menu item for `Formatting Flags' despite being its Up target - -Upstream-Status: Backport -Signed-off-by: Jonathan Liu <net147@gmail.com> - ---- a/doc/find-maint.texi -+++ b/doc/find-maint.texi -@@ -42,7 +42,7 @@ Free Documentation License''. - - @page - @vskip 0pt plus 1filll --@insertcopying{} -+@insertcopying - @end titlepage - - @contents -@@ -227,10 +227,10 @@ circumstances. - - @menu - * Make the Compiler Find the Bugs:: -+* Factor Out Repeated Code:: - * The File System Is Being Modified:: - * Don't Trust the File System Contents:: - * Debugging is For Users Too:: --* Factor Out Repeated Code:: - @end menu - - @node Make the Compiler Find the Bugs ---- a/doc/find.texi -+++ b/doc/find.texi -@@ -50,7 +50,7 @@ Texts. A copy of the license is included in the section entitled - - @page - @vskip 0pt plus 1filll --@insertcopying{} -+@insertcopying - @end titlepage - - @contents -@@ -1665,6 +1665,7 @@ no output is ever sent to it. - * Escapes:: - * Format Directives:: - * Time Formats:: -+* Formatting Flags:: - @end menu - - @node Escapes -@@ -1733,7 +1734,6 @@ from the novel you are reading. - * Size Directives:: - * Location Directives:: - * Time Directives:: --* Formatting Flags:: - @end menu - - @node Name Directives -@@ -2002,7 +2002,7 @@ seconds field includes a fractional part. - @end table - - @node Formatting Flags --@subsubsection Formatting Flags -+@subsection Formatting Flags - - The @samp{%m} and @samp{%d} directives support the @samp{#}, @samp{0} - and @samp{+} flags, but the other directives do not, even if they diff --git a/meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_for_automake-1.12.patch b/meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_for_automake-1.12.patch deleted file mode 100644 index d4a7e95728..0000000000 --- a/meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_for_automake-1.12.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Pending - -This patch fixes following issue with automake 1.12 - -| configure.ac:80: error: automatic de-ANSI-fication support has been removed - -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> -2012/05/03 - -Index: findutils-4.4.2/configure.ac -=================================================================== ---- findutils-4.4.2.orig/configure.ac -+++ findutils-4.4.2/configure.ac -@@ -77,8 +77,6 @@ AC_PROG_CPP - dnl for gnulib - gl_EARLY - --AM_C_PROTOTYPES -- - AC_PROG_INSTALL - AC_PROG_RANLIB - dnl AC_PROG_LIBTOOL diff --git a/meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_for_x32.patch b/meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_for_x32.patch deleted file mode 100644 index b78cc7539c..0000000000 --- a/meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_for_x32.patch +++ /dev/null @@ -1,40 +0,0 @@ -Upstream-Status: Pending - -Author: H.J. Lu <hjl.tools@gmail.com> - -Work around gnulib time_t assumption in findutils for x32 - -time_t is 64bit and long int is 32bit on x32. But gnulib used in -findutils assumes time_t values fit into long int. Such assumption is -invalid for x32 and should be removed. - -This patch is a workaround to compile gnulib for x32. - -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/05 - - -Index: findutils-4.4.2/gnulib/lib/getdate.y -=================================================================== ---- findutils-4.4.2.orig/gnulib/lib/getdate.y -+++ findutils-4.4.2/gnulib/lib/getdate.y -@@ -114,7 +114,6 @@ - wraps around, but there's no portable way to check for that at - compile-time. */ - verify (TYPE_IS_INTEGER (time_t)); --verify (LONG_MIN <= TYPE_MINIMUM (time_t) && TYPE_MAXIMUM (time_t) <= LONG_MAX); - - /* An integer value, and the number of digits in its textual - representation. */ -Index: findutils-4.4.2/gnulib/lib/mktime.c -=================================================================== ---- findutils-4.4.2.orig/gnulib/lib/mktime.c -+++ findutils-4.4.2/gnulib/lib/mktime.c -@@ -166,7 +166,7 @@ ydhms_diff (long int year1, long int yda - { - verify (C99_integer_division, -1 / 2 == 0); - verify (long_int_year_and_yday_are_wide_enough, -- INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX); -+ INT_MAX <= TIME_T_MAX / 2 || TIME_T_MAX <= UINT_MAX); - - /* Compute intervening leap days correctly even if year is negative. - Take care to avoid integer overflow here. */ diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc index 4f4068a091..37c84cc59b 100644 --- a/meta/recipes-extended/findutils/findutils.inc +++ b/meta/recipes-extended/findutils/findutils.inc @@ -7,7 +7,7 @@ BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils" SECTION = "console/utils" -SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz" +SRC_URI = "ftp://alpha.gnu.org/gnu/${BPN}/${BP}.tar.gz" inherit autotools gettext texinfo update-alternatives diff --git a/meta/recipes-extended/findutils/findutils_4.2.31.bb b/meta/recipes-extended/findutils/findutils_4.2.31.bb index 72b657a100..7dee018834 100644 --- a/meta/recipes-extended/findutils/findutils_4.2.31.bb +++ b/meta/recipes-extended/findutils/findutils_4.2.31.bb @@ -4,9 +4,10 @@ PR = "r4" require findutils.inc -SRC_URI += "file://gnulib-extension.patch \ - file://findutils_fix_for_automake-1.12.patch \ - file://findutils-fix-doc-build-error.patch \ +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ + file://gnulib-extension.patch \ + file://findutils_fix_for_automake-1.12.patch \ + file://findutils-fix-doc-build-error.patch \ " SRC_URI[md5sum] = "a0e31a0f18a49709bf5a449867c8049a" diff --git a/meta/recipes-extended/findutils/findutils_4.4.2.bb b/meta/recipes-extended/findutils/findutils_4.4.2.bb deleted file mode 100644 index faf2ebe462..0000000000 --- a/meta/recipes-extended/findutils/findutils_4.4.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -require findutils.inc - -# GPLv2+ (<< 4.2.32), GPLv3+ (>= 4.2.32) -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" - -PR = "r6" - -SRC_URI += "file://01-27017.patch \ - file://02-28824.patch \ - file://03-28872.patch \ - file://findutils_fix_for_x32.patch \ - file://findutils_fix_for_automake-1.12.patch \ - file://findutils_fix_doc.patch \ - " - -SRC_URI[md5sum] = "351cc4adb07d54877fa15f75fb77d39f" -SRC_URI[sha256sum] = "434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a" - -DEPENDS = "bison-native" - -# http://savannah.gnu.org/bugs/?27299 -CACHED_CONFIGUREVARS += "${@bb.utils.contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', 'gl_cv_func_wcwidth_works=yes', '', d)}" - -EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" diff --git a/meta/recipes-extended/findutils/findutils_4.5.14.bb b/meta/recipes-extended/findutils/findutils_4.5.14.bb new file mode 100644 index 0000000000..9253637fc1 --- /dev/null +++ b/meta/recipes-extended/findutils/findutils_4.5.14.bb @@ -0,0 +1,15 @@ +require findutils.inc + +# GPLv2+ (<< 4.2.32), GPLv3+ (>= 4.2.32) +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" + +DEPENDS = "bison-native" + +SRC_URI[md5sum] = "a8a8176282fd28e8d1234c84d847fa66" +SRC_URI[sha256sum] = "0de3cf625a5c9f154eee3171e072515ffdde405244dd00502af617ac57b73ae2" + +# http://savannah.gnu.org/bugs/?27299 +CACHED_CONFIGUREVARS += "${@bb.utils.contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', 'gl_cv_func_wcwidth_works=yes', '', d)}" + +EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" diff --git a/meta/recipes-extended/gawk/gawk_4.1.1.bb b/meta/recipes-extended/gawk/gawk_4.1.1.bb index 3266f58cbd..0a1811bb74 100644 --- a/meta/recipes-extended/gawk/gawk_4.1.1.bb +++ b/meta/recipes-extended/gawk/gawk_4.1.1.bb @@ -2,7 +2,7 @@ SUMMARY = "GNU awk text processing utility" DESCRIPTION = "The GNU version of awk, a text processing utility. \ Awk interprets a special-purpose programming language to do \ quick and easy text pattern matching and reformatting jobs." -HOMEPAGE = "www.gnu.org/software/gawk" +HOMEPAGE = "https://www.gnu.org/software/gawk/" BUGTRACKER = "bug-gawk@gnu.org" SECTION = "console/utils" diff --git a/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch b/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch index 1c0a6d5da5..a1c9368cc9 100644 --- a/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch +++ b/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch @@ -7,22 +7,25 @@ This addresses the cryto dependency seen during build. Upstream-Status: Backport Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + +Rebase the patch to ghostscript-9.15 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- cups/libs/cups/http-private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/cups/libs/cups/http-private.h b/cups/libs/cups/http-private.h -index 9c88281..94a9817 100644 +index 99a85c3..a674852 100644 --- a/cups/libs/cups/http-private.h +++ b/cups/libs/cups/http-private.h -@@ -98,7 +98,6 @@ extern BIO_METHOD *_httpBIOMethods(void); - * The GNU TLS library is more of a "bare metal" SSL/TLS library... - */ +@@ -80,7 +80,6 @@ typedef int socklen_t; + # elif defined HAVE_GNUTLS # include <gnutls/gnutls.h> + # include <gnutls/x509.h> -# include <gcrypt.h> - - typedef struct - { + # elif defined(HAVE_CDSASSL) + # include <CoreFoundation/CoreFoundation.h> + # include <Security/Security.h> -- -2.0.0 +1.9.1 diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch index 601f5f127e..ae9da6e08e 100644 --- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch +++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch @@ -12,6 +12,9 @@ RP: Extended || true to all CP_ operations, they all can race e.g.: Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Rebase the patch to ghostscript-9.15 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + diff --git a/base/expat.mak b/base/expat.mak index 4ee9c8c..2e16a9d 100644 --- a/base/expat.mak @@ -39,10 +42,10 @@ index 16f2b95..409f75b 100644 # Define the shared version. $(FTGEN)freetype_1.dev : $(TOP_MAKEFILES) $(FT_MAK) $(ECHOGS_XE) diff --git a/base/gs.mak b/base/gs.mak -index 7d75fb0..2a9596c 100644 +index 3fc67df..1fc3e26 100644 --- a/base/gs.mak +++ b/base/gs.mak -@@ -433,7 +433,7 @@ $(gconfxx_h) : $(ld_tr) +@@ -434,7 +434,7 @@ $(gconfxx_h) : $(ld_tr) $(gconfig_h) : $(gconfxx_h) $(RM_) $(gconfig_h) @@ -78,7 +81,7 @@ index bb74630..44617a0 100644 # dev file for shared (separately built) jbig2dec library $(JBIG2GEN)jbig2dec_1.dev : $(TOP_MAKEFILES) $(JBIG2_MAK) $(ECHOGS_XE) diff --git a/base/jpeg.mak b/base/jpeg.mak -index 5310a20..43cee63 100644 +index e300a04..9fdad5a 100644 --- a/base/jpeg.mak +++ b/base/jpeg.mak @@ -96,7 +96,7 @@ jconfig_h=$(GLGEN)jconfig.h @@ -148,7 +151,7 @@ index 5310a20..43cee63 100644 # In order to avoid having to keep the dependency lists for the IJG code # accurate, we simply make all of them depend on the only files that -@@ -174,40 +174,40 @@ $(JGEN)jpegc0.dev : $(JPEG_MAK) $(ECHOGS_XE) $(jpegc0_) +@@ -181,40 +181,40 @@ $(JGEN)jpegc0.dev : $(JPEG_MAK) $(ECHOGS_XE) $(jpegc0_) $(SETMOD) $(JGEN)jpegc0 $(jpegc0_) $(JOBJ)jcomapi.$(OBJ) : $(JSRC)jcomapi.c $(JDEP) @@ -196,7 +199,7 @@ index 5310a20..43cee63 100644 jpege6=$(JOBJ)jcapimin.$(OBJ) $(JOBJ)jcapistd.$(OBJ) $(JOBJ)jcinit.$(OBJ) -@@ -223,90 +223,90 @@ $(JGEN)jpege6.dev : $(JPEG_MAK) $(ECHOGS_XE) $(JGEN)jpegc0.dev $(jpege6) $(jpege +@@ -230,90 +230,90 @@ $(JGEN)jpege6.dev : $(JPEG_MAK) $(ECHOGS_XE) $(JGEN)jpegc0.dev $(jpege6) $(jpege $(ADDMOD) $(JGEN)jpege6 -obj $(jpege_3) $(JOBJ)jcapimin.$(OBJ) : $(JSRC)jcapimin.c $(JDEP) @@ -304,7 +307,7 @@ index 5310a20..43cee63 100644 jpegd6=$(JOBJ)jdapimin.$(OBJ) $(JOBJ)jdapistd.$(OBJ) $(JOBJ)jdinput.$(OBJ) $(JOBJ)jdhuff.$(OBJ) -@@ -322,76 +322,76 @@ $(JGEN)jpegd6.dev : $(JPEG_MAK) $(ECHOGS_XE) $(JGEN)jpegc0.dev $(jpegd6) $(jpegd +@@ -329,76 +329,76 @@ $(JGEN)jpegd6.dev : $(JPEG_MAK) $(ECHOGS_XE) $(JGEN)jpegc0.dev $(jpegd6) $(jpegd $(ADDMOD) $(JGEN)jpegd6 -obj $(jpegd_3) $(JOBJ)jdapimin.$(OBJ) : $(JSRC)jdapimin.c $(JDEP) @@ -436,10 +439,10 @@ index 52f750c..33a9c16 100644 # dev file for shared (separately built) lcms library $(LCMS2GEN)lcms2_1.dev : $(TOP_MAKEFILES) $(LCMS2_MAK) $(ECHOGS_XE) diff --git a/base/lcups.mak b/base/lcups.mak -index 0bfb3ac..fcdb170 100644 +index 7504c44..7b9b979 100644 --- a/base/lcups.mak +++ b/base/lcups.mak -@@ -114,7 +114,7 @@ libcups.config-clean : +@@ -116,7 +116,7 @@ libcups.config-clean : # instantiate the requested build option (shared or compiled in) $(LIBCUPSGEN)lcups.dev : $(TOP_MAKEFILES) $(LIBCUPSGEN)lcups_$(SHARE_LCUPS).dev @@ -448,7 +451,7 @@ index 0bfb3ac..fcdb170 100644 # Define the shared version. $(LIBCUPSGEN)lcups_1.dev : $(TOP_MAKEFILES) $(LCUPS_MAK) $(ECHOGS_XE) -@@ -131,7 +131,7 @@ $(LIBCUPSGEN)lcups_0.dev : $(TOP_MAKEFILES) $(LCUPS_MAK) $(ECHOGS_XE) \ +@@ -133,7 +133,7 @@ $(LIBCUPSGEN)lcups_0.dev : $(TOP_MAKEFILES) $(LCUPS_MAK) $(ECHOGS_XE) \ # for simplicity we have every source file depend on all headers $(LIBCUPSGEN)$(D)cups$(D)config.h : $(LCUPSSRCDIR)$(D)libs$(D)config$(LCUPSBUILDTYPE).h @@ -457,7 +460,7 @@ index 0bfb3ac..fcdb170 100644 $(LIBCUPSOBJ)adminutil.$(OBJ) : $(LIBCUPSSRC)adminutil.c $(LIBSCUPSHEADERS) $(LIBCUPSGEN)$(D)cups$(D)config.h $(LCUPS_CC) $(LCUPSO_)adminutil.$(OBJ) $(C_) $(LIBCUPSSRC)adminutil.c -@@ -218,7 +218,7 @@ $(LIBCUPSOBJ)mark.$(OBJ) : $(LIBCUPSSRC)mark.c $(LIBSCUPSHEADERS) +@@ -220,7 +220,7 @@ $(LIBCUPSOBJ)mark.$(OBJ) : $(LIBCUPSSRC)mark.c $(LIBSCUPSHEADERS) $(LCUPS_CC) $(LCUPSO_)mark.$(OBJ) $(C_) $(LIBCUPSSRC)mark.c $(LIBCUPSOBJ)cups_md5.$(OBJ) : $(LIBCUPSSRC)md5.c $(LIBSCUPSHEADERS) @@ -466,7 +469,7 @@ index 0bfb3ac..fcdb170 100644 $(LCUPS_CC) $(LCUPSO_)cups_md5.$(OBJ) $(C_) $(LIBCUPSGEN)cups_md5.c $(LIBCUPSOBJ)md5passwd.$(OBJ) : $(LIBCUPSSRC)md5passwd.c $(LIBSCUPSHEADERS) -@@ -255,7 +255,7 @@ $(LIBCUPSOBJ)snmp.$(OBJ) : $(LIBCUPSSRC)snmp.c $(LIBSCUPSHEADERS) +@@ -257,7 +257,7 @@ $(LIBCUPSOBJ)snmp.$(OBJ) : $(LIBCUPSSRC)snmp.c $(LIBSCUPSHEADERS) $(LCUPS_CC) $(LCUPSO_)snmp.$(OBJ) $(C_) $(LIBCUPSSRC)snmp.c $(LIBCUPSOBJ)cups_snpf.$(OBJ) : $(LIBCUPSSRC)snprintf.c $(LIBSCUPSHEADERS) @@ -475,18 +478,18 @@ index 0bfb3ac..fcdb170 100644 $(LCUPS_CC) $(LCUPSO_)cups_snpf.$(OBJ) $(C_) $(LIBCUPSGEN)cups_snpf.c $(LIBCUPSOBJ)string.$(OBJ) : $(LIBCUPSSRC)string.c $(LIBSCUPSHEADERS) -@@ -271,5 +271,5 @@ $(LIBCUPSOBJ)usersys.$(OBJ) : $(LIBCUPSSRC)usersys.c $(LIBSCUPSHEADERS) - $(LCUPS_CC) $(LCUPSO_)usersys.$(OBJ) $(C_) $(LIBCUPSSRC)usersys.c +@@ -279,5 +279,5 @@ $(LIBCUPSOBJ)thread.$(OBJ) : $(LIBCUPSSRC)thread.c $(LIBSCUPSHEADERS) + $(LCUPS_CC) $(LCUPSO_)thread.$(OBJ) $(C_) $(LIBCUPSSRC)thread.c $(LIBCUPSOBJ)cups_util.$(OBJ) : $(LIBCUPSSRC)util.c $(LIBSCUPSHEADERS) - $(CP_) $(LIBCUPSSRC)util.c $(LIBCUPSGEN)cups_util.c + $(CP_) $(LIBCUPSSRC)util.c $(LIBCUPSGEN)cups_util.c || true $(LCUPS_CC) $(LCUPSO_)cups_util.$(OBJ) $(C_) $(LIBCUPSGEN)cups_util.c diff --git a/base/lcupsi.mak b/base/lcupsi.mak -index ea4047f..0102d93 100644 +index da47da5..fa7d74c 100644 --- a/base/lcupsi.mak +++ b/base/lcupsi.mak -@@ -73,7 +73,7 @@ libcupsi.config-clean : +@@ -59,7 +59,7 @@ libcupsi.config-clean : # instantiate the requested build option (shared or compiled in) $(LIBCUPSIGEN)lcupsi.dev : $(TOP_MAKEFILES) $(LIBCUPSIGEN)lcupsi_$(SHARE_LCUPSI).dev @@ -509,10 +512,10 @@ index 3f50892..97c76a0 100644 # external link .dev $(LDF_JB2_GEN)ldf_jb2_1.dev : $(TOP_MAKEFILES) $(LDF_JB2_MAK) $(ECHOGS_XE) diff --git a/base/lib.mak b/base/lib.mak -index 3ad7db3..87b4f01 100644 +index 90c9249..fb11aba 100644 --- a/base/lib.mak +++ b/base/lib.mak -@@ -343,7 +343,7 @@ md5_=$(GLOBJ)md5.$(OBJ) +@@ -350,7 +350,7 @@ md5_=$(GLOBJ)md5.$(OBJ) $(GLOBJ)md5.$(OBJ) : $(GLSRC)md5.c $(AK) $(md5_h) $(std_h) $(MAKEDIRS) $(EXP)$(ECHOGS_XE) $(EXP)$(ECHOGS_XE) -w $(GLGEN)md5.h -x 23 include -x 2022 memory_.h -x 22 $(EXP)$(ECHOGS_XE) -a $(GLGEN)md5.h -+R $(GLSRC)md5.h @@ -521,7 +524,7 @@ index 3ad7db3..87b4f01 100644 $(GLCC) $(GLO_)md5.$(OBJ) $(C_) $(GLGEN)md5.c $(RM_) $(GLGEN)md5.c $(GLGEN)md5.h -@@ -624,19 +624,19 @@ $(GLOBJ)gconfig.$(OBJ) : $(gconfig_h) $(GLSRC)gconf.c $(AK) $(gx_h)\ +@@ -631,19 +631,19 @@ $(GLOBJ)gconfig.$(OBJ) : $(gconfig_h) $(GLSRC)gconf.c $(AK) $(gx_h)\ $(gxdevice_h) $(gxiclass_h) $(gxiodev_h) $(gxiparam_h) $(TOP_MAKEFILES)\ $(MAKEDDIRS) $(RM_) $(GLGEN)gconfig.c @@ -544,7 +547,7 @@ index 3ad7db3..87b4f01 100644 $(GLCCAUX) $(C_) $(AUXO_)gscdefs.$(OBJ) $(AUX)gscdefs.c $(GLOBJ)gxacpath.$(OBJ) : $(GLSRC)gxacpath.c $(AK) $(gx_h)\ -@@ -1527,7 +1527,7 @@ $(GLOBJ)sjpegc_0.$(OBJ) : $(GLSRC)sjpegc.c $(AK) $(stdio__h) $(string__h)\ +@@ -1535,7 +1535,7 @@ $(GLOBJ)sjpegc_0.$(OBJ) : $(GLSRC)sjpegc.c $(AK) $(stdio__h) $(string__h)\ $(GLJCC) $(GLO_)sjpegc_0.$(OBJ) $(C_) $(GLSRC)sjpegc.c $(GLOBJ)sjpegc.$(OBJ) : $(GLOBJ)sjpegc_$(SHARE_JPEG).$(OBJ) @@ -553,7 +556,7 @@ index 3ad7db3..87b4f01 100644 # sdcparam is used by the filter operator and the PS/PDF writer. # It is not included automatically in sdcte/d. -@@ -1555,7 +1555,7 @@ $(GLOBJ)sdcte_0.$(OBJ) : $(GLSRC)sdcte.c $(AK)\ +@@ -1563,7 +1563,7 @@ $(GLOBJ)sdcte_0.$(OBJ) : $(GLSRC)sdcte.c $(AK)\ $(GLJCC) $(GLO_)sdcte_0.$(OBJ) $(C_) $(GLSRC)sdcte.c $(GLOBJ)sdcte.$(OBJ) : $(GLOBJ)sdcte_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) @@ -562,7 +565,7 @@ index 3ad7db3..87b4f01 100644 $(GLOBJ)sjpege_1.$(OBJ) : $(GLSRC)sjpege.c $(AK)\ -@@ -1571,7 +1571,7 @@ $(GLOBJ)sjpege_0.$(OBJ) : $(GLSRC)sjpege.c $(AK)\ +@@ -1579,7 +1579,7 @@ $(GLOBJ)sjpege_0.$(OBJ) : $(GLSRC)sjpege.c $(AK)\ $(GLJCC) $(GLO_)sjpege_0.$(OBJ) $(C_) $(GLSRC)sjpege.c $(GLOBJ)sjpege.$(OBJ) : $(GLOBJ)sjpege_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) @@ -571,7 +574,7 @@ index 3ad7db3..87b4f01 100644 # sdeparam is used by the filter operator and the PS/PDF writer. # It is not included automatically in sdcte. -@@ -1603,7 +1603,7 @@ $(GLOBJ)sdctd_0.$(OBJ) : $(GLSRC)sdctd.c $(AK)\ +@@ -1611,7 +1611,7 @@ $(GLOBJ)sdctd_0.$(OBJ) : $(GLSRC)sdctd.c $(AK)\ $(GLJCC) $(GLO_)sdctd_0.$(OBJ) $(C_) $(GLSRC)sdctd.c $(GLOBJ)sdctd.$(OBJ) : $(GLOBJ)sdctd_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) @@ -580,7 +583,7 @@ index 3ad7db3..87b4f01 100644 $(GLOBJ)sjpegd_1.$(OBJ) : $(GLSRC)sjpegd.c $(AK)\ -@@ -1620,7 +1620,7 @@ $(GLOBJ)sjpegd_0.$(OBJ) : $(GLSRC)sjpegd.c $(AK)\ +@@ -1628,7 +1628,7 @@ $(GLOBJ)sjpegd_0.$(OBJ) : $(GLSRC)sjpegd.c $(AK)\ $(GLOBJ)sjpegd.$(OBJ) : $(GLOBJ)sjpegd_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) @@ -589,7 +592,7 @@ index 3ad7db3..87b4f01 100644 # sddparam is used by the filter operator. # It is not included automatically in sdctd. -@@ -1643,7 +1643,7 @@ $(GLD)lzwe.dev : $(LIB_MAK) $(ECHOGS_XE) $(lzwe_) +@@ -1651,7 +1651,7 @@ $(GLD)lzwe.dev : $(LIB_MAK) $(ECHOGS_XE) $(lzwe_) # We need slzwe.dev as a synonym for lzwe.dev for BAND_LIST_STORAGE = memory. $(GLD)slzwe.dev : $(GLD)lzwe.dev @@ -598,7 +601,7 @@ index 3ad7db3..87b4f01 100644 $(GLOBJ)slzwe.$(OBJ) : $(GLSRC)slzwe.c $(AK) $(stdio__h) $(gdebug_h)\ $(slzwx_h) $(strimpl_h) $(MAKEDIRS) -@@ -1659,7 +1659,7 @@ $(GLD)lzwd.dev : $(LIB_MAK) $(ECHOGS_XE) $(lzwd_) +@@ -1667,7 +1667,7 @@ $(GLD)lzwd.dev : $(LIB_MAK) $(ECHOGS_XE) $(lzwd_) # We need slzwd.dev as a synonym for lzwd.dev for BAND_LIST_STORAGE = memory. $(GLD)slzwd.dev : $(GLD)lzwd.dev @@ -607,7 +610,7 @@ index 3ad7db3..87b4f01 100644 $(GLOBJ)slzwd.$(OBJ) : $(GLSRC)slzwd.c $(AK) $(stdio__h) $(gdebug_h)\ $(slzwx_h) $(strimpl_h) $(MAKEDIRS) -@@ -1709,7 +1709,7 @@ $(GLOBJ)saes.$(OBJ) : $(GLSRC)saes.c $(AK) $(memory__h)\ +@@ -1717,7 +1717,7 @@ $(GLOBJ)saes.$(OBJ) : $(GLSRC)saes.c $(AK) $(memory__h)\ # ---------------- JBIG2 compression filter ---------------- # $(GLD)sjbig2.dev : $(LIB_MAK) $(ECHOGS_XE) $(GLD)sjbig2_$(JBIG2_LIB).dev @@ -616,7 +619,7 @@ index 3ad7db3..87b4f01 100644 # jbig2dec version sjbig2_jbig2dec=$(GLOBJ)sjbig2.$(OBJ) -@@ -1745,7 +1745,7 @@ $(GLOBJ)sjbig2_luratech.$(OBJ) : $(GLSRC)sjbig2_luratech.c $(AK) \ +@@ -1753,7 +1753,7 @@ $(GLOBJ)sjbig2_luratech.$(OBJ) : $(GLSRC)sjbig2_luratech.c $(AK) \ # ---------------- JPEG 2000 compression filter ---------------- # $(GLD)sjpx.dev : $(LIB_MAK) $(ECHOGS_XE) $(GLD)sjpx_$(JPX_LIB).dev @@ -625,7 +628,7 @@ index 3ad7db3..87b4f01 100644 $(GLOBJ)sjpx.$(OBJ) : $(GLSRC)sjpx.c $(AK) \ $(memory__h) $(gsmalloc_h) \ -@@ -1874,7 +1874,7 @@ $(GLOBJ)szlibc_0.$(OBJ) : $(GLSRC)szlibc.c $(AK) $(std_h)\ +@@ -1882,7 +1882,7 @@ $(GLOBJ)szlibc_0.$(OBJ) : $(GLSRC)szlibc.c $(AK) $(std_h)\ $(GLZCC) $(GLO_)szlibc_0.$(OBJ) $(C_) $(GLSRC)szlibc.c $(GLOBJ)szlibc.$(OBJ) : $(GLOBJ)szlibc_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) @@ -634,7 +637,7 @@ index 3ad7db3..87b4f01 100644 szlibe_=$(szlibc_) $(GLOBJ)szlibe.$(OBJ) $(GLD)szlibe.dev : $(LIB_MAK) $(ECHOGS_XE) $(ZGENDIR)$(D)zlibe.dev $(szlibe_) -@@ -1890,7 +1890,7 @@ $(GLOBJ)szlibe_0.$(OBJ) : $(GLSRC)szlibe.c $(AK) $(std_h)\ +@@ -1898,7 +1898,7 @@ $(GLOBJ)szlibe_0.$(OBJ) : $(GLSRC)szlibe.c $(AK) $(std_h)\ $(GLZCC) $(GLO_)szlibe_0.$(OBJ) $(C_) $(GLSRC)szlibe.c $(GLOBJ)szlibe.$(OBJ) : $(GLOBJ)szlibe_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) @@ -643,7 +646,7 @@ index 3ad7db3..87b4f01 100644 szlibd_=$(szlibc_) $(GLOBJ)szlibd.$(OBJ) $(GLD)szlibd.dev : $(LIB_MAK) $(ECHOGS_XE) $(ZGENDIR)$(D)zlibd.dev $(szlibd_) -@@ -1906,7 +1906,7 @@ $(GLOBJ)szlibd_0.$(OBJ) : $(GLSRC)szlibd.c $(AK) $(std_h) $(memory__h)\ +@@ -1914,7 +1914,7 @@ $(GLOBJ)szlibd_0.$(OBJ) : $(GLSRC)szlibd.c $(AK) $(std_h) $(memory__h)\ $(GLZCC) $(GLO_)szlibd_0.$(OBJ) $(C_) $(GLSRC)szlibd.c $(GLOBJ)szlibd.$(OBJ) : $(GLOBJ)szlibd_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) @@ -652,7 +655,7 @@ index 3ad7db3..87b4f01 100644 # ---------------- Page devices ---------------- # # We include this here, rather than in devs.mak, because it is more like -@@ -2796,7 +2796,7 @@ $(GLOBJ)gsicc_lcms_0.$(OBJ) : $(GLSRC)gsicc_lcms.c\ +@@ -2804,7 +2804,7 @@ $(GLOBJ)gsicc_lcms_0.$(OBJ) : $(GLSRC)gsicc_lcms.c\ $(GLLCMSCC) $(GLO_)gsicc_lcms_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms.c $(GLOBJ)gsicc_lcms.$(OBJ) : $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) $(gp_h) @@ -661,16 +664,16 @@ index 3ad7db3..87b4f01 100644 $(GLOBJ)gsicc_lcms2_1.$(OBJ) : $(GLSRC)gsicc_lcms2.c\ -@@ -2808,7 +2808,7 @@ $(GLOBJ)gsicc_lcms2_0.$(OBJ) : $(GLSRC)gsicc_lcms2.c\ - $(GLLCMS2CC) $(GLO_)gsicc_lcms2_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms2.c +@@ -2817,7 +2817,7 @@ $(GLOBJ)gsicc_lcms2_0.$(OBJ) : $(GLSRC)gsicc_lcms2.c\ - $(GLOBJ)gsicc_lcms2.$(OBJ) : $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(gp_h) + $(GLOBJ)gsicc_lcms2.$(OBJ) : $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(gp_h) \ + $(gxsync_h) - $(CP_) $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2.$(OBJ) + $(CP_) $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2.$(OBJ) || true # Note that gsicc_create requires compile with lcms to obtain icc34.h # header file that is used for creating ICC structures from PS objects. -@@ -2828,7 +2828,7 @@ $(GLOBJ)gsicc_create_0.$(OBJ) : $(GLSRC)gsicc_create.c $(AK) $(string__h)\ +@@ -2837,7 +2837,7 @@ $(GLOBJ)gsicc_create_0.$(OBJ) : $(GLSRC)gsicc_create.c $(AK) $(string__h)\ $(GLLCMSCC) $(GLO_)gsicc_create_0.$(OBJ) $(C_) $(GLSRC)gsicc_create.c $(GLOBJ)gsicc_create.$(OBJ) : $(GLOBJ)gsicc_create_$(SHARE_LCMS).$(OBJ) $(MAKEDIRS) @@ -679,7 +682,7 @@ index 3ad7db3..87b4f01 100644 #include "icc34.h" /* Note this header is needed even if lcms is not compiled as default CMS */ -@@ -3132,7 +3132,7 @@ $(GLGEN)gsromfs1_1.c : $(MKROMFS_XE) $(PS_ROMFS_DEPS) $(MAKEDIRS) +@@ -3141,7 +3141,7 @@ $(GLGEN)gsromfs1_1.c : $(MKROMFS_XE) $(PS_ROMFS_DEPS) $(MAKEDIRS) $(PS_ROMFS_ARGS) $(GL_ROMFS_ARGS) $(GLGEN)gsromfs1.c : $(GLGEN)gsromfs1_$(UFST_BRIDGE).c $(MAKEDIRS) @@ -688,7 +691,7 @@ index 3ad7db3..87b4f01 100644 # the following module is only included if the romfs.dev FEATURE is enabled $(GLOBJ)gsiorom_1.$(OBJ) : $(GLSRC)gsiorom.c $(gsiorom_h) \ -@@ -3148,7 +3148,7 @@ $(GLOBJ)gsiorom_0.$(OBJ) : $(GLSRC)gsiorom.c $(gsiorom_h) \ +@@ -3157,7 +3157,7 @@ $(GLOBJ)gsiorom_0.$(OBJ) : $(GLSRC)gsiorom.c $(gsiorom_h) \ $(GLCC) $(GLO_)gsiorom_0.$(OBJ) $(I_)$(ZI_)$(_I) $(C_) $(GLSRC)gsiorom.c $(GLOBJ)gsiorom.$(OBJ) : $(GLOBJ)gsiorom_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) @@ -711,7 +714,7 @@ index ca1b7cc..ad6446d 100644 # external link .dev $(LWF_JP2_GEN)lwf_jp2_1.dev : $(TOP_MAKEFILES) $(LWF_JP2_MAK) $(ECHOGS_XE) diff --git a/base/macos-mcp.mak b/base/macos-mcp.mak -index 4ded7f3..3599ed9 100644 +index 38a2937..2ab7cae 100644 --- a/base/macos-mcp.mak +++ b/base/macos-mcp.mak @@ -383,11 +383,11 @@ CWPROJ_XML=./ghostscript.mcp.xml @@ -731,7 +734,7 @@ index 4ded7f3..3599ed9 100644 $(GS_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL) $(CWPROJ_XML) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) diff --git a/base/openjpeg.mak b/base/openjpeg.mak -index 32be240..4a6b429 100644 +index b194709..dac7901 100644 --- a/base/openjpeg.mak +++ b/base/openjpeg.mak @@ -99,7 +99,7 @@ open_jpeg_HDRS = \ @@ -744,7 +747,7 @@ index 32be240..4a6b429 100644 # external link .dev $(OPEN_JPEG_GEN)openjpeg_1.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_MAK) $(ECHOGS_XE) diff --git a/base/openvms.mak b/base/openvms.mak -index e5ae40b..286ee84 100644 +index 1ea06fe..84378a4 100644 --- a/base/openvms.mak +++ b/base/openvms.mak @@ -365,7 +365,7 @@ SH= @@ -757,7 +760,7 @@ index e5ae40b..286ee84 100644 # Define the command for deleting (a) file(s) (including wild cards) diff --git a/base/png.mak b/base/png.mak -index f01c426..8a89884 100644 +index 1725ddb..0d54b80 100644 --- a/base/png.mak +++ b/base/png.mak @@ -79,7 +79,7 @@ png.config-clean : @@ -772,7 +775,7 @@ index f01c426..8a89884 100644 @@ -134,7 +134,7 @@ $(PNGOBJ)pngget.$(OBJ) : $(PNGSRC)pngget.c $(PDEP) # Define the version of libpng.dev that we are actually using. - $(PNGGEN)libpng.dev : $(TOP_MAKEFILES) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev + $(PNGGEN)libpng.dev : $(TOP_MAKEFILES) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev $(MAKEDIRS) - $(CP_) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev $(PNGGEN)libpng.dev + $(CP_) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev $(PNGGEN)libpng.dev || true @@ -841,7 +844,7 @@ index 6aa3599..70a61f8 100644 RMN_=rm -f diff --git a/base/zlib.mak b/base/zlib.mak -index 6c50605..7fb8c9b 100644 +index 78d398a..3d48145 100644 --- a/base/zlib.mak +++ b/base/zlib.mak @@ -83,7 +83,7 @@ $(ZOBJ)zutil.$(OBJ) : $(ZSRC)zutil.c $(ZDEP) @@ -865,17 +868,17 @@ index 6c50605..7fb8c9b 100644 @@ -127,7 +127,7 @@ $(ZOBJ)crc32.$(OBJ) : $(ZSRC)crc32.c $(ZDEP) # Decoding (decompression) code. - $(ZGEN)zlibd.dev : $(TOP_MAKEFILES) $(ZGEN)zlibd_$(SHARE_ZLIB).dev + $(ZGEN)zlibd.dev : $(TOP_MAKEFILES) $(ZGEN)zlibd_$(SHARE_ZLIB).dev $(MAKEDIRS) - $(CP_) $(ZGEN)zlibd_$(SHARE_ZLIB).dev $(ZGEN)zlibd.dev + $(CP_) $(ZGEN)zlibd_$(SHARE_ZLIB).dev $(ZGEN)zlibd.dev || true $(ZGEN)zlibd_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE) $(SETMOD) $(ZGEN)zlibd_1 -lib $(ZLIB_NAME) diff --git a/devices/devs.mak b/devices/devs.mak -index bc22594..4bd0a11 100644 +index 0a668d4..a19082e 100644 --- a/devices/devs.mak +++ b/devices/devs.mak -@@ -1555,7 +1555,7 @@ libpng_dev=$(PNGGENDIR)$(D)libpng.dev +@@ -1547,7 +1547,7 @@ libpng_dev=$(PNGGENDIR)$(D)libpng.dev png_i_=-include $(PNGGENDIR)$(D)libpng $(DEVOBJ)gdevpng.$(OBJ) : $(DEVSRC)gdevpng.c\ @@ -885,7 +888,7 @@ index bc22594..4bd0a11 100644 $(DD)pngmono.dev : $(DEVS_MAK) $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV) diff --git a/psi/int.mak b/psi/int.mak -index 62cba0e..a1e963a 100644 +index 7d36e66..71b88f5 100644 --- a/psi/int.mak +++ b/psi/int.mak @@ -274,7 +274,7 @@ $(PSOBJ)iconfig.$(OBJ) : $(gconfig_h) $(PSSRC)iconf.c $(stdio__h)\ @@ -925,5 +928,5 @@ index 62cba0e..a1e963a 100644 fjpx_luratech=$(PSOBJ)zfjpx_luratech.$(OBJ) -- -1.8.1.2 +1.9.1 diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch new file mode 100644 index 0000000000..797b8947cf --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch @@ -0,0 +1,40 @@ +From be1e1b33191afdcfe3c2ecc4ff3e361a5859e9c6 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Fri, 30 Jan 2015 00:40:22 -0800 +Subject: [PATCH] contrib.mak: fix for parallel build + +Fixed: +rm: cannot remove `/usr/share/ghostscript/9.15/lib': Is a directory + +Create lib before install to fix the race issue. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + contrib/contrib.mak | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/contrib/contrib.mak b/contrib/contrib.mak +index 08a80d1..de2e20d 100644 +--- a/contrib/contrib.mak ++++ b/contrib/contrib.mak +@@ -947,6 +947,7 @@ $(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h + $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c + + extra-dmprt-install: ++ mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib + $(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 + $(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 + $(INSTALL_DATA) $(JAPSRC)escp_24.src $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 +@@ -1088,6 +1089,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) + ### ----------------- Additional .upp files ---------------- ### + + extra-upp-install: ++ mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib + for f in $(CONTRIBSRC)uniprint$(D)*.upp; do \ + $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \ + done +-- +1.7.9.5 + diff --git a/meta/recipes-extended/ghostscript/ghostscript/mips64eln32/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/mips64eln32/objarch.h new file mode 100644 index 0000000000..a05de29def --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/mips64eln32/objarch.h @@ -0,0 +1,40 @@ +/* Parameters derived from machine and compiler architecture. */ +/* This file is generated mechanically by genarch.c. */ + + /* ---------------- Scalar alignments ---------------- */ + +#define ARCH_ALIGN_SHORT_MOD 2 +#define ARCH_ALIGN_INT_MOD 4 +#define ARCH_ALIGN_LONG_MOD 8 +#define ARCH_ALIGN_PTR_MOD 8 +#define ARCH_ALIGN_FLOAT_MOD 4 +#define ARCH_ALIGN_DOUBLE_MOD 8 + + /* ---------------- Scalar sizes ---------------- */ + +#define ARCH_LOG2_SIZEOF_CHAR 0 +#define ARCH_LOG2_SIZEOF_SHORT 1 +#define ARCH_LOG2_SIZEOF_INT 2 +#define ARCH_LOG2_SIZEOF_LONG 3 +#define ARCH_LOG2_SIZEOF_LONG_LONG 3 +#define ARCH_SIZEOF_GX_COLOR_INDEX 8 +#define ARCH_SIZEOF_PTR 8 +#define ARCH_SIZEOF_FLOAT 4 +#define ARCH_SIZEOF_DOUBLE 8 +#define ARCH_FLOAT_MANTISSA_BITS 24 +#define ARCH_DOUBLE_MANTISSA_BITS 53 + + /* ---------------- Unsigned max values ---------------- */ + +#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) +#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) +#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) +#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) + + /* ---------------- Miscellaneous ---------------- */ + +#define ARCH_IS_BIG_ENDIAN 0 +#define ARCH_PTRS_ARE_SIGNED 0 +#define ARCH_FLOATS_ARE_IEEE 1 +#define ARCH_ARITH_RSHIFT 2 +#define ARCH_DIV_NEG_POS_TRUNCATES 1 diff --git a/meta/recipes-extended/ghostscript/ghostscript/mips64n32/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/mips64n32/objarch.h new file mode 100644 index 0000000000..0d0a16bfa3 --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/mips64n32/objarch.h @@ -0,0 +1,40 @@ +/* Parameters derived from machine and compiler architecture. */ +/* This file is generated mechanically by genarch.c. */ + + /* ---------------- Scalar alignments ---------------- */ + +#define ARCH_ALIGN_SHORT_MOD 2 +#define ARCH_ALIGN_INT_MOD 4 +#define ARCH_ALIGN_LONG_MOD 8 +#define ARCH_ALIGN_PTR_MOD 8 +#define ARCH_ALIGN_FLOAT_MOD 4 +#define ARCH_ALIGN_DOUBLE_MOD 8 + + /* ---------------- Scalar sizes ---------------- */ + +#define ARCH_LOG2_SIZEOF_CHAR 0 +#define ARCH_LOG2_SIZEOF_SHORT 1 +#define ARCH_LOG2_SIZEOF_INT 2 +#define ARCH_LOG2_SIZEOF_LONG 3 +#define ARCH_LOG2_SIZEOF_LONG_LONG 3 +#define ARCH_SIZEOF_GX_COLOR_INDEX 8 +#define ARCH_SIZEOF_PTR 8 +#define ARCH_SIZEOF_FLOAT 4 +#define ARCH_SIZEOF_DOUBLE 8 +#define ARCH_FLOAT_MANTISSA_BITS 24 +#define ARCH_DOUBLE_MANTISSA_BITS 53 + + /* ---------------- Unsigned max values ---------------- */ + +#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0) +#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0) +#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) +#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) + + /* ---------------- Miscellaneous ---------------- */ + +#define ARCH_IS_BIG_ENDIAN 1 +#define ARCH_PTRS_ARE_SIGNED 0 +#define ARCH_FLOATS_ARE_IEEE 1 +#define ARCH_ARITH_RSHIFT 2 +#define ARCH_DIV_NEG_POS_TRUNCATES 1 diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.14.bb b/meta/recipes-extended/ghostscript/ghostscript_9.15.bb index 130dc1c378..578883777d 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_9.14.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_9.15.bb @@ -24,6 +24,7 @@ SRC_URI = "${SRC_URI_BASE} \ file://objarch.h \ file://ghostscript-9.02-parallel-make.patch \ file://cups-no-gcrypt.patch \ + file://ghostscript-9.15-parallel-make.patch \ " SRC_URI_class-native = "${SRC_URI_BASE} \ @@ -31,8 +32,10 @@ SRC_URI_class-native = "${SRC_URI_BASE} \ file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \ " -SRC_URI[md5sum] = "586494befb443363338c1b6379f13973" -SRC_URI[sha256sum] = "ab2ba5ce11c8db396c9acf774a497182d7686d04670976cc3e690ada7db9f0d4" +SRC_URI[md5sum] = "5a78ab0990ff6ec3a103576bc8777c46" +SRC_URI[sha256sum] = "27f11e4fe5b89857ae745687281d1e4daf9681edc858a3f7e8e77ef09609777a" + +PR = "r1" EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \ --with-fontpath=${datadir}/fonts \ @@ -58,7 +61,7 @@ EXTRA_OECONF_class-native = "--without-x --with-system-libtiff=no \ CFLAGS += "-DHAVE_SYS_TIME_H=1" BUILD_CFLAGS += "-DHAVE_SYS_TIME_H=1" -inherit autotools-brokensep +inherit autotools do_configure_prepend () { mkdir -p obj @@ -80,8 +83,8 @@ do_configure_append () { do_install_append () { mkdir -p ${D}${datadir}/ghostscript/${PV}/ - cp -r Resource ${D}${datadir}/ghostscript/${PV}/ - cp -r iccprofiles ${D}${datadir}/ghostscript/${PV}/ + cp -r ${S}/Resource ${D}${datadir}/ghostscript/${PV}/ + cp -r ${S}/iccprofiles ${D}${datadir}/ghostscript/${PV}/ } do_compile_class-native () { @@ -99,8 +102,3 @@ do_install_class-native () { } BBCLASSEXTEND = "native" - -# Ghostscript install tool 'instcopy' tries to remove already created -# directories during install and parallel make causes problems. -PARALLEL_MAKEINST="" - diff --git a/meta/recipes-extended/grep/grep_2.19.bb b/meta/recipes-extended/grep/grep_2.21.bb index 9c162cca49..2c378d8442 100644 --- a/meta/recipes-extended/grep/grep_2.19.bb +++ b/meta/recipes-extended/grep/grep_2.21.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8006d9c814277c1bfc4ca22af94b59ee" SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz" -SRC_URI[md5sum] = "ac732142227d9fe9567d71301e127979" -SRC_URI[sha256sum] = "6388295be48cfcaf7665d9cd3914e6625ea000e9414132bfefd45cf1d8eec34d" +SRC_URI[md5sum] = "43c48064d6409862b8a850db83c8038a" +SRC_URI[sha256sum] = "5244a11c00dee8e7e5e714b9aaa053ac6cbfa27e104abee20d3c778e4bb0e5de" inherit autotools gettext texinfo diff --git a/meta/recipes-extended/grep/grep_2.5.1a.bb b/meta/recipes-extended/grep/grep_2.5.1a.bb index 1ce112e43d..178fc31e6f 100644 --- a/meta/recipes-extended/grep/grep_2.5.1a.bb +++ b/meta/recipes-extended/grep/grep_2.5.1a.bb @@ -22,7 +22,7 @@ SRC_URI[sha256sum] = "38c8a2bb9223d1fb1b10bdd607cf44830afc92fd451ac4cd07619bf92b inherit autotools gettext texinfo -EXTRA_OECONF = "--disable-perl-regexp --disable-ncurses" +EXTRA_OECONF = "--disable-perl-regexp" CFLAGS += "-D PROTOTYPES" do_configure_prepend () { diff --git a/meta/recipes-extended/groff/groff_1.18.1.4.bb b/meta/recipes-extended/groff/groff_1.18.1.4.bb index 7fbce9bc4a..bd786a30aa 100644 --- a/meta/recipes-extended/groff/groff_1.18.1.4.bb +++ b/meta/recipes-extended/groff/groff_1.18.1.4.bb @@ -2,13 +2,13 @@ SUMMARY = "GNU Troff software" DESCRIPTION = "The groff (GNU troff) software is a typesetting package which reads plain text mixed with \ formatting commands and produces formatted output." SECTION = "console/utils" -HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/" +HOMEPAGE = "http://www.gnu.org/software/groff/" LICENSE = "GPLv2" PR = "r1" LIC_FILES_CHKSUM = "file://COPYING;md5=e43fc16fccd8519fba405f0a0ff6e8a3" -SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ +SRC_URI = "${GNU_MIRROR}/${BPN}/old/${BP}.tar.gz \ file://groff-1.18.1.4-remove-mom.patch;striplevel=1 \ file://man-local.patch \ file://mdoc-local.patch \ diff --git a/meta/recipes-extended/groff/groff_1.22.2.bb b/meta/recipes-extended/groff/groff_1.22.2.bb index 63f0425ea4..6e845878ac 100644 --- a/meta/recipes-extended/groff/groff_1.22.2.bb +++ b/meta/recipes-extended/groff/groff_1.22.2.bb @@ -2,7 +2,7 @@ SUMMARY = "GNU Troff software" DESCRIPTION = "The groff (GNU troff) software is a typesetting package which reads plain text mixed with \ formatting commands and produces formatted output." SECTION = "base" -HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/" +HOMEPAGE = "http://www.gnu.org/software/groff/" LICENSE = "GPLv3" PR = "r1" diff --git a/meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch index d4325779ce..92863d6c4b 100644 --- a/meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch +++ b/meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch @@ -21,11 +21,11 @@ diff -urpN a/Makefile.am b/Makefile.am @@ -81,9 +81,8 @@ gzip.doc.gz: gzip.doc $(bin_PROGRAMS) SUFFIXES = .in .in: - $(AM_V_GEN)sed \ + $(AM_V_GEN)sed \ - -e 's|/bin/sh|$(SHELL)|g' \ - -e 's|[@]bindir@|'\''$(bindir)'\''|g' \ + -e 's|[@]bindir@|'\''$(bindir)'\''|g' \ - -e 's|[@]GREP@|$(GREP)|g' \ + -e 's|[@]GREP@|$(base_bindir)/grep|g' \ - -e 's|[@]VERSION@|$(VERSION)|g' \ - $(srcdir)/$@.in >$@-t \ - && chmod a+x $@-t \ + -e 's|[@]VERSION@|$(VERSION)|g' \ + $(srcdir)/$@.in >$@-t \ + && chmod a+x $@-t \ diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc index b90856e796..94480ec530 100644 --- a/meta/recipes-extended/gzip/gzip.inc +++ b/meta/recipes-extended/gzip/gzip.inc @@ -4,12 +4,6 @@ project. Mark Adler wrote the decompression part" HOMEPAGE = "http://www.gnu.org/software/gzip/" SECTION = "console/utils" # change to GPLv3+ in 2007/07. Previous GPLv2 version is 1.3.12 -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" - -SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz" -SRC_URI_append_class-target = " file://wrong-path-fix.patch" inherit autotools texinfo diff --git a/meta/recipes-extended/gzip/gzip_1.3.12.bb b/meta/recipes-extended/gzip/gzip_1.3.12.bb index 45a33ffdd1..e4062827bd 100644 --- a/meta/recipes-extended/gzip/gzip_1.3.12.bb +++ b/meta/recipes-extended/gzip/gzip_1.3.12.bb @@ -1,8 +1,4 @@ -SUMMARY = "Standard GNU compressor" -DESCRIPTION = "GNU Gzip is a popular data compression program originally written by Jean-loup Gailly for the GNU \ -project. Mark Adler wrote the decompression part" -HOMEPAGE = "http://www.gnu.org/software/gzip" -SECTION = "base" +require gzip.inc LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ @@ -17,24 +13,3 @@ SRC_URI[md5sum] = "b5bac2d21840ae077e0217bc5e4845b1" SRC_URI[sha256sum] = "3f565be05f7f3d1aff117c030eb7c738300510b7d098cedea796ca8e4cd587af" PR = "r2" - -inherit autotools - -do_install_append () { - # move files into /bin (FHS) - install -d ${D}${base_bindir} - mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip - mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip - mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat - mv ${D}${bindir}/uncompress ${D}${base_bindir}/uncompress -} - -inherit update-alternatives - -ALTERNATIVE_${PN} = "gzip gunzip zcat" -ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip" -ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip" -ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat" -ALTERNATIVE_PRIORITY = "100" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/gzip/gzip_1.6.bb b/meta/recipes-extended/gzip/gzip_1.6.bb index 9c728dff5a..b347f0bb8d 100644 --- a/meta/recipes-extended/gzip/gzip_1.6.bb +++ b/meta/recipes-extended/gzip/gzip_1.6.bb @@ -1,5 +1,13 @@ require gzip.inc +LICENSE = "GPLv3+" + +SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz" +SRC_URI_append_class-target = " file://wrong-path-fix.patch" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" + PROVIDES_append_class-native = " gzip-replacement-native" NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" diff --git a/meta/recipes-extended/hdparm/hdparm_9.43.bb b/meta/recipes-extended/hdparm/hdparm_9.45.bb index 805f76a6b3..d11412d40c 100644 --- a/meta/recipes-extended/hdparm/hdparm_9.43.bb +++ b/meta/recipes-extended/hdparm/hdparm_9.45.bb @@ -18,8 +18,8 @@ RDEPENDS_wiper = "bash gawk stat" SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/hdparm-${PV}.tar.gz " -SRC_URI[md5sum] = "f73233be118d86c779a8463d8b6a3cdb" -SRC_URI[sha256sum] = "2bbe92274971182192901ab220e94bd2e4896f924fa6b225d0cffd7d8c16b52a" +SRC_URI[md5sum] = "1c75d0751a44928b6c4bc81fb16d7fe8" +SRC_URI[sha256sum] = "23b01caa56a995cf0897877b6aff98ea622a5df255bc2894b1a7693387f38669" EXTRA_OEMAKE += 'STRIP="echo"' diff --git a/meta/recipes-extended/images/core-image-kernel-dev.bb b/meta/recipes-extended/images/core-image-kernel-dev.bb new file mode 100644 index 0000000000..e1aa71a79f --- /dev/null +++ b/meta/recipes-extended/images/core-image-kernel-dev.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "A development image that builds the kernel and packages that are \ +sensitive to kernel updates and version changes" + +# Could also be core-image-basic, but we'll keep this small for now +require recipes-core/images/core-image-minimal.bb + +KERNEL_DEV_UTILS ?= "dropbear" +KERNEL_DEV_TOOLS ?= "packagegroup-core-tools-profile packagegroup-core-buildessential kernel-devsrc" +KERNEL_DEV_MODULE ?= "kernel-modules" + +CORE_IMAGE_EXTRA_INSTALL += "${KERNEL_DEV_MODULE} \ + ${KERNEL_DEV_UTILS} \ + ${KERNEL_DEV_TOOLS} \ + " + +# We need extra space for things like kernel builds, etc. +IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 3000000" diff --git a/meta/recipes-extended/iputils/iputils_s20121221.bb b/meta/recipes-extended/iputils/iputils_s20121221.bb index 46f8903222..e87a32a7de 100644 --- a/meta/recipes-extended/iputils/iputils_s20121221.bb +++ b/meta/recipes-extended/iputils/iputils_s20121221.bb @@ -34,6 +34,7 @@ do_install () { install -m 4555 ping ${D}${base_bindir}/ping install -m 4555 ping6 ${D}${base_bindir}/ping6 install -m 4555 traceroute6 ${D}${base_bindir}/ + install -m 4555 clockdiff ${D}${base_bindir}/ # Other programgs for i in arping tracepath tracepath6; do install -m 0755 $i ${D}${base_bindir}/ @@ -54,10 +55,10 @@ ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" ALTERNATIVE_${PN}-ping6 = "ping6" ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6" -PACKAGES += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6" +PACKAGES += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6 ${PN}-clockdiff" ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6" +RDEPENDS_${PN} += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6 ${PN}-clockdiff" FILES_${PN} = "" FILES_${PN}-ping = "${base_bindir}/ping.${BPN}" @@ -66,4 +67,5 @@ FILES_${PN}-arping = "${base_bindir}/arping" FILES_${PN}-tracepath = "${base_bindir}/tracepath" FILES_${PN}-tracepath6 = "${base_bindir}/tracepath6" FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" +FILES_${PN}-clockdiff = "${base_bindir}/clockdiff" FILES_${PN}-doc = "${mandir}/man8" diff --git a/meta/recipes-extended/less/less_466.bb b/meta/recipes-extended/less/less_471.bb index c5b8a3f7b6..81d354ccf0 100644 --- a/meta/recipes-extended/less/less_466.bb +++ b/meta/recipes-extended/less/less_471.bb @@ -26,8 +26,8 @@ DEPENDS = "ncurses" SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "7bc444bdb751bcf80ed0c39c17b4fcf4" -SRC_URI[sha256sum] = "8305f5a06764ff094ed3428f94f29059541e2483eae201991f90823da6557212" +SRC_URI[md5sum] = "9a40d29a2d84b41f9f36d7dd90b4f950" +SRC_URI[sha256sum] = "37f613fa9a526378788d790a92217d59b523574cf7159f6538da8564b3fb27f8" inherit autotools update-alternatives diff --git a/meta/recipes-extended/libaio/libaio/00_arches.patch b/meta/recipes-extended/libaio/libaio/00_arches.patch index 91f4588cc5..9d6447d98a 100644 --- a/meta/recipes-extended/libaio/libaio/00_arches.patch +++ b/meta/recipes-extended/libaio/libaio/00_arches.patch @@ -2,10 +2,10 @@ Upstream-Status: Inappropriate [embedded specific] from openembedded, added by Qing He <qing.he@intel.com> -Index: libaio-0.3.109/src/syscall-m68k.h +Index: libaio-0.3.110/src/syscall-m68k.h =================================================================== --- /dev/null -+++ libaio-0.3.109/src/syscall-m68k.h ++++ libaio-0.3.110/src/syscall-m68k.h @@ -0,0 +1,78 @@ +#define __NR_io_setup 241 +#define __NR_io_destroy 242 @@ -85,164 +85,27 @@ Index: libaio-0.3.109/src/syscall-m68k.h +return (type) __res; \ +} + -Index: libaio-0.3.109/src/syscall-sparc.h +Index: libaio-0.3.110/src/syscall.h =================================================================== ---- /dev/null -+++ libaio-0.3.109/src/syscall-sparc.h -@@ -0,0 +1,130 @@ -+/* $Id: unistd.h,v 1.74 2002/02/08 03:57:18 davem Exp $ */ -+ -+/* -+ * System calls under the Sparc. -+ * -+ * Don't be scared by the ugly clobbers, it is the only way I can -+ * think of right now to force the arguments into fixed registers -+ * before the trap into the system call with gcc 'asm' statements. -+ * -+ * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) -+ * -+ * SunOS compatibility based upon preliminary work which is: -+ * -+ * Copyright (C) 1995 Adrian M. Rodriguez (adrian@remus.rutgers.edu) -+ */ -+ -+ -+#define __NR_io_setup 268 -+#define __NR_io_destroy 269 -+#define __NR_io_submit 270 -+#define __NR_io_cancel 271 -+#define __NR_io_getevents 272 -+ -+ -+#define io_syscall1(type,fname,sname,type1,arg1) \ -+type fname(type1 arg1) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res >= 0) \ -+ return (type) __res; \ -+return -1; \ -+} -+ -+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ -+type fname(type1 arg1,type2 arg2) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res >= 0) \ -+ return (type) __res; \ -+return -1; \ -+} -+ -+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ -+type fname(type1 arg1,type2 arg2,type3 arg3) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+register long __o2 __asm__ ("o2") = (long)(arg3); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res>=0) \ -+ return (type) __res; \ -+return -1; \ -+} -+ -+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ -+type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+register long __o2 __asm__ ("o2") = (long)(arg3); \ -+register long __o3 __asm__ ("o3") = (long)(arg4); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res>=0) \ -+ return (type) __res; \ -+return -1; \ -+} -+ -+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ -+ type5,arg5) \ -+type fname(type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+register long __o2 __asm__ ("o2") = (long)(arg3); \ -+register long __o3 __asm__ ("o3") = (long)(arg4); \ -+register long __o4 __asm__ ("o4") = (long)(arg5); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__o4), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res>=0) \ -+ return (type) __res; \ -+return -1; \ -+} -+ -Index: libaio-0.3.109/src/syscall.h -=================================================================== ---- libaio-0.3.109.orig/src/syscall.h -+++ libaio-0.3.109/src/syscall.h -@@ -24,6 +24,14 @@ - #include "syscall-alpha.h" - #elif defined(__arm__) - #include "syscall-arm.h" +--- libaio-0.3.110.orig/src/syscall.h ++++ libaio-0.3.110/src/syscall.h +@@ -28,6 +28,12 @@ + #include "syscall-sparc.h" + #elif defined(__aarch64__) + #include "syscall-arm64.h" +#elif defined(__m68k__) +#include "syscall-m68k.h" -+#elif defined(__sparc__) -+#include "syscall-sparc.h" +#elif defined(__hppa__) +#include "syscall-parisc.h" +#elif defined(__mips__) +#include "syscall-mips.h" #else - #error "add syscall-arch.h" - #endif -Index: libaio-0.3.109/src/syscall-mips.h + #warning "using generic syscall method" + #include "syscall-generic.h" +Index: libaio-0.3.110/src/syscall-mips.h =================================================================== --- /dev/null -+++ libaio-0.3.109/src/syscall-mips.h ++++ libaio-0.3.110/src/syscall-mips.h @@ -0,0 +1,223 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -467,45 +330,10 @@ Index: libaio-0.3.109/src/syscall-mips.h + +#endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */ + -Index: libaio-0.3.109/src/libaio.h -=================================================================== ---- libaio-0.3.109.orig/src/libaio.h -+++ libaio-0.3.109/src/libaio.h -@@ -83,6 +83,30 @@ typedef enum io_iocb_cmd { - #define PADDEDptr(x, y) x; unsigned y - #define PADDEDul(x, y) unsigned long x; unsigned y - # endif -+#elif defined(__m68k__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x -+#elif defined(__sparc__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x -+#elif defined(__hppa__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x -+#elif defined(__mips__) -+# if defined (__MIPSEB__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x -+# elif defined(__MIPSEL__) /* little endian, 32 bits */ -+#define PADDED(x, y) x; unsigned y -+#define PADDEDptr(x, y) x; unsigned y -+#define PADDEDul(x, y) unsigned long x; unsigned y -+# else -+# error "neither mipseb nor mipsel?" -+# endif - #else - #error endian? - #endif -Index: libaio-0.3.109/src/syscall-parisc.h +Index: libaio-0.3.110/src/syscall-parisc.h =================================================================== --- /dev/null -+++ libaio-0.3.109/src/syscall-parisc.h ++++ libaio-0.3.110/src/syscall-parisc.h @@ -0,0 +1,146 @@ +/* + * Linux system call numbers. @@ -653,10 +481,10 @@ Index: libaio-0.3.109/src/syscall-parisc.h + return K_INLINE_SYSCALL(sname, 5, arg1, arg2, arg3, arg4, arg5); \ +} + -Index: libaio-0.3.109/src/syscall-arm.h +Index: libaio-0.3.110/src/syscall-arm.h =================================================================== ---- libaio-0.3.109.orig/src/syscall-arm.h -+++ libaio-0.3.109/src/syscall-arm.h +--- libaio-0.3.110.orig/src/syscall-arm.h ++++ libaio-0.3.110/src/syscall-arm.h @@ -114,3 +114,119 @@ type fname(type1 arg1, type2 arg2, type3 return (type) __res_r0; \ } diff --git a/meta/recipes-extended/libaio/libaio/generic-arch-dectection-for-padding-defines.patch b/meta/recipes-extended/libaio/libaio/generic-arch-dectection-for-padding-defines.patch new file mode 100644 index 0000000000..bba7e554af --- /dev/null +++ b/meta/recipes-extended/libaio/libaio/generic-arch-dectection-for-padding-defines.patch @@ -0,0 +1,65 @@ +From: Nathan Rossi <nathan.rossi@xilinx.com> +Date: Tue, 27 Jan 2015 14:59:35 +1000 +Subject: [PATCH] Generic arch dectection for padding defines + +When available use the GNU C defines for endian and bitwidth to +determine the padding required. This reduces the need to define the +padding selection for every architecture. + +Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com> +Signed-off-by: Jeff Moyer <jmoyer@redhat.com> +Upstream-Status: Backport +--- + src/libaio.h | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/src/libaio.h b/src/libaio.h +index 1223146..4a4e0f5 100644 +--- a/src/libaio.h ++++ b/src/libaio.h +@@ -52,14 +52,18 @@ typedef enum io_iocb_cmd { + /* little endian, 32 bits */ + #if defined(__i386__) || (defined(__arm__) && !defined(__ARMEB__)) || \ + defined(__sh__) || defined(__bfin__) || defined(__MIPSEL__) || \ +- defined(__cris__) ++ defined(__cris__) || \ ++ (defined(__GNUC__) && defined(__BYTE_ORDER__) && \ ++ __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ && __SIZEOF_LONG__ == 4) + #define PADDED(x, y) x; unsigned y + #define PADDEDptr(x, y) x; unsigned y + #define PADDEDul(x, y) unsigned long x; unsigned y + + /* little endian, 64 bits */ + #elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) || \ +- (defined(__aarch64__) && defined(__AARCH64EL__)) ++ (defined(__aarch64__) && defined(__AARCH64EL__)) || \ ++ (defined(__GNUC__) && defined(__BYTE_ORDER__) && \ ++ __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ && __SIZEOF_LONG__ == 8) + #define PADDED(x, y) x, y + #define PADDEDptr(x, y) x + #define PADDEDul(x, y) unsigned long x +@@ -67,7 +71,9 @@ typedef enum io_iocb_cmd { + /* big endian, 64 bits */ + #elif defined(__powerpc64__) || defined(__s390x__) || \ + (defined(__sparc__) && defined(__arch64__)) || \ +- (defined(__aarch64__) && defined(__AARCH64EB__)) ++ (defined(__aarch64__) && defined(__AARCH64EB__)) || \ ++ (defined(__GNUC__) && defined(__BYTE_ORDER__) && \ ++ __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ && __SIZEOF_LONG__ == 8) + #define PADDED(x, y) unsigned y; x + #define PADDEDptr(x,y) x + #define PADDEDul(x, y) unsigned long x +@@ -76,7 +82,9 @@ typedef enum io_iocb_cmd { + #elif defined(__PPC__) || defined(__s390__) || \ + (defined(__arm__) && defined(__ARMEB__)) || \ + defined(__sparc__) || defined(__MIPSEB__) || defined(__m68k__) || \ +- defined(__hppa__) || defined(__frv__) || defined(__avr32__) ++ defined(__hppa__) || defined(__frv__) || defined(__avr32__) || \ ++ (defined(__GNUC__) && defined(__BYTE_ORDER__) && \ ++ __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ && __SIZEOF_LONG__ == 4) + #define PADDED(x, y) unsigned y; x + #define PADDEDptr(x, y) unsigned y; x + #define PADDEDul(x, y) unsigned y; unsigned long x +-- +2.1.1 + diff --git a/meta/recipes-extended/libaio/libaio/libaio-aarch64.patch b/meta/recipes-extended/libaio/libaio/libaio-aarch64.patch deleted file mode 100644 index e3d10585de..0000000000 --- a/meta/recipes-extended/libaio/libaio/libaio-aarch64.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status: Submitted - -Signed-off-by: Riku Voipio <riku.voipio@linaro.org> - ---- - harness/cases/16.t | 2 ++ - src/libaio.h | 10 ++++++++++ - 2 files changed, 12 insertions(+) - ---- a/src/libaio.h -+++ b/src/libaio.h -@@ -107,6 +107,16 @@ - # else - # error "neither mipseb nor mipsel?" - # endif -+#elif defined(__aarch64__) -+# if defined (__AARCH64EB__) /* big endian, 64 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x,y) x -+#define PADDEDul(x, y) unsigned long x -+# elif defined(__AARCH64EL__) /* little endian, 64 bits */ -+#define PADDED(x, y) x, y -+#define PADDEDptr(x, y) x -+#define PADDEDul(x, y) unsigned long x -+# endif - #else - #error endian? - #endif diff --git a/meta/recipes-extended/libaio/libaio/toolchain.patch b/meta/recipes-extended/libaio/libaio/toolchain.patch deleted file mode 100644 index 4d88ec167b..0000000000 --- a/meta/recipes-extended/libaio/libaio/toolchain.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -8/27/2010 - created by Qing He <qing.he@intel.com> - -diff --git a/src/Makefile b/src/Makefile -index 8d134cc..df8e5b6 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -2,7 +2,6 @@ prefix=/usr - includedir=$(prefix)/include - libdir=$(prefix)/lib - --ARCH := $(shell uname -m | sed -e s/i.86/i386/) - CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC - SO_CFLAGS=-shared $(CFLAGS) - L_CFLAGS=$(CFLAGS) -@@ -44,8 +43,8 @@ $(libaio_objs) $(libaio_sobjs): libaio.h vsys_def.h - - libaio.a: $(libaio_objs) - rm -f libaio.a -- ar r libaio.a $^ -- ranlib libaio.a -+ $(AR) r libaio.a $^ -+ $(RANLIB) libaio.a - - $(libname): $(libaio_sobjs) libaio.map - $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) diff --git a/meta/recipes-extended/libaio/libaio_0.3.109.bb b/meta/recipes-extended/libaio/libaio_0.3.110.bb index 978f5f5fb5..cbe29ce2ab 100644 --- a/meta/recipes-extended/libaio/libaio_0.3.109.bb +++ b/meta/recipes-extended/libaio/libaio_0.3.110.bb @@ -5,22 +5,20 @@ HOMEPAGE = "http://lse.sourceforge.net/io/aio.html" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" -PR = "r2" - SRC_URI = "${DEBIAN_MIRROR}/main/liba/libaio/libaio_${PV}.orig.tar.gz \ + file://generic-arch-dectection-for-padding-defines.patch \ file://00_arches.patch \ - file://toolchain.patch \ file://destdir.patch \ file://libaio_fix_for_x32.patch \ - file://libaio-generic.patch \ - file://libaio-aarch64.patch \ file://libaio_fix_for_mips_syscalls.patch \ " -SRC_URI[md5sum] = "435a5b16ca6198eaf01155263d855756" -SRC_URI[sha256sum] = "bf4a457253cbaab215aea75cb6e18dc8d95bbd507e9920661ff9bdd288c8778d" +SRC_URI[md5sum] = "2a35602e43778383e2f4907a4ca39ab8" +SRC_URI[sha256sum] = "e019028e631725729376250e32b473012f7cb68e1f7275bfc1bbcdd0f8745f7e" EXTRA_OEMAKE =+ "prefix=${prefix} includedir=${includedir} libdir=${libdir}" +# Need libc for stack-protector's __stack_chk_fail_local() bounce function +LDFLAGS_append_x86 = " -lc" do_configure () { sed -i 's#LINK_FLAGS=.*#LINK_FLAGS=$(LDFLAGS)#' src/Makefile diff --git a/meta/recipes-extended/libidn/libidn_0.6.14.bb b/meta/recipes-extended/libidn/libidn_0.6.14.bb index ff8d345ccb..4df1d08d8f 100644 --- a/meta/recipes-extended/libidn/libidn_0.6.14.bb +++ b/meta/recipes-extended/libidn/libidn_0.6.14.bb @@ -29,4 +29,5 @@ do_configure_prepend() { do_install_append() { rm -rf ${D}${libdir}/Libidn.dll + rm -rf ${D}${datadir}/emacs } diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb index 20d5c1caa0..0cf5aa2df2 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb @@ -29,6 +29,9 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t SRC_URI[md5sum] = "f7a88130ee9984b421ad8aa80629750a" SRC_URI[sha256sum] = "4a71c1f6d8af41ed894b507720c4c17184dc320590013881d5170ca7f15c5bf7" +PACKAGECONFIG ??= "openssl" +PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl" + EXTRA_OECONF = " \ --without-bzip2 \ --without-ldap \ @@ -37,7 +40,6 @@ EXTRA_OECONF = " \ --with-pcre \ --without-webdav-props \ --without-webdav-locks \ - --without-openssl \ --disable-static \ " diff --git a/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch b/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch index 43068bdbd7..43ebcffbae 100644 --- a/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch +++ b/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch @@ -7,19 +7,20 @@ Upstream-Status: Submitted Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- - config.c | 8 -------- - 1 files changed, 0 insertions(+), 8 deletions(-) + config.c | 9 --------- + 1 file changed, 9 deletions(-) diff --git a/config.c b/config.c -index a85d1df..24575b3 100644 +index e0eadb7..c23092f 100644 --- a/config.c +++ b/config.c -@@ -1453,14 +1453,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) +@@ -1515,15 +1515,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) dirName, strerror(errno)); goto error; } - -- if (sb.st_dev != sb2.st_dev) { +- if (sb.st_dev != sb2.st_dev +- && !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY))) { - message(MESS_ERROR, - "%s:%d olddir %s and log file %s " - "are on different devices\n", configFile, @@ -30,5 +31,4 @@ index a85d1df..24575b3 100644 } -- -1.7.4.1 - +1.7.9.5 diff --git a/meta/recipes-extended/logrotate/logrotate_3.8.7.bb b/meta/recipes-extended/logrotate/logrotate_3.8.8.bb index faa8e0264f..e3cfa90ced 100644 --- a/meta/recipes-extended/logrotate/logrotate_3.8.7.bb +++ b/meta/recipes-extended/logrotate/logrotate_3.8.8.bb @@ -3,24 +3,33 @@ SECTION = "console/utils" HOMEPAGE = "https://fedorahosted.org/logrotate/" LICENSE = "GPLv2" +# TODO: logrotate 3.8.8 adds autotools/automake support, update recipe to use it. +# TODO: Document coreutils dependency. Why not RDEPENDS? Why not busybox? + DEPENDS="coreutils popt" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.gz \ file://act-as-mv-when-rotate.patch \ - file://disable-check-different-filesystems.patch \ file://update-the-manual.patch \ + file://disable-check-different-filesystems.patch \ " -SRC_URI[md5sum] = "99e08503ef24c3e2e3ff74cc5f3be213" -SRC_URI[sha256sum] = "f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64" +SRC_URI[md5sum] = "49846e873dddea15964cd0355b9943ca" +SRC_URI[sha256sum] = "46a1510ef4a1f4359edd5f361112cfd1523942e85ff28e6cbb0c81bad1829d0f" PACKAGECONFIG ?= "\ ${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ " +PACKAGECONFIG[acl] = ",,acl" +PACKAGECONFIG[selinux] = ",,libselinux" + +CONFFILES_${PN} += "${localstatedir}/lib/logrotate.status \ + ${sysconfdir}/logrotate.conf" + # If RPM_OPT_FLAGS is unset, it adds -g itself rather than obeying our # optimization variables, so use it rather than EXTRA_CFLAGS. EXTRA_OEMAKE = "\ diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb index d265731e04..1ae1e26971 100644 --- a/meta/recipes-extended/lsb/lsb_4.1.bb +++ b/meta/recipes-extended/lsb/lsb_4.1.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2+" PR = "r2" # lsb_release needs getopt -RDEPENDS_${PN} += "util-linux" +RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_getopt}" LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf" @@ -21,6 +21,8 @@ SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4" SRC_URI[sha256sum] = "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fdf17172" S = "${WORKDIR}/lsb-release-1.4" +CLEANBROKEN = "1" + do_install(){ oe_runmake install prefix=${D} mandir=${D}/${datadir}/man/ DESTDIR=${D} @@ -70,19 +72,18 @@ do_install(){ do_install_append(){ install -d ${D}${sysconfdir}/core-lsb - install -d ${D}/${baselib}/lsb for i in lsb_killproc lsb_log_message lsb_pidofproc lsb_start_daemon do install -m 0755 ${WORKDIR}/${i} ${D}${sysconfdir}/core-lsb done - install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb + + install -d ${D}/lib/lsb + install -m 0755 ${WORKDIR}/init-functions ${D}/lib/lsb # creat links for LSB test install -d ${D}/usr/lib/lsb ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/install_initd ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/remove_initd - install -d ${D}/${libdir} - ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail if [ "${TARGET_ARCH}" = "x86_64" ];then cd ${D} @@ -115,7 +116,7 @@ do_install_append(){ fi } FILES_${PN} += "/lib64 \ - /usr/lib/lsb \ + /usr/lib/lsb \ ${base_libdir}/lsb/* \ - ${libdir}/sendmail \ + /lib/lsb/* \ " diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.55.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.61.bb index 6ab52e3f17..65eb9f40ab 100644 --- a/meta/recipes-extended/lsb/lsbinitscripts_9.55.bb +++ b/meta/recipes-extended/lsb/lsbinitscripts_9.61.bb @@ -6,12 +6,12 @@ DEPENDS = "popt glib-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6" S="${WORKDIR}/initscripts-${PV}" -SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-9.55.tar.bz2/0672f648a9ee8607a2df65835c54f5e5/initscripts-9.55.tar.bz2 \ +SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-9.61.tar.bz2/892006be882b41f680109cb7336949d1/initscripts-9.61.tar.bz2 \ file://functions.patch \ " -SRC_URI[md5sum] = "0672f648a9ee8607a2df65835c54f5e5" -SRC_URI[sha256sum] = "546d4403a4efa3c4fa6de06a195013d4e64738799c2c779e56d900e7b232a9fa" +SRC_URI[md5sum] = "892006be882b41f680109cb7336949d1" +SRC_URI[sha256sum] = "fb090d3fc48adbc0bb5835090e7eb5f1aa7e33d39537523d017a604527a59653" inherit update-alternatives @@ -27,4 +27,5 @@ do_compile[noexec] = "1" do_install(){ install -d ${D}${sysconfdir}/init.d/ install -m 0644 ${S}/rc.d/init.d/functions ${D}${sysconfdir}/init.d/functions + sed -i 's,${base_bindir}/mountpoint,${bindir}/mountpoint,g' ${D}${sysconfdir}/init.d/functions } diff --git a/meta/recipes-extended/lsof/lsof_4.87.bb b/meta/recipes-extended/lsof/lsof_4.88.bb index e7a1eb2129..0e49f9217c 100644 --- a/meta/recipes-extended/lsof/lsof_4.87.bb +++ b/meta/recipes-extended/lsof/lsof_4.88.bb @@ -6,8 +6,8 @@ LICENSE = "BSD" SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2" -SRC_URI[md5sum] = "80e2a76d0e05826db910ec88e631296c" -SRC_URI[sha256sum] = "dfdd3709d82bc79ccdf3e404b84aafa9aede5948642a824ecaefd0aac589da2c" +SRC_URI[md5sum] = "1b29c10db4aa88afcaeeaabeef6790db" +SRC_URI[sha256sum] = "fe6f9b0e26b779ccd0ea5a0b6327c2b5c38d207a6db16f61ac01bd6c44e5c99b" LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar" S = "${WORKDIR}/lsof_${PV}_src" @@ -15,9 +15,16 @@ S = "${WORKDIR}/lsof_${PV}_src" LIC_FILES_CHKSUM = "file://${S}/00README;beginline=645;endline=679;md5=964df275d26429ba3b39dbb9f205172a" python do_unpack () { + # temporarily change S for unpack + # of lsof_${PV} + s = d.getVar('S') + d.setVar('S', '${WORKDIR}/lsof_${PV}') bb.build.exec_func('base_do_unpack', d) + # temporarily change SRC_URI for unpack + # of lsof_${PV}_src src_uri = d.getVar('SRC_URI') d.setVar('SRC_URI', '${LOCALSRC}') + d.setVar('S', s) bb.build.exec_func('base_do_unpack', d) d.setVar('SRC_URI', src_uri) } diff --git a/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch b/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch deleted file mode 100644 index fa20b085f7..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch +++ /dev/null @@ -1,48 +0,0 @@ -From b601a8d1b39075a5339195fc0a4038f71ec3b49e Mon Sep 17 00:00:00 2001 -From: "Gary S. Robertson" <gary.robertson@linaro.org> -Date: Wed, 27 Aug 2014 16:23:56 -0500 -Subject: [LTP][PATCH] Realtime tests: Fix bad priority inheritance conditionals - -testcases/realtime/lib/librttest.c and -testcases/realtime/stress/pi-tests/testpi-3.c -both referenced a non-existent autoconf configuration setting variable. -Replaced the invalid variable name with the variable actually created -by autoconf. - -Upstream-Status: Submitted - -Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org> ---- - testcases/realtime/lib/librttest.c | 2 +- - testcases/realtime/stress/pi-tests/testpi-3.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/testcases/realtime/lib/librttest.c b/testcases/realtime/lib/librttest.c -index c175148..3679058 100644 ---- a/testcases/realtime/lib/librttest.c -+++ b/testcases/realtime/lib/librttest.c -@@ -586,7 +586,7 @@ void *busy_work_us(int us) - - void init_pi_mutex(pthread_mutex_t * m) - { --#if HAVE_DECL_PTHREAD_PRIO_INHERIT -+#if HAS_PRIORITY_INHERIT - pthread_mutexattr_t attr; - int ret; - int protocol; -diff --git a/testcases/realtime/stress/pi-tests/testpi-3.c b/testcases/realtime/stress/pi-tests/testpi-3.c -index 30f38f6..e483945 100644 ---- a/testcases/realtime/stress/pi-tests/testpi-3.c -+++ b/testcases/realtime/stress/pi-tests/testpi-3.c -@@ -365,7 +365,7 @@ int main(int argc, char *argv[]) - - printf("Start %s\n", argv[0]); - --#if HAVE_DECL_PTHREAD_PRIO_INHERIT -+#if HAS_PRIORITY_INHERIT - if (!nopi) { - pthread_mutexattr_t mutexattr; - int protocol; --- -1.7.9.5 - diff --git a/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch b/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch deleted file mode 100644 index ccdd4d0bb3..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-Realtime-tests-Fix-robust-mutex-conditionals.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 663a14423baea0e05ba79d90d2497dde5e4594bd Mon Sep 17 00:00:00 2001 -From: "Gary S. Robertson" <gary.robertson@linaro.org> -Date: Thu, 11 Sep 2014 13:02:47 -0500 -Subject: [LTP][PATCH] Realtime tests: Fix robust mutex conditionals - -sbrk_mutex, testpi-5, and testpi-6 realtime tests in subdir -testcases/realtime/func/pi-tests used compile time config variables -which were not generated by autoconf in order to configure tests -for robust mutexes. Changed these conditionals to use the config -variables actually generated in the autoconf process. - -Upstream-Status: Submitted - -Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org> ---- - testcases/realtime/func/pi-tests/sbrk_mutex.c | 2 +- - testcases/realtime/func/pi-tests/testpi-5.c | 2 +- - testcases/realtime/func/pi-tests/testpi-6.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/testcases/realtime/func/pi-tests/sbrk_mutex.c b/testcases/realtime/func/pi-tests/sbrk_mutex.c -index 684021f..5c325b4 100644 ---- a/testcases/realtime/func/pi-tests/sbrk_mutex.c -+++ b/testcases/realtime/func/pi-tests/sbrk_mutex.c -@@ -45,7 +45,7 @@ - #include <unistd.h> - #include "librttest.h" - --#if defined(HAS_PTHREAD_MUTEXTATTR_ROBUST_APIS) && defined(PTHREAD_MUTEX_ROBUST_NP) -+#if HAS_PTHREAD_MUTEXTATTR_ROBUST_APIS - - #define NUM_MUTEXES 5000 - #define NUM_THREADS 50 -diff --git a/testcases/realtime/func/pi-tests/testpi-5.c b/testcases/realtime/func/pi-tests/testpi-5.c -index a1d93cc..70f02fd 100644 ---- a/testcases/realtime/func/pi-tests/testpi-5.c -+++ b/testcases/realtime/func/pi-tests/testpi-5.c -@@ -69,7 +69,7 @@ int do_test(int argc, char **argv) - pthread_mutexattr_t mutexattr; - int retc, protocol; - --#if HAS_PTHREAD_MUTEXATTR_PROTOCOL_FUNCTIONS -+#if HAS_PTHREAD_MUTEXTATTR_ROBUST_APIS - - if (pthread_mutexattr_init(&mutexattr) != 0) - printf("Failed to init mutexattr\n"); -diff --git a/testcases/realtime/func/pi-tests/testpi-6.c b/testcases/realtime/func/pi-tests/testpi-6.c -index b3c3e4a..f715eee 100644 ---- a/testcases/realtime/func/pi-tests/testpi-6.c -+++ b/testcases/realtime/func/pi-tests/testpi-6.c -@@ -41,7 +41,7 @@ - #include <unistd.h> - #include <librttest.h> - --#if defined(PTHREAD_MUTEX_ROBUST_NP) -+#if HAS_PTHREAD_MUTEXTATTR_ROBUST_APIS - pthread_mutex_t child_mutex; - - void *child_thread(void *arg) --- -1.7.9.5 - diff --git a/meta/recipes-extended/ltp/ltp/add-knob-for-tirpc.patch b/meta/recipes-extended/ltp/ltp/add-knob-for-tirpc.patch new file mode 100644 index 0000000000..36ff4c775d --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/add-knob-for-tirpc.patch @@ -0,0 +1,37 @@ +[PATCH] add knob to control whether tirpc support should be checked + +Upstream-Status: Pending + +tirpc support is broken upstream. in the meantime, allow to disable tirpc. + +Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org> +--- + configure.ac | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/configure.ac ++++ b/configure.ac +@@ -98,6 +98,13 @@ if test "x$with_python" = xyes; then + else + AC_SUBST([WITH_PYTHON],["no"]) + fi ++ ++# TI RPC ++AC_ARG_WITH([tirpc], ++ AC_HELP_STRING([--without-tirpc], ++ [without libtirpc support]), ++ [],[with_tirpc=yes], ++) + # END tools knobs + + # Testsuites knobs +@@ -182,7 +189,9 @@ LTP_CHECK_RENAMEAT + LTP_CHECK_FALLOCATE + LTP_CHECK_SYSCALL_FCNTL + LTP_CHECK_SYSCALL_PERF_EVENT_OPEN ++if test "x$with_tirpc" = xyes; then + LTP_CHECK_TIRPC ++fi + LTP_CHECK_TEE + LTP_CHECK_SPLICE + LTP_CHECK_VMSPLICE diff --git a/meta/recipes-extended/ltp/ltp/automake-foreign.patch b/meta/recipes-extended/ltp/ltp/automake-foreign.patch deleted file mode 100644 index c3dd891395..0000000000 --- a/meta/recipes-extended/ltp/ltp/automake-foreign.patch +++ /dev/null @@ -1,20 +0,0 @@ -Use foreign strictness to avoid automake errors. - -Upstream-Status: Submitted (https://github.com/linux-test-project/ltp/issues/16) -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/configure.ac b/configure.ac -index 9f397e7..fc57957 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4 +4 @@ --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) ---- a/utils/ffsb-6.0-rc2/configure.in -+++ b/utils/ffsb-6.0-rc2/configure.in -@@ -2,2 +2,3 @@ dnl Process this file with autoconf to produce a configure script. --AC_INIT(main.c) --AM_INIT_AUTOMAKE(ffsb, 6.0-RC2) -+AC_INIT([ffsb], [6.0-RC2]) -+AC_CONFIG_SRCDIR([main.c]) -+AM_INIT_AUTOMAKE([foreign]) diff --git a/meta/recipes-extended/ltp/ltp_20140422.bb b/meta/recipes-extended/ltp/ltp_20150119.bb index 5deaabf663..90c5973a08 100644 --- a/meta/recipes-extended/ltp/ltp_20140422.bb +++ b/meta/recipes-extended/ltp/ltp_20150119.bb @@ -20,16 +20,14 @@ LIC_FILES_CHKSUM = "\ " DEPENDS = "attr libaio libcap acl openssl zip-native" -SRCREV = "f4c3bfe1eab51eb72caeb0f3336d2790c9a8bd1b" +SRCREV = "b6ab85d764339b025526bdaf0b5026a67b3a677a" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \ file://ltp-Do-not-link-against-libfl.patch \ - file://automake-foreign.patch \ file://make-setregid02-work.patch \ file://add-knob-for-numa.patch \ - file://0001-Realtime-tests-Fix-bad-priority-inheritance-conditio.patch \ - file://0001-Realtime-tests-Fix-robust-mutex-conditionals.patch \ + file://add-knob-for-tirpc.patch \ " S = "${WORKDIR}/git" @@ -44,12 +42,8 @@ export exec_prefix = "/opt/ltp" PACKAGECONFIG[numa] = "--with-numa, --without-numa, numactl," EXTRA_AUTORECONF += "-I ${S}/testcases/realtime/m4" EXTRA_OECONF = " --with-power-management-testsuite --with-realtime-testsuite " - -# ltp doesn't regenerate ffsb-6.0-rc2 configure and hardcode configure call. -# we explicitly force regeneration of that directory and pass configure options. -do_configure_append() { - (cd utils/ffsb-6.0-rc2; autoreconf -fvi; ./configure ${CONFIGUREOPTS}) -} +# ltp network/rpc test cases ftbfs when libtirpc is found +EXTRA_OECONF += " --without-tirpc " # The makefiles make excessive use of make -C and several include testcases.mk # which triggers a build of the syscall header. To reproduce, build ltp, @@ -65,19 +59,15 @@ do_install(){ # Copy POSIX test suite into ${D}/opt/ltp/testcases by manual cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases - - # We need to remove all scripts which depend on /usr/bin/expect, since expect is not supported in oe-core - # We will add expect for enhancement in future - find ${D} -type f -print | xargs grep "\!.*\/usr\/bin\/expect" | awk -F":" '{print $1}' | xargs rm -f } -RDEPENDS_${PN} = "perl e2fsprogs-mke2fs python-core libaio bash gawk" +RDEPENDS_${PN} = "perl e2fsprogs-mke2fs python-core libaio bash gawk expect" FILES_${PN}-dbg += "\ /opt/ltp/runtest/.debug \ - /opt/ltp/testcases/bin/.debug \ - /opt/ltp/testcases/bin/*/bin/.debug \ - /opt/ltp/testcases/bin/*/test/.debug \ + /opt/ltp/testcases/*/.debug \ + /opt/ltp/testcases/*/*/.debug \ + /opt/ltp/testcases/*/*/*/.debug \ /opt/ltp/scenario_groups/.debug \ /opt/ltp/testscripts/.debug \ /opt/ltp/testscripts/open_posix_testsuite/.debug \ @@ -89,3 +79,6 @@ FILES_${PN} += "/opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/lt # Avoid generated binaries stripping. Otherwise some of the ltp tests such as ldd01 & nm01 fails INHIBIT_PACKAGE_STRIP = "1" +# However, test_arch_stripped is already stripped, so... +INSANE_SKIP_${PN} += "already-stripped" + diff --git a/meta/recipes-extended/mailx/mailx_12.5.bb b/meta/recipes-extended/mailx/mailx_12.5.bb index cc0b6bfd3a..a53da3af5d 100644 --- a/meta/recipes-extended/mailx/mailx_12.5.bb +++ b/meta/recipes-extended/mailx/mailx_12.5.bb @@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4202a0a62910cf94f7af8a3436a2a2dd" DEPENDS = "openssl" -SRC_URI = "${DEBIAN_MIRROR}/main/h/heirloom-mailx/heirloom-mailx_${PV}.orig.tar.gz;name=archive \ - ${DEBIAN_MIRROR}/main/h/heirloom-mailx/heirloom-mailx_${PV}-1.diff.gz;name=patch \ +SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+files/heirloom-mailx_12.5.orig.tar.gz;name=archive \ + https://launchpad.net/ubuntu/+archive/primary/+files/heirloom-mailx_12.5-1.diff.gz;name=patch \ file://explicitly.disable.krb5.support.patch \ " @@ -29,4 +29,8 @@ inherit autotools-brokensep CFLAGS_append = " -D_BSD_SOURCE -DDEBIAN -I${S}/EXT" EXTRA_OEMAKE = "SENDMAIL=${sbindir}/sendmail" +# The makeconfig can't run parallelly, otherwise the checking results +# might be incorrect and lead to errors: +# fio.c:56:17: fatal error: ssl.h: No such file or directory +# #include <ssl.h> PARALLEL_MAKE = "" diff --git a/meta/recipes-extended/man-pages/man-pages_3.71.bb b/meta/recipes-extended/man-pages/man-pages_3.76.bb index 225b2567cb..ed8a15f51d 100644 --- a/meta/recipes-extended/man-pages/man-pages_3.71.bb +++ b/meta/recipes-extended/man-pages/man-pages_3.76.bb @@ -7,8 +7,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://README;md5=8f2a3d43057d458e5066714980567a60" SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/Archive/${BP}.tar.gz" -SRC_URI[md5sum] = "a853ef29d835e8522c04f832919139f1" -SRC_URI[sha256sum] = "307c9ac65b98a3a3d377050f0dc62d40b7a5995e6e6e6049d63fd9cc4fc27059" +SRC_URI[md5sum] = "d00cf09677caefc3e827737afc565583" +SRC_URI[sha256sum] = "eff558c13b61a46136994514b3ec00a74dcf00414d3bde4f0edca80a36d36359" RDEPENDS_${PN} = "man" diff --git a/meta/recipes-extended/man/man/man-1.6e-whatis2.patch b/meta/recipes-extended/man/man/man-1.6e-whatis2.patch index 7f013836c0..fc4ed3135d 100644 --- a/meta/recipes-extended/man/man/man-1.6e-whatis2.patch +++ b/meta/recipes-extended/man/man/man-1.6e-whatis2.patch @@ -50,3 +50,10 @@ Index: man-1.6f/src/makewhatis.sh here=`pwd` cd $mandir for i in $sections +@@ -447,7 +447,6 @@ + + chmod 644 ${mandir1}/whatis + rm $TMPFILE +- fi + done + done diff --git a/meta/recipes-extended/man/man/man-1.6g-whatis3.patch b/meta/recipes-extended/man/man/man-1.6g-whatis3.patch new file mode 100644 index 0000000000..6334456857 --- /dev/null +++ b/meta/recipes-extended/man/man/man-1.6g-whatis3.patch @@ -0,0 +1,20 @@ +Do not use absolute path for awk while getting the path of awk +when running makewhatis. +This can avoid errors if path of awk changes. + +Upstream-Status: Submitted [man-1.6g] + +Signed-off-by: Jian Liu <jian.liu@windriver.com> + +diff -Nur man-1.6g.orig/src/makewhatis.sh man-1.6g/src/makewhatis.sh +--- man-1.6g.orig/src/makewhatis.sh 2015-02-25 16:13:12.657611419 +0800 ++++ man-1.6g/src/makewhatis.sh 2015-02-25 16:14:49.334694815 +0800 +@@ -67,7 +67,7 @@ + # but that leads to problems and bugs. + + # AWK=/usr/bin/gawk +-AWK=@awk@ ++AWK=`which awk` + + # Find a place for our temporary files. If security is not a concern, use + # TMPFILE=/tmp/whatis$$; TMPFILEDIR=none diff --git a/meta/recipes-extended/man/man_1.6g.bb b/meta/recipes-extended/man/man_1.6g.bb index 03fffd6015..d4a4b26fc5 100644 --- a/meta/recipes-extended/man/man_1.6g.bb +++ b/meta/recipes-extended/man/man_1.6g.bb @@ -22,7 +22,7 @@ def compress_pkg(d): RDEPENDS_${PN} += "${@compress_pkg(d)}" -SRC_URI = "http://primates.ximian.com/~flucifredi/${BPN}/${BPN}-${PV}.tar.gz \ +SRC_URI = "http://pkgs.fedoraproject.org/lookaside/pkgs/man2html/${BP}.tar.gz/ba154d5796928b841c9c69f0ae376660/${BP}.tar.gz \ file://man-1.5k-confpath.patch;striplevel=0 \ file://man-1.5h1-make.patch \ file://man-1.5k-nonascii.patch \ @@ -50,7 +50,9 @@ SRC_URI = "http://primates.ximian.com/~flucifredi/${BPN}/${BPN}-${PV}.tar.gz \ file://man.1.gz;unpack=false \ file://man.7.gz;unpack=false \ file://man.conf \ - file://manpath.5.gz;unpack=false" + file://manpath.5.gz;unpack=false \ + file://man-1.6g-whatis3.patch \ +" SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660" SRC_URI[sha256sum] = "ccdcb8c3f4e0080923d7e818f0e4a202db26c46415eaef361387c20995b8959f" @@ -60,7 +62,7 @@ do_configure () { } -fakeroot do_install() { +do_install() { oe_runmake install DESTDIR=${D} } diff --git a/meta/recipes-extended/mc/mc/mc-CTRL.patch b/meta/recipes-extended/mc/mc/mc-CTRL.patch index d532bde9a6..e23d9dd81c 100644 --- a/meta/recipes-extended/mc/mc/mc-CTRL.patch +++ b/meta/recipes-extended/mc/mc/mc-CTRL.patch @@ -15,7 +15,7 @@ Therefore this should be good to include in OpenEmbedded. Signed-off-by: Paul Barker <paul@paulbarker.me.uk> -Upstream-status: Pending +Upstream-status: Accepted (should be included in v4.8.14) diff -u mc-4.8.1.7.org/lib/tty/tty-ncurses.c mc-4.8.1.7/lib/tty/tty-ncurses.c --- mc-4.8.1.7.org/lib/tty/tty-ncurses.c diff --git a/meta/recipes-extended/mc/mc_4.8.12.bb b/meta/recipes-extended/mc/mc_4.8.13.bb index bc462e3fc0..ef5b1a23e2 100644 --- a/meta/recipes-extended/mc/mc_4.8.12.bb +++ b/meta/recipes-extended/mc/mc_4.8.13.bb @@ -10,8 +10,8 @@ SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://mc-CTRL.patch \ " -SRC_URI[md5sum] = "a64c426364bfaee56b628f6c0738aade" -SRC_URI[sha256sum] = "1054fcc27a488771cbe5b85d7c10135fa1cd1b7682a19930d44b51a023e39396" +SRC_URI[md5sum] = "12a521a50da6a86852177591b9623d5e" +SRC_URI[sha256sum] = "22e1b809edba957eb9a392138bf87fea3877f7ca0b7463b7cc2eb94afa6f3e49" inherit autotools gettext pkgconfig diff --git a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch new file mode 100644 index 0000000000..143a8d952e --- /dev/null +++ b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch @@ -0,0 +1,26 @@ +When try to print time_t values as a long int it causes an error because time_t +data type in x32 ABI is long long int. + +Upstream-Status: Pending + +Signed-off-by: AnÃbal Limón <anibal.limon@linux.intel.com> + +diff --git a/monitor.c b/monitor.c +index f81e707..19ea041 100644 +--- a/monitor.c ++++ b/monitor.c +@@ -260,8 +260,13 @@ static int read_and_act(struct active_array *a) + } + + gettimeofday(&tv, NULL); ++#if defined(__x86_64__) && defined(__ILP32__) ++ dprintf("%s(%d): %lld.%06lld state:%s prev:%s action:%s prev: %s start:%llu\n", ++#else + dprintf("%s(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n", +- __func__, a->info.container_member, ++#endif ++ __func__, ++ a->info.container_member, + tv.tv_sec, tv.tv_usec, + array_states[a->curr_state], + array_states[a->prev_state], diff --git a/meta/recipes-extended/mdadm/mdadm_3.3.1.bb b/meta/recipes-extended/mdadm/mdadm_3.3.2.bb index 59bc587ef9..c6a5635207 100644 --- a/meta/recipes-extended/mdadm/mdadm_3.3.1.bb +++ b/meta/recipes-extended/mdadm/mdadm_3.3.2.bb @@ -11,10 +11,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://mdadm-3.2.2_fix_for_x32.patch \ file://gcc-4.9.patch \ + file://mdadm-3.3.2_x32_abi_time_t.patch \ " -SRC_URI[md5sum] = "4227d48de62dfb217c92fa0c54171bbe" -SRC_URI[sha256sum] = "d8c74112cfd77bdc1dbc1291fe8d9243c76d91bfa276fcb95f2a75ca7717ab02" +SRC_URI[md5sum] = "44698d351501cac6a89072dc877eb220" +SRC_URI[sha256sum] = "0f3a7e1a76b13892b79f9fceaf99ecb23513260389a768ac644ffa3ae06e5b8c" CFLAGS += "-fno-strict-aliasing" @@ -32,6 +33,7 @@ EXTRA_OEMAKE = "CHECK_RUN_DIR=0" # int-ll64.h included EXTRA_OEMAKE_append_powerpc64 = ' CFLAGS=-D__SANE_USERSPACE_TYPES__' EXTRA_OEMAKE_append_mips64 = ' CFLAGS=-D__SANE_USERSPACE_TYPES__' +EXTRA_OEMAKE_append_mips64n32 = ' CFLAGS=-D__SANE_USERSPACE_TYPES__' do_compile() { oe_runmake diff --git a/meta/recipes-extended/mingetty/mingetty_1.08.bb b/meta/recipes-extended/mingetty/mingetty_1.08.bb index f1936afd23..3c16228b0d 100644 --- a/meta/recipes-extended/mingetty/mingetty_1.08.bb +++ b/meta/recipes-extended/mingetty/mingetty_1.08.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2" PR = "r3" LIC_FILES_CHKSUM = "file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e" -SRC_URI = "http://cdnetworks-kr-1.dl.sourceforge.net/project/mingetty/mingetty/${PV}/mingetty-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" SRC_URI[md5sum] = "2a75ad6487ff271424ffc00a64420990" SRC_URI[sha256sum] = "0f55c90ba4faa913d91ef99cbf5cb2eb4dbe2780314c3bb17953f849c8cddd17" diff --git a/meta/recipes-extended/msmtp/msmtp_1.4.32.bb b/meta/recipes-extended/msmtp/msmtp_1.6.1.bb index 4b7024ba85..d6f3a1516f 100644 --- a/meta/recipes-extended/msmtp/msmtp_1.4.32.bb +++ b/meta/recipes-extended/msmtp/msmtp_1.6.1.bb @@ -9,17 +9,22 @@ DEPENDS = "zlib gnutls" #COPYING or Licence LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "http://sourceforge.net/projects/msmtp/files/msmtp/${PV}/${BPN}-${PV}.tar.bz2 \ +SRC_URI = "http://sourceforge.net/projects/msmtp/files/msmtp/${PV}/${BPN}-${PV}.tar.xz \ " -SRC_URI[md5sum] = "aa60e22211118f222470439cea60f795" -SRC_URI[sha256sum] = "2bf0c5c7e78f9905f48de235a75111a1a88238793043bbeae00360b22f1a5f88" +SRC_URI[md5sum] = "6ebba4809bbc665b8a665a018d1a5ee1" +SRC_URI[sha256sum] = "c45d47f2dc77484e3f74c0f66aef0d5d95de6c47ed71d9f926d86d546f8346f3" inherit gettext autotools update-alternatives pkgconfig -EXTRA_OECONF += "--without-gnome-keyring --without-libidn" +EXTRA_OECONF += "--without-libsecret --without-libgsasl --without-libidn" ALTERNATIVE_${PN} = "sendmail" ALTERNATIVE_TARGET[sendmail] = "${bindir}/msmtp" ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" ALTERNATIVE_PRIORITY = "100" + +pkg_postinst_${PN}_linuxstdbase () { + # /usr/lib/sendmial is required by LSB core test + [ ! -L $D/usr/lib/sendmail ] && ln -sf ${sbindir}/sendmail $D/usr/lib/ +} diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-25.bb b/meta/recipes-extended/net-tools/net-tools_1.60-25.bb index 02826a09c9..c47d69a43d 100644 --- a/meta/recipes-extended/net-tools/net-tools_1.60-25.bb +++ b/meta/recipes-extended/net-tools/net-tools_1.60-25.bb @@ -6,8 +6,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ file://ifconfig.c;beginline=11;endline=15;md5=d1ca372080ad5401e23ca0afc35cf9ba" -SRC_URI = "${DEBIAN_MIRROR}/main/n/net-tools/net-tools_1.60.orig.tar.gz;name=tarball \ - ${DEBIAN_MIRROR}/main/n/net-tools/${BPN}_${PV}.diff.gz;apply=no;name=patch \ +SRC_URI = "http://snapshot.debian.org/archive/debian/20050312T000000Z/pool/main/n/${BPN}/${BPN}_1.60.orig.tar.gz;name=tarball \ + http://snapshot.debian.org/archive/debian/20130511T214653Z/pool/main/n/${BPN}/${BPN}_${PV}.diff.gz;apply=no;name=patch \ file://net-tools-config.h \ file://net-tools-config.make \ file://ifconfig-interface-0-del-IP-will-remove-the-aliased-.patch \ @@ -34,6 +34,7 @@ nettools_do_patch() { cd ${S} quilt pop -a || true if [ -d ${S}/.pc-nettools ]; then + rm -rf ${S}/.pc mv ${S}/.pc-nettools ${S}/.pc QUILT_PATCHES=${S}/debian/patches quilt pop -a rm -rf ${S}/.pc ${S}/debian diff --git a/meta/recipes-extended/newt/libnewt-python_0.52.17.bb b/meta/recipes-extended/newt/libnewt-python_0.52.18.bb index d591fbd3d2..ecc670e0aa 100644 --- a/meta/recipes-extended/newt/libnewt-python_0.52.17.bb +++ b/meta/recipes-extended/newt/libnewt-python_0.52.18.bb @@ -12,7 +12,7 @@ EXTRA_OEMAKE += "PYTHONVERS=${PYTHON_DIR}" do_compile () { VERSION="$(sed -n 's/^VERSION = //p' Makefile)" - oe_runmake "LIBNEWTSH=${STAGING_LIBDIR}/libnewt.so.$VERSION" _snack.so + oe_runmake _snack.so } do_install () { diff --git a/meta/recipes-extended/newt/libnewt_0.52.17.bb b/meta/recipes-extended/newt/libnewt_0.52.18.bb index 28d5cf1a34..fa2493b554 100644 --- a/meta/recipes-extended/newt/libnewt_0.52.17.bb +++ b/meta/recipes-extended/newt/libnewt_0.52.18.bb @@ -17,16 +17,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" # slang needs to be >= 2.2 DEPENDS = "slang popt" -PR = "r2" - SRC_URI = "https://fedorahosted.org/releases/n/e/newt/newt-${PV}.tar.gz \ file://remove_slang_include.patch \ file://fix_SHAREDDIR.patch \ file://cross_ar.patch \ " -SRC_URI[md5sum] = "f36d4d908965a0c89fd6fd8b61a6118b" -SRC_URI[sha256sum] = "69837973ef2ee2fa644426f1c3e48d2b18785ebcd382ef7fd01eb2e67d2d632b" +SRC_URI[md5sum] = "685721bee1a318570704b19dcf31d268" +SRC_URI[sha256sum] = "771b0e634ede56ae6a6acd910728bb5832ac13ddb0d1d27919d2498dab70c91e" S = "${WORKDIR}/newt-${PV}" @@ -34,6 +32,8 @@ EXTRA_OECONF = "--without-tcl --without-python" inherit autotools-brokensep +CLEANBROKEN = "1" + export STAGING_INCDIR export STAGING_LIBDIR diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index dd96fbebaa..e0f32e0a1d 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb @@ -211,6 +211,7 @@ QT4PKGS = " \ ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \ " QT4PKGS_mips64 = "" +QT4PKGS_mips64n32 = "" SUMMARY_packagegroup-core-lsb-desktop = "LSB Desktop" DESCRIPTION_packagegroup-core-lsb-desktop = "Packages required to support libraries \ diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb index 3b6d5144f9..b3b39da864 100644 --- a/meta/recipes-extended/pam/libpam_1.1.6.bb +++ b/meta/recipes-extended/pam/libpam_1.1.6.bb @@ -163,3 +163,9 @@ python do_pam_sanity () { addtask pam_sanity before do_configure BBCLASSEXTEND = "nativesdk native" + +CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session" +CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-auth" +CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-password" +CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session-noninteractive" +CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-account" diff --git a/meta/recipes-extended/parted/parted-3.1/Makefile b/meta/recipes-extended/parted/files/Makefile index ee90be0814..ee90be0814 100644 --- a/meta/recipes-extended/parted/parted-3.1/Makefile +++ b/meta/recipes-extended/parted/files/Makefile diff --git a/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch b/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch new file mode 100644 index 0000000000..68ab715f32 --- /dev/null +++ b/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch @@ -0,0 +1,57 @@ +From 060e74354774d36d2c11ef08e3e7ea9b9b6e23fb Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 13 Nov 2014 11:29:33 +0800 +Subject: [PATCH] libparted/arch/linux.c: fix compile failure while + --disable-device-mapper + +While --disable-device-mapper, the MACRO ENABLE_DEVICE_MAPPER is +undef, but it missed to scope some device mapper functions. + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + libparted/arch/linux.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c +index 6fd73c5..2afa479 100644 +--- a/libparted/arch/linux.c ++++ b/libparted/arch/linux.c +@@ -2320,6 +2320,7 @@ zasprintf (const char *format, ...) + static char * + dm_canonical_path (PedDevice const *dev) + { ++#ifdef ENABLE_DEVICE_MAPPER + LinuxSpecific const *arch_specific = LINUX_SPECIFIC (dev); + + /* Get map name from devicemapper */ +@@ -2337,6 +2338,7 @@ dm_canonical_path (PedDevice const *dev) + dm_task_destroy (task); + return dev_name; + err: ++#endif + return NULL; + } + +@@ -2957,13 +2959,15 @@ _disk_sync_part_table (PedDisk* disk) + unsigned long long *start, + unsigned long long *length); + +- ++#ifdef ENABLE_DEVICE_MAPPER + if (disk->dev->type == PED_DEVICE_DM) { + add_partition = _dm_add_partition; + remove_partition = _dm_remove_partition; + resize_partition = _dm_resize_partition; + get_partition_start_and_length = _dm_get_partition_start_and_length; +- } else { ++ } else ++#endif ++ { + add_partition = _blkpg_add_partition; + remove_partition = _blkpg_remove_partition; + #ifdef BLKPG_RESIZE_PARTITION +-- +1.9.1 + diff --git a/meta/recipes-extended/parted/parted-3.1/fix-doc-mandir.patch b/meta/recipes-extended/parted/files/fix-doc-mandir.patch index 0711d4e297..0711d4e297 100644 --- a/meta/recipes-extended/parted/parted-3.1/fix-doc-mandir.patch +++ b/meta/recipes-extended/parted/files/fix-doc-mandir.patch diff --git a/meta/recipes-extended/parted/parted-3.1/no_check.patch b/meta/recipes-extended/parted/files/no_check.patch index 58d8db4426..58d8db4426 100644 --- a/meta/recipes-extended/parted/parted-3.1/no_check.patch +++ b/meta/recipes-extended/parted/files/no_check.patch diff --git a/meta/recipes-extended/parted/parted-3.1/run-ptest b/meta/recipes-extended/parted/files/run-ptest index 695c5e8a7b..695c5e8a7b 100644 --- a/meta/recipes-extended/parted/parted-3.1/run-ptest +++ b/meta/recipes-extended/parted/files/run-ptest diff --git a/meta/recipes-extended/parted/parted-3.1/syscalls.patch b/meta/recipes-extended/parted/files/syscalls.patch index e9bbe9a956..e9bbe9a956 100644 --- a/meta/recipes-extended/parted/parted-3.1/syscalls.patch +++ b/meta/recipes-extended/parted/files/syscalls.patch diff --git a/meta/recipes-extended/parted/parted-3.1/fix-deprecated-readline.patch b/meta/recipes-extended/parted/parted-3.1/fix-deprecated-readline.patch deleted file mode 100644 index c4ca06d407..0000000000 --- a/meta/recipes-extended/parted/parted-3.1/fix-deprecated-readline.patch +++ /dev/null @@ -1,34 +0,0 @@ - -From: Gustavo Zacarias -Subject: bug#16929: [PATCH] ui: switch to new-style readline typedef -Date: Mon, 3 Mar 2014 10:40:08 -0300 - -The CPPFunction typedef (among others) have been deprecated in favour of -specific prototyped typedefs since readline 4.2 (circa 2001). -It's been working since because compatibility typedefs have been in -place until they where removed in the recent readline 6.3 release. -Switch to the new style to avoid build breakage. - -Signed-off-by: Gustavo Zacarias <address@hidden> - -Upstream-Status: Backport - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - ---- - parted/ui.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/parted/ui.c b/parted/ui.c -index 786deed..b33f6fc 100644 ---- a/parted/ui.c -+++ b/parted/ui.c -@@ -1470,7 +1470,7 @@ init_readline (void) - #ifdef HAVE_LIBREADLINE - if (!opt_script_mode) { - rl_initialize (); -- rl_attempted_completion_function = (CPPFunction*) complete_function; -+ rl_attempted_completion_function = (rl_completion_func_t *) complete_function; - readline_state.in_readline = 0; - } - #endif diff --git a/meta/recipes-extended/parted/parted-3.1/fix-dvh-overflows.patch b/meta/recipes-extended/parted/parted-3.1/fix-dvh-overflows.patch deleted file mode 100644 index b1eae97988..0000000000 --- a/meta/recipes-extended/parted/parted-3.1/fix-dvh-overflows.patch +++ /dev/null @@ -1,35 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Ming Liu <ming.liu@windriver.com> ---- - dvh.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -Index: parted-3.1/libparted/labels/dvh.h -=================================================================== ---- parted-3.1.orig/libparted/labels/dvh.h 2013-02-25 10:46:13.204477586 +0800 -+++ parted-3.1/libparted/labels/dvh.h 2013-02-25 10:47:20.954477065 +0800 -@@ -112,8 +112,8 @@ struct device_parameters { - - struct volume_directory { - char vd_name[VDNAMESIZE]; /* name */ -- int vd_lbn; /* logical block number */ -- int vd_nbytes; /* file length in bytes */ -+ unsigned int vd_lbn; /* logical block number */ -+ unsigned int vd_nbytes; /* file length in bytes */ - }; - - /* -@@ -125,9 +125,9 @@ struct volume_directory { - * NOTE: pt_firstlbn SHOULD BE CYLINDER ALIGNED - */ - struct partition_table { /* one per logical partition */ -- int pt_nblks; /* # of logical blks in partition */ -- int pt_firstlbn; /* first lbn of partition */ -- int pt_type; /* use of partition */ -+ unsigned int pt_nblks; /* # of logical blks in partition */ -+ unsigned int pt_firstlbn; /* first lbn of partition */ -+ int pt_type; /* use of partition */ - }; - - #define PTYPE_VOLHDR 0 /* partition is volume header */ diff --git a/meta/recipes-extended/parted/parted-3.1/fix-git-version-gen.patch b/meta/recipes-extended/parted/parted-3.1/fix-git-version-gen.patch deleted file mode 100644 index a9f26e9781..0000000000 --- a/meta/recipes-extended/parted/parted-3.1/fix-git-version-gen.patch +++ /dev/null @@ -1,43 +0,0 @@ -Upstream-Status: Accepted [Expected to be included in parted versions > 3.1] -Upstream-URL: http://git.savannah.gnu.org/cgit/gnulib.git/patch/?id=cbc11ff0020eb9c04caea6b3e7dc4e4281dff1f9 - -From cbc11ff0020eb9c04caea6b3e7dc4e4281dff1f9 Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter <obi@opendreambox.org> -Date: Sun, 18 Mar 2012 17:39:14 +0000 -Subject: git-version-gen: don't let "prefix" envvar cause trouble - -* build-aux/git-version-gen (prefix): Initialize properly, -so as not to use a value specified via the environment. -Details here: http://thread.gmane.org/gmane.comp.gnu.parted.bugs/10810 ---- -diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen -index d5542a2..0fa9063 100755 ---- a/build-aux/git-version-gen -+++ b/build-aux/git-version-gen -@@ -1,6 +1,6 @@ - #!/bin/sh - # Print a version string. --scriptversion=2012-01-06.07; # UTC -+scriptversion=2012-03-18.17; # UTC - - # Copyright (C) 2007-2012 Free Software Foundation, Inc. - # -@@ -92,6 +92,8 @@ Options: - - Running without arguments will suffice in most cases." - -+prefix=v -+ - while test $# -gt 0; do - case $1 in - --help) echo "$usage"; exit 0;; -@@ -120,7 +122,6 @@ if test -z "$tarball_version_file"; then - fi - - tag_sed_script="${tag_sed_script:-s/x/x/}" --prefix="${prefix:-v}" - - nl=' - ' --- -cgit v0.9.0.2 diff --git a/meta/recipes-extended/parted/parted_3.1.bb b/meta/recipes-extended/parted/parted_3.2.bb index 9057463c7e..e2257696d7 100644 --- a/meta/recipes-extended/parted/parted_3.1.bb +++ b/meta/recipes-extended/parted/parted_3.2.bb @@ -9,16 +9,14 @@ PR = "r1" SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ file://no_check.patch \ file://syscalls.patch \ - file://fix-git-version-gen.patch \ file://fix-doc-mandir.patch \ - file://fix-dvh-overflows.patch \ - file://fix-deprecated-readline.patch \ + file://fix-compile-failure-while-dis.patch \ file://run-ptest \ file://Makefile \ " -SRC_URI[md5sum] = "5d89d64d94bcfefa9ce8f59f4b81bdcb" -SRC_URI[sha256sum] = "5e9cc1f91eaf016e5033d85b9b893fd6d3ffaca532a48de1082df9b94225ca15" +SRC_URI[md5sum] = "0247b6a7b314f8edeb618159fa95f9cb" +SRC_URI[sha256sum] = "858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4" EXTRA_OECONF = "--disable-device-mapper" @@ -42,4 +40,4 @@ do_install_ptest() { sed -e 's| ../parted||' -i $t/tests/*.sh } -RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup" +RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup python" diff --git a/meta/recipes-extended/pax/pax_3.4.bb b/meta/recipes-extended/pax/pax_3.4.bb index 0c10688feb..ad04871a8e 100644 --- a/meta/recipes-extended/pax/pax_3.4.bb +++ b/meta/recipes-extended/pax/pax_3.4.bb @@ -1,6 +1,6 @@ SUMMARY = "Portable Archive eXchange" DESCRIPTION = "pax (Portable Archive eXchange) is the POSIX standard archive tool" -HOMEPAGE = "http://www.openbsd.org/cgi-bin/cvsweb/src/bin/pax/" +HOMEPAGE = "http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/bin/pax/" BUGTRACKER = "http://www.openbsd.org/query-pr.html" LICENSE = "BSD" @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4b0b674dfdc56daa3832d4069b820ea0 \ SECTION = "base" PR = "r2" -SRC_URI = "ftp://ftp.suse.com/pub/people/kukuk/pax/pax-${PV}.tar.bz2 \ +SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.tar.bz2/fbd9023b590b45ac3ade95870702a0d6/${BP}.tar.bz2 \ file://fix_for_compile_with_gcc-4.6.0.patch \ file://pax-3.4_fix_for_x32.patch" diff --git a/meta/recipes-extended/pigz/pigz.inc b/meta/recipes-extended/pigz/pigz.inc index 355fb2a4ec..c271f70159 100644 --- a/meta/recipes-extended/pigz/pigz.inc +++ b/meta/recipes-extended/pigz/pigz.inc @@ -5,28 +5,34 @@ multiple cores to the hilt when compressing data. pigz was written by Mark \ Adler, and uses the zlib and pthread libraries." HOMEPAGE = "http://zlib.net/pigz/" SECTION = "console/utils" -LICENSE = "Zlib" +LICENSE = "Zlib & Apache-2.0" -SRC_URI = "http://zlib.net/pigz/pigz-${PV}.tar.gz" +SRC_URI = "http://zlib.net/${BPN}/${BP}.tar.gz" PROVIDES_class-native += "gzip-native" DEPENDS = "zlib" -do_install () { - if [ "${CLASSOVERRIDE}" = "class-target" ] ; then - # Install files into /bin (FHS), which is typical place for gzip - install -d ${D}${base_bindir} - install ${B}/pigz ${D}${base_bindir}/gzip - install ${B}/unpigz ${D}${base_bindir}/gunzip - else - install -d ${D}${bindir} - install ${B}/pigz ${D}${bindir}/gzip - install ${B}/unpigz ${D}${bindir}/gunzip - fi +inherit update-alternatives + +do_install_class-target() { + # Install files into /bin (FHS), which is typical place for gzip + install -d ${D}${base_bindir} + install ${B}/pigz ${D}${base_bindir}/pigz + ln -nsf pigz ${D}${base_bindir}/unpigz + ln -nsf pigz ${D}${base_bindir}/pigzcat +} + +do_install() { + install -d ${D}${bindir} + install ${B}/pigz ${D}${bindir}/gzip + ln -nsf gzip ${D}${bindir}/gunzip + ln -nsf gzip ${D}${bindir}/zcat } -ALTERNATIVE_${PN} = "gzip gunzip" -ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip" -ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip" ALTERNATIVE_PRIORITY = "80" +ALTERNATIVE_${PN} = "gunzip gzip zcat" +ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip" +ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip" +ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat" +ALTERNATIVE_TARGET = "${base_bindir}/pigz" diff --git a/meta/recipes-extended/pigz/pigz/link-order.patch b/meta/recipes-extended/pigz/pigz/link-order.patch new file mode 100644 index 0000000000..4becc0e3fe --- /dev/null +++ b/meta/recipes-extended/pigz/pigz/link-order.patch @@ -0,0 +1,38 @@ +This patch avoids underlinking issues since we pass -lz via LDFLAGS but it appears +before pigz.o which needs symbols from libz however due to order linker happily discards libz + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: pigz-2.3.3/Makefile +=================================================================== +--- pigz-2.3.3.orig/Makefile 2015-01-19 20:12:31.000000000 -0800 ++++ pigz-2.3.3/Makefile 2015-01-28 09:11:50.266669184 -0800 +@@ -5,7 +5,7 @@ + # use gcc and gmake on Solaris + + pigz: pigz.o yarn.o try.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o ${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o ${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o +- $(CC) $(LDFLAGS) -o pigz $^ -lpthread -lm ++ $(CC) -o pigz $^ $(LDFLAGS) -lz -lpthread -lm + ln -f pigz unpigz + + pigz.o: pigz.c yarn.h try.h ${ZOPFLI}deflate.h ${ZOPFLI}util.h +@@ -35,7 +35,7 @@ + dev: pigz pigzt pigzn + + pigzt: pigzt.o yarnt.o try.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o ${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o ${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o +- $(CC) $(LDFLAGS) -o pigzt $^ -lpthread -lm ++ $(CC) -o pigzt $^ $(LDFLAGS) -lz -lpthread -lm + + pigzt.o: pigz.c yarn.h try.h + $(CC) $(CFLAGS) -DDEBUG -g -c -o pigzt.o pigz.c +@@ -44,7 +44,7 @@ + $(CC) $(CFLAGS) -DDEBUG -g -c -o yarnt.o yarn.c + + pigzn: pigzn.o tryn.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o ${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o ${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o +- $(CC) $(LDFLAGS) -o pigzn $^ -lm ++ $(CC) -o pigzn $^ $(LDFLAGS) -lz -lm + + pigzn.o: pigz.c try.h + $(CC) $(CFLAGS) -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c diff --git a/meta/recipes-extended/pigz/pigz_2.3.1.bb b/meta/recipes-extended/pigz/pigz_2.3.3.bb index cd5508d63e..080be2bbc9 100644 --- a/meta/recipes-extended/pigz/pigz_2.3.1.bb +++ b/meta/recipes-extended/pigz/pigz_2.3.3.bb @@ -1,8 +1,10 @@ require pigz.inc LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" -SRC_URI[md5sum] = "e803f8bc0770c7a5e96dccb1d2dd2aab" -SRC_URI[sha256sum] = "629b0ce5422a3978f31742bf8275d0be2f84987140d18f390f1e3b4e46e0af54" +SRC_URI += "file://link-order.patch" + +SRC_URI[md5sum] = "01d7a16cce77929cc1a78aa1bdfb68cb" +SRC_URI[sha256sum] = "4e8b67b432ce7907575a549f3e1cac4709781ba0f6b48afea9f59369846b509c" NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" diff --git a/meta/recipes-extended/procps/procps-3.2.8/0001-Fix-musl-build-failure.patch b/meta/recipes-extended/procps/procps-3.2.8/0001-Fix-musl-build-failure.patch deleted file mode 100644 index 71dc3f07e4..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/0001-Fix-musl-build-failure.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6f2fd55ef7621fd7ab7897aee2c2651b6faf9e6a Mon Sep 17 00:00:00 2001 -From: Paul Barker <paul@paulbarker.me.uk> -Date: Wed, 20 Aug 2014 11:56:11 +0200 -Subject: [PATCH] Fix musl build failure - -Include <limits.h> for PATH_MAX. - -Signed-off-by: Paul Barker <paul@paulbarker.me.uk> - -Upstream-status: Pending ---- - proc/readproc.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/proc/readproc.c b/proc/readproc.c -index 4fad11d..c5b1869 100644 ---- a/proc/readproc.c -+++ b/proc/readproc.c -@@ -26,6 +26,7 @@ - #include <sys/dir.h> - #include <sys/types.h> - #include <sys/stat.h> -+#include <limits.h> - - // sometimes it's easier to do this manually, w/o gcc helping - #ifdef PROF --- -1.9.1 - diff --git a/meta/recipes-extended/procps/procps-3.2.8/60_linux_version_init.patch b/meta/recipes-extended/procps/procps-3.2.8/60_linux_version_init.patch deleted file mode 100644 index 203ccb3347..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/60_linux_version_init.patch +++ /dev/null @@ -1,54 +0,0 @@ -## 60_linux_init.dpatch by <david.sugar@canonical.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix Linux version detection which relied on elf loader side-effect. -## DP: This patch also depends on 40_gnu-kbsd-version, which modified -## DP: init_Linux_version(). - -@DPATCH@ - -Upstream-Status: inappropriate [upstream unmaintained] ---- - proc/sysinfo.c | 1 + - proc/version.c | 5 +++-- - proc/version.h | 1 + - 3 files changed, 5 insertions(+), 2 deletions(-) - -Index: procps-3.2.8/proc/sysinfo.c -=================================================================== ---- procps-3.2.8.orig/proc/sysinfo.c -+++ procps-3.2.8/proc/sysinfo.c -@@ -212,6 +212,7 @@ static int check_for_privs(void){ - static void init_libproc(void) __attribute__((constructor)); - static void init_libproc(void){ - have_privs = check_for_privs(); -+ init_Linux_version(); // make sure we have version before continuing... - // ought to count CPUs in /proc/stat instead of relying - // on glibc, which foolishly tries to parse /proc/cpuinfo - // -Index: procps-3.2.8/proc/version.c -=================================================================== ---- procps-3.2.8.orig/proc/version.c -+++ procps-3.2.8/proc/version.c -@@ -33,8 +33,7 @@ void display_version(void) { - - int linux_version_code; - --static void init_Linux_version(void) __attribute__((constructor)); --static void init_Linux_version(void) { -+void init_Linux_version(void) { - int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 2 */ - FILE *fp; - char buf[256]; -Index: procps-3.2.8/proc/version.h -=================================================================== ---- procps-3.2.8.orig/proc/version.h -+++ procps-3.2.8/proc/version.h -@@ -14,6 +14,7 @@ - - EXTERN_C_BEGIN - -+extern void init_Linux_version(void); /* initialize linux version */ - extern void display_version(void); /* display suite version */ - extern const char procps_version[]; /* global buf for suite version */ - diff --git a/meta/recipes-extended/procps/procps-3.2.8/detect_bitness.patch b/meta/recipes-extended/procps/procps-3.2.8/detect_bitness.patch deleted file mode 100644 index 1523c3dfb2..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/detect_bitness.patch +++ /dev/null @@ -1,26 +0,0 @@ -Do not try to detect 64bit/32bit system -we already feed that information via compiler -defaults - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Inappropriate [OE specific] -Index: procps-3.2.8/Makefile -=================================================================== ---- procps-3.2.8.orig/Makefile 2014-05-03 01:00:01.707387583 -0700 -+++ procps-3.2.8/Makefile 2014-05-03 08:53:08.087175369 -0700 -@@ -118,15 +118,6 @@ - # until you go looking for a 64-bit curses library. - check_gcc = $(shell if $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) dummy.c $(ALL_LDFLAGS) $(1) -o /dev/null $(CURSES) > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) - --# Be 64-bit if at all possible. In a cross-compiling situation, one may --# do "make m64=-m32 lib64=lib" to produce 32-bit executables. DO NOT --# attempt to use a 32-bit executable on a 64-bit kernel. Packagers MUST --# produce separate executables for ppc and ppc64, s390 and s390x, --# i386 and x86-64, mips and mips64, sparc and sparc64, and so on. --# Failure to do so will cause data corruption. --m64 := $(call check_gcc,-m64,$(call check_gcc,-mabi=64,)) --ALL_CFLAGS += $(m64) -- - ALL_CFLAGS += $(call check_gcc,-Wdeclaration-after-statement,) - ALL_CFLAGS += $(call check_gcc,-Wpadded,) - ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing,) diff --git a/meta/recipes-extended/procps/procps-3.2.8/gnu-kbsd-version.patch b/meta/recipes-extended/procps/procps-3.2.8/gnu-kbsd-version.patch deleted file mode 100644 index 2582857e25..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/gnu-kbsd-version.patch +++ /dev/null @@ -1,44 +0,0 @@ -Upstream-Status: Inappropriate [not author, no upstream] - -Imported from Debian. -Source: http://anonscm.debian.org/gitweb/?p=collab-maint/procps.git;a=blob;f=debian/patches/gnu-kbsd-version.patch;h=fe5489fc772a3355ff8c0dcf9b953bf0c05aa9f8;hb=b460cfd726b019f8d918b380f78af4c19c5f3e50 -Bugtracker: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632749 - -Stops procps utilities from printing a warning when used with -kernels having only two digit versions, e.g. 3.0. - -Author: <csmall@debian.org> -Description: Rework version parsing so its ok with other OSes ---- a/proc/version.c -+++ b/proc/version.c -@@ -35,15 +35,23 @@ - - static void init_Linux_version(void) __attribute__((constructor)); - static void init_Linux_version(void) { -- static struct utsname uts; -- int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ -+ int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 2 */ -+ FILE *fp; -+ char buf[256]; - -- if (uname(&uts) == -1) /* failure implies impending death */ -- exit(1); -- if (sscanf(uts.release, "%d.%d.%d", &x, &y, &z) < 3) -+ if ( (fp=fopen("/proc/version","r")) == NULL) /* failure implies impending death */ -+ exit(1); -+ if (fgets(buf, 256, fp) == NULL) { -+ fprintf(stderr, "Cannot read kernel version from /proc/version\n"); -+ fclose(fp); -+ exit(1); -+ } -+ fclose(fp); -+ if (sscanf(buf, "Linux version %d.%d.%d", &x, &y, &z) < 2) - fprintf(stderr, /* *very* unlikely to happen by accident */ - "Non-standard uts for running kernel:\n" -- "release %s=%d.%d.%d gives version code %d\n", -- uts.release, x, y, z, LINUX_VERSION(x,y,z)); -+ "release %s=%d.%d.%d gives version code %d\n", -+ buf, -+ x, y, z, LINUX_VERSION(x,y,z)); - linux_version_code = LINUX_VERSION(x, y, z); - } diff --git a/meta/recipes-extended/procps/procps-3.2.8/install.patch b/meta/recipes-extended/procps/procps-3.2.8/install.patch deleted file mode 100644 index 2a59a5ff68..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/install.patch +++ /dev/null @@ -1,39 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -diff -ruN procps-3.2.8-orig//Makefile procps-3.2.8/Makefile ---- procps-3.2.8-orig//Makefile 2011-08-23 22:06:46.471163999 +0800 -+++ procps-3.2.8/Makefile 2011-08-23 22:15:01.091163999 +0800 -@@ -29,9 +29,6 @@ - ln_sf := ln -sf - install := install -D --owner 0 --group 0 - --# Lame x86-64 /lib64 and /usr/lib64 abomination: --lib64 := lib$(shell [ -d /lib64 ] && echo 64) -- - usr/bin := $(DESTDIR)/usr/bin/ - bin := $(DESTDIR)/bin/ - sbin := $(DESTDIR)/sbin/ -@@ -39,8 +36,8 @@ - man1 := $(DESTDIR)/usr/share/man/man1/ - man5 := $(DESTDIR)/usr/share/man/man5/ - man8 := $(DESTDIR)/usr/share/man/man8/ --lib := $(DESTDIR)/$(lib64)/ --usr/lib := $(DESTDIR)/usr/$(lib64)/ -+lib := $(DESTDIR)/$(base_libdir)/ -+usr/lib := $(DESTDIR)/$(libdir)/ - usr/include := $(DESTDIR)/usr/include/ - - #SKIP := $(bin)kill $(man1)kill.1 -@@ -222,10 +219,10 @@ - ###### install - - $(BINFILES) : all -- $(install) --mode a=rx $(notdir $@) $@ -+ $(install) -m 555 $(notdir $@) $@ - - $(MANFILES) : all -- $(install) --mode a=r $(notdir $@) $@ -+ $(install) -m 444 $(notdir $@) $@ - - install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) - cd $(usr/bin) && $(ln_f) skill snice diff --git a/meta/recipes-extended/procps/procps-3.2.8/linux-limits.patch b/meta/recipes-extended/procps/procps-3.2.8/linux-limits.patch deleted file mode 100644 index 2ca972482d..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/linux-limits.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Pending - -diff --git a/pwdx.c b/pwdx.c -index cb96a52..29ebce2 100644 ---- a/pwdx.c -+++ b/pwdx.c -@@ -13,7 +13,7 @@ - #include <stdlib.h> - #include <sys/types.h> - #include <regex.h> --#include <limits.h> -+#include <linux/limits.h> - #include <unistd.h> - #include <errno.h> - diff --git a/meta/recipes-extended/procps/procps-3.2.8/procmodule.patch b/meta/recipes-extended/procps/procps-3.2.8/procmodule.patch deleted file mode 100644 index 2a65c3509f..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/procmodule.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Pending - -*** procps-3.2.5/proc/module.mk.orig Sun Jul 24 11:53:49 2005 ---- procps-3.2.5/proc/module.mk Sun Jul 24 11:54:32 2005 -*************** -*** 96,102 **** - #################### install rules ########################### - - $(lib)$(SOFILE) : proc/$(SONAME) -! $(install) --mode a=rx $< $@ - - ifneq ($(SOLINK),$(SOFILE)) - .PHONY: $(lib)$(SOLINK) ---- 96,102 ---- - #################### install rules ########################### - - $(lib)$(SOFILE) : proc/$(SONAME) -! $(install) -m 555 $< $@ - - ifneq ($(SOLINK),$(SOFILE)) - .PHONY: $(lib)$(SOLINK) -*************** -*** 115,121 **** - $(ldconfig) - - $(usr/lib)$(ANAME) : proc/$(ANAME) -! $(install) --mode a=r $< $@ - - # Junk anyway... supposed to go in /usr/include/$(NAME) - #INSTALL += $(addprefix $(include),$(HDRFILES)) ---- 115,121 ---- - $(ldconfig) - - $(usr/lib)$(ANAME) : proc/$(ANAME) -! $(install) -m 444 $< $@ - - # Junk anyway... supposed to go in /usr/include/$(NAME) - #INSTALL += $(addprefix $(include),$(HDRFILES)) diff --git a/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.7-top-remcpu.patch b/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.7-top-remcpu.patch deleted file mode 100644 index 0306c8d639..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.7-top-remcpu.patch +++ /dev/null @@ -1,111 +0,0 @@ -Upstream-Status: Pending - -fix that top will quit after cpu offline - -top utiliy fails to read /proc/stat after cpu offline, because Cpu_tot -is still the original cpu numbers when calling cpus_refresh, in which -it is trying to read and sscanf Cpu_tot times /proc/stat. - -The patch is from procps-3.2.8-2.fc12.src.rpm - -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> - ---- ---- procps-3.2.7/top.c.remcpu 2006-07-10 10:41:11.000000000 +0200 -+++ procps-3.2.7/top.c 2006-07-10 10:41:35.000000000 +0200 -@@ -912,6 +912,7 @@ - static CPU_t *cpus_refresh (CPU_t *cpus) - { - static FILE *fp = NULL; -+ static int cpu_max; - int i; - int num; - // enough for a /proc/stat CPU line (not the intr line) -@@ -926,24 +927,29 @@ - can hold tics representing the /proc/stat cpu summary (the first - line read) -- that slot supports our View_CPUSUM toggle */ - cpus = alloc_c((1 + Cpu_tot) * sizeof(CPU_t)); -+ cpu_max = Cpu_tot; - } -+ else if (cpu_max > Cpu_tot) -+ /* move saved CUPs summary to cpu_max possition */ -+ memcpy(&cpus[cpu_max], &cpus[Cpu_tot], sizeof(CPU_t)); -+ - rewind(fp); - fflush(fp); - - // first value the last slot with the cpu summary line - if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read"); -- cpus[Cpu_tot].x = 0; // FIXME: can't tell by kernel version number -- cpus[Cpu_tot].y = 0; // FIXME: can't tell by kernel version number -- cpus[Cpu_tot].z = 0; // FIXME: can't tell by kernel version number -+ cpus[cpu_max].x = 0; // FIXME: can't tell by kernel version number -+ cpus[cpu_max].y = 0; // FIXME: can't tell by kernel version number -+ cpus[cpu_max].z = 0; // FIXME: can't tell by kernel version number - num = sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", -- &cpus[Cpu_tot].u, -- &cpus[Cpu_tot].n, -- &cpus[Cpu_tot].s, -- &cpus[Cpu_tot].i, -- &cpus[Cpu_tot].w, -- &cpus[Cpu_tot].x, -- &cpus[Cpu_tot].y, -- &cpus[Cpu_tot].z -+ &cpus[cpu_max].u, -+ &cpus[cpu_max].n, -+ &cpus[cpu_max].s, -+ &cpus[cpu_max].i, -+ &cpus[cpu_max].w, -+ &cpus[cpu_max].x, -+ &cpus[cpu_max].y, -+ &cpus[cpu_max].z - ); - if (num < 4) - std_err("failed /proc/stat read"); -@@ -955,7 +961,7 @@ - } - - // now value each separate cpu's tics -- for (i = 0; 1 < Cpu_tot && i < Cpu_tot; i++) { -+ for (i = 0; ; i++) { - if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read"); - cpus[i].x = 0; // FIXME: can't tell by kernel version number - cpus[i].y = 0; // FIXME: can't tell by kernel version number -@@ -964,9 +970,35 @@ - &cpus[i].id, - &cpus[i].u, &cpus[i].n, &cpus[i].s, &cpus[i].i, &cpus[i].w, &cpus[i].x, &cpus[i].y, &cpus[i].z - ); -- if (num < 4) -- std_err("failed /proc/stat read"); -+ if (num < 4) { -+ Cpu_tot = i; -+ break; -+ } -+ if (i == cpu_max - 1) { -+ // Bump cpu_max and extend cpus -+ cpu_max++; -+ cpus = realloc(cpus, (1 + cpu_max) * sizeof(CPU_t)); -+ if (!cpus) std_err("realloc failed"); -+ memcpy(&cpus[cpu_max], &cpus[cpu_max-1], sizeof(CPU_t)); -+ } -+ } -+ -+ if (cpu_max > Cpu_tot) -+ memcpy(&cpus[Cpu_tot], &cpus[cpu_max], sizeof(CPU_t)); -+ -+ // and just in case we're 2.2.xx compiled without SMP support... -+ if (Cpu_tot == 1) { -+ cpus[0].id = cpus[1].id = 0; -+ cpus[0].u = cpus[1].u; -+ cpus[0].n = cpus[1].n; -+ cpus[0].s = cpus[1].s; -+ cpus[0].i = cpus[1].i; -+ cpus[0].w = cpus[1].w; -+ cpus[0].x = cpus[1].x; -+ cpus[0].y = cpus[1].y; -+ cpus[0].z = cpus[1].z; - } -+ - return cpus; - } - diff --git a/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.8+gmake-3.82.patch b/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.8+gmake-3.82.patch deleted file mode 100644 index c8cee26eac..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.8+gmake-3.82.patch +++ /dev/null @@ -1,19 +0,0 @@ -Upstream-Status: Backport - -Fix for stricter Makefile parser in Make 3.82 take from Gentoo bugzilla: -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-process/procps/files/procps-3.2.8%2Bgmake-3.82.patch?revision=1.1 - -Index: procps-3.2.8/Makefile -=================================================================== ---- procps-3.2.8.orig/Makefile -+++ procps-3.2.8/Makefile -@@ -174,7 +174,8 @@ INSTALL := $(BINFILES) $(MANFILES) - # want this rule first, use := on ALL, and ALL not filled in yet - all: do_all - ---include */module.mk -+-include proc/module.mk -+-include ps/module.mk - - do_all: $(ALL) - diff --git a/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.8-ps-cgroup.patch b/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.8-ps-cgroup.patch deleted file mode 100644 index 1a294142f5..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.8-ps-cgroup.patch +++ /dev/null @@ -1,82 +0,0 @@ -From e529ce0b53f6b73d8b760cd37b23e0397720cede Mon Sep 17 00:00:00 2001 -From: Daniel Novotny <dnovotny@fedoraproject.org> -Date: Mon, 16 Feb 2009 12:22:20 +0000 -Subject: add cgroup support - -Rebased for 3.2.8: Andrei Gherzan <andrei.gherzan@windriver.com> - -Upstream-Status: Pending - -The patch was imported from the meta-ivi repository -(git://git.yoctoproject.org/meta-ivi) as of commit id -74b9624fe94b2b90810717a13d481b0db9d2d95a - -Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> - -Index: procps-3.2.8/ps/output.c -=================================================================== ---- procps-3.2.8.orig/ps/output.c 2012-11-15 17:44:05.501337741 +0200 -+++ procps-3.2.8/ps/output.c 2012-11-15 17:48:31.585328231 +0200 -@@ -1099,6 +1099,39 @@ - return snprintf(outbuf, COLWID, "*"); - } - -+static int pr_cgroup(char *restrict const outbuf, const proc_t *restrict const pp){ -+ char filename[48]; -+ FILE *fd; -+ int counter = 0; -+ int c; -+ int is_cgroup = 0; -+ -+ outbuf[0]='\0'; -+ snprintf(filename, sizeof filename, "/proc/%d/cgroup", pp->tgid); -+ fd = fopen(filename, "r"); -+ if (likely(fd == NULL)) goto fail; -+ while (( (c = fgetc(fd)) != EOF) && (counter<665)) { -+ if (is_cgroup == 0) { -+ if (c == ':') { -+ is_cgroup = 1; -+ if (counter>0) -+ outbuf[counter++]=';'; -+ } -+ }else -+ if ((c == '\n') || (c == '\0')) -+ is_cgroup = 0; -+ else -+ outbuf[counter++]=c; -+ } -+ outbuf[counter]='\0'; -+ close(fd); -+ if (counter>0) -+ return counter; -+fail: -+ outbuf[0] = '-'; -+ outbuf[1] = '\0'; -+ return 1; -+} - - /****************** FLASK & seLinux security stuff **********************/ - // move the bulk of this to libproc sometime -@@ -1293,6 +1326,7 @@ - {"bsdtime", "TIME", pr_bsdtime, sr_nop, 6, 0, LNX, ET|RIGHT}, - {"c", "C", pr_c, sr_pcpu, 2, 0, SUN, ET|RIGHT}, - {"caught", "CAUGHT", pr_sigcatch, sr_nop, 9, 0, BSD, TO|SIGNAL}, /*sigcatch*/ -+{"cgroup", "CGROUP", pr_cgroup, sr_nop, 35, 0, LNX, PO|LEFT}, /* cgroups*/ - {"class", "CLS", pr_class, sr_sched, 3, 0, XXX, TO|LEFT}, - {"cls", "CLS", pr_class, sr_sched, 3, 0, HPU, TO|RIGHT}, /*says HPUX or RT*/ - {"cmaj_flt", "-", pr_nop, sr_cmaj_flt, 1, 0, LNX, AN|RIGHT}, -Index: procps-3.2.8/ps/ps.1 -=================================================================== ---- procps-3.2.8.orig/ps/ps.1 2012-11-15 17:44:50.845336117 +0200 -+++ procps-3.2.8/ps/ps.1 2012-11-15 17:49:09.621326859 +0200 -@@ -904,6 +904,10 @@ - displayed. (alias\ \fBsig_catch\fR,\ \fBsigcatch\fR). - T} - -+cgroup CGROUP T{ -+display control groups to which the process belonges. -+t} -+ - class CLS T{ - scheduling class of the process. (alias\ \fBpolicy\fR,\ \fBcls\fR). - Field's possible values are: diff --git a/meta/recipes-extended/procps/procps-3.2.8/psmodule.patch b/meta/recipes-extended/procps/procps-3.2.8/psmodule.patch deleted file mode 100644 index 0775eaba26..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/psmodule.patch +++ /dev/null @@ -1,23 +0,0 @@ -Upstream-Status: Pending - -*** procps-3.2.5/ps/module.mk.orig Sun Jul 24 11:54:40 2005 ---- procps-3.2.5/ps/module.mk Sun Jul 24 11:55:02 2005 -*************** -*** 33,40 **** - - - $(bin)ps: ps/ps -! $(install) --mode a=rx $< $@ - - $(man1)ps.1 : ps/ps.1 -! $(install) --mode a=r $< $@ - -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz ---- 33,40 ---- - - - $(bin)ps: ps/ps -! $(install) -m 555 $< $@ - - $(man1)ps.1 : ps/ps.1 -! $(install) -m 444 $< $@ - -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz diff --git a/meta/recipes-extended/procps/procps.inc b/meta/recipes-extended/procps/procps.inc deleted file mode 100644 index da91da232d..0000000000 --- a/meta/recipes-extended/procps/procps.inc +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "System and process monitoring utilities" -DESCRIPTION = "Procps contains a set of system utilities that provide system information about processes using \ -the /proc filesystem. The package \ includes the programs ps, top, vmstat, w, kill, and skill." -HOMEPAGE = "http://procps.sf.net" -SECTION = "base" -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM="file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ - file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812 \ - file://ps/COPYING;md5=6e29c688d912da12b66b73e32b03d812 \ - file://proc/COPYING;md5=6e29c688d912da12b66b73e32b03d812" -DEPENDS = "ncurses" - -SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \ - file://install.patch" - -inherit autotools-brokensep update-alternatives - -do_install_append() { - mv ${D}${bindir}/watch ${D}${bindir}/watch.${BPN} -} - -FILES_${PN} += "${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so" -FILES_SOLIBSDEV = "" - -ALTERNATIVE_${PN} = "top uptime free pkill pmap kill sysctl ps pgrep pwdx watch" -ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" -ALTERNATIVE_LINK_NAME[sysctl] = "${base_sbindir}/sysctl" -ALTERNATIVE_LINK_NAME[ps] = "${base_bindir}/ps" -ALTERNATIVE_LINK_NAME[watch] = "${base_bindir}/watch" -ALTERNATIVE_TARGET[watch] = "${bindir}/watch.${BPN}" -ALTERNATIVE_PRIORITY = "110" diff --git a/meta/recipes-extended/procps/procps/fix-configure.patch b/meta/recipes-extended/procps/procps/fix-configure.patch new file mode 100644 index 0000000000..934ae80954 --- /dev/null +++ b/meta/recipes-extended/procps/procps/fix-configure.patch @@ -0,0 +1,19 @@ + +exec_prefix is /usr default in OE-Core + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Saul Wold <sgw@linux.intel.com> +Index: procps-ng-3.3.10/configure.ac +=================================================================== +--- procps-ng-3.3.10.orig/configure.ac ++++ procps-ng-3.3.10/configure.ac +@@ -70,7 +70,7 @@ AC_FUNC_MMAP + AC_FUNC_REALLOC + AC_FUNC_STRTOD + +-usrbin_execdir='${exec_prefix}/usr/bin' ++usrbin_execdir='${exec_prefix}/bin' + AC_SUBST([usrbin_execdir]) + + AM_GNU_GETTEXT_VERSION([0.14.1]) diff --git a/meta/recipes-extended/procps/procps-3.2.8/sysctl.conf b/meta/recipes-extended/procps/procps/sysctl.conf index 34e7488bf7..34e7488bf7 100644 --- a/meta/recipes-extended/procps/procps-3.2.8/sysctl.conf +++ b/meta/recipes-extended/procps/procps/sysctl.conf diff --git a/meta/recipes-extended/procps/procps_3.2.8.bb b/meta/recipes-extended/procps/procps_3.2.8.bb deleted file mode 100644 index fcfde194f1..0000000000 --- a/meta/recipes-extended/procps/procps_3.2.8.bb +++ /dev/null @@ -1,37 +0,0 @@ -require procps.inc - -PR = "r12" - -SRC_URI += "file://procmodule.patch \ - file://psmodule.patch \ - file://linux-limits.patch \ - file://sysctl.conf \ - file://procps-3.2.8+gmake-3.82.patch \ - file://gnu-kbsd-version.patch \ - file://60_linux_version_init.patch \ - file://procps-3.2.7-top-remcpu.patch \ - file://procps-3.2.8-ps-cgroup.patch \ - file://detect_bitness.patch \ - file://0001-Fix-musl-build-failure.patch \ - " - -SRC_URI[md5sum] = "9532714b6846013ca9898984ba4cd7e0" -SRC_URI[sha256sum] = "11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535" - -EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -I${STAGING_INCDIR}" \ - CPPFLAGS=-I${STAGING_INCDIR} \ - LDFLAGS="${LDFLAGS}" \ - CURSES=-lncurses \ - install="install -D" \ - ldconfig=echo' - -do_install_append () { - install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${sysconfdir}/sysctl.d - ln -sf ../sysctl.conf ${D}${sysconfdir}/sysctl.d/99-sysctl.conf - fi -} - -CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" diff --git a/meta/recipes-extended/procps/procps_3.3.10.bb b/meta/recipes-extended/procps/procps_3.3.10.bb new file mode 100644 index 0000000000..621b6dd578 --- /dev/null +++ b/meta/recipes-extended/procps/procps_3.3.10.bb @@ -0,0 +1,62 @@ +SUMMARY = "System and process monitoring utilities" +DESCRIPTION = "Procps contains a set of system utilities that provide system information about processes using \ +the /proc filesystem. The package includes the programs ps, top, vmstat, w, kill, and skill." +HOMEPAGE = "https://gitorious.org/procps" +SECTION = "base" +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4cf66a4984120007c9881cc871cf49db \ + " + +DEPENDS = "ncurses" + +inherit autotools gettext pkgconfig update-alternatives + +SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz \ + file://fix-configure.patch \ + file://sysctl.conf \ + " + +SRC_URI[md5sum] = "1fb7f3f6bf92ce6c5c9ed9949ae858fe" +SRC_URI[sha256sum] = "a02e6f98974dfceab79884df902ca3df30b0e9bad6d76aee0fb5dce17f267f04" + +S = "${WORKDIR}/procps-ng-${PV}" + +EXTRA_OECONF = "--enable-skill --disable-modern-top" + +CPPFLAGS += "-I${S}" + +do_install_append () { + install -d ${D}${base_bindir} + [ "${bindir}" != "${base_bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i; done + install -d ${D}${base_sbindir} + [ "${sbindir}" != "${base_sbindir}" ] && for i in ${base_sbindir_progs}; do mv ${D}${sbindir}/$i ${D}${base_sbindir}/$i; done + # Remove now empty dir + rmdir ${D}/${sbindir} + + install -d ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${sysconfdir}/sysctl.d + ln -sf ../sysctl.conf ${D}${sysconfdir}/sysctl.d/99-sysctl.conf + fi +} + +CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" + +bindir_progs = "free pkill pmap pgrep pwdx skill snice top uptime" +base_bindir_progs += "kill pidof ps watch" +base_sbindir_progs += "sysctl" + +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE_${PN} = "${bindir_progs} ${base_bindir_progs} ${base_sbindir_progs}" + +python __anonymous() { + for prog in d.getVar('base_bindir_progs', True).split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog)) + + for prog in d.getVar('base_sbindir_progs', True).split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir', True), prog)) +} + diff --git a/meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch b/meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch deleted file mode 100644 index b556a46347..0000000000 --- a/meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 914507aa6980129fefb4decaabea1a4f60c7182b Mon Sep 17 00:00:00 2001 -From: Steve Dickson <steved@redhat.com> -Date: Wed, 21 Aug 2013 14:40:22 -0400 -Subject: [PATCH 1/1] rpcbind: rpcuser not being set in Makefile.am - -Upstream-Status: backport - -Commit 8d7a0708 cause a regression where the rpcuser id was not -being set, which in turn cause rpcbind to immediately exit. -This patch removes the extra ',' that was in the AC_ARG_WITH -statement in the configure.ac file. - -Signed-off-by: Steve Dickson <steved@redhat.com> -Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 2b67720..1cf42d3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -23,7 +23,7 @@ AC_ARG_WITH([statedir], - AC_SUBST([statedir], [$with_statedir]) - - AC_ARG_WITH([rpcuser], -- AS_HELP_STRING([--with-rpcuser=ARG], [use ARG for RPC @<:@default=root@:>@]), -+ AS_HELP_STRING([--with-rpcuser=ARG], [use ARG for RPC @<:@default=root@:>@]) - ,, [with_rpcuser=root]) - AC_SUBST([rpcuser], [$with_rpcuser]) - --- -1.8.3.2 - diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb index b7324766f7..1952b2a298 100644 --- a/meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb +++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb @@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b46486e4c4a416602693a711bb5bfa39 \ file://src/rpcinfo.c;beginline=1;endline=27;md5=f8a8cd2cb25ac5aa16767364fb0e3c24" SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ - file://0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch \ file://init.d \ ${UCLIBCPATCHES} \ file://rpcbind.conf \ @@ -24,8 +23,8 @@ UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \ " UCLIBCPATCHES ?= "" -SRC_URI[md5sum] = "0a5f9c2142af814c55d957aaab3bcc68" -SRC_URI[sha256sum] = "da169ff877a5a07581fad50a9a808ac6e96f0c277a3df49a7ef005778428496e" +SRC_URI[md5sum] = "8acf839bfef2364a05fbd6be5f8edf9a" +SRC_URI[sha256sum] = "13dbc8c796dbe0ce8df873007bea0490c8460b56202d918c9eb6fa0358a08f29" inherit autotools update-rc.d systemd pkgconfig @@ -35,7 +34,7 @@ PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" INITSCRIPT_NAME = "rpcbind" INITSCRIPT_PARAMS = "start 12 2 3 4 5 . stop 60 0 1 6 ." -SYSTEMD_SERVICE_${PN} = "rpcbind.service rpcbind.socket" +SYSTEMD_SERVICE_${PN} = "rpcbind.service" inherit useradd @@ -43,6 +42,12 @@ USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system --no-create-home --home-dir / \ --shell /bin/false --user-group rpc" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/, \ + --without-systemdsystemunitdir, \ + systemd \ +" + EXTRA_OECONF += " --enable-warmstarts --with-rpcuser=rpc" do_install_append () { diff --git a/meta/recipes-extended/screen/screen_4.0.3.bb b/meta/recipes-extended/screen/screen_4.0.3.bb index c5218ec1db..962a4993a9 100644 --- a/meta/recipes-extended/screen/screen_4.0.3.bb +++ b/meta/recipes-extended/screen/screen_4.0.3.bb @@ -34,6 +34,9 @@ SRC_URI[patch.sha256sum] = "10acb274b2fb0bb7137a0d66e52fa0f18125bc5198c7a8d5af38 inherit autotools texinfo +PACKAGECONFIG ??= "" +PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter," + EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" diff --git a/meta/recipes-extended/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb index fe242e16bd..40e3a53ceb 100644 --- a/meta/recipes-extended/sed/sed_4.1.2.bb +++ b/meta/recipes-extended/sed/sed_4.1.2.bb @@ -23,12 +23,13 @@ do_configure_prepend () { do_install () { autotools_do_install install -d ${D}${base_bindir} - mv ${D}${bindir}/sed ${D}${base_bindir}/sed - rmdir ${D}${bindir}/ + if [ ! ${D}${bindir} -ef ${D}${base_bindir} ]; then + mv ${D}${bindir}/sed ${D}${base_bindir}/sed + rmdir ${D}${bindir}/ + fi } ALTERNATIVE_${PN} = "sed" ALTERNATIVE_LINK_NAME[sed] = "${base_bindir}/sed" ALTERNATIVE_PRIORITY = "100" -BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/sed/sed_4.2.2.bb b/meta/recipes-extended/sed/sed_4.2.2.bb index ea39dae435..bbfa238df1 100644 --- a/meta/recipes-extended/sed/sed_4.2.2.bb +++ b/meta/recipes-extended/sed/sed_4.2.2.bb @@ -22,8 +22,10 @@ EXTRA_OECONF = "--disable-acl \ do_install () { autotools_do_install install -d ${D}${base_bindir} - mv ${D}${bindir}/sed ${D}${base_bindir}/sed - rmdir ${D}${bindir}/ + if [ ! ${D}${bindir} -ef ${D}${base_bindir} ]; then + mv ${D}${bindir}/sed ${D}${base_bindir}/sed + rmdir ${D}${bindir}/ + fi } ALTERNATIVE_${PN} = "sed" @@ -40,4 +42,3 @@ do_install_ptest() { oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR} } -BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/shadow/files/check_size_of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch b/meta/recipes-extended/shadow/files/check_size_of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch index 60f2ed548a..185590cabd 100644 --- a/meta/recipes-extended/shadow/files/check_size_of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch +++ b/meta/recipes-extended/shadow/files/check_size_of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch @@ -19,9 +19,9 @@ index 1a3f841..4a4d6d0 100644 --- a/configure.in +++ b/configure.in @@ -335,16 +335,10 @@ if test "$enable_subids" != "no"; then - dnl - dnl FIXME: check if 32 bit UIDs/GIDs are supported by libc - dnl + dnl + dnl FIXME: check if 32 bit UIDs/GIDs are supported by libc + dnl - AC_RUN_IFELSE([AC_LANG_SOURCE([ -#include <sys/types.h> -int main(void) { @@ -36,6 +36,6 @@ index 1a3f841..4a4d6d0 100644 + AC_CHECK_SIZEOF([gid_t],, [#include "sys/types.h"]) + + if test "$ac_cv_sizeof_uid_t" -ge 4 && test "$ac_cv_sizeof_gid_t" -ge 4; then - AC_DEFINE(ENABLE_SUBIDS, 1, [Define to support the subordinate IDs.]) - enable_subids="yes" - else + AC_DEFINE(ENABLE_SUBIDS, 1, [Define to support the subordinate IDs.]) + enable_subids="yes" + else diff --git a/meta/recipes-extended/shadow/files/securetty b/meta/recipes-extended/shadow/files/securetty index ecc246f799..2be341a216 100644 --- a/meta/recipes-extended/shadow/files/securetty +++ b/meta/recipes-extended/shadow/files/securetty @@ -45,6 +45,10 @@ ttyO1 ttyO2 ttyO3 +# Xilinx Zynq SoC +ttyPS0 +ttyPS1 + # USB dongles ttyUSB0 ttyUSB1 diff --git a/meta/recipes-extended/shadow/shadow-securetty_4.2.1.bb b/meta/recipes-extended/shadow/shadow-securetty_4.2.1.bb index 0e0410043b..c78f888cf4 100644 --- a/meta/recipes-extended/shadow/shadow-securetty_4.2.1.bb +++ b/meta/recipes-extended/shadow/shadow-securetty_4.2.1.bb @@ -9,6 +9,8 @@ PR = "r3" SRC_URI = "file://securetty" +S = "${WORKDIR}" + # Since SERIAL_CONSOLES is likely to be set from the machine configuration PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 14c7281f53..b338432d2c 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -60,6 +60,7 @@ NSCDOPT = "" NSCDOPT_class-native = "--without-nscd" NSCDOPT_class-nativesdk = "--without-nscd" NSCDOPT_libc-uclibc = " --without-nscd" +NSCDOPT_libc-glibc = "${@bb.utils.contains('DISTRO_FEATURES', 'libc-spawn', '--with-nscd', '--without-nscd', d)}" PAM_PLUGINS = "libpam-runtime \ pam-plugin-faildelay \ @@ -148,15 +149,30 @@ do_install_append() { ln -sf newgrp.${BPN} ${D}${bindir}/sg } +PACKAGES =+ "${PN}-base" +FILES_${PN}-base = "\ + ${base_bindir}/login.shadow \ + ${base_bindir}/su.shadow \ + ${bindir}/sg \ + ${bindir}/newgrp.shadow \ + ${bindir}/groups.shadow \ + ${sysconfdir}/pam.d/login \ + ${sysconfdir}/pam.d/su \ + ${sysconfdir}/login.defs \ +" +RDEPENDS_${PN} += "${PN}-base" + inherit update-alternatives ALTERNATIVE_PRIORITY = "200" -ALTERNATIVE_${PN} = "passwd chfn newgrp chsh groups chpasswd login vipw vigr su" +ALTERNATIVE_${PN} = "passwd chfn chsh chpasswd vipw vigr" ALTERNATIVE_LINK_NAME[chpasswd] = "${sbindir}/chpasswd" -ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" + +ALTERNATIVE_${PN}-base = "newgrp groups login su" +ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" ALTERNATIVE_${PN}-doc = "passwd.5 getspnam.3" diff --git a/meta/recipes-extended/slang/slang_2.2.4.bb b/meta/recipes-extended/slang/slang_2.2.4.bb index f3003c9f08..ed1190ad69 100644 --- a/meta/recipes-extended/slang/slang_2.2.4.bb +++ b/meta/recipes-extended/slang/slang_2.2.4.bb @@ -26,6 +26,8 @@ SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v2.2/slang-${PV}.tar.bz2 \ inherit autotools-brokensep +CLEANBROKEN = "1" + SRC_URI[md5sum] = "7fcfd447e378f07dd0c0bae671fe6487" SRC_URI[sha256sum] = "9a8257a9a2a55099af858b13338dc8f3a06dd2069f46f0df2c9c3bb84a01d5db" diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 1d7e541024..6e9aec824b 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -6,12 +6,12 @@ SECTION = "admin" LICENSE = "ISC & BSD & Zlib" LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=69e337d679950e304953813158595256 \ file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=e2dbb155fc49beea947515300bab99e0 \ - file://compat/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \ - file://compat/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \ - file://compat/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \ - file://compat/snprintf.c;beginline=6;endline=31;md5=c98b24f02967c095d7a70ae2e4d4d4ea \ - file://include/queue.h;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \ - file://compat/inet_pton.c;beginline=3;endline=17;md5=3970ab0518ab79cbd0bafb697f10b33a" + file://lib/util/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \ + file://lib/util/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \ + file://lib/util/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 \ + file://lib/util/snprintf.c;beginline=6;endline=31;md5=c98b24f02967c095d7a70ae2e4d4d4ea \ + file://include/sudo_queue.h;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \ + file://lib/util/inet_pton.c;beginline=3;endline=17;md5=3970ab0518ab79cbd0bafb697f10b33a" inherit autotools @@ -30,7 +30,7 @@ do_configure_prepend () { # mksigname/mksiglist are used on build host to generate source files do_compile_prepend () { - oe_runmake SSP_CFLAGS="" SSP_LDFLAGS="" CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS="$BUILD_CPPFLAGS -I${S}/include -I${S} -I${B}" -C compat mksigname mksiglist + oe_runmake SSP_CFLAGS="" SSP_LDFLAGS="" CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS="$BUILD_CPPFLAGS -I${S}/include -I${S} -I${B}" -C lib/util mksigname mksiglist } # Explicitly create ${localstatedir}/lib before do_install to ensure diff --git a/meta/recipes-extended/sudo/sudo_1.8.10p3.bb b/meta/recipes-extended/sudo/sudo_1.8.11p2.bb index 4c53032c5d..c5e2545c18 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.10p3.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.11p2.bb @@ -6,8 +6,8 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[md5sum] = "fcd8d0d9f9f0397d076ee901e242ed39" -SRC_URI[sha256sum] = "6eda135fa68163108f1c24de6975de5ddb09d75730bb62d6390bda7b04345400" +SRC_URI[md5sum] = "84012b4871b6c775c957cd310d5bad87" +SRC_URI[sha256sum] = "8133849418fa18cf6b6bb6893d1855ff7afe21db8923234a00bf045c90fba1ad" DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" @@ -25,3 +25,5 @@ do_install_append () { # Explicitly remove the ${localstatedir}/run directory to avoid QA error rmdir -p --ignore-fail-on-non-empty ${D}${localstatedir}/run/sudo } + +FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*.la" diff --git a/meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb b/meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb new file mode 100644 index 0000000000..975ecc2b63 --- /dev/null +++ b/meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb @@ -0,0 +1,4 @@ +require sysklogd.inc + +SRC_URI[md5sum] = "c70599ab0d037fde724f7210c2c8d7f8" +SRC_URI[sha256sum] = "5166c185ae23c92e8b9feee66a6e3d0bc944bf673112f53e3ecf62e08ce7c201" diff --git a/meta/recipes-extended/sysklogd/sysklogd_1.5.bb b/meta/recipes-extended/sysklogd/sysklogd_1.5.bb deleted file mode 100644 index 5c9588945d..0000000000 --- a/meta/recipes-extended/sysklogd/sysklogd_1.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require sysklogd.inc -PR = "r7" - -SRC_URI[md5sum] = "e053094e8103165f98ddafe828f6ae4b" -SRC_URI[sha256sum] = "6169b8e91d29288e90404f01462b69e7f2afb1161aa419826fe4736c7f9eb773" diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc index 09a5d28d4a..566cb08fc2 100644 --- a/meta/recipes-extended/sysstat/sysstat.inc +++ b/meta/recipes-extended/sysstat/sysstat.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://sebastien.godard.pagesperso-orange.fr/" LICENSE = "GPLv2+" SECTION = "console/utils" -SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz \ +SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.xz \ file://99_sysstat \ " diff --git a/meta/recipes-extended/sysstat/sysstat_10.2.1.bb b/meta/recipes-extended/sysstat/sysstat_10.2.1.bb deleted file mode 100644 index 654457dbe1..0000000000 --- a/meta/recipes-extended/sysstat/sysstat_10.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require sysstat.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" - -SRC_URI[md5sum] = "039dcd235dfcfb3d4acc0a05730f9512" -SRC_URI[sha256sum] = "3bfd1b4c5b99314585709c092096234b6e181741729f601d18d0ed7f0612612a" diff --git a/meta/recipes-extended/sysstat/sysstat_11.0.2.bb b/meta/recipes-extended/sysstat/sysstat_11.0.2.bb new file mode 100644 index 0000000000..ce83f4f0f9 --- /dev/null +++ b/meta/recipes-extended/sysstat/sysstat_11.0.2.bb @@ -0,0 +1,6 @@ +require sysstat.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" + +SRC_URI[md5sum] = "27d4ca66869dce132ace3194dd7d7539" +SRC_URI[sha256sum] = "acd87fdfbe7c796480f14fc26119d8f785d26827d74a0f5bced6c492a91f1b96" diff --git a/meta/recipes-extended/tar/tar-replacement-native_1.27.1.bb b/meta/recipes-extended/tar/tar-replacement-native_1.28.bb index 071ede765b..071ede765b 100644 --- a/meta/recipes-extended/tar/tar-replacement-native_1.27.1.bb +++ b/meta/recipes-extended/tar/tar-replacement-native_1.28.bb diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc index 51d49340a1..de2ed3108e 100644 --- a/meta/recipes-extended/tar/tar.inc +++ b/meta/recipes-extended/tar/tar.inc @@ -10,6 +10,12 @@ inherit autotools gettext texinfo EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}" +# Let aclocal use the relative path for the m4 file rather than the +# absolute since tar has a lot of m4 files, otherwise there might +# be an "Argument list too long" error when it is built in a long/deep +# directory. +acpaths = "-I ./m4" + EXTRAINSTALL = "do_install_extra" EXTRAINSTALL_class-nativesdk = "" @@ -26,8 +32,6 @@ do_install_extra () { PACKAGES =+ "${PN}-rmt" -PACKAGECONFIG[acl] = "--with-posix-acls, --without-posix-acls, acl," - FILES_${PN}-rmt = "${base_sbindir}/rmt*" inherit update-alternatives diff --git a/meta/recipes-extended/tar/tar_1.27.1.bb b/meta/recipes-extended/tar/tar_1.27.1.bb deleted file mode 100644 index 439bb500b9..0000000000 --- a/meta/recipes-extended/tar/tar_1.27.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require tar.inc - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI += "file://remove-gets.patch \ - " - -SRC_URI[md5sum] = "490e074dd7e71f553df8357a7ef9bdcf" -SRC_URI[sha256sum] = "9b0fb3ce8512059337add0da5f8f0f7d7647f2201f5ece24581d620ea60337c6" diff --git a/meta/recipes-extended/tar/tar_1.28.bb b/meta/recipes-extended/tar/tar_1.28.bb new file mode 100644 index 0000000000..8816000399 --- /dev/null +++ b/meta/recipes-extended/tar/tar_1.28.bb @@ -0,0 +1,12 @@ +require tar.inc + +PACKAGECONFIG ??= "" +PACKAGECONFIG[acl] = "--with-posix-acls, --without-posix-acls, acl," + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI += "file://remove-gets.patch \ + " +SRC_URI[md5sum] = "8f32b2bc1ed7ddf4cf4e4a39711341b0" +SRC_URI[sha256sum] = "60e4bfe0602fef34cd908d91cf638e17eeb09394d7b98c2487217dc4d3147562" diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch new file mode 100644 index 0000000000..797352579b --- /dev/null +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch @@ -0,0 +1,54 @@ +From daf89d272e51b2153015ce7f54ab0b86182e64c1 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Wed, 28 Jan 2015 18:50:23 -0800 +Subject: [PATCH] Makefile: fix for parallel build + +Fixed: +make: *** No rule to make target `cflags', needed by `tcpd.o'. Stop. + +Let "cflags" depend on config-check which generates cflgas will fix the +problem. + +Also fixed: +Fatal error: can't create shared/hosts_access.o: No such file or directory + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index fe5e732..f468751 100644 +--- a/Makefile ++++ b/Makefile +@@ -714,6 +714,7 @@ KIT = README miscd.c tcpd.c fromhost.c hosts_access.c shell_cmd.c \ + LIB = libwrap.a + + shared/%.o: %.c ++ [ -d shared ] || mkdir -p shared + $(CC) $(CFLAGS) $(SHCFLAGS) -c $< -o $@ + + SOMAJOR = 0 +@@ -730,6 +731,8 @@ SHLIB_OBJ= $(addprefix shared/, $(LIB_OBJ)); + + all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk $(LIB) + ++cflags: config-check ++ + # Invalidate all object files when the compiler options (CFLAGS) have changed. + + config-check: +@@ -739,7 +742,7 @@ config-check: + then rm cflags.new ; \ + else mv cflags.new cflags ; \ + fi >/dev/null 2>/dev/null +- @if [ ! -d shared ]; then mkdir shared; fi ++ @[ -d shared ] || mkdir -p shared + + $(LIB): $(LIB_OBJ) + rm -f $(LIB) +-- +1.7.9.5 + diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb index 4d6430634e..2630478284 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb @@ -40,16 +40,16 @@ SRC_URI = "ftp://ftp.porcupine.org/pub/security/tcp_wrappers_${PV}.tar.gz \ file://tcpdchk_libwrapped.patch \ file://ldflags.patch \ file://rename_strings_variable.patch \ - \ file://try-from.8 \ - file://safe_finger.8" + file://safe_finger.8 \ + file://makefile-fix-parallel.patch \ + " SRC_URI[md5sum] = "e6fa25f71226d090f34de3f6b122fb5a" SRC_URI[sha256sum] = "9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d" S = "${WORKDIR}/tcp_wrappers_${PV}" -PARALLEL_MAKE = "" EXTRA_OEMAKE = "'CC=${CC}' \ 'AR=${AR}' \ 'RANLIB=${RANLIB}' \ diff --git a/meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch b/meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch deleted file mode 100644 index d1c9fe5746..0000000000 --- a/meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch +++ /dev/null @@ -1,31 +0,0 @@ - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Index: texi2html-5.0/po_document/Makefile.in.in -=================================================================== ---- texi2html-5.0.orig/po_document/Makefile.in.in -+++ texi2html-5.0/po_document/Makefile.in.in -@@ -9,7 +9,7 @@ - # General Public License and is *not* in the public domain. - # - # Origin: gettext-0.17 --GETTEXT_MACRO_VERSION = 0.17 -+GETTEXT_MACRO_VERSION = 0.18 - - PACKAGE = @PACKAGE@ - VERSION = @VERSION@ -Index: texi2html-5.0/po_messages/Makefile.in.in -=================================================================== ---- texi2html-5.0.orig/po_messages/Makefile.in.in -+++ texi2html-5.0/po_messages/Makefile.in.in -@@ -9,7 +9,7 @@ - # General Public License and is *not* in the public domain. - # - # Origin: gettext-0.17 --GETTEXT_MACRO_VERSION = 0.17 -+GETTEXT_MACRO_VERSION = 0.18 - - PACKAGE = @PACKAGE@ - VERSION = @VERSION@ diff --git a/meta/recipes-extended/texi2html/texi2html_5.0.bb b/meta/recipes-extended/texi2html/texi2html_5.0.bb index aa5f1fddaf..eac289e3b5 100644 --- a/meta/recipes-extended/texi2html/texi2html_5.0.bb +++ b/meta/recipes-extended/texi2html/texi2html_5.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" PR = "r2" SRC_URI = "${SAVANNAH_GNU_MIRROR}/texi2html/${BPN}-${PV}.tar.bz2 \ - file://fix_gettext_version.patch" + " SRC_URI[md5sum] = "f15ac876fcdc8be865b16535f480aa54" SRC_URI[sha256sum] = "e8a98b0ee20c495a6ab894398a065ef580272dbd5a15b1b19e8bd1bc89d9f9fa" @@ -15,15 +15,10 @@ SRC_URI[sha256sum] = "e8a98b0ee20c495a6ab894398a065ef580272dbd5a15b1b19e8bd1bc89 inherit autotools gettext texinfo do_configure_prepend() { - # Make a directory for the old gettext setup - if [ ! -d ${S}/po ]; then - mkdir ${S}/po - fi -} - -do_configure_append() { - # Clean up the phony po directory - rm -rf ${S}/po + # autotools_do_configure updates po/Makefile.in.in, we also need + # update po_document. + cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po_document/ + cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po_messages/ } do_install_append () { diff --git a/meta/recipes-extended/texinfo/texinfo-4.8/check-locale-h.patch b/meta/recipes-extended/texinfo/texinfo-4.8/check-locale-h.patch new file mode 100644 index 0000000000..4a8cc57a56 --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo-4.8/check-locale-h.patch @@ -0,0 +1,28 @@ +fix the macro check + +Upstream-status: Pending + +configure does not check if locale.h exists, but check setlocale, +if setlocale exist, the locale.h should exist. + +Signed-off-by: Roy Li <rongqing.li@windriver.com> +--- + lib/system.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/system.h b/lib/system.h +index 946eb3c..c70037b 100644 +--- a/lib/system.h ++++ b/lib/system.h +@@ -42,7 +42,7 @@ extern char *substring (const char *, const char *); + #include <ctype.h> + + /* All systems nowadays probably have these functions, but ... */ +-#ifdef HAVE_LOCALE_H ++#ifdef HAVE_SETLOCALE + #include <locale.h> + #endif + #ifndef HAVE_SETLOCALE +-- +1.7.10.4 + diff --git a/meta/recipes-extended/texinfo/texinfo-4.8/do-compile-native-tools.patch b/meta/recipes-extended/texinfo/texinfo-4.8/do-compile-native-tools.patch new file mode 100644 index 0000000000..2cc5fbb1fc --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo-4.8/do-compile-native-tools.patch @@ -0,0 +1,49 @@ +From 458e9450cecf703f55536e609365162719585900 Mon Sep 17 00:00:00 2001 +From: "Roy.Li" <rongqing.li@windriver.com> +Date: Wed, 10 Sep 2014 17:03:29 +0800 +Subject: [PATCH] do not compile host tools, since we have native + +Upstream-status: Pending + +Signed-off-by: Roy.Li <rongqing.li@windriver.com> +--- + configure.ac | 23 +---------------------- + 1 file changed, 1 insertion(+), 22 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b46130d..cf58654 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -90,28 +90,7 @@ AC_CANONICAL_BUILD + # $native_tools is also added to SUBDIRS in the main Makefile.am, + # so that make compiles the native tools first. + # +-if test "$cross_compiling" = no; then +- native_tools= +-else +- native_tools=tools +- test -d "$native_tools" || mkdir "$native_tools" +- confdir=`(cd "$srcdir";pwd)` +- # Make sure the secondary configure won't fail with +- # "error: source directory already configured". +- rm -f config.status +- AC_MSG_NOTICE([[Doing configure of native tools (${build}).]]) +- cd "$native_tools" || exit 1 +- # Run secondary configure in alternate environment or +- # it gets the wrong CC etc. env -i gives this build host configure +- # a clean environment. +- env -i CC="${BUILD_CC}" AR="${BUILD_AR}" RANLIB="${BUILD_RANLIB}" \ +- PATH="${PATH}" \ +- tools_only=1 \ +- ${confdir}/configure --build=${build} --host=${build} \ +- --disable-rpath --disable-nls +- cd .. || exit 1 +- AC_MSG_NOTICE([[Continuing with main configure (${host}).]]) +-fi ++native_tools= + AC_SUBST(native_tools) + AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]]) + +-- +1.9.1 + diff --git a/meta/recipes-extended/texinfo/texinfo-4.8/using-native-makeinfo.patch b/meta/recipes-extended/texinfo/texinfo-4.8/using-native-makeinfo.patch new file mode 100644 index 0000000000..d9bed6933d --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo-4.8/using-native-makeinfo.patch @@ -0,0 +1,24 @@ +From 9b0df7d6d3c18cfac82c291d60a5357d1bc8d9d0 Mon Sep 17 00:00:00 2001 +From: "Roy.Li" <rongqing.li@windriver.com> +Date: Wed, 10 Sep 2014 17:10:03 +0800 +Subject: [PATCH] using native makeinfo + +Upstream-status: Pending + +Signed-off-by: Roy.Li <rongqing.li@windriver.com> +--- + doc/Makefile.am | 2 +- + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 63df818..b6ceb34 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -19,7 +19,7 @@ man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 texi2dvi.1 \ + + # Use the programs built in our distribution, taking account of possible + # cross-compiling. +-MAKEINFO = $(top_builddir)/$(native_tools)/makeinfo/makeinfo ++MAKEINFO = makeinfo + INSTALL_INFO = $(top_builddir)/$(native_tools)/util/install-info + + TXI_XLATE = txi-cs.tex txi-de.tex txi-en.tex txi-es.tex txi-fr.tex \ diff --git a/meta/recipes-extended/texinfo/texinfo_4.8.bb b/meta/recipes-extended/texinfo/texinfo_4.8.bb new file mode 100644 index 0000000000..13678e093b --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo_4.8.bb @@ -0,0 +1,55 @@ +SUMMARY = "Documentation system for on-line information and printed output" +DESCRIPTION = "Texinfo is a documentation system that can produce both \ +online information and printed output from a single source file. The \ +GNU Project uses the Texinfo file format for most of its documentation." +HOMEPAGE = "http://www.gnu.org/software/texinfo/" +SECTION = "console/utils" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +PROVIDES_append_class-native = " texinfo-4.8-replacement-native" + +DEPENDS = "zlib ncurses texinfo-4.8-replacement-native" +DEPENDS_class-native = "zlib-native ncurses-native" + +TARGET_PATCH = "file://use_host_makedoc.patch \ + file://using-native-makeinfo.patch \ +" +TARGET_PATCH_class-native = "" + +SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ + file://check-locale-h.patch \ + file://do-compile-native-tools.patch \ + ${TARGET_PATCH} \ + " + +SRC_URI[md5sum] = "4e9a1a591ed236003d0d4b008bf07eef" +SRC_URI[sha256sum] = "1f3cdeebe65fdf510f55d765ab1031b54416aa5bc2635b6a54ef9bcb2367c917" + +tex_texinfo = "texmf/tex/texinfo" + +inherit gettext autotools + +do_install_append() { + mkdir -p ${D}${datadir}/${tex_texinfo} + install -p -m644 ${S}/doc/texinfo.tex ${S}/doc/txi-??.tex ${D}${datadir}/${tex_texinfo} +} + +do_install_append_class-native() { + install -m 755 info/makedoc ${D}${bindir} + install -m 755 makeinfo/makeinfo ${D}${bindir} +} + +PACKAGES += "info info-doc" + +FILES_info = "${bindir}/info ${bindir}/infokey ${bindir}/install-info" +FILES_info-doc = "${infodir}/info.info ${infodir}/dir ${infodir}/info-*.info \ + ${mandir}/man1/info.1* ${mandir}/man5/info.5* \ + ${mandir}/man1/infokey.1* ${mandir}/man1/install-info.1*" + +FILES_${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi ${datadir}/texinfo" +FILES_${PN}-doc = "${infodir}/texinfo* \ + ${datadir}/${tex_texinfo} \ + ${mandir}/man1 ${mandir}/man5" + +BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/texinfo/texinfo_5.2.bb b/meta/recipes-extended/texinfo/texinfo_5.2.bb index cf9dcfd5de..8dbcaa14f4 100644 --- a/meta/recipes-extended/texinfo/texinfo_5.2.bb +++ b/meta/recipes-extended/texinfo/texinfo_5.2.bb @@ -40,11 +40,16 @@ SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ SRC_URI[md5sum] = "1b8f98b80a8e6c50422125e07522e8db" SRC_URI[sha256sum] = "6b8ca30e9b6f093b54fe04439e5545e564c63698a806a48065c0bba16994cf74" -S = "${WORKDIR}/${BP}" tex_texinfo = "texmf/tex/texinfo" inherit gettext autotools +do_configure_prepend () { + # autotools_do_configure updates po/Makefile.in.in, we also need + # update po_document. + cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po_document/ +} + do_compile_prepend() { if [ -d tools ];then oe_runmake -C tools/gnulib/lib diff --git a/meta/recipes-extended/tzcode/tzcode-native_2014h.bb b/meta/recipes-extended/tzcode/tzcode-native_2014h.bb deleted file mode 100644 index 87c5f23847..0000000000 --- a/meta/recipes-extended/tzcode/tzcode-native_2014h.bb +++ /dev/null @@ -1,11 +0,0 @@ -# note that we allow for us to use data later than our code version -# -SRC_URI =" ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ - ftp://ftp.iana.org/tz/releases/tzdata2014h.tar.gz;name=tzdata" - -SRC_URI[tzcode.md5sum] = "8e7741fc769ebdd94d95e5f2c3adbb60" -SRC_URI[tzcode.sha256sum] = "a4d9788a1bb0aa314eae4986ee991425b83ecc47da0e84f626735846be1dbf44" -SRC_URI[tzdata.md5sum] = "ed05111948beba8a0f30956baa46b272" -SRC_URI[tzdata.sha256sum] = "e78152f616fb07c1dea124215ffca57d0de66d8897e00896086542e3de30f69e" - -require tzcode-native.inc diff --git a/meta/recipes-extended/tzcode/tzcode-native_2014j.bb b/meta/recipes-extended/tzcode/tzcode-native_2014j.bb deleted file mode 100644 index b76aa33494..0000000000 --- a/meta/recipes-extended/tzcode/tzcode-native_2014j.bb +++ /dev/null @@ -1,10 +0,0 @@ -# note that we allow for us to use data later than our code version -# -SRC_URI =" ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ - ftp://ftp.iana.org/tz/releases/tzdata2014j.tar.gz;name=tzdata" - -SRC_URI[tzcode.md5sum] = "970119e9765bc5a9320368851c91ecb6" -SRC_URI[tzcode.sha256sum] = "7fd46125464856309fc81fe85a67a61de862b8ab884ce8ca82051f5fa308ede2" -SRC_URI[tzdata.md5sum] = "2d7ea9c309f0d4e162e426e568290ca3" -SRC_URI[tzdata.sha256sum] = "a2d870320694d40535df822ac8074dc629a90e92abafa5d3373314f78ddc0e0d" -require tzcode-native.inc diff --git a/meta/recipes-extended/tzcode/tzcode-native_2015b.bb b/meta/recipes-extended/tzcode/tzcode-native_2015b.bb new file mode 100644 index 0000000000..a4ec72d159 --- /dev/null +++ b/meta/recipes-extended/tzcode/tzcode-native_2015b.bb @@ -0,0 +1,10 @@ +# note that we allow for us to use data later than our code version +# +SRC_URI =" ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ + ftp://ftp.iana.org/tz/releases/tzdata2015b.tar.gz;name=tzdata" + +SRC_URI[tzcode.md5sum] = "f073a7c9bca7f9fe408491f826e92968" +SRC_URI[tzcode.sha256sum] = "e668f1235b998c90e43ecc93c8535728c65bb01d6bb93d22467e04b5ffa35d76" +SRC_URI[tzdata.md5sum] = "75571bb17c7b6be88a9f8872e45bc726" +SRC_URI[tzdata.sha256sum] = "556ac1a5b3a371adc1ad4e77138f78ddd7f8ddd7bc2b52545924598c7dc8ad62" +require tzcode-native.inc diff --git a/meta/recipes-extended/tzdata/tzdata.inc b/meta/recipes-extended/tzdata/tzdata.inc index f13a4fe910..ee56d36395 100644 --- a/meta/recipes-extended/tzdata/tzdata.inc +++ b/meta/recipes-extended/tzdata/tzdata.inc @@ -1,5 +1,5 @@ DESCRIPTION = "Timezone data" -HOMEPAGE = "ftp://elsie.nci.nih.gov/pub/" +HOMEPAGE = "http://www.iana.org/time-zones" SECTION = "base" LICENSE = "PD & BSD" LIC_FILES_CHKSUM = "file://asia;beginline=2;endline=3;md5=996a9811747aa48db91ed239e5b355a1" @@ -60,8 +60,8 @@ pkg_postinst_${PN} () { tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") fi - if [ -z ${tz} ] ; then - return 0 + if [ -z "${tz}" ] ; then + exit 0 fi if [ ! -e "$D${datadir}/zoneinfo/${tz}" ] ; then diff --git a/meta/recipes-extended/tzdata/tzdata_2014h.bb b/meta/recipes-extended/tzdata/tzdata_2014h.bb deleted file mode 100644 index 9334a6293b..0000000000 --- a/meta/recipes-extended/tzdata/tzdata_2014h.bb +++ /dev/null @@ -1,6 +0,0 @@ -SRC_URI = "ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata" - -SRC_URI[tzdata.md5sum] = "ed05111948beba8a0f30956baa46b272" -SRC_URI[tzdata.sha256sum] = "e78152f616fb07c1dea124215ffca57d0de66d8897e00896086542e3de30f69e" - -require tzdata.inc diff --git a/meta/recipes-extended/tzdata/tzdata_2014j.bb b/meta/recipes-extended/tzdata/tzdata_2014j.bb deleted file mode 100644 index f0388c2fd2..0000000000 --- a/meta/recipes-extended/tzdata/tzdata_2014j.bb +++ /dev/null @@ -1,6 +0,0 @@ -SRC_URI = "ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata" - -SRC_URI[tzdata.md5sum] = "2d7ea9c309f0d4e162e426e568290ca3" -SRC_URI[tzdata.sha256sum] = "a2d870320694d40535df822ac8074dc629a90e92abafa5d3373314f78ddc0e0d" - -require tzdata.inc diff --git a/meta/recipes-extended/tzdata/tzdata_2015b.bb b/meta/recipes-extended/tzdata/tzdata_2015b.bb new file mode 100644 index 0000000000..df97d6d34e --- /dev/null +++ b/meta/recipes-extended/tzdata/tzdata_2015b.bb @@ -0,0 +1,6 @@ +SRC_URI = "ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata" + +SRC_URI[tzdata.md5sum] = "75571bb17c7b6be88a9f8872e45bc726" +SRC_URI[tzdata.sha256sum] = "556ac1a5b3a371adc1ad4e77138f78ddd7f8ddd7bc2b52545924598c7dc8ad62" + +require tzdata.inc diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb index 33c20f8b4c..e203c069f4 100644 --- a/meta/recipes-extended/unzip/unzip_6.0.bb +++ b/meta/recipes-extended/unzip/unzip_6.0.bb @@ -35,4 +35,11 @@ do_install() { rmdir ${D}${prefix}/man/ } +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE_${PN} = "unzip" +ALTERNATIVE_LINK_NAME[unzip] = "${bindir}/unzip" + BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/watchdog/files/fix-ping-failure.patch b/meta/recipes-extended/watchdog/watchdog/fix-ping-failure.patch index f5976eb5cf..14ab9c56ab 100644 --- a/meta/recipes-extended/watchdog/files/fix-ping-failure.patch +++ b/meta/recipes-extended/watchdog/watchdog/fix-ping-failure.patch @@ -33,11 +33,11 @@ Signed-off-by: Roy.Li <rongqing.li@windriver.com> src/watchdog.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) -Index: watchdog-5.13/src/watchdog.c +Index: watchdog-5.14/src/watchdog.c =================================================================== ---- watchdog-5.13.orig/src/watchdog.c 2013-02-01 03:15:44.000000000 -0800 -+++ watchdog-5.13/src/watchdog.c 2013-03-11 22:27:48.741657881 -0700 -@@ -28,6 +28,7 @@ +--- watchdog-5.14.orig/src/watchdog.c ++++ watchdog-5.14/src/watchdog.c +@@ -24,6 +24,7 @@ #include <sys/types.h> #include <sys/ioctl.h> #include <linux/oom.h> @@ -45,21 +45,35 @@ Index: watchdog-5.13/src/watchdog.c #include <linux/watchdog.h> #include <string.h> -@@ -567,6 +568,8 @@ - pid_t child_pid; - int oom_adjusted = 0; - struct stat s; -+ struct icmp_filter filt; -+ filt.data = ~(1<<ICMP_ECHOREPLY); +Index: watchdog-5.14/src/net.c +=================================================================== +--- watchdog-5.14.orig/src/net.c ++++ watchdog-5.14/src/net.c +@@ -11,7 +11,8 @@ + #include <errno.h> + #include <sys/time.h> + #include <netinet/ip.h> +-#include <netinet/ip_icmp.h> ++#include <linux/icmp.h> ++//#include <netinet/ip_icmp.h> + #include <fcntl.h> + #include <string.h> + #include <unistd.h> /* for gethostname() etc */ +@@ -179,6 +180,9 @@ int open_netcheck(struct list *tlist) + { + struct list *act; + int hold = 0; ++ struct icmp_filter filt; ++ filt.data = ~(1<<ICMP_ECHOREPLY); ++ + + if (tlist != NULL) { + for (act = tlist; act != NULL; act = act->next) { +@@ -202,6 +206,7 @@ int open_netcheck(struct list *tlist) + fatal_error(EX_SYSERR, "error opening socket (%s)", strerror(errno)); + } + ++ setsockopt(net->sock_fp, SOL_RAW, ICMP_FILTER, (char*)&filt, sizeof(filt)); + /* this is necessary for broadcast pings to work */ + (void)setsockopt(net->sock_fp, SOL_SOCKET, SO_BROADCAST, (char *)&hold, sizeof(hold)); - #if USE_SYSLOG - char *opts = "d:i:n:Ffsvbql:p:t:c:r:m:a:"; -@@ -703,7 +706,7 @@ - perror(progname); - exit(1); - } -- -+ setsockopt(net->sock_fp, SOL_RAW, ICMP_FILTER, (char*)&filt, sizeof(filt)); - /* this is necessary for broadcast pings to work */ - (void) setsockopt(net->sock_fp, SOL_SOCKET, SO_BROADCAST, (char *)&hold, sizeof(hold)); - diff --git a/meta/recipes-extended/watchdog/files/fixsepbuild.patch b/meta/recipes-extended/watchdog/watchdog/fixsepbuild.patch index 2fad3a112f..2fad3a112f 100644 --- a/meta/recipes-extended/watchdog/files/fixsepbuild.patch +++ b/meta/recipes-extended/watchdog/watchdog/fixsepbuild.patch diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch b/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch new file mode 100644 index 0000000000..36f2968f5a --- /dev/null +++ b/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch @@ -0,0 +1,11 @@ +--- watchdog-5.13.orig/watchdog.conf 2013-02-01 12:15:44.000000000 +0100 ++++ watchdog-5.13/watchdog.conf 2014-11-13 10:59:43.233943000 +0100 +@@ -20,7 +20,7 @@ + #test-binary = + #test-timeout = + +-#watchdog-device = /dev/watchdog ++watchdog-device = /dev/watchdog + + # Defaults compiled into the binary + #temperature-device = diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog-init.patch b/meta/recipes-extended/watchdog/watchdog/watchdog-init.patch new file mode 100644 index 0000000000..0fa8ee97cb --- /dev/null +++ b/meta/recipes-extended/watchdog/watchdog/watchdog-init.patch @@ -0,0 +1,53 @@ +--- watchdog-5.13.orig/redhat/watchdog.init 2014-11-12 17:18:39.125943000 +0100 ++++ watchdog-5.13/redhat/watchdog.init 2014-11-12 18:27:36.189943000 +0100 +@@ -7,7 +7,7 @@ + # Henning P. Schmiedehausen <hps@tanstaafl.de> + + # Source function library. +-. /etc/rc.d/init.d/functions ++. /etc/init.d/functions + + [ -x /usr/sbin/watchdog -a -e /etc/watchdog.conf ] || exit 0 + +@@ -23,22 +23,22 @@ + + start() { + +- echo -n $"Starting $prog: " ++ echo -n "Starting $prog: " + if [ -n "$(pidofproc $prog)" ]; then +- echo -n $"$prog: already running" +- echo_failure ++ echo -n "$prog: already running " ++ failure + echo + return 1 + fi + if [ "$VERBOSE" = "yes" ]; then +- daemon /usr/sbin/${prog} -v ++ /usr/sbin/${prog} -v + else +- daemon /usr/sbin/${prog} ++ /usr/sbin/${prog} + fi + RETVAL=$? + [ $RETVAL -eq 0 ] && touch $lockfile +- [ $RETVAL -eq 0 ] && echo_success +- [ $RETVAL -ne 0 ] && echo_failure ++ [ $RETVAL -eq 0 ] && success ++ [ $RETVAL -ne 0 ] && failure + echo + return $RETVAL + } +@@ -50,8 +50,10 @@ + # and reboot the box. + killproc $prog -TERM + RETVAL=$? +- echo + [ $RETVAL -eq 0 ] && rm -f $lockfile $pidfile ++ [ $RETVAL -eq 0 ] && success ++ [ $RETVAL -ne 0 ] && failure ++ echo + return $RETVAL + } + diff --git a/meta/recipes-extended/watchdog/watchdog_5.13.bb b/meta/recipes-extended/watchdog/watchdog_5.14.bb index b9e29d22fc..9ec0a8e84a 100644 --- a/meta/recipes-extended/watchdog/watchdog_5.13.bb +++ b/meta/recipes-extended/watchdog/watchdog_5.14.bb @@ -10,10 +10,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ecc0551bf54ad97f6b541720f84d6569" SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \ file://fixsepbuild.patch \ - file://fix-ping-failure.patch" -SRC_URI[md5sum] = "153455f008f1cf8f65f6ad9586a21ff1" -SRC_URI[sha256sum] = "141e0faf3ee4d8187a6ff4e00b18ef7b7a4ce432a2d4c8a6e6fdc62507fc6eb0" + file://fix-ping-failure.patch \ + file://watchdog-init.patch \ + file://watchdog-conf.patch" + +SRC_URI[md5sum] = "5b2dba0c593942f4acc100bca0d560c4" +SRC_URI[sha256sum] = "620b2f49e9879f2e85c73d4c1f422f9101e6b38e824fea2414befd8bb6866ad1" inherit autotools +inherit update-rc.d + +INITSCRIPT_NAME = "watchdog.sh" +INITSCRIPT_PARAMS = "start 15 1 2 3 4 5 . stop 85 0 6 ." RRECOMMENDS_${PN} = "kernel-module-softdog" + +do_install_append() { + install -D ${S}/redhat/watchdog.init ${D}/${sysconfdir}/init.d/watchdog.sh +} diff --git a/meta/recipes-extended/wget/wget-1.15/wget_cve-2014-4877.patch b/meta/recipes-extended/wget/wget-1.15/wget_cve-2014-4877.patch deleted file mode 100644 index bfcc36ea9e..0000000000 --- a/meta/recipes-extended/wget/wget-1.15/wget_cve-2014-4877.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 18b0979357ed7dc4e11d4f2b1d7e0f5932d82aa7 Mon Sep 17 00:00:00 2001 -From: Darshit Shah <darnir@gmail.com> -Date: Sun, 07 Sep 2014 19:11:17 +0000 -Subject: CVE-2014-4877: Arbitrary Symlink Access - -Wget was susceptible to a symlink attack which could create arbitrary -files, directories or symbolic links and set their permissions when -retrieving a directory recursively through FTP. This commit changes the -default settings in Wget such that Wget no longer creates local symbolic -links, but rather traverses them and retrieves the pointed-to file in -such a retrieval. - -The old behaviour can be attained by passing the --retr-symlinks=no -option to the Wget invokation command. ---- -diff --git a/doc/wget.texi b/doc/wget.texi -index aef1f80..d7a4c94 100644 ---- a/doc/wget.texi -+++ b/doc/wget.texi -@@ -1883,17 +1883,18 @@ Preserve remote file permissions instead of permissions set by umask. - - @cindex symbolic links, retrieving - @item --retr-symlinks --Usually, when retrieving @sc{ftp} directories recursively and a symbolic --link is encountered, the linked-to file is not downloaded. Instead, a --matching symbolic link is created on the local filesystem. The --pointed-to file will not be downloaded unless this recursive retrieval --would have encountered it separately and downloaded it anyway. -- --When @samp{--retr-symlinks} is specified, however, symbolic links are --traversed and the pointed-to files are retrieved. At this time, this --option does not cause Wget to traverse symlinks to directories and --recurse through them, but in the future it should be enhanced to do --this. -+By default, when retrieving @sc{ftp} directories recursively and a symbolic link -+is encountered, the symbolic link is traversed and the pointed-to files are -+retrieved. Currently, Wget does not traverse symbolic links to directories to -+download them recursively, though this feature may be added in the future. -+ -+When @samp{--retr-symlinks=no} is specified, the linked-to file is not -+downloaded. Instead, a matching symbolic link is created on the local -+filesystem. The pointed-to file will not be retrieved unless this recursive -+retrieval would have encountered it separately and downloaded it anyway. This -+option poses a security risk where a malicious FTP Server may cause Wget to -+write to files outside of the intended directories through a specially crafted -+@sc{.listing} file. - - Note that when retrieving a file (not a directory) because it was - specified on the command-line, rather than because it was recursed to, -diff --git a/src/init.c b/src/init.c -index 09557af..3bdaa48 100644 ---- a/src/init.c -+++ b/src/init.c -@@ -366,6 +366,22 @@ defaults (void) - - opt.dns_cache = true; - opt.ftp_pasv = true; -+ /* 2014-09-07 Darshit Shah <darnir@gmail.com> -+ * opt.retr_symlinks is set to true by default. Creating symbolic links on the -+ * local filesystem pose a security threat by malicious FTP Servers that -+ * server a specially crafted .listing file akin to this: -+ * -+ * lrwxrwxrwx 1 root root 33 Dec 25 2012 JoCxl6d8rFU -> / -+ * drwxrwxr-x 15 1024 106 4096 Aug 28 02:02 JoCxl6d8rFU -+ * -+ * A .listing file in this fashion makes Wget susceptiple to a symlink attack -+ * wherein the attacker is able to create arbitrary files, directories and -+ * symbolic links on the target system and even set permissions. -+ * -+ * Hence, by default Wget attempts to retrieve the pointed-to files and does -+ * not create the symbolic links locally. -+ */ -+ opt.retr_symlinks = true; - - #ifdef HAVE_SSL - opt.check_cert = true; --- -cgit v0.9.0.2 diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc index dc46841537..049b898d39 100644 --- a/meta/recipes-extended/wget/wget.inc +++ b/meta/recipes-extended/wget/wget.inc @@ -7,7 +7,7 @@ DEPENDS = "gnutls zlib libpcre" INC_PR = "r16" -inherit autotools gettext texinfo update-alternatives +inherit autotools gettext texinfo update-alternatives pkgconfig EXTRA_OECONF = "--enable-ipv6 --with-ssl=gnutls --disable-rpath --disable-iri \ --without-libgnutls-prefix ac_cv_header_uuid_uuid_h=no" @@ -19,3 +19,6 @@ ALTERNATIVE_PRIORITY = "100" RRECOMMENDS_${PN} += "ca-certificates" BBCLASSEXTEND += "nativesdk" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[libuuid] = "--with-libuuid, --without-libuuid,util-linux" diff --git a/meta/recipes-extended/wget/wget_1.15.bb b/meta/recipes-extended/wget/wget_1.15.bb deleted file mode 100644 index 5375e4e504..0000000000 --- a/meta/recipes-extended/wget/wget_1.15.bb +++ /dev/null @@ -1,8 +0,0 @@ -SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ - file://fix_makefile.patch \ - file://wget_cve-2014-4877.patch \ - " -SRC_URI[md5sum] = "506df41295afc6486662cc47470b4618" -SRC_URI[sha256sum] = "52126be8cf1bddd7536886e74c053ad7d0ed2aa89b4b630f76785bac21695fcd" - -require wget.inc diff --git a/meta/recipes-extended/wget/wget_1.16.1.bb b/meta/recipes-extended/wget/wget_1.16.1.bb new file mode 100644 index 0000000000..ca6f0fee25 --- /dev/null +++ b/meta/recipes-extended/wget/wget_1.16.1.bb @@ -0,0 +1,8 @@ +SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ + file://fix_makefile.patch \ + " + +SRC_URI[md5sum] = "5d12410a398ec9907e105e8734561ba0" +SRC_URI[sha256sum] = "3b834ce69366d4681f295307fce36ee14e122c4ee68a4d1291b62b0b26755a77" + +require wget.inc diff --git a/meta/recipes-extended/which/which-2.18/automake-foreign.patch b/meta/recipes-extended/which/which-2.18/automake-foreign.patch index 8ab1d028eb..495cdc6cf4 100644 --- a/meta/recipes-extended/which/which-2.18/automake-foreign.patch +++ b/meta/recipes-extended/which/which-2.18/automake-foreign.patch @@ -22,6 +22,7 @@ index b30b6f5..bd3222c 100644 +AM_INIT_AUTOMAKE([foreign]) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE - --- + +-- 1.7.1 + diff --git a/meta/recipes-extended/which/which-2.20/automake.patch b/meta/recipes-extended/which/which-2.20/automake.patch index 92365dd854..ef00bc9f23 100644 --- a/meta/recipes-extended/which/which-2.20/automake.patch +++ b/meta/recipes-extended/which/which-2.20/automake.patch @@ -1,3 +1,8 @@ +Update autoconf prologue to use "foreign" strictness. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + diff --git a/configure.ac b/configure.ac index d974461..a20dfa8 100644 --- a/configure.ac diff --git a/meta/recipes-extended/which/which_2.18.bb b/meta/recipes-extended/which/which_2.18.bb index fd68520d97..eb6cc9967e 100644 --- a/meta/recipes-extended/which/which_2.18.bb +++ b/meta/recipes-extended/which/which_2.18.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" PR = "r2" -SRC_URI = "http://www.xs4all.nl/~carlo17/which/which-${PV}.tar.gz \ +SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/which/which-2.18.tar.gz/42d51938e48b91f6e19fabf216f5c3e9/which-${PV}.tar.gz \ file://fix_name_conflict_group_member.patch \ file://automake-foreign.patch \ " diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd.service b/meta/recipes-extended/xinetd/xinetd/xinetd.service new file mode 100644 index 0000000000..d5fdc5bc29 --- /dev/null +++ b/meta/recipes-extended/xinetd/xinetd/xinetd.service @@ -0,0 +1,13 @@ +[Unit] +Description=Xinetd A Powerful Replacement For Inetd +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/var/run/xinetd.pid +EnvironmentFile=-/etc/sysconfig/xinetd +ExecStart=@SBINDIR@/xinetd -stayalive -pidfile /var/run/xinetd.pid "$EXTRAOPTIONS" +ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb index 1928949e94..ffc03e5c70 100644 --- a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb +++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb @@ -1,5 +1,5 @@ SUMMARY = "Socket-based service activation daemon" -HOMEPAGE = "http://www.xinetd.org" +HOMEPAGE = "https://github.com/xinetd-org/xinetd" # xinetd is a BSD-like license # Apple and Gentoo say BSD here. @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8" DEPENDS = "" PR = "r2" -SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \ +SRC_URI = "git://github.com/xinetd-org/xinetd.git;protocol=https \ file://xinetd.init \ file://xinetd.conf \ file://xinetd.default \ @@ -17,12 +17,16 @@ SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \ file://Disable-services-from-inetd.conf-if-a-service-with-t.patch \ file://xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch \ file://xinetd-CVE-2013-4342.patch \ + file://xinetd.service \ " -SRC_URI[md5sum] = "77358478fd58efa6366accae99b8b04c" -SRC_URI[sha256sum] = "bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3" +SRCREV = "68bb9ab9e9f214ad8a2322f28ac1d6733e70bc24" -inherit autotools update-rc.d +S = "${WORKDIR}/git" + +inherit autotools update-rc.d systemd + +SYSTEMD_SERVICE_${PN} = "xinetd.service" INITSCRIPT_NAME = "xinetd" INITSCRIPT_PARAMS = "defaults" @@ -52,6 +56,13 @@ do_install() { install -m 644 "${WORKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd" install -m 755 "${B}/xinetd/xinetd" "${D}${sbindir}" install -m 755 "${B}/xinetd/itox" "${D}${sbindir}" + + # Install systemd unit files + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/xinetd.service ${D}${systemd_unitdir}/system + sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ + -e 's,@SBINDIR@,${sbindir},g' \ + ${D}${systemd_unitdir}/system/xinetd.service } CONFFILES_${PN} = "${sysconfdir}/xinetd.conf" diff --git a/meta/recipes-extended/xz/xz_5.1.3alpha.bb b/meta/recipes-extended/xz/xz_5.2.0.bb index 168e3837d8..3439ec911f 100644 --- a/meta/recipes-extended/xz/xz_5.1.3alpha.bb +++ b/meta/recipes-extended/xz/xz_5.2.0.bb @@ -25,8 +25,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \ file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 " SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.gz" -SRC_URI[md5sum] = "bbb2daa876c87fb2cf9fe4590af9694e" -SRC_URI[sha256sum] = "9f94506e301d5b6863921bba861a99ba00de384dafb4e5f409679a93e41613d4" +SRC_URI[md5sum] = "be585bdf8672e4406632eda3d819e284" +SRC_URI[sha256sum] = "231ef369982240bb20ed7cffa52bb12a4a297ce6871f480ab85e8a7ba98bf3d6" inherit autotools gettext diff --git a/meta/recipes-gnome/gnome/gnome-common_3.12.0.bb b/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb index d3b6683090..1f9fe8bf5c 100644 --- a/meta/recipes-gnome/gnome/gnome-common_3.12.0.bb +++ b/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb @@ -10,8 +10,8 @@ inherit gnomebase allarch GNOME_COMPRESS_TYPE = "xz" -SRC_URI[archive.md5sum] = "da903a1c89b0a24e062227fa97d42fe7" -SRC_URI[archive.sha256sum] = "18712bc2df6b2dd88a11b9f7f874096d1c0c6e7ebc9cfc0686ef963bd590e1d8" +SRC_URI[archive.md5sum] = "ba58c61d0d81b7c3ff8452c620513a9d" +SRC_URI[archive.sha256sum] = "4c00242f781bb441289f49dd80ed1d895d84de0c94bfc2c6818a104c9e39262c" EXTRA_AUTORECONF = "" DEPENDS = "" diff --git a/meta/recipes-gnome/gnome/gnome-desktop.inc b/meta/recipes-gnome/gnome/gnome-desktop.inc deleted file mode 100644 index 3853022710..0000000000 --- a/meta/recipes-gnome/gnome/gnome-desktop.inc +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "GNOME library for reading .desktop files" -SECTION = "x11/gnome" -LICENSE = "GPLv2 & LGPLv2" -DEPENDS = "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup-notification" - -EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs" - -do_configure_prepend () { - cp ${STAGING_DATADIR_NATIVE}/gnome-common/data/omf.make ${S} -} - -FILES_${PN} += "${datadir}/gnome-about ${datadir}/libgnome-desktop/pnp.ids" - -PR = "r6" - -inherit gnomebase - -do_install_append () { - sed -i -e's,${STAGING_BINDIR_NATIVE},${bindir},g' ${D}${bindir}/gnome-about - sed -i -e '1s,#!.*python,#! ${USRBINPATH}/env python,' ${D}${bindir}/gnome-about -} - - diff --git a/meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb b/meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb deleted file mode 100644 index 424eafeaf0..0000000000 --- a/meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require gnome-desktop.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -SRC_URI[archive.md5sum] = "5c80d628a240eb9d9ff78913b31f2f67" -SRC_URI[archive.sha256sum] = "55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d" diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/meta/recipes-gnome/gnome/gnome-doc-utils.inc index e148ce3350..958750690a 100644 --- a/meta/recipes-gnome/gnome/gnome-doc-utils.inc +++ b/meta/recipes-gnome/gnome/gnome-doc-utils.inc @@ -10,6 +10,8 @@ DEPENDS_class-native = "libxml2-native libxslt-native intltool-native glib-2.0-n inherit gnomebase gettext python-dir pythonnative autotools-brokensep +CLEANBROKEN = "1" + EXTRA_OECONF += "--disable-scrollkeeper" do_install_append() { diff --git a/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.10.1.bb b/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.10.1.bb deleted file mode 100644 index a0123d9005..0000000000 --- a/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.10.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "GNOME desktop-wide GSettings schemas" -HOMEPAGE = "http://live.gnome.org/gsettings-desktop-schemas" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -PR = "r1" - -DEPENDS = "glib-2.0 intltool-native gobject-introspection-stub-native" - -inherit gnomebase gsettings gettext - -GNOME_COMPRESS_TYPE = "xz" - -SRC_URI[archive.md5sum] = "f9ffca591a984f19a1dd9caeb96b5f23" -SRC_URI[archive.sha256sum] = "452378c4960a145747ec69f8c6a874e5b7715454df3e2452d1ff1a0a82e76811" diff --git a/meta/recipes-gnome/gnome/libart-lgpl/aarch64be/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/aarch64be/art_config.h new file mode 100644 index 0000000000..500ffc38f1 --- /dev/null +++ b/meta/recipes-gnome/gnome/libart-lgpl/aarch64be/art_config.h @@ -0,0 +1,10 @@ +/* Automatically generated by gen_art_config.c */ + +#define ART_SIZEOF_CHAR 1 +#define ART_SIZEOF_SHORT 2 +#define ART_SIZEOF_INT 4 +#define ART_SIZEOF_LONG 8 + +typedef unsigned char art_u8; +typedef unsigned short art_u16; +typedef unsigned int art_u32; diff --git a/meta/recipes-gnome/gnome/libart-lgpl/aarch64be_32/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/aarch64be_32/art_config.h new file mode 100644 index 0000000000..b0e74ad6ae --- /dev/null +++ b/meta/recipes-gnome/gnome/libart-lgpl/aarch64be_32/art_config.h @@ -0,0 +1,10 @@ +/* Automatically generated by gen_art_config.c */ + +#define ART_SIZEOF_CHAR 1 +#define ART_SIZEOF_SHORT 2 +#define ART_SIZEOF_INT 4 +#define ART_SIZEOF_LONG 4 + +typedef unsigned char art_u8; +typedef unsigned short art_u16; +typedef unsigned int art_u32; diff --git a/meta/recipes-gnome/gnome/libart-lgpl/armeb/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/armeb/art_config.h new file mode 100644 index 0000000000..b0e74ad6ae --- /dev/null +++ b/meta/recipes-gnome/gnome/libart-lgpl/armeb/art_config.h @@ -0,0 +1,10 @@ +/* Automatically generated by gen_art_config.c */ + +#define ART_SIZEOF_CHAR 1 +#define ART_SIZEOF_SHORT 2 +#define ART_SIZEOF_INT 4 +#define ART_SIZEOF_LONG 4 + +typedef unsigned char art_u8; +typedef unsigned short art_u16; +typedef unsigned int art_u32; diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch deleted file mode 100644 index 71e334d897..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d1f7a894674dfdd6769f1bbae31eb1a69e451a5c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Fri, 16 Nov 2012 22:07:28 +0100 -Subject: [PATCH] GtkButton: do not prelight in touchscreen mode -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Code was copied from GtkToggleButton. - -Upstream-Status: submitted [1] - -[1] https://bugzilla.gnome.org/show_bug.cgi?id=689138 - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - gtk/gtkbutton.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c -index f472007..1beb1b6 100644 ---- a/gtk/gtkbutton.c -+++ b/gtk/gtkbutton.c -@@ -2079,15 +2079,19 @@ _gtk_button_set_depressed (GtkButton *button, - static void - gtk_button_update_state (GtkButton *button) - { -- gboolean depressed; -+ gboolean depressed, touchscreen; - GtkStateType new_state; - -+ g_object_get (gtk_widget_get_settings (GTK_WIDGET (button)), -+ "gtk-touchscreen-mode", &touchscreen, -+ NULL); -+ - if (button->activate_timeout) - depressed = button->depress_on_activate; - else - depressed = button->in_button && button->button_down; - -- if (button->in_button && (!button->button_down || !depressed)) -+ if (!touchscreen && button->in_button && (!button->button_down || !depressed)) - new_state = GTK_STATE_PRELIGHT; - else - new_state = depressed ? GTK_STATE_ACTIVE : GTK_STATE_NORMAL; --- -1.7.6.5 - diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch deleted file mode 100644 index 354f0ab376..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 69b9441eab2a7215509687dc22b48b6f212d22aa Mon Sep 17 00:00:00 2001 -From: Rob Bradford <rob@linux.intel.com> -Date: Thu, 4 Jun 2009 15:43:20 +0100 -Subject: [PATCH] =?utf-8?q?bgo#584832=20=E2=80=93=20Duplicate=20the=20exec=20string=20returned=20by=20gtk=5Frecent=5Finfo=5Fget=5Fapplication=5Finfo?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -This function states that the caller is responsible for freeing the string -passed returned by reference. Unfortunately if you do this you get a crash -since the internal value is returned without being duplicated. ---- - gtk/gtkrecentmanager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -Upstream-Status: Pending - -Index: gtk+-2.21.2/gtk/gtkrecentmanager.c -=================================================================== ---- gtk+-2.21.2.orig/gtk/gtkrecentmanager.c 2010-06-22 18:11:30.000000000 +0800 -+++ gtk+-2.21.2/gtk/gtkrecentmanager.c 2010-06-22 18:11:53.000000000 +0800 -@@ -1766,7 +1766,7 @@ - } - - if (app_exec) -- *app_exec = ai->exec; -+ *app_exec = g_strdup (ai->exec); - - if (count) - *count = ai->count; diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.24/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/cellrenderer-cairo.patch deleted file mode 100644 index ba893292d6..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+-2.24.24/cellrenderer-cairo.patch +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status: Pending - -Index: gtk/gtkcellrenderer.c -=================================================================== ---- gtk/gtkcellrenderer.c.orig 2010-06-22 17:21:22.000000000 +0800 -+++ gtk/gtkcellrenderer.c 2010-06-22 17:21:25.000000000 +0800 -@@ -566,6 +566,7 @@ - - if (cell->cell_background_set && !selected) - { -+#ifdef USE_CAIRO_INTERNALLY - cairo_t *cr = gdk_cairo_create (window); - - gdk_cairo_rectangle (cr, background_area); -@@ -573,6 +574,16 @@ - cairo_fill (cr); - - cairo_destroy (cr); -+#else -+ GdkGC *gc; -+ -+ gc = gdk_gc_new (window); -+ gdk_gc_set_rgb_fg_color (gc, &priv->cell_background); -+ gdk_draw_rectangle (window, gc, TRUE, -+ background_area->x, background_area->y, -+ background_area->width, background_area->height); -+ g_object_unref (gc); -+#endif - } - - GTK_CELL_RENDERER_GET_CLASS (cell)->render (cell, diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.24/configure-nm.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/configure-nm.patch deleted file mode 100644 index d67b797852..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+-2.24.24/configure-nm.patch +++ /dev/null @@ -1,21 +0,0 @@ -Upstream-Status: Pending -https://bugzilla.gnome.org/show_bug.cgi?id=671515 - -Signed-Off-By: Xiaofeng Yan <xiaofeng.yan@windriver.com> -# Pick up ${NM} from the environment - -Updated to apply to gtk+-2.24.15 - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac ---- gtk+-2.24.15/configure.ac 2013-01-12 20:52:54.000000000 +0200 -+++ gtk+-2.24.15/configure.ac 2013-02-12 21:25:06.073937041 +0200 -@@ -190,7 +190,7 @@ - AC_SYS_LARGEFILE - - AM_PROG_AS --AC_PATH_PROG(NM, nm, nm) -+AC_CHECK_TOOLS(NM, [$NM nm], nm) - - dnl Initialize maintainer mode - AM_MAINTAINER_MODE([enable]) diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.24/configurefix.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/configurefix.patch deleted file mode 100644 index 2803691246..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+-2.24.24/configurefix.patch +++ /dev/null @@ -1,87 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: gtk+-2.21.2/docs/faq/Makefile.am -=================================================================== ---- gtk+-2.21.2.orig/docs/faq/Makefile.am 2010-04-09 10:29:53.000000000 +0800 -+++ gtk+-2.21.2/docs/faq/Makefile.am 2010-06-22 17:39:24.000000000 +0800 -@@ -3,34 +3,36 @@ - EXTRA_DIST += \ - gtk-faq.sgml - --if HAVE_DOCBOOK -+ - html: -+if HAVE_DOCBOOK - if test -w $(srcdir); then \ - (cd $(srcdir); \ - db2html gtk-faq.sgml; \ - test -d html && rm -r html; \ - mv gtk-faq html); \ - fi -- --pdf: -- if test -w $(srcdir); then \ -- (cd $(srcdir); db2pdf gtk-faq.sgml); \ -- fi -- --dist-hook: html -- cp -Rp $(srcdir)/html $(distdir) - else --html: - echo "***" - echo "*** Warning: FAQ not built" - echo "***" -+endif - - pdf: -+if HAVE_DOCBOOK -+ if test -w $(srcdir); then \ -+ (cd $(srcdir); db2pdf gtk-faq.sgml); \ -+ fi -+else - echo "***" - echo "*** Warning: FAQ not built" - echo "***" -+endif - --dist-hook: -+dist-hook: html -+if HAVE_DOCBOOK -+ cp -Rp $(srcdir)/html $(distdir) -+else - echo "***" - echo "*** Warning: FAQ not built" - echo "*** DISTRIBUTION IS INCOMPLETE" -Index: gtk+-2.21.2/gtk-doc.make -=================================================================== ---- gtk+-2.21.2.orig/gtk-doc.make 2010-05-28 00:01:48.000000000 +0800 -+++ gtk+-2.21.2/gtk-doc.make 2010-06-22 17:39:24.000000000 +0800 -@@ -23,7 +23,7 @@ - - TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) - --EXTRA_DIST = \ -+EXTRA_DIST += \ - $(content_files) \ - $(HTML_IMAGES) \ - $(DOC_MAIN_SGML_FILE) \ -Index: gtk+-2.21.2/gtk/tests/Makefile.am -=================================================================== ---- gtk+-2.21.2.orig/gtk/tests/Makefile.am 2010-06-10 20:53:46.000000000 +0800 -+++ gtk+-2.21.2/gtk/tests/Makefile.am 2010-06-22 17:39:24.000000000 +0800 -@@ -58,13 +58,13 @@ - # this doesn't work in make distcheck, since running - # on a naked X server creates slightly different event - # sequences than running on a normal desktop --# TEST_PROGS += crossingevents -+#TEST_PROGS += crossingevents - crossingevents_SOURCES = crossingevents.c - crossingevents_LDADD = $(progs_ldadd) - - # this doesn't work in make distcheck, since it doesn't - # find file-chooser-test-dir --# TEST_PROGS += filechooser -+#TEST_PROGS += filechooser - filechooser_SOURCES = filechooser.c pixbuf-init.c - filechooser_LDADD = $(progs_ldadd) - diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.24/entry-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/entry-cairo.patch deleted file mode 100644 index 3083b77830..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+-2.24.24/entry-cairo.patch +++ /dev/null @@ -1,105 +0,0 @@ -Upstream-Status: Pending - -Index: gtk/gtkentry.c -=================================================================== -RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v -retrieving revision 1.317 -diff -u -r1.317 gtkentry.c ---- gtk/gtkentry.c 29 Jun 2006 09:18:05 -0000 1.317 -+++ gtk/gtkentry.c 2 Jul 2006 14:14:24 -0000 -@@ -3337,7 +3337,9 @@ - if (GTK_WIDGET_DRAWABLE (entry)) - { - PangoLayout *layout = gtk_entry_ensure_layout (entry, TRUE); -+#ifdef USE_CAIRO_INTERNALLY - cairo_t *cr; -+#endif - gint x, y; - gint start_pos, end_pos; - -@@ -3345,23 +3347,35 @@ - - get_layout_position (entry, &x, &y); - -+#ifdef USE_CAIRO_INTERNALLY - cr = gdk_cairo_create (entry->text_area); - - cairo_move_to (cr, x, y); - gdk_cairo_set_source_color (cr, &widget->style->text [widget->state]); - pango_cairo_show_layout (cr, layout); -+#else -+ gdk_draw_layout (entry->text_area, widget->style->text_gc [widget->state], -+ x, y, -+ layout); -+#endif - - if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start_pos, &end_pos)) - { - gint *ranges; - gint n_ranges, i; - PangoRectangle logical_rect; -- GdkColor *selection_color, *text_color; - GtkBorder inner_border; -+#ifdef USE_CAIRO_INTERNALLY -+ GdkColor *selection_color, *text_color; -+#else -+ GdkGC *selection_gc, *text_gc; -+ GdkRegion *clip_region; -+#endif - - pango_layout_get_pixel_extents (layout, NULL, &logical_rect); - gtk_entry_get_pixel_ranges (entry, &ranges, &n_ranges); - -+#ifdef USE_CAIRO_INTERNALLY - if (GTK_WIDGET_HAS_FOCUS (entry)) - { - selection_color = &widget->style->base [GTK_STATE_SELECTED]; -@@ -3390,11 +3404,46 @@ - cairo_move_to (cr, x, y); - gdk_cairo_set_source_color (cr, text_color); - pango_cairo_show_layout (cr, layout); -- -+#else -+ if (GTK_WIDGET_HAS_FOCUS (entry)) -+ { -+ selection_gc = widget->style->base_gc [GTK_STATE_SELECTED]; -+ text_gc = widget->style->text_gc [GTK_STATE_SELECTED]; -+ } -+ else -+ { -+ selection_gc = widget->style->base_gc [GTK_STATE_ACTIVE]; -+ text_gc = widget->style->text_gc [GTK_STATE_ACTIVE]; -+ } -+ -+ clip_region = gdk_region_new (); -+ for (i = 0; i < n_ranges; ++i) -+ { -+ GdkRectangle rect; -+ -+ rect.x = inner_border.left - entry->scroll_offset + ranges[2 * i]; -+ rect.y = y; -+ rect.width = ranges[2 * i + 1]; -+ rect.height = logical_rect.height; -+ -+ gdk_draw_rectangle (entry->text_area, selection_gc, TRUE, -+ rect.x, rect.y, rect.width, rect.height); -+ -+ gdk_region_union_with_rect (clip_region, &rect); -+ } -+ -+ gdk_gc_set_clip_region (text_gc, clip_region); -+ gdk_draw_layout (entry->text_area, text_gc, -+ x, y, -+ layout); -+ gdk_gc_set_clip_region (text_gc, NULL); -+ gdk_region_destroy (clip_region); -+#endif - g_free (ranges); - } -- -+#ifdef USE_CAIRO_INTERNALLY - cairo_destroy (cr); -+#endif - } - } - diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.24/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/hardcoded_libtool.patch deleted file mode 100644 index 13ff318768..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+-2.24.24/hardcoded_libtool.patch +++ /dev/null @@ -1,1814 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Updated to apply to gtk+-2.24.15 - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac ---- gtk+-2.24.15/configure.ac 2013-01-12 20:52:54.000000000 +0200 -+++ gtk+-2.24.15/configure.ac 2013-02-12 21:33:30.689925967 +0200 -@@ -415,7 +415,7 @@ - case $enable_explicit_deps in - auto) - export SED -- deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` -+ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` - if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then - enable_explicit_deps=yes - else -@@ -774,7 +774,7 @@ - dnl Now we check to see if our libtool supports shared lib deps - dnl (in a rather ugly way even) - if $dynworks; then -- module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -+ module_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config" - module_deplibs_check=`$module_libtool_config | \ - grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ - sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -@@ -1574,7 +1574,7 @@ - # We are using gmodule-no-export now, but I'm leaving the stripping - # code in place for now, since pango and atk still require gmodule. - export SED --export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` - if test -n "$export_dynamic"; then - GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` - GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` -diff -Nurd gtk+-2.24.15/configure.ac.orig gtk+-2.24.15/configure.ac.orig ---- gtk+-2.24.15/configure.ac.orig 1970-01-01 02:00:00.000000000 +0200 -+++ gtk+-2.24.15/configure.ac.orig 2013-02-12 21:33:21.821926163 +0200 -@@ -0,0 +1,1775 @@ -+# Process this file with autoconf to produce a configure script. -+# Process this file with autoconf to produce a configure script. -+# require autoconf 2.54 -+AC_PREREQ(2.62) -+ -+# Making releases: -+# GTK_MICRO_VERSION += 1; -+# GTK_INTERFACE_AGE += 1; -+# GTK_BINARY_AGE += 1; -+# if any functions have been added, set GTK_INTERFACE_AGE to 0. -+# if backwards compatibility has been broken, -+# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0. -+ -+m4_define([gtk_major_version], [2]) -+m4_define([gtk_minor_version], [24]) -+m4_define([gtk_micro_version], [15]) -+m4_define([gtk_interface_age], [15]) -+m4_define([gtk_binary_age], -+ [m4_eval(100 * gtk_minor_version + gtk_micro_version)]) -+m4_define([gtk_version], -+ [gtk_major_version.gtk_minor_version.gtk_micro_version]) -+# This is the X.Y used in -lgtk-FOO-X.Y -+m4_define([gtk_api_version], [2.0]) -+ -+# Define a string for the earliest version that this release has -+# backwards binary compatibility with for all interfaces a module -+# might. Unless we add module-only API with lower stability -+# guarantees, this should be unchanged until we break binary compat -+# for GTK+. -+# -+#GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT -+m4_define([gtk_binary_version], [2.10.0]) -+ -+# required versions of other packages -+m4_define([glib_required_version], [2.28.0]) -+m4_define([pango_required_version], [1.20]) -+m4_define([atk_required_version], [1.29.2]) -+m4_define([cairo_required_version], [1.6]) -+m4_define([gdk_pixbuf_required_version], [2.21.0]) -+ -+ -+AC_INIT([gtk+], [gtk_version], -+ [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B], -+ [gtk+]) -+ -+AC_CONFIG_SRCDIR([gdk/gdktypes.h]) -+AC_CONFIG_HEADERS([config.h]) -+AC_CONFIG_MACRO_DIR([m4]) -+ -+# Save this value here, since automake will set cflags later -+cflags_set=${CFLAGS+set} -+ -+AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2]) -+ -+# Support silent build rules, requires at least automake-1.11. Enable -+# by either passing --enable-silent-rules to configure or passing V=0 -+# to make -+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])]) -+ -+# -+# For each of the libraries we build, we define the following -+ -+# substituted variables: -+# -+# foo_PACKAGES: pkg-config packages this library requires -+# foo_EXTRA_LIBS: Libraries this module requires not pulled in by pkg-config -+# foo_EXTRA_CFLAGS: cflags this module requires not pulled in by pkg-config -+# foo_DEP_LIBS: All libraries this module requires -+# foo_DEP_CFLAGS: All cflags this module requires -+ -+ -+GTK_MAJOR_VERSION=gtk_major_version -+GTK_MINOR_VERSION=gtk_minor_version -+GTK_MICRO_VERSION=gtk_micro_version -+GTK_INTERFACE_AGE=gtk_interface_age -+GTK_BINARY_AGE=gtk_binary_age -+GTK_VERSION=gtk_version -+GTK_API_VERSION=gtk_api_version -+GTK_BINARY_VERSION=gtk_binary_version -+AC_SUBST(GTK_MAJOR_VERSION) -+AC_SUBST(GTK_MINOR_VERSION) -+AC_SUBST(GTK_MICRO_VERSION) -+AC_SUBST(GTK_INTERFACE_AGE) -+AC_SUBST(GTK_BINARY_AGE) -+AC_SUBST(GTK_API_VERSION) -+AC_SUBST(GTK_VERSION) -+AC_SUBST(GTK_BINARY_VERSION) -+ -+# libtool versioning -+#LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION -+#LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE` -+#LT_REVISION=$GTK_INTERFACE_AGE -+#LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE` -+#LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE` -+ -+m4_define([lt_current], [m4_eval(100 * gtk_minor_version + gtk_micro_version - gtk_interface_age)]) -+m4_define([lt_revision], [gtk_interface_age]) -+m4_define([lt_age], [m4_eval(gtk_binary_age - gtk_interface_age)]) -+LT_VERSION_INFO="lt_current:lt_revision:lt_age" -+LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age) -+AC_SUBST(LT_VERSION_INFO) -+AC_SUBST(LT_CURRENT_MINUS_AGE) -+ -+m4_define([gail_lt_current],[18]) -+m4_define([gail_lt_revision],[1]) -+m4_define([gail_lt_age],[0]) -+m4_define([gail_lt_version_info],[gail_lt_current:gail_lt_revision:gail_lt_age]) -+m4_define([gail_lt_current_minus_age],[m4_eval(gail_lt_current - gail_lt_age)]) -+AC_SUBST([GAIL_LT_VERSION_INFO],[gail_lt_version_info]) -+AC_SUBST([GAIL_LT_CURRENT_MINUS_AGE],[gail_lt_current_minus_age]) -+ -+GETTEXT_PACKAGE=gtk20 -+AC_SUBST(GETTEXT_PACKAGE) -+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", -+ [The prefix for our gettext translation domains.]) -+ -+AC_CANONICAL_HOST -+ -+MATH_LIB=-lm -+AC_MSG_CHECKING([for native Win32]) -+LIB_EXE_MACHINE_FLAG=X86 -+EXE_MANIFEST_ARCHITECTURE=X86 -+case "$host" in -+ *-*-mingw*) -+ os_win32=yes -+ gio_can_sniff=no -+ MATH_LIB= -+ case "$host" in -+ x86_64-*-*) -+ LIB_EXE_MACHINE_FLAG=X64 -+ EXE_MANIFEST_ARCHITECTURE=AMD64 -+ ;; -+ esac -+ ;; -+ *) -+ os_win32=no -+ ;; -+esac -+AC_MSG_RESULT([$os_win32]) -+ -+AC_SUBST(LIB_EXE_MACHINE_FLAG) -+AC_SUBST(EXE_MANIFEST_ARCHITECTURE) -+ -+case $host in -+ *-*-linux*) -+ os_linux=yes -+ ;; -+esac -+ -+dnl Initialize libtool -+AC_PROG_CC -+AM_DISABLE_STATIC -+ -+dnl -+dnl Check for a working C++ compiler, but do not bail out, if none is found. -+dnl We use this for an automated test for C++ header correctness. -+dnl -+AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc) -+AC_LANG_SAVE -+AC_LANG_CPLUSPLUS -+ -+AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=) -+AM_CONDITIONAL(HAVE_CXX, test "$CXX" != "") -+ -+gtk_save_cxxflags="$CXXFLAGS" -+CXXFLAGS="$CXXFLAGS -x objective-c++" -+AC_TRY_COMPILE([@interface Foo @end],,OBJC=yes,OBJC=no) -+AM_CONDITIONAL(HAVE_OBJC, test "$OBJC" = "yes") -+CXXFLAGS="$gtk_save_cxxflags" -+AC_LANG_RESTORE -+ -+if test "$os_win32" = "yes"; then -+ if test x$enable_static = xyes -o x$enable_static = x; then -+ AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) -+ enable_static=no -+ fi -+ if test x$enable_shared = xno; then -+ AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) -+ fi -+ enable_shared=yes -+fi -+ -+AC_LIBTOOL_WIN32_DLL -+AM_PROG_LIBTOOL -+dnl when using libtool 2.x create libtool early, because it's used in configure -+m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) -+ -+ -+# Make sure we use 64-bit versions of various file stuff. -+AC_SYS_LARGEFILE -+ -+AM_PROG_AS -+AC_PATH_PROG(NM, nm, nm) -+ -+dnl Initialize maintainer mode -+AM_MAINTAINER_MODE([enable]) -+ -+AC_MSG_CHECKING([for some Win32 platform]) -+case "$host" in -+ *-*-mingw*|*-*-cygwin*) -+ platform_win32=yes -+ ;; -+ *) -+ platform_win32=no -+ ;; -+esac -+AC_MSG_RESULT([$platform_win32]) -+AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes") -+ -+AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes") -+AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes") -+AM_CONDITIONAL(OS_LINUX, test "$os_linux" = "yes") -+ -+if test "$os_win32" = "yes"; then -+ AC_CHECK_TOOL(WINDRES, windres, no) -+ if test "$WINDRES" = no; then -+ AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.]) -+ fi -+ AC_CHECK_PROG(ms_librarian, lib.exe, yes, no) -+fi -+AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes) -+ -+m4_define([debug_default], -+ m4_if(m4_eval(gtk_minor_version % 2), [1], [yes], [minimum])) -+ -+dnl declare --enable-* args and collect ac_help strings -+AC_ARG_ENABLE(debug, -+ AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@], -+ [turn on debugging @<:@default=debug_default@:>@]),, -+ enable_debug=debug_default) -+AC_ARG_ENABLE(shm, -+ [AC_HELP_STRING([--enable-shm], -+ [support shared memory if available [default=yes]])],, -+ [enable_shm="yes"]) -+AC_ARG_ENABLE(xkb, -+ [AC_HELP_STRING([--enable-xkb], -+ [support XKB [default=maybe]])],, -+ [enable_xkb="maybe"]) -+AC_ARG_ENABLE(xinerama, -+ [AC_HELP_STRING([--enable-xinerama], -+ [support xinerama extension if available [default=yes]])],, -+ [enable_xinerama="yes"]) -+AC_ARG_ENABLE(rebuilds, -+ [AC_HELP_STRING([--disable-rebuilds], -+ [disable all source autogeneration rules])],, -+ [enable_rebuilds=yes]) -+AC_ARG_ENABLE(visibility, -+ [AC_HELP_STRING([--disable-visibility], -+ [don't use ELF visibility attributes])],, -+ [enable_visibility=yes]) -+ -+AC_ARG_WITH(xinput, -+ [AC_HELP_STRING([--with-xinput=@<:@no/yes@:>@], [support XInput])]) -+ -+if test "$platform_win32" = yes; then -+ gdktarget=win32 -+else -+ gdktarget=x11 -+fi -+ -+AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target], -+ gdktarget=$with_gdktarget) -+ -+AC_SUBST(gdktarget) -+case $gdktarget in -+ x11|win32|quartz|directfb) ;; -+ *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);; -+esac -+ -+gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la -+gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la -+ -+AC_SUBST(gdktargetlib) -+AC_SUBST(gtktargetlib) -+ -+if test "x$enable_debug" = "xyes"; then -+ test "$cflags_set" = set || CFLAGS="$CFLAGS -g" -+ GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES" -+else -+ if test "x$enable_debug" = "xno"; then -+ GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS" -+ else -+ GTK_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS" -+ fi -+fi -+ -+ -+if test "x$enable_visibility" = "xno"; then -+ GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS -DDISABLE_VISIBILITY" -+fi -+ -+ -+AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}", -+ [Define if debugging is enabled]) -+ -+ -+# Build time sanity check... -+AM_SANITY_CHECK -+ -+# Checks for programs. -+AC_ISC_POSIX -+AM_PROG_CC_C_O -+AC_PROG_INSTALL -+AC_PROG_MAKE_SET -+ -+changequote(,)dnl -+if test "x$GCC" = "xyes"; then -+ case " $CFLAGS " in -+ *[\ \ ]-Wall[\ \ ]*) ;; -+ *) CFLAGS="$CFLAGS -Wall" ;; -+ esac -+ -+ if test "x$enable_ansi" = "xyes"; then -+ case " $CFLAGS " in -+ *[\ \ ]-ansi[\ \ ]*) ;; -+ *) CFLAGS="$CFLAGS -ansi" ;; -+ esac -+ -+ case " $CFLAGS " in -+ *[\ \ ]-pedantic[\ \ ]*) ;; -+ *) CFLAGS="$CFLAGS -pedantic" ;; -+ esac -+ fi -+fi -+changequote([,])dnl -+ -+CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES" -+ -+# Ensure MSVC-compatible struct packing convention is used when -+# compiling for Win32 with gcc. -+# What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while -+# gcc2 uses "-fnative-struct". -+if test x"$os_win32" = xyes; then -+ if test x"$GCC" = xyes; then -+ msnative_struct='' -+ AC_MSG_CHECKING([how to get MSVC-compatible struct packing]) -+ if test -z "$ac_cv_prog_CC"; then -+ our_gcc="$CC" -+ else -+ our_gcc="$ac_cv_prog_CC" -+ fi -+ case `$our_gcc --version | sed -e 's,\..*,.,' -e q` in -+ 2.) -+ if $our_gcc -v --help 2>/dev/null | grep fnative-struct >/dev/null; then -+ msnative_struct='-fnative-struct' -+ fi -+ ;; -+ *) -+ if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then -+ msnative_struct='-mms-bitfields' -+ fi -+ ;; -+ esac -+ if test x"$msnative_struct" = x ; then -+ AC_MSG_RESULT([no way]) -+ AC_MSG_WARN([produced libraries might be incompatible with MSVC-compiled code]) -+ else -+ CFLAGS="$CFLAGS $msnative_struct" -+ AC_MSG_RESULT([${msnative_struct}]) -+ fi -+ fi -+fi -+ -+# Honor aclocal flags -+ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" -+ -+## Initial sanity check, done here so that users get told they -+## have the wrong dependencies as early in the process as possible. -+## Later on we actually use the cflags/libs from separate pkg-config -+## calls. Oh, also the later pkg-config calls don't include -+## the version requirements since those make the module lists -+## annoying to construct -+PKG_CHECK_MODULES(BASE_DEPENDENCIES, -+ [glib-2.0 >= glib_required_version dnl -+ atk >= atk_required_version dnl -+ pango >= pango_required_version dnl -+ cairo >= cairo_required_version dnl -+ gdk-pixbuf-2.0 >= gdk_pixbuf_required_version]) -+ -+## In addition to checking that cairo is present, we also need to -+## check that the correct cairo backend is there. E.g. if the GDK -+## target is win32 we need the cairo-win32 backend and so on. -+cairo_backend=$gdktarget -+ -+# GDK calls the xlib backend "x11," cairo calls it "xlib." Other -+# backend names are identical. -+if test "x$cairo_backend" = "xx11"; then -+ cairo_backend=xlib -+fi -+PKG_CHECK_MODULES(CAIRO_BACKEND, -+ [cairo-$cairo_backend >= cairo_required_version]) -+ -+PKG_CHECK_MODULES(GMODULE, [gmodule-2.0]) -+ -+if test "$os_win32" != yes; then -+ # libtool option to control which symbols are exported -+ # right now, symbols starting with _ are not exported -+ LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"' -+else -+ # We currently use .def files on Windows (for gdk and gtk) -+ LIBTOOL_EXPORT_OPTIONS= -+fi -+AC_SUBST(LIBTOOL_EXPORT_OPTIONS) -+ -+dnl ****************************************************** -+dnl * See whether to include shared library dependencies * -+dnl ****************************************************** -+ -+AC_ARG_ENABLE(explicit-deps, -+ [AC_HELP_STRING([--enable-explicit-deps=@<:@yes/no/auto@:>@], -+ [use explicit dependencies in .pc files [default=auto]])],, -+ [enable_explicit_deps=auto]) -+ -+AC_MSG_CHECKING([Whether to write dependencies into .pc files]) -+case $enable_explicit_deps in -+ auto) -+ export SED -+ deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` -+ if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then -+ enable_explicit_deps=yes -+ else -+ enable_explicit_deps=no -+ fi -+ ;; -+ yes|no) -+ ;; -+ *) AC_MSG_ERROR([Value given to --enable-explicit-deps must be one of yes, no or auto]) -+ ;; -+esac -+AC_MSG_RESULT($enable_explicit_deps) -+ -+AM_CONDITIONAL(DISABLE_EXPLICIT_DEPS, test $enable_explicit_deps = no) -+ -+# define a MAINT-like variable REBUILD which is set if Perl -+# and awk are found, so autogenerated sources can be rebuilt -+ -+AC_PATH_PROGS(PERL, perl5 perl) -+ -+# We would like indent, but don't require it. -+AC_CHECK_PROG(INDENT, indent, indent) -+ -+REBUILD=\# -+if test "x$enable_rebuilds" = "xyes" && \ -+ test -n "$PERL" && \ -+ $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then -+ REBUILD= -+fi -+AC_SUBST(REBUILD) -+ -+AC_CHECK_FUNCS(lstat mkstemp flockfile getc_unlocked) -+AC_CHECK_FUNCS(localtime_r) -+ -+# _NL_TIME_FIRST_WEEKDAY is an enum and not a define -+AC_MSG_CHECKING([for _NL_TIME_FIRST_WEEKDAY]) -+AC_TRY_LINK([#include <langinfo.h>], [ -+char c; -+c = *((unsigned char *) nl_langinfo(_NL_TIME_FIRST_WEEKDAY)); -+], gtk_ok=yes, gtk_ok=no) -+AC_MSG_RESULT($gtk_ok) -+if test "$gtk_ok" = "yes"; then -+ AC_DEFINE([HAVE__NL_TIME_FIRST_WEEKDAY], [1], -+ [Define if _NL_TIME_FIRST_WEEKDAY is available]) -+fi -+ -+# _NL_MEASUREMENT_MEASUREMENT is an enum and not a define -+AC_MSG_CHECKING([for _NL_MEASUREMENT_MEASUREMENT]) -+AC_TRY_LINK([#include <langinfo.h>], [ -+char c; -+c = *((unsigned char *) nl_langinfo(_NL_MEASUREMENT_MEASUREMENT)); -+], gtk_ok=yes, gtk_ok=no) -+AC_MSG_RESULT($gtk_ok) -+if test "$gtk_ok" = "yes"; then -+ AC_DEFINE([HAVE__NL_MEASUREMENT_MEASUREMENT], [1], -+ [Define if _NL_MEASUREMENT_MEASUREMENT is available]) -+fi -+ -+# _NL_PAPER_HEIGHT is an enum and not a define -+AC_MSG_CHECKING([for _NL_PAPER_HEIGHT]) -+AC_TRY_LINK([#include <langinfo.h>], [ -+char c; -+c = *((unsigned char *) nl_langinfo(_NL_PAPER_HEIGHT)); -+], gtk_ok=yes, gtk_ok=no) -+AC_MSG_RESULT($gtk_ok) -+if test "$gtk_ok" = "yes"; then -+ AC_DEFINE([HAVE__NL_PAPER_HEIGHT], [1], -+ [Define if _NL_PAPER_HEIGHT is available]) -+fi -+ -+# _NL_PAPER_WIDTH is an enum and not a define -+AC_MSG_CHECKING([for _NL_PAPER_WIDTH]) -+AC_TRY_LINK([#include <langinfo.h>], [ -+char c; -+c = *((unsigned char *) nl_langinfo(_NL_PAPER_WIDTH)); -+], gtk_ok=yes, gtk_ok=no) -+AC_MSG_RESULT($gtk_ok) -+if test "$gtk_ok" = "yes"; then -+ AC_DEFINE([HAVE__NL_PAPER_WIDTH], [1], -+ [Define if _NL_PAPER_WIDTH is available]) -+fi -+ -+# sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable -+AC_MSG_CHECKING(for sigsetjmp) -+AC_TRY_LINK([#include <setjmp.h>], [ -+sigjmp_buf env; -+sigsetjmp(env, 0); -+], gtk_ok=yes, gtk_ok=no) -+AC_MSG_RESULT($gtk_ok) -+if test "$gtk_ok" = "yes"; then -+ AC_DEFINE(HAVE_SIGSETJMP, 1, -+ [Define to 1 if sigsetjmp is available]) -+fi -+ -+# i18n stuff -+ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`" -+AM_GLIB_GNU_GETTEXT -+LIBS="$LIBS $INTLLIBS" -+AC_OUTPUT_COMMANDS([case "$CONFIG_FILES" in *po-properties/Makefile.in*) -+ sed -e "/POTFILES =/r po-properties/POTFILES" po-properties/Makefile.in > po-properties/Makefile -+ esac]) -+ -+dnl Snippet below is copied from AM_GLIB_GNU_GETTEXT to generate a first -+dnl po-properties/POTFILES during configure; see GNOME #573515. -+dnl -+dnl Generate list of files to be processed by xgettext which will -+dnl be included in po-properties/Makefile. -+test -d po-properties || mkdir po-properties -+if test "x$srcdir" != "x."; then -+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then -+ popropsrcprefix="$srcdir/" -+ else -+ popropsrcprefix="../$srcdir/" -+ fi -+else -+ popropsrcprefix="../" -+fi -+rm -f po-properties/POTFILES -+sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $popropsrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ -+< $srcdir/po-properties/POTFILES.in > po-properties/POTFILES -+dnl (End of adapted AM_GLIB_GNU_GETTEXT snippet.) -+ -+AM_GLIB_DEFINE_LOCALEDIR(GTK_LOCALEDIR) -+ -+dnl The DU4 header files don't provide library prototypes unless -+dnl -std1 is given to the native cc. -+AC_MSG_CHECKING([for extra flags to get ANSI library prototypes]) -+ -+gtk_save_LIBS=$LIBS -+LIBS="$LIBS -lm" -+AC_TRY_RUN([#include <math.h> -+ int main (void) { return (log(1) != log(1.)); }], -+ AC_MSG_RESULT(none needed), -+ gtk_save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -std1" -+ AC_TRY_RUN([#include <math.h> -+ int main (void) { return (log(1) != log(1.)); }], -+ AC_MSG_RESULT(-std1), -+ AC_MSG_RESULT() -+ CFLAGS="$gtk_save_CFLAGS" -+ AC_MSG_WARN( -+ [No ANSI prototypes found in library. (-std1 didn't work.)]), -+ true -+ ), -+ AC_MSG_RESULT(none needed) -+) -+LIBS=$gtk_save_LIBS -+ -+AC_MSG_CHECKING(for the BeOS) -+case $host in -+ *-*-beos*) -+ AC_MSG_RESULT(yes) -+ MATH_LIB= -+ ;; -+ *) -+ AC_MSG_RESULT(no) -+ ;; -+esac -+ -+AC_SUBST(MATH_LIB) -+# -+# see bug 162979 -+# -+AC_MSG_CHECKING(for HP-UX) -+case $host_os in -+ hpux9* | hpux10* | hpux11*) -+ AC_MSG_RESULT(yes) -+ CFLAGS="$CFLAGS -DHPPEX -DSHMLINK" -+ ;; -+ *) -+ AC_MSG_RESULT(no) -+ ;; -+esac -+ -+dnl NeXTStep cc seems to need this -+AC_MSG_CHECKING([for extra flags for POSIX compliance]) -+AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;], -+ AC_MSG_RESULT(none needed), -+ gtk_save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -posix" -+ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;], -+ AC_MSG_RESULT(-posix), -+ AC_MSG_RESULT() -+ CFLAGS="$gtk_save_CFLAGS" -+ AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)]))) -+ -+# -+# Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working -+# -+ -+GLIB_PACKAGES="gobject-2.0 gio-2.0 gmodule-no-export-2.0" -+ -+AM_PATH_GLIB_2_0(glib_required_version, :, -+ AC_MSG_ERROR([ -+*** GLIB glib_required_version or better is required. The latest version of -+*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]), -+ gobject gmodule-no-export gthread) -+ -+# See if it's safe to turn G_DISABLE_DEPRECATED on. -+GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.@<:@^.@:>@*\$//"` -+GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo glib_required_version | sed "s/\.@<:@^.@:>@*\$//"` -+if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then -+ CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS" -+fi -+ -+CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS" -+ -+ -+dnl -+dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in. -+dnl -+gtk_save_LIBS=$LIBS -+LIBS="$LIBS $GLIB_LIBS" -+AC_CHECK_FUNCS(bind_textdomain_codeset) -+LIBS=$gtk_save_LIBS -+ -+AC_CHECK_HEADERS(pwd.h, -+ AC_DEFINE(HAVE_PWD_H, 1, -+ [Define to 1 if pwd.h is available])) -+AC_CHECK_HEADERS(sys/time.h, -+ AC_DEFINE(HAVE_SYS_TIME_H, 1, -+ [Define to 1 if time.h is available])) -+AC_CHECK_HEADERS(unistd.h, -+ AC_DEFINE(HAVE_UNISTD_H, 1, -+ [Define to 1 if unistd.h is available])) -+AC_CHECK_HEADERS(ftw.h, -+ AC_DEFINE(HAVE_FTW_H, 1, -+ [Define to 1 if ftw.h is available])) -+ -+AC_MSG_CHECKING([for GNU ftw extensions]) -+AC_TRY_COMPILE([#define _XOPEN_SOURCE 500 -+#define _GNU_SOURCE -+#include <ftw.h>], [int flags = FTW_ACTIONRETVAL;], gtk_ok=yes, gtk_ok=no) -+if test $gtk_ok = yes; then -+ AC_MSG_RESULT([yes]) -+ AC_DEFINE(HAVE_GNU_FTW, 1, [Have GNU ftw]) -+else -+ AC_MSG_RESULT([no]) -+fi -+ -+saved_cflags="$CFLAGS" -+saved_ldflags="$LDFLAGS" -+ -+ -+# Checks for header files. -+AC_HEADER_STDC -+ -+# Checks for typedefs, structures, and compiler characteristics. -+AC_C_CONST -+ -+# Checks for library functions. -+AC_TYPE_SIGNAL -+AC_FUNC_MMAP -+ -+AC_CHECK_FUNCS(mallinfo) -+AC_CHECK_FUNCS(getresuid) -+AC_TYPE_UID_T -+ -+# Check if <sys/select.h> needs to be included for fd_set -+AC_MSG_CHECKING([for fd_set]) -+AC_TRY_COMPILE([#include <sys/types.h>], -+ [fd_set readMask, writeMask;], gtk_ok=yes, gtk_ok=no) -+if test $gtk_ok = yes; then -+ AC_MSG_RESULT([yes, found in sys/types.h]) -+else -+ AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes) -+ if test $gtk_ok = yes; then -+ AC_DEFINE(HAVE_SYS_SELECT_H, 1, -+ [Define to 1 if sys/select.h is available]) -+ AC_MSG_RESULT([yes, found in sys/select.h]) -+ else -+ AC_DEFINE(NO_FD_SET, 1, -+ [Define to 1 if fd_set is not available]) -+ AC_MSG_RESULT(no) -+ fi -+fi -+ -+# `widechar' tests for gdki18n.h -+AC_MSG_CHECKING(for wchar.h) -+AC_TRY_CPP([#include <wchar.h>], gdk_wchar_h=yes, gdk_wchar_h=no) -+if test $gdk_wchar_h = yes; then -+ AC_DEFINE(HAVE_WCHAR_H, 1, [Have wchar.h include file]) -+fi -+AC_MSG_RESULT($gdk_wchar_h) -+ -+# Check for wctype.h (for iswalnum) -+AC_MSG_CHECKING(for wctype.h) -+AC_TRY_CPP([#include <wctype.h>], gdk_wctype_h=yes, gdk_wctype_h=no) -+if test $gdk_wctype_h = yes; then -+ AC_DEFINE(HAVE_WCTYPE_H, 1, [Have wctype.h include file]) -+fi -+AC_MSG_RESULT($gdk_wctype_h) -+ -+# in Solaris 2.5, `iswalnum' is in -lw -+GDK_WLIBS= -+AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS=-lw)]) -+ -+oLIBS="$LIBS" -+LIBS="$LIBS $GDK_WLIBS" -+# The following is necessary for Linux libc-5.4.38 -+AC_MSG_CHECKING(if iswalnum() and friends are properly defined) -+AC_TRY_LINK([#include <stdlib.h>],[ -+#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H)) -+# ifdef HAVE_WCTYPE_H -+# include <wctype.h> -+# else -+# ifdef HAVE_WCHAR_H -+# include <wchar.h> -+# endif -+# endif -+#else -+# define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c)) -+#endif -+iswalnum((wchar_t) 0); -+], gdk_working_wctype=yes, gdk_working_wctype=no) -+LIBS="$oLIBS" -+ -+if test $gdk_working_wctype = no; then -+ AC_DEFINE(HAVE_BROKEN_WCTYPE, 1, [Is the wctype implementation broken]) -+ GDK_WLIBS= -+fi -+AC_MSG_RESULT($gdk_working_wctype) -+AC_SUBST(GDK_WLIBS) -+ -+# Check for uxtheme.h (for MS-Windows Engine) -+AC_MSG_CHECKING(for uxtheme.h) -+AC_TRY_CPP([#include <uxtheme.h>], gtk_uxtheme_h=yes, gtk_uxtheme_h=no) -+if test $gtk_uxtheme_h = yes; then -+ AC_DEFINE(HAVE_UXTHEME_H, 1, [Have uxtheme.h include file]) -+fi -+AC_MSG_RESULT($gtk_uxtheme_h) -+ -+# Checks for gdkspawn -+AC_CHECK_HEADERS(crt_externs.h) -+AC_CHECK_FUNCS(_NSGetEnviron) -+ -+AC_MSG_CHECKING(whether to build dynamic modules) -+ -+AC_ARG_ENABLE(modules, -+ [AC_HELP_STRING([--disable-modules], -+ [disable dynamic module loading])]) -+ -+dynworks=false -+deps= -+if test x$enable_modules = xno; then -+ AC_MSG_RESULT(no) -+else -+ AC_MSG_RESULT(yes) -+ AC_MSG_CHECKING(whether dynamic modules work) -+ ## for loop is to strip newline -+ tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0` -+ for I in $tmp; do -+ dynworks=$I -+ done -+ -+ dnl Now we check to see if our libtool supports shared lib deps -+ dnl (in a rather ugly way even) -+ if $dynworks; then -+ module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -+ module_deplibs_check=`$module_libtool_config | \ -+ grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ -+ sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -+ if test "x$module_deplibs_check" = "xnone" || \ -+ test "x$module_deplibs_check" = "xunknown" || \ -+ test "x$module_deplibs_check" = "x"; then -+ dynworks=false -+ fi -+ fi -+ -+ if $dynworks; then -+ AC_DEFINE(USE_GMODULE, 1, -+ [Define to 1 if gmodule works and should be used]) -+ AC_MSG_RESULT(yes) -+ else -+ AC_MSG_RESULT(no) -+ fi -+fi -+ -+AM_CONDITIONAL(BUILD_DYNAMIC_MODULES, $dynworks) -+ -+# -+# Allow building some or all immodules included -+# -+AC_MSG_CHECKING(immodules to build) -+ -+dnl due to an autoconf bug, commas in the first arg to -+dnl AC_HELP_STRING cause problems. -+dnl AC_HELP_STRING([--with-included-immodules=MODULE1 MODULE2 ...], -+dnl [build the specified input method modules into gtk]) -+AC_ARG_WITH(included_immodules, -+[ --with-included-immodules=MODULE1,MODULE2,... -+ build the specified input methods into gtk]) -+ -+if $dynworks; then -+ : -+else -+ ## if the option was specified, leave it; otherwise disable included immodules -+ if test x$with_included_immodules = xno; then -+ with_included_immodules=yes -+ fi -+fi -+ -+all_immodules="am-et,cedilla,cyrillic-translit" -+if test "$gdktarget" = "win32"; then -+ all_immodules="${all_immodules},ime" -+fi -+all_immodules="${all_immodules},inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr" -+if test "$gdktarget" = "x11"; then -+ all_immodules="${all_immodules},xim" -+fi -+ -+included_immodules="" -+# If the switch specified without listing any specific ones, include all -+if test "x$with_included_immodules" = xyes ; then -+ included_immodules="$all_immodules" -+else -+ included_immodules="$with_included_immodules" -+fi -+ -+AC_MSG_RESULT($included_immodules) -+AM_CONDITIONAL(HAVE_INCLUDED_IMMMODULES, test "x$included_immodules" != x) -+ -+INCLUDED_IMMODULE_OBJ= -+INCLUDED_IMMODULE_DEFINE= -+ -+IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS="," -+for immodule in $included_immodules; do -+ immodule_underscores=`echo $immodule | sed -e 's/-/_/g'` -+ if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then -+ : -+ else -+ AC_MSG_ERROR([the specified input method $immodule does not exist]) -+ fi -+ -+ INCLUDED_IMMODULE_OBJ="$INCLUDED_IMMODULE_OBJ ../modules/input/libstatic-im-$immodule.la" -+ INCLUDED_IMMODULE_DEFINE="$INCLUDED_IMMODULE_DEFINE -DINCLUDE_IM_$immodule_underscores" -+ eval INCLUDE_$immodule_underscores=yes -+done -+IFS="$gtk_save_ifs" -+AC_SUBST(INCLUDED_IMMODULE_OBJ) -+AC_SUBST(INCLUDED_IMMODULE_DEFINE) -+ -+AM_CONDITIONAL(INCLUDE_IM_AM_ET, [test x"$INCLUDE_am_et" = xyes]) -+AM_CONDITIONAL(INCLUDE_IM_CEDILLA, [test x"$INCLUDE_cedilla" = xyes]) -+AM_CONDITIONAL(INCLUDE_IM_CYRILLIC_TRANSLIT, [test x"$INCLUDE_cyrillic_translit" = xyes]) -+AM_CONDITIONAL(INCLUDE_IM_IME, [test x"$INCLUDE_ime" = xyes]) -+AM_CONDITIONAL(INCLUDE_IM_INUKTITUT, [test x"$INCLUDE_inuktitut" = xyes]) -+AM_CONDITIONAL(INCLUDE_IM_IPA, [test x"$INCLUDE_ipa" = xyes]) -+AM_CONDITIONAL(INCLUDE_IM_MULTIPRESS, [test x"$INCLUDE_multipress" = xyes]) -+AM_CONDITIONAL(INCLUDE_IM_THAI, [test x"$INCLUDE_thai" = xyes]) -+AM_CONDITIONAL(INCLUDE_IM_TI_ER, [test x"$INCLUDE_ti_er" = xyes]) -+AM_CONDITIONAL(INCLUDE_IM_TI_ET, [test x"$INCLUDE_ti_et" = xyes]) -+AM_CONDITIONAL(INCLUDE_IM_VIQR, [test x"$INCLUDE_viqr" = xyes]) -+AM_CONDITIONAL(INCLUDE_IM_XIM, [test x"$INCLUDE_xim" = xyes]) -+ -+AC_HEADER_SYS_WAIT -+ -+AC_TYPE_SIGNAL -+ -+# Checks to see whether we should include mediaLib -+# support. -+# -+AC_CHECK_HEADER(sys/systeminfo.h, -+ AC_DEFINE(HAVE_SYS_SYSTEMINFO_H, 1, -+ [Define to 1 if sys/systeminfo.h is available])) -+AC_CHECK_HEADER(sys/sysinfo.h, -+ AC_DEFINE(HAVE_SYS_SYSINFO_H, 1, -+ [Define to 1 if sys/sysinfo.h is available])) -+ -+AC_MSG_CHECKING(for mediaLib 2.3) -+use_mlib25=no -+# Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib -+# patch requires. -+AC_CHECK_LIB(mlib, mlib_ImageSetStruct, use_mlib=yes, use_mlib=no) -+if test $use_mlib = yes; then -+ AC_DEFINE(USE_MEDIALIB, 1, -+ [Define to 1 if medialib is available and should be used]) -+ MEDIA_LIB=-lmlib -+ -+ AC_MSG_CHECKING(for mediaLib 2.5) -+ # Check for a mediaLib 2.5 function since that is what is needed for -+ # gdk_rgb_convert integration. -+ AC_CHECK_LIB(mlib, mlib_VideoColorRGBint_to_BGRAint, use_mlib25=yes, use_mlib25=no) -+ if test $use_mlib25 = yes; then -+ AC_DEFINE(USE_MEDIALIB25, 1, -+ [Define to 1 if medialib 2.5 is available]) -+ fi -+fi -+AM_CONDITIONAL(USE_MEDIALIB, test $use_mlib = yes) -+AM_CONDITIONAL(USE_MEDIALIB25, test $use_mlib25 = yes) -+ -+dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling -+ -+AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) -+ -+if test $cross_compiling = yes; then -+ AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no) -+ if test x$GTK_UPDATE_ICON_CACHE = xno; then -+ REBUILD_PNGS=# -+ fi -+fi -+ -+AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no) -+ -+if test ! -f $srcdir/gtk/gtkbuiltincache.h && -+ test "x$REBUILD_PNGS" = "x#" ; then -+ AC_MSG_ERROR([ -+*** gtkbuiltincache.h is not in the tree, and cannot be built -+*** because you don't have libpng, or (when cross-compiling) you -+*** don't have a prebuilt gtk-update-icon-cache on the build system.]) -+fi -+ -+######################################## -+# Windowing system checks -+######################################## -+ -+GDK_EXTRA_LIBS="$GDK_WLIBS" -+GDK_EXTRA_CFLAGS= -+ -+# GTK+ uses some X calls, so needs to link against X directly -+GTK_DEP_PACKAGES_FOR_X= -+GTK_DEP_LIBS_FOR_X= -+ -+if test "x$gdktarget" = "xx11"; then -+ X_PACKAGES=fontconfig -+ -+ # -+ # We use fontconfig very peripherally when decoding the default -+ # settings. -+ # -+ if $PKG_CONFIG --exists fontconfig; then : ; else -+ AC_MSG_ERROR([ -+*** fontconfig (http://www.fontconfig.org) is required by the X11 backend.]) -+ fi -+ -+ # -+ # Check for basic X packages; we use pkg-config if available -+ # -+ if $PKG_CONFIG --exists x11 xext xrender; then -+ have_base_x_pc=true -+ X_PACKAGES="$X_PACKAGES x11 xext xrender" -+ x_libs="`$PKG_CONFIG --libs x11 xext xrender`" -+ X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`" -+ -+ # Strip out any .la files that pkg-config might give us (this happens -+ # with -uninstalled.pc files) -+ x_libs_for_checks= -+ for I in $x_libs ; do -+ case $I in -+ *.la) ;; -+ *) x_libs_for_checks="$x_libs_for_checks $I" ;; -+ esac -+ done -+ -+ GTK_PACKAGES_FOR_X="x11" -+ else -+ have_base_x_pc=false -+ AC_PATH_XTRA -+ if test x$no_x = xyes ; then -+ AC_MSG_ERROR([X development libraries not found]) -+ fi -+ -+ x_cflags="$X_CFLAGS" -+ x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS" -+ -+ GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 $X_EXTRA_LIBS" -+ fi -+ -+ # Extra libraries found during checks (-lXinerama, etc), not from pkg-config. -+ x_extra_libs= -+ -+ gtk_save_cppflags="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $X_CFLAGS" -+ -+ gtk_save_LIBS=$LIBS -+ LIBS="$x_libs_for_checks $LIBS" -+ -+ # Sanity check for the X11 and Xext libraries. While everything we need from -+ # Xext is optional, the chances a system has *none* of these things is so -+ # small that we just unconditionally require it. -+ AC_CHECK_FUNC(XOpenDisplay, :, -+ AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.])) -+ AC_CHECK_FUNC(XextFindDisplay, :, -+ AC_MSG_ERROR([*** libXext not found. Check 'config.log' for more details.])) -+ AC_CHECK_FUNC(XRenderQueryExtension, :, -+ AC_MSG_ERROR([*** libXrender not found. Check 'config.log' for more details.])) -+ -+ # Check for xReply -+ -+ AC_MSG_CHECKING([if <X11/extensions/XIproto.h> is needed for xReply]) -+ AC_TRY_COMPILE([#include <X11/Xlibint.h>], -+ [xReply *rep;], -+ [AC_MSG_RESULT([no])], -+ [AC_TRY_COMPILE([#include <X11/extensions/XIproto.h> -+#include <X11/Xlibint.h>], -+ [xReply *rep;], -+ [AC_MSG_RESULT([yes]) -+ AC_DEFINE([NEED_XIPROTO_H_FOR_XREPLY], 1, -+ [Define if <X11/extensions/XIproto.h> needed for xReply])], -+ [AC_MSG_RESULT([unknown]) -+ AC_MSG_ERROR([xReply type unavailable. X11 is too old])])]) -+ -+ # Check for XConvertCase, XInternAtoms (X11R6 specific) -+ -+ AC_CHECK_FUNCS(XConvertCase XInternAtoms) -+ -+ # Generic X11R6 check needed for XIM support; we could -+ # probably use this to replace the above, but we'll -+ # leave the separate checks for XConvertCase and XInternAtoms -+ # for clarity -+ -+ have_x11r6=false -+ AC_CHECK_FUNC(XAddConnectionWatch, -+ have_x11r6=true) -+ -+ if $have_x11r6; then -+ AC_DEFINE(HAVE_X11R6, 1, [Define if we have X11R6]) -+ fi -+ AM_CONDITIONAL(HAVE_X11R6, $have_x11r6) -+ -+ # Check for XKB support. -+ -+ if test "x$enable_xkb" = "xyes"; then -+ AC_MSG_WARN(XKB support explicitly enabled) -+ AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension]) -+ elif test "x$enable_xkb" = "xmaybe"; then -+ AC_CHECK_FUNC(XkbQueryExtension, -+ AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension])) -+ else -+ AC_MSG_WARN(XKB support explicitly disabled) -+ fi -+ -+ # Check for shaped window extension -+ -+ AC_CHECK_FUNC(XShapeCombineMask, :, -+ [AC_MSG_ERROR([Shape extension not found, check your development headers])]) -+ -+ # X SYNC check -+ gtk_save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $x_cflags" -+ -+ AC_CHECK_FUNC(XSyncQueryExtension, -+ [AC_CHECK_HEADER(X11/extensions/sync.h, -+ AC_DEFINE(HAVE_XSYNC, 1, [Have the SYNC extension library]), -+ :, [#include <X11/Xlib.h>])]) -+ -+ CFLAGS="$gtk_save_CFLAGS" -+ -+ # Xshm checks -+ -+ if test "x$enable_shm" = "xyes"; then -+ # Check for the XShm extension, normally in Xext -+ AC_CHECK_FUNC(XShmAttach, -+ :, -+ # On AIX, it is in XextSam instead -+ [AC_CHECK_LIB(XextSam, XShmAttach, -+ [GTK_ADD_LIB(x_extra_libs,XextSam)])]) -+ fi -+ -+ if test "x$enable_shm" = "xyes"; then -+ # Check for shared memory -+ AC_CHECK_HEADER(sys/ipc.h, -+ AC_DEFINE(HAVE_IPC_H, 1, -+ [Define to 1 if ipc.h is available]), -+ no_sys_ipc=yes) -+ AC_CHECK_HEADER(sys/shm.h, -+ AC_DEFINE(HAVE_SHM_H, 1, -+ [Define to 1 if shm.h is available]), -+ no_sys_shm=yes) -+ -+ # Check for the X shared memory extension header file -+ have_xshm=no -+ AC_MSG_CHECKING(X11/extensions/XShm.h) -+ if test "x$no_xext_lib" = "xyes"; then -+ : -+ else -+ gtk_save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $x_cflags" -+ AC_TRY_COMPILE([ -+#include <stdlib.h> -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/shm.h> -+#include <X11/Xlib.h> -+#include <X11/Xutil.h> -+#include <X11/extensions/XShm.h> -+], [XShmSegmentInfo *x_shm_info;], have_xshm=yes) -+ CFLAGS="$gtk_save_CFLAGS" -+ fi -+ AC_MSG_RESULT($have_xshm) -+ if test $have_xshm = yes ; then -+ AC_DEFINE(HAVE_XSHM_H, 1, -+ [Define to 1 if xshm.h is available]) -+ fi -+ fi -+ -+ if test "x$enable_xinerama" = "xyes"; then -+ # Check for Xinerama extension (Solaris impl or Xfree impl) -+ gtk_save_cppflags="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $x_cflags" -+ -+ # Check for XFree -+ AC_MSG_CHECKING(for Xinerama support on XFree86) -+ -+ have_xfree_xinerama=false -+ if $PKG_CONFIG --exists xinerama ; then -+ have_xfree_xinerama=true -+ X_PACKAGES="$X_PACKAGES xinerama" -+ else -+ AC_CHECK_LIB(Xinerama, XineramaQueryExtension, -+ [AC_CHECK_HEADER(X11/extensions/Xinerama.h, -+ [GTK_ADD_LIB(x_extra_libs,Xinerama) -+ have_xfree_xinerama=true], :, -+ [#include <X11/Xlib.h>])]) -+ fi -+ -+ if $have_xfree_xinerama ; then -+ AC_DEFINE(HAVE_XFREE_XINERAMA, 1, -+ [Define to 1 if XFree Xinerama is available]) -+ AC_DEFINE(HAVE_XINERAMA, 1, -+ [Define to 1 is Xinerama is available]) -+ AC_MSG_RESULT(yes) -+ else -+ AC_MSG_RESULT(no) -+ -+ case "$host" in -+ *-*-solaris*) -+ # Check for solaris -+ AC_MSG_CHECKING(for Xinerama support on Solaris) -+ -+ have_solaris_xinerama=false -+ AC_CHECK_FUNC(XineramaGetInfo, -+ [AC_CHECK_HEADER(X11/extensions/xinerama.h, -+ [have_solaris_xinerama=true], :, -+ [#include <X11/Xlib.h>])]) -+ -+ if $have_solaris_xinerama ; then -+ AC_DEFINE(HAVE_SOLARIS_XINERAMA, 1, -+ [Define to 1 if solaris xinerama is available]) -+ AC_DEFINE(HAVE_XINERAMA, 1, -+ [Define to 1 if xinerama is available]) -+ AC_MSG_RESULT(yes) -+ else -+ AC_MSG_RESULT(no) -+ fi -+ ;; -+ *) -+ ;; -+ esac -+ fi -+ fi -+ -+ # set up things for XInput -+ -+ if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then -+ AC_DEFINE(XINPUT_XFREE, 1, -+ [Define to 1 if XFree XInput should be used]) -+ -+ if $PKG_CONFIG --exists xi ; then -+ X_PACKAGES="$X_PACKAGES xi" -+ else -+ GTK_ADD_LIB(x_extra_libs, Xi) -+ fi -+ else -+ AC_DEFINE(XINPUT_NONE, 1, -+ [Define to 1 if no XInput should be used]) -+ fi -+ -+ AM_CONDITIONAL(XINPUT_XFREE, test x$with_xinput = xxfree || test x$with_xinput = xyes) -+ -+ # Check for the RANDR extension -+ if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then -+ AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library]) -+ -+ X_PACKAGES="$X_PACKAGES xrandr" -+ fi -+ -+ # Checks for Xcursor library -+ -+ if $PKG_CONFIG --exists xcursor ; then -+ AC_DEFINE(HAVE_XCURSOR, 1, [Have the Xcursor library]) -+ -+ X_PACKAGES="$X_PACKAGES xcursor" -+ fi -+ -+ # Checks for XFixes extension -+ -+ if $PKG_CONFIG --exists xfixes ; then -+ AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension]) -+ -+ X_PACKAGES="$X_PACKAGES xfixes" -+ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes" -+ fi -+ -+ # Checks for Xcomposite extension -+ -+ if $PKG_CONFIG --exists xcomposite ; then -+ AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension]) -+ -+ X_PACKAGES="$X_PACKAGES xcomposite" -+ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xcomposite" -+ fi -+ -+ # Checks for Xdamage extension -+ -+ if $PKG_CONFIG --exists xdamage ; then -+ AC_DEFINE(HAVE_XDAMAGE, 1, [Have the XDAMAGE X extension]) -+ -+ X_PACKAGES="$X_PACKAGES xdamage" -+ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage" -+ fi -+ -+ if $have_base_x_pc ; then -+ GDK_EXTRA_LIBS="$x_extra_libs" -+ else -+ GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs -lXext -lX11 $GDK_EXTRA_LIBS" -+ fi -+ -+ CPPFLAGS="$gtk_save_cppflags" -+ LIBS="$gtk_save_libs" -+ -+ AM_CONDITIONAL(USE_X11, true) -+else -+ XPACKAGES= -+ -+ AM_CONDITIONAL(XINPUT_XFREE, false) -+ AM_CONDITIONAL(USE_X11, false) -+ AM_CONDITIONAL(HAVE_X11R6, false) -+fi -+ -+if test "x$gdktarget" = "xwin32"; then -+ GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" -+ AM_CONDITIONAL(USE_WIN32, true) -+else -+ AM_CONDITIONAL(USE_WIN32, false) -+fi -+ -+AC_ARG_ENABLE(quartz-relocation, -+ [AS_HELP_STRING([--enable-quartz-relocation], -+ [enable bundle-based relocation functions])], -+ [quartz_relocation=yes]) -+ -+if test "x$gdktarget" = "xquartz"; then -+ GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" -+ AM_CONDITIONAL(USE_QUARTZ, true) -+ if test "x$quartz_relocation" = xyes; then -+ AC_DEFINE([QUARTZ_RELOCATION], [1], [Use NSBundle functions to determine load paths for libraries, translations, etc.]) -+ fi -+ -+else -+ AM_CONDITIONAL(USE_QUARTZ, false) -+fi -+ -+if test "x$gdktarget" = "xdirectfb"; then -+ DIRECTFB_REQUIRED_VERSION=1.0.0 -+ AC_MSG_CHECKING(for DirectFB) -+ -+ PKG_CHECK_MODULES(DIRECTFB, [directfb >= $DIRECTFB_REQUIRED_VERSION]) -+ AM_CONDITIONAL(USE_DIRECTFB, true) -+else -+ AM_CONDITIONAL(USE_DIRECTFB, false) -+fi -+ -+ -+# Check for Pango flags -+ -+if test "x$gdktarget" = "xwin32"; then -+ PANGO_PACKAGES="pangowin32 pangocairo" -+else -+ PANGO_PACKAGES="pango pangocairo" -+fi -+ -+AC_MSG_CHECKING(Pango flags) -+if $PKG_CONFIG --exists $PANGO_PACKAGES ; then -+ PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES` -+ PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES` -+ -+ AC_MSG_RESULT($PANGO_CFLAGS $PANGO_LIBS) -+else -+ AC_MSG_ERROR([ -+*** Pango not found. Pango built with Cairo support is required -+*** to build GTK+. See http://www.pango.org for Pango information. -+]) -+fi -+ -+CFLAGS="$CFLAGS $PANGO_CFLAGS" -+ -+if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then -+ : -+else -+ gtk_save_LIBS="$LIBS" -+ LIBS="$PANGO_LIBS $LIBS" -+ AC_TRY_LINK_FUNC(pango_context_new, :, AC_MSG_ERROR([ -+*** Can't link to Pango. Pango is required to build -+*** GTK+. For more information see http://www.pango.org])) -+ LIBS="$gtk_save_LIBS" -+fi -+ -+CFLAGS="$saved_cflags" -+LDFLAGS="$saved_ldflags" -+ -+# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c -+if test "x$gdktarget" = "xx11"; then -+ GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend" -+else -+ GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend" -+fi -+ -+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES` $MATH_LIB" -+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS" -+# -+# If we aren't writing explicit dependencies, then don't put the extra libraries we need -+# into the pkg-config files -+# -+if test $enable_explicit_deps != yes ; then -+ GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0" -+ GDK_EXTRA_LIBS= -+fi -+ -+AC_SUBST(GDK_PACKAGES) -+AC_SUBST(GDK_EXTRA_LIBS) -+AC_SUBST(GDK_EXTRA_CFLAGS) -+AC_SUBST(GDK_DEP_LIBS) -+AC_SUBST(GDK_DEP_CFLAGS) -+ -+ -+######################################## -+# Check for Accessibility Toolkit flags -+######################################## -+ -+ATK_PACKAGES=atk -+AC_MSG_CHECKING(ATK flags) -+if $PKG_CONFIG --exists $ATK_PACKAGES ; then -+ ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES` -+ ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES` -+ -+ AC_MSG_RESULT($ATK_CFLAGS $ATK_LIBS) -+else -+ AC_MSG_ERROR([ -+*** Accessibility Toolkit not found. Accessibility Toolkit is required -+*** to build GTK+. -+]) -+fi -+ -+if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then -+ : -+else -+ gtk_save_LIBS="$LIBS" -+ LIBS="$ATK_LIBS $LIBS" -+ AC_TRY_LINK_FUNC(atk_object_get_type, : , AC_MSG_ERROR([ -+ *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required -+ *** to build GTK+])) -+ LIBS="$gtk_save_LIBS" -+fi -+ -+GTK_PACKAGES="atk cairo gdk-pixbuf-2.0 gio-2.0" -+if test "x$gdktarget" = "xx11"; then -+ GTK_PACKAGES="$GTK_PACKAGES pangoft2" -+fi -+GTK_EXTRA_LIBS= -+GTK_EXTRA_CFLAGS= -+GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $MATH_LIB" -+GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES $GTK_PACKAGES` $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" -+ -+if test x"$os_win32" = xyes; then -+ GTK_EXTRA_CFLAGS="$msnative_struct" -+fi -+ -+GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" -+ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`" -+PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`" -+CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" -+ -+AC_SUBST(GTK_PACKAGES) -+AC_SUBST(GTK_EXTRA_LIBS) -+AC_SUBST(GTK_EXTRA_CFLAGS) -+AC_SUBST(GTK_DEP_LIBS) -+AC_SUBST(GTK_DEP_CFLAGS) -+ -+AC_SUBST(GLIB_PREFIX) -+AC_SUBST(ATK_PREFIX) -+AC_SUBST(PANGO_PREFIX) -+AC_SUBST(CAIRO_PREFIX) -+ -+AC_SUBST(GTK_DEBUG_FLAGS) -+AC_SUBST(GTK_XIM_FLAGS) -+ -+GDK_PIXBUF_LIBS=`$PKG_CONFIG --libs gdk-pixbuf-2.0` -+AC_SUBST(GDK_PIXBUF_LIBS) -+ -+######################## -+# Checks needed for gail -+######################## -+ -+old_LIBS="$LIBS" -+dnl Checks for inet libraries: -+AC_SEARCH_LIBS(gethostent, nsl) -+AC_SEARCH_LIBS(setsockopt, socket) -+AC_SEARCH_LIBS(connect, inet) -+ -+dnl check for the sockaddr_un.sun_len member -+AC_CHECK_MEMBER([struct sockaddr_un.sun_len], -+ [struct_sockaddr_un_sun_len=true], -+ [struct_sockaddr_un_suin_len=false], -+ [#include <sys/types.h> -+ #include <sys/un.h>] -+ ) -+case $struct_sockaddr_un_sun_len in -+ true) -+ AC_DEFINE_UNQUOTED(HAVE_SOCKADDR_UN_SUN_LEN, 1, -+ [Have the sockaddr_un.sun_len member]) -+ ;; -+ *) -+ ;; -+esac -+ -+GAIL_INET_LIBS="$LIBS" -+AC_SUBST([GAIL_INET_LIBS]) -+ -+LIBS="$old_LIBS" -+ -+################################################################ -+# Printing system checks -+################################################################ -+ -+AC_ARG_ENABLE(cups, -+ [AC_HELP_STRING([--disable-cups] -+ [disable cups print backend])],, -+ [enable_cups=auto]) -+ -+if test "x$enable_cups" = "xno"; then -+ AM_CONDITIONAL(HAVE_CUPS, false) -+else -+ AC_PATH_PROG(CUPS_CONFIG, cups-config, no) -+ if test "x$CUPS_CONFIG" = "xno"; then -+ if test "x$enable_cups" = "xauto"; then -+ AM_CONDITIONAL(HAVE_CUPS, false) -+ else -+ AC_MSG_ERROR([ -+*** cups not found. -+]) -+ fi -+ else -+ CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` -+ CUPS_LIBS=`$CUPS_CONFIG --libs` -+ -+ CUPS_API_VERSION=`$CUPS_CONFIG --api-version` -+ CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'` -+ CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'` -+ -+ if test $CUPS_API_MAJOR -gt 1 -o \ -+ $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then -+ AC_DEFINE(HAVE_CUPS_API_1_2, 1, -+ [Define to 1 if CUPS 1.2 API is available]) -+ fi -+ if test $CUPS_API_MAJOR -gt 1 -o \ -+ $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6; then -+ AC_DEFINE(HAVE_CUPS_API_1_6, 1, -+ [Define to 1 if CUPS 1.6 API is available]) -+ -+ fi -+ -+ AC_SUBST(CUPS_API_MAJOR) -+ AC_SUBST(CUPS_API_MINOR) -+ AC_SUBST(CUPS_CFLAGS) -+ AC_SUBST(CUPS_LIBS) -+ -+ AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([[*** Sorry, cups-config present but cups/cups.h missing.]])) -+ -+ AM_CONDITIONAL(HAVE_CUPS, true) -+ -+ gtk_save_cflags="$CFLAGS" -+ CFLAGS="$CUPS_CFLAGS" -+ AC_TRY_COMPILE([#include <cups/http.h>], -+ [http_t http; char *s = http.authstring;], -+ [AC_DEFINE(HAVE_HTTP_AUTHSTRING, [], -+ [Define if cups http_t authstring field is accessible])],) -+ CFLAGS="$gtk_save_cflags" -+ -+ AC_SUBST(HAVE_HTTP_AUTHSTRING) -+ -+ gtk_save_libs="$LIBS" -+ LIBS="$CUPS_LIBS" -+ AC_CHECK_FUNCS(httpGetAuthString) -+ LIBS="$gtk_save_libs" -+ fi -+fi -+ -+# Checks to see if we should compile with PAPI backend for GTK+ -+# -+ -+AC_ARG_ENABLE(papi, -+ [AC_HELP_STRING([--disable-papi] -+ [disable papi print backend])],, -+ [enable_papi=auto]) -+ -+if test "x$enable_papi" = "xno"; then -+ AM_CONDITIONAL(HAVE_PAPI, false) -+else -+ AC_MSG_CHECKING(libpapi) -+ AC_CHECK_LIB(papi, papiServiceCreate, have_papi=yes, have_papi=no) -+ if test $have_papi = yes; then -+ AC_DEFINE([HAVE_PAPI], [], [Define to 1 if libpapi available]) -+ fi -+ AM_CONDITIONAL(HAVE_PAPI, test $have_papi = yes) -+ if test "x$enable_papi" = "xyes" -a "x$have_papi" = "xno"; then -+ AC_MSG_ERROR([ -+*** papi not found. -+]) -+ fi -+fi -+ -+AM_CONDITIONAL(HAVE_PAPI_CUPS, test "x$have_papi" = "xyes" -a "x$CUPS_CONFIG" != "xno") -+ -+gtk_save_cppflags="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS" -+ -+AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([ -+*** Can't find cairo-pdf.h. You must build Cairo with the pdf -+*** backend enabled.])) -+ -+if test "$os_win32" != "yes"; then -+ AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([ -+*** Can't find cairo-ps.h. You must build Cairo with the -+*** postscript backend enabled.])) -+ -+ AC_CHECK_HEADER(cairo-svg.h,,AC_MSG_ERROR([ -+*** Can't find cairo-svg.h. You must build Cairo with the -+*** svg backend enabled.])) -+fi -+ -+CPPFLAGS="$gtk_save_cppflags" -+ -+ -+AC_ARG_ENABLE(test-print-backend, -+ [AC_HELP_STRING([--enable-test-print-backend], -+ [build test print backend])],, -+ [enable_test_print_backend=no]) -+AM_CONDITIONAL(TEST_PRINT_BACKEND, test "x$enable_test_print_backend" != "xno") -+ -+if test "$os_win32" = "yes"; then -+ AC_CHECK_TYPES([IPrintDialogCallback],[],[],[[#include <windows.h>]]) -+fi -+ -+################################################################ -+# Strip -export-dynamic from the link lines of various libraries -+################################################################ -+ -+# -+# pkg-config --libs gmodule includes the "export_dynamic" flag, -+# but this flag is only meaningful for executables. For libraries -+# the effect is undefined; what it causes on Linux is that the -+# export list from -export-symbols-regex is ignored and everything -+# is exported -+# -+# We are using gmodule-no-export now, but I'm leaving the stripping -+# code in place for now, since pango and atk still require gmodule. -+export SED -+export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+if test -n "$export_dynamic"; then -+ GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` -+ GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` -+fi -+ -+################################################## -+# GObject introspection -+################################################## -+ -+GOBJECT_INTROSPECTION_CHECK([0.9.3]) -+ -+################################################## -+# Checks for gtk-doc and docbook-tools -+################################################## -+ -+GTK_DOC_CHECK([1.11]) -+ -+AC_CHECK_PROG(DB2HTML, db2html, true, false) -+AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML) -+ -+AC_ARG_ENABLE(man, -+ [AC_HELP_STRING([--enable-man], -+ [regenerate man pages from Docbook [default=no]])],enable_man=yes, -+ enable_man=no) -+ -+if test "${enable_man}" != no; then -+ dnl -+ dnl Check for xsltproc -+ dnl -+ AC_PATH_PROG([XSLTPROC], [xsltproc]) -+ if test -z "$XSLTPROC"; then -+ enable_man=no -+ fi -+ -+ dnl check for DocBook DTD and stylesheets in the local catalog. -+ JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN], -+ [DocBook XML DTD V4.1.2],,enable_man=no) -+ JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl], -+ [DocBook XSL Stylesheets],,enable_man=no) -+fi -+ -+AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno) -+ -+ -+################################################## -+# Output commands -+################################################## -+ -+AC_CONFIG_COMMANDS([gdk/gdkconfig.h], [ -+ outfile=gdkconfig.h-tmp -+ cat > $outfile <<\_______EOF -+/* gdkconfig.h -+ * -+ * This is a generated file. Please modify `configure.in' -+ */ -+ -+#ifndef GDKCONFIG_H -+#define GDKCONFIG_H -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+#ifndef GSEAL -+/* introduce GSEAL() here for all of Gdk and Gtk+ without the need to modify GLib */ -+# ifdef GSEAL_ENABLE -+# define GSEAL(ident) _g_sealed__ ## ident -+# else -+# define GSEAL(ident) ident -+# endif -+#endif /* !GSEAL */ -+ -+_______EOF -+ -+ cat >>$outfile <<_______EOF -+$gdk_windowing -+$gdk_wc -+_______EOF -+ -+ cat >>$outfile <<_______EOF -+ -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ -+ -+#endif /* GDKCONFIG_H */ -+_______EOF -+ -+ -+ if cmp -s $outfile gdk/gdkconfig.h; then -+ AC_MSG_NOTICE([gdk/gdkconfig.h is unchanged]) -+ rm -f $outfile -+ else -+ mv $outfile gdk/gdkconfig.h -+ fi -+],[ -+if test "x$gdktarget" = "xx11" ; then -+ gdk_windowing=' -+#define GDK_WINDOWING_X11' -+elif test "x$gdktarget" = "xwin32" ; then -+ gdk_windowing=' -+#define GDK_NATIVE_WINDOW_POINTER -+ -+#define GDK_WINDOWING_WIN32' -+elif test "x$gdktarget" = "xquartz" ; then -+ gdk_windowing=' -+#define GDK_WINDOWING_QUARTZ' -+elif test "x$gdktarget" = "xdirectfb" ; then -+ gdk_windowing=' -+#define GDK_WINDOWING_DIRECTFB' -+fi -+ -+if test x$gdk_wchar_h = xyes; then -+ gdk_wc=' -+#define GDK_HAVE_WCHAR_H 1' -+fi -+if test x$gdk_wctype_h = xyes; then -+ gdk_wc="\$gdk_wc -+#define GDK_HAVE_WCTYPE_H 1" -+fi -+if test x$gdk_working_wctype = xno; then -+ gdk_wc="\$gdk_wc -+#define GDK_HAVE_BROKEN_WCTYPE 1" -+fi -+ -+ -+]) -+ -+AC_CONFIG_FILES([ -+config.h.win32 -+gtk-zip.sh -+Makefile -+gdk-2.0.pc -+gtk+-2.0.pc -+gtk+-unix-print-2.0.pc -+gail.pc -+gdk-2.0-uninstalled.pc -+gtk+-2.0-uninstalled.pc -+gail-uninstalled.pc -+m4macros/Makefile -+po/Makefile.in -+po-properties/Makefile.in -+demos/Makefile -+demos/gtk-demo/Makefile -+demos/gtk-demo/geninclude.pl -+tests/Makefile -+docs/Makefile -+docs/reference/Makefile -+docs/reference/gdk/Makefile -+docs/reference/gdk/version.xml -+docs/reference/gtk/Makefile -+docs/reference/gtk/version.xml -+docs/reference/libgail-util/Makefile -+docs/faq/Makefile -+docs/tools/Makefile -+docs/tutorial/Makefile -+build/Makefile -+build/win32/Makefile -+build/win32/vs9/Makefile -+build/win32/vs10/Makefile -+gdk/Makefile -+gdk/x11/Makefile -+gdk/win32/Makefile -+gdk/win32/rc/Makefile -+gdk/win32/rc/gdk.rc -+gdk/quartz/Makefile -+gdk/directfb/Makefile -+gdk/tests/Makefile -+gtk/Makefile -+gtk/makefile.msc -+gtk/gtkversion.h -+gtk/gtk-win32.rc -+gtk/theme-bits/Makefile -+gtk/tests/Makefile -+modules/Makefile -+modules/other/Makefile -+modules/other/gail/Makefile -+modules/other/gail/libgail-util/Makefile -+modules/other/gail/tests/Makefile -+modules/engines/Makefile -+modules/engines/pixbuf/Makefile -+modules/engines/ms-windows/Makefile -+modules/engines/ms-windows/Theme/Makefile -+modules/engines/ms-windows/Theme/gtk-2.0/Makefile -+modules/input/Makefile -+modules/printbackends/Makefile -+modules/printbackends/cups/Makefile -+modules/printbackends/lpr/Makefile -+modules/printbackends/file/Makefile -+modules/printbackends/papi/Makefile -+modules/printbackends/test/Makefile -+perf/Makefile -+]) -+ -+AC_OUTPUT -+ -+echo "configuration: -+ target: $gdktarget" diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.24/run-iconcache.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/run-iconcache.patch deleted file mode 100644 index a4e2254c59..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+-2.24.24/run-iconcache.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -diff -Nurd gtk+-2.24.24/gtk/Makefile.am gtk+-2.24.24/gtk/Makefile.am ---- gtk+-2.24.24/gtk/Makefile.am 2014-06-23 18:08:14.000000000 +0300 -+++ gtk+-2.24.24/gtk/Makefile.am 2014-09-03 23:45:12.669307700 +0300 -@@ -1391,12 +1391,12 @@ - ./gtk-update-icon-cache - endif - --gtkbuiltincache.h: @REBUILD@ stamp-icons -- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) -- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -- --include-image-data \ -- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -- mv gtkbuiltincache.h.tmp gtkbuiltincache.h -+#gtkbuiltincache.h: @REBUILD@ stamp-icons -+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) -+# $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -+# --include-image-data \ -+# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -+# mv gtkbuiltincache.h.tmp gtkbuiltincache.h - - EXTRA_DIST += \ - $(STOCK_ICONS) \ diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.24/doc-fixes.patch b/meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch index 74e479fd1b..74e479fd1b 100644 --- a/meta/recipes-gnome/gtk+/gtk+-2.24.24/doc-fixes.patch +++ b/meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch diff --git a/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch new file mode 100644 index 0000000000..1ae728e70d --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch @@ -0,0 +1,35 @@ +Upstream-Status: Inappropriate [embedded specific] + +Updated to apply to gtk+-2.24.15 + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac +--- gtk+-2.24.15/configure.ac 2013-01-12 20:52:54.000000000 +0200 ++++ gtk+-2.24.15/configure.ac 2013-02-12 21:33:30.689925967 +0200 +@@ -415,7 +415,7 @@ + case $enable_explicit_deps in + auto) + export SED +- deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` ++ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` + if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then + enable_explicit_deps=yes + else +@@ -774,7 +774,7 @@ + dnl Now we check to see if our libtool supports shared lib deps + dnl (in a rather ugly way even) + if $dynworks; then +- module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" ++ module_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config" + module_deplibs_check=`$module_libtool_config | \ + grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ + sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` +@@ -1574,7 +1574,7 @@ + # We are using gmodule-no-export now, but I'm leaving the stripping + # code in place for now, since pango and atk still require gmodule. + export SED +-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + if test -n "$export_dynamic"; then + GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` + GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.24/toggle-font.diff b/meta/recipes-gnome/gtk+/gtk+/toggle-font.diff index 340d12008b..340d12008b 100644 --- a/meta/recipes-gnome/gtk+/gtk+-2.24.24/toggle-font.diff +++ b/meta/recipes-gnome/gtk+/gtk+/toggle-font.diff diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.24/xsettings.patch b/meta/recipes-gnome/gtk+/gtk+/xsettings.patch index d0a970ad4d..d0a970ad4d 100644 --- a/meta/recipes-gnome/gtk+/gtk+-2.24.24/xsettings.patch +++ b/meta/recipes-gnome/gtk+/gtk+/xsettings.patch diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.24.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.25.bb index 7d0a0a2a8d..ada79567e7 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.24.24.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.24.25.bb @@ -6,30 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ file://xsettings.patch \ - file://run-iconcache.patch \ - file://configure-nm.patch \ file://hardcoded_libtool.patch \ - file://cellrenderer-cairo.patch;striplevel=0 \ file://toggle-font.diff;striplevel=0 \ - file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch \ file://doc-fixes.patch \ - file://0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch \ " -# TO MERGE -# file://entry-cairo.patch;striplevel=0 -# file://filesystem-volumes.patch -# file://filechooser-props.patch -# file://filechooser-default.patch -# file://filechooser-sizefix.patch -# temporary -# file://gtklabel-resize-patch -# file://menu-deactivate.patch -# file://combo-arrow-size.patch;striplevel=0 -# file://configurefix.patch - -SRC_URI[md5sum] = "f80ac8aa95ea8482ad89656d0370752e" -SRC_URI[sha256sum] = "12ceb2e198c82bfb93eb36348b6e9293c8fdcd60786763d04cfec7ebe7ed3d6d" +SRC_URI[md5sum] = "612350704dd3aacb95355a4981930c6f" +SRC_URI[sha256sum] = "38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3" EXTRA_OECONF = "--enable-xkb --disable-glibtest --disable-cups --disable-xinerama" diff --git a/meta/recipes-gnome/hicolor-icon-theme/files/index.theme b/meta/recipes-gnome/hicolor-icon-theme/files/index.theme deleted file mode 100644 index 0471bd53f2..0000000000 --- a/meta/recipes-gnome/hicolor-icon-theme/files/index.theme +++ /dev/null @@ -1,1731 +0,0 @@ -[Icon Theme] -Name=Hicolor -Comment=Fallback icon theme -Hidden=true -Directories=16x16/actions,16x16/animations,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/emotes,16x16/filesystems,16x16/intl,16x16/mimetypes,16x16/places,16x16/status,16x16/stock,16x16/stock/chart,16x16/stock/code,16x16/stock/data,16x16/stock/form,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,22x22/actions,22x22/animations,22x22/apps,22x22/categories,22x22/devices,22x22/emblems,22x22/emotes,22x22/filesystems,22x22/intl,22x22/mimetypes,22x22/places,22x22/status,22x22/stock,22x22/stock/chart,22x22/stock/code,22x22/stock/data,22x22/stock/form,22x22/stock/image,22x22/stock/io,22x22/stock/media,22x22/stock/navigation,22x22/stock/net,22x22/stock/object,22x22/stock/table,22x22/stock/text,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/emotes,24x24/filesystems,24x24/intl,24x24/mimetypes,24x24/places,24x24/status,24x24/stock,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/form,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,32x32/actions,32x32/animations,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/emotes,32x32/filesystems,32x32/intl,32x32/mimetypes,32x32/places,32x32/status,32x32/stock,32x32/stock/chart,32x32/stock/code,32x32/stock/data,32x32/stock/form,32x32/stock/image,32x32/stock/io,32x32/stock/media,32x32/stock/navigation,32x32/stock/net,32x32/stock/object,32x32/stock/table,32x32/stock/text,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/emblems,36x36/emotes,36x36/filesystems,36x36/intl,36x36/mimetypes,36x36/places,36x36/status,36x36/stock,36x36/stock/chart,36x36/stock/code,36x36/stock/data,36x36/stock/form,36x36/stock/image,36x36/stock/io,36x36/stock/media,36x36/stock/navigation,36x36/stock/net,36x36/stock/object,36x36/stock/table,36x36/stock/text,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/emotes,48x48/filesystems,48x48/intl,48x48/mimetypes,48x48/places,48x48/status,48x48/stock,48x48/stock/chart,48x48/stock/code,48x48/stock/data,48x48/stock/form,48x48/stock/image,48x48/stock/io,48x48/stock/media,48x48/stock/navigation,48x48/stock/net,48x48/stock/object,48x48/stock/table,48x48/stock/text,64x64/actions,64x64/animations,64x64/apps,64x64/categories,64x64/devices,64x64/emblems,64x64/emotes,64x64/filesystems,64x64/intl,64x64/mimetypes,64x64/places,64x64/status,64x64/stock,64x64/stock/chart,64x64/stock/code,64x64/stock/data,64x64/stock/form,64x64/stock/image,64x64/stock/io,64x64/stock/media,64x64/stock/navigation,64x64/stock/net,64x64/stock/object,64x64/stock/table,64x64/stock/text,72x72/actions,72x72/animations,72x72/apps,72x72/categories,72x72/devices,72x72/emblems,72x72/emotes,72x72/filesystems,72x72/intl,72x72/mimetypes,72x72/places,72x72/status,72x72/stock,72x72/stock/chart,72x72/stock/code,72x72/stock/data,72x72/stock/form,72x72/stock/image,72x72/stock/io,72x72/stock/media,72x72/stock/navigation,72x72/stock/net,72x72/stock/object,72x72/stock/table,72x72/stock/text,96x96/actions,96x96/animations,96x96/apps,96x96/categories,96x96/devices,96x96/emblems,96x96/emotes,96x96/filesystems,96x96/intl,96x96/mimetypes,96x96/places,96x96/status,96x96/stock,96x96/stock/chart,96x96/stock/code,96x96/stock/data,96x96/stock/form,96x96/stock/image,96x96/stock/io,96x96/stock/media,96x96/stock/navigation,96x96/stock/net,96x96/stock/object,96x96/stock/table,96x96/stock/text,128x128/actions,128x128/animations,128x128/apps,128x128/categories,128x128/devices,128x128/emblems,128x128/emotes,128x128/filesystems,128x128/intl,128x128/mimetypes,128x128/places,128x128/status,128x128/stock,128x128/stock/chart,128x128/stock/code,128x128/stock/data,128x128/stock/form,128x128/stock/image,128x128/stock/io,128x128/stock/media,128x128/stock/navigation,128x128/stock/net,128x128/stock/object,128x128/stock/table,128x128/stock/text,192x192/actions,192x192/animations,192x192/apps,192x192/categories,192x192/devices,192x192/emblems,192x192/emotes,192x192/filesystems,192x192/intl,192x192/mimetypes,192x192/places,192x192/status,192x192/stock,192x192/stock/chart,192x192/stock/code,192x192/stock/data,192x192/stock/form,192x192/stock/image,192x192/stock/io,192x192/stock/media,192x192/stock/navigation,192x192/stock/net,192x192/stock/object,192x192/stock/table,192x192/stock/text,scalable/actions,scalable/animations,scalable/apps,scalable/categories,scalable/devices,scalable/emblems,scalable/emotes,scalable/filesystems,scalable/intl,scalable/mimetypes,scalable/places,scalable/status,scalable/stock,scalable/stock/chart,scalable/stock/code,scalable/stock/data,scalable/stock/form,scalable/stock/image,scalable/stock/io,scalable/stock/media,scalable/stock/navigation,scalable/stock/net,scalable/stock/object,scalable/stock/table,scalable/stock/text,12x12/apps,12x12/devices,12x12/filesystems,12x12/hildon,12x12/mimetypes,16x16/hildon,26x26/apps,26x26/devices,26x26/filesystems,26x26/hildon,26x26/mimetypes,34x34/apps,34x34/devices,34x34/filesystems,34x34/hildon,34x34/mimetypes,40x40/apps,40x40/devices,40x40/filesystems,40x40/hildon,40x40/mimetypes,50x50/apps,50x50/devices,50x50/filesystems,50x50/hildon,50x50/mimetypes,250x250/apps,250x250/devices,250x250/filesystems,250x250/hildon,250x250/mimetypes,scalable/hildon - -[12x12/apps] -Size=12 -Context=Applications -Type=Threshold - -[12x12/devices] -Size=12 -Context=Devices -Type=Threshold - -[12x12/filesystems] -Size=12 -Context=FileSystems -Type=Threshold - -[12x12/hildon] -Size=12 -Context=hildon -Type=Threshold - -[12x12/mimetypes] -Size=12 -Context=MimeTypes -Type=Threshold - -[16x16/actions] -Size=16 -Context=Actions -Type=Threshold - -[16x16/animations] -Size=16 -Context=Animations -Type=Threshold - -[16x16/apps] -Size=16 -Context=Applications -Type=Threshold - -[16x16/categories] -Size=16 -Context=Categories -Type=Threshold - -[16x16/devices] -Size=16 -Context=Devices -Type=Threshold - -[16x16/emblems] -Size=16 -Context=Emblems -Type=Threshold - -[16x16/emotes] -Size=16 -Context=Emotes -Type=Threshold - -[16x16/filesystems] -Size=16 -Context=FileSystems -Type=Threshold - -[16x16/hildon] -Size=16 -Context=hildon -Type=Threshold - -[16x16/intl] -Size=16 -Context=International -Type=Threshold - -[16x16/mimetypes] -Size=16 -Context=MimeTypes -Type=Threshold - -[16x16/places] -Size=16 -Context=Places -Type=Threshold - -[16x16/status] -Size=16 -Context=Status -Type=Threshold - -[16x16/stock/chart] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/code] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/data] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/form] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/image] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/io] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/media] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/navigation] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/net] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/object] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/table] -Size=16 -Context=Stock -Type=Threshold - -[16x16/stock/text] -Size=16 -Context=Stock -Type=Threshold - -[22x22/actions] -Size=22 -Context=Actions -Type=Threshold - -[22x22/animations] -Size=22 -Context=Animations -Type=Threshold - -[22x22/apps] -Size=22 -Context=Applications -Type=Fixed - -[22x22/categories] -Size=22 -Context=Categories -Type=Threshold - -[22x22/devices] -Size=22 -Context=Devices -Type=Threshold - -[22x22/emblems] -Size=22 -Context=Emblems -Type=Threshold - -[22x22/emotes] -Size=22 -Context=Emotes -Type=Threshold - -[22x22/filesystems] -Size=22 -Context=FileSystems -Type=Threshold - -[22x22/intl] -Size=22 -Context=International -Type=Threshold - -[22x22/mimetypes] -Size=22 -Context=MimeTypes -Type=Threshold - -[22x22/places] -Size=22 -Context=Places -Type=Threshold - -[22x22/status] -Size=22 -Context=Status -Type=Threshold - -[22x22/stock/chart] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/code] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/data] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/form] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/image] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/io] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/media] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/navigation] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/net] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/object] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/table] -Size=22 -Context=Stock -Type=Threshold - -[22x22/stock/text] -Size=22 -Context=Stock -Type=Threshold - -[24x24/actions] -Size=24 -Context=Actions -Type=Threshold - -[24x24/animations] -Size=24 -Context=Animations -Type=Threshold - -[24x24/apps] -Size=24 -Context=Applications -Type=Threshold - -[24x24/categories] -Size=24 -Context=Categories -Type=Threshold - -[24x24/devices] -Size=24 -Context=Devices -Type=Threshold - -[24x24/emblems] -Size=24 -Context=Emblems -Type=Threshold - -[24x24/emotes] -Size=24 -Context=Emotes -Type=Threshold - -[24x24/filesystems] -Size=24 -Context=FileSystems -Type=Threshold - -[24x24/intl] -Size=24 -Context=International -Type=Threshold - -[24x24/mimetypes] -Size=24 -Context=MimeTypes -Type=Threshold - -[24x24/places] -Size=24 -Context=Places -Type=Threshold - -[24x24/status] -Size=24 -Context=Status -Type=Threshold - -[24x24/stock/chart] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/code] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/data] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/form] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/image] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/io] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/media] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/navigation] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/net] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/object] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/table] -Size=24 -Context=Stock -Type=Threshold - -[24x24/stock/text] -Size=24 -Context=Stock -Type=Threshold - -[26x26/apps] -Size=26 -Context=Applications -Type=Threshold - -[26x26/devices] -Size=26 -Context=Devices -Type=Threshold - -[26x26/filesystems] -Size=26 -Context=FileSystems -Type=Threshold - -[26x26/hildon] -Size=26 -Context=hildon -Type=Threshold - -[26x26/mimetypes] -Size=26 -Context=MimeTypes -Type=Threshold - -[32x32/actions] -Size=32 -Context=Actions -Type=Threshold - -[32x32/animations] -Size=32 -Context=Animations -Type=Threshold - -[32x32/apps] -Size=32 -Context=Applications -Type=Threshold - -[32x32/categories] -Size=32 -Context=Categories -Type=Threshold - -[32x32/devices] -Size=32 -Context=Devices -Type=Threshold - -[32x32/emblems] -Size=32 -Context=Emblems -Type=Threshold - -[32x32/emotes] -Size=32 -Context=Emotes -Type=Threshold - -[32x32/filesystems] -Size=32 -Context=FileSystems -Type=Threshold - -[32x32/intl] -Size=32 -Context=International -Type=Threshold - -[32x32/mimetypes] -Size=32 -Context=MimeTypes -Type=Threshold - -[32x32/places] -Size=32 -Context=Places -Type=Threshold - -[32x32/status] -Size=32 -Context=Status -Type=Threshold - -[32x32/stock/chart] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/code] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/data] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/form] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/image] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/io] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/media] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/navigation] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/net] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/object] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/table] -Size=32 -Context=Stock -Type=Threshold - -[32x32/stock/text] -Size=32 -Context=Stock -Type=Threshold - -[34x34/apps] -Size=34 -Context=Applications -Type=Threshold - -[34x34/devices] -Size=34 -Context=Devices -Type=Threshold - -[34x34/filesystems] -Size=34 -Context=FileSystems -Type=Threshold - -[34x34/hildon] -Size=34 -Context=hildon -Type=Threshold - -[34x34/mimetypes] -Size=34 -Context=MimeTypes -Type=Threshold - -[36x36/actions] -Size=36 -Context=Actions -Type=Threshold - -[36x36/animations] -Size=36 -Context=Animations -Type=Threshold - -[36x36/apps] -Size=36 -Context=Applications -Type=Threshold - -[36x36/categories] -Size=36 -Context=Categories -Type=Threshold - -[36x36/devices] -Size=36 -Context=Devices -Type=Threshold - -[36x36/emblems] -Size=36 -Context=Emblems -Type=Threshold - -[36x36/emotes] -Size=36 -Context=Emotes -Type=Threshold - -[36x36/filesystems] -Size=36 -Context=FileSystems -Type=Threshold - -[36x36/intl] -Size=36 -Context=International -Type=Threshold - -[36x36/mimetypes] -Size=36 -Context=MimeTypes -Type=Threshold - -[36x36/places] -Size=36 -Context=Places -Type=Threshold - -[36x36/status] -Size=36 -Context=Status -Type=Threshold - -[36x36/stock/chart] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/code] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/data] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/form] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/image] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/io] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/media] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/navigation] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/net] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/object] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/table] -Size=36 -Context=Stock -Type=Threshold - -[36x36/stock/text] -Size=36 -Context=Stock -Type=Threshold - -[40x40/apps] -Size=40 -Context=Applications -Type=Threshold - -[40x40/devices] -Size=40 -Context=Devices -Type=Threshold - -[40x40/filesystems] -Size=40 -Context=FileSystems -Type=Threshold - -[40x40/hildon] -Size=40 -Context=hildon -Type=Threshold - -[40x40/mimetypes] -Size=40 -Context=MimeTypes -Type=Threshold - -[48x48/actions] -Size=48 -Context=Actions -Type=Threshold - -[48x48/animations] -Size=48 -Context=Animations -Type=Threshold - -[48x48/apps] -Size=48 -Context=Applications -Type=Threshold - -[48x48/categories] -Size=48 -Context=Categories -Type=Threshold - -[48x48/devices] -Size=48 -Context=Devices -Type=Threshold - -[48x48/emblems] -Size=48 -Context=Emblems -Type=Threshold - -[48x48/emotes] -Size=48 -Context=Emotes -Type=Threshold - -[48x48/filesystems] -Size=48 -Context=FileSystems -Type=Threshold - -[48x48/intl] -Size=48 -Context=International -Type=Threshold - -[48x48/mimetypes] -Size=48 -Context=MimeTypes -Type=Threshold - -[48x48/places] -Size=48 -Context=Places -Type=Threshold - -[48x48/status] -Size=48 -Context=Status -Type=Threshold - -[48x48/stock/chart] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/code] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/data] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/form] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/image] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/io] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/media] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/navigation] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/net] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/object] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/table] -Size=48 -Context=Stock -Type=Threshold - -[48x48/stock/text] -Size=48 -Context=Stock -Type=Threshold - -[50x50/apps] -Size=50 -Context=Applications -Type=Threshold - -[50x50/devices] -Size=50 -Context=Devices -Type=Threshold - -[50x50/filesystems] -Size=50 -Context=FileSystems -Type=Threshold - -[50x50/hildon] -Size=50 -Context=hildon -Type=Threshold - -[50x50/mimetypes] -Size=50 -Context=MimeTypes -Type=Threshold - -[64x64/actions] -Size=64 -Context=Actions -Type=Threshold - -[64x64/animations] -Size=64 -Context=Animations -Type=Threshold - -[64x64/apps] -Size=64 -Context=Applications -Type=Threshold - -[64x64/categories] -Size=64 -Context=Categories -Type=Threshold - -[64x64/devices] -Size=64 -Context=Devices -Type=Threshold - -[64x64/emblems] -Size=64 -Context=Emblems -Type=Threshold - -[64x64/emotes] -Size=64 -Context=Emotes -Type=Threshold - -[64x64/filesystems] -Size=64 -Context=FileSystems -Type=Threshold - -[64x64/intl] -Size=64 -Context=International -Type=Threshold - -[64x64/mimetypes] -Size=64 -Context=MimeTypes -Type=Threshold - -[64x64/places] -Size=64 -Context=Places -Type=Threshold - -[64x64/status] -Size=64 -Context=Status -Type=Threshold - -[64x64/stock/chart] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/code] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/data] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/form] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/image] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/io] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/media] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/navigation] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/net] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/object] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/table] -Size=64 -Context=Stock -Type=Threshold - -[64x64/stock/text] -Size=64 -Context=Stock -Type=Threshold -[72x72/actions] -Size=72 -Context=Actions -Type=Threshold - -[72x72/animations] -Size=72 -Context=Animations -Type=Threshold - -[72x72/apps] -Size=72 -Context=Applications -Type=Threshold - -[72x72/categories] -Size=72 -Context=Categories -Type=Threshold - -[72x72/devices] -Size=72 -Context=Devices -Type=Threshold - -[72x72/emblems] -Size=72 -Context=Emblems -Type=Threshold - -[72x72/emotes] -Size=72 -Context=Emotes -Type=Threshold - -[72x72/filesystems] -Size=72 -Context=FileSystems -Type=Threshold - -[72x72/intl] -Size=72 -Context=International -Type=Threshold - -[72x72/mimetypes] -Size=72 -Context=MimeTypes -Type=Threshold - -[72x72/places] -Size=72 -Context=Places -Type=Threshold - -[72x72/status] -Size=72 -Context=Status -Type=Threshold - -[72x72/stock/chart] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/code] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/data] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/form] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/image] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/io] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/media] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/navigation] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/net] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/object] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/table] -Size=72 -Context=Stock -Type=Threshold - -[72x72/stock/text] -Size=72 -Context=Stock -Type=Threshold - -[96x96/actions] -Size=96 -Context=Actions -Type=Threshold - -[96x96/animations] -Size=96 -Context=Animations -Type=Threshold - -[96x96/apps] -Size=96 -Context=Applications -Type=Threshold - -[96x96/categories] -Size=96 -Context=Categories -Type=Threshold - -[96x96/devices] -Size=96 -Context=Devices -Type=Threshold - -[96x96/emblems] -Size=96 -Context=Emblems -Type=Threshold - -[96x96/emotes] -Size=96 -Context=Emotes -Type=Threshold - -[96x96/filesystems] -Size=96 -Context=FileSystems -Type=Threshold - -[96x96/intl] -Size=96 -Context=International -Type=Threshold - -[96x96/mimetypes] -Size=96 -Context=MimeTypes -Type=Threshold - -[96x96/places] -Size=96 -Context=Places -Type=Threshold - -[96x96/status] -Size=96 -Context=Status -Type=Threshold - -[96x96/stock/chart] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/code] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/data] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/form] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/image] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/io] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/media] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/navigation] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/net] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/object] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/table] -Size=96 -Context=Stock -Type=Threshold - -[96x96/stock/text] -Size=96 -Context=Stock -Type=Threshold - -[128x128/actions] -Size=128 -Context=Actions -Type=Threshold - -[128x128/animations] -Size=128 -Context=Animations -Type=Threshold - -[128x128/apps] -Size=128 -Context=Applications -Type=Threshold - -[128x128/categories] -Size=128 -Context=Categories -Type=Threshold - -[128x128/devices] -Size=128 -Context=Devices -Type=Threshold - -[128x128/emblems] -Size=128 -Context=Emblems -Type=Threshold - -[128x128/emotes] -Size=128 -Context=Emotes -Type=Threshold - -[128x128/filesystems] -Size=128 -Context=FileSystems -Type=Threshold - -[128x128/intl] -Size=128 -Context=International -Type=Threshold - -[128x128/mimetypes] -Size=128 -Context=MimeTypes -Type=Threshold - -[128x128/places] -Size=128 -Context=Places -Type=Threshold - -[128x128/status] -Size=128 -Context=Status -Type=Threshold - -[128x128/stock/chart] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/code] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/data] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/form] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/image] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/io] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/media] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/navigation] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/net] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/object] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/table] -Size=128 -Context=Stock -Type=Threshold - -[128x128/stock/text] -Size=128 -Context=Stock -Type=Threshold - -[192x192/actions] -Size=192 -Context=Actions -Type=Threshold - -[192x192/animations] -Size=192 -Context=Animations -Type=Threshold - -[192x192/apps] -Size=192 -Context=Applications -Type=Threshold - -[192x192/categories] -Size=192 -Context=Categories -Type=Threshold - -[192x192/devices] -Size=192 -Context=Devices -Type=Threshold - -[192x192/emblems] -Size=192 -Context=Emblems -Type=Threshold - -[192x192/emotes] -Size=192 -Context=Emotes -Type=Threshold - -[192x192/filesystems] -Size=192 -Context=FileSystems -Type=Threshold - -[192x192/intl] -Size=192 -Context=International -Type=Threshold - -[192x192/mimetypes] -Size=192 -Context=MimeTypes -Type=Threshold - -[192x192/places] -Size=192 -Context=Places -Type=Threshold - -[192x192/status] -Size=192 -Context=Status -Type=Threshold - -[192x192/stock/chart] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/code] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/data] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/form] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/image] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/io] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/media] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/navigation] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/net] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/object] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/table] -Size=192 -Context=Stock -Type=Threshold - -[192x192/stock/text] -Size=192 -Context=Stock -Type=Threshold - -[250x250/apps] -Size=250 -Context=Applications -Type=Threshold - -[250x250/devices] -Size=250 -Context=Devices -Type=Threshold - -[250x250/filesystems] -Size=250 -Context=FileSystems -Type=Threshold - -[250x250/hildon] -Size=250 -Context=hildon -Type=Threshold - -[250x250/mimetypes] -Size=250 -Context=MimeTypes -Type=Threshold - -[scalable/actions] -MinSize=1 -Size=128 -MaxSize=256 -Context=Actions -Type=Scalable - -[scalable/animations] -MinSize=1 -Size=128 -MaxSize=256 -Context=Animations -Type=Scalable - -[scalable/apps] -MinSize=1 -Size=128 -MaxSize=256 -Context=Applications -Type=Scalable - -[scalable/categories] -MinSize=1 -Size=128 -MaxSize=256 -Context=Categories -Type=Scalable - -[scalable/devices] -MinSize=1 -Size=128 -MaxSize=256 -Context=Devices -Type=Scalable - -[scalable/emblems] -MinSize=1 -Size=128 -MaxSize=256 -Context=Emblems -Type=Scalable - -[scalable/emotes] -MinSize=1 -Size=128 -MaxSize=256 -Context=Emotes -Type=Scalable - -[scalable/filesystems] -MinSize=1 -Size=128 -MaxSize=256 -Context=FileSystems -Type=Scalable - -[scalable/hildon] -MinSize=1 -Size=128 -MaxSize=256 -Context=hildon -Type=Scalable - -[scalable/intl] -MinSize=1 -Size=128 -MaxSize=256 -Context=International -Type=Scalable - -[scalable/mimetypes] -MinSize=1 -Size=128 -MaxSize=256 -Context=MimeTypes -Type=Scalable - -[scalable/places] -MinSize=1 -Size=128 -MaxSize=256 -Context=Places -Type=Scalable - -[scalable/status] -MinSize=1 -Size=128 -MaxSize=256 -Context=Status -Type=Scalable - -[scalable/stock/chart] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/code] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/data] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/form] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/image] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/io] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/media] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/navigation] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/net] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/object] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/table] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[scalable/stock/text] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable - -[12x12/stock] -Size=12 -Context=Stock -Type=Threshold - -[16x16/stock] -Size=16 -Context=Stock -Type=Threshold - -[22x22/stock] -Size=22 -Context=Stock -Type=Threshold - -[24x24/stock] -Size=24 -Context=Stock -Type=Threshold - -[26x26/stock] -Size=26 -Context=Stock -Type=Threshold - -[32x32/stock] -Size=32 -Context=Stock -Type=Threshold - -[34x34/stock] -Size=34 -Context=Stock -Type=Threshold - -[36x36/stock] -Size=36 -Context=Stock -Type=Threshold - -[48x48/stock] -Size=48 -Context=Stock -Type=Threshold - -[64x64/stock] -Size=64 -Context=Stock -Type=Threshold - -[72x72/stock] -Size=72 -Context=Stock -Type=Threshold - -[96x96/stock] -Size=96 -Context=Stock -Type=Threshold - -[128x128/stock] -Size=128 -Context=Stock -Type=Threshold - -[192x192/stock] -Size=192 -Context=Stock -Type=Threshold - -[scalable/stock] -MinSize=1 -Size=128 -MaxSize=256 -Context=Stock -Type=Scalable diff --git a/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.13.bb b/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.14.bb index 9df81cbb16..9cb8056655 100644 --- a/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.13.bb +++ b/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.14.bb @@ -5,19 +5,10 @@ BUGTRACKER = "https://bugs.freedesktop.org/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=f08a446809913fc9b3c718f0eaea0426" -SECTION = "unknown" -inherit gnomebase allarch autotools-brokensep +SRC_URI = "http://icon-theme.freedesktop.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "56d2c6c3a9df5a0acd332430e3f3ae3e" +SRC_URI[sha256sum] = "7bed06e6ef316318274bda0fdaf39fce960e4222a0165c968d84acb428902ecd" -PR = "r1" - -SRC_URI = "http://icon-theme.freedesktop.org/releases/${BPN}-${PV}.tar.gz \ - file://index.theme" - -SRC_URI[md5sum] = "21d0f50aa6b8eef02846cda9e5e9324c" -SRC_URI[sha256sum] = "a38b038915480d1ddd4e3c421562560a14d42ace0449a5acc07c50f57f9c3406" +inherit allarch autotools FILES_${PN} += "${datadir}/icons" - -do_install_append () { - install -m 0644 ${WORKDIR}/index.theme ${D}/${datadir}/icons/hicolor -} diff --git a/meta/recipes-gnome/json-glib/json-glib_1.0.0.bb b/meta/recipes-gnome/json-glib/json-glib_1.0.2.bb index ce007094b4..0c25deca74 100644 --- a/meta/recipes-gnome/json-glib/json-glib_1.0.0.bb +++ b/meta/recipes-gnome/json-glib/json-glib_1.0.2.bb @@ -12,8 +12,8 @@ DEPENDS = "glib-2.0" GNOME_COMPRESS_TYPE = "xz" -SRC_URI[archive.md5sum] = "d13485f5aa3b93227bbeb689ccfb596c" -SRC_URI[archive.sha256sum] = "dbf558d2da989ab84a27e4e13daa51ceaa97eb959c2c2f80976c9322a8f4cdde" +SRC_URI[archive.md5sum] = "e43efaf6852958207982e79141bf371e" +SRC_URI[archive.sha256sum] = "887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a" inherit gnome gettext lib_package diff --git a/meta/recipes-gnome/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch b/meta/recipes-gnome/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch new file mode 100644 index 0000000000..db96e63547 --- /dev/null +++ b/meta/recipes-gnome/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch @@ -0,0 +1,32 @@ +From a5efaa96fd934eb245c234a5275fcf62698ef986 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 2 Apr 2015 21:38:03 -0700 +Subject: [PATCH] mips: Use compiler internal define for linux + +__linux__ is defined by compiler when building for +linux platforms, lets use it + + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/mips/ffitarget.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mips/ffitarget.h b/src/mips/ffitarget.h +index 717d659..6faa358 100644 +--- a/src/mips/ffitarget.h ++++ b/src/mips/ffitarget.h +@@ -32,7 +32,7 @@ + #error "Please do not include ffitarget.h directly into your source. Use ffi.h instead." + #endif + +-#ifdef linux ++#ifdef __linux__ + # include <asm/sgidefs.h> + #elif defined(__rtems__) + /* +-- +2.1.4 + diff --git a/meta/recipes-gnome/libffi/libffi_3.1.bb b/meta/recipes-gnome/libffi/libffi_3.2.1.bb index bc97aba20b..fd916caf7e 100644 --- a/meta/recipes-gnome/libffi/libffi_3.1.bb +++ b/meta/recipes-gnome/libffi/libffi_3.2.1.bb @@ -10,10 +10,12 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3610bb17683a0089ed64055416b2ae1b" SRC_URI = "ftp://sourceware.org/pub/libffi/${BP}.tar.gz \ - file://fix-libffi.la-location.patch" + file://fix-libffi.la-location.patch \ + file://0001-mips-Use-compiler-internal-define-for-linux.patch \ + " -SRC_URI[md5sum] = "f5898b29bbfd70502831a212d9249d10" -SRC_URI[sha256sum] = "97feeeadca5e21870fa4433bc953d1b3af3f698d5df8a428f68b73cd60aef6eb" +SRC_URI[md5sum] = "83b89587607e3eb65c70d361f13bab43" +SRC_URI[sha256sum] = "d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37" EXTRA_OECONF += "--disable-builddir" diff --git a/meta/recipes-gnome/librsvg/librsvg/vapigen.m4 b/meta/recipes-gnome/librsvg/librsvg/vapigen.m4 deleted file mode 100644 index f2df12f23f..0000000000 --- a/meta/recipes-gnome/librsvg/librsvg/vapigen.m4 +++ /dev/null @@ -1,96 +0,0 @@ -dnl vapigen.m4 -dnl -dnl Copyright 2012 Evan Nemerson -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -# VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND-INTROSPECTION], [DEFAULT]) -# -------------------------------------- -# Check vapigen existence and version -# -# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation -AC_DEFUN([VAPIGEN_CHECK], -[ - AC_BEFORE([GOBJECT_INTROSPECTION_CHECK],[$0]) - AC_BEFORE([GOBJECT_INTROSPECTION_REQUIRE],[$0]) - - AC_ARG_ENABLE([vala], - [AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]],[build Vala bindings @<:@default=]ifelse($4,,auto,$4)[@:>@])],,[ - AS_IF([test "x$4" = "x"], [ - enable_vala=auto - ], [ - enable_vala=$4 - ]) - ]) - - AS_CASE([$enable_vala], [no], [enable_vala=no], - [yes], [ - AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [ - AC_MSG_ERROR([Vala bindings require GObject Introspection]) - ]) - ], [auto], [ - AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [ - enable_vala=no - ]) - ], [ - AC_MSG_ERROR([Invalid argument passed to --enable-vala, should be one of @<:@no/auto/yes@:>@]) - ]) - - AS_IF([test "x$2" = "x"], [ - vapigen_pkg_name=vapigen - ], [ - vapigen_pkg_name=vapigen-$2 - ]) - AS_IF([test "x$1" = "x"], [ - vapigen_pkg="$vapigen_pkg_name" - ], [ - vapigen_pkg="$vapigen_pkg_name >= $1" - ]) - - PKG_PROG_PKG_CONFIG - - PKG_CHECK_EXISTS([$vapigen_pkg], [ - AS_IF([test "$enable_vala" = "auto"], [ - enable_vala=yes - ]) - ], [ - AS_CASE([$enable_vala], [yes], [ - AC_MSG_ERROR([$vapigen_pkg not found]) - ], [auto], [ - enable_vala=no - ]) - ]) - - AC_MSG_CHECKING([for vala]) - - AS_CASE([$enable_vala], - [yes], [ - VAPIGEN=`$PKG_CONFIG --variable=vapigen vapigen` - VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir vapigen`/vala/Makefile.vapigen - AS_IF([test "x$2" = "x"], [ - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir vapigen` - ], [ - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned vapigen` - ]) - ]) - - AC_MSG_RESULT([$enable_vala]) - - AC_SUBST([VAPIGEN]) - AC_SUBST([VAPIGEN_VAPIDIR]) - AC_SUBST([VAPIGEN_MAKEFILE]) - - AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$enable_vala" = "xyes") -]) diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.2.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.6.bb index e2b26f5ae7..483d30980f 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.40.2.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.40.6.bb @@ -14,11 +14,10 @@ inherit autotools pkgconfig gnomebase gtk-doc pixbufcache GNOME_COMPRESS_TYPE = "xz" -SRC_URI += "file://gtk-option.patch \ - file://vapigen.m4" +SRC_URI += "file://gtk-option.patch" -SRC_URI[archive.md5sum] = "acdecdb9f08f3bf662a68bf7dafb8b82" -SRC_URI[archive.sha256sum] = "48049b643294636df7de1a4b997414d699666f5dc44776945c218a257d2a291c" +SRC_URI[archive.md5sum] = "259fd160b47ec11f3c27d7e18e507c99" +SRC_URI[archive.sha256sum] = "8af349f241677b04b7a1ea6b9b33a6343e781bcccc8a09d00208a47342584f06" EXTRA_OECONF = "--disable-introspection --disable-vala" @@ -32,15 +31,6 @@ PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gdk-p # GTK+ test application (rsvg-view) PACKAGECONFIG[gtk] = "--with-gtk3,--without-gtk3,gtk+3" -# The tarball doesn't ship with macros, so drop a vapigen in there so we don't -# need to build vala to configure. -do_configure_prepend() { - if test ! -e ${S}/m4/vapigen.m4; then - mkdir --parents ${S}/m4 - mv ${WORKDIR}/vapigen.m4 ${S}/m4/ - fi -} - do_install_append() { # Loadable modules don't need .a or .la on Linux rm -f ${D}${libdir}/gdk-pixbuf-2.0/*/loaders/*.a ${D}${libdir}/gdk-pixbuf-2.0/*/loaders/*.la diff --git a/meta/recipes-graphics/cairo/cairo/0001-Remove-LTO-support.patch b/meta/recipes-graphics/cairo/cairo/0001-Remove-LTO-support.patch deleted file mode 100644 index 87297b25b4..0000000000 --- a/meta/recipes-graphics/cairo/cairo/0001-Remove-LTO-support.patch +++ /dev/null @@ -1,60 +0,0 @@ -From bdf15c249130568093676ed3b6c91f6f5e06f089 Mon Sep 17 00:00:00 2001 -From: Uli Schlachter <psychon@znc.in> -Date: Mon, 21 Jul 2014 17:10:16 +0200 -Subject: [PATCH] Remove LTO support - -This just never worked too well and caused too many issues. I don't think anyone -will miss this. - -As mentioned in the below bug report, proper LTO support also requires using -special versions of ranlib, nm and ar which support the LTO object files. -Otherwise, calling the normal ranlib on an .a library breaks the list of -exported symbols and thus completely breaks the static library. - -This (partly) reverts the following commits: - -c3645d97ebd24c6f7ad850785d585aebc706a11c configure.ac: Add a --disable-lto configure option -d486ea30f1a58640a1178de74f705a73845b1cda configure: Conditionally include -flto -0870c6fb5b39dcc04fa376123848adde2d06d2ce gcc-4.5 warnings and optimisation flags. - -(The last commit is the one which brought us -flto in the first place even -though it doesn't talk about this. It's also the one which is only reverted -partly.) - -Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=77060 -CC: Chris Wilson <chris@chris-wilson.co.uk> -Signed-off-by: Uli Schlachter <psychon@znc.in> -Reviewed-by: Bryce Harrington <b.harrington@samsung.com> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> - -Upstream-Status: Backport (will be in 1.14*) -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - build/configure.ac.warnings | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings -index f984eb2..2c4e34d 100644 ---- a/build/configure.ac.warnings -+++ b/build/configure.ac.warnings -@@ -35,17 +35,6 @@ MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \ - - dnl We also abuse the warning-flag facility to enable other compiler - dnl options. Namely, the following: -- --dnl -flto working really needs a test link, not just a compile -- --safe_MAYBE_WARN="$MAYBE_WARN" --MAYBE_WARN="$MAYBE_WARN -flto" --AC_TRY_LINK([],[ -- int main(int argc, char **argv) { return 0; } --],[],[ -- MAYBE_WARN="$safe_MAYBE_WARN" --]) -- - MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common" - - dnl Also to turn various gcc/glibc-specific preprocessor checks --- -2.0.2 - diff --git a/meta/recipes-graphics/cairo/cairo_1.12.16.bb b/meta/recipes-graphics/cairo/cairo_1.12.18.bb index 42f7682607..fd0bd8c36d 100644 --- a/meta/recipes-graphics/cairo/cairo_1.12.16.bb +++ b/meta/recipes-graphics/cairo/cairo_1.12.18.bb @@ -2,12 +2,10 @@ require cairo.inc LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" -SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \ - file://0001-Remove-LTO-support.patch \ -" +SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz" -SRC_URI[md5sum] = "a1304edcdc99282f478b995ee5f8f854" -SRC_URI[sha256sum] = "2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846" +SRC_URI[md5sum] = "8e4ff32b82c3b39387eb6f5c59ef848e" +SRC_URI[sha256sum] = "dc59f0b7ac945ce4e138a03c227a29260915a8b05a4226c1f6f1be586ba7f5b6" PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc index 77035d746f..da21cee8b5 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -2,7 +2,7 @@ SUMMARY = "Graphics library for creating hardware-accelerated user interfaces" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPLv2.1+" -inherit clutter +inherit clutter ptest-gnome DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0" PACKAGE_BEFORE_PN += "${PN}-examples" @@ -33,12 +33,15 @@ PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,${E PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland" # Default configuration, distros might want to override -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ +PACKAGECONFIG ??= "egl \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" FILES_${PN}-dbg += "${libdir}/clutter/examples/.debug" FILES_${PN}-examples = "${libdir}/clutter/examples" +FILES_${PN}-dbg += "${libexecdir}/installed-tests/.debug" + do_configure_prepend() { # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this touch -t 200001010000 ${S}/po/clutter-1.0.pot diff --git a/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch b/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch new file mode 100644 index 0000000000..80acab867c --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch @@ -0,0 +1,20 @@ +Configure output from installed-tests to be TAP compliant, such that gnome-desktop-testing-runner properly interprets the results. + +Upstream-status: Pending + +Signed-off-by: Tim Orling <TicoTimo@gmail.com> + +Index: clutter-1.20.0/build/autotools/glib-tap.mk +=================================================================== +--- clutter-1.20.0.orig/build/autotools/glib-tap.mk ++++ clutter-1.20.0/build/autotools/glib-tap.mk +@@ -128,7 +128,8 @@ installed_test_meta_DATA = $(installed_t + $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ + echo 'Type=session' >> $@.tmp; \ + echo 'TestEnvironment=G_ENABLE_DIAGNOSTIC=0;CLUTTER_ENABLE_DIAGNOSTIC=0;' >> $@.tmp; \ +- echo 'Exec=$(installed_testdir)/$<' >> $@.tmp; \ ++ echo 'Exec=$(installed_testdir)/$< --tap' >> $@.tmp; \ ++ echo 'Output=TAP' >> $@.tmp; \ + mv $@.tmp $@) + + CLEANFILES += $(installed_test_meta_DATA) diff --git a/meta/recipes-graphics/clutter/clutter-1.0/run-ptest b/meta/recipes-graphics/clutter/clutter-1.0/run-ptest new file mode 100644 index 0000000000..98877e5226 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0/run-ptest @@ -0,0 +1,3 @@ +#! /bin/sh + +gnome-desktop-testing-runner clutter diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb deleted file mode 100644 index 452e7eefd0..0000000000 --- a/meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require clutter-1.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI[archive.md5sum] = "471f5ea423e20d4140c7771873daef29" -SRC_URI[archive.sha256sum] = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63" - -SRC_URI += "file://install-examples.patch" diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb new file mode 100644 index 0000000000..5f39a3a8ac --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb @@ -0,0 +1,10 @@ +require clutter-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[archive.md5sum] = "a8a33a57a944c6d7c7c013ce9aa3222b" +SRC_URI[archive.sha256sum] = "cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293" + +SRC_URI += "file://install-examples.patch \ + file://run-installed-tests-with-tap-output.patch \ + file://run-ptest" diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc index b763dd5ba8..af06484903 100644 --- a/meta/recipes-graphics/cogl/cogl-1.0.inc +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -42,7 +42,7 @@ PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDE # EGL backends PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}" PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform" -PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11}" +PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11} ${EDEPENDS_EGL}" PACKAGECONFIG[egl-wayland] = "--enable-wayland-egl-platform,--disable-wayland-egl-platform,${EDEPENDS_WAYLAND}" # Wayland (server-side) @@ -55,7 +55,9 @@ PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango" # default. PACKAGECONFIG ??= "cogl-pango gles2 \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx egl-x11', '', d)} \ + " + FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" FILES_libcogl = "${libdir}/libcogl${SOLIBS}" @@ -69,18 +71,18 @@ FILES_libcogl-gles2 = "${libdir}/libcogl-gles2${SOLIBS}" FILES_libcogl-gles2-dev = "${includedir}/cogl/cogl-gles2 \ ${libdir}/libcogl-gles2${SOLIBSDEV} \ ${libdir}/libcogl-gles2.la \ - ${libdir}/pkgconfig/cogl-gles2-experimental.pc" + ${libdir}/pkgconfig/cogl-gles2-*.pc" FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS}" FILES_libcogl-pango-dev = "${includedir}/cogl/cogl-pango \ ${libdir}/libcogl-pango${SOLIBSDEV} \ ${libdir}/libcogl-pango.la \ - ${libdir}/pkgconfig/cogl-pango-1.0.pc" + ${libdir}/pkgconfig/cogl-pango-*.pc" FILES_libcogl-path = "${libdir}/libcogl-path${SOLIBS}" FILES_libcogl-path-dev = "${includedir}/cogl/cogl-path \ ${libdir}/libcogl-path${SOLIBSDEV} \ ${libdir}/libcogl-path.la \ - ${libdir}/pkgconfig/cogl-path-1.0.pc" + ${libdir}/pkgconfig/cogl-path-*.pc" # For backwards compatibility after Debian-renaming RPROVIDES_libcogl = "cogl-1.0" diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc index 669c0ffd9d..13495b167d 100644 --- a/meta/recipes-graphics/directfb/directfb.inc +++ b/meta/recipes-graphics/directfb/directfb.inc @@ -9,7 +9,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589" HOMEPAGE = "http://directfb.org" -DEPENDS = "jpeg libpng freetype zlib tslib" +DEPENDS = "jpeg libpng freetype zlib tslib sysfsutils" SRC_URI = "http://www.directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${PV}.tar.gz \ file://configurefix.patch \ @@ -31,12 +31,13 @@ PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" EXTRA_OECONF = "\ --with-gfxdrivers=none \ - --enable-libmpeg3=no \ --enable-freetype=yes \ - --enable-sdl=no \ - --enable-vnc=no \ - --disable-x11 \ + --enable-zlib \ + --disable-imlib2 \ --disable-mesa \ + --disable-sdl \ + --disable-vnc \ + --disable-x11 \ " #Once -fno-omit-frame-pointer option of gcc is added into TARGET_CLFAGS as default diff --git a/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch b/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch deleted file mode 100644 index 94a9ba5f02..0000000000 --- a/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix out of tree builds - -Upstream-Status: Pending - -RP 2013/03/21 - -Index: DirectFB-1.6.1/configure.in -=================================================================== ---- DirectFB-1.6.1.orig/configure.in 2013-03-19 01:38:28.174004720 +0000 -+++ DirectFB-1.6.1/configure.in 2013-03-21 12:18:10.253113675 +0000 -@@ -111,7 +111,7 @@ - AC_PATH_TOOL(FLUXCOMP, fluxcomp) - AC_SUBST(FLUXCOMP) - if test -z "$FLUXCOMP"; then -- if ! test -e src/core/CoreDFB.cpp; then -+ if ! test -e $srcdir/src/core/CoreDFB.cpp; then - AC_MSG_ERROR([ - *** DirectFB compilation requires fluxcomp *** - diff --git a/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch b/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch deleted file mode 100644 index 443df5a9da..0000000000 --- a/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch +++ /dev/null @@ -1,345 +0,0 @@ -Rename __no_instrument_function__ macro to avoid conficting redefinitions -of the same symbol. - -Upstream-Status: Pending -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> - -Index: DirectFB-1.6.1/lib/direct/clock.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/clock.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/clock.c 2013-01-05 18:03:24.000000000 +0200 -@@ -36,28 +36,28 @@ - - /**********************************************************************************************************************/ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - long long - direct_clock_get_micros( void ) - { - return direct_clock_get_time( DIRECT_CLOCK_SESSION ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - long long - direct_clock_get_millis( void ) - { - return direct_clock_get_time( DIRECT_CLOCK_SESSION ) / 1000LL; - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - long long - direct_clock_get_abs_micros( void ) - { - return direct_clock_get_time( DIRECT_CLOCK_REALTIME ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - long long - direct_clock_get_abs_millis( void ) - { -Index: DirectFB-1.6.1/lib/direct/debug.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/debug.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/debug.c 2013-01-05 18:03:49.000000000 +0200 -@@ -48,7 +48,7 @@ - - #if DIRECT_BUILD_DEBUGS /* Build with debug support? */ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_debug_log( DirectLogDomain *domain, - unsigned int debug_level, /* 1-9, 0 = info */ -@@ -63,7 +63,7 @@ - va_end( ap ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_debug_at( DirectLogDomain *domain, - const char *format, ... ) -@@ -77,7 +77,7 @@ - - #endif /* DIRECT_BUILD_DEBUGS */ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_debug_at_always( DirectLogDomain *domain, - const char *format, ... ) -@@ -93,7 +93,7 @@ - - #if DIRECT_BUILD_DEBUGS /* Build with debug support? */ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_break( const char *func, - const char *file, -@@ -123,7 +123,7 @@ - direct_trap( "Break", SIGABRT ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_assertion( const char *exp, - const char *func, -@@ -144,7 +144,7 @@ - direct_trap( "Assertion", SIGTRAP ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_assumption( const char *exp, - const char *func, -Index: DirectFB-1.6.1/lib/direct/interface.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/interface.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/interface.c 2013-01-05 18:04:56.000000000 +0200 -@@ -522,7 +522,7 @@ - - /**************************************************************************************************/ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - static InterfaceDesc * - allocate_interface_desc( void ) - { -@@ -543,7 +543,7 @@ - return &alloc_list[alloc_count++]; - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - static __inline__ void - fill_interface_desc( InterfaceDesc *desc, - const void *interface_ptr, -@@ -565,7 +565,7 @@ - - /**************************************************************************************************/ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_dbg_interface_add( const char *func, - const char *file, -@@ -586,7 +586,7 @@ - direct_mutex_unlock( &alloc_lock ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_dbg_interface_remove( const char *func, - const char *file, -Index: DirectFB-1.6.1/lib/direct/log.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/log.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/log.c 2013-01-05 18:04:18.000000000 +0200 -@@ -128,7 +128,7 @@ - return DR_OK; - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - DirectResult - direct_log_printf( DirectLog *log, - const char *format, ... ) -@@ -197,7 +197,7 @@ - return DR_OK; - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_log_lock( DirectLog *log ) - { -@@ -211,7 +211,7 @@ - direct_mutex_lock( &log->lock ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_log_unlock( DirectLog *log ) - { -@@ -262,7 +262,7 @@ - - /**********************************************************************************************************************/ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - DirectLog * - direct_log_default( void ) - { -Index: DirectFB-1.6.1/lib/direct/log_domain.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/log_domain.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/log_domain.c 2013-01-05 18:04:38.000000000 +0200 -@@ -69,7 +69,7 @@ - - /**********************************************************************************************************************/ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - static __inline__ LogDomainEntry * - lookup_domain( const char *name, bool sub ); - -@@ -104,7 +104,7 @@ - return NULL; - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - static DirectLogLevel - check_domain( DirectLogDomain *domain ); - -@@ -207,7 +207,7 @@ - /* FIXME: merge following */ - - --__no_instrument_function__ -+__dfb_no_instrument_function__ - DirectResult - direct_log_domain_vprintf( DirectLogDomain *domain, - DirectLogLevel level, -@@ -268,7 +268,7 @@ - return DR_OK; - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - DirectResult - direct_log_domain_log( DirectLogDomain *domain, - DirectLogLevel level, -Index: DirectFB-1.6.1/lib/direct/mem.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/mem.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/mem.c 2013-01-05 18:03:08.000000000 +0200 -@@ -121,7 +121,7 @@ - - /**********************************************************************************************************************/ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - static __inline__ MemDesc * - fill_mem_desc( MemDesc *desc, int bytes, const char *func, const char *file, int line, DirectTraceBuffer *trace ) - { -Index: DirectFB-1.6.1/lib/direct/messages.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/messages.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/messages.c 2013-01-05 18:02:57.000000000 +0200 -@@ -40,7 +40,7 @@ - - #if DIRECT_BUILD_TEXT - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_info( const char *format, ... ) - { -@@ -57,7 +57,7 @@ - direct_log_printf( NULL, "(*) %s", buf ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_error( const char *format, ... ) - { -@@ -76,7 +76,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_derror( DirectResult result, const char *format, ... ) - { -@@ -95,7 +95,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_perror( int erno, const char *format, ... ) - { -@@ -114,7 +114,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_dlerror( const char *dlerr, const char *format, ... ) - { -@@ -133,7 +133,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_once( const char *func, - const char *file, -@@ -155,7 +155,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_unimplemented( const char *func, - const char *file, -@@ -166,7 +166,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_bug( const char *func, - const char *file, -@@ -188,7 +188,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_warn( const char *func, - const char *file, -Index: DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/os/linux/glibc/types.h 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h 2013-01-05 18:06:04.000000000 +0200 -@@ -74,7 +74,7 @@ - - #define __inline__ inline - #define D_UNUSED __attribute__((unused)) --#define __no_instrument_function__ __attribute__((no_instrument_function)) -+#define __dfb_no_instrument_function__ __attribute__((no_instrument_function)) - #define __constructor__ __attribute__((constructor)) - #define __destructor__ __attribute__((destructor)) - #define __typeof__(x) typeof(x) -Index: DirectFB-1.6.1/lib/direct/util.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/util.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/util.c 2013-01-05 18:03:59.000000000 +0200 -@@ -110,7 +110,7 @@ - /* - * translates errno to DirectResult - */ --__no_instrument_function__ -+__dfb_no_instrument_function__ - DirectResult - errno2result( int erno ) - { diff --git a/meta/recipes-graphics/directfb/directfb_1.7.4.bb b/meta/recipes-graphics/directfb/directfb_1.7.4.bb deleted file mode 100644 index 39b006e8b3..0000000000 --- a/meta/recipes-graphics/directfb/directfb_1.7.4.bb +++ /dev/null @@ -1,23 +0,0 @@ -require directfb.inc - -RV = "1.7-4" - -DEPENDS += "sysfsutils" - -SRC_URI += "file://fixsepbuild.patch" - -EXTRA_OECONF = "\ - --enable-freetype=yes \ - --enable-zlib \ - --with-gfxdrivers=none \ - --disable-sdl \ - --disable-vnc \ - --disable-x11 \ - --disable-imlib2 \ - --disable-mesa \ -" - -LEAD_SONAME = "libdirectfb-1.7.so.0" - -SRC_URI[md5sum] = "f5bdacde77fc653279819796ae11341e" -SRC_URI[sha256sum] = "20ccd60011c788e50c940ab566943d050679067bc84dc37ca447f1b4af08481b" diff --git a/meta/recipes-graphics/directfb/directfb_1.7.6.bb b/meta/recipes-graphics/directfb/directfb_1.7.6.bb new file mode 100644 index 0000000000..1b49112c37 --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb_1.7.6.bb @@ -0,0 +1,8 @@ +require directfb.inc + +RV = "1.7-6" + +LEAD_SONAME = "libdirectfb-1.7.so.0" + +SRC_URI[md5sum] = "8a7bb06b3f58599b230b4cf314004512" +SRC_URI[sha256sum] = "44f32bacfb842ea234599532f8481fe41b5bd2310d2bd101508eb3a5df26c9e1" diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc index 5ec63071ef..d3e1e92b61 100644 --- a/meta/recipes-graphics/drm/libdrm.inc +++ b/meta/recipes-graphics/drm/libdrm.inc @@ -21,8 +21,8 @@ inherit autotools pkgconfig EXTRA_OECONF += "--disable-cairo-tests \ --enable-omap-experimental-api \ - --enable-freedreno-experimental-api \ --enable-install-test-programs \ + --disable-manpages \ " ALLOW_EMPTY_${PN}-drivers = "1" PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ diff --git a/meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch b/meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch deleted file mode 100644 index 8eb1d5e1ea..0000000000 --- a/meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch +++ /dev/null @@ -1,30 +0,0 @@ -uclibc headers need to know if _GNU_SOURCE is defined or not and its defined -in config.h so include it first to get the definition if its there fixed build -problems on uclibc - -test_decode.c:107:2: error: implicit declaration of function 'open_memstream' [-Werror=implicit-function-declaration] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - -Index: libdrm-2.4.30/intel/test_decode.c -=================================================================== ---- libdrm-2.4.30.orig/intel/test_decode.c 2012-02-03 14:28:46.409355918 -0800 -+++ libdrm-2.4.30/intel/test_decode.c 2012-02-03 14:29:02.357356689 -0800 -@@ -21,6 +21,8 @@ - * IN THE SOFTWARE. - */ - -+#include "config.h" -+ - #include <string.h> - #include <stdlib.h> - #include <stdio.h> -@@ -31,7 +33,6 @@ - #include <sys/mman.h> - #include <err.h> - --#include "config.h" - #include "intel_bufmgr.h" - #include "intel_chipset.h" - diff --git a/meta/recipes-graphics/drm/libdrm/installtests.patch b/meta/recipes-graphics/drm/libdrm/installtests.patch index 7d443af663..03d6254cbd 100644 --- a/meta/recipes-graphics/drm/libdrm/installtests.patch +++ b/meta/recipes-graphics/drm/libdrm/installtests.patch @@ -18,6 +18,6 @@ index bf1987f..d909e19 100644 drmstat +check_PROGRAMS = - SUBDIRS = modeprint + SUBDIRS = modeprint proptest if HAVE_LIBKMS diff --git a/meta/recipes-graphics/drm/libdrm_2.4.54.bb b/meta/recipes-graphics/drm/libdrm_2.4.54.bb deleted file mode 100644 index 12eefc7751..0000000000 --- a/meta/recipes-graphics/drm/libdrm_2.4.54.bb +++ /dev/null @@ -1,8 +0,0 @@ -require libdrm.inc - -SRC_URI += "file://installtests.patch \ - file://GNU_SOURCE_definition.patch \ - " -SRC_URI[md5sum] = "56e98a9c2073c3fab7f95e003b657f46" -SRC_URI[sha256sum] = "d94001ebfbe80e1523d1228ee2df57294698d1c734fad9ccf53efde8932fe4e9" - diff --git a/meta/recipes-graphics/drm/libdrm_2.4.59.bb b/meta/recipes-graphics/drm/libdrm_2.4.59.bb new file mode 100644 index 0000000000..14bf44affb --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm_2.4.59.bb @@ -0,0 +1,6 @@ +require libdrm.inc + +SRC_URI += "file://installtests.patch " + +SRC_URI[md5sum] = "d32a1d37c2546ee11fc5924abeedb23e" +SRC_URI[sha256sum] = "68d26e1fd85582f4243d66864f9b43ca4ee93662825de32b5506fc8e181ea41b" diff --git a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb index 18fc8938d6..3427fdf420 100644 --- a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb +++ b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb @@ -5,4 +5,8 @@ include eglinfo.inc DEPENDS += "virtual/libx11" +inherit distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + SUMMARY += "(X11 version)" diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb index 797b3218b5..7c5b4b4bf9 100644 --- a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb @@ -37,6 +37,8 @@ DEBIAN_NOAUTONAME_fontconfig-utils = "1" inherit autotools pkgconfig -EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts" +FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig" + +EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts --with-cache-dir=${FONTCONFIG_CACHE_DIR}" BBCLASSEXTEND = "native" diff --git a/meta/recipes-graphics/freetype/freetype_2.5.3.bb b/meta/recipes-graphics/freetype/freetype_2.5.4.bb index 2c861de63a..b5f0362eb3 100644 --- a/meta/recipes-graphics/freetype/freetype_2.5.3.bb +++ b/meta/recipes-graphics/freetype/freetype_2.5.4.bb @@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56 SECTION = "libs" SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2" -SRC_URI[md5sum] = "d6b60f06bfc046e43ab2a6cbfd171d65" -SRC_URI[sha256sum] = "c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e" +SRC_URI[md5sum] = "438585445a2f1f71c77590155fd96616" +SRC_URI[sha256sum] = "3b4e2c666b33b32ad29ff0fe5c6538e757d3c73368e5dfa88bd59b4bc95cbabb" BINCONFIG = "${bindir}/freetype-config" diff --git a/meta/recipes-graphics/fstests/fstests_git.bb b/meta/recipes-graphics/fstests/fstests_git.bb index 57ff9f6d54..95c33f410b 100644 --- a/meta/recipes-graphics/fstests/fstests_git.bb +++ b/meta/recipes-graphics/fstests/fstests_git.bb @@ -13,4 +13,6 @@ LIC_FILES_CHKSUM = "file://test-pango-gdk.c;endline=24;md5=1ee74ec851ecda57eb7ac S = "${WORKDIR}/git/tests" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta/recipes-graphics/glew/glew_1.11.0.bb b/meta/recipes-graphics/glew/glew_1.12.0.bb index 4231320dbd..eb28c4d4f3 100644 --- a/meta/recipes-graphics/glew/glew_1.11.0.bb +++ b/meta/recipes-graphics/glew/glew_1.12.0.bb @@ -15,7 +15,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ file://fix-glew.pc-install.patch \ " -SRC_URI[md5sum] = "f6d72c7426a5f66580ad09e50816450a" -SRC_URI[sha256sum] = "69bbce306ac281c4fa806a7a7d02c0596281a2d8f9d70690e98126f23ba513d6" +SRC_URI[md5sum] = "01246c7ecd135d99be031aa63f86dca1" +SRC_URI[sha256sum] = "af58103f4824b443e7fa4ed3af593b8edac6f3a7be3b30911edbc7344f48e4bf" -inherit autotools lib_package pkgconfig +inherit autotools lib_package pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.35.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.38.bb index 2329b2ffc8..90794c71d3 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.35.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.38.bb @@ -11,8 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \ SECTION = "libs" SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2" -SRC_URI[md5sum] = "531ee8650626ecddcd90b2a4637e31d4" -SRC_URI[sha256sum] = "0aa1a8aba6f502321cf6fef3c9d2c73dde48389c5ed1d3615a7691944c2a06ed" +SRC_URI[md5sum] = "8839e574be8089c0de83768798bf7916" +SRC_URI[sha256sum] = "6736f383b4edfcaaeb6f3292302ca382d617d8c79948bb2dd2e8f86cdccfd514" + inherit autotools pkgconfig lib_package DEPENDS = "glib-2.0 cairo freetype" diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb index 4acac39f0d..f2eb675600 100644 --- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb +++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb @@ -16,7 +16,9 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BP SRC_URI[md5sum] = "fc6cc807f55a3e7c752d8013176875d7" SRC_URI[sha256sum] = "254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534217b53" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" PACKAGECONFIG ??= "jpeg png xft xsettings" PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb index e544b60eae..266bd42467 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb @@ -53,8 +53,6 @@ EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," -PARALLEL_MAKE = "" - EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" do_configure_prepend() { diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb index 38304a96a4..197f962824 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb @@ -42,8 +42,6 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," -PARALLEL_MAKE = "" - EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" do_configure_prepend() { diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb b/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb index d7a80305e8..670d9fcb9c 100644 --- a/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb +++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb @@ -28,7 +28,9 @@ SRC_URI[sha256sum] = "f274a4bc969ae192994a856b7f786c6fce96bae77f96c1c2b71dd97599 S = "${WORKDIR}/Xsettings-client-0.10" -inherit autotools gettext +inherit autotools gettext distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" do_configure_prepend() { # This package doesn't ship with its own COPYING file and diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch b/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch deleted file mode 100644 index 800bf3b559..0000000000 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: matchbox-window-manager/configure.ac -=================================================================== ---- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000 -+++ matchbox-window-manager/configure.ac 2007-11-14 12:18:55.000000000 +0000 -@@ -283,7 +283,7 @@ - yes) - - case "$expat" in -- yes) -+ yes|"") - EXPAT_LIBS="-lexpat" - ;; - *) diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4 b/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4 deleted file mode 100644 index aca7c7da45..0000000000 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4 +++ /dev/null @@ -1,39 +0,0 @@ -dnl AM_GCONF_SOURCE_2 -dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas -dnl (i.e. pass to gconftool-2 -dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where -dnl you should install foo.schemas files -dnl - -AC_DEFUN([AM_GCONF_SOURCE_2], -[ - if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then - GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` - else - GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE - fi - - AC_ARG_WITH(gconf-source, - [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) - - AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) - AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) - - if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then - GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' - fi - - AC_ARG_WITH(gconf-schema-file-dir, - [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) - - AC_SUBST(GCONF_SCHEMA_FILE_DIR) - AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) - - AC_ARG_ENABLE(schemas-install, - [ --disable-schemas-install Disable the schemas installation], - [case ${enableval} in - yes|no) ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; - esac]) - AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) -]) diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb deleted file mode 100644 index 8ee42c34b0..0000000000 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Matchbox lightweight window manager" -SECTION = "x11/wm" -LICENSE = "GPLv2.0+" -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxcursor xdamage libxrender startup-notification expat" -PR = "r5" - -SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.bz2 \ - file://configure_fix.patch \ - file://kbdconfig \ - file://gconf-2.m4" - -SRC_URI[md5sum] = "3e158dcf57823b55c926d95b245500fb" -SRC_URI[sha256sum] = "81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff" - -S = "${WORKDIR}/matchbox-window-manager-${PV}" - -inherit autotools pkgconfig - -FILES_${PN} = "${bindir}/* \ - ${datadir}/matchbox \ - ${sysconfdir}/matchbox \ - ${datadir}/themes/blondie/matchbox \ - ${datadir}/themes/Default/matchbox \ - ${datadir}/themes/MBOpus/matchbox" - -EXTRA_OECONF = " --enable-startup-notification \ - --disable-xrm \ - --enable-expat \ - --with-expat-lib=${STAGING_LIBDIR} \ - --with-expat-includes=${STAGING_INCDIR}" - - -do_configure_prepend () { - cp ${WORKDIR}/gconf-2.m4 ${S}/ -} - -do_install_prepend() { - install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig -} diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb index 154b967d2c..422d255951 100644 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb @@ -18,7 +18,9 @@ SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager \ S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" FILES_${PN} = "${bindir}/* \ ${datadir}/matchbox \ diff --git a/meta/recipes-graphics/menu-cache/files/Fix-segfault.patch b/meta/recipes-graphics/menu-cache/files/Fix-segfault.patch deleted file mode 100644 index 74a04074ec..0000000000 --- a/meta/recipes-graphics/menu-cache/files/Fix-segfault.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a497ea6aae3994b7f6527ef7599dd95baf2ad841 Mon Sep 17 00:00:00 2001 -From: Laurentiu Palcu <laurentiu.palcu@intel.com> -Date: Mon, 29 Apr 2013 12:04:20 +0300 -Subject: [PATCH] Fix segfault - -Apparently, g_io_channel_unref() was called twice: once in the -menu-cache's on_client_closed() callback and once from the finalize -function, g_io_unix_finalize()/g_io_win32_finalize(), which is called -anyway when the source is removed. - -Upstream-Status: Pending -Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> ---- - menu-cache-daemon/menu-cached.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/menu-cache-daemon/menu-cached.c b/menu-cache-daemon/menu-cached.c -index e246bb4..a10b6db 100644 ---- a/menu-cache-daemon/menu-cached.c -+++ b/menu-cache-daemon/menu-cached.c -@@ -579,7 +579,6 @@ static void on_client_closed(gpointer user_data) - } - } - /* DEBUG("client closed"); */ -- g_io_channel_unref(ch); - } - - static gboolean on_client_data_in(GIOChannel* ch, GIOCondition cond, gpointer user_data) --- -1.7.9.5 - diff --git a/meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb b/meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb deleted file mode 100644 index 98bbe76412..0000000000 --- a/meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Library for caching application menus" -DESCRIPTION = "A library creating and utilizing caches to speed up freedesktop.org application menus" -HOMEPAGE = "http://lxde.sourceforge.net/" - -LICENSE = "GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://libmenu-cache/menu-cache.h;endline=29;md5=26571532593adb17a37eac396260532c \ - file://menu-cache-daemon/menu-cached.c;endline=22;md5=fcecb7d315c57ef804103fa9cdab7111" - -SECTION = "x11/libs" -DEPENDS = "glib-2.0 zlib" - -SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.gz \ - file://Fix-segfault.patch \ - " - -SRC_URI[md5sum] = "20fed982f5d8e6ec8a56a5b48894ecf0" -SRC_URI[sha256sum] = "4fa9408e353fedba5b7314cbf6b6cd06d873a1424e281aa050d88bb9c0a0191e" - - -inherit autotools pkgconfig gtk-doc diff --git a/meta/recipes-graphics/menu-cache/menu-cache_1.0.0.bb b/meta/recipes-graphics/menu-cache/menu-cache_1.0.0.bb new file mode 100644 index 0000000000..ab909f7361 --- /dev/null +++ b/meta/recipes-graphics/menu-cache/menu-cache_1.0.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "Library for caching application menus" +DESCRIPTION = "A library creating and utilizing caches to speed up freedesktop.org application menus" +HOMEPAGE = "http://lxde.sourceforge.net/" + +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=0964c689fcf4c21c6797ea87408416b6" + +SECTION = "x11/libs" +DEPENDS = "glib-2.0 intltool-native libfm-extra" + +SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.xz" + +SRC_URI[md5sum] = "4a8e6c1a86d5e64ec725d850a4abfbad" +SRC_URI[sha256sum] = "ff7df437bbfd3119c5f662c6d209b98f15de03a7203308c6b56a4c1e1d419aaf" + +inherit autotools gettext pkgconfig gtk-doc diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.1.3.bb b/meta/recipes-graphics/mesa/mesa-gl_10.4.4.bb index 2acc21dce5..2acc21dce5 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_10.1.3.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_10.4.4.bb diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 1857f3c220..97ed02ff34 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -59,12 +59,11 @@ GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" # keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" -PACKAGECONFIG[gallium-egl] = "--enable-gallium-egl, --disable-gallium-egl" -PACKAGECONFIG[gallium-gbm] = "--enable-gallium-gbm, --disable-gallium-gbm" MESA_LLVM_RELEASE ?= "3.3" -PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --with-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \ +PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --enable-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \ ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" +PACKAGECONFIG[xa] = "--enable-xa, --disable-xa" # llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" @@ -84,9 +83,9 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \ libgles2-mesa libgles2-mesa-dev \ libgles3-mesa libgles3-mesa-dev \ libwayland-egl libwayland-egl-dev \ - libegl-gallium libgbm-gallium \ libopenvg libopenvg-dev \ libxvmcsoftpipe libxvmcsoftpipe-dev \ + libxatracker libxatracker-dev \ mesa-megadriver \ " @@ -167,10 +166,9 @@ FILES_libgl-mesa = "${libdir}/libGL.so.*" FILES_libglapi = "${libdir}/libglapi.so.*" FILES_libosmesa = "${libdir}/libOSMesa.so.*" FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*" -FILES_libegl-gallium = "${libdir}/egl/egl_gallium.so*" -FILES_libgbm-gallium = "${libdir}/gbm/gbm_gallium_drm.so*" FILES_libopenvg = "${libdir}/libOpenVG.so.*" FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*" +FILES_libxatracker = "${libdir}/libxatracker.so.*" FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc" FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" @@ -185,5 +183,8 @@ FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayl FILES_libopenvg-dev = "${libdir}/libOpenVG.so ${libdir}/libOpenVG.la* \ ${includedir}/VG ${libdir}/pkgconfig/vg.pc" FILES_libxvmcsoftpipe-dev = "${libdir}/libXvMCsoftpipe.so ${libdir}/libXvMCsoftpipe.la" +FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ + ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ + ${libdir}/pkgconfig/xatracker.pc" FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/* ${libdir}/gbm/.debug/* ${libdir}/gallium-pipe/.debug" diff --git a/meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch b/meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch deleted file mode 100644 index 2df5e61d21..0000000000 --- a/meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch +++ /dev/null @@ -1,52 +0,0 @@ -From debac5531f7107d239530ff6e29eeda72b9ec1e9 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sat, 29 Jun 2013 11:20:51 +0200 -Subject: [PATCH 2/4] pipe_loader_sw: include xlib_sw_winsys.h only when - HAVE_PIPE_LOADER_XLIB - -* HAVE_WINSYS_XLIB was removed in - commit b3f1f665b0fef178ae193e6b111f14c9a5ad3b25 - Author: Matt Turner <mattst88@gmail.com> - Date: Sun Jan 20 15:32:08 2013 -0800 - build: Get rid of GALLIUM_WINSYS_DIRS - -* HAVE_PIPE_LOADER_XLIB is set correctly: - if test "x$NEED_WINSYS_XLIB" = xyes; then - GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DHAVE_PIPE_LOADER_XLIB" - GALLIUM_PIPE_LOADER_LIBS="$GALLIUM_PIPE_LOADER_LIBS \$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la" - fi - -* fixes build of pipe_loader_sw without libx11 headers available - -Upstream-Status: Submitted https://bugs.freedesktop.org/show_bug.cgi?id=66357 -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c -index c2b78c6..0da3f4d 100644 ---- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c -+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c -@@ -31,7 +31,9 @@ - #include "util/u_dl.h" - #include "sw/null/null_sw_winsys.h" - #include "target-helpers/inline_sw_helper.h" -+#ifdef HAVE_PIPE_LOADER_XLIB - #include "state_tracker/xlib_sw_winsys.h" -+#endif - - struct pipe_loader_sw_device { - struct pipe_loader_device base; -@@ -44,7 +46,7 @@ struct pipe_loader_sw_device { - static struct pipe_loader_ops pipe_loader_sw_ops; - - static struct sw_winsys *(*backends[])() = { --#ifdef HAVE_WINSYS_XLIB -+#ifdef HAVE_PIPE_LOADER_XLIB - x11_sw_create, - #endif - null_sw_create --- -1.8.2.1 - diff --git a/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch b/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch deleted file mode 100644 index 30a3d98758..0000000000 --- a/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch +++ /dev/null @@ -1,362 +0,0 @@ -From 06c1ba29de8a26fffb73ee99f0fc54c704e9fee4 Mon Sep 17 00:00:00 2001 -From: Daniel Stone <daniel@fooishbar.org> -Date: Fri, 24 May 2013 17:20:27 +0100 -Subject: [PATCH 3/5] EGL: Mutate NativeDisplayType depending on config - -If we go through ./configure without enabling X11 anywhere, then set the -fallback types for EGL NativeDisplay and friends, rather than assuming -X11/Xlib. - -Upstream-Status: Backport (slightly different solution was applied in master -https://bugs.freedesktop.org/show_bug.cgi?id=64959) - -Signed-off-by: Daniel Stone <daniel@fooishbar.org> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure.ac | 9 +++ - include/EGL/eglplatform.h | 146 ------------------------------------------- - include/EGL/eglplatform.h.in | 146 +++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 155 insertions(+), 146 deletions(-) - delete mode 100644 include/EGL/eglplatform.h - create mode 100644 include/EGL/eglplatform.h.in - -diff --git a/configure.ac b/configure.ac -index 2b4a374..d4c7a95 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1565,12 +1565,20 @@ fi - - EGL_PLATFORMS="$egl_platforms" - -+if echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1; then -+ MESA_EGL_NO_X11_HEADERS=0 -+else -+ MESA_EGL_NO_X11_HEADERS=1 -+fi -+ - AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1) - AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep 'wayland' >/dev/null 2>&1) - AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep 'drm' >/dev/null 2>&1) - AM_CONDITIONAL(HAVE_EGL_PLATFORM_FBDEV, echo "$egl_platforms" | grep 'fbdev' >/dev/null 2>&1) - AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep 'null' >/dev/null 2>&1) - -+AC_SUBST([MESA_EGL_NO_X11_HEADERS]) -+ - AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x") - AM_CONDITIONAL(HAVE_EGL_DRIVER_GLX, test "x$HAVE_EGL_DRIVER_GLX" != "x") - -@@ -2042,6 +2050,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS" - - dnl Substitute the config - AC_CONFIG_FILES([Makefile -+ include/EGL/eglplatform.h - src/Makefile - src/egl/Makefile - src/egl/drivers/Makefile -diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h -deleted file mode 100644 -index 17fdc61..0000000 ---- a/include/EGL/eglplatform.h -+++ /dev/null -@@ -1,146 +0,0 @@ --#ifndef __eglplatform_h_ --#define __eglplatform_h_ -- --/* --** Copyright (c) 2007-2009 The Khronos Group Inc. --** --** Permission is hereby granted, free of charge, to any person obtaining a --** copy of this software and/or associated documentation files (the --** "Materials"), to deal in the Materials without restriction, including --** without limitation the rights to use, copy, modify, merge, publish, --** distribute, sublicense, and/or sell copies of the Materials, and to --** permit persons to whom the Materials are furnished to do so, subject to --** the following conditions: --** --** The above copyright notice and this permission notice shall be included --** in all copies or substantial portions of the Materials. --** --** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, --** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. --** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY --** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, --** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE --** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. --*/ -- --/* Platform-specific types and definitions for egl.h -- * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $ -- * -- * Adopters may modify khrplatform.h and this file to suit their platform. -- * You are encouraged to submit all modifications to the Khronos group so that -- * they can be included in future versions of this file. Please submit changes -- * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) -- * by filing a bug against product "EGL" component "Registry". -- */ -- --#include <KHR/khrplatform.h> -- --/* Macros used in EGL function prototype declarations. -- * -- * EGL functions should be prototyped as: -- * -- * EGLAPI return-type EGLAPIENTRY eglFunction(arguments); -- * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments); -- * -- * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h -- */ -- --#ifndef EGLAPI --#define EGLAPI KHRONOS_APICALL --#endif -- --#ifndef EGLAPIENTRY --#define EGLAPIENTRY KHRONOS_APIENTRY --#endif --#define EGLAPIENTRYP EGLAPIENTRY* -- --/* The types NativeDisplayType, NativeWindowType, and NativePixmapType -- * are aliases of window-system-dependent types, such as X Display * or -- * Windows Device Context. They must be defined in platform-specific -- * code below. The EGL-prefixed versions of Native*Type are the same -- * types, renamed in EGL 1.3 so all types in the API start with "EGL". -- * -- * Khronos STRONGLY RECOMMENDS that you use the default definitions -- * provided below, since these changes affect both binary and source -- * portability of applications using EGL running on different EGL -- * implementations. -- */ -- --#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */ --#ifndef WIN32_LEAN_AND_MEAN --#define WIN32_LEAN_AND_MEAN 1 --#endif --#include <windows.h> -- --typedef HDC EGLNativeDisplayType; --typedef HBITMAP EGLNativePixmapType; --typedef HWND EGLNativeWindowType; -- --#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */ -- --typedef int EGLNativeDisplayType; --typedef void *EGLNativeWindowType; --typedef void *EGLNativePixmapType; -- --#elif defined(WL_EGL_PLATFORM) -- --typedef struct wl_display *EGLNativeDisplayType; --typedef struct wl_egl_pixmap *EGLNativePixmapType; --typedef struct wl_egl_window *EGLNativeWindowType; -- --#elif defined(__GBM__) -- --typedef struct gbm_device *EGLNativeDisplayType; --typedef struct gbm_bo *EGLNativePixmapType; --typedef void *EGLNativeWindowType; -- --#elif defined(ANDROID) /* Android */ -- --struct ANativeWindow; --struct egl_native_pixmap_t; -- --typedef struct ANativeWindow *EGLNativeWindowType; --typedef struct egl_native_pixmap_t *EGLNativePixmapType; --typedef void *EGLNativeDisplayType; -- --#elif defined(__unix__) -- --#ifdef MESA_EGL_NO_X11_HEADERS -- --typedef void *EGLNativeDisplayType; --typedef khronos_uint32_t EGLNativePixmapType; --typedef khronos_uint32_t EGLNativeWindowType; -- --#else -- --/* X11 (tentative) */ --#include <X11/Xlib.h> --#include <X11/Xutil.h> -- --typedef Display *EGLNativeDisplayType; --typedef Pixmap EGLNativePixmapType; --typedef Window EGLNativeWindowType; -- --#endif /* MESA_EGL_NO_X11_HEADERS */ -- --#else --#error "Platform not recognized" --#endif -- --/* EGL 1.2 types, renamed for consistency in EGL 1.3 */ --typedef EGLNativeDisplayType NativeDisplayType; --typedef EGLNativePixmapType NativePixmapType; --typedef EGLNativeWindowType NativeWindowType; -- -- --/* Define EGLint. This must be a signed integral type large enough to contain -- * all legal attribute names and values passed into and out of EGL, whether -- * their type is boolean, bitmask, enumerant (symbolic constant), integer, -- * handle, or other. While in general a 32-bit integer will suffice, if -- * handles are 64 bit types, then EGLint should be defined as a signed 64-bit -- * integer type. -- */ --typedef khronos_int32_t EGLint; -- --#endif /* __eglplatform_h */ -diff --git a/include/EGL/eglplatform.h.in b/include/EGL/eglplatform.h.in -new file mode 100644 -index 0000000..5126c92 ---- /dev/null -+++ b/include/EGL/eglplatform.h.in -@@ -0,0 +1,146 @@ -+#ifndef __eglplatform_h_ -+#define __eglplatform_h_ -+ -+/* -+** Copyright (c) 2007-2009 The Khronos Group Inc. -+** -+** Permission is hereby granted, free of charge, to any person obtaining a -+** copy of this software and/or associated documentation files (the -+** "Materials"), to deal in the Materials without restriction, including -+** without limitation the rights to use, copy, modify, merge, publish, -+** distribute, sublicense, and/or sell copies of the Materials, and to -+** permit persons to whom the Materials are furnished to do so, subject to -+** the following conditions: -+** -+** The above copyright notice and this permission notice shall be included -+** in all copies or substantial portions of the Materials. -+** -+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -+*/ -+ -+/* Platform-specific types and definitions for egl.h -+ * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $ -+ * -+ * Adopters may modify khrplatform.h and this file to suit their platform. -+ * You are encouraged to submit all modifications to the Khronos group so that -+ * they can be included in future versions of this file. Please submit changes -+ * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) -+ * by filing a bug against product "EGL" component "Registry". -+ */ -+ -+#include <KHR/khrplatform.h> -+ -+/* Macros used in EGL function prototype declarations. -+ * -+ * EGL functions should be prototyped as: -+ * -+ * EGLAPI return-type EGLAPIENTRY eglFunction(arguments); -+ * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments); -+ * -+ * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h -+ */ -+ -+#ifndef EGLAPI -+#define EGLAPI KHRONOS_APICALL -+#endif -+ -+#ifndef EGLAPIENTRY -+#define EGLAPIENTRY KHRONOS_APIENTRY -+#endif -+#define EGLAPIENTRYP EGLAPIENTRY* -+ -+/* The types NativeDisplayType, NativeWindowType, and NativePixmapType -+ * are aliases of window-system-dependent types, such as X Display * or -+ * Windows Device Context. They must be defined in platform-specific -+ * code below. The EGL-prefixed versions of Native*Type are the same -+ * types, renamed in EGL 1.3 so all types in the API start with "EGL". -+ * -+ * Khronos STRONGLY RECOMMENDS that you use the default definitions -+ * provided below, since these changes affect both binary and source -+ * portability of applications using EGL running on different EGL -+ * implementations. -+ */ -+ -+#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */ -+#ifndef WIN32_LEAN_AND_MEAN -+#define WIN32_LEAN_AND_MEAN 1 -+#endif -+#include <windows.h> -+ -+typedef HDC EGLNativeDisplayType; -+typedef HBITMAP EGLNativePixmapType; -+typedef HWND EGLNativeWindowType; -+ -+#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */ -+ -+typedef int EGLNativeDisplayType; -+typedef void *EGLNativeWindowType; -+typedef void *EGLNativePixmapType; -+ -+#elif defined(WL_EGL_PLATFORM) -+ -+typedef struct wl_display *EGLNativeDisplayType; -+typedef struct wl_egl_pixmap *EGLNativePixmapType; -+typedef struct wl_egl_window *EGLNativeWindowType; -+ -+#elif defined(__GBM__) -+ -+typedef struct gbm_device *EGLNativeDisplayType; -+typedef struct gbm_bo *EGLNativePixmapType; -+typedef void *EGLNativeWindowType; -+ -+#elif defined(ANDROID) /* Android */ -+ -+struct ANativeWindow; -+struct egl_native_pixmap_t; -+ -+typedef struct ANativeWindow *EGLNativeWindowType; -+typedef struct egl_native_pixmap_t *EGLNativePixmapType; -+typedef void *EGLNativeDisplayType; -+ -+#elif defined(__unix__) -+ -+#if @MESA_EGL_NO_X11_HEADERS@ -+ -+typedef void *EGLNativeDisplayType; -+typedef khronos_uint32_t EGLNativePixmapType; -+typedef khronos_uint32_t EGLNativeWindowType; -+ -+#else -+ -+/* X11 (tentative) */ -+#include <X11/Xlib.h> -+#include <X11/Xutil.h> -+ -+typedef Display *EGLNativeDisplayType; -+typedef Pixmap EGLNativePixmapType; -+typedef Window EGLNativeWindowType; -+ -+#endif /* MESA_EGL_NO_X11_HEADERS */ -+ -+#else -+#error "Platform not recognized" -+#endif -+ -+/* EGL 1.2 types, renamed for consistency in EGL 1.3 */ -+typedef EGLNativeDisplayType NativeDisplayType; -+typedef EGLNativePixmapType NativePixmapType; -+typedef EGLNativeWindowType NativeWindowType; -+ -+ -+/* Define EGLint. This must be a signed integral type large enough to contain -+ * all legal attribute names and values passed into and out of EGL, whether -+ * their type is boolean, bitmask, enumerant (symbolic constant), integer, -+ * handle, or other. While in general a 32-bit integer will suffice, if -+ * handles are 64 bit types, then EGLint should be defined as a signed 64-bit -+ * integer type. -+ */ -+typedef khronos_int32_t EGLint; -+ -+#endif /* __eglplatform_h */ --- -1.8.2.1 - diff --git a/meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch b/meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch deleted file mode 100644 index 88a4fb0636..0000000000 --- a/meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch +++ /dev/null @@ -1,48 +0,0 @@ -Fix out of tree compilation failure due to -0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch. - -Upstream-Status: Inappropriate (upstream has different solution to root problem) -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/src/egl/drivers/dri2/Makefile.am b/src/egl/drivers/dri2/Makefile.am -index 45f7dfa..ed0e777 100644 ---- a/src/egl/drivers/dri2/Makefile.am -+++ b/src/egl/drivers/dri2/Makefile.am -@@ -21,6 +21,7 @@ - - AM_CFLAGS = \ - -I$(top_srcdir)/include \ -+ -I$(top_builddir)/include \ - -I$(top_srcdir)/src/egl/main \ - -I$(top_srcdir)/src/gbm/main \ - -I$(top_srcdir)/src/gbm/backends/dri \ -diff --git a/src/egl/drivers/glx/Makefile.am b/src/egl/drivers/glx/Makefile.am -index 6bf67ea..7b87047 100644 ---- a/src/egl/drivers/glx/Makefile.am -+++ b/src/egl/drivers/glx/Makefile.am -@@ -21,6 +21,7 @@ - - AM_CFLAGS = \ - -I$(top_srcdir)/include \ -+ -I$(top_builddir)/include \ - -I$(top_srcdir)/src/egl/main \ - $(X11_CFLAGS) \ - $(DEFINES) -diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am -index ca5257a..13a5734 100644 ---- a/src/egl/main/Makefile.am -+++ b/src/egl/main/Makefile.am -@@ -27,6 +27,7 @@ endif - - AM_CFLAGS = \ - -I$(top_srcdir)/include \ -+ -I$(top_builddir)/include \ - -I$(top_srcdir)/src/gbm/main \ - $(DEFINES) \ - $(EGL_CFLAGS) \ -@@ -135,4 +136,4 @@ egl_HEADERS = \ - $(top_srcdir)/include/EGL/eglext.h \ - $(top_srcdir)/include/EGL/egl.h \ - $(top_srcdir)/include/EGL/eglmesaext.h \ -- $(top_srcdir)/include/EGL/eglplatform.h -+ $(top_builddir)/include/EGL/eglplatform.h diff --git a/meta/recipes-graphics/mesa/mesa_10.1.3.bb b/meta/recipes-graphics/mesa/mesa_10.4.4.bb index abc450a9c5..8140411752 100644 --- a/meta/recipes-graphics/mesa/mesa_10.1.3.bb +++ b/meta/recipes-graphics/mesa/mesa_10.4.4.bb @@ -1,12 +1,9 @@ require ${BPN}.inc -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ - file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \ - file://0006-fix-out-of-tree-egl.patch \ - " +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2" -SRC_URI[md5sum] = "ba6dbe2b9cab0b4de840c996b9b6a3ad" -SRC_URI[sha256sum] = "b2615e236ef25d0fb94b8420bdd2e2a520b7dd5ca2d4b93306154f7fd4adecc3" +SRC_URI[md5sum] = "62faf98ac79c5587f8e917e187419e6c" +SRC_URI[sha256sum] = "f18a967e9c4d80e054b2fdff8c130ce6e6d1f8eecfc42c9f354f8628d8b4df1c" S = "${WORKDIR}/Mesa-${PV}" diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb index cda310a525..cbe891118d 100644 --- a/meta/recipes-graphics/mesa/mesa_git.bb +++ b/meta/recipes-graphics/mesa/mesa_git.bb @@ -2,15 +2,10 @@ require ${BPN}.inc DEFAULT_PREFERENCE = "-1" -LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de" +SRCREV = "62eb27ac8bbd979796f50e253f6c786d7d791242" +PV = "10.4.4+git${SRCPV}" -SRCREV = "0028eb1083e6adc110a23a5f02c993cda217067a" -PV = "10.1.3+git${SRCPV}" - -SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;branch=10.1 \ - file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \ - file://0006-fix-out-of-tree-egl.patch \ - " +SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;branch=10.4" S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb index 2eff3713bc..17301a0527 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb @@ -3,7 +3,9 @@ DESCRIPTION = "Packages required to set up a basic working X11 session" LICENSE = "MIT" PR = "r1" -inherit packagegroup +inherit packagegroup distro_features_check +# rdepends on matchbox-wm +REQUIRED_DISTRO_FEATURES = "x11" RDEPENDS_${PN} = "\ packagegroup-core-x11-xserver \ diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb index 2d68e97383..c53f1b758d 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb @@ -8,7 +8,9 @@ PR = "r40" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit packagegroup +inherit packagegroup distro_features_check +# rdepends on XSERVER +REQUIRED_DISTRO_FEATURES = "x11" XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev" XSERVERCODECS ?= "" diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb index fde5144b46..3537d8cbba 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb @@ -5,7 +5,9 @@ LICENSE = "MIT" PR = "r40" -inherit packagegroup +inherit packagegroup distro_features_check +# rdepends on x11-common +REQUIRED_DISTRO_FEATURES = "x11" PACKAGES = "${PN} ${PN}-utils" diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index b59d33d14f..df0fdf679a 100644 --- a/meta/recipes-graphics/pango/pango.inc +++ b/meta/recipes-graphics/pango/pango.inc @@ -46,12 +46,12 @@ EXTRA_OECONF = "--disable-introspection \ LEAD_SONAME = "libpango-1.0*" LIBV = "1.8.0" -postinst_prologue() { +pango_postinst() { if ! [ -e $D${sysconfdir}/pango ] ; then mkdir -p $D${sysconfdir}/pango fi -if [ "x$D" != "x" ]; then +if [ -n "$D" ]; then ${@qemu_run_binary(d, '$D','${bindir}/${MLPREFIX}pango-querymodules')} \ $D${libdir}/pango/${LIBV}/modules/*.so \ > $D${sysconfdir}/pango/${MLPREFIX}pango.modules 2>/dev/null @@ -61,6 +61,8 @@ if [ "x$D" != "x" ]; then sed -i -e "s:$D::" $D${sysconfdir}/pango/${MLPREFIX}pango.modules exit 0 +else + ${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules fi } @@ -79,11 +81,11 @@ do_install_append () { python populate_packages_prepend () { - prologue = d.getVar("postinst_prologue", True) + pango_postinst = d.getVar("pango_postinst", True) modules_root = d.expand('${libdir}/pango/${LIBV}/modules') - do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + '${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules') + do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', pango_postinst) } FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" diff --git a/meta/recipes-graphics/pango/pango_1.36.6.bb b/meta/recipes-graphics/pango/pango_1.36.8.bb index 61ae359e93..4605c768a5 100644 --- a/meta/recipes-graphics/pango/pango_1.36.6.bb +++ b/meta/recipes-graphics/pango/pango_1.36.8.bb @@ -8,5 +8,5 @@ SRC_URI += "file://run-ptest \ file://multilib-fix-clean.patch \ " -SRC_URI[archive.md5sum] = "1c27523c3f3a4efe4d9d303d0d240320" -SRC_URI[archive.sha256sum] = "4c53c752823723875078b91340f32136aadb99e91c0f6483f024f978a02c8624"
\ No newline at end of file +SRC_URI[archive.md5sum] = "217a9a753006275215fa9fa127760ece" +SRC_URI[archive.sha256sum] = "18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07" diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index f468120f80..68ac7e7677 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -13,7 +13,9 @@ S = "${WORKDIR}/git" DEPENDS = "virtual/libx11 libxrender waffle virtual/libgl libglu python-mako-native python-numpy-native" -inherit cmake pythonnative +inherit cmake pythonnative distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" # As piglit doesn't install, enforce in-tree builds so that we can easily copy # contents out of $S and $B. diff --git a/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb b/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb index fe886f536d..0e1a7928f2 100644 --- a/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb +++ b/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb @@ -2,6 +2,10 @@ SUMMARY = "A clock combined with a game of pong" LICENSE = "GPLv2+" DEPENDS = "virtual/libx11 xdmcp xau" +inherit distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + SRC_URI = "file://pong-clock-no-flicker.c" LIC_FILES_CHKSUM = "file://pong-clock-no-flicker.c;beginline=1;endline=23;md5=dd248d50f73f746d1ee78586b0b2ebd3" diff --git a/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb b/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb index 363bdcd706..6c1b93cd0a 100644 --- a/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb +++ b/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb @@ -17,7 +17,9 @@ SECTION = "libs" DEPENDS = "virtual/libx11 libsm xcb-util" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/${BPN}-${PV}.tar.gz \ file://obsolete_automake_macros.patch \ diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb index 89fa4b211d..708f59e89b 100644 --- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb +++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" PR = "r4" PE = "1" -inherit fontcache +inherit allarch fontcache FONT_PACKAGES = "${PN}" diff --git a/meta/recipes-graphics/waffle/waffle_1.3.0.bb b/meta/recipes-graphics/waffle/waffle_1.3.0.bb index a6d1acdf31..fe9609c5b0 100644 --- a/meta/recipes-graphics/waffle/waffle_1.3.0.bb +++ b/meta/recipes-graphics/waffle/waffle_1.3.0.bb @@ -26,7 +26,4 @@ PACKAGECONFIG[gbm] = "-Dwaffle_has_wayland=1,,virtual/libgl udev" # I say virtual/libgl, actually wants egl.pc PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=1,,virtual/libgl libxcb" -# Take the flags added by PACKAGECONFIG and pass them to cmake. -EXTRA_OECMAKE = "${EXTRA_OECONF}" - FILES_${PN}-dev += "${datadir}/cmake/Modules/FindWaffle.cmake" diff --git a/meta/recipes-graphics/wayland/libinput_0.7.0.bb b/meta/recipes-graphics/wayland/libinput_0.7.0.bb new file mode 100644 index 0000000000..98d29426e6 --- /dev/null +++ b/meta/recipes-graphics/wayland/libinput_0.7.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "Library to handle input devices in Wayland compositors" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libinput/" +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=673e626420c7f859fbe2be3a9c13632d" + +DEPENDS = "libevdev udev mtdev" + +SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz" +SRC_URI[md5sum] = "381b61396de28c12716ef7a5475fea50" +SRC_URI[sha256sum] = "129f485afe5e4a9394641293991c97cb99f5f3338340d0d65b704ff463d1579e" + +inherit autotools pkgconfig diff --git a/meta/recipes-graphics/wayland/wayland_1.5.0.bb b/meta/recipes-graphics/wayland/wayland_1.6.0.bb index b1ae59ef13..00713bff3f 100644 --- a/meta/recipes-graphics/wayland/wayland_1.5.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.6.0.bb @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \ file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "1d882776b27329b91d2d500b6d66dd1d" -SRC_URI[sha256sum] = "0069e1e9af888b3e05384380ad8cc6c976ea3e81d08ba19b7675ce1d693a41b5" +SRC_URI[md5sum] = "d34c141c975084e4fb668e77b38f840e" +SRC_URI[sha256sum] = "a7d5102dcf53d08c059d24bc62de491d7cd482070abeb6737a20d0d86ba6fc7f" SRC_URI_append_class-native = " \ file://disable-macro-checks-not-used-for-scanner.patch \ " @@ -23,7 +23,6 @@ inherit autotools pkgconfig # We need wayland-native for the wayland-scanner utility BBCLASSEXTEND = "native" -DEPENDS_class-native = "expat-native libffi-native" DEPENDS = "expat libffi wayland-native" EXTRA_OECONF = "--disable-documentation --disable-scanner" diff --git a/meta/recipes-graphics/wayland/weston_1.5.0.bb b/meta/recipes-graphics/wayland/weston_1.6.0.bb index 4a8584f79a..d30e48bfa0 100644 --- a/meta/recipes-graphics/wayland/weston_1.5.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.6.0.bb @@ -12,8 +12,8 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://make-lcms-explicitly-configurable.patch \ file://make-libwebp-explicitly-configurable.patch \ " -SRC_URI[md5sum] = "8eb40d230efc2411f083c20656534780" -SRC_URI[sha256sum] = "06388ba04ac79aa72d685cc1a8e646ddb2b8cfe11fcc742294f9addac48b7684" +SRC_URI[md5sum] = "c60ce9dde99a089db0539d8f6b557827" +SRC_URI[sha256sum] = "dc3ea5d13bbf025fabc006216c5ddc0d80d5f4ebe778912b8c4d1d4acaaa614d" inherit autotools pkgconfig useradd @@ -60,6 +60,8 @@ PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo" PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms" # Weston with webp support PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" +# Weston with libinput backend +PACKAGECONFIG[libinput] = "--enable-libinput-backend,--disable-libinput-backend,libinput" do_install_append() { # Weston doesn't need the .la files to load modules, so wipe them @@ -77,7 +79,7 @@ do_install_append() { PACKAGES += "${PN}-examples" -FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${datadir}" +FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libdir}/weston ${datadir}" FILES_${PN}-examples = "${bindir}/*" RDEPENDS_${PN} += "xkeyboard-config" diff --git a/meta/recipes-graphics/x11-common/x11-common_0.1.bb b/meta/recipes-graphics/x11-common/x11-common_0.1.bb index a2d8885cc7..156b329486 100644 --- a/meta/recipes-graphics/x11-common/x11-common_0.1.bb +++ b/meta/recipes-graphics/x11-common/x11-common_0.1.bb @@ -4,6 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SECTION = "x11" PR = "r47" +inherit distro_features_check +# rdepends on xdypinfo xmodmap xinit +REQUIRED_DISTRO_FEATURES = "x11" + SRC_URI = "file://etc \ file://gplv2-license.patch" diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm index ef6c11c3f2..2e3e090777 100755 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm @@ -48,6 +48,7 @@ case "$1" in stop) echo "Stopping XServer" killproc xinit + chvt 1 ;; restart) diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb index 3d98172442..ec0241fb28 100644 --- a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb +++ b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb @@ -16,7 +16,9 @@ SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr libxdamage libxtst" -inherit autotools-brokensep +inherit autotools-brokensep distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi" diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb index 562434f16a..a9de3d7ef2 100644 --- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb @@ -7,7 +7,9 @@ DEPENDS = "virtual/libx11 libxi" PV = "0.7.5+git${SRCPV}" PR = "r6" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111" SRC_URI = "git://github.com/tias/xinput_calibrator.git \ diff --git a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb index 65f74c21c5..31cf186767 100644 --- a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb +++ b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb @@ -14,5 +14,5 @@ BBCLASSEXTEND = "native" LIC_FILES_CHKSUM = "file://COPYING;md5=2e0d129d05305176d1a790e0ac1acb7f" -SRC_URI[md5sum] = "03de3f15db678e277f5ef9c013aca1ad" -SRC_URI[sha256sum] = "244017992477ced2397a44fd0ddcfb0f1d9899128613f5c4db81471163b0b731" +SRC_URI[md5sum] = "9bdd6ebfa62b1bbd474906ac86a40fd8" +SRC_URI[sha256sum] = "8c6d5228af885477b9aec60ca6f172578e7d2de42234357af62fb00439453f20" diff --git a/meta/recipes-graphics/xorg-app/rgb_1.0.5.bb b/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb index 26d4f1b5ba..87268046e6 100644 --- a/meta/recipes-graphics/xorg-app/rgb_1.0.5.bb +++ b/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb @@ -9,9 +9,8 @@ format." DEPENDS += " xproto util-macros" LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a" PE = "1" -PR = "${INC_PR}.0" -SRC_URI[md5sum] = "bcd820d967eaa51bd25b86c0ee682d4e" -SRC_URI[sha256sum] = "8e936e648ffddce2e7184790efa15e4fa2bcb47f9da5469515d212c61bc8f857" +SRC_URI[md5sum] = "eab5bbd7642e5c784429307ec210d198" +SRC_URI[sha256sum] = "bbca7c6aa59939b9f6a0fb9fff15dfd62176420ffd4ae30c8d92a6a125fbe6b0" FILES_${PN} += "${datadir}/X11" diff --git a/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb b/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb index 96ea030be1..84d0cb8044 100644 --- a/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb +++ b/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3ea51b365051ac32d1813a7dbaa4bfc6" SRC_URI[md5sum] = "a3035dcecdbdb89e864177c080924981" SRC_URI[sha256sum] = "975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521" -DEPENDS += " virtual/libx11 libxau libxt libxext libxmu libxrender" +DEPENDS += "libxau libxt libxext libxmu libxrender" diff --git a/meta/recipes-graphics/xorg-app/xinit_1.3.3.bb b/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb index 583ea87eeb..93185188ee 100644 --- a/meta/recipes-graphics/xorg-app/xinit_1.3.3.bb +++ b/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb @@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18f01e7b39807bebe2b8df101a039b68" PE = "1" -SRC_URI[md5sum] = "3b8da0e6237aee9828cc809c647510a7" -SRC_URI[sha256sum] = "74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af" +SRC_URI[md5sum] = "4e928452dfaf73851413a2d8b8c76388" +SRC_URI[sha256sum] = "75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3" EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie" diff --git a/meta/recipes-graphics/xorg-app/xkbcomp_1.2.4.bb b/meta/recipes-graphics/xorg-app/xkbcomp_1.3.0.bb index 5c274b133e..efac0699c9 100644 --- a/meta/recipes-graphics/xorg-app/xkbcomp_1.2.4.bb +++ b/meta/recipes-graphics/xorg-app/xkbcomp_1.3.0.bb @@ -15,5 +15,5 @@ DEPENDS += "libxkbfile" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "a0fc1ac3fc4fe479ade09674347c5aa0" -SRC_URI[sha256sum] = "91d0c9ab445d21dfe1892dbae5ae5264f39bae68223dd092ffc547c9450b5a2d" +SRC_URI[md5sum] = "0012a8e3092cddf7f87b250f96bb38c5" +SRC_URI[sha256sum] = "cfac973778fabf5216121ad60b7af8ab74ce7513af0f9260cf8c5309e1622b2a" diff --git a/meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch b/meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch deleted file mode 100644 index 40f81f0f74..0000000000 --- a/meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch +++ /dev/null @@ -1,60 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 42f99a7a7b836f6f9704a7b1747eb722c93446ec Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Mon, 23 Apr 2012 14:28:39 +0000 -Subject: include config.h before stdio.h & other system headers - -Ensures definitions like _GNU_SOURCE are visible when needed. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/exec.c b/exec.c -index dbcb669..419b10e 100644 ---- a/exec.c -+++ b/exec.c -@@ -54,6 +54,10 @@ from The Open Group. - * original xmodmap, written by David Rosenthal, of Sun Microsystems. - */ - -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ - #include <X11/Xos.h> - #include <X11/Xlib.h> - #include <stdio.h> -diff --git a/pf.c b/pf.c -index 0eb0f55..3f0c3f4 100644 ---- a/pf.c -+++ b/pf.c -@@ -26,6 +26,10 @@ from The Open Group. - - */ - -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ - #include <X11/Xos.h> - #include <X11/Xlib.h> - #include <stdio.h> -diff --git a/xmodmap.c b/xmodmap.c -index 58a8e70..0f89629 100644 ---- a/xmodmap.c -+++ b/xmodmap.c -@@ -26,6 +26,10 @@ from The Open Group. - - */ - -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ - #include <X11/Xos.h> - #include <X11/Xlib.h> - #include <stdio.h> --- -cgit v0.9.0.2-2-gbebe diff --git a/meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb b/meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb index 65a55e3560..87efb76022 100644 --- a/meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb +++ b/meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb @@ -13,7 +13,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=272c17e96370e1e74773fa22d9989621" PE = "1" -SRC_URI += "file://gnu-source.patch" - SRC_URI[md5sum] = "5511da3361eea4eaa21427652c559e1c" SRC_URI[sha256sum] = "efe2e3c89858a2db3bdcf969f55f55d0af4f5007789198344de0595249a99fc3" diff --git a/meta/recipes-graphics/xorg-app/xorg-app-common.inc b/meta/recipes-graphics/xorg-app/xorg-app-common.inc index 524a2d3077..3529cb26ef 100644 --- a/meta/recipes-graphics/xorg-app/xorg-app-common.inc +++ b/meta/recipes-graphics/xorg-app/xorg-app-common.inc @@ -5,12 +5,13 @@ SECTION = "x11/apps" LICENSE = "MIT-X" DEPENDS = "util-macros-native virtual/libx11" +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + INC_PR = "r8" SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2" -S = "${WORKDIR}/${BPN}-${PV}" - -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check FILES_${PN} += " ${libdir}/X11/${BPN} ${datadir}/X11/app-defaults/" diff --git a/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb b/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb index efbb1b3f6c..d78bf0451c 100644 --- a/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb +++ b/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb @@ -10,7 +10,7 @@ formatting information." LIC_FILES_CHKSUM = "file://COPYING;md5=e226ab8db88ac0bc0391673be40c9f91" -DEPENDS += " libxmu virtual/libx11" +DEPENDS += "libxmu" PE = "1" diff --git a/meta/recipes-graphics/xorg-app/xrandr_1.4.2.bb b/meta/recipes-graphics/xorg-app/xrandr_1.4.3.bb index 84f01b02dd..41bd42069c 100644 --- a/meta/recipes-graphics/xorg-app/xrandr_1.4.2.bb +++ b/meta/recipes-graphics/xorg-app/xrandr_1.4.3.bb @@ -11,5 +11,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fe1608bdb33cf8c62a4438f7d34679b3" DEPENDS += "libxrandr libxrender" PE = "1" -SRC_URI[md5sum] = "78fd973d9b532106f8777a3449176148" -SRC_URI[sha256sum] = "b2e76ee92ff827f1c52ded7c666fe6f2704ca81cdeef882397da4e3e8ab490bc" +SRC_URI[md5sum] = "441fdb98d2abc6051108b7075d948fc7" +SRC_URI[sha256sum] = "7154ac3486b86923692f2d6cdb2991a2ee72bc32af2c4379a6f1c068f204be1b" diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.1.bb index 4ab6ad1d66..6d71ba8186 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.1.bb @@ -16,5 +16,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16" DEPENDS += "mtdev libevdev" -SRC_URI[md5sum] = "9076ae2646f7aeb30963056e0bbfccf0" -SRC_URI[sha256sum] = "0c0c4aa393cb027a2304967944867a21a340bcad2e5efe630291b6906c3abc35" +SRC_URI[md5sum] = "8f73a98e32dccc9d054b54727cc4093f" +SRC_URI[sha256sum] = "0ce30328adfeac90a6f4b508d992fb834d8e50b484b29d3d58cf6683fa8502f9" diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch deleted file mode 100644 index f36bb7579d..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 96e60a4ea242d2decf109835981ae186cc36f642 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Fri, 29 Aug 2014 07:57:41 +1000 -Subject: Include xorg-server.h to fix build errors on newest glibc - -In file included from /usr/include/string.h:634:0, - from /usr/include/xorg/os.h:53, - from /usr/include/xorg/misc.h:115, - from /usr/include/xorg/xf86str.h:37, - from /usr/include/xorg/xf86Xinput.h:54, - from synproto.h:36, - from synproto.c:24: -/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' - strndup(const char *str, size_t n); - -See http://lists.freedesktop.org/archives/xorg-devel/2014-July/043070.html - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -Status: Backport - -Index: xf86-input-synaptics-1.8.0/src/eventcomm.h -=================================================================== ---- xf86-input-synaptics-1.8.0.orig/src/eventcomm.h 2014-08-28 18:40:28.628070587 -0700 -+++ xf86-input-synaptics-1.8.0/src/eventcomm.h 2014-08-28 18:40:28.620070587 -0700 -@@ -27,6 +27,8 @@ - #ifndef _EVENTCOMM_H_ - #define _EVENTCOMM_H_ - -+#include <xorg-server.h> -+ - #include <linux/input.h> - #include <linux/version.h> - #include <xf86Xinput.h> -Index: xf86-input-synaptics-1.8.0/src/ps2comm.h -=================================================================== ---- xf86-input-synaptics-1.8.0.orig/src/ps2comm.h 2014-08-28 18:40:28.628070587 -0700 -+++ xf86-input-synaptics-1.8.0/src/ps2comm.h 2014-08-28 18:40:28.620070587 -0700 -@@ -22,6 +22,8 @@ - #ifndef _PS2COMM_H_ - #define _PS2COMM_H_ - -+#include <xorg-server.h> -+ - #include <unistd.h> - #include <sys/ioctl.h> - #include "xf86_OSproc.h" -Index: xf86-input-synaptics-1.8.0/src/synproto.h -=================================================================== ---- xf86-input-synaptics-1.8.0.orig/src/synproto.h 2014-08-28 18:40:28.628070587 -0700 -+++ xf86-input-synaptics-1.8.0/src/synproto.h 2014-08-28 18:40:28.624070587 -0700 -@@ -31,6 +31,8 @@ - #include "config.h" - #endif - -+#include <xorg-server.h> -+ - #include <unistd.h> - #include <sys/ioctl.h> - #include <xf86Xinput.h> diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb index 90baf8fbf3..19be77aadb 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb @@ -1,7 +1,5 @@ require xorg-driver-input.inc -#SRC_URI += "file://configurefix.patch" - SUMMARY = "X.Org X server -- synaptics touchpad input driver" DESCRIPTION = "synaptics is an Xorg input driver for the touchpads from \ @@ -12,10 +10,8 @@ advanced features of the touchpad to become available." LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398" -SRC_URI += "file://always_include_xorg_server.h.patch" - -SRC_URI[md5sum] = "27a3f2b31606a13dd6b58d419978d64f" -SRC_URI[sha256sum] = "9bf27632aaa6c5e62621ca9c2ca00f9b309c85b039ee33cd592b189fc872c37a" +SRC_URI[md5sum] = "ed70d0cba94262a4008dcef654ab34a9" +SRC_URI[sha256sum] = "d74fdaf29e9888a2cb494e16d0a9ddb24265c5c765b05392b69c50e84ffbf09a" DEPENDS += "libxi mtdev libxtst libevdev" diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch deleted file mode 100644 index 3a42d1377c..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch +++ /dev/null @@ -1,29 +0,0 @@ -Upstream-Status: Backport - -From 524a45da56e2a052ffafa3887891caa90ba39f76 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Sat, 5 Oct 2013 18:42:24 +0100 -Subject: [PATCH] compat-api: Map changes of DamageUnregister API in 1.14.99.2 - -Reported-by: Emmanuel Benisty <benisty.e@gmail.com> -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- - src/compat-api.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/compat-api.h b/src/compat-api.h -index 8eb46ef..244a486 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -162,4 +162,8 @@ static inline void FreePixmap(PixmapPtr pixmap) - if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h) - #endif - -+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0) -+#define DamageUnregister(d, dd) DamageUnregister(dd) -+#endif -+ - #endif --- -1.7.9.5 - diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/configure-dri.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/configure-dri.patch deleted file mode 100644 index 7fa9443d93..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/configure-dri.patch +++ /dev/null @@ -1,166 +0,0 @@ -Add the ability to enable/disable specific versions of the DRI support. - -This is the following two commits from master squashed: - 7bc669dd4b7e3e5978e95e4131d1f9215afbc041 - 5a0cb1049c2fa0586708719210a2d2cffa7a4491 - -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/configure.ac b/configure.ac -index b3b6e8e..bd654f3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -296,6 +296,21 @@ AC_ARG_ENABLE(dri, - [Disable DRI support [[default=auto]]]), - [DRI=$enableval], - [DRI=auto]) -+AC_ARG_ENABLE(dri1, -+ AS_HELP_STRING([--disable-dri1], -+ [Disable DRI1 support [[default=yes]]]), -+ [DRI1=$enableval], -+ [DRI1=yes]) -+AC_ARG_ENABLE(dri2, -+ AS_HELP_STRING([--disable-dri2], -+ [Disable DRI2 support [[default=yes]]]), -+ [DRI2=$enableval], -+ [DRI2=yes]) -+AC_ARG_ENABLE(dri3, -+ AS_HELP_STRING([--disable-dri3], -+ [Disable DRI3 support [[default=yes]]]), -+ [DRI3=$enableval], -+ [DRI3=yes]) - - AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--disable-xvmc], - [Disable XvMC support [[default=yes]]]), -@@ -461,15 +476,15 @@ if test "x$UMS" = "xyes"; then - AC_DEFINE(UMS,1,[Assume UMS support]) - fi - --DRI1=no -+have_dri1=no - XORG_DRIVER_CHECK_EXT(XF86DRI, xf86driproto) --if test "x$_EXT_CHECK" != "xno" -a "x$DRI" != "xno" -a "x$UMS" = "xyes"; then -- PKG_CHECK_MODULES(DRI1, [xf86driproto], [DRI1=$DRI], [DRI1=no]) -+if test "x$_EXT_CHECK" != "xno" -a "x$DRI" != "xno" -a "x$DRI1" != "xno" -a "x$UMS" = "xyes"; then -+ PKG_CHECK_MODULES(DRI1, [xf86driproto], [have_dri1=$DRI], [have_dri1=no]) - save_CFLAGS="$CFLAGS" - save_CPPFLAGS="$CPPFLAGS" - CFLAGS="$CFLAGS $XORG_CFLAGS $DRI1_CFLAGS $DRM_CFLAGS" - CPPFLAGS="$CPPFLAGS $XORG_CFLAGS $DRI1_CFLAGS $DRM_CFLAGS" -- AC_CHECK_HEADERS([dri.h sarea.h dristruct.h], [], [DRI1=no], -+ AC_CHECK_HEADERS([dri.h sarea.h dristruct.h], [], [have_dri1=no], - [/* for dri.h */ - #include <xf86str.h> - /* for dristruct.h */ -@@ -486,49 +501,55 @@ if test "x$_EXT_CHECK" != "xno" -a "x$DRI" != "xno" -a "x$UMS" = "xyes"; then - fi - - AC_MSG_CHECKING([whether to include DRI1 support]) --AC_MSG_RESULT([$DRI1]) -+AC_MSG_RESULT([$have_dri1]) - --AM_CONDITIONAL(DRI1, test "x$DRI1" != "xno") --if test "x$DRI1" != "xno"; then -+AM_CONDITIONAL(DRI1, test "x$have_dri1" != "xno") -+if test "x$have_dri1" != "xno"; then - AC_DEFINE(HAVE_DRI1,1,[Enable DRI1 driver support]) - dri_msg="$dri_msg DRI1" - else - DRI1_CFLAGS="" - DRI1_LIBS="" - -- if test "x$DRI" = "xyes" -a "x$UMS" = "xyes"; then -+ if test "x$DRI" = "xyes" -a "x$UMS" = "xyes" -a "x$DRI1" != "xno"; then - AC_MSG_ERROR([DRI1 requested but prerequisites not found]) - fi - fi - --DRI2=no --DRI3=no -+have_dri2=no -+have_dri3=no - if test "x$DRI" != "xno"; then -- PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6], [DRI2=$DRI], [DRI2=no]) -- dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri` -- if test "x$dridriverdir" = "x"; then -- dridriverdir="$libdir/dri" -- fi -- AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI2 driver path]) - if test "x$DRI2" != "xno"; then -+ PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6], [have_dri2=$DRI], [have_dri2=no]) -+ fi -+ if test "x$have_dri2" != "xno"; then - save_CFLAGS=$CFLAGS - CFLAGS="$XORG_CFLAGS $DRM_CFLAGS $DRI1_CFLAGS $DRI2_CFLAGS" -- AC_CHECK_HEADERS([dri2.h], [], [DRI2=no], [ -+ AC_CHECK_HEADERS([dri2.h], [], [have_dri2=no], [ - #include <dixstruct.h> - #include <drm.h> - ]) - CFLAGS=$save_CFLAGS - fi -- -- XORG_DRIVER_CHECK_EXT(DRI3, dri3proto) -- if test "x$_EXT_CHECK" != "xno"; then -- PKG_CHECK_MODULES(DRI3, [dri3proto], [DRI3=$DRI], []) -+ if test "x$have_dri2" != "xno"; then -+ dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri` -+ if test "x$dridriverdir" = "x"; then -+ dridriverdir="$libdir/dri" -+ fi -+ AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default have_dri2 driver path]) - fi -+ - if test "x$DRI3" != "xno"; then -+ XORG_DRIVER_CHECK_EXT(DRI3, dri3proto) -+ if test "x$_EXT_CHECK" != "xno"; then -+ PKG_CHECK_MODULES(DRI3, [dri3proto], [have_dri3=$DRI], []) -+ fi -+ fi -+ if test "x$have_dri3" != "xno"; then - save_CFLAGS=$CFLAGS - CFLAGS="$XORG_CFLAGS $DRI3_CFLAGS" -- AC_CHECK_DECL(DRI3, [], [DRI3=no], [#include <xorg-server.h>]) -- AC_CHECK_HEADERS([misyncstr.h misyncshm.h], [], [DRI3=no], [ -+ AC_CHECK_DECL(DRI3, [], [have_dri3=no], [#include <xorg-server.h>]) -+ AC_CHECK_HEADERS([misyncstr.h misyncshm.h], [], [have_dri3=no], [ - #include <xorg-server.h> - #include <xf86str.h> - #include <misync.h> -@@ -538,13 +559,13 @@ if test "x$DRI" != "xno"; then - fi - - AC_MSG_CHECKING([whether to include DRI2 support]) --AM_CONDITIONAL(DRI2, test "x$DRI2" != "xno") --AC_MSG_RESULT([$DRI2]) --if test "x$DRI2" != "xno"; then -+AM_CONDITIONAL(DRI2, test "x$have_dri2" != "xno") -+AC_MSG_RESULT([$have_dri2]) -+if test "x$have_dri2" != "xno"; then - AC_DEFINE(HAVE_DRI2,1,[Enable DRI2 driver support]) - dri_msg="$dri_msg DRI2" - else -- if test "x$DRI" = "xyes" -a "x$KMS" = "xyes"; then -+ if test "x$DRI" = "xyes" -a "x$DRI2" != "xno" -a "x$KMS" = "xyes"; then - AC_MSG_ERROR([DRI2 requested but prerequisites not found]) - fi - -@@ -553,13 +574,13 @@ else - fi - - AC_MSG_CHECKING([whether to include DRI3 support]) --AM_CONDITIONAL(DRI3, test "x$DRI3" != "xno") --AC_MSG_RESULT([$DRI3]) --if test "x$DRI3" != "xno"; then -+AM_CONDITIONAL(DRI3, test "x$have_dri3" != "xno") -+AC_MSG_RESULT([$have_dri3]) -+if test "x$have_dri3" != "xno"; then - AC_DEFINE(HAVE_DRI3,1,[Enable DRI3 driver support]) - dri_msg="$dri_msg DRI3" - else -- if test "x$DRI" = "xyes" -a "x$KMS" = "xyes"; then -+ if test "x$DRI" = "xyes" -a "x$DRI3" != "xno" -a "x$KMS" = "xyes"; then - AC_MSG_ERROR([DRI3 requested but prerequisites not found]) - fi - fi diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch deleted file mode 100644 index 9e93ca875c..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch +++ /dev/null @@ -1,50 +0,0 @@ -Upstream-Status: Submitted -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From ec91cfe7e5efdd5e1b1fbb85eea8f07b50e24c4b Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Wed, 11 Sep 2013 21:12:37 +0100 -Subject: [PATCH] test: only build DRI2 tests if DRI2 is enabled - -Signed-off-by: Ross Burton <ross.burton@intel.com> ---- - test/Makefile.am | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/test/Makefile.am b/test/Makefile.am -index f51967b..18528a9 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -16,9 +16,14 @@ stress_TESTS = \ - render-copyarea-size \ - render-copy-alphaless \ - mixed-stress \ -+ $(NULL) -+ -+if DRI2 -+stress_TESTS += \ - dri2-swap \ - dri2-race \ - $(NULL) -+endif - - check_PROGRAMS = $(stress_TESTS) - -@@ -34,9 +39,14 @@ libtest_la_SOURCES = \ - test_image.c \ - test_log.c \ - test_render.c \ -+ $(NULL) -+ -+if DRI2 -+libtest_la_SOURCES += \ - dri2.c \ - dri2.h \ - $(NULL) -+endif - - vsync.avi: mkvsync.sh - ./mkvsync.sh $@ --- -1.7.10.4 - diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb deleted file mode 100644 index cd8fd63b51..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb +++ /dev/null @@ -1,32 +0,0 @@ -require xorg-driver-video.inc - -SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver" - -DESCRIPTION = "intel is an Xorg driver for Intel integrated graphics \ -chipsets. The driver supports depths 8, 15, 16 and 24. On some chipsets, \ -the driver supports hardware accelerated 3D via the Direct Rendering \ -Infrastructure (DRI)." - -LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" - -DEPENDS += "virtual/libx11 drm libpciaccess pixman" - -SRC_URI += "file://disable-dri2-tests.patch \ - file://compat-api-Map-changes-of-DamageUnregister-API-in-1..patch \ - " - -PACKAGECONFIG ??= "sna udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" - -PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xf86driproto dri2proto" -PACKAGECONFIG[sna] = "--enable-sna,--disable-sna" -PACKAGECONFIG[uxa] = "--enable-uxa,--disable-uxa" -PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" -PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" - -# --enable-kms-only option is required by ROOTLESS_X -EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}' - -COMPATIBLE_HOST = '(i.86|x86_64).*-linux' - -SRC_URI[md5sum] = "8b646d257ace8197d6ab4e5ddeb8efb2" -SRC_URI[sha256sum] = "7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc" diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb index a10cd9e278..26b68b461c 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb @@ -9,13 +9,12 @@ Infrastructure (DRI)." LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" -SRC_URI += "file://configure-dri.patch \ - file://disable-x11-dri3.patch \ +SRC_URI += "file://disable-x11-dri3.patch \ file://always_include_xorg_server.h.patch \ " -SRC_URI[md5sum] = "88d1a884f9b7bd07bf0755cfa34052d4" -SRC_URI[sha256sum] = "7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501" +SRC_URI[md5sum] = "fa196a66e52c0c624fe5d350af7a5e7b" +SRC_URI[sha256sum] = "00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf9667c9" DEPENDS += "virtual/libx11 drm libpciaccess pixman" diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.8.1.bb b/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.9.0.bb index 5bb89266cd..b22078792a 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.8.1.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.9.0.bb @@ -4,5 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5e53d3fcadb1c23d122ad63cb099a918" SUMMARY = "X.Org X server -- modesetting display driver" DESCRIPTION = "Provides a generic kernel modesetting display driver for the X.Org X server." -SRC_URI[md5sum] = "eb275e1ff0031897bcf23e2e5cb8655a" -SRC_URI[sha256sum] = "3ba8d8d7cb679497abc6486e2e843f8ea1582d830a27448ed4c90413e58312ca" +SRC_URI[md5sum] = "da588d4f54111c2deae035998058ce10" +SRC_URI[sha256sum] = "90cf085573203dfadd48ea69bd694c4d04ccbe088b6855e9c85c34bb8a95d75c" diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc index 17fac8b8c0..7ddd1c7da5 100644 --- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc @@ -11,12 +11,12 @@ DEPENDS = "virtual/xserver xproto randrproto util-macros" SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" -S = "${WORKDIR}/${BPN}-${PV}" - FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +# depends on virtual/xserver +REQUIRED_DISTRO_FEATURES = "x11" # FIXME: We don't want to include the libtool archives (*.la) from modules # directory, as they serve no useful purpose. Upstream should fix Makefile.am diff --git a/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb b/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb index 8b42991d1c..03f70bfe67 100644 --- a/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb +++ b/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb @@ -16,11 +16,12 @@ RDEPENDS_${PN}_class-native = "mkfontdir-native mkfontscale-native" PR = "${INC_PR}.0" -do_configure_prepend() { - sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\" pkg-config#g" ${S}/fontutil.m4.in -} - BBCLASSEXTEND = "native" SRC_URI[md5sum] = "ddfc8a89d597651408369d940d03d06b" SRC_URI[sha256sum] = "dfa9e55625a4e0250f32fabab1fd5c8ffcd2d1ff2720d6fcf0f74bc8a5929195" + +SYSROOT_PREPROCESS_FUNCS += "fontutil_sysroot_preprocess" +fontutil_sysroot_preprocess () { + sysroot_stage_dir ${D}${datadir}/fonts/ ${SYSROOT_DESTDIR}${datadir}/fonts/ +} diff --git a/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/meta/recipes-graphics/xorg-font/xorg-font-common.inc index 55adde3608..d3b995a358 100644 --- a/meta/recipes-graphics/xorg-font/xorg-font-common.inc +++ b/meta/recipes-graphics/xorg-font/xorg-font-common.inc @@ -15,13 +15,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig -EXTRA_OEMAKE += "FCCACHE=/bin/true" - -do_configure_prepend() { - if [ -f "${S}"/configure.ac ] ; then - sed -i "s#^MAPFILES_PATH=.*#MAPFILES_PATH=\"${STAGING_DIR_TARGET}/\$(pkg-config --variable=mapdir fontutil)\"#g" "${S}"/configure.ac - fi -} +EXTRA_OEMAKE += "FCCACHE=/bin/true UTIL_DIR=${STAGING_DIR_TARGET}\$\(MAPFILES_PATH\)" do_install_append() { find ${D}${libdir}/X11/fonts -type f -name fonts.dir | xargs rm -f diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb index 3688685509..bee500b43a 100644 --- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb @@ -15,13 +15,15 @@ PR = "r2" inherit allarch +S = "${WORKDIR}/misc" + PACKAGES = "${PN}" FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/" RDEPENDS_${PN} += "font-alias" do_install() { install -d ${D}/${datadir}/fonts/X11/misc - install -m 0644 ${WORKDIR}/misc/* ${D}/${datadir}/fonts/X11/misc/ + install -m 0644 ${S}/* ${D}/${datadir}/fonts/X11/misc/ install -d ${D}/${libdir}/X11 ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s } diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.2.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.3.bb index d837bbd047..bbba24eb9a 100644 --- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.2.bb +++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.3.bb @@ -8,7 +8,7 @@ require xorg-lib-common.inc LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068" -SRC_URI[md5sum] = "b7c0d3afce14eedca57312a3141ec13a" -SRC_URI[sha256sum] = "abab8c2b050afb89bc29280e9c6b50ec5867174960d88bfb81a01036ec20de19" +SRC_URI[md5sum] = "1f65be5ffc55641c1846c2f41d180d00" +SRC_URI[sha256sum] = "6cd76ccae4e06eee47d3ead84a118740e9406e2a9b7adc9b08e92c69ce89c2e3" REQUIRED_DISTRO_FEATURES = "" diff --git a/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb b/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb index 3e7ef27bed..5514c7f5e8 100644 --- a/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb +++ b/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb @@ -7,7 +7,6 @@ SECTION = "x11/libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=6edc1fea03d959f0c2d743fe5ca746ad" -PARALLEL_MAKE = "" #DEPENDS = "xcb-proto xproto libxau libxslt-native" # DEPENDS += "xsltproc-native gperf-native" diff --git a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb index 180acfae0b..1925136369 100644 --- a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb +++ b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb @@ -11,7 +11,12 @@ require xorg-lib-common.inc LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb37f44e02bdbde80546024400728d" -DEPENDS += "libice xproto xtrans e2fsprogs" +DEPENDS += "libice xproto xtrans" + +# libSM can work without libuuid, we explicitly disable it to break the following circular dependency +# when DISTRO_FEATURES contains 'systemd' and 'x11'. +# systemd -> dbus -> libsm -> util-linux -> systemd +EXTRA_OECONF += "--without-libuuid" PE = "1" diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.10.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.10.bb deleted file mode 100644 index d88b025e1f..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxcb_1.10.bb +++ /dev/null @@ -1,10 +0,0 @@ -include libxcb.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" - - -DEPENDS += "libxdmcp" - -SRC_URI[md5sum] = "074c335cc4453467eeb234e3dadda700" -SRC_URI[sha256sum] = "98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5" diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb new file mode 100644 index 0000000000..c162702105 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb @@ -0,0 +1,10 @@ +include libxcb.inc + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" + + +DEPENDS += "libxdmcp" + +SRC_URI[md5sum] = "5a873ebd383d1a60612dd6ec6b42c781" +SRC_URI[sha256sum] = "03635d70045b9ede90778e67516135828a57de87ac508f987024f43c03620ff7" diff --git a/meta/recipes-graphics/xorg-lib/libxext_1.3.2.bb b/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb index ec66175684..efa8b65ace 100644 --- a/meta/recipes-graphics/xorg-lib/libxext_1.3.2.bb +++ b/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb @@ -22,5 +22,5 @@ XORG_PN = "libXext" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "4376101e51bb2c6c44d9ab14344e85ad" -SRC_URI[sha256sum] = "f829075bc646cdc085fa25d98d5885d83b1759ceb355933127c257e8e50432e0" +SRC_URI[md5sum] = "52df7c4c1f0badd9f82ab124fb32eb97" +SRC_URI[sha256sum] = "b518d4d332231f313371fdefac59e3776f4f0823bcb23cf7c7305bfb57b16e35" diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.3.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb index 0dd295678e..a166b57603 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb @@ -2,15 +2,15 @@ SUMMARY = "Generic XKB keymap library" DESCRIPTION = "libxkbcommon is a keymap compiler and support library which \ processes a reduced subset of keymaps as defined by the XKB specification." HOMEPAGE = "http://www.xkbcommon.org" -LIC_FILES_CHKSUM = "file://COPYING;md5=9c0b824e72a22f9d2c40b9c93b1f0ddc" +LIC_FILES_CHKSUM = "file://COPYING;md5=09457b156e3155972abebcaaaa0cb434" LICENSE = "MIT & MIT-style" DEPENDS = "util-macros flex-native bison-native" SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "26c57ff21438ed45de2a4ca609177db9" -SRC_URI[sha256sum] = "9a52d5d0419e76c49c0ece86208c205ffacb1cf0ff8ffbaba98d3d4dd40c4e41" +SRC_URI[md5sum] = "2e1faeafcc609c30af3a561a91e84158" +SRC_URI[sha256sum] = "90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c" inherit autotools pkgconfig diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-image_0.3.9.bb b/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb index 1d36893f93..91464b6c98 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util-image_0.3.9.bb +++ b/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb @@ -6,6 +6,5 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://image/xcb_image.c;endline=24;md5=eafdf965cfb89955fdedf75054223fb4 \ file://image/xcb_image.h;beginline=4;endline=27;md5=48cd25ae55e7de525fe1e1a3a7672e1c" -SRC_URI[md5sum] = "fabb80b36490b00fc91289e2c7f66770" -SRC_URI[sha256sum] = "d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df" - +SRC_URI[md5sum] = "08fe8ffecc8d4e37c0ade7906b3f4c87" +SRC_URI[sha256sum] = "2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc"
\ No newline at end of file diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.3.9.bb b/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb index 39ead34e92..bca64ed61f 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.3.9.bb +++ b/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb @@ -3,8 +3,7 @@ require xcb-util.inc LICENSE = "MIT" LIC_FILES_CHKSUM = "file://keysyms/keysyms.c;endline=30;md5=2f8de023ed823bb92f0b47900574ea9e \ " - -SRC_URI[md5sum] = "64e4aad2d48cd4a92e2da13b9f35bfd2" -SRC_URI[sha256sum] = "7be1acf053bd68a1910fc861b2cbcbad7637b5618590dd5484d43a96f7995c6e" +SRC_URI[md5sum] = "1022293083eec9e62d5659261c29e367" +SRC_URI[sha256sum] = "0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9" diff --git a/meta/recipes-graphics/xorg-lib/xcb-util.inc b/meta/recipes-graphics/xorg-lib/xcb-util.inc index 7dad545c33..d15cf9fba1 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util.inc +++ b/meta/recipes-graphics/xorg-lib/xcb-util.inc @@ -16,8 +16,6 @@ SECTION = "x11/libs" DEPENDS = "libxcb" DEPENDS += "gperf-native" -PARALLEL_MAKE = "" - SRC_URI = "http://xcb.freedesktop.org/dist/${BPN}-${PV}.tar.bz2" inherit autotools pkgconfig diff --git a/meta/recipes-graphics/xorg-lib/xcb-util_0.3.9.bb b/meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb index c5d8858115..206f07a65c 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util_0.3.9.bb +++ b/meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb @@ -4,5 +4,5 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://src/xcb_aux.c;endline=30;md5=ae305b9c2a38f9ba27060191046a6460 \ file://src/xcb_event.h;endline=27;md5=627be355aee59e1b8ade80d5bd90fad9" -SRC_URI[md5sum] = "01dcc7a16d5020530552712710646ea2" -SRC_URI[sha256sum] = "c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4" +SRC_URI[md5sum] = "2e97feed81919465a04ccc71e4073313" +SRC_URI[sha256sum] = "46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9" diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.13.bb index adac0eedd8..5536b6217a 100644 --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.13.bb @@ -13,8 +13,8 @@ LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" SRC_URI="${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "1fd54ceb9092d1dbcaabaf03653092bc" -SRC_URI[sha256sum] = "65b62b95b77b609cb6c0439e0148c48c3ab7dcb5c90eb8d34cf1cb8f360cca44" +SRC_URI[md5sum] = "a415775ca8ecf4dfafc9488b8cbd7114" +SRC_URI[sha256sum] = "7b5be9f2b9a30102512b15308aec55f7f54289df24ac21de82ebb4bf145f9fce" SECTION = "x11/libs" DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native" diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.3.4.bb b/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb index f2b89217bb..d5b7f1a2c6 100644 --- a/meta/recipes-graphics/xorg-lib/xtrans_1.3.4.bb +++ b/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb @@ -20,5 +20,5 @@ inherit gettext BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "a615e17d9fee6f097fc3b716eacb3dca" -SRC_URI[sha256sum] = "054d4ee3efd52508c753e9f7bc655ef185a29bd2850dd9e2fc2ccc33544f583a" +SRC_URI[md5sum] = "c5ba432dd1514d858053ffe9f4737dd8" +SRC_URI[sha256sum] = "adbd3b36932ce4c062cd10f57d78a156ba98d618bdb6f50664da327502bc8301" diff --git a/meta/recipes-graphics/xorg-proto/presentproto_git.bb b/meta/recipes-graphics/xorg-proto/presentproto_git.bb index 7fca51d31e..dbb6f32bc0 100644 --- a/meta/recipes-graphics/xorg-proto/presentproto_git.bb +++ b/meta/recipes-graphics/xorg-proto/presentproto_git.bb @@ -17,6 +17,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/presentproto" S = "${WORKDIR}/git" -inherit autotools-brokensep +PR = "r1" + +inherit autotools BBCLASSEXTEND = "native" diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.10.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.11.bb index 0b67b5703e..5bc5a112e5 100644 --- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.10.bb +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.11.bb @@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \ file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65" -SRC_URI[md5sum] = "ade74b8e9c870dc7515adfa209e66063" -SRC_URI[sha256sum] = "7ef40ddd855b750bc597d2a435da21e55e502a0fefa85b274f2c922800baaf05" +SRC_URI[md5sum] = "6bf2797445dc6d43e9e4707c082eff9c" +SRC_URI[sha256sum] = "b4aceee6502a0ce45fc39b33c541a2df4715d00b72e660ebe8c5bb444771e32e" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb index 549c7c89bf..5420b7d23e 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb @@ -7,6 +7,8 @@ PR = "r33" SRC_URI = "file://xorg.conf" +S = "${WORKDIR}" + CONFFILES_${PN} = "${sysconfdir}/X11/xorg.conf" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index dd60884992..f0da488412 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -117,6 +117,7 @@ EXTRA_OECONF += "--with-fop=no \ " PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)}" + PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto" PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" @@ -126,6 +127,7 @@ PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,glproto virtua PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" +PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus," do_install_append () { # Its assumed base-files creates this for us diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-Check-strings-length-against-request-size.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-Check-strings-length-against-request-size.patch new file mode 100644 index 0000000000..b0e2bcad43 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-Check-strings-length-against-request-size.patch @@ -0,0 +1,145 @@ +From 20079c36cf7d377938ca5478447d8b9045cb7d43 Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan <ofourdan@redhat.com> +Date: Fri, 16 Jan 2015 08:44:45 +0100 +Subject: [PATCH] xkb: Check strings length against request size + +Ensure that the given strings length in an XkbSetGeometry request remain +within the limits of the size of the request. + +Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> +Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +Upstream-Status: backport + +Signed-off-by: Li Zhou <li.zhou@windriver.com> +--- + xkb/xkb.c | 65 +++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 40 insertions(+), 25 deletions(-) + +diff --git a/xkb/xkb.c b/xkb/xkb.c +index b9a3ac4..f3988f9 100644 +--- a/xkb/xkb.c ++++ b/xkb/xkb.c +@@ -4957,25 +4957,29 @@ ProcXkbGetGeometry(ClientPtr client) + + /***====================================================================***/ + +-static char * +-_GetCountedString(char **wire_inout, Bool swap) ++static Status ++_GetCountedString(char **wire_inout, ClientPtr client, char **str) + { +- char *wire, *str; ++ char *wire, *next; + CARD16 len; + + wire = *wire_inout; + len = *(CARD16 *) wire; +- if (swap) { ++ if (client->swapped) { + swaps(&len); + } +- str = malloc(len + 1); +- if (str) { +- memcpy(str, &wire[2], len); +- str[len] = '\0'; +- } +- wire += XkbPaddedSize(len + 2); +- *wire_inout = wire; +- return str; ++ next = wire + XkbPaddedSize(len + 2); ++ /* Check we're still within the size of the request */ ++ if (client->req_len < ++ bytes_to_int32(next - (char *) client->requestBuffer)) ++ return BadValue; ++ *str = malloc(len + 1); ++ if (!*str) ++ return BadAlloc; ++ memcpy(*str, &wire[2], len); ++ *(*str + len) = '\0'; ++ *wire_inout = next; ++ return Success; + } + + static Status +@@ -4987,6 +4991,7 @@ _CheckSetDoodad(char **wire_inout, + xkbAnyDoodadWireDesc any; + xkbTextDoodadWireDesc text; + XkbDoodadPtr doodad; ++ Status status; + + dWire = (xkbDoodadWireDesc *) (*wire_inout); + any = dWire->any; +@@ -5036,8 +5041,14 @@ _CheckSetDoodad(char **wire_inout, + doodad->text.width = text.width; + doodad->text.height = text.height; + doodad->text.color_ndx = dWire->text.colorNdx; +- doodad->text.text = _GetCountedString(&wire, client->swapped); +- doodad->text.font = _GetCountedString(&wire, client->swapped); ++ status = _GetCountedString(&wire, client, &doodad->text.text); ++ if (status != Success) ++ return status; ++ status = _GetCountedString(&wire, client, &doodad->text.font); ++ if (status != Success) { ++ free (doodad->text.text); ++ return status; ++ } + break; + case XkbIndicatorDoodad: + if (dWire->indicator.onColorNdx >= geom->num_colors) { +@@ -5072,7 +5083,9 @@ _CheckSetDoodad(char **wire_inout, + } + doodad->logo.color_ndx = dWire->logo.colorNdx; + doodad->logo.shape_ndx = dWire->logo.shapeNdx; +- doodad->logo.logo_name = _GetCountedString(&wire, client->swapped); ++ status = _GetCountedString(&wire, client, &doodad->logo.logo_name); ++ if (status != Success) ++ return status; + break; + default: + client->errorValue = _XkbErrCode2(0x4F, dWire->any.type); +@@ -5304,18 +5317,20 @@ _CheckSetGeom(XkbGeometryPtr geom, xkbSetGeometryReq * req, ClientPtr client) + char *wire; + + wire = (char *) &req[1]; +- geom->label_font = _GetCountedString(&wire, client->swapped); ++ status = _GetCountedString(&wire, client, &geom->label_font); ++ if (status != Success) ++ return status; + + for (i = 0; i < req->nProperties; i++) { + char *name, *val; + +- name = _GetCountedString(&wire, client->swapped); +- if (!name) +- return BadAlloc; +- val = _GetCountedString(&wire, client->swapped); +- if (!val) { ++ status = _GetCountedString(&wire, client, &name); ++ if (status != Success) ++ return status; ++ status = _GetCountedString(&wire, client, &val); ++ if (status != Success) { + free(name); +- return BadAlloc; ++ return status; + } + if (XkbAddGeomProperty(geom, name, val) == NULL) { + free(name); +@@ -5349,9 +5364,9 @@ _CheckSetGeom(XkbGeometryPtr geom, xkbSetGeometryReq * req, ClientPtr client) + for (i = 0; i < req->nColors; i++) { + char *name; + +- name = _GetCountedString(&wire, client->swapped); +- if (!name) +- return BadAlloc; ++ status = _GetCountedString(&wire, client, &name); ++ if (status != Success) ++ return status; + if (!XkbAddGeomColor(geom, name, geom->num_colors)) { + free(name); + return BadAlloc; +-- +1.7.9.5 + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch new file mode 100644 index 0000000000..c841dbe87e --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch @@ -0,0 +1,109 @@ +From 81c90dc8f0aae3b65730409b1b615b5fa7280ebd Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan <ofourdan@redhat.com> +Date: Fri, 16 Jan 2015 20:08:59 +0100 +Subject: [PATCH] xkb: Don't swap XkbSetGeometry data in the input buffer + +The XkbSetGeometry request embeds data which needs to be swapped when the +server and the client have different endianess. + +_XkbSetGeometry() invokes functions that swap these data directly in the +input buffer. + +However, ProcXkbSetGeometry() may call _XkbSetGeometry() more than once +(if there is more than one keyboard), thus causing on swapped clients the +same data to be swapped twice in memory, further causing a server crash +because the strings lengths on the second time are way off bounds. + +To allow _XkbSetGeometry() to run reliably more than once with swapped +clients, do not swap the data in the buffer, use variables instead. + +Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +Upstream-Status: backport + +Signed-off-by: Li Zhou <li.zhou@windriver.com> +--- + xkb/xkb.c | 35 +++++++++++++++++++---------------- + 1 file changed, 19 insertions(+), 16 deletions(-) + +diff --git a/xkb/xkb.c b/xkb/xkb.c +index 15c7f34..b9a3ac4 100644 +--- a/xkb/xkb.c ++++ b/xkb/xkb.c +@@ -4961,14 +4961,13 @@ static char * + _GetCountedString(char **wire_inout, Bool swap) + { + char *wire, *str; +- CARD16 len, *plen; ++ CARD16 len; + + wire = *wire_inout; +- plen = (CARD16 *) wire; ++ len = *(CARD16 *) wire; + if (swap) { +- swaps(plen); ++ swaps(&len); + } +- len = *plen; + str = malloc(len + 1); + if (str) { + memcpy(str, &wire[2], len); +@@ -4985,25 +4984,28 @@ _CheckSetDoodad(char **wire_inout, + { + char *wire; + xkbDoodadWireDesc *dWire; ++ xkbAnyDoodadWireDesc any; ++ xkbTextDoodadWireDesc text; + XkbDoodadPtr doodad; + + dWire = (xkbDoodadWireDesc *) (*wire_inout); ++ any = dWire->any; + wire = (char *) &dWire[1]; + if (client->swapped) { +- swapl(&dWire->any.name); +- swaps(&dWire->any.top); +- swaps(&dWire->any.left); +- swaps(&dWire->any.angle); ++ swapl(&any.name); ++ swaps(&any.top); ++ swaps(&any.left); ++ swaps(&any.angle); + } + CHK_ATOM_ONLY(dWire->any.name); +- doodad = XkbAddGeomDoodad(geom, section, dWire->any.name); ++ doodad = XkbAddGeomDoodad(geom, section, any.name); + if (!doodad) + return BadAlloc; + doodad->any.type = dWire->any.type; + doodad->any.priority = dWire->any.priority; +- doodad->any.top = dWire->any.top; +- doodad->any.left = dWire->any.left; +- doodad->any.angle = dWire->any.angle; ++ doodad->any.top = any.top; ++ doodad->any.left = any.left; ++ doodad->any.angle = any.angle; + switch (doodad->any.type) { + case XkbOutlineDoodad: + case XkbSolidDoodad: +@@ -5026,12 +5028,13 @@ _CheckSetDoodad(char **wire_inout, + dWire->text.colorNdx); + return BadMatch; + } ++ text = dWire->text; + if (client->swapped) { +- swaps(&dWire->text.width); +- swaps(&dWire->text.height); ++ swaps(&text.width); ++ swaps(&text.height); + } +- doodad->text.width = dWire->text.width; +- doodad->text.height = dWire->text.height; ++ doodad->text.width = text.width; ++ doodad->text.height = text.height; + doodad->text.color_ndx = dWire->text.colorNdx; + doodad->text.text = _GetCountedString(&wire, client->swapped); + doodad->text.font = _GetCountedString(&wire, client->swapped); +-- +1.7.9.5 + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/Fix-subwindow-in-Xi-emulated-events.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/Fix-subwindow-in-Xi-emulated-events.patch new file mode 100644 index 0000000000..604d23a376 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/Fix-subwindow-in-Xi-emulated-events.patch @@ -0,0 +1,41 @@ +From db424318d0bb29cbcdf3a07fcc2e023586f1219f Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan <fourdan@xfce.org> +Date: Fri, 2 Jan 2015 18:50:17 +0100 +Subject: [PATCH] Fix subwindow in Xi emulated events + +Bug: 70790 +Upstream status: Submitted + https://bugs.freedesktop.org/show_bug.cgi?id=70790 + +Signed-off-by: Olivier Fourdan <fourdan@xfce.org> +--- + Xi/exevents.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Xi/exevents.c b/Xi/exevents.c +index b0bc47e..0857bce 100644 +--- a/Xi/exevents.c ++++ b/Xi/exevents.c +@@ -1403,7 +1403,7 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, + + if (grab->ownerEvents) { + WindowPtr focus = NullWindow; +- WindowPtr sprite_win = dev->spriteInfo->sprite->win; ++ WindowPtr sprite_win = DeepestSpriteWin(dev->spriteInfo->sprite); + + deliveries = DeliverDeviceEvents(sprite_win, ptrev, grab, focus, dev); + } +@@ -1429,8 +1429,9 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, + } + else { + GrabPtr devgrab = dev->deviceGrab.grab; ++ WindowPtr sprite_win = DeepestSpriteWin(dev->spriteInfo->sprite); + +- DeliverDeviceEvents(win, ptrev, grab, win, dev); ++ DeliverDeviceEvents(sprite_win, ptrev, grab, win, dev); + /* FIXME: bad hack + * Implicit passive grab activated in response to this event. Store + * the event. +-- +2.1.0 + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch deleted file mode 100644 index 2f98bb8c89..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -diff --git a/configure.ac b/configure.ac -index b3b752c..600500b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, - dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross - dnl compiling, assume default font path uses standard FONTROOTDIR directories. - DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" --if test "$cross_compiling" != yes; then -- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], -- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], -- [case $host_os in -+ case $host_os in - darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; -- esac]) --fi -+ esac - AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), - [ FONTPATH="$withval" ], - [ FONTPATH="${DEFAULT_FONT_PATH}" ]) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch deleted file mode 100644 index 168368e6c3..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch +++ /dev/null @@ -1,29 +0,0 @@ -on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well -so we end up with incompatible conversion errors - -This patch choses the right values for mips64 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending -Index: xorg-server-1.13.0/hw/xfree86/common/compiler.h -=================================================================== ---- xorg-server-1.13.0-orig/hw/xfree86/common/compiler.h 2012-06-14 23:04:29.000000000 +0300 -+++ xorg-server-1.13.0/hw/xfree86/common/compiler.h 2012-11-08 10:06:50.865831783 +0200 -@@ -101,6 +101,7 @@ - #if defined(NO_INLINE) || defined(DO_PROTOTYPES) - #if !defined(__arm__) - #if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \ -+ && !defined(__mips64) \ - && !(defined(__alpha__) && defined(linux)) \ - && !(defined(__ia64__) && defined(linux)) \ - -@@ -721,7 +722,7 @@ - } - - #elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) --#ifdef __arm32__ -+#if defined (__arm32__) || defined (__mips64) - #define PORT_SIZE long - #else - #define PORT_SIZE short diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch deleted file mode 100644 index 13f3caf768..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch +++ /dev/null @@ -1,66 +0,0 @@ -[ YOCTO #6583 ] - -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 746be5a03ebbda4ab411ca3efb2ed95f99e9ea46 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Wed, 28 May 2014 08:13:59 +0100 -Subject: xfree86: Report DRI3 as a built-in module - -This is so that drivers can do a runtime check that DRI3 is available, -similar to existing runtime checks performed by the drivers for DRI and -DRI2. - -v2: Only add DRI3 to the list if the module was actually built into the -server (Mark Kettenis). - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> -Cc: Mark Kettenis <mark.kettenis@xs4all.nl> -Signed-off-by: Keith Packard <keithp@keithp.com> - -diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c -index 092bf57..f92ad8d 100644 ---- a/hw/xfree86/loader/loadmod.c -+++ b/hw/xfree86/loader/loadmod.c -@@ -838,6 +838,9 @@ static const char *compiled_in_modules[] = { - "extmod", - "dri", - "dri2", -+#if DRI3 -+ "dri3", -+#endif - NULL - }; - --- -cgit v0.10.2 - - -From 7ca458493aa2f0aa091c989ea0768611e0730bf5 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Wed, 28 May 2014 08:14:00 +0100 -Subject: xfree86: Report Present as a built-in module - -This is so that drivers can do a runtime check that Present is available, -similar to existing runtime checks performed by the drivers for DRI. - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> -Signed-off-by: Keith Packard <keithp@keithp.com> - -diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c -index f92ad8d..e1f649a 100644 ---- a/hw/xfree86/loader/loadmod.c -+++ b/hw/xfree86/loader/loadmod.c -@@ -841,6 +841,9 @@ static const char *compiled_in_modules[] = { - #if DRI3 - "dri3", - #endif -+#if PRESENT -+ "present", -+#endif - NULL - }; - --- -cgit v0.10.2 diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/xtrans.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xtrans.patch new file mode 100644 index 0000000000..e6dba04919 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xtrans.patch @@ -0,0 +1,38 @@ +Upstream-Status: Submitted +Signed-off-by: Ross Burton <ross.burton@intel.com> + +Since _XSERVTransClose frees the connection pointer passed to it, +remove that pointer from the array, so we don't try to double free it +if we come back into CloseWellKnownConnections again. + +Should fix https://bugzilla.yoctoproject.org/show_bug.cgi?id=6665 in which +the shutdown section of the main() loop called CloseWellKnownConnections() +and then moved on to ddxGiveUp(), which failed to release the VT and thus +called AbortServer(), which called CloseWellKnownConnections() again. + +Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> +Reviewed-by: Adam Jackson <ajax@redhat.com> +--- + os/connection.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/os/connection.c b/os/connection.c +index ddfe50a..7ff44e1 100644 +--- a/os/connection.c ++++ b/os/connection.c +@@ -513,8 +513,13 @@ CloseWellKnownConnections(void) + { + int i; + +- for (i = 0; i < ListenTransCount; i++) +- _XSERVTransClose(ListenTransConns[i]); ++ for (i = 0; i < ListenTransCount; i++) { ++ if (ListenTransConns[i] != NULL) { ++ _XSERVTransClose(ListenTransConns[i]); ++ ListenTransConns[i] = NULL; ++ } ++ } ++ ListenTransCount = 0; + } + + static void diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.3.bb index 3bba3ce0bf..cfbc491fcc 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.3.bb @@ -1,16 +1,17 @@ require xserver-xorg.inc # Misc build failure for master HEAD -SRC_URI += "file://crosscompile.patch \ - file://fix_open_max_preprocessor_error.patch \ - file://mips64-compiler.patch \ +SRC_URI += "file://fix_open_max_preprocessor_error.patch \ file://xorg-CVE-2013-6424.patch \ file://xshmfence-option.patch \ - file://present-module.patch \ + file://Fix-subwindow-in-Xi-emulated-events.patch \ + file://xtrans.patch \ + file://0001-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch \ + file://0001-xkb-Check-strings-length-against-request-size.patch \ " -SRC_URI[md5sum] = "e4c70262ed89764be8f8f5d699ed9227" -SRC_URI[sha256sum] = "626db6882602ebe1ff81f7a4231c7ccc6ceb5032f2b5b3954bf749e1567221e2" +SRC_URI[md5sum] = "afd93977235584a9caa7528a737c1b52" +SRC_URI[sha256sum] = "5e0f443238af1078b48f6eea98a382861b59187da221c2cf714d31c1d560b0fb" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. diff --git a/meta/recipes-graphics/xrestop/xrestop_0.4.bb b/meta/recipes-graphics/xrestop/xrestop_0.4.bb index 20d66be55b..ce5df03936 100644 --- a/meta/recipes-graphics/xrestop/xrestop_0.4.bb +++ b/meta/recipes-graphics/xrestop/xrestop_0.4.bb @@ -19,4 +19,6 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/xrestop/xrestop-${PV}.tar. SRC_URI[md5sum] = "d8a54596cbaf037e62b80c4585a3ca9b" SRC_URI[sha256sum] = "67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb b/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb index 7e01775ce4..4bfddf06b5 100644 --- a/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb +++ b/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb @@ -23,7 +23,9 @@ SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \ SRC_URI[md5sum] = "9bcab80b474d5454477d1ca166a68c34" SRC_URI[sha256sum] = "27b9dc2203de9b1706ca39fa6ca80ecab8807909ec901c4a345b8e41178800a1" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" do_install_append() { install -d ${D}${sysconfdir}/X11/Xsession.d/ diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_git.bb index 7a329934b8..ef9f7376bc 100644 --- a/meta/recipes-kernel/blktrace/blktrace_git.bb +++ b/meta/recipes-kernel/blktrace/blktrace_git.bb @@ -19,6 +19,18 @@ EXTRA_OEMAKE = "\ 'CFLAGS=${CFLAGS}' \ 'LDFLAGS=${LDFLAGS}' \ " + +# There are a few parallel issues: +# 1) ../rbtree.o: error adding symbols: Invalid operation +# collect2: error: ld returned 1 exit status +# Makefile:42: recipe for target 'btt' failed +# 2) git/blkiomon.c:216: undefined reference to `rb_insert_color' +# collect2: error: ld returned 1 exit status +# Makefile:27: recipe for target 'blkparse' failed +# 3) ld: rbtree.o: invalid string offset 128 >= 125 for section `.strtab' +# 4) btreplay.o: file not recognized: File truncated +# collect2: error: ld returned 1 exit status +# btreplay/btreplay.c:47:18: fatal error: list.h: No such file or directory PARALLEL_MAKE = "" do_install() { diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb index df50e5a1c6..e6b10257f0 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb +++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.6.bb @@ -10,6 +10,7 @@ DEPENDS += "cryptodev-linux" SRC_URI += " \ file://0001-Disable-installing-header-file-provided-by-another-p.patch \ file://0002-In-the-3.13-rc1-Linux-kernel-the-INIT_COMPLETION-mac.patch \ +file://0001-ioctl.c-Fix-build-on-3.19.patch \ " EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' diff --git a/meta/recipes-kernel/cryptodev/cryptodev_1.6.inc b/meta/recipes-kernel/cryptodev/cryptodev_1.6.inc index 946faac7d2..6a93a35a39 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev_1.6.inc +++ b/meta/recipes-kernel/cryptodev/cryptodev_1.6.inc @@ -9,3 +9,5 @@ SRC_URI[md5sum] = "eade38998313c25fd7934719cdf8a2ea" SRC_URI[sha256sum] = "75f1425c8ea1f8cae523905a5a046a35092327a6152800b0b86efc4e56fb3e2f" S = "${WORKDIR}/cryptodev-linux-${PV}" + +CLEANBROKEN = "1" diff --git a/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch b/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch new file mode 100644 index 0000000000..74c8972536 --- /dev/null +++ b/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-on-3.19.patch @@ -0,0 +1,29 @@ +From 7d71124991030f99965e6e6aaed421115f185adb Mon Sep 17 00:00:00 2001 +From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> +Date: Mon, 9 Feb 2015 13:51:56 +0100 +Subject: [PATCH] ioctl.c: Fix build on 3.19 + +get_unused_fd() MACRO has been removed on kernel 3.19. Replace by the +actual output of the macro. + +Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> +--- + ioctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ioctl.c b/ioctl.c +index f26cf93..cf8cc17 100644 +--- a/ioctl.c ++++ b/ioctl.c +@@ -529,7 +529,7 @@ static int + clonefd(struct file *filp) + { + int ret; +- ret = get_unused_fd(); ++ ret = get_unused_fd_flags(0); + if (ret >= 0) { + get_file(filp); + fd_install(ret, filp); +-- +2.1.4 + diff --git a/meta/recipes-kernel/dtc/dtc.inc b/meta/recipes-kernel/dtc/dtc.inc index 95023b6e97..0c409b0c0b 100644 --- a/meta/recipes-kernel/dtc/dtc.inc +++ b/meta/recipes-kernel/dtc/dtc.inc @@ -4,16 +4,18 @@ SECTION = "bootloader" LICENSE = "GPLv2 | BSD" DEPENDS = "flex-native bison-native" -inherit autotools-brokensep - SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git \ file://make_install.patch \ " -EXTRA_OEMAKE='PREFIX="${prefix}" LIBDIR="${libdir}"' +EXTRA_OEMAKE='PREFIX="${prefix}" LIBDIR="${libdir}" DESTDIR="${D}"' S = "${WORKDIR}/git" +do_install () { + oe_runmake install +} + PACKAGES =+ "${PN}-misc" FILES_${PN}-misc = "${bindir}/convert-dtsv0 ${bindir}/ftdump ${bindir}/dtdiff" diff --git a/meta/recipes-kernel/dtc/dtc_git.bb b/meta/recipes-kernel/dtc/dtc_git.bb index 0bd3acf6c0..4446142a30 100644 --- a/meta/recipes-kernel/dtc/dtc_git.bb +++ b/meta/recipes-kernel/dtc/dtc_git.bb @@ -3,8 +3,8 @@ require dtc.inc LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c" -SRCREV = "65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf" -PV = "1.4.0+git${SRCPV}" +SRCREV = "302fca9f4c283e1994cf0a5a9ce1cf43ca15e6d2" +PV = "1.4.1+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index ce872354f2..a1ec198fde 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c DEPENDS = "git-native" -SRCREV = "23345b8846fe4bd167efdf1bd8a1224b2ba9a5ff" +SRCREV = "83e5493ea46067152609008ade131971eaebbb27" PR = "r12" PV = "0.2+git${SRCPV}" diff --git a/meta/recipes-kernel/kexec/kexec-tools.inc b/meta/recipes-kernel/kexec/kexec-tools.inc index 7e3b7adfc7..7797a25738 100644 --- a/meta/recipes-kernel/kexec/kexec-tools.inc +++ b/meta/recipes-kernel/kexec/kexec-tools.inc @@ -10,9 +10,11 @@ DEPENDS = "zlib xz" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz" -inherit autotools-brokensep +PR = "r1" -COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*|mips.*)-(linux|freebsd.*)' +inherit autotools + +COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|freebsd.*)' INSANE_SKIP_${PN} = "arch" diff --git a/meta/recipes-kernel/kexec/kexec-tools/kexec-aarch64.patch b/meta/recipes-kernel/kexec/kexec-tools/kexec-aarch64.patch new file mode 100644 index 0000000000..92b5631f78 --- /dev/null +++ b/meta/recipes-kernel/kexec/kexec-tools/kexec-aarch64.patch @@ -0,0 +1,779 @@ +From: Geoff Levand <geoff@infradead.org> +Date: Mon, 15 Jul 2013 23:32:36 +0000 (-0700) +Subject: Add arm64 support +X-Git-Url: https://git.linaro.org/gitweb?p=people%2Fgeoff%2Fkexec-tools.git;a=commitdiff_plain;h=fbf5ac6c2c70ec0f6da2b9ff563e573999752c01 + +Add arm64 support + +Signed-off-by: Geoff Levand <geoff@infradead.org> + +Get patch from: +https://fedorapeople.org/~hrw/aarch64/for-fedora/kexec-aarch64.patch + +Upstream-Status: Pending + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + +--- + configure.ac | 3 + kexec/Makefile | 1 + kexec/arch/arm64/Makefile | 13 + + kexec/arch/arm64/crashdump-arm64.c | 305 ++++++++++++++++++++++++++++++++ + kexec/arch/arm64/include/arch/options.h | 26 ++ + kexec/arch/arm64/kexec-arm64.c | 177 ++++++++++++++++++ + kexec/arch/arm64/kexec-arm64.h | 20 ++ + kexec/arch/arm64/kexec-elf-arm64.c | 114 +++++++++++ + kexec/kexec-syscall.h | 9 + kexec/kexec.c | 2 + purgatory/arch/arm64/Makefile | 7 + 11 files changed, 675 insertions(+), 2 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -35,6 +35,9 @@ case $target_cpu in + ARCH="ppc64" + SUBARCH="LE" + ;; ++ aarch64* ) ++ ARCH="arm64" ++ ;; + arm* ) + ARCH="arm" + ;; +--- a/kexec/Makefile ++++ b/kexec/Makefile +@@ -71,6 +71,7 @@ KEXEC_SRCS += $($(ARCH)_FS2DT) + + include $(srcdir)/kexec/arch/alpha/Makefile + include $(srcdir)/kexec/arch/arm/Makefile ++include $(srcdir)/kexec/arch/arm64/Makefile + include $(srcdir)/kexec/arch/i386/Makefile + include $(srcdir)/kexec/arch/ia64/Makefile + include $(srcdir)/kexec/arch/m68k/Makefile +--- /dev/null ++++ b/kexec/arch/arm64/Makefile +@@ -0,0 +1,13 @@ ++ ++arm64_KEXEC_SRCS += \ ++ kexec/arch/arm64/kexec-arm64.c \ ++ kexec/arch/arm64/kexec-elf-arm64.c \ ++ kexec/arch/arm64/crashdump-arm64.c ++ ++arm64_ARCH_REUSE_INITRD = ++arm64_ADD_SEGMENT = ++arm64_VIRT_TO_PHYS = ++ ++dist += $(arm64_KEXEC_SRCS) \ ++ kexec/arch/arm64/Makefile \ ++ kexec/arch/arm64/kexec-arm64.h +--- /dev/null ++++ b/kexec/arch/arm64/crashdump-arm64.c +@@ -0,0 +1,305 @@ ++/* ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation (version 2 of the License). ++ */ ++ ++#include "../../kexec.h" ++#include "../../kexec-elf.h" ++#include "../../crashdump.h" ++ ++int is_crashkernel_mem_reserved(void) ++{ ++ return 0; ++} ++ ++#if 0 ++/* ++ * Used to save various memory ranges/regions needed for the captured ++ * kernel to boot. (lime memmap= option in other archs) ++ */ ++static struct memory_range crash_memory_ranges[CRASH_MAX_MEMORY_RANGES]; ++struct memory_ranges usablemem_rgns = { ++ .size = 0, ++ .ranges = crash_memory_ranges, ++}; ++ ++/* memory range reserved for crashkernel */ ++static struct memory_range crash_reserved_mem; ++ ++static struct crash_elf_info elf_info = { ++ .class = ELFCLASS32, ++ .data = ELFDATA2LSB, ++ .machine = EM_ARM, ++ .page_offset = PAGE_OFFSET, ++}; ++ ++unsigned long phys_offset; ++ ++/** ++ * crash_range_callback() - callback called for each iomem region ++ * @data: not used ++ * @nr: not used ++ * @str: name of the memory region ++ * @base: start address of the memory region ++ * @length: size of the memory region ++ * ++ * This function is called once for each memory region found in /proc/iomem. It ++ * locates system RAM and crashkernel reserved memory and places these to ++ * variables: @crash_memory_ranges and @crash_reserved_mem. Number of memory ++ * regions is placed in @crash_memory_nr_ranges. ++ */ ++static int crash_range_callback(void *UNUSED(data), int UNUSED(nr), ++ char *str, unsigned long base, ++ unsigned long length) ++{ ++ struct memory_range *range; ++ ++ if (usablemem_rgns.size >= CRASH_MAX_MEMORY_RANGES) ++ return 1; ++ ++ range = usablemem_rgns.ranges + usablemem_rgns.size; ++ ++ if (strncmp(str, "System RAM\n", 11) == 0) { ++ range->start = base; ++ range->end = base + length - 1; ++ range->type = RANGE_RAM; ++ usablemem_rgns.size++; ++ } else if (strncmp(str, "Crash kernel\n", 13) == 0) { ++ crash_reserved_mem.start = base; ++ crash_reserved_mem.end = base + length - 1; ++ crash_reserved_mem.type = RANGE_RAM; ++ } ++ ++ return 0; ++} ++ ++/** ++ * crash_exclude_range() - excludes memory region reserved for crashkernel ++ * ++ * Function locates where crashkernel reserved memory is and removes that region ++ * from the available memory regions. ++ */ ++static void crash_exclude_range(void) ++{ ++ const struct memory_range *range = &crash_reserved_mem; ++ int i; ++ ++ for (i = 0; i < usablemem_rgns.size; i++) { ++ struct memory_range *r = usablemem_rgns.ranges + i; ++ ++ /* ++ * We assume that crash area is fully contained in ++ * some larger memory area. ++ */ ++ if (r->start <= range->start && r->end >= range->end) { ++ struct memory_range *new; ++ /* ++ * Let's split this area into 2 smaller ones and ++ * remove excluded range from between. First create ++ * new entry for the remaining area. ++ */ ++ new = usablemem_rgns.ranges + usablemem_rgns.size; ++ new->start = range->end + 1; ++ new->end = r->end; ++ usablemem_rgns.size++; ++ /* ++ * Next update this area to end before excluded range. ++ */ ++ r->end = range->start - 1; ++ break; ++ } ++ } ++} ++ ++static int range_cmp(const void *a1, const void *a2) ++{ ++ const struct memory_range *r1 = a1; ++ const struct memory_range *r2 = a2; ++ ++ if (r1->start > r2->start) ++ return 1; ++ if (r1->start < r2->start) ++ return -1; ++ ++ return 0; ++} ++ ++/** ++ * crash_get_memory_ranges() - read system physical memory ++ * ++ * Function reads through system physical memory and stores found memory regions ++ * in @crash_memory_ranges. Number of memory regions found is placed in ++ * @crash_memory_nr_ranges. Regions are sorted in ascending order. ++ * ++ * Returns %0 in case of success and %-1 otherwise (errno is set). ++ */ ++static int crash_get_memory_ranges(void) ++{ ++ /* ++ * First read all memory regions that can be considered as ++ * system memory including the crash area. ++ */ ++ kexec_iomem_for_each_line(NULL, crash_range_callback, NULL); ++ ++ if (usablemem_rgns.size < 1) { ++ errno = EINVAL; ++ return -1; ++ } ++ ++ /* ++ * Exclude memory reserved for crashkernel (this may result a split memory ++ * region). ++ */ ++ crash_exclude_range(); ++ ++ /* ++ * Make sure that the memory regions are sorted. ++ */ ++ qsort(usablemem_rgns.ranges, usablemem_rgns.size, ++ sizeof(*usablemem_rgns.ranges), range_cmp); ++ ++ return 0; ++} ++ ++/** ++ * cmdline_add_elfcorehdr() - adds elfcorehdr= to @cmdline ++ * @cmdline: buffer where parameter is placed ++ * @elfcorehdr: physical address of elfcorehdr ++ * ++ * Function appends 'elfcorehdr=start' at the end of the command line given in ++ * @cmdline. Note that @cmdline must be at least %COMMAND_LINE_SIZE bytes long ++ * (inclunding %NUL). ++ */ ++static void cmdline_add_elfcorehdr(char *cmdline, unsigned long elfcorehdr) ++{ ++ char buf[COMMAND_LINE_SIZE]; ++ int buflen; ++ ++ buflen = snprintf(buf, sizeof(buf), "%s elfcorehdr=%#lx", ++ cmdline, elfcorehdr); ++ if (buflen < 0) ++ die("Failed to construct elfcorehdr= command line parameter\n"); ++ if (buflen >= sizeof(buf)) ++ die("Command line overflow\n"); ++ ++ (void) strncpy(cmdline, buf, COMMAND_LINE_SIZE); ++ cmdline[COMMAND_LINE_SIZE - 1] = '\0'; ++} ++ ++/** ++ * cmdline_add_mem() - adds mem= parameter to kernel command line ++ * @cmdline: buffer where parameter is placed ++ * @size: size of the kernel reserved memory (in bytes) ++ * ++ * This function appends 'mem=size' at the end of the command line given in ++ * @cmdline. Note that @cmdline must be at least %COMMAND_LINE_SIZE bytes long ++ * (including %NUL). ++ */ ++static void cmdline_add_mem(char *cmdline, unsigned long size) ++{ ++ char buf[COMMAND_LINE_SIZE]; ++ int buflen; ++ ++ buflen = snprintf(buf, sizeof(buf), "%s mem=%ldK", cmdline, size >> 10); ++ if (buflen < 0) ++ die("Failed to construct mem= command line parameter\n"); ++ if (buflen >= sizeof(buf)) ++ die("Command line overflow\n"); ++ ++ (void) strncpy(cmdline, buf, COMMAND_LINE_SIZE); ++ cmdline[COMMAND_LINE_SIZE - 1] = '\0'; ++} ++ ++static unsigned long long range_size(const struct memory_range *r) ++{ ++ return r->end - r->start + 1; ++} ++ ++static void dump_memory_ranges(void) ++{ ++ int i; ++ ++ if (!kexec_debug) ++ return; ++ ++ dbgprintf("crashkernel: [%#llx - %#llx] (%ldM)\n", ++ crash_reserved_mem.start, crash_reserved_mem.end, ++ (unsigned long)range_size(&crash_reserved_mem) >> 20); ++ ++ for (i = 0; i < usablemem_rgns.size; i++) { ++ struct memory_range *r = usablemem_rgns.ranges + i; ++ dbgprintf("memory range: [%#llx - %#llx] (%ldM)\n", ++ r->start, r->end, (unsigned long)range_size(r) >> 20); ++ } ++} ++ ++/** ++ * load_crashdump_segments() - loads additional segments needed for kdump ++ * @info: kexec info structure ++ * @mod_cmdline: kernel command line ++ * ++ * This function loads additional segments which are needed for the dump capture ++ * kernel. It also updates kernel command line passed in @mod_cmdline to have ++ * right parameters for the dump capture kernel. ++ * ++ * Return %0 in case of success and %-1 in case of error. ++ */ ++int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) ++{ ++ unsigned long elfcorehdr; ++ unsigned long bufsz; ++ void *buf; ++ int err; ++ ++ /* ++ * First fetch all the memory (RAM) ranges that we are going to pass to ++ * the crashdump kernel during panic. ++ */ ++ err = crash_get_memory_ranges(); ++ if (err) ++ return err; ++ ++ /* ++ * Now that we have memory regions sorted, we can use first memory ++ * region as PHYS_OFFSET. ++ */ ++ phys_offset = usablemem_rgns.ranges->start; ++ dbgprintf("phys_offset: %#lx\n", phys_offset); ++ ++ err = crash_create_elf32_headers(info, &elf_info, ++ usablemem_rgns.ranges, ++ usablemem_rgns.size, &buf, &bufsz, ++ ELF_CORE_HEADER_ALIGN); ++ if (err) ++ return err; ++ ++ /* ++ * We allocate ELF core header from the end of the memory area reserved ++ * for the crashkernel. We align the header to SECTION_SIZE (which is ++ * 1MB) so that available memory passed in kernel command line will be ++ * aligned to 1MB. This is because kernel create_mapping() wants memory ++ * regions to be aligned to SECTION_SIZE. ++ */ ++ elfcorehdr = add_buffer_phys_virt(info, buf, bufsz, bufsz, 1 << 20, ++ crash_reserved_mem.start, ++ crash_reserved_mem.end, -1, 0); ++ ++ dbgprintf("elfcorehdr: %#lx\n", elfcorehdr); ++ cmdline_add_elfcorehdr(mod_cmdline, elfcorehdr); ++ ++ /* ++ * Add 'mem=size' parameter to dump capture kernel command line. This ++ * prevents the dump capture kernel from using any other memory regions ++ * which belong to the primary kernel. ++ */ ++ cmdline_add_mem(mod_cmdline, elfcorehdr - crash_reserved_mem.start); ++ ++ dump_memory_ranges(); ++ dbgprintf("kernel command line: \"%s\"\n", mod_cmdline); ++ ++ return 0; ++} ++ ++#endif ++ +--- /dev/null ++++ b/kexec/arch/arm64/include/arch/options.h +@@ -0,0 +1,26 @@ ++#ifndef KEXEC_ARCH_ARM64_OPTIONS_H ++#define KEXEC_ARCH_ARM64_OPTIONS_H ++ ++//#define OPT_ARCH_MAX ((OPT_MAX)+0) ++ ++#define OPT_APPEND ((OPT_MAX)+0) ++#define OPT_RAMDISK ((OPT_MAX)+1) ++#define OPT_DTB ((OPT_MAX)+2) ++ ++#define OPT_ARCH_MAX ((OPT_MAX)+3) ++ ++ ++#define KEXEC_ARCH_OPTIONS \ ++ KEXEC_OPTIONS \ ++ { "append", 1, NULL, OPT_APPEND }, \ ++ { "command-line", 1, NULL, OPT_APPEND }, \ ++ { "dtb", 1, NULL, OPT_DTB }, \ ++ { "initrd", 1, NULL, OPT_RAMDISK }, \ ++ { "ramdisk", 1, NULL, OPT_RAMDISK }, \ ++ ++#define KEXEC_ARCH_OPT_STR KEXEC_OPT_STR /* Only accept long arch options. */ ++ ++#define KEXEC_ALL_OPTIONS KEXEC_ARCH_OPTIONS ++#define KEXEC_ALL_OPT_STR KEXEC_ARCH_OPT_STR ++ ++#endif /* KEXEC_ARCH_ARM64_OPTIONS_H */ +--- /dev/null ++++ b/kexec/arch/arm64/kexec-arm64.c +@@ -0,0 +1,177 @@ ++/* ++ * ARM64 kexec support. ++ */ ++ ++#define _GNU_SOURCE ++ ++#include <errno.h> ++#include <stddef.h> ++ ++//#include <linux/kexec.h> ++ ++#include "../../kexec.h" ++#include "../../kexec-syscall.h" ++#include "kexec-arm64.h" ++ ++ ++void arch_usage(void) ++{ ++ fprintf(stderr, "%s:%d: ->\n", __func__, __LINE__); ++ ++ printf( ++" --append=STRING Set the kernel command line to STRING.\n" ++" --command-line=STRING Set the kernel command line to STRING.\n" ++" --dtb=FILE Use FILE as the device tree blob.\n" ++" --initrd=FILE Use FILE as the kernel initial ramdisk.\n" ++" --ramdisk=FILE Use FILE as the kernel initial ramdisk.\n"); ++ ++ fprintf(stderr, "%s:%d: <-\n", __func__, __LINE__); ++} ++ ++int arch_process_options(int UNUSED(argc), char **UNUSED(argv)) ++{ ++ fprintf(stderr, "%s:%d: do\n", __func__, __LINE__); ++ return 0; ++} ++ ++const struct arch_map_entry arches[] = { ++ { "aarch64", KEXEC_ARCH_ARM64 }, ++ { NULL, 0 }, ++}; ++ ++void arch_update_purgatory(struct kexec_info *UNUSED(info)) ++{ ++ fprintf(stderr, "%s:%d: do\n", __func__, __LINE__); ++} ++ ++unsigned long virt_to_phys(unsigned long addr) ++{ ++ fprintf(stderr, "%s:%d: %016lx -> %016lx\n", __func__, __LINE__, addr, ++ addr + 0x080000000UL); ++ return addr + 0x080000000UL; ++} ++ ++void add_segment(struct kexec_info *info, const void *buf, size_t bufsz, ++ unsigned long base, size_t memsz) ++{ ++ fprintf(stderr, "%s:%d: ->\n", __func__, __LINE__); ++ add_segment_phys_virt(info, buf, bufsz, base, memsz, 1); ++ fprintf(stderr, "%s:%d: <-\n", __func__, __LINE__); ++} ++ ++static int get_memory_ranges_1(struct memory_range **range, int *ranges, ++ unsigned long kexec_flags) ++{ ++ static struct memory_range memory_range[KEXEC_SEGMENT_MAX]; ++ const char *iomem; ++ int range_count = 0; ++ char line[MAX_LINE]; ++ FILE *fp; ++ ++ iomem = proc_iomem(); ++ fp = fopen(iomem, "r"); ++ ++ if (!fp) { ++ fprintf(stderr, "Cannot open %s: %s\n", ++ iomem, strerror(errno)); ++ return -1; ++ } ++ ++ dbgprintf("memory ranges:\n"); ++ ++ while(fgets(line, sizeof(line), fp) != 0) { ++ struct memory_range r; ++ char *str; ++ int consumed; ++ ++ if (range_count >= KEXEC_SEGMENT_MAX) ++ break; ++ ++ if (sscanf(line, "%Lx-%Lx : %n", &r.start, &r.end, &consumed) ++ != 2) ++ continue; ++ ++ str = line + consumed; ++ r.end++; ++ ++ if (memcmp(str, "System RAM\n", 11)) { ++ dbgprintf(" Skip: %016Lx - %016Lx : %s", r.start, r.end, ++ str); ++ continue; ++ } ++ ++ r.type = RANGE_RAM; ++ memory_range[range_count] = r; ++ range_count++; ++ ++ dbgprintf(" Add: %016Lx - %016Lx : %s", r.start, r.end, str); ++ } ++ ++ fclose(fp); ++ *range = memory_range; ++ *ranges = range_count; ++ ++ return 0; ++} ++ ++static int get_memory_ranges_2(struct memory_range **range, int *ranges, ++ unsigned long UNUSED(kexec_flags)) ++{ ++ static struct memory_range memory_range[2]; ++ ++ memory_range[0].start = 0x080000000; ++ memory_range[0].end = 0x100000000; ++ memory_range[0].type = RANGE_RAM; ++ ++ memory_range[1].start = 0x900000000; ++ memory_range[1].end = 0x880000000; ++ memory_range[1].type = RANGE_RAM; ++ ++ *range = memory_range; ++ *ranges = sizeof(memory_range) / sizeof(memory_range[0]); ++ ++ return 0; ++} ++ ++int get_memory_ranges(struct memory_range **range, int *ranges, ++ unsigned long kexec_flags) ++{ ++ /* FIXME: Should get this info from device tree. */ ++ ++ return get_memory_ranges_1(range, ranges, kexec_flags); ++} ++ ++struct file_type file_type[] = { ++ { "elf-arm64", elf_arm64_probe, elf_arm64_load, elf_arm64_usage }, ++}; ++ ++int file_types = sizeof(file_type) / sizeof(file_type[0]); ++ ++int arch_compat_trampoline(struct kexec_info *info) ++{ ++ fprintf(stderr, "%s:%d: do\n", __func__, __LINE__); ++ return 0; ++} ++ ++void arch_reuse_initrd(void) ++{ ++} ++ ++int machine_verify_elf_rel(struct mem_ehdr *ehdr) ++{ ++ (void)ehdr; ++ ++ fprintf(stderr, "%s:%d: do\n", __func__, __LINE__); ++ return 0; ++} ++ ++void machine_apply_elf_rel(struct mem_ehdr *ehdr, unsigned long r_type, ++ void *location, unsigned long address, unsigned long value) ++{ ++ (void)ehdr; ++ (void)r_type; ++ (void)location; ++ (void)address; ++ (void)value; ++ fprintf(stderr, "%s:%d: do\n", __func__, __LINE__); ++} +--- /dev/null ++++ b/kexec/arch/arm64/kexec-arm64.h +@@ -0,0 +1,20 @@ ++/* ++ * ARM64 kexec support. ++ */ ++ ++#if !defined(KEXEC_ARM64_H) ++#define KEXEC_ARM64_H ++ ++/* #include <linux/kexec.h> FIXME: this is broken */ ++#include <sys/types.h> ++ ++#include "../../kexec.h" ++ ++#define KEXEC_SEGMENT_MAX 16 /* FIXME: this should come from <linux/kexec.h> */ ++ ++int elf_arm64_probe(const char *buf, off_t len); ++int elf_arm64_load(int argc, char **argv, const char *buf, off_t len, ++ struct kexec_info *info); ++void elf_arm64_usage(void); ++ ++#endif +\ No newline at end of file +--- /dev/null ++++ b/kexec/arch/arm64/kexec-elf-arm64.c +@@ -0,0 +1,114 @@ ++/* ++ * ARM64 kexec support. ++ */ ++ ++#define _GNU_SOURCE ++ ++#include <elf.h> ++#include <getopt.h> ++ ++#include "../../kexec-syscall.h" ++ ++#include "kexec-arm64.h" ++#include "arch/options.h" ++ ++#if !defined(EM_AARCH64) ++# define EM_AARCH64 183 ++#endif ++ ++int elf_arm64_probe(const char *buf, off_t len) ++{ ++ int result; ++ struct mem_ehdr ehdr; ++ ++ fprintf(stderr, "%s:%d: ->\n", __func__, __LINE__); ++ ++ result = build_elf_exec_info(buf, len, &ehdr, 0); ++ ++ if (result < 0) { ++ dbgprintf("Not an ELF executable\n"); ++ goto out; ++ } ++ ++ if (ehdr.e_machine != EM_AARCH64) { ++ dbgprintf("Not an AARCH64 executable\n"); ++ result = -1; ++ goto out; ++ } ++ ++ result = 0; ++ ++out: ++ free_elf_info(&ehdr); ++ fprintf(stderr, "%s:%d: <-\n", __func__, __LINE__); ++ return result; ++} ++ ++int elf_arm64_load(int argc, char **argv, const char *buf, off_t len, ++ struct kexec_info *info) ++{ ++ static const struct option options[] = { ++ KEXEC_ARCH_OPTIONS ++ { 0 } ++ }; ++ static const char short_options[] = KEXEC_OPT_STR ""; ++ const char *command_line = NULL; ++ unsigned int command_line_len = 0; ++ const char *ramdisk = NULL; ++ const char *dtb = NULL; ++ int opt; ++ struct mem_ehdr ehdr; ++ int result; ++ ++ fprintf(stderr, "%s:%d: ->\n", __func__, __LINE__); ++ ++ while ((opt = getopt_long(argc, argv, short_options, options, 0)) ++ != -1) { ++ switch (opt) { ++ default: ++ if (opt < OPT_MAX) /* Ignore core options */ ++ break; ++ case OPT_APPEND: ++ command_line = optarg; ++ command_line_len = strlen(command_line) + 1; ++ break; ++ case OPT_RAMDISK: ++ ramdisk = optarg; ++ break; ++ case OPT_DTB: ++ dtb = optarg; ++ break; ++ } ++ } ++ ++ fprintf(stderr, "%s:%d: command_line: %s\n", __func__, __LINE__, command_line); ++ fprintf(stderr, "%s:%d: ramdisk: %s\n", __func__, __LINE__, ramdisk); ++ fprintf(stderr, "%s:%d: dtb: %s\n", __func__, __LINE__, dtb); ++ ++ if (info->kexec_flags & KEXEC_ON_CRASH) { ++ fprintf(stderr, "kexec: kdump not yet supported on arm64\n"); ++ return -1; ++ } ++ ++ result = build_elf_exec_info(buf, len, &ehdr, 0); ++ ++ if (result < 0) { ++ free_elf_info(&ehdr); ++ fprintf(stderr, "%s:%d: free_elf_info failed\n", __func__, ++ __LINE__); ++ return result; ++ } ++ ++ elf_exec_build_load(info, &ehdr, buf, len, 0); ++ ++ info->entry = (void*)0x80080000UL; // FIXME ++ ++ fprintf(stderr, "%s:%d: <-\n", __func__, __LINE__); ++ return 0; ++} ++ ++void elf_arm64_usage(void) ++{ ++ fprintf(stderr, "%s:%d: ->\n", __func__, __LINE__); ++ fprintf(stderr, "%s:%d: <-\n", __func__, __LINE__); ++} +--- a/kexec/kexec-syscall.h ++++ b/kexec/kexec-syscall.h +@@ -39,8 +39,8 @@ + #ifdef __s390__ + #define __NR_kexec_load 277 + #endif +-#ifdef __arm__ +-#define __NR_kexec_load __NR_SYSCALL_BASE + 347 ++#if defined(__arm__) || defined(__arm64__) ++#define __NR_kexec_load __NR_SYSCALL_BASE + 347 + #endif + #if defined(__mips__) + #define __NR_kexec_load 4311 +@@ -108,6 +108,8 @@ static inline long kexec_file_load(int k + #define KEXEC_ARCH_PPC64 (21 << 16) + #define KEXEC_ARCH_IA_64 (50 << 16) + #define KEXEC_ARCH_ARM (40 << 16) ++#define KEXEC_ARCH_ARM64 (183 << 16) ++/* #define KEXEC_ARCH_AARCH64 (183 << 16) */ + #define KEXEC_ARCH_S390 (22 << 16) + #define KEXEC_ARCH_SH (42 << 16) + #define KEXEC_ARCH_MIPS_LE (10 << 16) +@@ -153,5 +155,8 @@ static inline long kexec_file_load(int k + #ifdef __m68k__ + #define KEXEC_ARCH_NATIVE KEXEC_ARCH_68K + #endif ++#if defined(__arm64__) ++#define KEXEC_ARCH_NATIVE KEXEC_ARCH_ARM64 ++#endif + + #endif /* KEXEC_SYSCALL_H */ +--- a/kexec/kexec.c ++++ b/kexec/kexec.c +@@ -664,6 +664,8 @@ static int my_load(const char *type, int + memset(&info, 0, sizeof(info)); + info.kexec_flags = kexec_flags; + ++ fprintf(stderr, "%s:%d: do\n", __func__, __LINE__); ++ + result = 0; + if (argc - fileind <= 0) { + fprintf(stderr, "No kernel specified\n"); +--- /dev/null ++++ b/purgatory/arch/arm64/Makefile +@@ -0,0 +1,7 @@ ++# ++# Purgatory arm64 ++# ++ ++arm64_PURGATORY_SRCS = ++ ++dist += purgatory/arch/arm64/Makefile $(arm64_PURGATORY_SRCS) diff --git a/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch b/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch index ab1fe96db2..8bb4fc49ad 100644 --- a/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch +++ b/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch @@ -46,37 +46,3 @@ index 4121c7d..cc04b04 100644 return strcmp(str1, str2); } -diff --git a/kexec/fs2dt.c b/kexec/fs2dt.c -index 5e6b98d..1c0345b 100644 ---- a/kexec/fs2dt.c -+++ b/kexec/fs2dt.c -@@ -475,6 +475,9 @@ static int comparefunc(const struct dirent **dentry1, - { - char *str1 = (*(struct dirent **)dentry1)->d_name; - char *str2 = (*(struct dirent **)dentry2)->d_name; -+ char* ptr1 = strchr(str1, '@'); -+ char* ptr2 = strchr(str2, '@'); -+ int len1, len2; - - /* - * strcmp scans from left to right and fails to idetify for some -@@ -482,9 +485,13 @@ static int comparefunc(const struct dirent **dentry1, - * Therefore, we get the wrong sorted order like memory@10000000 and - * memory@f000000. - */ -- if (strchr(str1, '@') && strchr(str2, '@') && -- (strlen(str1) > strlen(str2))) -- return 1; -+ if (ptr1 && ptr2) { -+ len1 = ptr1 - str1; -+ len2 = ptr2 - str2; -+ if (!strncmp(str1, str2, len1 >len2 ? len1: len2) && -+ (strlen(str1) > strlen(str2))) -+ return 1; -+ } - - return strcmp(str1, str2); - } --- -1.7.9.5 - diff --git a/meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch b/meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch new file mode 100644 index 0000000000..0bd3264af7 --- /dev/null +++ b/meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch @@ -0,0 +1,113 @@ +x86_64: Add support to build kexec-tools with x32 ABI + +Summary of changes, + +configure.ac: Add test for detect x32 ABI. +purgatory/arch/x86_64/Makefile: Not use mcmodel large when + x32 ABI is set. +kexec/arch/x86_64/kexec-elf-rel-x86_64.c: When x32 ABI is set + use ELFCLASS32 instead of ELFCLASS64. +kexec/kexec-syscall.h: Add correct syscall number for x32 ABI. + +Upstream-Status: Submitted + +Signed-off-by: AnÃbal Limón <anibal.limon@linux.intel.com> +Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> + +--- + configure.ac | 9 +++++++++ + kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 4 ++++ + kexec/kexec-syscall.h | 4 ++++ + purgatory/arch/x86_64/Makefile | 4 +++- + 4 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c410e90..1ecadd5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -52,6 +52,15 @@ case $target_cpu in + ;; + ia64|x86_64|alpha|m68k ) + ARCH="$target_cpu" ++ ++ dnl ---Test for x32 ABI in x86_64 ++ if test "x$ARCH" = "xx86_64" ; then ++ AC_EGREP_CPP(x32_test, ++ [#if defined(__x86_64__) && defined (__ILP32__) ++ x32_test ++ #endif ++ ], SUBARCH='x32', SUBARCH='64') ++ fi + ;; + * ) + AC_MSG_ERROR([unsupported architecture $target_cpu]) +diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c +index c795037..06db7f0 100644 +--- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c ++++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c +@@ -8,7 +8,11 @@ int machine_verify_elf_rel(struct mem_ehdr *ehdr) + if (ehdr->ei_data != ELFDATA2LSB) { + return 0; + } ++#ifdef __ILP32__ ++ if (ehdr->ei_class != ELFCLASS32) { ++#else + if (ehdr->ei_class != ELFCLASS64) { ++#endif + return 0; + } + if (ehdr->e_machine != EM_X86_64) { +diff --git a/kexec/kexec-syscall.h b/kexec/kexec-syscall.h +index ce2e20b..cab5535 100644 +--- a/kexec/kexec-syscall.h ++++ b/kexec/kexec-syscall.h +@@ -31,8 +31,12 @@ + #define __NR_kexec_load 268 + #endif + #ifdef __x86_64__ ++#ifdef __ILP32__ ++#define __NR_kexec_load 528 ++#else + #define __NR_kexec_load 246 + #endif ++#endif + #ifdef __s390x__ + #define __NR_kexec_load 277 + #endif +diff --git a/purgatory/arch/x86_64/Makefile b/purgatory/arch/x86_64/Makefile +index 7300937..4af11e4 100644 +--- a/purgatory/arch/x86_64/Makefile ++++ b/purgatory/arch/x86_64/Makefile +@@ -23,4 +23,6 @@ x86_64_PURGATORY_SRCS += purgatory/arch/i386/console-x86.c + x86_64_PURGATORY_SRCS += purgatory/arch/i386/vga.c + x86_64_PURGATORY_SRCS += purgatory/arch/i386/pic.c + +-x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large ++ifeq ($(SUBARCH),64) ++ x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large ++endif +-- +1.8.4.5 + +diff --git a/configure.ac b/configure.ac +index 1ecadd5..e0b5f78 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -8,6 +8,7 @@ AC_INIT(kexec-tools, 2.0.10.git) + AC_CONFIG_AUX_DIR(./config) + AC_CONFIG_HEADERS([include/config.h]) + AC_LANG(C) ++AC_PROG_CC + + AC_DEFINE_UNQUOTED(PACKAGE_DATE, "`date '+%d %B %Y'`", + [Define to the release date of this package]) +@@ -106,9 +107,6 @@ AC_ARG_WITH([booke], + + dnl ---Programs + dnl To specify a different compiler, just 'export CC=/path/to/compiler' +- +-AC_PROG_CC +- + if test "${build}" != "${host}" ; then + AC_CHECK_PROGS(BUILD_CC, [${build_alias}-gcc ${build}-gcc gcc]) + else diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.7.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.9.bb index f0ece0d45b..36e4c15364 100644 --- a/meta/recipes-kernel/kexec/kexec-tools_2.0.7.bb +++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.9.bb @@ -2,10 +2,13 @@ require kexec-tools.inc export LDFLAGS = "-L${STAGING_LIBDIR}" EXTRA_OECONF = " --with-zlib=yes" -SRC_URI += "file://kexec-tools-Refine-kdump-device_tree-sort.patch" +SRC_URI += "file://kexec-tools-Refine-kdump-device_tree-sort.patch \ + file://kexec-aarch64.patch \ + file://kexec-x32.patch \ + " -SRC_URI[md5sum] = "2309ba43981cb6d39d07ac3a9aac30ab" -SRC_URI[sha256sum] = "dde5c38be39882c6c91f0129647349c4e1943b077d3020af1970b481ee954eb0" +SRC_URI[md5sum] = "4ecb7ab7ad9eb6ce413899bdb07a8426" +SRC_URI[sha256sum] = "c2c6d204fe0911ebd304c40100163237feca4c5a854a2cca382ee36916a573d8" PACKAGES =+ "kexec kdump vmcore-dmesg" diff --git a/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb b/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb index ec20bf8d30..44b7650e4e 100644 --- a/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb +++ b/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb @@ -19,21 +19,21 @@ if [ "\$1" != "-a" -o "\$2" != "-b" ]; then echo "Usage: depmodwrapper -a -b rootfs KERNEL_VERSION" >&2 exit 1 fi -if [ ! -r ${STAGING_KERNEL_DIR}/kernel-abiversion ]; then - echo "Unable to read: ${STAGING_KERNEL_DIR}/kernel-abiversion" >&2 +if [ ! -r ${PKGDATA_DIR}/kernel-depmod/kernel-abiversion ]; then + echo "Unable to read: ${PKGDATA_DIR}/kernel-depmod/kernel-abiversion" >&2 else - kernelabi=\$(cat ${STAGING_KERNEL_DIR}/kernel-abiversion) + kernelabi=\$(cat ${PKGDATA_DIR}/kernel-depmod/kernel-abiversion) if [ "\$kernelabi" != "\$4" ]; then echo "Error: Kernel version \$4 does not match kernel-abiversion (\$kernelabi)" >&2 exit 1 fi fi -if [ ! -r ${STAGING_KERNEL_DIR}/System.map-\$4 ]; then - echo "Unable to read: ${STAGING_KERNEL_DIR}/System.map-\$4" >&2 +if [ ! -r ${PKGDATA_DIR}/kernel-depmod/System.map-\$4 ]; then + echo "Unable to read: ${PKGDATA_DIR}/kernel-depmod/System.map-\$4" >&2 exec env depmod "\$1" "\$2" "\$3" "\$4" else - exec env depmod "\$1" "\$2" "\$3" -F "${STAGING_KERNEL_DIR}/System.map-\$4" "\$4" + exec env depmod "\$1" "\$2" "\$3" -F "${PKGDATA_DIR}/kernel-depmod/System.map-\$4" "\$4" fi EOF chmod +x ${D}${bindir_crossscripts}/depmodwrapper diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc index dda74c85b6..899881e1fb 100644 --- a/meta/recipes-kernel/kmod/kmod.inc +++ b/meta/recipes-kernel/kmod/kmod.inc @@ -11,14 +11,14 @@ SECTION = "base" DEPENDS += "pkgconfig-native" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ " inherit autotools gtk-doc ptest -SRCREV = "ae58de0fcb4a6528dd365e23d383bbe2eaf2d566" +SRCREV = "fd56638aed3fe147015bfa10ed4a5f7491303cb4" # Lookout for PV bump too when SRCREV is changed -PV = "18+git${SRCPV}" +PV = "19+git${SRCPV}" SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ file://depmod-search.conf \ @@ -26,13 +26,15 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ file://ptest.patch \ file://avoid_parallel_tests.patch \ file://fix-O_CLOEXEC.patch \ - file://0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch \ " S = "${WORKDIR}/git" EXTRA_AUTORECONF += "--install --symlink" -EXTRA_OECONF +="--enable-debug --enable-logging --enable-tools --disable-manpages --with-zlib" +EXTRA_OECONF +=" --enable-tools --disable-manpages --with-zlib" + +PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" +PACKAGECONFIG[logging] = " --enable-logging,--disable-logging" do_configure_prepend () { gtkdocize --docdir ${S}/libkmod/docs || touch ${S}/libkmod/docs/gtk-doc.make diff --git a/meta/recipes-kernel/kmod/kmod/0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch b/meta/recipes-kernel/kmod/kmod/0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch deleted file mode 100644 index 77624ce151..0000000000 --- a/meta/recipes-kernel/kmod/kmod/0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 74c26943f1228870022d116a1fda25be3a55a38e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org> -Date: Wed, 18 Jun 2014 20:51:00 -0400 -Subject: [PATCH] Add missing O_CLOEXEC in kmod_module_get_size() - -Upstream-Status: Backport -Signed-off-by: Saul Wold <sgw@linux.intel.com> ---- - libkmod/libkmod-module.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c -index e3cc5a7..b81b451 100644 ---- a/libkmod/libkmod-module.c -+++ b/libkmod/libkmod-module.c -@@ -1783,7 +1783,7 @@ KMOD_EXPORT long kmod_module_get_size(const struct kmod_module *mod) - * loaded. - */ - snprintf(line, sizeof(line), "/sys/module/%s", mod->name); -- dfd = open(line, O_RDONLY); -+ dfd = open(line, O_RDONLY|O_CLOEXEC); - if (dfd < 0) - return -errno; - --- -1.8.3.1 - diff --git a/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch b/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch index 2320b92eba..7c0a27510b 100644 --- a/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch +++ b/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch @@ -1,6 +1,6 @@ -From 0c4dbadc9db3cda1cfca64e44ea08c6e89919ea7 Mon Sep 17 00:00:00 2001 -From: Ting Liu <b28495@freescale.com> -Date: Tue, 10 Sep 2013 13:44:18 +0800 +From 4b68940b1ed46c54a5a0bdf6bb9d4599bc64e6f4 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Wed, 24 Dec 2014 10:12:40 +0800 Subject: [PATCH] Change to calling bswap_* instead of htobe* and be*toh We can't use htobe* and be*toh functions because they are not @@ -11,12 +11,13 @@ Change to directly calling bswap_* as defined in+byteswap.h. Upstream-Status: Inappropriate Signed-off-by: Ting Liu <b28495@freescale.com> +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- - libkmod/libkmod-signature.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + libkmod/libkmod-signature.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c -index 6b80caa..3544a36 100644 +index 2b976a5..ffe58c2 100644 --- a/libkmod/libkmod-signature.c +++ b/libkmod/libkmod-signature.c @@ -19,6 +19,7 @@ @@ -24,10 +25,10 @@ index 6b80caa..3544a36 100644 #include <endian.h> +#include <byteswap.h> - #include <stdint.h> + #include <inttypes.h> + #include <stdio.h> #include <stdlib.h> - #include <string.h> -@@ -121,7 +122,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat +@@ -124,7 +125,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat modsig->hash >= PKEY_HASH__LAST || modsig->id_type >= PKEY_ID_TYPE__LAST) return false; @@ -37,5 +38,5 @@ index 6b80caa..3544a36 100644 return false; -- -1.7.5.4 +1.9.1 diff --git a/meta/recipes-kernel/latencytop/latencytop_0.5.bb b/meta/recipes-kernel/latencytop/latencytop_0.5.bb index e910a96f43..cb0a3c5ed1 100644 --- a/meta/recipes-kernel/latencytop/latencytop_0.5.bb +++ b/meta/recipes-kernel/latencytop/latencytop_0.5.bb @@ -8,7 +8,7 @@ DEPENDS = "virtual/libintl ncurses glib-2.0" PR = "r3" -SRC_URI = "http://www.latencytop.org/download/latencytop-${PV}.tar.gz \ +SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.tar.gz/73bb3371c6ee0b0e68e25289027e865c/${BP}.tar.gz \ file://latencytop-makefile.patch \ file://latencytop-fsync.patch" diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index a107f804fa..16ebf6ad6b 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.radeon;md5=07b0c31777bd686d8e1609c6940b5e74\ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.ralink-firmware.txt;md5=ab2c269277c45476fb449673911a2dfd \ file://LICENCE.qla2xxx;md5=f5ce8529ec5c17cb7f911d2721d90e91 \ - file://LICENCE.iwlwifi_firmware;md5=8b938534f77ffd453690eb34ed84ae8b \ + file://LICENCE.iwlwifi_firmware;md5=5106226b2863d00d8ed553221ddf8cd2 \ file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \ file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ @@ -24,7 +24,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.radeon;md5=07b0c31777bd686d8e1609c6940b5e74\ file://LICENCE.Marvell;md5=9ddea1734a4baf3c78d845151f42a37a \ " -SRCREV = "dec41bce44e0dff6a2c3358a958fadf22bf58858" +SRCREV = "0e5f63771d0df6d7859f7c4100a74d737c62ac88" PE = "1" PV = "0.0+git${SRCPV}" @@ -34,6 +34,8 @@ S = "${WORKDIR}/git" inherit allarch update-alternatives +CLEANBROKEN = "1" + do_compile() { : } @@ -42,7 +44,7 @@ do_install() { install -d ${D}/lib/firmware/ cp -r * ${D}/lib/firmware/ - # Avoid Makefile to be deplyed + # Avoid Makefile to be deployed rm ${D}/lib/firmware/Makefile # Remove unbuild firmware which needs cmake and bash @@ -67,9 +69,13 @@ PACKAGES =+ "${PN}-ralink \ ${PN}-rtl-license ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su \ ${PN}-broadcom-license ${PN}-bcm4329 ${PN}-bcm4330 ${PN}-bcm4334 \ ${PN}-atheros-license ${PN}-ar9170 ${PN}-ar3k ${PN}-ath6k ${PN}-ath9k \ - ${PN}-iwlwifi-license ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2b-6 ${PN}-iwlwifi-7260-7 \ - ${PN}-iwlwifi-6000g2a-6 ${PN}-iwlwifi-135-6" - + ${PN}-iwlwifi-license ${PN}-iwlwifi-135-6 \ + ${PN}-iwlwifi-3160-7 ${PN}-iwlwifi-3160-8 ${PN}-iwlwifi-3160-9 \ + ${PN}-iwlwifi-6000-4 ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2a-6 ${PN}-iwlwifi-6000g2b-5 ${PN}-iwlwifi-6000g2b-6 \ + ${PN}-iwlwifi-6050-4 ${PN}-iwlwifi-6050-5 \ + ${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9 \ + ${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9 \ + " FILES_${PN}-atheros-license = "/lib/firmware/LICENCE.atheros_firmware" @@ -208,18 +214,40 @@ RDEPENDS_${PN}-bcm4334 += "${PN}-broadcom-license" ALTERNATIVE_linux-firmware-bcm4334 = "brcmfmac-sdio.bin" ALTERNATIVE_TARGET_linux-firmware-bcm4334[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac4334-sdio.bin" +RDEPENDS_${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-3160-7 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-3160-8 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-3160-9 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-6000-4 = "${PN}-iwlwifi-license" RDEPENDS_${PN}-iwlwifi-6000g2a-5 = "${PN}-iwlwifi-license" RDEPENDS_${PN}-iwlwifi-6000g2a-6 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-6000g2a-5 = "${PN}-iwlwifi-license" RDEPENDS_${PN}-iwlwifi-6000g2b-6 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-7260-7 = "${PN}-iwlwifi-license" - -FILES_${PN}-iwlwifi-license = "/lib/firmware/LICENCE.iwlwifi_firmware" +RDEPENDS_${PN}-iwlwifi-6050-4 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-6050-5 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-7260-7 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-7260-8 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-7260-9 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-7265-8 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-7265-9 = "${PN}-iwlwifi-license" + +FILES_${PN}-iwlwifi-license = "/lib/firmware/LICENCE.iwlwifi_firmware" +FILES_${PN}-iwlwifi-135-6 = "/lib/firmware/iwlwifi-135-6.ucode" +FILES_${PN}-iwlwifi-3160-7 = "/lib/firmware/iwlwifi-3160-7.ucode" +FILES_${PN}-iwlwifi-3160-8 = "/lib/firmware/iwlwifi-3160-8.ucode" +FILES_${PN}-iwlwifi-3160-9 = "/lib/firmware/iwlwifi-3160-9.ucode" +FILES_${PN}-iwlwifi-6000-4 = "/lib/firmware/iwlwifi-6000-4.ucode" FILES_${PN}-iwlwifi-6000g2a-5 = "/lib/firmware/iwlwifi-6000g2a-5.ucode" FILES_${PN}-iwlwifi-6000g2a-6 = "/lib/firmware/iwlwifi-6000g2a-6.ucode" +FILES_${PN}-iwlwifi-6000g2b-5 = "/lib/firmware/iwlwifi-6000g2b-5.ucode" FILES_${PN}-iwlwifi-6000g2b-6 = "/lib/firmware/iwlwifi-6000g2b-6.ucode" -FILES_${PN}-iwlwifi-135-6 = "/lib/firmware/iwlwifi-135-6.ucode" +FILES_${PN}-iwlwifi-6050-4 = "/lib/firmware/iwlwifi-6050-4.ucode" +FILES_${PN}-iwlwifi-6050-5 = "/lib/firmware/iwlwifi-6050-5.ucode" FILES_${PN}-iwlwifi-7260-7 = "/lib/firmware/iwlwifi-7260-7.ucode" +FILES_${PN}-iwlwifi-7260-8 = "/lib/firmware/iwlwifi-7260-8.ucode" +FILES_${PN}-iwlwifi-7260-9 = "/lib/firmware/iwlwifi-7260-9.ucode" +FILES_${PN}-iwlwifi-7265-8 = "/lib/firmware/iwlwifi-7265-8.ucode" +FILES_${PN}-iwlwifi-7265-9 = "/lib/firmware/iwlwifi-7265-9.ucode" FILES_${PN} += "/lib/firmware/*" diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.16.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.16.bb deleted file mode 100644 index cedaced2da..0000000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.16.bb +++ /dev/null @@ -1,7 +0,0 @@ -KORG_ARCHIVE_COMPRESSION = "xz" - -require linux-libc-headers.inc - -SRC_URI[md5sum] = "5c569ed649a0c9711879f333e90c5386" -SRC_URI[sha256sum] = "4813ad7927a7d92e5339a873ab16201b242b2748934f12cb5df9ba2cfe1d77a0" - diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.19.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.19.bb new file mode 100644 index 0000000000..078df4512b --- /dev/null +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.19.bb @@ -0,0 +1,7 @@ +KORG_ARCHIVE_COMPRESSION = "xz" + +require linux-libc-headers.inc + +SRC_URI[md5sum] = "d3fc8316d4d4d04b65cbc2d70799e763" +SRC_URI[sha256sum] = "be42511fe5321012bb4a2009167ce56a9e5fe362b4af43e8c371b3666859806c" + diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb new file mode 100644 index 0000000000..dd6578861a --- /dev/null +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -0,0 +1,76 @@ +SUMMARY = "Linux kernel Development Source" +DESCRIPTION = "Development source linux kernel. When built, this recipe packages the \ +source of the preferred virtual/kernel provider and makes it available for full kernel \ +development or external module builds" + +SECTION = "kernel" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +inherit linux-kernel-base + +# Whilst not a module, this ensures we don't get multilib extended (which would make no sense) +inherit module-base + +# We need the kernel to be staged (unpacked, patched and configured) before +# we can grab the source and make the source package. We also need the bits from +# ${B} not to change while we install, so virtual/kernel must finish do_compile. +do_install[depends] += "virtual/kernel:do_shared_workdir" +# Need the source, not just the output of populate_sysroot +do_install[depends] += "virtual/kernel:do_compile" + +# There's nothing to do here, except install the source where we can package it +do_fetch[noexec] = "1" +do_unpack[noexec] = "1" +do_patch[noexec] = "1" +do_configure[noexec] = "1" +do_compile[noexec] = "1" +do_populate_sysroot[noexec] = "1" + +# Define where the kernel headers are installed on the target as well as where +# they are staged. +KERNEL_SRC_PATH = "/usr/src/kernel" +S = "${STAGING_KERNEL_DIR}" +B = "${STAGING_KERNEL_BUILDDIR}" + +KERNEL_VERSION = "${@get_kernelversion_headers('${S}')}" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +do_install() { + kerneldir=${D}${KERNEL_SRC_PATH} + install -d $kerneldir + + # + # Copy the staging dir source (and module build support) into the devsrc structure. + # We can keep this copy simple and take everything, since a we'll clean up any build + # artifacts afterwards, and the extra i/o is not significant + # + cd ${B} + find . -type d -name '.git*' -prune -o -path '.debug' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir + cd ${S} + find . -type d -name '.git*' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir + + # Explicitly set KBUILD_OUTPUT to ensure that the image directory is cleaned and not + # The main build artifacts. We clean the directory to avoid QA errors on mismatched + # architecture (since scripts and helpers are native format). + KBUILD_OUTPUT="$kerneldir" + oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean _mrproper_scripts + + # As of Linux kernel version 3.0.1, the clean target removes + # arch/powerpc/lib/crtsavres.o which is present in + # KBUILD_LDFLAGS_MODULE, making it required to build external modules. + if [ ${ARCH} = "powerpc" ]; then + mkdir -p $kerneldir/arch/powerpc/lib/ + cp ${B}/arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o + fi + + chown -R root:root ${D} +} +# Ensure we don't race against "make scripts" during cpio +do_install[lockfiles] = "${TMPDIR}/kernel-scripts.lock" + +PACKAGES = "kernel-devsrc" +FILES_${PN} = "${KERNEL_SRC_PATH}" +RDEPENDS_${PN} = "bc" diff --git a/meta/recipes-kernel/linux/linux-dummy.bb b/meta/recipes-kernel/linux/linux-dummy.bb index 8f25f17e6f..cc0e4e64a9 100644 --- a/meta/recipes-kernel/linux/linux-dummy.bb +++ b/meta/recipes-kernel/linux/linux-dummy.bb @@ -33,6 +33,10 @@ do_compile () { : } +do_shared_workdir () { + : +} + do_install() { : } @@ -47,4 +51,4 @@ do_deploy() { addtask bundle_initramfs after do_install before do_deploy addtask deploy after do_install - +addtask shared_workdir after do_compile before do_install diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb index 00feadedd8..ba88fd7dc3 100644 --- a/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -35,7 +35,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;bareclone=1;branch=${K SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' -LINUX_VERSION ?= "3.17+" +LINUX_VERSION ?= "3.19+" LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb deleted file mode 100644 index 1075972058..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +++ /dev/null @@ -1,27 +0,0 @@ -KBRANCH ?= "standard/preempt-rt/base" -KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc" - -require recipes-kernel/linux/linux-yocto.inc - -SRCREV_machine ?= "0abce5181274dbf37788ab8d2c62e135defd9956" -SRCREV_machine_qemuppc ?= "c31f38edf5dec2c295632199dbfe3f5a221f7c16" -SRCREV_meta ?= "f79a00265eefbe2fffc2cdb03f67235497a9a87e" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" - -LINUX_VERSION ?= "3.10.55" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "meta" - -LINUX_KERNEL_TYPE = "preempt-rt" - -COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuppc|qemumips)" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" -KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb index b2ad078bca..4b602b1b03 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb @@ -3,17 +3,18 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc" require recipes-kernel/linux/linux-yocto.inc -SRCREV_machine ?= "0a875ce52aa7a42ddabdb87038074381bb268e77" -SRCREV_machine_qemuppc ?= "b993661d41f08846daa28b14f89c8ae3e94225bd" -SRCREV_meta ?= "fb6271a942b57bdc40c6e49f0203be153699f81c" +SRCREV_machine ?= "3fb54cf8f4c3254f628e6c4720fe3c731a9de0b2" +SRCREV_machine_qemuppc ?= "ab935c000435b6f5af42543f8e2300e473995d5a" +SRCREV_meta ?= "162dfe3bb092c1a792e5ed224fe09672e9814b24" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" -LINUX_VERSION ?= "3.14.19" +LINUX_VERSION ?= "3.14.36" PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "meta" +KCONF_BSP_AUDIT_LEVEL = "2" LINUX_KERNEL_TYPE = "preempt-rt" @@ -23,5 +24,4 @@ COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuppc|qemumips)" KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb index 79bd6935a2..afcc4dd620 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb @@ -4,12 +4,13 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "3.14.19" +LINUX_VERSION ?= "3.14.36" KMETA = "meta" +KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "902f34d36102a4b2008b776ecae686f80d307e12" -SRCREV_meta ?= "fb6271a942b57bdc40c6e49f0203be153699f81c" +SRCREV_machine ?= "4434aa71ff7043c570f9eae493df1ccadbda9b85" +SRCREV_meta ?= "162dfe3bb092c1a792e5ed224fe09672e9814b24" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.17.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.17.bb deleted file mode 100644 index eae08540e6..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.17.bb +++ /dev/null @@ -1,21 +0,0 @@ -KBRANCH ?= "standard/tiny/base" -LINUX_KERNEL_TYPE = "tiny" -KCONFIG_MODE = "--allnoconfig" - -require recipes-kernel/linux/linux-yocto.inc - -LINUX_VERSION ?= "3.17-rc7" - -KMETA = "meta" - -SRCREV_machine ?= "268b7677421eef003a84f31c6bd0b8ec3acc1e36" -SRCREV_meta ?= "84b57b01050dd9e5a004e265e70120e2a792f38a" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" - -COMPATIBLE_MACHINE = "(qemux86)" - -# Functionality flags -KERNEL_FEATURES = "" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb index a53ce544a3..0631c5e551 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb @@ -1,20 +1,20 @@ KBRANCH ?= "standard/tiny/base" - -require recipes-kernel/linux/linux-yocto.inc - LINUX_KERNEL_TYPE = "tiny" KCONFIG_MODE = "--allnoconfig" -LINUX_VERSION ?= "3.10.55" +require recipes-kernel/linux/linux-yocto.inc + +LINUX_VERSION ?= "3.19.2" KMETA = "meta" +KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "8e055f3b669c65e83ba7128c248c632eedafad72" -SRCREV_meta ?= "f79a00265eefbe2fffc2cdb03f67235497a9a87e" +SRCREV_machine ?= "31b35da6a5c8a2b162f6c33202e9b64dd13757d5" +SRCREV_meta ?= "9e70b482d3773abf92c9c5850e134cbca1d5651f" PV = "${LINUX_VERSION}+git${SRCPV}" -SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" +SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.19.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" COMPATIBLE_MACHINE = "(qemux86)" diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 4ed318886f..3b41a61c36 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -7,6 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" INC_PR = "r4" DEPENDS += "xz-native bc-native" +DEPENDS_append_aarch64 = " libgcc" +KERNEL_CC_append_aarch64 = " ${TOOLCHAIN_OPTIONS}" +KERNEL_LD_append_aarch64 = " ${TOOLCHAIN_OPTIONS}" # A KMACHINE is the mapping of a yocto $MACHINE to what is built # by the kernel. This is typically the branch that should be built, @@ -20,11 +23,14 @@ KBRANCH ?= "master" KMACHINE ?= "${MACHINE}" SRCREV_FORMAT ?= "meta_machine" -LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" - -do_patch[depends] = "kern-tools-native:do_populate_sysroot" +# LEVELS: +# 0: no reporting +# 1: report options that are specified, but not in the final config +# 2: report options that are not hardware related, but set by a BSP +KCONF_AUDIT_LEVEL ?= "1" +KCONF_BSP_AUDIT_LEVEL ?= "0" -addtask kernel_configme before do_configure after do_patch +LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" # Pick up shared functions inherit kernel diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb deleted file mode 100644 index ea69856595..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb +++ /dev/null @@ -1,37 +0,0 @@ -KBRANCH ?= "standard/base" - -require recipes-kernel/linux/linux-yocto.inc - -# board specific branches -KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs" -KBRANCH_qemumips ?= "standard/mti-malta32" -KBRANCH_qemuppc ?= "standard/qemuppc" -KBRANCH_qemux86 ?= "standard/common-pc/base" -KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" -KBRANCH_qemumips64 ?= "standard/mti-malta64" - -SRCREV_machine_qemuarm ?= "a4195791d27ef50feb454765149ea34621ef8ed7" -SRCREV_machine_qemumips ?= "ff747b3dff7dfa643b3447a348b901cacc5b6a16" -SRCREV_machine_qemuppc ?= "46e30d608f4268b0ea77362398aae91f1d410ee3" -SRCREV_machine_qemux86 ?= "8e055f3b669c65e83ba7128c248c632eedafad72" -SRCREV_machine_qemux86-64 ?= "8e055f3b669c65e83ba7128c248c632eedafad72" -SRCREV_machine_qemumips64 ?= "42457c568170cb11a9011382ebca4677f22b35c1" -SRCREV_machine ?= "8e055f3b669c65e83ba7128c248c632eedafad72" -SRCREV_meta ?= "f79a00265eefbe2fffc2cdb03f67235497a9a87e" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" - -LINUX_VERSION ?= "3.10.55" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "meta" - -COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" -KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb index a2f4b4dccf..b71aea2b18 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb @@ -4,30 +4,33 @@ require recipes-kernel/linux/linux-yocto.inc # board specific branches KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs" +KBRANCH_qemuarm64 ?= "standard/qemuarm64" KBRANCH_qemumips ?= "standard/mti-malta32" KBRANCH_qemuppc ?= "standard/qemuppc" KBRANCH_qemux86 ?= "standard/common-pc/base" KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "127b621f2a4d3b1111e24423c12fac001e047c1c" -SRCREV_machine_qemumips ?= "c3b9f1b2397f0847ab4844d1cdb8e02574434d78" -SRCREV_machine_qemuppc ?= "73e2411cdd91764d0601c0869857f53381c2a177" -SRCREV_machine_qemux86 ?= "e19a1b40de44e756defdfb40349342d8037609bd" -SRCREV_machine_qemux86-64 ?= "902f34d36102a4b2008b776ecae686f80d307e12" -SRCREV_machine_qemumips64 ?= "1c4d70272dde4b695697dd8705a031420480f712" -SRCREV_machine ?= "902f34d36102a4b2008b776ecae686f80d307e12" -SRCREV_meta ?= "fb6271a942b57bdc40c6e49f0203be153699f81c" +SRCREV_machine_qemuarm ?= "d1cea997ae512ee325600a247d75027e65655e0a" +SRCREV_machine_qemuarm64 ?= "4434aa71ff7043c570f9eae493df1ccadbda9b85" +SRCREV_machine_qemumips ?= "c37155f99472e7dc9f94b3bda72c73a3f718fdbf" +SRCREV_machine_qemuppc ?= "521b9fd001dc25a446d39f349cdfb7f9f5697d05" +SRCREV_machine_qemux86 ?= "f7cbba6012312f5bf9b7279bafa8bb09d18b547d" +SRCREV_machine_qemux86-64 ?= "4434aa71ff7043c570f9eae493df1ccadbda9b85" +SRCREV_machine_qemumips64 ?= "a777f11a26f075b71becb47b5133252c5d8fafff" +SRCREV_machine ?= "4434aa71ff7043c570f9eae493df1ccadbda9b85" +SRCREV_meta ?= "162dfe3bb092c1a792e5ed224fe09672e9814b24" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" -LINUX_VERSION ?= "3.14.19" +LINUX_VERSION ?= "3.14.36" PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "meta" +KCONF_BSP_AUDIT_LEVEL = "2" -COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" +COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.17.bb b/meta/recipes-kernel/linux/linux-yocto_3.17.bb deleted file mode 100644 index 02f10a3aaf..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto_3.17.bb +++ /dev/null @@ -1,37 +0,0 @@ -KBRANCH ?= "standard/base" - -require recipes-kernel/linux/linux-yocto.inc - -# board specific branches -KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs" -KBRANCH_qemumips ?= "standard/mti-malta32" -KBRANCH_qemuppc ?= "standard/qemuppc" -KBRANCH_qemux86 ?= "standard/common-pc" -KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" -KBRANCH_qemumips64 ?= "standard/mti-malta64" - -SRCREV_machine_qemuarm ?= "d156e4658a13349f7a30adafd436e32fb722d248" -SRCREV_machine_qemumips ?= "5aa58a6ca9d4efe79ddf66c9d09695b42c84a3b6" -SRCREV_machine_qemuppc ?= "cc4943bf3b93f9c424b63c357ab2c9f71384f3ac" -SRCREV_machine_qemux86 ?= "268b7677421eef003a84f31c6bd0b8ec3acc1e36" -SRCREV_machine_qemux86-64 ?= "268b7677421eef003a84f31c6bd0b8ec3acc1e36" -SRCREV_machine_qemumips64 ?= "798c30525b1e0eacfa3ff97c4bb17c45b9b4b220" -SRCREV_machine ?= "268b7677421eef003a84f31c6bd0b8ec3acc1e36" -SRCREV_meta ?= "84b57b01050dd9e5a004e265e70120e2a792f38a" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.17.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" - -LINUX_VERSION ?= "3.17-rc7" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "meta" - -COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.19.bb b/meta/recipes-kernel/linux/linux-yocto_3.19.bb new file mode 100644 index 0000000000..9b19eb299b --- /dev/null +++ b/meta/recipes-kernel/linux/linux-yocto_3.19.bb @@ -0,0 +1,40 @@ +KBRANCH ?= "standard/base" + +require recipes-kernel/linux/linux-yocto.inc + +# board specific branches +KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs" +KBRANCH_qemuarm64 ?= "standard/qemuarm64" +KBRANCH_qemumips ?= "standard/mti-malta32" +KBRANCH_qemuppc ?= "standard/qemuppc" +KBRANCH_qemux86 ?= "standard/common-pc" +KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" +KBRANCH_qemumips64 ?= "standard/mti-malta64" + +SRCREV_machine_qemuarm ?= "473e2f3788730c51e82714a9785325b6308f6762" +SRCREV_machine_qemuarm64 ?= "31b35da6a5c8a2b162f6c33202e9b64dd13757d5" +SRCREV_machine_qemumips ?= "d43f1cbf282d020f7aa31d68a54b2876d2c0e81b" +SRCREV_machine_qemuppc ?= "35de413056b86191963ffe686913da31b978a9b3" +SRCREV_machine_qemux86 ?= "31b35da6a5c8a2b162f6c33202e9b64dd13757d5" +SRCREV_machine_qemux86-64 ?= "31b35da6a5c8a2b162f6c33202e9b64dd13757d5" +SRCREV_machine_qemumips64 ?= "d35649ef8cbb0a0404be5c721377b138866181ad" +SRCREV_machine ?= "31b35da6a5c8a2b162f6c33202e9b64dd13757d5" +SRCREV_meta ?= "9e70b482d3773abf92c9c5850e134cbca1d5651f" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.19.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" + +LINUX_VERSION ?= "3.19.2" + +PV = "${LINUX_VERSION}+git${SRCPV}" + +KMETA = "meta" +KCONF_BSP_AUDIT_LEVEL = "2" + +COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" diff --git a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch b/meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch deleted file mode 100644 index 258eedd3ba..0000000000 --- a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: backport - -babeltrace: Fix support out of tree builds in babeltrace - -Signed-off-by: Lars Persson <larper@axis.com> - -diff --git a/formats/lttng-live/Makefile.am b/formats/lttng-live/Makefile.am -index c834699..2c6b0bd 100644 ---- a/formats/lttng-live/Makefile.am -+++ b/formats/lttng-live/Makefile.am -@@ -1,4 +1,4 @@ --AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir) - - lib_LTLIBRARIES = libbabeltrace-lttng-live.la - - diff --git a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-don-t-perform-unaligned-integer-read-writes.patch b/meta/recipes-kernel/lttng/babeltrace/0001-Fix-don-t-perform-unaligned-integer-read-writes.patch deleted file mode 100644 index ea0aad699d..0000000000 --- a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-don-t-perform-unaligned-integer-read-writes.patch +++ /dev/null @@ -1,252 +0,0 @@ -From 6a0b6cd5133db9e3c72914d4e5dd7fc792360934 Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -Date: Wed, 16 Jul 2014 10:58:48 -0400 -Subject: [PATCH] Fix: don't perform unaligned integer read/writes - -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> - -Upstream-Status: Backport -Signed-off-by: Saul Wold <sgw@linux.intel.com> - ---- - formats/ctf/types/integer.c | 108 ++++++++++++++++++++++++++++---------------- - 1 file changed, 70 insertions(+), 38 deletions(-) - -diff --git a/formats/ctf/types/integer.c b/formats/ctf/types/integer.c -index 189943e..85931be 100644 ---- a/formats/ctf/types/integer.c -+++ b/formats/ctf/types/integer.c -@@ -62,7 +62,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, - { - uint8_t v; - -- v = *(const uint8_t *) ctf_get_pos_addr(pos); -+ memcpy(&v, ctf_get_pos_addr(pos), sizeof(v)); - integer_definition->value._unsigned = v; - break; - } -@@ -70,7 +70,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, - { - uint16_t v; - -- v = *(const uint16_t *) ctf_get_pos_addr(pos); -+ memcpy(&v, ctf_get_pos_addr(pos), sizeof(v)); - integer_definition->value._unsigned = - rbo ? GUINT16_SWAP_LE_BE(v) : v; - break; -@@ -79,7 +79,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, - { - uint32_t v; - -- v = *(const uint32_t *) ctf_get_pos_addr(pos); -+ memcpy(&v, ctf_get_pos_addr(pos), sizeof(v)); - integer_definition->value._unsigned = - rbo ? GUINT32_SWAP_LE_BE(v) : v; - break; -@@ -88,7 +88,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, - { - uint64_t v; - -- v = *(const uint64_t *) ctf_get_pos_addr(pos); -+ memcpy(&v, ctf_get_pos_addr(pos), sizeof(v)); - integer_definition->value._unsigned = - rbo ? GUINT64_SWAP_LE_BE(v) : v; - break; -@@ -102,7 +102,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, - { - int8_t v; - -- v = *(const int8_t *) ctf_get_pos_addr(pos); -+ memcpy(&v, ctf_get_pos_addr(pos), sizeof(v)); - integer_definition->value._signed = v; - break; - } -@@ -110,7 +110,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, - { - int16_t v; - -- v = *(const int16_t *) ctf_get_pos_addr(pos); -+ memcpy(&v, ctf_get_pos_addr(pos), sizeof(v)); - integer_definition->value._signed = - rbo ? (int16_t) GUINT16_SWAP_LE_BE(v) : v; - break; -@@ -119,7 +119,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, - { - int32_t v; - -- v = *(const int32_t *) ctf_get_pos_addr(pos); -+ memcpy(&v, ctf_get_pos_addr(pos), sizeof(v)); - integer_definition->value._signed = - rbo ? (int32_t) GUINT32_SWAP_LE_BE(v) : v; - break; -@@ -128,7 +128,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, - { - int64_t v; - -- v = *(const int64_t *) ctf_get_pos_addr(pos); -+ memcpy(&v, ctf_get_pos_addr(pos), sizeof(v)); - integer_definition->value._signed = - rbo ? (int64_t) GUINT64_SWAP_LE_BE(v) : v; - break; -@@ -163,48 +163,80 @@ int _aligned_integer_write(struct bt_stream_pos *ppos, - if (pos->dummy) - goto end; - if (!integer_declaration->signedness) { -- uint64_t v = integer_definition->value._unsigned; -- - switch (integer_declaration->len) { -- case 8: *(uint8_t *) ctf_get_pos_addr(pos) = (uint8_t) v; -+ case 8: -+ { -+ uint8_t v = integer_definition->value._unsigned; -+ -+ memcpy(ctf_get_pos_addr(pos), &v, sizeof(v)); - break; -+ } - case 16: -- *(uint16_t *) ctf_get_pos_addr(pos) = rbo ? -- GUINT16_SWAP_LE_BE((uint16_t) v) : -- (uint16_t) v; -+ { -+ uint16_t v = integer_definition->value._unsigned; -+ -+ if (rbo) -+ v = GUINT16_SWAP_LE_BE(v); -+ memcpy(ctf_get_pos_addr(pos), &v, sizeof(v)); - break; -+ } - case 32: -- *(uint32_t *) ctf_get_pos_addr(pos) = rbo ? -- GUINT32_SWAP_LE_BE((uint32_t) v) : -- (uint32_t) v; -+ { -+ uint32_t v = integer_definition->value._unsigned; -+ -+ if (rbo) -+ v = GUINT32_SWAP_LE_BE(v); -+ memcpy(ctf_get_pos_addr(pos), &v, sizeof(v)); - break; -+ } - case 64: -- *(uint64_t *) ctf_get_pos_addr(pos) = rbo ? -- GUINT64_SWAP_LE_BE(v) : v; -+ { -+ uint64_t v = integer_definition->value._unsigned; -+ -+ if (rbo) -+ v = GUINT64_SWAP_LE_BE(v); -+ memcpy(ctf_get_pos_addr(pos), &v, sizeof(v)); - break; -+ } - default: - assert(0); - } - } else { -- int64_t v = integer_definition->value._signed; -- - switch (integer_declaration->len) { -- case 8: *(int8_t *) ctf_get_pos_addr(pos) = (int8_t) v; -+ case 8: -+ { -+ uint8_t v = integer_definition->value._signed; -+ -+ memcpy(ctf_get_pos_addr(pos), &v, sizeof(v)); - break; -+ } - case 16: -- *(int16_t *) ctf_get_pos_addr(pos) = rbo ? -- (int16_t) GUINT16_SWAP_LE_BE((int16_t) v) : -- (int16_t) v; -+ { -+ int16_t v = integer_definition->value._signed; -+ -+ if (rbo) -+ v = GUINT16_SWAP_LE_BE(v); -+ memcpy(ctf_get_pos_addr(pos), &v, sizeof(v)); - break; -+ } - case 32: -- *(int32_t *) ctf_get_pos_addr(pos) = rbo ? -- (int32_t) GUINT32_SWAP_LE_BE((int32_t) v) : -- (int32_t) v; -+ { -+ int32_t v = integer_definition->value._signed; -+ -+ if (rbo) -+ v = GUINT32_SWAP_LE_BE(v); -+ memcpy(ctf_get_pos_addr(pos), &v, sizeof(v)); - break; -+ } - case 64: -- *(int64_t *) ctf_get_pos_addr(pos) = rbo ? -- GUINT64_SWAP_LE_BE(v) : v; -+ { -+ int64_t v = integer_definition->value._signed; -+ -+ if (rbo) -+ v = GUINT64_SWAP_LE_BE(v); -+ memcpy(ctf_get_pos_addr(pos), &v, sizeof(v)); - break; -+ } - default: - assert(0); - } -@@ -237,23 +269,23 @@ int ctf_integer_read(struct bt_stream_pos *ppos, struct bt_definition *definitio - if (!integer_declaration->signedness) { - if (integer_declaration->byte_order == LITTLE_ENDIAN) - bt_bitfield_read_le(mmap_align_addr(pos->base_mma) + -- pos->mmap_base_offset, unsigned long, -+ pos->mmap_base_offset, unsigned char, - pos->offset, integer_declaration->len, - &integer_definition->value._unsigned); - else - bt_bitfield_read_be(mmap_align_addr(pos->base_mma) + -- pos->mmap_base_offset, unsigned long, -+ pos->mmap_base_offset, unsigned char, - pos->offset, integer_declaration->len, - &integer_definition->value._unsigned); - } else { - if (integer_declaration->byte_order == LITTLE_ENDIAN) - bt_bitfield_read_le(mmap_align_addr(pos->base_mma) + -- pos->mmap_base_offset, unsigned long, -+ pos->mmap_base_offset, unsigned char, - pos->offset, integer_declaration->len, - &integer_definition->value._signed); - else - bt_bitfield_read_be(mmap_align_addr(pos->base_mma) + -- pos->mmap_base_offset, unsigned long, -+ pos->mmap_base_offset, unsigned char, - pos->offset, integer_declaration->len, - &integer_definition->value._signed); - } -@@ -286,23 +318,23 @@ int ctf_integer_write(struct bt_stream_pos *ppos, struct bt_definition *definiti - if (!integer_declaration->signedness) { - if (integer_declaration->byte_order == LITTLE_ENDIAN) - bt_bitfield_write_le(mmap_align_addr(pos->base_mma) + -- pos->mmap_base_offset, unsigned long, -+ pos->mmap_base_offset, unsigned char, - pos->offset, integer_declaration->len, - integer_definition->value._unsigned); - else - bt_bitfield_write_be(mmap_align_addr(pos->base_mma) + -- pos->mmap_base_offset, unsigned long, -+ pos->mmap_base_offset, unsigned char, - pos->offset, integer_declaration->len, - integer_definition->value._unsigned); - } else { - if (integer_declaration->byte_order == LITTLE_ENDIAN) - bt_bitfield_write_le(mmap_align_addr(pos->base_mma) + -- pos->mmap_base_offset, unsigned long, -+ pos->mmap_base_offset, unsigned char, - pos->offset, integer_declaration->len, - integer_definition->value._signed); - else - bt_bitfield_write_be(mmap_align_addr(pos->base_mma) + -- pos->mmap_base_offset, unsigned long, -+ pos->mmap_base_offset, unsigned char, - pos->offset, integer_declaration->len, - integer_definition->value._signed); - } --- -1.8.3.1 - diff --git a/meta/recipes-kernel/lttng/babeltrace/Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch b/meta/recipes-kernel/lttng/babeltrace/Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch deleted file mode 100644 index 8e81d2d781..0000000000 --- a/meta/recipes-kernel/lttng/babeltrace/Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch +++ /dev/null @@ -1,54 +0,0 @@ -From cae67efbd9ddf2cee6bbefec076dc8933ababc43 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fredrik=20Markstr=C3=B6m?= <fredrik.markstrom@gmail.com> -Date: Fri, 16 May 2014 10:10:38 +0800 -Subject: [PATCH] Fix: Align buffers from objstack_alloc on sizeof(void *) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Backport - -The buffers from objstack_alloc will store pointers, so they must -be aligned on a pointer's size, or else it will cause issues on the -CPUs which do not support unaligned addresses access. - -Signed-off-by: Fredrik Markstrom <fredrik.markstrom@gmail.com> -Signed-off-by: Roy Li <rongqing.li@windriver.com> -Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com> ---- - formats/ctf/metadata/objstack.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/formats/ctf/metadata/objstack.c b/formats/ctf/metadata/objstack.c -index 9e264a4..14d9252 100644 ---- a/formats/ctf/metadata/objstack.c -+++ b/formats/ctf/metadata/objstack.c -@@ -27,6 +27,7 @@ - #include <stdlib.h> - #include <babeltrace/list.h> - #include <babeltrace/babeltrace-internal.h> -+#include <babeltrace/align.h> - - #define OBJSTACK_INIT_LEN 128 - #define OBJSTACK_POISON 0xcc -@@ -39,7 +40,7 @@ struct objstack_node { - struct bt_list_head node; - size_t len; - size_t used_len; -- char data[]; -+ char __attribute__ ((aligned (sizeof(void *)))) data[]; - }; - - BT_HIDDEN -@@ -118,6 +119,8 @@ void *objstack_alloc(struct objstack *objstack, size_t len) - struct objstack_node *last_node; - void *p; - -+ len = ALIGN(len, sizeof(void *)); -+ - /* Get last node */ - last_node = bt_list_entry(objstack->head.prev, - struct objstack_node, node); --- -1.7.10.4 - diff --git a/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb b/meta/recipes-kernel/lttng/babeltrace_1.2.4.bb index 1c41e25827..f616146393 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.2.4.bb @@ -10,14 +10,10 @@ inherit autotools pkgconfig DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" -SRCREV = "66c2a20b4391fb5c7f870aeb0dde854f0ae1fc79" -PV = "1.2.1+git${SRCPV}" +SRCREV = "90395824efc007de88787a6b8e400a07c980be1c" +PV = "1.2.4+git${SRCPV}" -SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.2 \ - file://0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch \ - file://Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch \ - file://0001-Fix-don-t-perform-unaligned-integer-read-writes.patch \ -" +SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.2" S = "${WORKDIR}/git" diff --git a/meta/recipes-kernel/lttng/lttng-modules/Fix-noargs-probes-should-calculate-alignment-and-eve.patch b/meta/recipes-kernel/lttng/lttng-modules/Fix-noargs-probes-should-calculate-alignment-and-eve.patch deleted file mode 100644 index 9c3dc9c1e1..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/Fix-noargs-probes-should-calculate-alignment-and-eve.patch +++ /dev/null @@ -1,130 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> - -From d3de7f1468be0b18145ff85b3c1a7c7fb1d48c15 Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -Date: Fri, 25 Jul 2014 12:30:43 -0400 -Subject: [PATCH 1/3] Fix: noargs probes should calculate alignment and event - length - -A noargs probe could have event fields. noargs just means that the probe -does not receive any argument as parameter. However, it could very well -serialize data into fields (global variables, constants, etc). - -It just happens that LTTng does not serialize any data in noargs events -at the moment, but this may very well change. - -The if (0) with (void) variable access strategy to stop compiler from -complaining from unused variables does not seem to work as expected with -gcc 4.9.1. Use "unused" attribute instead. - -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - probes/lttng-events.h | 49 +++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 35 insertions(+), 14 deletions(-) - -diff --git a/probes/lttng-events.h b/probes/lttng-events.h -index 596b70608584..ba9563b15cf9 100644 ---- a/probes/lttng-events.h -+++ b/probes/lttng-events.h -@@ -456,10 +456,19 @@ static __used struct lttng_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = { - static inline size_t __event_get_size__##_name(size_t *__dynamic_len, _proto) \ - { \ - size_t __event_len = 0; \ -- unsigned int __dynamic_len_idx = 0; \ -+ unsigned int __dynamic_len_idx __attribute__((unused)) = 0; \ -+ \ -+ _tstruct \ -+ return __event_len; \ -+} -+ -+#undef DECLARE_EVENT_CLASS_NOARGS -+#define DECLARE_EVENT_CLASS_NOARGS(_name, _tstruct, _assign, _print) \ -+static inline size_t __event_get_size__##_name(size_t *__dynamic_len) \ -+{ \ -+ size_t __event_len = 0; \ -+ unsigned int __dynamic_len_idx __attribute__((unused)) = 0; \ - \ -- if (0) \ -- (void) __dynamic_len_idx; /* don't warn if unused */ \ - _tstruct \ - return __event_len; \ - } -@@ -514,6 +523,15 @@ static inline size_t __event_get_align__##_name(_proto) \ - return __event_align; \ - } - -+#undef DECLARE_EVENT_CLASS_NOARGS -+#define DECLARE_EVENT_CLASS_NOARGS(_name, _tstruct, _assign, _print) \ -+static inline size_t __event_get_align__##_name(void) \ -+{ \ -+ size_t __event_align = 1; \ -+ _tstruct \ -+ return __event_align; \ -+} -+ - #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) - - -@@ -553,12 +571,16 @@ static inline size_t __event_get_align__##_name(_proto) \ - #undef TP_STRUCT__entry - #define TP_STRUCT__entry(args...) args - --#undef DECLARE_EVENT_CLASS --#define DECLARE_EVENT_CLASS(_name, _proto, _args, _tstruct, _assign, _print) \ -+#undef DECLARE_EVENT_CLASS_NOARGS -+#define DECLARE_EVENT_CLASS_NOARGS(_name, _tstruct, _assign, _print) \ - struct __event_typemap__##_name { \ - _tstruct \ - }; - -+#undef DECLARE_EVENT_CLASS -+#define DECLARE_EVENT_CLASS(_name, _proto, _args, _tstruct, _assign, _print) \ -+ DECLARE_EVENT_CLASS_NOARGS(_name, _tstruct, _assign, _print) -+ - #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) - - -@@ -760,15 +782,11 @@ static void __event_probe__##_name(void *__data, _proto) \ - struct lttng_channel *__chan = __event->chan; \ - struct lib_ring_buffer_ctx __ctx; \ - size_t __event_len, __event_align; \ -- size_t __dynamic_len_idx = 0; \ -- size_t __dynamic_len[2 * ARRAY_SIZE(__event_fields___##_name)]; \ -- struct __event_typemap__##_name __typemap; \ -+ size_t __dynamic_len_idx __attribute__((unused)) = 0; \ -+ size_t __dynamic_len[2 * ARRAY_SIZE(__event_fields___##_name)] __attribute__((unused)); \ -+ struct __event_typemap__##_name __typemap __attribute__((unused)); \ - int __ret; \ - \ -- if (0) { \ -- (void) __dynamic_len_idx; /* don't warn if unused */ \ -- (void) __typemap; /* don't warn if unused */ \ -- } \ - if (!_TP_SESSION_CHECK(session, __chan->session)) \ - return; \ - if (unlikely(!ACCESS_ONCE(__chan->session->active))) \ -@@ -800,6 +818,9 @@ static void __event_probe__##_name(void *__data) \ - struct lttng_channel *__chan = __event->chan; \ - struct lib_ring_buffer_ctx __ctx; \ - size_t __event_len, __event_align; \ -+ size_t __dynamic_len_idx __attribute__((unused)) = 0; \ -+ size_t __dynamic_len[2 * ARRAY_SIZE(__event_fields___##_name)] __attribute__((unused)); \ -+ struct __event_typemap__##_name __typemap __attribute__((unused)); \ - int __ret; \ - \ - if (!_TP_SESSION_CHECK(session, __chan->session)) \ -@@ -810,8 +831,8 @@ static void __event_probe__##_name(void *__data) \ - return; \ - if (unlikely(!ACCESS_ONCE(__event->enabled))) \ - return; \ -- __event_len = 0; \ -- __event_align = 1; \ -+ __event_len = __event_get_size__##_name(__dynamic_len); \ -+ __event_align = __event_get_align__##_name(); \ - lib_ring_buffer_ctx_init(&__ctx, __chan->chan, __event, __event_len, \ - __event_align, -1); \ - __ret = __chan->ops->event_reserve(&__ctx, __event->id); \ --- -1.8.1.2 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/Update-compaction-instrumentation-to-3.16-kernel.patch b/meta/recipes-kernel/lttng/lttng-modules/Update-compaction-instrumentation-to-3.16-kernel.patch deleted file mode 100644 index 0a056a9475..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/Update-compaction-instrumentation-to-3.16-kernel.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 0007344741ef65259bc52dea72259173dfbf96c0 Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -Date: Sun, 13 Jul 2014 13:33:21 -0400 -Subject: [PATCH 2/2] Update compaction instrumentation to 3.16 kernel - -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - instrumentation/events/lttng-module/compaction.h | 45 +++++++++++++++++++++++- - 1 file changed, 44 insertions(+), 1 deletion(-) - -diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h -index 1b237fa45ab0..22024e9ee582 100644 ---- a/instrumentation/events/lttng-module/compaction.h -+++ b/instrumentation/events/lttng-module/compaction.h -@@ -6,6 +6,7 @@ - - #include <linux/types.h> - #include <linux/tracepoint.h> -+#include <linux/version.h> - #include <trace/events/gfpflags.h> - - DECLARE_EVENT_CLASS(mm_compaction_isolate_template, -@@ -45,6 +46,48 @@ DEFINE_EVENT(mm_compaction_isolate_template, mm_compaction_isolate_freepages, - TP_ARGS(nr_scanned, nr_taken) - ) - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) -+TRACE_EVENT(mm_compaction_migratepages, -+ -+ TP_PROTO(unsigned long nr_all, -+ int migrate_rc, -+ struct list_head *migratepages), -+ -+ TP_ARGS(nr_all, migrate_rc, migratepages), -+ -+ TP_STRUCT__entry( -+ __field(unsigned long, nr_migrated) -+ __field(unsigned long, nr_failed) -+ ), -+ -+ TP_fast_assign( -+ tp_assign(nr_migrated, -+ nr_all - -+ (migrate_rc >= 0 ? migrate_rc : -+ ({ -+ unsigned long nr_failed = 0; -+ struct list_head *page_lru; -+ -+ list_for_each(page_lru, migratepages) -+ nr_failed++; -+ nr_failed; -+ }))) -+ tp_assign(nr_failed, -+ ({ -+ unsigned long nr_failed = 0; -+ struct list_head *page_lru; -+ -+ list_for_each(page_lru, migratepages) -+ nr_failed++; -+ nr_failed; -+ })) -+ ), -+ -+ TP_printk("nr_migrated=%lu nr_failed=%lu", -+ __entry->nr_migrated, -+ __entry->nr_failed) -+) -+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */ - TRACE_EVENT(mm_compaction_migratepages, - - TP_PROTO(unsigned long nr_migrated, -@@ -66,7 +109,7 @@ TRACE_EVENT(mm_compaction_migratepages, - __entry->nr_migrated, - __entry->nr_failed) - ) -- -+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */ - - #endif /* _TRACE_COMPACTION_H */ - --- -1.8.1.2 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/Update-kvm-instrumentation-compile-on-3.17-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/Update-kvm-instrumentation-compile-on-3.17-rc1.patch deleted file mode 100644 index 3541b50b79..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/Update-kvm-instrumentation-compile-on-3.17-rc1.patch +++ /dev/null @@ -1,46 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> - -From 458c2022e992c057bd21d02e4c77bcc7d4d6cd6c Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -Date: Thu, 21 Aug 2014 11:15:50 -0400 -Subject: [PATCH 3/3] Update kvm instrumentation: compile on 3.17-rc1 - -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - instrumentation/events/lttng-module/arch/x86/kvm/trace.h | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h -index 2354884074eb..3c299c58a1cf 100644 ---- a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h -+++ b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h -@@ -724,7 +724,7 @@ TRACE_EVENT(kvm_emulate_insn, - tp_memcpy(insn, - vcpu->arch.emulate_ctxt.decode.fetch.data, - 15) --#else -+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) - tp_assign(rip, vcpu->arch.emulate_ctxt.fetch.start) - tp_assign(csbase, kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS)) - tp_assign(len, vcpu->arch.emulate_ctxt._eip -@@ -732,6 +732,16 @@ TRACE_EVENT(kvm_emulate_insn, - tp_memcpy(insn, - vcpu->arch.emulate_ctxt.fetch.data, - 15) -+#else -+ tp_assign(rip, vcpu->arch.emulate_ctxt._eip - -+ (vcpu->arch.emulate_ctxt.fetch.ptr - -+ vcpu->arch.emulate_ctxt.fetch.data)) -+ tp_assign(csbase, kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS)) -+ tp_assign(len, vcpu->arch.emulate_ctxt.fetch.ptr - -+ vcpu->arch.emulate_ctxt.fetch.data) -+ tp_memcpy(insn, -+ vcpu->arch.emulate_ctxt.fetch.data, -+ 15) - #endif - tp_assign(flags, kei_decode_mode(vcpu->arch.emulate_ctxt.mode)) - tp_assign(failed, failed) --- -1.8.1.2 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/Update-statedump-to-3.17-nsproxy-locking.patch b/meta/recipes-kernel/lttng/lttng-modules/Update-statedump-to-3.17-nsproxy-locking.patch deleted file mode 100644 index 0f18c8a3e6..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/Update-statedump-to-3.17-nsproxy-locking.patch +++ /dev/null @@ -1,70 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> - -From 4ba1f53c5aebb4433fedc25d65af010274985043 Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -Date: Thu, 21 Aug 2014 10:53:12 -0400 -Subject: [PATCH 2/3] Update statedump to 3.17 nsproxy locking - -This Linux upstream commit introduces locking strategy back and forth: - -commit 728dba3a39c66b3d8ac889ddbe38b5b1c264aec3 -Author: Eric W. Biederman <ebiederm@xmission.com> -Date: Mon Feb 3 19:13:49 2014 -0800 - - namespaces: Use task_lock and not rcu to protect nsproxy - -Use the task lock starting from kernel 3.17 rather than RCU to access -the task nsproxy. - -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - lttng-statedump-impl.c | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c -index dad51ddaa250..e4caa488e436 100644 ---- a/lttng-statedump-impl.c -+++ b/lttng-statedump-impl.c -@@ -378,6 +378,9 @@ int lttng_list_interrupts(struct lttng_session *session) - } - #endif - -+/* -+ * Called with task lock held. -+ */ - static - void lttng_statedump_process_ns(struct lttng_session *session, - struct task_struct *p, -@@ -389,8 +392,18 @@ void lttng_statedump_process_ns(struct lttng_session *session, - struct nsproxy *proxy; - struct pid_namespace *pid_ns; - -+ /* -+ * Back and forth on locking strategy within Linux upstream for nsproxy. -+ * See Linux upstream commit 728dba3a39c66b3d8ac889ddbe38b5b1c264aec3 -+ * "namespaces: Use task_lock and not rcu to protect nsproxy" -+ * for details. -+ */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) - rcu_read_lock(); - proxy = task_nsproxy(p); -+#else /* #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */ -+ proxy = p->nsproxy; -+#endif /* #else #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */ - if (proxy) { - pid_ns = lttng_get_proxy_pid_ns(proxy); - do { -@@ -402,7 +415,9 @@ void lttng_statedump_process_ns(struct lttng_session *session, - trace_lttng_statedump_process_state(session, - p, type, mode, submode, status, NULL); - } -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) - rcu_read_unlock(); -+#endif /* #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */ - } - - static --- -1.8.1.2 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/Update-vmscan-instrumentation-to-3.16-kernel.patch b/meta/recipes-kernel/lttng/lttng-modules/Update-vmscan-instrumentation-to-3.16-kernel.patch deleted file mode 100644 index 5f02270e89..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/Update-vmscan-instrumentation-to-3.16-kernel.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 5defe623568273e9b87da1b817e373ff087fd862 Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -Date: Sun, 13 Jul 2014 13:27:01 -0400 -Subject: [PATCH 1/2] Update vmscan instrumentation to 3.16 kernel - -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - instrumentation/events/lttng-module/vmscan.h | 39 ++++++++++++++++++++++++++++ - 1 file changed, 39 insertions(+) - -diff --git a/instrumentation/events/lttng-module/vmscan.h b/instrumentation/events/lttng-module/vmscan.h -index 1fd50ba7c235..0b4aa56761dc 100644 ---- a/instrumentation/events/lttng-module/vmscan.h -+++ b/instrumentation/events/lttng-module/vmscan.h -@@ -238,6 +238,44 @@ TRACE_EVENT(mm_shrink_slab_start, - __entry->total_scan) - ) - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) -+TRACE_EVENT(mm_shrink_slab_end, -+ TP_PROTO(struct shrinker *shr, int nid, int shrinker_retval, -+ long unused_scan_cnt, long new_scan_cnt, long total_scan), -+ -+ TP_ARGS(shr, nid, shrinker_retval, unused_scan_cnt, new_scan_cnt, -+ total_scan), -+ -+ TP_STRUCT__entry( -+ __field(struct shrinker *, shr) -+ __field(int, nid) -+ __field(void *, shrink) -+ __field(long, unused_scan) -+ __field(long, new_scan) -+ __field(int, retval) -+ __field(long, total_scan) -+ ), -+ -+ TP_fast_assign( -+ tp_assign(shr, shr) -+ tp_assign(nid, nid) -+ tp_assign(shrink, shr->scan_objects) -+ tp_assign(unused_scan, unused_scan_cnt) -+ tp_assign(new_scan, new_scan_cnt) -+ tp_assign(retval, shrinker_retval) -+ tp_assign(total_scan, total_scan) -+ ), -+ -+ TP_printk("%pF %p: nid %d unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", -+ __entry->shrink, -+ __entry->shr, -+ __entry->nid, -+ __entry->unused_scan, -+ __entry->new_scan, -+ __entry->total_scan, -+ __entry->retval) -+) -+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */ - TRACE_EVENT(mm_shrink_slab_end, - TP_PROTO(struct shrinker *shr, int shrinker_retval, - long unused_scan_cnt, long new_scan_cnt), -@@ -274,6 +312,7 @@ TRACE_EVENT(mm_shrink_slab_end, - __entry->total_scan, - __entry->retval) - ) -+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */ - #endif - - DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template, --- -1.8.1.2 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/fix_build_with_v3.17_kernel.patch b/meta/recipes-kernel/lttng/lttng-modules/fix_build_with_v3.17_kernel.patch deleted file mode 100644 index 97b7a53a07..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/fix_build_with_v3.17_kernel.patch +++ /dev/null @@ -1,113 +0,0 @@ - -Upstream-Status: Backport - -commit 7df57eb5d6bdc85ddcf2b9afb6cd0cacfb22096e -Author: Nitin A Kamble <nitin.a.kamble@intel.com> -Date: Thu Sep 25 18:19:43 2014 -0700 - - asoc.h: fix build with v3.17 kernel - - The snd_soc_codec structure has changed in the v3.17 kernel. Some - of the redundant fields have been removed. To be specific this commit - from the v3.17 kernel causes the build failure for lttng-modules. - - |commit f4333203ec933f9272c90c7add01774ec2cf94d3 - |Author: Lars-Peter Clausen <lars@metafoo.de> - |Date: Mon Jun 16 18:13:02 2014 +0200 - | - | ASoC: Move name and id from CODEC/platform to component - | - | The component struct already has a name and id field which are initialized to - | the same values as the same fields in the CODEC and platform structs. So remove - | them from the CODEC and platform structs and used the ones from the component - | struct instead. - | - | Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> - | Signed-off-by: Mark Brown <broonie@linaro.org> - - The asoc.h is changed according to the change in the above kernel commit - to fix the lttng-modules build. The change in the lttng-modules code is - conditional on the kernel version, so that it does not break builds with - previous kernel versions. - - Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> - Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> - -diff --git a/instrumentation/events/lttng-module/asoc.h b/instrumentation/events/lttng-module/asoc.h -index 672bea4..bf9cf86 100644 ---- a/instrumentation/events/lttng-module/asoc.h -+++ b/instrumentation/events/lttng-module/asoc.h -@@ -21,6 +21,14 @@ struct snd_soc_card; - struct snd_soc_dapm_widget; - #endif - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) -+#define CODEC_NAME_FIELD component.name -+#define CODEC_ID_FIELD component.id -+#else -+#define CODEC_NAME_FIELD name -+#define CODEC_ID_FIELD id -+#endif -+ - /* - * Log register events - */ -@@ -32,15 +40,15 @@ DECLARE_EVENT_CLASS(snd_soc_reg, - TP_ARGS(codec, reg, val), - - TP_STRUCT__entry( -- __string( name, codec->name ) -+ __string( name, codec->CODEC_NAME_FIELD ) - __field( int, id ) - __field( unsigned int, reg ) - __field( unsigned int, val ) - ), - - TP_fast_assign( -- tp_strcpy(name, codec->name) -- tp_assign(id, codec->id) -+ tp_strcpy(name, codec->CODEC_NAME_FIELD) -+ tp_assign(id, codec->CODEC_ID_FIELD) - tp_assign(reg, reg) - tp_assign(val, val) - ), -@@ -77,15 +85,15 @@ DECLARE_EVENT_CLASS(snd_soc_preg, - TP_ARGS(platform, reg, val), - - TP_STRUCT__entry( -- __string( name, platform->name ) -+ __string( name, platform->CODEC_NAME_FIELD ) - __field( int, id ) - __field( unsigned int, reg ) - __field( unsigned int, val ) - ), - - TP_fast_assign( -- tp_strcpy(name, platform->name) -- tp_assign(id, platform->id) -+ tp_strcpy(name, platform->CODEC_NAME_FIELD) -+ tp_assign(id, platform->CODEC_ID_FIELD) - tp_assign(reg, reg) - tp_assign(val, val) - ), -@@ -399,17 +407,17 @@ TRACE_EVENT(snd_soc_cache_sync, - TP_ARGS(codec, type, status), - - TP_STRUCT__entry( -- __string( name, codec->name ) -+ __string( name, codec->CODEC_NAME_FIELD ) - __string( status, status ) - __string( type, type ) - __field( int, id ) - ), - - TP_fast_assign( -- tp_strcpy(name, codec->name) -+ tp_strcpy(name, codec->CODEC_NAME_FIELD) - tp_strcpy(status, status) - tp_strcpy(type, type) -- tp_assign(id, codec->id) -+ tp_assign(id, codec->CODEC_ID_FIELD) - ), - - TP_printk("codec=%s.%d type=%s status=%s", __get_str(name), diff --git a/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch b/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch index 30f825c414..bbfa38a0b5 100644 --- a/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch +++ b/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch @@ -8,11 +8,11 @@ it as-is. Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com> -diff --git a/Makefile b/Makefile -index a9d1cb1..c1b65b9 100644 ---- a/Makefile -+++ b/Makefile -@@ -43,19 +43,19 @@ obj-m += lib/ +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile +@@ -62,19 +62,19 @@ obj-m += lib/ endif # CONFIG_TRACEPOINTS else # KERNELRELEASE @@ -37,26 +37,11 @@ index a9d1cb1..c1b65b9 100644 - $(MAKE) -C $(KERNELDIR) M=$(PWD) $@ + $(MAKE) -C $(KERNEL_SRC) M=$(PWD) $@ endif # KERNELRELEASE -diff --git a/README b/README -index 8c5dd46..6bd3334 100644 ---- a/README -+++ b/README -@@ -27,8 +27,8 @@ access to your full kernel source tree), and use: - If you need to specify the target directory to the kernel you want to build - against, use: - --% KERNELDIR=path_to_kernel_dir make --# KERNELDIR=path_to_kernel_dir make modules_install -+% KERNEL_SRC=path_to_kernel_dir make -+# KERNEL_SRC=path_to_kernel_dir make modules_install - # depmod -a kernel_version - - Use lttng-tools to control the tracer. LTTng tools should automatically load -diff --git a/probes/Makefile b/probes/Makefile -index 225803c..3449866 100644 ---- a/probes/Makefile -+++ b/probes/Makefile -@@ -212,18 +212,18 @@ endif +Index: git/probes/Makefile +=================================================================== +--- git.orig/probes/Makefile ++++ git/probes/Makefile +@@ -231,18 +231,18 @@ endif endif else diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.6.0.bb index 6ff961a9b1..4cf01caa51 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.6.0.bb @@ -7,21 +7,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1412caf5a1aa90d6a48588a4794c0eac \ file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad" DEPENDS = "virtual/kernel" +do_configure[depends] += "virtual/kernel:do_shared_workdir" inherit module -SRCREV = "789fd1d06d07aeb9a403bdce1b3318560cfc6eca" +SRCREV = "1b2a5429de815c95643df2eadf91253909708728" COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|arm).*-linux' -SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.5 \ +SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.6 \ file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \ - file://Update-compaction-instrumentation-to-3.16-kernel.patch \ - file://Update-vmscan-instrumentation-to-3.16-kernel.patch \ - file://Fix-noargs-probes-should-calculate-alignment-and-eve.patch \ - file://Update-statedump-to-3.17-nsproxy-locking.patch \ - file://Update-kvm-instrumentation-compile-on-3.17-rc1.patch \ - file://fix_build_with_v3.17_kernel.patch \ " export INSTALL_MOD_DIR="kernel/lttng-modules" diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb index fd44aa5f6d..f0969b5241 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb @@ -12,8 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \ DEPENDS = "liburcu popt lttng-ust libxml2" RDEPENDS_${PN}-ptest += "make perl bash" -SRCREV = "8b27cacb277c2cdab791139b08da8eb87ab14a88" -PV = "v2.5.0" +SRCREV = "d522c1f14285e2e8b10b7c0cd011847696ffe779" PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ am_cv_python_pythondir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ @@ -21,16 +20,20 @@ PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/s " PACKAGECONFIG ??= "lttng-ust" PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python swig-native" -PACKAGECONFIG[lttng-ust] = ", --disable-lttng-ust, lttng-ust" +PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust" +PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod" -SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.5 \ +SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.6 \ file://runtest-2.4.0.patch \ file://run-ptest \ " S = "${WORKDIR}/git" -inherit autotools-brokensep ptest pkgconfig +inherit autotools-brokensep ptest pkgconfig useradd + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "tracing" export KERNELDIR="${STAGING_KERNEL_DIR}" diff --git a/meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch b/meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch new file mode 100644 index 0000000000..cec5410369 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch @@ -0,0 +1,19 @@ +lttng-ust: add aarch64 recognition + +Treat the same as "arm". + +Upstream-Status: Pending + +Signed-off-by: joe.slater@windriver.com + + +--- a/configure.ac ++++ b/configure.ac +@@ -230,6 +230,7 @@ changequote([,])dnl + s390) NO_UNALIGNED_ACCESS=1 ;; + s390x) NO_UNALIGNED_ACCESS=1 ;; + arm*) NO_UNALIGNED_ACCESS=1 ;; ++ aarch64) NO_UNALIGNED_ACCESS=1 ;; + mips*) NO_UNALIGNED_ACCESS=1 ;; + tile*) NO_UNALIGNED_ACCESS=1 ;; + *) AC_MSG_ERROR([unable to detect alignment requirements (unsupported architecture ($host_cpu)?)]) ;; diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.5.0.bb b/meta/recipes-kernel/lttng/lttng-ust_2.6.0.bb index 71ea5bccf2..080e7448b2 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_2.5.0.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_2.6.0.bb @@ -18,12 +18,12 @@ RPROVIDES_${PN} = "lttng2-ust" RREPLACES_${PN} = "lttng2-ust" RCONFLICTS_${PN} = "lttng2-ust" -SRCREV = "ce59a997afdb7dc8af02b464430bb7e35549fa66" -PV = "2.5.0" +SRCREV = "5748584c5ae8ca5c4da26f41b6c61bb816e6d50b" PE = "2" -SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.5 \ +SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.6 \ file://lttng-ust-doc-examples-disable.patch \ + file://add-aarch64.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb index 7031ba142c..db670cfbb4 100644 --- a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb +++ b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb @@ -4,8 +4,11 @@ LICENSE = "PD" LIC_FILES_CHKSUM = "file://LICENSE;md5=7bf87fc37976e93ec66ad84fac58c098" SRC_URI = "file://modutils.sh \ file://PD.patch" + PR = "r7" +S = "${WORKDIR}" + INITSCRIPT_NAME = "modutils.sh" INITSCRIPT_PARAMS = "start 05 S ." diff --git a/meta/recipes-kernel/oprofile/oprofile.inc b/meta/recipes-kernel/oprofile/oprofile.inc index 69582039e8..49e6b16c1c 100644 --- a/meta/recipes-kernel/oprofile/oprofile.inc +++ b/meta/recipes-kernel/oprofile/oprofile.inc @@ -18,16 +18,16 @@ FILES_${PN} = "${bindir} ${libdir}/${BPN}/lib*${SOLIBS} ${datadir}/${BPN}" FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la" FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a" -SRC_URI = "file://opstart.patch \ +SRC_URI = "file://filemode-fix.patch \ file://acinclude.m4 \ file://automake-foreign.patch \ file://oprofile-cross-compile-tests.patch \ file://run-ptest \ file://root-home-dir.patch" -inherit autotools-brokensep pkgconfig ptest +inherit autotools pkgconfig ptest -EXTRA_OECONF = "--with-kernel=${STAGING_KERNEL_DIR} --without-x" +EXTRA_OECONF = "--with-kernel=${STAGING_KERNEL_DIR} --without-x ac_cv_prog_XSLTPROC=" do_configure () { cp ${WORKDIR}/acinclude.m4 ${S}/ autotools_do_configure @@ -40,7 +40,6 @@ do_compile_ptest() { do_install_ptest() { subdirs="libdb/tests libutil++/tests libregex/tests libutil/tests libop/tests libdb/tests " - cd ${S} for tooltest in ${subdirs} do find ${tooltest} -perm /u=x -type f| cpio -pvdu ${D}${PTEST_PATH} @@ -54,6 +53,6 @@ do_install_ptest() { cp libregex/tests/mangled-name ${D}${PTEST_PATH}/libregex/tests # needed by litutil++ file_manip_tests - cp libutil++/tests/file_manip_tests.cpp \ + cp ${S}/libutil++/tests/file_manip_tests.cpp \ libutil++/tests/file_manip_tests.o ${D}${PTEST_PATH}/libutil++/tests } diff --git a/meta/recipes-kernel/oprofile/oprofile/0001-Add-freescale-e500mc-support.patch b/meta/recipes-kernel/oprofile/oprofile/0001-Add-freescale-e500mc-support.patch deleted file mode 100644 index 077da4bf2b..0000000000 --- a/meta/recipes-kernel/oprofile/oprofile/0001-Add-freescale-e500mc-support.patch +++ /dev/null @@ -1,219 +0,0 @@ -From ca3f796b3a7742215ed35b56fc072595174c410e Mon Sep 17 00:00:00 2001 -From: Ting Liu <b28495@freescale.com> -Date: Thu, 5 Sep 2013 07:43:55 -0500 -Subject: [PATCH 1/2] Add freescale e500mc support - -Upstream-Status: Backport - -Signed-off-by: George Stephen <Stephen.George@freescale.com> -Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> -Signed-off-by: Ting Liu <b28495@freescale.com> ---- - events/Makefile.am | 1 + - events/ppc/e500mc/events | 120 ++++++++++++++++++++++++++++++++++++++++++ - events/ppc/e500mc/unit_masks | 4 ++ - libop/op_cpu_type.c | 1 + - libop/op_cpu_type.h | 1 + - libop/op_events.c | 1 + - utils/ophelp.c | 1 + - 7 files changed, 129 insertions(+), 0 deletions(-) - create mode 100644 events/ppc/e500mc/events - create mode 100644 events/ppc/e500mc/unit_masks - -diff --git a/events/Makefile.am b/events/Makefile.am -index be87781..e496f98 100644 ---- a/events/Makefile.am -+++ b/events/Makefile.am -@@ -76,6 +76,7 @@ event_files = \ - ppc/7450/events ppc/7450/unit_masks \ - ppc/e500/events ppc/e500/unit_masks \ - ppc/e500v2/events ppc/e500v2/unit_masks \ -+ ppc/e500mc/events ppc/e500mc/unit_masks \ - ppc/e300/events ppc/e300/unit_masks \ - tile/tile64/events tile/tile64/unit_masks \ - tile/tilepro/events tile/tilepro/unit_masks \ -diff --git a/events/ppc/e500mc/events b/events/ppc/e500mc/events -new file mode 100644 -index 0000000..8197a7d ---- /dev/null -+++ b/events/ppc/e500mc/events -@@ -0,0 +1,120 @@ -+# e500mc Events -+# -+# Copyright (C) 2010 Freescale Semiconductor, Inc. -+# -+event:0x1 counters:0,1,2,3 um:zero minimum:100 name:CPU_CLK : Cycles -+event:0x2 counters:0,1,2,3 um:zero minimum:500 name:COMPLETED_INSNS : Completed Instructions (0, 1, or 2 per cycle) -+event:0x3 counters:0,1,2,3 um:zero minimum:500 name:COMPLETED_OPS : Completed Micro-ops (counts 2 for load/store w/update) -+event:0x4 counters:0,1,2,3 um:zero minimum:500 name:INSTRUCTION_FETCHES : Instruction fetches -+event:0x5 counters:0,1,2,3 um:zero minimum:500 name:DECODED_OPS : Micro-ops decoded -+event:0x8 counters:0,1,2,3 um:zero minimum:500 name:COMPLETED_BRANCHES : Branch Instructions completed -+event:0x9 counters:0,1,2,3 um:zero minimum:500 name:COMPLETED_LOAD_OPS : Load micro-ops completed -+event:0xa counters:0,1,2,3 um:zero minimum:500 name:COMPLETED_STORE_OPS : Store micro-ops completed -+event:0xb counters:0,1,2,3 um:zero minimum:500 name:COMPLETION_REDIRECTS : Number of completion buffer redirects -+event:0xc counters:0,1,2,3 um:zero minimum:500 name:BRANCHES_FINISHED : Branches finished -+event:0xd counters:0,1,2,3 um:zero minimum:500 name:TAKEN_BRANCHES_FINISHED : Taken branches finished -+event:0xe counters:0,1,2,3 um:zero minimum:500 name:BIFFED_BRANCHES_FINISHED : Biffed branches finished -+event:0xf counters:0,1,2,3 um:zero minimum:500 name:BRANCHES_MISPREDICTED : Branch instructions mispredicted due to direction, target, or IAB prediction -+event:0x10 counters:0,1,2,3 um:zero minimum:500 name:BRANCHES_MISPREDICTED_DIRECTION : Branches mispredicted due to direction prediction -+event:0x11 counters:0,1,2,3 um:zero minimum:500 name:BTB_HITS : Branches that hit in the BTB, or missed but are not taken -+event:0x12 counters:0,1,2,3 um:zero minimum:500 name:DECODE_STALLED : Cycles the instruction buffer was not empty, but 0 instructions decoded -+event:0x13 counters:0,1,2,3 um:zero minimum:500 name:ISSUE_STALLED : Cycles the issue buffer is not empty but 0 instructions issued -+event:0x14 counters:0,1,2,3 um:zero minimum:500 name:BRANCH_ISSUE_STALLED : Cycles the branch buffer is not empty but 0 instructions issued -+event:0x15 counters:0,1,2,3 um:zero minimum:500 name:SRS0_SCHEDULE_STALLED : Cycles SRS0 is not empty but 0 instructions scheduled -+event:0x16 counters:0,1,2,3 um:zero minimum:500 name:SRS1_SCHEDULE_STALLED : Cycles SRS1 is not empty but 0 instructions scheduled -+event:0x17 counters:0,1,2,3 um:zero minimum:500 name:VRS_SCHEDULE_STALLED : Cycles VRS is not empty but 0 instructions scheduled -+event:0x18 counters:0,1,2,3 um:zero minimum:500 name:LRS_SCHEDULE_STALLED : Cycles LRS is not empty but 0 instructions scheduled -+event:0x19 counters:0,1,2,3 um:zero minimum:500 name:BRS_SCHEDULE_STALLED : Cycles BRS is not empty but 0 instructions scheduled Load/Store, Data Cache, and dLFB Events -+event:0x1a counters:0,1,2,3 um:zero minimum:500 name:TOTAL_TRANSLATED : Total Ldst microops translated. -+event:0x1b counters:0,1,2,3 um:zero minimum:500 name:LOADS_TRANSLATED : Number of cacheable L* or EVL* microops translated. (This includes microops from load-multiple, load-update, and load-context instructions.) -+event:0x1c counters:0,1,2,3 um:zero minimum:500 name:STORES_TRANSLATED : Number of cacheable ST* or EVST* microops translated. (This includes microops from store-multiple, store-update, and save-context instructions.) -+event:0x1d counters:0,1,2,3 um:zero minimum:500 name:TOUCHES_TRANSLATED : Number of cacheable DCBT and DCBTST instructions translated (L1 only) (Does not count touches that are converted to nops i.e. exceptions, noncacheable, hid0[nopti] bit is set.) -+event:0x1e counters:0,1,2,3 um:zero minimum:500 name:CACHEOPS_TRANSLATED : Number of dcba, dcbf, dcbst, and dcbz instructions translated (e500 traps on dcbi) -+event:0x1f counters:0,1,2,3 um:zero minimum:500 name:CACHEINHIBITED_ACCESSES_TRANSLATED : Number of cache inhibited accesses translated -+event:0x20 counters:0,1,2,3 um:zero minimum:500 name:GUARDED_LOADS_TRANSLATED : Number of guarded loads translated -+event:0x21 counters:0,1,2,3 um:zero minimum:500 name:WRITETHROUGH_STORES_TRANSLATED : Number of write-through stores translated -+event:0x22 counters:0,1,2,3 um:zero minimum:500 name:MISALIGNED_ACCESSES_TRANSLATED : Number of misaligned load or store accesses translated. -+event:0x23 counters:0,1,2,3 um:zero minimum:500 name:TOTAL_ALLOCATED_DLFB : Total allocated to dLFB -+event:0x24 counters:0,1,2,3 um:zero minimum:500 name:LOADS_TRANSLATED_ALLOCATED_DLFB : Loads translated and allocated to dLFB (Applies to same class of instructions as loads translated.) -+event:0x25 counters:0,1,2,3 um:zero minimum:500 name:STORES_COMPLETED_ALLOCATED_DLFB : Stores completed and allocated to dLFB (Applies to same class of instructions as stores translated.) -+event:0x26 counters:0,1,2,3 um:zero minimum:500 name:TOUCHES_TRANSLATED_ALLOCATED_DLFB : Touches translated and allocated to dLFB (Applies to same class of instructions as touches translated.) -+event:0x27 counters:0,1,2,3 um:zero minimum:500 name:STORES_COMPLETED : Number of cacheable ST* or EVST* microops completed. (Applies to the same class of instructions as stores translated.) -+event:0x28 counters:0,1,2,3 um:zero minimum:500 name:DL1_LOCKS : Number of cache lines locked in the dL1. (Counts a lock even if an overlock condition is encountered.) -+event:0x29 counters:0,1,2,3 um:zero minimum:500 name:DL1_RELOADS : This is historically used to determine dcache miss rate (along with loads/stores completed). This counts dL1 reloads for any reason. -+event:0x2a counters:0,1,2,3 um:zero minimum:500 name:DL1_CASTOUTS : dL1 castouts. Does not count castouts due to DCBF. -+event:0x2b counters:0,1,2,3 um:zero minimum:500 name:DETECTED_REPLAYS : Times detected replay condition - Load miss with dLFB full. -+event:0x2c counters:0,1,2,3 um:zero minimum:500 name:LOAD_MISS_QUEUE_FULL_REPLAYS : Load miss with load queue full. -+event:0x2d counters:0,1,2,3 um:zero minimum:500 name:LOAD_GUARDED_MISS_NOT_LAST_REPLAYS : Load guarded miss when the load is not yet at the bottom of the completion buffer. -+event:0x2e counters:0,1,2,3 um:zero minimum:500 name:STORE_TRANSLATED_QUEUE_FULL_REPLAYS : Translate a store when the StQ is full. -+event:0x2f counters:0,1,2,3 um:zero minimum:500 name:ADDRESS_COLLISION_REPLAYS : Address collision. -+event:0x30 counters:0,1,2,3 um:zero minimum:500 name:DMMU_MISS_REPLAYS : DMMU_MISS_REPLAYS : DMMU miss. -+event:0x31 counters:0,1,2,3 um:zero minimum:500 name:DMMU_BUSY_REPLAYS : DMMU_BUSY_REPLAYS : DMMU busy. -+event:0x32 counters:0,1,2,3 um:zero minimum:500 name:SECOND_PART_MISALIGNED_AFTER_MISS_REPLAYS : Second part of misaligned access when first part missed in cache. -+event:0x33 counters:0,1,2,3 um:zero minimum:500 name:LOAD_MISS_DLFB_FULL_CYCLES : Cycles stalled on replay condition - Load miss with dLFB full. -+event:0x34 counters:0,1,2,3 um:zero minimum:500 name:LOAD_MISS_QUEUE_FULL_CYCLES : Cycles stalled on replay condition - Load miss with load queue full. -+event:0x35 counters:0,1,2,3 um:zero minimum:500 name:LOAD_GUARDED_MISS_NOT_LAST_CYCLES : Cycles stalled on replay condition - Load guarded miss when the load is not yet at the bottom of the completion buffer. -+event:0x36 counters:0,1,2,3 um:zero minimum:500 name:STORE_TRANSLATED_QUEUE_FULL_CYCLES : Cycles stalled on replay condition - Translate a store when the StQ is full. -+event:0x37 counters:0,1,2,3 um:zero minimum:500 name:ADDRESS_COLLISION_CYCLES : Cycles stalled on replay condition - Address collision. -+event:0x38 counters:0,1,2,3 um:zero minimum:500 name:DMMU_MISS_CYCLES : Cycles stalled on replay condition - DMMU miss. -+event:0x39 counters:0,1,2,3 um:zero minimum:500 name:DMMU_BUSY_CYCLES : Cycles stalled on replay condition - DMMU busy. -+event:0x3a counters:0,1,2,3 um:zero minimum:500 name:SECOND_PART_MISALIGNED_AFTER_MISS_CYCLES : Cycles stalled on replay condition - Second part of misaligned access when first part missed in cache. -+event:0x3b counters:0,1,2,3 um:zero minimum:500 name:IL1_LOCKS : Number of cache lines locked in the iL1. (Counts a lock even if an overlock condition is encountered.) -+event:0x3c counters:0,1,2,3 um:zero minimum:500 name:IL1_FETCH_RELOADS : This is historically used to determine icache miss rate (along with instructions completed) Reloads due to demand fetch. -+event:0x3d counters:0,1,2,3 um:zero minimum:500 name:FETCHES : Counts the number of fetches that write at least one instruction to the instruction buffer. (With instruction fetched, can used to compute instructions-per-fetch) -+event:0x3e counters:0,1,2,3 um:zero minimum:500 name:IMMU_TLB4K_RELOADS : iMMU TLB4K reloads -+event:0x3f counters:0,1,2,3 um:zero minimum:500 name:IMMU_VSP_RELOADS : iMMU VSP reloads -+event:0x40 counters:0,1,2,3 um:zero minimum:500 name:DMMU_TLB4K_RELOADS : dMMU TLB4K reloads -+event:0x41 counters:0,1,2,3 um:zero minimum:500 name:DMMU_VSP_RELOADS : dMMU VSP reloads -+event:0x42 counters:0,1,2,3 um:zero minimum:500 name:L2MMU_MISSES : Counts iTLB/dTLB error interrupt -+event:0x43 counters:0,1,2,3 um:zero minimum:500 name:BIU_MASTER_REQUESTS : Number of master transactions. (Number of master TSs.) -+event:0x44 counters:0,1,2,3 um:zero minimum:500 name:BIU_MASTER_I_REQUESTS : Number of master I-Side transactions. (Number of master I-Side TSs.) -+event:0x45 counters:0,1,2,3 um:zero minimum:500 name:BIU_MASTER_D_REQUESTS : Number of master D-Side transactions. (Number of master D-Side TSs.) -+event:0x46 counters:0,1,2,3 um:zero minimum:500 name:BIU_MASTER_D_CASTOUT_REQUESTS : Number of master D-Side non-program-demand castout transactions. This counts replacement pushes and snoop pushes. This does not count DCBF castouts. (Number of master D-side non-program-demand castout TSs.) -+event:0x48 counters:0,1,2,3 um:zero minimum:500 name:SNOOP_REQUESTS : Number of externally generated snoop requests. (Counts snoop TSs.) -+event:0x49 counters:0,1,2,3 um:zero minimum:500 name:SNOOP_HITS : Number of snoop hits on all D-side resources regardless of the cache state (modified, exclusive, or shared) -+event:0x4a counters:0,1,2,3 um:zero minimum:500 name:SNOOP_PUSHES : Number of snoop pushes from all D-side resources. (Counts snoop ARTRY/WOPs.) -+event:0x52 counters:0,1,2,3 um:zero minimum:500 name:PMC0_OVERFLOW : Counts the number of times PMC0[32] transitioned from 1 to 0. -+event:0x53 counters:0,1,2,3 um:zero minimum:500 name:PMC1_OVERFLOW : Counts the number of times PMC1[32] transitioned from 1 to 0. -+event:0x54 counters:0,1,2,3 um:zero minimum:500 name:PMC2_OVERFLOW : Counts the number of times PMC2[32] transitioned from 1 to 0. -+event:0x55 counters:0,1,2,3 um:zero minimum:500 name:PMC3_OVERFLOW : Counts the number of times PMC3[32] transitioned from 1 to 0. -+event:0x56 counters:0,1,2,3 um:zero minimum:500 name:INTERRUPTS : Number of interrupts taken -+event:0x57 counters:0,1,2,3 um:zero minimum:500 name:EXTERNAL_INTERRUPTS : Number of external input interrupts taken -+event:0x58 counters:0,1,2,3 um:zero minimum:500 name:CRITICAL_INTERRUPTS : Number of critical input interrupts taken -+event:0x59 counters:0,1,2,3 um:zero minimum:500 name:SC_TRAP_INTERRUPTS : Number of system call and trap interrupts -+event:0x5b counters:0,1,2,3 um:zero minimum:500 name:L2_LINEFILL_REQ : Number L2 Linefill requests -+event:0x5c counters:0,1,2,3 um:zero minimum:500 name:L2_VICTIM_SELECT : Number L2 Victim selects -+event:0x6e counters:0,1,2,3 um:zero minimum:500 name:L2_ACCESS : Number L2 cache accesses -+event:0x6f counters:0,1,2,3 um:zero minimum:500 name:L2_HIT_ACCESS : Number L2 hit cache accesses -+event:0x70 counters:0,1,2,3 um:zero minimum:500 name:L2_DATA_ACCESS : Number L2 data cache accesses -+event:0x71 counters:0,1,2,3 um:zero minimum:500 name:L2_HIT_DATA_ACCESS : Number L2 hit data cache accesses -+event:0x72 counters:0,1,2,3 um:zero minimum:500 name:L2_INST_ACCESS : Number L2 instruction cache accesses -+event:0x73 counters:0,1,2,3 um:zero minimum:500 name:L2_HIT_INST_ACCESS : Number L2 hit instruction cache accesses -+event:0x74 counters:0,1,2,3 um:zero minimum:500 name:L2_ALLOC : Number L2 cache allocations -+event:0x75 counters:0,1,2,3 um:zero minimum:500 name:L2_DATA_ALLOC : Number L2 data cache allocations -+event:0x76 counters:0,1,2,3 um:zero minimum:500 name:L2_DIRTY_DATA_ALLOC : Number L2 dirty data cache allocations -+event:0x77 counters:0,1,2,3 um:zero minimum:500 name:L2_INST_ALLOC : Number L2 instruction cache allocations -+event:0x78 counters:0,1,2,3 um:zero minimum:500 name:L2_UPDATE : Number L2 cache updates -+event:0x79 counters:0,1,2,3 um:zero minimum:500 name:L2_CLEAN_UPDATE : Number L2 cache clean updates -+event:0x7a counters:0,1,2,3 um:zero minimum:500 name:L2_DIRTY_UPDATE : Number L2 cache dirty updates -+event:0x7b counters:0,1,2,3 um:zero minimum:500 name:L2_CLEAN_REDU_UPDATE : Number L2 cache clean redundant updates -+event:0x7c counters:0,1,2,3 um:zero minimum:500 name:L2_DIRTY_REDU_UPDATE : Number L2 cache dirty redundant updates -+event:0x7d counters:0,1,2,3 um:zero minimum:500 name:L2_LOCKS : Number L2 cache locks -+event:0x7e counters:0,1,2,3 um:zero minimum:500 name:L2_CASTOUT : Number L2 cache castouts -+event:0x7f counters:0,1,2,3 um:zero minimum:500 name:L2_HIT_DATA_DIRTY : Number L2 cache data dirty hits -+event:0x82 counters:0,1,2,3 um:zero minimum:500 name:L2_INV_CLEAN : Number L2 cache invalidation of clean lines -+event:0x83 counters:0,1,2,3 um:zero minimum:500 name:L2_INV_INCOHER : Number L2 cache invalidation of incoherent lines -+event:0x84 counters:0,1,2,3 um:zero minimum:500 name:L2_INV_COHER : Number L2 cache invalidation of coherent lines -+event:0x94 counters:0,1,2,3 um:zero minimum:500 name:DVT0 : Detection of write to DEVENT with DVT0 set -+event:0x95 counters:0,1,2,3 um:zero minimum:500 name:DVT1 : Detection of write to DEVENT with DVT1 set -+event:0x96 counters:0,1,2,3 um:zero minimum:500 name:DVT2 : Detection of write to DEVENT with DVT2 set -+event:0x97 counters:0,1,2,3 um:zero minimum:500 name:DVT3 : Detection of write to DEVENT with DVT3 set -+event:0x98 counters:0,1,2,3 um:zero minimum:500 name:DVT4 : Detection of write to DEVENT with DVT4 set -+event:0x99 counters:0,1,2,3 um:zero minimum:500 name:DVT5 : Detection of write to DEVENT with DVT5 set -+event:0x9a counters:0,1,2,3 um:zero minimum:500 name:DVT6 : Detection of write to DEVENT with DVT6 set -+event:0x9b counters:0,1,2,3 um:zero minimum:500 name:DVT7 : Detection of write to DEVENT with DVT7 set -+event:0x9c counters:0,1,2,3 um:zero minimum:500 name:CYCLES_NEXUS_STALLED : Number of completion cycles stalled due to Nexus FIFO full -+event:0xb0 counters:0,1,2,3 um:zero minimum:500 name:DECORATED_LOAD : Number of decorated loads. -+event:0xb1 counters:0,1,2,3 um:zero minimum:500 name:DECORATED_STORE : Number of decorated stores -+event:0xb2 counters:0,1,2,3 um:zero minimum:500 name:LOAD_RETRY : Number of load retries -+event:0xb3 counters:0,1,2,3 um:zero minimum:500 name:STWCX_SUCCESS : Number of successful stwcx. instructions -+event:0xb4 counters:0,1,2,3 um:zero minimum:500 name:STWCX_UNSUCCESS : Number of unsuccessful stwcx. instructions -diff --git a/events/ppc/e500mc/unit_masks b/events/ppc/e500mc/unit_masks -new file mode 100644 -index 0000000..395c653 ---- /dev/null -+++ b/events/ppc/e500mc/unit_masks -@@ -0,0 +1,4 @@ -+# e500 possible unit masks -+# -+name:zero type:mandatory default:0x0 -+ 0x0 No unit mask -diff --git a/libop/op_cpu_type.c b/libop/op_cpu_type.c -index 89d5a92..7d50a2d 100644 ---- a/libop/op_cpu_type.c -+++ b/libop/op_cpu_type.c -@@ -125,6 +125,7 @@ static struct cpu_descr const cpu_descrs[MAX_CPU_TYPE] = { - { "AMD64 generic", "x86-64/generic", CPU_AMD64_GENERIC, 4 }, - { "IBM Power Architected Events V1", "ppc64/architected_events_v1", CPU_PPC64_ARCH_V1, 6 }, - { "ppc64 POWER8", "ppc64/power8", CPU_PPC64_POWER8, 6 }, -+ { "e500mc", "ppc/e500mc", CPU_PPC_E500MC, 4 }, - }; - - static size_t const nr_cpu_descrs = sizeof(cpu_descrs) / sizeof(struct cpu_descr); -diff --git a/libop/op_cpu_type.h b/libop/op_cpu_type.h -index aeb6bb2..10f000b 100644 ---- a/libop/op_cpu_type.h -+++ b/libop/op_cpu_type.h -@@ -105,6 +105,7 @@ typedef enum { - CPU_AMD64_GENERIC, /**< AMD64 Generic */ - CPU_PPC64_ARCH_V1, /** < IBM Power architected events version 1 */ - CPU_PPC64_POWER8, /**< ppc64 POWER8 family */ -+ CPU_PPC_E500MC, /**< e500mc */ - MAX_CPU_TYPE - } op_cpu; - -diff --git a/libop/op_events.c b/libop/op_events.c -index bb86833..638dc5c 100644 ---- a/libop/op_events.c -+++ b/libop/op_events.c -@@ -1308,6 +1308,7 @@ void op_default_event(op_cpu cpu_type, struct op_default_event_descr * descr) - - case CPU_PPC_E500: - case CPU_PPC_E500_2: -+ case CPU_PPC_E500MC: - case CPU_PPC_E300: - descr->name = "CPU_CLK"; - break; -diff --git a/utils/ophelp.c b/utils/ophelp.c -index 1b913ca..0647360 100644 ---- a/utils/ophelp.c -+++ b/utils/ophelp.c -@@ -753,6 +753,7 @@ int main(int argc, char const * argv[]) - - case CPU_PPC_E500: - case CPU_PPC_E500_2: -+ case CPU_PPC_E500MC: - event_doc = - "See PowerPC e500 Core Complex Reference Manual\n" - "Chapter 7: Performance Monitor\n" --- diff --git a/meta/recipes-kernel/oprofile/oprofile/0001-Add-rmb-definition-for-AArch64-architecture.patch b/meta/recipes-kernel/oprofile/oprofile/0001-Add-rmb-definition-for-AArch64-architecture.patch deleted file mode 100644 index a2385cd2b2..0000000000 --- a/meta/recipes-kernel/oprofile/oprofile/0001-Add-rmb-definition-for-AArch64-architecture.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 27edaef9c6d66dfc324630ef40cb27e78031eeeb Mon Sep 17 00:00:00 2001 -From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> -Date: Tue, 15 Jan 2013 07:37:33 +0100 -Subject: [PATCH] Add rmb() definition for AArch64 architecture - -Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> - -Upstream-Status: backport ---- - libperf_events/operf_utils.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libperf_events/operf_utils.h b/libperf_events/operf_utils.h -index 815d51d..2df00b7 100644 ---- a/libperf_events/operf_utils.h -+++ b/libperf_events/operf_utils.h -@@ -148,6 +148,11 @@ void op_release_resources(void); - #define cpu_relax() asm volatile("":::"memory") - #endif - -+#ifdef __aarch64__ -+#define rmb() asm volatile("dmb ld" ::: "memory") -+#define cpu_relax() asm volatile("yield" ::: "memory") -+#endif -+ - #ifdef __mips__ - #include <asm/unistd.h> - #define rmb() asm volatile( \ --- -1.8.0 - diff --git a/meta/recipes-kernel/oprofile/oprofile/0001-Tidy-powerpc64-bfd-target-check.patch b/meta/recipes-kernel/oprofile/oprofile/0001-Tidy-powerpc64-bfd-target-check.patch deleted file mode 100644 index 93c62400cf..0000000000 --- a/meta/recipes-kernel/oprofile/oprofile/0001-Tidy-powerpc64-bfd-target-check.patch +++ /dev/null @@ -1,123 +0,0 @@ -Upstream-Status: Backport - -From 63b5692aace5ff6022f892822b4bfdc51ed25bfb Mon Sep 17 00:00:00 2001 -From: Alan Modra <amodra@gmail.com> -Date: Fri, 2 May 2014 07:54:08 -0500 -Subject: [PATCH] Tidy powerpc64 bfd target check - -Testing for a bfd_target vector might (will!) break. See -https://sourceware.org/ml/binutils/2014-04/msg00283.html - -It's safer to ask BFD for the target name. I left the direct target -vector checks in configure tests, and updated them, even though the -target vector is no longer used in oprofile code, because a run-time -configure test for powerpc64 support in bfd: - #include <bfd.h> - int main(void) - { return !bfd_find_target("elf64-powerpc", (void *)0); } -unfortunately isn't possible when cross-compiling. - -The bfd_target vector tests could be omitted if we aren't bothered by -the small runtime overhead of a strncmp on targets other than -powerpc64. - - * libutil++/bfd_support.cpp (get_synth_symbols): Don't check for - ppc64 target vector, use bfd_get_target to return the target - name instead. - * m4/binutils.m4: Modernize bfd_get_synthetic_symtab checks to - use AC_LINK_IFELSE. Check for either powerpc_elf64_vec or - bfd_elf64_powerpc_vec. - -Signed-off-by: Alan Modra <amodra@gmail.com> ---- - libutil++/bfd_support.cpp | 10 +++++++-- - m4/binutils.m4 | 50 ++++++++++++++++++++++----------------------- - 2 files changed, 33 insertions(+), 27 deletions(-) - -Index: oprofile-0.9.9/libutil++/bfd_support.cpp -=================================================================== ---- oprofile-0.9.9.orig/libutil++/bfd_support.cpp 2013-07-29 08:55:06.000000000 -0700 -+++ oprofile-0.9.9/libutil++/bfd_support.cpp 2014-05-02 09:12:05.761146347 -0700 -@@ -633,10 +633,16 @@ - - bool bfd_info::get_synth_symbols() - { -- extern const bfd_target bfd_elf64_powerpc_vec; -- extern const bfd_target bfd_elf64_powerpcle_vec; -- bool is_elf64_powerpc_target = (abfd->xvec == &bfd_elf64_powerpc_vec) -- || (abfd->xvec == &bfd_elf64_powerpcle_vec); -+ const char* targname = bfd_get_target(abfd); -+ // Match elf64-powerpc and elf64-powerpc-freebsd, but not -+ // elf64-powerpcle. elf64-powerpcle is a different ABI without -+ // function descriptors, so we don't need the synthetic -+ // symbols to have function code marked by a symbol. -+ bool is_elf64_powerpc_target = (!strncmp(targname, "elf64-powerpc", 13) -+ && (targname[13] == 0 -+ || targname[13] == '-')); -+ -+ - - if (!is_elf64_powerpc_target) - return false; -Index: oprofile-0.9.9/m4/binutils.m4 -=================================================================== ---- oprofile-0.9.9.orig/m4/binutils.m4 2013-07-29 08:55:07.000000000 -0700 -+++ oprofile-0.9.9/m4/binutils.m4 2014-05-02 09:07:32.471148147 -0700 -@@ -22,32 +22,32 @@ - - AC_LANG_PUSH(C) - # Determine if bfd_get_synthetic_symtab macro is available --OS="`uname`" --if test "$OS" = "Linux"; then -- AC_MSG_CHECKING([whether bfd_get_synthetic_symtab() exists in BFD library]) -- rm -f test-for-synth -- AC_LANG_CONFTEST( -- [AC_LANG_PROGRAM([[#include <bfd.h>]], -- [[asymbol * synthsyms; bfd * ibfd = 0; -- long synth_count = bfd_get_synthetic_symtab(ibfd, 0, 0, 0, 0, &synthsyms); -- extern const bfd_target bfd_elf64_powerpc_vec; -- extern const bfd_target bfd_elf64_powerpcle_vec; -- char * ppc_name = bfd_elf64_powerpc_vec.name; -- char * ppcle_name = bfd_elf64_powerpcle_vec.name; -- printf("%s %s\n", ppc_name, ppcle_name);]]) -- ]) -- $CC conftest.$ac_ext $CFLAGS $LDFLAGS $LIBS -o test-for-synth > /dev/null 2>&1 -- if test -f test-for-synth; then -- echo "yes" -- SYNTHESIZE_SYMBOLS='1' -- else -- echo "no" -- SYNTHESIZE_SYMBOLS='0' -- fi -- AC_DEFINE_UNQUOTED(SYNTHESIZE_SYMBOLS, $SYNTHESIZE_SYMBOLS, [Synthesize special symbols when needed]) -- rm -f test-for-synth* -+AC_MSG_CHECKING([whether bfd_get_synthetic_symtab() exists in BFD library]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <bfd.h> -+ ]], -+ [[asymbol * synthsyms; bfd * ibfd = 0; -+ long synth_count = bfd_get_synthetic_symtab(ibfd, 0, 0, 0, 0, &synthsyms); -+ extern const bfd_target powerpc_elf64_vec; -+ char *ppc_name = powerpc_elf64_vec.name; -+ printf("%s\n", ppc_name); -+ ]])], -+ [AC_MSG_RESULT([yes]) -+ SYNTHESIZE_SYMBOLS=2], -+ [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <bfd.h> -+ ]], -+ [[asymbol * synthsyms; bfd * ibfd = 0; -+ long synth_count = bfd_get_synthetic_symtab(ibfd, 0, 0, 0, 0, &synthsyms); -+ extern const bfd_target bfd_elf64_powerpc_vec; -+ char *ppc_name = bfd_elf64_powerpc_vec.name; -+ printf("%s\n", ppc_name); -+ ]])], -+ [AC_MSG_RESULT([yes]) -+ SYNTHESIZE_SYMBOLS=1], -+ [AC_MSG_RESULT([no]) -+ SYNTHESIZE_SYMBOLS=0]) -+ ]) -+AC_DEFINE_UNQUOTED(SYNTHESIZE_SYMBOLS, $SYNTHESIZE_SYMBOLS, [Synthesize special symbols when needed]) - --fi - AC_LANG_POP(C) - ] - ) diff --git a/meta/recipes-kernel/oprofile/oprofile/0002-Add-freescale-e6500-support.patch b/meta/recipes-kernel/oprofile/oprofile/0002-Add-freescale-e6500-support.patch deleted file mode 100644 index 9b2ae042c6..0000000000 --- a/meta/recipes-kernel/oprofile/oprofile/0002-Add-freescale-e6500-support.patch +++ /dev/null @@ -1,364 +0,0 @@ -From b91794fd855177946719b34ea5cd3822c7993caa Mon Sep 17 00:00:00 2001 -From: Ting Liu <b28495@freescale.com> -Date: Thu, 5 Sep 2013 07:45:52 -0500 -Subject: [PATCH 2/2] Add freescale e6500 support - -Upstream-Status: Backport - -Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> -Signed-off-by: Ting Liu <b28495@freescale.com> ---- - events/Makefile.am | 1 + - events/ppc/e6500/events | 266 +++++++++++++++++++++++++++++++++++++++++++ - events/ppc/e6500/unit_masks | 4 + - libop/op_cpu_type.c | 1 + - libop/op_cpu_type.h | 1 + - libop/op_events.c | 1 + - utils/ophelp.c | 1 + - 7 files changed, 275 insertions(+), 0 deletions(-) - create mode 100644 events/ppc/e6500/events - create mode 100644 events/ppc/e6500/unit_masks - -diff --git a/events/Makefile.am b/events/Makefile.am -index e496f98..d91d44b 100644 ---- a/events/Makefile.am -+++ b/events/Makefile.am -@@ -77,6 +77,7 @@ event_files = \ - ppc/e500/events ppc/e500/unit_masks \ - ppc/e500v2/events ppc/e500v2/unit_masks \ - ppc/e500mc/events ppc/e500mc/unit_masks \ -+ ppc/e6500/events ppc/e6500/unit_masks \ - ppc/e300/events ppc/e300/unit_masks \ - tile/tile64/events tile/tile64/unit_masks \ - tile/tilepro/events tile/tilepro/unit_masks \ -diff --git a/events/ppc/e6500/events b/events/ppc/e6500/events -new file mode 100644 -index 0000000..f34f82d ---- /dev/null -+++ b/events/ppc/e6500/events -@@ -0,0 +1,266 @@ -+# e6500 Events -+# -+# Copyright (C) 2012 Freescale Semiconductor, Inc. -+# -+event:0x1 counters:0,1,2,3,4,5 um:zero minimum:100 name:CPU_CLK : Cycles -+event:0x2 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_INSNS : Completed Instructions (0, 1, or 2 per cycle) -+event:0x3 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_OPS : Completed Micro-ops -+event:0x5 counters:0,1,2,3,4,5 um:zero minimum:500 name:DECODED_OPS : Micro-ops decoded -+event:0x6 counters:0,1,2,3,4,5 um:zero minimum:500 name:TRANSITIONS_PM_EVENT : 0 to 1 transitions on the pm_event input -+event:0x7 counters:0,1,2,3,4,5 um:zero minimum:500 name:CPU_CLK_PM_EVENT : Processor cycles that occur when the pm_event input is asserted -+event:0x8 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_BRANCHES : Branch Instructions completed -+event:0x9 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_LOAD_OPS : Load micro-ops completed -+event:0xa counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_STORE_OPS : Store micro-ops completed -+event:0xb counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETION_REDIRECTS : Number of completion buffer redirects -+event:0xc counters:0,1,2,3,4,5 um:zero minimum:500 name:BRANCHES_FINISHED : Branches finished -+event:0xd counters:0,1,2,3,4,5 um:zero minimum:500 name:TAKEN_BRANCHES_FINISHED : Taken branches finished -+event:0xe counters:0,1,2,3,4,5 um:zero minimum:500 name:TAKEN_BRANCHES_FINISHED_NOT_BTB : Finished unconditional branches that miss the BTB -+event:0xf counters:0,1,2,3,4,5 um:zero minimum:500 name:BRANCHES_MISPREDICTED : Branch instructions mispredicted due to direction, target, or IAB prediction -+event:0x10 counters:0,1,2,3,4,5 um:zero minimum:500 name:BRANCHES_MISPREDICTED_DIRECTION : Branches mispredicted due to direction prediction -+event:0x11 counters:0,1,2,3,4,5 um:zero minimum:500 name:BTB_HITS : Branches that hit in the BTB, or missed but are not taken -+event:0x12 counters:0,1,2,3,4,5 um:zero minimum:500 name:DECODE_STALLED : Cycles the instruction buffer was not empty, but 0 instructions decoded -+event:0x13 counters:0,1,2,3,4,5 um:zero minimum:500 name:ISSUE_STALLED : Cycles the SFX/CFX issue queue is not empty but 0 instructions issued -+event:0x14 counters:0,1,2,3,4,5 um:zero minimum:500 name:BRANCH_ISSUE_STALLED : Cycles the branch buffer is not empty but 0 instructions issued -+event:0x15 counters:0,1,2,3,4,5 um:zero minimum:500 name:SFX0_SCHEDULE_STALLED : Cycles SFX0 is not empty but 0 instructions scheduled -+event:0x16 counters:0,1,2,3,4,5 um:zero minimum:500 name:SFX1_SCHEDULE_STALLED : Cycles SFX1 is not empty but 0 instructions scheduled -+event:0x17 counters:0,1,2,3,4,5 um:zero minimum:500 name:CFX_SCHEDULE_STALLED : Cycles CFX is not empty but 0 instructions scheduled -+event:0x18 counters:0,1,2,3,4,5 um:zero minimum:500 name:LSU_SCHEDULE_STALLED : Cycles LSU is not empty but 0 instructions scheduled -+event:0x19 counters:0,1,2,3,4,5 um:zero minimum:500 name:BU_SCHEDULE_STALLED : Cycles BU is not empty but 0 instructions scheduled -+event:0x1a counters:0,1,2,3,4,5 um:zero minimum:500 name:TOTAL_TRANSLATED : Total LSU micro-ops that reach the second stage of the LSU -+event:0x1b counters:0,1,2,3,4,5 um:zero minimum:500 name:LOADS_TRANSLATED : Cacheable load micro-ops translated.1 (Does not include WT) -+event:0x1c counters:0,1,2,3,4,5 um:zero minimum:500 name:STORES_TRANSLATED : Cacheable store micro-ops translated.1 (Does not include WT) -+event:0x1d counters:0,1,2,3,4,5 um:zero minimum:500 name:TOUCHES_TRANSLATED : Cacheable touch instructions translated. Includes: dcbt / dcbtep dcbtst / dcbtstep icbt ct=2 -+event:0x1e counters:0,1,2,3,4,5 um:zero minimum:500 name:CACHEOPS_TRANSLATED : Number of dcba, dcbf, dcbst, and dcbz instructions translated (e500 traps on dcbi) -+event:0x1f counters:0,1,2,3,4,5 um:zero minimum:500 name:CACHEINHIBITED_ACCESSES_TRANSLATED : Number of cache inhibited accesses translated -+event:0x20 counters:0,1,2,3,4,5 um:zero minimum:500 name:GUARDED_LOADS_TRANSLATED : Number of guarded loads translated -+event:0x21 counters:0,1,2,3,4,5 um:zero minimum:500 name:WRITETHROUGH_STORES_TRANSLATED : Number of write-through stores translated -+event:0x22 counters:0,1,2,3,4,5 um:zero minimum:500 name:MISALIGNED_ACCESSES_TRANSLATED : Number of misaligned load or store accesses translated. -+event:0x23 counters:0,1,2,3,4,5 um:zero minimum:500 name:FETCH_2X4_HITS : Each fetch retrieves up to 8 instructions, but only the first 4 are required. This event increments if at least one instruction of the second 4 are actually used. -+event:0x24 counters:0,1,2,3,4,5 um:zero minimum:500 name:FETCH_HITS_ON_PREFETCHES : Fetch hits on instruction prefetch when the data is still in the ILFB. -+event:0x25 counters:0,1,2,3,4,5 um:zero minimum:500 name:GENERATED_FETCH_PREFETCHES : Number of prefetches generated. -+event:0x29 counters:0,1,2,3,4,5 um:zero minimum:500 name:DL1_RELOADS : This is historically used to determine dcache miss rate (along with loads/stores completed). This counts dL1 reloads for any reason. -+event:0x2c counters:0,1,2,3,4,5 um:zero minimum:500 name:LOAD_MISS_WITH_LOAD_QUEUE_FULL : Counts number of stalls; Com:52 counts cycles stalled. Includes: cacheable loads, CI loads, loadec, larx, touches, ibll, ibsl,ibllsl -+event:0x2d counters:0,1,2,3,4,5 um:zero minimum:500 name:LOAD_GUARDED_MISS_NOT_LAST_REPLAYS : Load guarded miss when the load is not yet at the bottom of the completion buffer. -+event:0x2e counters:0,1,2,3,4,5 um:zero minimum:500 name:STORE_TRANSLATED_QUEUE_FULL_REPLAYS : Translate a store when the StQ is full. -+event:0x2f counters:0,1,2,3,4,5 um:zero minimum:500 name:ADDRESS_COLLISION_REPLAYS : Address collision. -+event:0x30 counters:0,1,2,3,4,5 um:zero minimum:500 name:DTLB_MISS_REPLAYS : Counts number of stalls; Com:56 counts cycles stalled. -+event:0x31 counters:0,1,2,3,4,5 um:zero minimum:500 name:DTLB_BUSY_REPLAYS : Counts number of stalls; Com:57 counts cycles stalled. -+event:0x32 counters:0,1,2,3,4,5 um:zero minimum:500 name:SECOND_PART_MISALIGNED_AFTER_MISS_REPLAYS : Second part of misaligned access when first part missed in cache. -+event:0x34 counters:0,1,2,3,4,5 um:zero minimum:500 name:LOAD_MISS_QUEUE_FULL_CYCLES : Cycles stalled on replay condition - Load miss with load queue full. -+event:0x35 counters:0,1,2,3,4,5 um:zero minimum:500 name:LOAD_GUARDED_MISS_NOT_LAST_CYCLES : Cycles stalled on replay condition - Load guarded miss when the load is not yet at the bottom of the completion buffer. -+event:0x36 counters:0,1,2,3,4,5 um:zero minimum:500 name:STORE_TRANSLATED_QUEUE_FULL_CYCLES : Cycles stalled on replay condition - Translate a store when the StQ is full. -+event:0x37 counters:0,1,2,3,4,5 um:zero minimum:500 name:ADDRESS_COLLISION_CYCLES : Cycles stalled on replay condition - Address collision. -+event:0x38 counters:0,1,2,3,4,5 um:zero minimum:500 name:DTLB_MISS_CYCLES : Cycles stalled on replay condition - DTLB miss. -+event:0x39 counters:0,1,2,3,4,5 um:zero minimum:500 name:DTLB_BUSY_CYCLES : Cycles stalled on replay condition - DTLB busy. -+event:0x3a counters:0,1,2,3,4,5 um:zero minimum:500 name:SECOND_PART_MISALIGNED_AFTER_MISS_CYCLES : Cycles stalled on replay condition - Second part of misaligned access when first part missed in cache. -+event:0x3c counters:0,1,2,3,4,5 um:zero minimum:500 name:IL1_FETCH_RELOADS : This is historically used to determine icache miss rate (along with instructions completed) Reloads due to demand fetch. -+event:0x3d counters:0,1,2,3,4,5 um:zero minimum:500 name:FETCHES : Counts fetches that write at least one instruction to the Instruction Buffer. -+event:0x3e counters:0,1,2,3,4,5 um:zero minimum:500 name:IMMU_TLB4K_RELOADS : iMMU TLB4K reloads -+event:0x3f counters:0,1,2,3,4,5 um:zero minimum:500 name:IMMU_VSP_RELOADS : iMMU VSP reloads -+event:0x40 counters:0,1,2,3,4,5 um:zero minimum:500 name:DMMU_TLB4K_RELOADS : dMMU TLB4K reloads -+event:0x41 counters:0,1,2,3,4,5 um:zero minimum:500 name:DMMU_VSP_RELOADS : dMMU VSP reloads -+event:0x42 counters:0,1,2,3,4,5 um:zero minimum:500 name:L2MMU_MISSES : Counts iTLB/dTLB error interrupt -+event:0x43 counters:0,1,2,3,4,5 um:zero minimum:500 name:TAKEN_BRANCHES : Completed branch instructions that were taken. -+event:0x44 counters:0,1,2,3,4,5 um:zero minimum:500 name:TAKEN_BLR : Completed blr instructions that were taken. -+event:0x45 counters:0,1,2,3,4,5 um:zero minimum:500 name:BTB_TARGET_MISPREDICT : Number of target mispredicts (BTB). -+event:0x46 counters:0,1,2,3,4,5 um:zero minimum:500 name:MISPREDICT_TARGET_BLR : Number of link stack mispredicts (LS). -+event:0x47 counters:0,1,2,3,4,5 um:zero minimum:500 name:TAKEN_BTB_BUT_MISS : Number of BTB misses, but taken (BTB allocates). -+event:0x52 counters:0,1,2,3,4,5 um:zero minimum:500 name:PMC0_OVERFLOW : Counts the number of times PMC0[32] transitioned from 1 to 0. -+event:0x53 counters:0,1,2,3,4,5 um:zero minimum:500 name:PMC1_OVERFLOW : Counts the number of times PMC1[32] transitioned from 1 to 0. -+event:0x54 counters:0,1,2,3,4,5 um:zero minimum:500 name:PMC2_OVERFLOW : Counts the number of times PMC2[32] transitioned from 1 to 0. -+event:0x55 counters:0,1,2,3,4,5 um:zero minimum:500 name:PMC3_OVERFLOW : Counts the number of times PMC3[32] transitioned from 1 to 0. -+event:0x56 counters:0,1,2,3,4,5 um:zero minimum:500 name:INTERRUPTS : Number of interrupts taken -+event:0x57 counters:0,1,2,3,4,5 um:zero minimum:500 name:EXTERNAL_INTERRUPTS : Number of external input interrupts taken -+event:0x58 counters:0,1,2,3,4,5 um:zero minimum:500 name:CRITICAL_INTERRUPTS : Number of critical input interrupts taken -+event:0x59 counters:0,1,2,3,4,5 um:zero minimum:500 name:SC_TRAP_INTERRUPTS : Number of system call and trap interrupts -+event:0x5a counters:0,1,2,3,4,5 um:zero minimum:500 name:TBL_BIT_TRANS_PMGC0 : Counts transitions of the TBL bit selected by PMGC0[TBSEL]. -+event:0x5b counters:0,1,2,3,4,5 um:zero minimum:500 name:PMC4_OVERFLOW : Counts the number of times PMC4[32] transitioned from 1 to 0. -+event:0x5c counters:0,1,2,3,4,5 um:zero minimum:500 name:PMC5_OVERFLOW : Counts the number of times PMC5[32] transitioned from 1 to 0. -+event:0x61 counters:0,1,2,3,4,5 um:zero minimum:500 name:L1_STASH_HIT : Stash hits in L1 Data Cache. -+event:0x63 counters:0,1,2,3,4,5 um:zero minimum:500 name:L1_STASH_REQ : Stash requests to L1 Data Cache. -+event:0x64 counters:0,1,2,3,4,5 um:zero minimum:500 name:TIMES_LSU_THREAD_PRIO_SWTICHED : Number of times the Load Store Unit thread priority switched based on resource collisions. -+event:0x65 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_THREAD_REQ_FPU_DENIED : Number of cycles both threads had Floating Point Unit requests and one was denied. -+event:0x66 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_THREAD_REQ_VPERM_DENIED : Number of cycles both threads had Altivec Permute requests and one was denied. -+event:0x67 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_THREAD_REQ_VGEN_DENIED : Number of cycles both threads had Altivec General requests and one was denied. -+event:0x68 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_THREAD_REQ_CFX_DENIED : Number of cycles both threads had Complex Fixed-Point Unit requests and one was denied. -+event:0x69 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_THREAD_REQ_FETCH_DENIED : Number of cycles both threads both threads made a Fetch request to the L1 Instruction Cache and one thread wins arbitration. -+event:0x6e counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_LSU_ISSUE_STALLED : Cycles the LSU issue queue is not empty but 0 instructions issued. -+event:0x6f counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_FPU_ISSUE_STALLED : Cycles the FPU issue queue is not empty but 0 instructions issued. -+event:0x70 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_ALTIVEC_ISSUE_STALLED : Cycles the AltiVec issue queue is not empty but 0 instructions issued. -+event:0x71 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_FPU_SCHEDULE_STALLED : Cycles FPU is not empty but 0 instructions scheduled. -+event:0x72 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_VPERM_SCHEDULE_STALLED : Cycles VPERM is not empty but 0 instructions scheduled. -+event:0x73 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_VGEN_SCHEDULE_STALLED : Cycles VGEN is not empty but 0 instructions scheduled. -+event:0x74 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_VPU_INSTRUCTION_WAIT_FOR_OPERA : Cycles VPU instruction waits for operands. -+event:0x75 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_VFPU_INSTRUCTION_WAIT_FOR_OPERA : Cycles VFPU instruction waits for operands. -+event:0x76 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_VSFX_INSTRUCTION_WAIT_FOR_OPERA : Cycles VSFX instruction waits for operands -+event:0x77 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_VCFX_INSTRUCTION_WAIT_FOR_OPERA : Cycles VCFX instruction waits for operands. -+event:0x7a counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_IB_EMPT : Number of cycles the Instruction Buffer is empty -+event:0x7b counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_IB_FULL : Number of cycles the Instruction Buffer is full enough such that fetch stops fetching. -+event:0x7c counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_CB_EMPT : Number of cycles the Completion Buffer is empty. -+event:0x7d counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_CB_FULL : Number of cycles the Completion Buffer is full enough such that decode stops. -+event:0x7e counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_PRESYNC_SI_IB : Number of cycles a pre-sync serialized instruction holds in the Instruction Buffer and is not decoded. -+event:0x7f counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_CLK_0_INSTRUCTIONS : Increments if 0 instructions (micro-ops) completed. -+event:0x80 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_CLK_1_INSTRUCTIONS : Increments if 1 instruction (micro-op) completed. -+event:0x80 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_CLK_2_INSTRUCTIONS : Increments if 2 instructions (micro-op) completed. -+event:0x88 counters:0,1,2,3,4,5 um:zero minimum:500 name:DETECTED_IAC5S : Every valid IAC5 detection. -+event:0x89 counters:0,1,2,3,4,5 um:zero minimum:500 name:DETECTED_IAC6S : Every valid IAC6 detection. -+event:0x8a counters:0,1,2,3,4,5 um:zero minimum:500 name:DETECTED_IAC7S : Every valid IAC7 detection. -+event:0x8b counters:0,1,2,3,4,5 um:zero minimum:500 name:DETECTED_IAC8S : Every valid IAC8 detection. -+event:0x8c counters:0,1,2,3,4,5 um:zero minimum:500 name:DETECTED_IAC1S : Every valid IAC1 detection. -+event:0x8d counters:0,1,2,3,4,5 um:zero minimum:500 name:DETECTED_IAC2S : Every valid IAC2 detection. -+event:0x8e counters:0,1,2,3,4,5 um:zero minimum:500 name:DETECTED_IAC3S : Every valid IAC3 detection. -+event:0x8f counters:0,1,2,3,4,5 um:zero minimum:500 name:DETECTED_IAC4S : Every valid IAC4 detection. -+event:0x90 counters:0,1,2,3,4,5 um:zero minimum:500 name:DETECTED_DAC1S : Every valid DAC1 detection. -+event:0x91 counters:0,1,2,3,4,5 um:zero minimum:500 name:DETECTED_DAC2S : Every valid DAC2 detection. -+event:0x94 counters:0,1,2,3,4,5 um:zero minimum:500 name:DETECTED_DVT0 : Detection of a write to DEVENT SPR with DVT0 set. -+event:0x95 counters:0,1,2,3,4,5 um:zero minimum:500 name:DETECTED_DVT1 : Detection of a write to DEVENT SPR with DVT1 set. -+event:0x96 counters:0,1,2,3,4,5 um:zero minimum:500 name:DETECTED_DVT2 : Detection of a write to DEVENT SPR with DVT2 set. -+event:0x97 counters:0,1,2,3,4,5 um:zero minimum:500 name:DETECTED_DVT3 : Detection of a write to DEVENT SPR with DVT3 set. -+event:0x98 counters:0,1,2,3,4,5 um:zero minimum:500 name:DETECTED_DVT4 : Detection of a write to DEVENT SPR with DVT4 set. -+event:0x99 counters:0,1,2,3,4,5 um:zero minimum:500 name:DETECTED_DVT5 : Detection of a write to DEVENT SPR with DVT5 set. -+event:0x9a counters:0,1,2,3,4,5 um:zero minimum:500 name:DETECTED_DVT6 : Detection of a write to DEVENT SPR with DVT6 set. -+event:0x9b counters:0,1,2,3,4,5 um:zero minimum:500 name:DETECTED_DVT7 : Detection of a write to DEVENT SPR with DVT7 set. -+event:0x9c counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_COMPLETION_STALLED : Number of completion cycles stalled due to Nexus FIFO full. -+event:0xa1 counters:0,1,2,3,4,5 um:zero minimum:500 name:FPU_FINISH : FPU finish. -+event:0xa2 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_FPU_DIV : Counts once for every cycle of divide execution. (fdivs and fdiv). -+event:0xa3 counters:0,1,2,3,4,5 um:zero minimum:500 name:FPU_DENORM_INPUT : Counts extra cycles delay due to denormalized inputs. If there is one, this is incremented 4 times, Two operands increments it 5 times. This shows the real penalty due to denorms, not just how often they occur. -+event:0xa4 counters:0,1,2,3,4,5 um:zero minimum:500 name:FPU_DENORM_OUTPUT : FPU denorm output. -+event:0xa5 counters:0,1,2,3,4,5 um:zero minimum:500 name:FPU_FPSCR_FULL_STALL : FPU FPSCR stall. -+event:0xa6 counters:0,1,2,3,4,5 um:zero minimum:500 name:FPU_PIPE_SYNC_STALL : Synchronization-op stalls: count once for each cycle that a ��break-before�� FPU is in the RS/issue stage but cannotissue. Also count once for each cycle that an FPU op is in the RS/issue stage but cannot issue due to ��break-after��: of an FPU op currently in progress. -+event:0xa7 counters:0,1,2,3,4,5 um:zero minimum:500 name:FPU_INPUT_DATA_STALL : FPU data-ready stall: cycles in which there is an op in the RS/issue stage that cannot issue because one or more of its operands is not yet available. -+event:0xa8 counters:0,1,2,3,4,5 um:zero minimum:500 name:FPU_INSTRUCTIONS_GEN_FLAG : FPU instruction sets FPSCR[FEX]. -+event:0xac counters:0,1,2,3,4,5 um:zero minimum:500 name:PW20_CNT : Number of times the core enters the PW20 power management state. -+event:0xb0 counters:0,1,2,3,4,5 um:zero minimum:500 name:DECORATED_LOADS : Number of decorated loads to cache inhibited memory performed. -+event:0xb1 counters:0,1,2,3,4,5 um:zero minimum:500 name:DECORATED_STORES : Number of decorated stores to cache inhibited memory performed. -+event:0xb3 counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_INSTRUCTIONS_SUCC : Number of successful stbcx., sthcx., stwcx., or stdcx. instructions. -+event:0xb4 counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_INSTRUCTIONS_UNSUCC : Number of unsuccessful stbcx., sthcx., stwcx., or stdcx. instructions. -+event:0xb5 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_LSU_MICROOPS : Completed Load Store Unit micro-ops. Every micro-op that goes down the LSU pipe. Includes: GPR loads / GPR stores, FPR loads / FPR stores, VR loads / VR stores, Cache ops. Memory barriers Other LSU ops (dsn, msgsnd, mvidsplt, mviwsplt, tlbilx, tlbivax, tlbsync) -+event:0xb6 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_GPR_LOADS : GPR load micro-ops completed. This event only counts once for misaligns. Note that lmw that causes a fault may end up double-counting micro-ops -- once for first pass, once for second pass. -+event:0xb7 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_GPR_STORES : GPR store micro-ops completed. This event only counts once for misaligns. Note that stmw that causes a fault may end up double-counting micro-ops -- once for first pass, once for second pass. -+event:0xb8 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_CACHEOPS : Cache ops completed. Includes: dcba / dcbal, dcbf / dcbfep, dcbi, dcblc / dcblq, dcbst / dcbstep, dcbt / dcbtep / dcbtls, dcbtst / dcbtstep / dcbtstls, dcbz / dcbzep / dcbzl / dcbzlep, icbi / icbiep, icblc / icblq., icbt / icbtls -+event:0xb9 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_MEM_BARRIERS : Memory barriers completed. Includes: msync (sync, lwsync, elemental barriers) mbar (eieio) miso. -+event:0xba counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_SFX_MICROOPS : SFX micro-ops completed. -+event:0xbb counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_SINCLK_SFX_MICROOPS : SFX single-cycle micro-ops completed. -+event:0xbc counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_DBLCLK_SFX_MICROOPS : SFX double-cycle micro-ops completed. -+event:0xbe counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_CFX_INSTRUCTIONS : CFX instructions completed. -+event:0xbf counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_SFX_CFX_INSTRUCTIONS : SFX or CFX instructions completed. -+event:0xc0 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_FPU_INSTRUCTIONS : FPU instructions completed. -+event:0xc1 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_FPR_MICROOPS_LOADS : FPR load micro-ops completed. -+event:0xc2 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_FPR_MICROOPS_STORES : FPR store micro-ops completed. -+event:0xc3 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_FPR_MICROOPS_LOADS_STORES : FPR load and store micro-ops completed. -+event:0xc4 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_FPR_SINPRECISE_LOADS_STORES : FPR single-precision load and store micro-ops completed. -+event:0xc5 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_FPR_DBLPRECISE_LOADS_STORES : FPR double-precision load and store micro-ops completed. -+event:0xc6 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_ALTIVEC_INSTRUCTIONS : AltiVec instructions completed. (non-LSU). -+event:0xc7 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_ALTIVEC_VSFX_INSTRUCTIONS : AltiVec VSFX instructions completed. -+event:0xc8 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_ALTIVEC_VCFX_INSTRUCTIONS : AltiVec VCFX instructions completed. -+event:0xc9 counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_ALTIVEC_VPU_INSTRUCTIONS : AltiVec VPU instructions completed. -+event:0xca counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_ALTIVEC_VFPU_INSTRUCTIONS : AltiVec VFPU instructions completed. -+event:0xcb counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_VR_LOADS_MICROOPS : VR load micro-ops completed. -+event:0xcc counters:0,1,2,3,4,5 um:zero minimum:500 name:COMPLETED_VR_STORES_MICROOPS : VR store micro-ops completed. -+event:0xcd counters:0,1,2,3,4,5 um:zero minimum:500 name:VSCR_SAT_SET : Number of times the saturate bit flips from 0 to 1. -+event:0xd2 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_SFX0_IDLE : Cycles Simple Fixed Point Unit 0 is idle. -+event:0xd3 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_SFX1_IDLE : Cycles Simple Fixed Point Unit 1 is idle. -+event:0xd4 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_CFX_IDLE : Cycles Complex Fixed Point Unit is idle. -+event:0xd5 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_LSU_IDLE : Cycles Load Store Unit is idle. -+event:0xd6 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_BU_IDLE : Cycles Branch Unit is idle. -+event:0xd7 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_FPU_IDLE : Cycles Floating Point Unit is idle. -+event:0xd8 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_VPU_IDLE : Cycles AltiVec Permute Unit is idle. -+event:0xd9 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_VFPU_IDLE : Cycles AltiVec Floating Point Unit is idle. -+event:0xda counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_VSFX_IDLE : Cycles AltiVec Simple Fixed Point Unit is idle. -+event:0xdb counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_VCFX_IDLE : Cycles AltiVec Complex Fixed Point Unit is idle. -+event:0xdd counters:0,1,2,3,4,5 um:zero minimum:500 name:L1_CACHE_MISSES : Data L1 cache misses. (Includes load, store, cache ops). -+event:0xde counters:0,1,2,3,4,5 um:zero minimum:500 name:L1_CACHE_LOAD_MISSES : Data L1 cache load misses. -+event:0xdf counters:0,1,2,3,4,5 um:zero minimum:500 name:L1_CACHE_STORE_MISSES : Data L1 cache store misses. -+event:0xe0 counters:0,1,2,3,4,5 um:zero minimum:500 name:LMQ_ALLOCATED_LOADS : Loads that allocate into Load Miss Queue. (Data L1 cache misses, but may not be to different cache lines). -+event:0xe1 counters:0,1,2,3,4,5 um:zero minimum:500 name:LOAD_THREAD_MISS_COLLISION : Number of times that this thread��s load hits a line that is valid for the other thread but not this thread. -+event:0xe2 counters:0,1,2,3,4,5 um:zero minimum:500 name:INTERTHREAD_STATUS_ARRAY_COLLISION : Number of times that two threads collide on status array access. -+event:0xe3 counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_SGB_ALLOC : Number of Store Gather Buffer allocates. -+event:0xe4 counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_SGB_GATHERS : Number of Store Gather Buffer gathers. -+event:0xe5 counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_SGB_OVERFLOWS : Number of Store Gather Buffer overflows. (Causes SGB full condition when additional store request is made). -+event:0xe6 counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_SGB_PROMOTIONS : Number of Store Gather Buffer promotions. -+event:0xe7 counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_SGB_INORDER_PROMOTIONS : Number of Store Gather Buffer in-order promotions. (Also includes oldest-entry timeout condition). -+event:0xe8 counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_SGB_OUTOFORDER_PROMOTIONS : Number of Store Gather Buffer out-of-order promotions. -+event:0xe9 counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_SGB_HP_PROMOTIONS : Number of Store Gather Buffer high-priority promotions. (Load hits on pending store). -+event:0xea counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_SGB_MISO_PROMOTIONS : Number of Store Gather Buffer miso promotions. promotions. (Load hits on pending store). -+event:0xeb counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_SGB_WATERMARK_PROMOTIONS : Number of Store Gather Buffer watermark promotions. -+event:0xec counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_SGB_OVERFLOW_PROMOTIONS : Number of Store Gather Buffer overflow promotions. -+event:0xed counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_DLAQ_FULL : Number of cycles the DLink Age Queue is full. -+event:0xee counters:0,1,2,3,4,5 um:zero minimum:500 name:TIMES_DLAQ_FULL : Number of times the DLink Age Queue is full. -+event:0xef counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_LRSAQ_FULL : Number of cycles the Load Reservation Set Age Queue is full. -+event:0xf0 counters:0,1,2,3,4,5 um:zero minimum:500 name:TIMES_LRSAQ_FULL : Number of times the Load Reservation Set Age Queue is full. -+event:0xf1 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_FWDAQ_FULL : Number of cycles the Forward Age Queue is full. -+event:0xf2 counters:0,1,2,3,4,5 um:zero minimum:500 name:TIMES_FWDAQ_FULL : Number of times the Forward Age Queue is full. -+event:0xf3 counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_FWD_STQ_COLLISION_TIMES : Number of times a Store Queue collision is forwardable. The following cases are not forwardable: store address + size does not contain the load, cache-inhibited store, denormalized, floating point store, stcx, guarded load. -+event:0xf4 counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_FWD_STQ_COLLISION_TIMES_DATA_RDY : Number of times a Store Queue collision is forwardable and is ready with data to forward. -+event:0xf5 counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_FWD_STQ_COLLISION_TIMES_DATA_NORDY : Number of times a Store Queue collision is forwardable but is not ready with data to forward. -+event:0xf6 counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_NOFWD_STQ_COLLISION_TIMES : Number of times a Store Queue collision is not forwardable and must wait until the store leaves the Store Queue. -+event:0xf7 counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_FWD_STQ_COLLISION_CLK : Number of cycles a Store Queue collision is forwardable. (Number of cycles from the detection of a forwardable Store Queue entry until the load is replayed in stg1). -+event:0xf8 counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_FWD_STQ_COLLISION_CLK_DATA_RDY : Number of cycles a Store Queue collision is forwardable and is ready with data to forward. (Number of cycles from the detection of a forwardable Store Queue entry with valid data until the load is replayed in stg1). -+event:0xf9 counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_FWD_STQ_COLLISION_CLK_DATA_NORDY : Number of cycles a Store Queue collision is forwardable but is not ready with data to forward. (Number of cycles from the detection of a forwardable Store Queue entry without valid data until the load is replayed in stg1). -+event:0xfa counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_NOFWD_STQ_COLLISION_CLK : Number of cycles a Store Queue collision is not forwardable and has to wait until the store leaves the Store Queue. (Number of cycles from the detection of a non-forwardable Store Queue entry until the load is replayed in stg1). -+event:0xfb counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_FALSE_EA_COLLISION : Number of times the lower 12-bits of EA matched but the upper bits did not, leading to a false load-on-store replay. Cycle penalty is 4x the number of times. -+event:0xfc counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_LSO_BUS_COLLISION : Number of LS0 result bus collisions. Cycle penalty is 3x this measurement. -+event:0xfd counters:0,1,2,3,4,5 um:zero minimum:500 name:NUM_INTERTHREAD_DBLWORKD_BANK_COLLISION : Number of inter-thread double-word bank collisions. Measures when both threads attempt to access the same double-word bank. Cycle penalty is 3x this measurement. -+event:0xfe counters:0,1,2,3,4,5 um:zero minimum:500 name:L1_CACHE_IM : Instruction L1 cache demand fetch misses. (Includes icbtls. Does not include prefetch). -+event:0x100 counters:0,1,2,3,4,5 um:zero minimum:500 name:IMMU_MISSES : Counts misses in the level 1 Instruction MMU. -+event:0x101 counters:0,1,2,3,4,5 um:zero minimum:500 name:IMMU_TLB4K_HITS : Counts hits in the level 1 Instruction MMU TLB-4K. -+event:0x102 counters:0,1,2,3,4,5 um:zero minimum:500 name:IMMU_VSP_HITS : Counts hits in the level 1 Instruction MMU VSP. -+event:0x103 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_IMMU_HW_TABLEWALK : Counts IMMU cycles spent in hardware tablewalk. This represents the cycles from the point where the L2 MMU miss occurs to when the page table walk completes with a valid translation or exception. -+event:0x104 counters:0,1,2,3,4,5 um:zero minimum:500 name:DMMU_MISSES : Counts misses in the level 1 Data MMU. (Does not count replayed operations). -+event:0x105 counters:0,1,2,3,4,5 um:zero minimum:500 name:DMMU_TLB4K_HITS : Counts hits in the level 1 Data MMU TLB-4K. (Does not count replayed operations). -+event:0x106 counters:0,1,2,3,4,5 um:zero minimum:500 name:DMMU_VSP_HITS : Counts hits in the level 1 Data MMU VSP. (Does not count replayed operations). -+event:0x107 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_DMMU_HW_TABLEWALK : Counts DMMU cycles spent in hardware tablewalk. This represents the cycles from the point where the L2 MMU miss occurs to when the page table walk completes with a valid translation or exception. -+event:0x108 counters:0,1,2,3,4,5 um:zero minimum:500 name:L2MMU_MISSES : Counts level 2 MMU misses. (Does not count misses that occur due to dcbt / dcbtst / dcba / dcbal instructions that fail translation and are no-oped. Does not count misses in L2MMU-VSP when looking up an indirect entry). -+event:0x109 counters:0,1,2,3,4,5 um:zero minimum:500 name:L2MMU_4K_HITS : Counts level 2 MMU hits in L2MMU-4K. -+event:0x10a counters:0,1,2,3,4,5 um:zero minimum:500 name:L2MMU_VSP_HITS : Counts level 2 MMU hits in L2MMU-VSP. (Does not count indirect lookups). -+event:0x10b counters:0,1,2,3,4,5 um:zero minimum:500 name:L2MMU_INDIRECT_MISSES : Counts level 2 MMU indirect misses. This represents indirect entry lookups that do not have a matching indirect entry. -+event:0x10c counters:0,1,2,3,4,5 um:zero minimum:500 name:L2MMU_INDIRECT_VALID_MISSES : Counts level 2 MMU indirect valid misses. This occurts when the indirect entry is valid, but the corresponding PTE[V] = 0 or the premissions in the PTE are not sufficient for the requested access. -+event:0x10d counters:0,1,2,3,4,5 um:zero minimum:500 name:LRAT_MISSES : Counts Logical to Real Address Translation misses. This includes LRAT misses from tlbwe instructions or from page table translations. -+event:0x110 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_LMQ_LOSE_DLINK_DUE_SGB : Cycles the Load Miss Queue loses DLINK arbitration due to the Store Gather Buffer. -+event:0x111 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_SGB_LOSE_DLINK_DUE_LMQ : Cycles the Store Gather Buffer loses DLINK arbitration due to the Load Miss Queue. -+event:0x112 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_THREAD_LOSE_DLINK_DUE_OTHER_THREAD : Cycles thread loses DLINK arbitration due to other thread: Cycles thread loses DLINK arbitration due to other thread. -+event:0x116 counters:0,1,2,3,4,5 um:zero minimum:500 name:DECODE_MASK_VALUE : One mask/value pair that allows instructions to be counted in Decode. -+event:0x1bb counters:0,1,2,3,4,5 um:zero minimum:500 name:SHR_L2_DLINK_REQ : Number of DLINK requests made from core to Shared L2. -+event:0x1bc counters:0,1,2,3,4,5 um:zero minimum:500 name:SHR_L2_ILINK_REQ : Number of ILINK requests made from core to Shared L2. (Includes instruction fetches and L2MMU hardware tablewalk requests). -+event:0x1bd counters:0,1,2,3,4,5 um:zero minimum:500 name:SHR_L2_RLINK_REQ : Number of RLINK requests made from Shared L2 to core. (back invalidates, stashes, barriers). -+event:0x1be counters:0,1,2,3,4,5 um:zero minimum:500 name:SHR_L2_BLINK_REQ : Number of BLINK requests made from Shared L2 to core. (back invalidates, stashes, barriers). -+event:0x1bf counters:0,1,2,3,4,5 um:zero minimum:500 name:SHR_L2_CLINK_REQ : Number of CLINK requests made from Shared L2 to core. (back invalidates, stashes, barriers). -+event:0x1c8 counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_HITS : Number of L2 Cache hits. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1c9 counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_MISSES : Number of L2 Cache hits. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1ca counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_DEMAND_ACCESS : Number of L2 Cache demand accesses. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1cb counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_ACCESSES : Number of L2 Cache accesses from all sources (demand, reload, snoop, etc). Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1cc counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_STORE_ALLOCATE : Number of L2 Cache store allocates. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1cd counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_INSTRUCTIONS_ACCESS : Number of L2 Cache instruction accesses. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1ce counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_DATA_ACCESS : Number of L2 Cache data accesses. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1cf counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_INSTRUCTIONS_MISSES : Number of L2 Cache instruction misses. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1d0 counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_DATA_MISSES : Number of L2 Cache data misses. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1d1 counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_HITS_PER_THREAD : Number of times this core/thread hits in the L2 Cache. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1d2 counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_MISSES_PER_THREAD : Number of times this core/thread misses in the L2 Cache. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1d3 counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_DEMAND_ACCESS_PER_THREAD : Number of times this core/thread makes a demand access to the L2 Cache. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1d4 counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_STORE_ALLOC_PER_THREAD : Number of times a store from this core/thread allocates in the L2 Cache. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1d5 counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_INSTRUCTIONS_ACCESS_PER_THREAD : Number of times an instruction from this core/thread accesses the L2 Cache. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1d6 counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_DATA_ACCESS_PER_THREAD : Number of times a data operation from this core/thread accesses the L2 Cache. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1d7 counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_INSTRUCTION_MISSES_PER_THREAD : Number of times an instruction from this core/thread misses in the L2 Cache. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1d8 counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_DATA_MISSES_PER_THREAD : Number of times a data operation from this core/thread misses in the L2 Cache. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1d9 counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_RELOAD_FROM_CORENET : Number of L2 Cache reloads from CoreNet. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1da counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_IN_STASH_REQ : Number of incoming L2 Cache stash requests. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1db counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_STASH_REQ_DOWNGRD_TO_SNOOPS : Number of incoming L2 Cache stash requests downgraded to snoops. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1dc counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_SNOOPS_HITS : Number of L2 Cache snoop hits. Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1dd counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_SNOOPS_MINT : Number of L2 Cache snoops causing MINT. -+event:0x1de counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_SNOOPS_SINT : Number of L2 Cache snoops causing SINT. -+event:0x1df counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_SNOOPS_PUSHES : Number of L2 Cache snoop pushes. -+event:0x1e0 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_BIB_STALL : Stall for Back Invalidate Buffer entry (cycles). Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1e2 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_RLT_STALL : Stall for Reload Table entry (cycles). Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1e4 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_RLFQ_STALL : Stall for Reload Fold Queue entry (cycles). Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1e6 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_DTQ_STALL : Stall for Data Transaction Queue entry (cycles). Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1e8 counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_COB_STALL : Stall for Castout Buffer entry (cycles). Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1ea counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_WDB_STALL : Stall for Write Data Buffer entry (cycles). Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1ec counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_RLDB_STALL : Stall for Reload Data Buffer entry (cycles). Counts 0, 1, 2, 3, or 4 per cycle. -+event:0x1ee counters:0,1,2,3,4,5 um:zero minimum:500 name:CLK_SNPQ_STALL : Stall for Snoop Queue entry (cycles). -+event:0x1fa counters:0,1,2,3,4,5 um:zero minimum:500 name:BIU_MASTER_REQ : Master transaction starts. (Number of AOut sent to CoreNet). -+event:0x1fb counters:0,1,2,3,4,5 um:zero minimum:500 name:BIU_MASTER_GLOBAL_REQ : Master transaction starts that are global. (Number of AOut with M=1 sent to CoreNet). -+event:0x1fc counters:0,1,2,3,4,5 um:zero minimum:500 name:BIU_MASTER_DATA_SIDE_REQ : Master transaction starts that are global. (Number of AOut with M=1 sent to CoreNet). -+event:0x1fd counters:0,1,2,3,4,5 um:zero minimum:500 name:BIU_MASTER_INSTRUCTION_SIDE_REQ : Master instruction-side transaction starts. (Number of I-side AOut sent to CoreNet). -+event:0x1fe counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_STASH_REQ : Stash request on AIn matches stash IDs for core or L2. -+event:0x1ff counters:0,1,2,3,4,5 um:zero minimum:500 name:L2_SNOOP_REQ : Externally generated snoop requests. (Number of AIn from CoreNet not from self). -+ -diff --git a/events/ppc/e6500/unit_masks b/events/ppc/e6500/unit_masks -new file mode 100644 -index 0000000..b7e7a23 ---- /dev/null -+++ b/events/ppc/e6500/unit_masks -@@ -0,0 +1,4 @@ -+# e6500 possible unit masks -+# -+name:zero type:mandatory default:0x0 -+ 0x0 no unit mask -diff --git a/libop/op_cpu_type.c b/libop/op_cpu_type.c -index 7d50a2d..badb7ba 100644 ---- a/libop/op_cpu_type.c -+++ b/libop/op_cpu_type.c -@@ -126,6 +126,7 @@ static struct cpu_descr const cpu_descrs[MAX_CPU_TYPE] = { - { "IBM Power Architected Events V1", "ppc64/architected_events_v1", CPU_PPC64_ARCH_V1, 6 }, - { "ppc64 POWER8", "ppc64/power8", CPU_PPC64_POWER8, 6 }, - { "e500mc", "ppc/e500mc", CPU_PPC_E500MC, 4 }, -+ { "e6500", "ppc/e6500", CPU_PPC_E6500, 6 }, - }; - - static size_t const nr_cpu_descrs = sizeof(cpu_descrs) / sizeof(struct cpu_descr); -diff --git a/libop/op_cpu_type.h b/libop/op_cpu_type.h -index 10f000b..934fe9e 100644 ---- a/libop/op_cpu_type.h -+++ b/libop/op_cpu_type.h -@@ -106,6 +106,7 @@ typedef enum { - CPU_PPC64_ARCH_V1, /** < IBM Power architected events version 1 */ - CPU_PPC64_POWER8, /**< ppc64 POWER8 family */ - CPU_PPC_E500MC, /**< e500mc */ -+ CPU_PPC_E6500, /**< e6500 */ - MAX_CPU_TYPE - } op_cpu; - -diff --git a/libop/op_events.c b/libop/op_events.c -index 638dc5c..9d2aa5e 100644 ---- a/libop/op_events.c -+++ b/libop/op_events.c -@@ -1309,6 +1309,7 @@ void op_default_event(op_cpu cpu_type, struct op_default_event_descr * descr) - case CPU_PPC_E500: - case CPU_PPC_E500_2: - case CPU_PPC_E500MC: -+ case CPU_PPC_E6500: - case CPU_PPC_E300: - descr->name = "CPU_CLK"; - break; -diff --git a/utils/ophelp.c b/utils/ophelp.c -index 0647360..3b2896a 100644 ---- a/utils/ophelp.c -+++ b/utils/ophelp.c -@@ -754,6 +754,7 @@ int main(int argc, char const * argv[]) - case CPU_PPC_E500: - case CPU_PPC_E500_2: - case CPU_PPC_E500MC: -+ case CPU_PPC_E6500: - event_doc = - "See PowerPC e500 Core Complex Reference Manual\n" - "Chapter 7: Performance Monitor\n" --- diff --git a/meta/recipes-kernel/oprofile/oprofile/automake-foreign.patch b/meta/recipes-kernel/oprofile/oprofile/automake-foreign.patch index e82a381139..b9bb6c5779 100644 --- a/meta/recipes-kernel/oprofile/oprofile/automake-foreign.patch +++ b/meta/recipes-kernel/oprofile/oprofile/automake-foreign.patch @@ -1,3 +1,8 @@ +oprofile doesn't want GNU-levels of automake strictness so tell it to be "foreign". + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + diff --git a/configure.ac b/configure.ac index 5740585..cf6c316 100644 --- a/configure.ac diff --git a/meta/recipes-kernel/oprofile/oprofile/filemode-fix.patch b/meta/recipes-kernel/oprofile/oprofile/filemode-fix.patch new file mode 100644 index 0000000000..f7ebe24691 --- /dev/null +++ b/meta/recipes-kernel/oprofile/oprofile/filemode-fix.patch @@ -0,0 +1,41 @@ +With security_flags.inc: + +| In file included from /media/build1/poky/build/tmp/sysroots/qemumips/usr/include/fcntl.h:302:0, +| from opjitconv.c:25: +| In function 'open', +| inlined from 'copy_dumpfile' at opjitconv.c:219:6: +| /media/build1/poky/build/tmp/sysroots/qemumips/usr/include/bits/fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT in second argument needs 3 arguments +| __open_missing_mode (); +| ^ +| Makefile:440: recipe for target 'opjitconv.o' failed + +Why does this only happen on mips? mips has: + +O_CREAT = 0x100 +and +S_IRUSR = 0400 + +and these (in hex and otcal) are equivalent. Most other platforms +have O_CREAT = 0100. + +http://sourceforge.net/p/oprofile/oprofile/ci/4598ca73b0a367ca46d4a2843261e20e1896773b + +The file should not be created, only opened if its present, therefore use O_RDONLY instead. + +RP 2014/11/6 + +Upstream-Status: Backport + +Index: oprofile-1.0.0/opjitconv/opjitconv.c +=================================================================== +--- oprofile-1.0.0.orig/opjitconv/opjitconv.c 2014-09-12 14:39:47.000000000 +0000 ++++ oprofile-1.0.0/opjitconv/opjitconv.c 2014-11-06 13:14:25.941639003 +0000 +@@ -216,7 +216,7 @@ + int file_locked = 0; + unsigned int usecs_waited = 0; + int rc = OP_JIT_CONV_OK; +- int fd = open(dumpfile, S_IRUSR); ++ int fd = open(dumpfile, O_RDONLY); + if (fd < 0) { + perror("opjitconv failed to open JIT dumpfile"); + return OP_JIT_CONV_FAIL; diff --git a/meta/recipes-kernel/oprofile/oprofile/opstart.patch b/meta/recipes-kernel/oprofile/oprofile/opstart.patch deleted file mode 100644 index 8696f4ef4d..0000000000 --- a/meta/recipes-kernel/oprofile/oprofile/opstart.patch +++ /dev/null @@ -1,245 +0,0 @@ -Upstream-Status: Pending - -The patch gives a low overhead way of starting/stopping oprofile which -doesn't involve script exection. - -(written by RP in OpenedHand days) - -diff --git a/utils/Makefile.am b/utils/Makefile.am -index d34b060..dff15f9 100644 ---- oprofile.orig/utils/Makefile.am -+++ oprofile/utils/Makefile.am -@@ -7,7 +7,7 @@ AM_LDFLAGS = @OP_LDFLAGS@ - - LIBS=@POPT_LIBS@ @LIBERTY_LIBS@ - --bin_PROGRAMS = ophelp op-check-perfevents -+bin_PROGRAMS = ophelp op-check-perfevents opstart - dist_bin_SCRIPTS = opcontrol - - op_check_perfevents_SOURCES = op_perf_events_checker.c -@@ -15,3 +15,10 @@ op_check_perfevents_CPPFLAGS = ${AM_CFLAGS} @PERF_EVENT_FLAGS@ - - ophelp_SOURCES = ophelp.c - ophelp_LDADD = ../libop/libop.a ../libutil/libutil.a -+ -+opstart_SOURCES = opstart.c -+ -+install-exec-local: -+ cd $(DESTDIR)/$(bindir) && \ -+ rm -f opstop && \ -+ $(LN_S) opstart opstop -Index: oprofile/utils/opstart.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ oprofile/utils/opstart.c 2008-07-02 15:14:07.000000000 +0100 -@@ -0,0 +1,110 @@ -+/** -+ * @file opstart.c -+ * Start/Stop oprofile -+ * -+ * @remark Copyright 2007 Openedhand Ltd. -+ * @remark Read the file COPYING -+ * -+ * @author Richard Purdie -+ */ -+ -+#include <signal.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <unistd.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+ -+int main(const int argc, const char* argv[]) -+{ -+ const char *enable = "/dev/oprofile/enable"; -+ const char *lockfile; -+ unsigned long dpid; -+ struct stat sbuf; -+ FILE *lfile, *efile; -+ int sig, enb, err; -+ -+ if (argc >= 2) { -+ printf("Error: Invalid options.\n"); -+ return 1; -+ } -+ -+ lockfile = getenv("LOCK_FILE"); -+ if (!lockfile) -+ lockfile = "/var/lib/oprofile/lock"; -+ -+ /* Add SESSION_DIR support? */ -+ -+ if (geteuid()) { -+ printf("Error: This program must be run as root.\n"); -+ return 1; -+ } -+ -+ if (stat(enable, &sbuf)) { -+ printf("Error: Could not find /dev/oprofile/enable, the" -+ " kernel module probably isn't loaded.\n"); -+ printf("This binary only works with 2.6 kernels and oprofile" -+ " must have been initialised with 'opcontrol --start-daemon'.\n"); -+ return 1; -+ } -+ -+ if (stat(lockfile, &sbuf)) { -+ printf("Error: Could not find lockfile %s.\n", lockfile); -+ printf("The oprofile daemon must be running (oprofile must" -+ " have been initialised with 'opcontrol --start-daemon').\n"); -+ return 1; -+ } -+ -+ lfile = fopen(lockfile, "r"); -+ if (!lfile) { -+ printf("Error opening lockfile %s.\n", lockfile); -+ return 1; -+ } -+ -+ err = fscanf(lfile, "%lud", (unsigned long *) &dpid); -+ if (err != 1) { -+ printf("Error reading pid from lockfile %s.\n", lockfile); -+ return 1; -+ } -+ fclose(lfile); -+ -+ efile = fopen(enable, "r"); -+ if (!efile) { -+ printf("Error opening %s.\n", enable); -+ return 1; -+ } -+ -+ if (strstr(argv[0], "opstart")) { -+ printf("Starting Profiler\n"); -+ sig = SIGUSR1; -+ enb = 1; -+ } else if (strstr(argv[0], "opstop")) { -+ printf("Stopping Oprofile.\n"); -+ printf("You need to run 'opcontrol --dump' when the session" -+ " is finished.\n"); -+ sig = SIGUSR2; -+ enb = 0; -+ } else { -+ printf("Error: Please call as 'opstart' or 'opstop'\n"); -+ return 1; -+ } -+ -+ err = kill(dpid, 0); -+ if (err) { -+ printf("Error sending signal to oprofiled. Stale lockfile" -+ " (%s) ?\n", lockfile); -+ return 1; -+ } -+ -+ fprintf(efile, "%d\n", enb); -+ err = kill(dpid, sig); -+ if (err) { -+ printf("Error sending signal to oprofiled. Stale lockfile" -+ " (%s) ?\n", lockfile); -+ return 1; -+ } -+ -+ return 0; -+} -+ -Index: oprofile/configure.ac -=================================================================== ---- oprofile.orig/configure.ac 2008-07-02 15:13:58.000000000 +0100 -+++ oprofile/configure.ac 2008-07-02 15:17:37.000000000 +0100 -@@ -16,6 +16,7 @@ - AM_CONFIG_HEADER(config.h) - - AC_PROG_RANLIB -+AC_PROG_LN_S - AC_PROG_LIBTOOL - - dnl for the man page -@@ -241,6 +242,8 @@ - doc/xsl/catalog-1.xml \ - doc/oprofile.1 \ - doc/opcontrol.1 \ -+ doc/opstart.1 \ -+ doc/opstop.1 \ - doc/ophelp.1 \ - doc/opreport.1 \ - doc/opannotate.1 \ -Index: oprofile/doc/Makefile.am -=================================================================== ---- oprofile.orig/doc/Makefile.am 2008-07-02 15:13:59.000000000 +0100 -+++ oprofile/doc/Makefile.am 2008-07-02 15:14:07.000000000 +0100 -@@ -11,6 +11,8 @@ - man_MANS = \ - oprofile.1 \ - opcontrol.1 \ -+ opstart.1 \ -+ opstop.1 \ - opreport.1 \ - opannotate.1 \ - opgprof.1 \ -Index: oprofile/doc/opstart.1.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ oprofile/doc/opstart.1.in 2008-07-02 15:14:07.000000000 +0100 -@@ -0,0 +1,27 @@ -+.TH OPSTART 1 "@DATE@" "oprofile @VERSION@" -+.UC 4 -+.SH NAME -+opstart \- start OProfile profiling -+.SH SYNOPSIS -+.br -+.B opstart -+.SH DESCRIPTION -+.B opstart -+is a simple optimised command to start profiling with 2.6 Linux kernels. -+OProfile should have already been initialised by calling "opcontrol --start-daemon". -+ -+.SH ENVIRONMENT -+No special environment variables are recognised by opstart. -+ -+.SH FILES -+.TP -+.I /var/lib/oprofile/samples/ -+The location of the generated sample files. -+ -+.SH VERSION -+.TP -+This man page is current for @PACKAGE@-@VERSION@. -+ -+.SH SEE ALSO -+.BR @OP_DOCDIR@, -+.BR oprofile(1) -Index: oprofile/doc/opstop.1.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ oprofile/doc/opstop.1.in 2008-07-02 15:14:07.000000000 +0100 -@@ -0,0 +1,28 @@ -+.TH OPSTOP 1 "@DATE@" "oprofile @VERSION@" -+.UC 4 -+.SH NAME -+opstop \- stop OProfile profiling -+.SH SYNOPSIS -+.br -+.B opstop -+.SH DESCRIPTION -+.B opstop -+is a simple optimsed command to stop profiling with 2.6 Linux kernels. -+You need to run "opcontrol --dump" before being able to view a profile -+with opreport. -+ -+.SH ENVIRONMENT -+No special environment variables are recognised by opstop. -+ -+.SH FILES -+.TP -+.I /var/lib/oprofile/samples/ -+The location of the generated sample files. -+ -+.SH VERSION -+.TP -+This man page is current for @PACKAGE@-@VERSION@. -+ -+.SH SEE ALSO -+.BR @OP_DOCDIR@, -+.BR oprofile(1) diff --git a/meta/recipes-kernel/oprofile/oprofile/root-home-dir.patch b/meta/recipes-kernel/oprofile/oprofile/root-home-dir.patch index 45cab7d3d8..20fc5e503b 100644 --- a/meta/recipes-kernel/oprofile/oprofile/root-home-dir.patch +++ b/meta/recipes-kernel/oprofile/oprofile/root-home-dir.patch @@ -1,7 +1,7 @@ oprofile: Determine the root home directory dynamically This commit detects the root home directory dynamically with changes to -the opcontrol script and the oprofile gui app source. +the oprofile gui app source. The commit replaces an earlier fix that detected and adjusted a 'non-standard' root home directory at build time. The advantage of this @@ -12,109 +12,33 @@ Upstream-Status: inappropriate [OE specific] Signed-off-by: Dave Lerner <dave.lerner@windriver.com> -diff --git a/doc/opcontrol.1.in b/doc/opcontrol.1.in -index c434704..f57eb76 100644 ---- a/doc/opcontrol.1.in -+++ b/doc/opcontrol.1.in -@@ -171,7 +171,7 @@ No special environment variables are recognised by opcontrol. - - .SH FILES - .TP --.I /root/.oprofile/daemonrc -+.I ~root/.oprofile/daemonrc - Configuration file for opcontrol - .TP - .I /var/lib/oprofile/samples/ -diff --git a/doc/oprofile.1.in b/doc/oprofile.1.in -index 3d0f0ed..5c623e1 100644 ---- a/doc/oprofile.1.in -+++ b/doc/oprofile.1.in -@@ -150,7 +150,7 @@ No special environment variables are recognised by oprofile. - .I $HOME/.oprofile/ - Configuration files - .TP --.I /root/.oprofile/daemonrc -+.I ~root/.oprofile/daemonrc - Configuration file for opcontrol - .TP - .I @prefix@/share/oprofile/ -diff --git a/doc/oprofile.html b/doc/oprofile.html -index 128d9f7..d7e4dea 100644 ---- a/doc/oprofile.html -+++ b/doc/oprofile.html -@@ -1394,7 +1394,7 @@ The <span class="command"><strong>opcontrol</strong></span> script provides the - <dd> - <p> - Followed by list arguments for profiling set up. List of arguments -- saved in <code class="filename">/root/.oprofile/daemonrc</code>. -+ saved in <code class="filename">~root/.oprofile/daemonrc</code>. - Giving this option is not necessary; you can just directly pass one - of the setup options, e.g. <span class="command"><strong>opcontrol --no-vmlinux</strong></span>. - </p> -@@ -1430,7 +1430,7 @@ The <span class="command"><strong>opcontrol</strong></span> script provides the - <dd> - <p> - Start data collection with either arguments provided by <code class="option">--setup</code> -- or information saved in <code class="filename">/root/.oprofile/daemonrc</code>. Specifying -+ or information saved in <code class="filename">~root/.oprofile/daemonrc</code>. Specifying - the addition <code class="option">--verbose</code> makes the daemon generate lots of debug data - whilst it is running. +Index: oprofile-1.0.0/doc/oprofile.html +=================================================================== +--- oprofile-1.0.0.orig/doc/oprofile.html 2014-11-03 17:55:31.511034857 +0000 ++++ oprofile-1.0.0/doc/oprofile.html 2014-11-03 17:57:26.415037988 +0000 +@@ -1563,8 +1563,8 @@ + <span class="emphasis"><em>must</em></span> stop it in a controlled manner in order to process + the profile data it has collected. Use <code class="code">kill -SIGINT <operf-PID></code> + for this purpose. It is recommended that when running <span class="command"><strong>operf</strong></span> +- with this option, your current working directory should be <code class="filename">/root</code> or a subdirectory +- of <code class="filename">/root</code> to avoid storing sample data files in locations accessible by regular users. ++ with this option, your current working directory should be <code class="filename">~root</code> or a subdirectory ++ of <code class="filename">~root</code> to avoid storing sample data files in locations accessible by regular users. </p> -diff --git a/doc/oprofile.xml b/doc/oprofile.xml -index 6a17c6d..0968d76 100644 ---- a/doc/oprofile.xml -+++ b/doc/oprofile.xml -@@ -568,7 +568,7 @@ The <command>opcontrol</command> script provides the following actions : - <term><option>--setup</option></term> - <listitem><para> - Followed by list arguments for profiling set up. List of arguments -- saved in <filename>/root/.oprofile/daemonrc</filename>. -+ saved in <filename>~root/.oprofile/daemonrc</filename>. - Giving this option is not necessary; you can just directly pass one - of the setup options, e.g. <command>opcontrol --no-vmlinux</command>. - </para></listitem> -@@ -592,7 +592,7 @@ The <command>opcontrol</command> script provides the following actions : - <term><option>--start</option></term> - <listitem><para> - Start data collection with either arguments provided by <option>--setup</option> -- or information saved in <filename>/root/.oprofile/daemonrc</filename>. Specifying -+ or information saved in <filename>~root/.oprofile/daemonrc</filename>. Specifying - the addition <option>--verbose</option> makes the daemon generate lots of debug data - whilst it is running. + </dd> + <dt> +Index: oprofile-1.0.0/doc/oprofile.xml +=================================================================== +--- oprofile-1.0.0.orig/doc/oprofile.xml 2014-11-03 17:55:31.515034857 +0000 ++++ oprofile-1.0.0/doc/oprofile.xml 2014-11-03 17:58:03.719039005 +0000 +@@ -654,8 +654,8 @@ + <emphasis>must</emphasis> stop it in a controlled manner in order to process + the profile data it has collected. Use <code>kill -SIGINT <operf-PID></code> + for this purpose. It is recommended that when running <command>operf</command> +- with this option, your current working directory should be <filename>/root</filename> or a subdirectory +- of <filename>/root</filename> to avoid storing sample data files in locations accessible by regular users. ++ with this option, your current working directory should be <filename>~root</filename> or a subdirectory ++ of <filename>~root</filename> to avoid storing sample data files in locations accessible by regular users. </para></listitem> -diff --git a/gui/oprof_start_util.cpp b/gui/oprof_start_util.cpp -index d293431..d13fa8f 100644 ---- a/gui/oprof_start_util.cpp -+++ b/gui/oprof_start_util.cpp -@@ -20,6 +20,8 @@ - #include <iostream> - #include <fstream> - #include <cstdlib> -+#include <sys/types.h> -+#include <pwd.h> - - #include <qfiledialog.h> - #include <qmessagebox.h> -@@ -39,7 +41,8 @@ namespace { - // return the ~ expansion suffixed with a '/' - string const get_config_dir() - { -- return "/root"; -+ struct *pw = getpwnam("root"); -+ return pw->pw_dir; - } - - string daemon_pid; -diff --git a/utils/opcontrol b/utils/opcontrol -index 09fa5a7..a8acdae 100644 ---- a/utils/opcontrol -+++ b/utils/opcontrol -@@ -385,7 +385,7 @@ do_init() - OPROFILED="$OPDIR/oprofiled" - - # location for daemon setup information -- SETUP_DIR="/root/.oprofile" -+ SETUP_DIR="`grep root /etc/passwd | cut -d: -f6`/.oprofile" - SETUP_FILE="$SETUP_DIR/daemonrc" - SEC_SETUP_FILE="$SETUP_DIR/daemonrc_new" - + </varlistentry> + <varlistentry> diff --git a/meta/recipes-kernel/oprofile/oprofile_0.9.9.bb b/meta/recipes-kernel/oprofile/oprofile_0.9.9.bb deleted file mode 100644 index 63ef6af0e9..0000000000 --- a/meta/recipes-kernel/oprofile/oprofile_0.9.9.bb +++ /dev/null @@ -1,17 +0,0 @@ -require oprofile.inc - -DEPENDS += "virtual/kernel" -DEPENDS_append_powerpc64 = " libpfm4" - -SRC_URI += "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ - file://0001-Add-rmb-definition-for-AArch64-architecture.patch \ - file://0001-Tidy-powerpc64-bfd-target-check.patch \ - file://0001-Add-freescale-e500mc-support.patch \ - file://0002-Add-freescale-e6500-support.patch \ - " -SRC_URI[md5sum] = "00aec1287da2dfffda17a9b1c0a01868" -SRC_URI[sha256sum] = "1e523400daaba7b8d0d15269e977a08b40edfea53970774b69ae130e25117597" - - -S = "${WORKDIR}/oprofile-${PV}" - diff --git a/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb b/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb new file mode 100644 index 0000000000..f4a34b32e6 --- /dev/null +++ b/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb @@ -0,0 +1,13 @@ +require oprofile.inc + +DEPENDS += "virtual/kernel" +DEPENDS_append_powerpc64 = " libpfm4" + +SRC_URI += "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" + +SRC_URI[md5sum] = "ba0b340e5c421a93959776c836ed35b3" +SRC_URI[sha256sum] = "847110b4ecdcf8c8353cd38f94c1b704aad4bfcd9453e38b88d112cfb7e3c45a" + +S = "${WORKDIR}/oprofile-${PV}" + +PR = "r1" diff --git a/meta/recipes-kernel/perf/perf-features.inc b/meta/recipes-kernel/perf/perf-features.inc index 2dbbb47761..b8859ab7d5 100644 --- a/meta/recipes-kernel/perf/perf-features.inc +++ b/meta/recipes-kernel/perf/perf-features.inc @@ -1,4 +1,4 @@ -PERF_FEATURES_ENABLE ?= "perf-scripting perf-tui perf-libunwind" +PERF_FEATURES_ENABLE ?= "perf-scripting perf-tui" def perf_feature_enabled(feature, trueval, falseval, d): """ diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 3771cdb3e9..420fe6b57a 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -22,7 +22,7 @@ TUI_DEPENDS = "${@perf_feature_enabled('perf-tui', 'libnewt slang', '',d)}" SCRIPTING_DEPENDS = "${@perf_feature_enabled('perf-scripting', 'perl python', '',d)}" LIBUNWIND_DEPENDS = "${@perf_feature_enabled('perf-libunwind', 'libunwind', '',d)}" -DEPENDS = "virtual/kernel \ +DEPENDS = " \ virtual/${MLPREFIX}libc \ ${MLPREFIX}elfutils \ ${MLPREFIX}binutils \ @@ -32,6 +32,8 @@ DEPENDS = "virtual/kernel \ bison flex \ " +do_configure[depends] += "virtual/kernel:do_shared_workdir" + PROVIDES = "virtual/perf" inherit linux-kernel-base kernel-arch pythonnative @@ -46,7 +48,7 @@ export HOST_SYS #kernel 3.1+ supports WERROR to disable warnings as errors export WERROR = "0" -do_populate_lic[depends] += "virtual/kernel:do_populate_sysroot" +do_populate_lic[depends] += "virtual/kernel:do_patch" # needed for building the tools/perf Perl binding inherit perlnative cpan-base @@ -56,15 +58,14 @@ export PERL_INC = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)} export PERL_LIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" -S = "${STAGING_KERNEL_DIR}" -# The source should be ready after the do_unpack -do_unpack[depends] += "virtual/kernel:do_populate_sysroot" +inherit kernelsrc B = "${WORKDIR}/${BPN}-${PV}" SCRIPTING_DEFINES = "${@perf_feature_enabled('perf-scripting', '', 'NO_LIBPERL=1 NO_LIBPYTHON=1',d)}" TUI_DEFINES = "${@perf_feature_enabled('perf-tui', '', 'NO_NEWT=1',d)}" -LIBUNWIND_DEFINES = "${@perf_feature_enabled('perf-libunwind', '', 'NO_LIBUNWIND=1',d)}" +LIBUNWIND_DEFINES = "${@perf_feature_enabled('perf-libunwind', '', 'NO_LIBUNWIND=1 NO_LIBDW_DWARF_UNWIND=1',d)}" +LIBNUMA_DEFINES = "${@perf_feature_enabled('perf-libnuma', '', 'NO_LIBNUMA=1',d)}" # The LDFLAGS is required or some old kernels fails due missing # symbols and this is preferred than requiring patches to every old @@ -80,7 +81,8 @@ EXTRA_OEMAKE = '\ AR="${AR}" \ EXTRA_CFLAGS="-ldw" \ perfexecdir=${libexecdir} \ - NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${LIBUNWIND_DEFINES} ${SCRIPTING_DEFINES} \ + NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${LIBUNWIND_DEFINES} \ + ${SCRIPTING_DEFINES} ${LIBNUMA_DEFINES} \ ' EXTRA_OEMAKE += "\ @@ -96,7 +98,6 @@ EXTRA_OEMAKE += "\ 'infodir=${@os.path.relpath(infodir, prefix)}' \ " -PARALLEL_MAKE = "" do_compile() { # Linux kernel build system is expected to do the right thing @@ -115,6 +116,10 @@ do_install() { } do_configure_prepend () { + # Fix for rebuilding + rm -rf ${B}/ + mkdir ${B}/ + #kernels before 3.1 do not support WERROR env variable sed -i 's,-Werror ,,' ${S}/tools/perf/Makefile if [ -e "${S}/tools/perf/config/Makefile" ]; then @@ -157,7 +162,7 @@ do_configure_prepend () { } python do_package_prepend() { - bb.data.setVar('PKGV', get_kernelversion('${S}').split("-")[0], d) + d.setVar('PKGV', d.getVar("KERNEL_VERSION", True).split("-")[0]) } PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -165,7 +170,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl ${PN}-python" -RDEPENDS_${PN} += "elfutils" +RDEPENDS_${PN} += "elfutils bash" RDEPENDS_${PN}-archive =+ "bash" RDEPENDS_${PN}-python =+ "bash python" RDEPENDS_${PN}-perl =+ "bash perl perl-modules" diff --git a/meta/recipes-kernel/powertop/powertop_2.6.1.bb b/meta/recipes-kernel/powertop/powertop_2.7.bb index 58216c2d15..5ba07e9ab9 100644 --- a/meta/recipes-kernel/powertop/powertop_2.6.1.bb +++ b/meta/recipes-kernel/powertop/powertop_2.7.bb @@ -6,16 +6,17 @@ DEPENDS = "ncurses libnl pciutils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" -SRC_URI = "http://01.org/powertop/sites/default/files/downloads/powertop-${PV}.tar.gz" +SRC_URI = "http://01.org/sites/default/files/downloads/powertop/powertop-${PV}.tar.gz" -SRC_URI[md5sum] = "4391e7b0af854ecf722cdf712f24b631" -SRC_URI[sha256sum] = "034cde6d5bb433fe0d29251d5cde5d4c2948abf05fe29ef10966b659331b20e4" +SRC_URI[md5sum] = "e0d686e47daaf7e9d89031f7763432ef" +SRC_URI[sha256sum] = "8d4b1490e2baad4467c0ded3c423db4472dcbf7b2dd8f8f2a928f54047c678ca" inherit autotools gettext pkgconfig # we need to explicitly link with libintl in uClibc systems -LDFLAGS += "${EXTRA_LDFLAGS}" +EXTRA_LDFLAGS ?= "" EXTRA_LDFLAGS_libc-uclibc = "-lintl" +LDFLAGS += "${EXTRA_LDFLAGS}" # we do not want libncursesw if we can do_configure_prepend() { diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb index ef1e270883..19c3e10f7c 100644 --- a/meta/recipes-kernel/sysprof/sysprof_git.bb +++ b/meta/recipes-kernel/sysprof/sysprof_git.bb @@ -12,9 +12,16 @@ SRC_URI = "git://git.gnome.org/sysprof \ " SRC_URI_append_arm = " file://rmb-arm.patch" +SRC_URI_append_armeb = " file://rmb-arm.patch" SRC_URI_append_mips = " file://rmb-mips.patch" SRC_URI_append_mips64 = " file://rmb-mips.patch" +SRC_URI_append_mips64n32 = " file://rmb-mips.patch" S = "${WORKDIR}/git" inherit autotools pkgconfig + +# We do not yet work for aarch64. +# +COMPATIBLE_HOST = "^(?!aarch64).*" + diff --git a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb index 4d2bec4714..758908bff9 100644 --- a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb @@ -21,7 +21,7 @@ EXTRA_OEMAKE = "" # support. Note that staprun expects it in the systemtap/runtime directory, # not in /lib/modules. do_compile() { - if grep -q "CONFIG_UTRACE=y" ${STAGING_KERNEL_DIR}/.config + if grep -q "CONFIG_UTRACE=y" ${STAGING_KERNEL_BUILDDIR}/.config then unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ diff --git a/meta/recipes-kernel/systemtap/systemtap/tapset-linux-sendfile-syscall.patch b/meta/recipes-kernel/systemtap/systemtap/tapset-linux-sendfile-syscall.patch deleted file mode 100644 index f945760fde..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap/tapset-linux-sendfile-syscall.patch +++ /dev/null @@ -1,22 +0,0 @@ -systemtap: Fixed probe syscall.sendfile failure - -compat_sendfile syscall is unavailable in kernels starting version 3.8. -Hence systemtap scripts like 'probe syscall.* { if (target()==pid()) log(name." ".argstr) }' fail. -This problem is solved by marking __syscall.compat_sendfile as optional in tapset/linux/syscalls2.stp - -Upstream-Status: Pending - -Signed-off-by: Mikhail Durnev <mikhail_durnev@mentor.com> - -diff -Naur old/tapset/linux/syscalls2.stp new/tapset/linux/syscalls2.stp ---- old/tapset/linux/syscalls2.stp 2014-04-21 01:28:41.000000000 -0500 -+++ new/tapset/linux/syscalls2.stp 2014-04-21 01:38:14.961233914 -0500 -@@ -1953,7 +1953,7 @@ - # COMPAT_SYSCALL_DEFINE4(sendfile64, int, out_fd, int, in_fd, - # compat_loff_t __user *, offset, compat_size_t, count) - # --probe syscall.sendfile = __syscall.sendfile, __syscall.compat_sendfile -+probe syscall.sendfile = __syscall.sendfile, __syscall.compat_sendfile ? - { - name = "sendfile" - out_fd = __int32($out_fd) diff --git a/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch b/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch new file mode 100644 index 0000000000..28a7eae407 --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch @@ -0,0 +1,34 @@ +Fix time_t print because in x32 ABI is long long int instead of long int. + +Upstream-Status: Pending + +Signed-off-by: AnÃbal Limón <anibal.limon@linux.intel.com> + +diff --git a/cache.cxx b/cache.cxx +index 3546b30..19c77ca 100644 +--- a/cache.cxx ++++ b/cache.cxx +@@ -294,7 +294,11 @@ clean_cache(systemtap_session& s) + { + //interval not passed, don't continue + if (s.verbose > 1) ++#if defined(__x86_64__) && defined (__ILP32__) ++ clog << _F("Cache cleaning skipped, interval not reached %lld s / %lu s.", ++#else + clog << _F("Cache cleaning skipped, interval not reached %lu s / %lu s.", ++#endif + (current_time.tv_sec-sb.st_mtime), cache_clean_interval) << endl; + return; + } +@@ -302,7 +306,11 @@ clean_cache(systemtap_session& s) + { + //interval reached, continue + if (s.verbose > 1) ++#if defined(__x86_64__) && defined (__ILP32__) ++ clog << _F("Cleaning cache, interval reached %lld s > %lu s.", ++#else + clog << _F("Cleaning cache, interval reached %lu s > %lu s.", ++#endif + (current_time.tv_sec-sb.st_mtime), cache_clean_interval) << endl; + } + diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index f81e8baf86..59a578daac 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -1,14 +1,14 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "8f0fcd995f7f650a2ee0a94539f90c99e6d19e1d" -PV = "2.5+git${SRCPV}" +SRCREV = "bf16266782e1f2588b519a50d9684279d4e21036" +PV = "2.7+git${SRCPV}" SRC_URI = "git://sourceware.org/git/systemtap.git \ file://docproc-build-fix.patch \ file://obsolete_automake_macros.patch \ file://system_map_location.patch \ - file://tapset-linux-sendfile-syscall.patch \ file://configure-allow-to-disable-libvirt.patch \ + file://x32_abi_time.patch \ " # systemtap doesn't support mips diff --git a/meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch b/meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch deleted file mode 100644 index faef049fec..0000000000 --- a/meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch +++ /dev/null @@ -1,30 +0,0 @@ -kernelshark: fix syntax error of shell - -Delete "<<<" syntax of bash in Makefile, else we would get following error: - - Syntax error: redirection unexpected - -Upstream-Status: Pending - -Signed-off-by: Chong Lu <Chong.Lu@windriver.com> ---- - Makefile | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index c1fa906..be84415 100644 ---- a/Makefile -+++ b/Makefile -@@ -89,8 +89,7 @@ endif - - # $(call test-build, snippet, ret) -> ret if snippet compiles - # -> empty otherwise --test-build = $(if $(shell $(CC) -o /dev/null -c -x c - > /dev/null 2>&1 \ -- <<<'$1' && echo y), $2) -+test-build = $(if $(shell echo '$1' |$(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y), $2) - - # have udis86 disassembler library? - udis86-flags := $(call test-build,\#include <udis86.h>,-DHAVE_UDIS86 -ludis86) --- -1.7.9.5 - diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb index 28412c72d3..b2ef1fcf55 100644 --- a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb +++ b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb @@ -9,9 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ DEPENDS = "gtk+ libxml2" RDEPENDS_${PN} = "trace-cmd" -SRC_URI_append = "file://kernelshark-fix-syntax-error-of-shell.patch" - -EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui" +EXTRA_OEMAKE = "\ + 'prefix=${prefix}' \ + 'bindir_relative=${@oe.path.relative(prefix, bindir)}' \ + 'libdir=${@oe.path.relative(prefix, libdir)}' \ + NO_PYTHON=1 \ + gui \ +" do_compile_prepend() { # Make sure the recompile is OK @@ -19,8 +23,8 @@ do_compile_prepend() { } do_install() { - oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui - rm ${D}${bindir}/trace-cmd - rm -rf ${D}${datadir}/trace-cmd - rmdir ${D}${datadir} + oe_runmake DESTDIR="${D}" install_gui + rm ${D}${bindir}/trace-cmd + rm -rf ${D}${libdir}/trace-cmd + rmdir ${D}${libdir} } diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd.inc b/meta/recipes-kernel/trace-cmd/trace-cmd.inc index fb8c5fa7f7..87e4a9c603 100644 --- a/meta/recipes-kernel/trace-cmd/trace-cmd.inc +++ b/meta/recipes-kernel/trace-cmd/trace-cmd.inc @@ -1,14 +1,12 @@ -SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5" -PR = "r3" -PV = "1.2+git${SRCPV}" +SRCREV = "0813335d2e49291e7ab6a4365cec2baa05813eda" +PV = "2.5.3+git${SRCPV}" -inherit pkgconfig pythonnative +inherit pkgconfig FILESEXTRAPATHS =. "${FILE_DIRNAME}/trace-cmd:" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git \ - file://addldflags.patch \ - file://make-docs-optional.patch \ +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;branch=trace-cmd-stable-v2.5 \ file://blktrace-api-compatibility.patch \ " + S = "${WORKDIR}/git" diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch deleted file mode 100644 index 14730db905..0000000000 --- a/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch +++ /dev/null @@ -1,51 +0,0 @@ -trace-cmd: Cross-compile fixes for LDFLAGS and include path - -Add ability for the Makefile to respect LDFLAGS. -Also remove hardcoded /usr/local/include include path. - -Upstream-Status: Accepted [Post 1.2: 5f576e9af7ad706774d9764a9ae3989376797c0e] - -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> -Signed-off-by: Darren Hart <dvhart@linux.intel.com> - ---- - Makefile | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -Index: git/Makefile -=================================================================== ---- git.orig/Makefile -+++ git/Makefile -@@ -202,12 +202,13 @@ export Q VERBOSE - TRACECMD_VERSION = $(TC_VERSION).$(TC_PATCHLEVEL).$(TC_EXTRAVERSION) - KERNELSHARK_VERSION = $(KS_VERSION).$(KS_PATCHLEVEL).$(KS_EXTRAVERSION) - --INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES) -+INCLUDES = -I. $(CONFIG_INCLUDES) - - include features.mk - - # Set compile option CFLAGS if not set elsewhere - CFLAGS ?= -g -Wall -+LDFLAGS ?= - - ifndef NO_PTRACE - ifneq ($(call try-cc,$(SOURCE_PTRACE),),y) -@@ -251,7 +252,7 @@ do_fpic_compile = \ - - do_app_build = \ - ($(print_app_build) \ -- $(CC) $^ -rdynamic -o $@ $(CONFIG_LIBS) $(LIBS)) -+ $(CC) $^ -rdynamic -o $@ $(LDFLAGS) $(CONFIG_LIBS) $(LIBS)) - - do_compile_shared_library = \ - ($(print_shared_lib_compile) \ -@@ -263,7 +264,7 @@ do_compile_plugin_obj = \ - - do_plugin_build = \ - ($(print_plugin_build) \ -- $(CC) $(CFLAGS) -shared -nostartfiles -o $@ $<) -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -nostartfiles -o $@ $<) - - do_build_static_lib = \ - ($(print_static_lib_build) \ diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch deleted file mode 100644 index 8402426c5f..0000000000 --- a/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch +++ /dev/null @@ -1,36 +0,0 @@ -Disable building docs until we have asciidocs available as a recipe. - -Upstream-Status: Inappropriate [Account for missing dependency, the lazy way] - -Signed-off-by: Darren Hart <dvhart@linux.intel.com> - ---- - Makefile | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -Index: git/Makefile -=================================================================== ---- git.orig/Makefile -+++ git/Makefile -@@ -327,7 +327,9 @@ TARGETS = $(CMD_TARGETS) $(GUI_TARGETS) - # If you want kernelshark, then do: make gui - ### - --all: all_cmd doc show_gui_make -+# Make doc optional -+#all: all_cmd doc show_gui_make -+all: all_cmd show_gui_make - - all_cmd: $(CMD_TARGETS) - -@@ -503,7 +505,9 @@ install_python: $(PYTHON_SO_INSTALL) $(P - install_cmd: all_cmd install_plugins install_python - $(Q)$(call do_install,trace-cmd,$(bindir_SQ)) - --install: install_cmd install_doc -+# Make doc optional -+#install: install_cmd install_doc -+install: install_cmd - @echo "Note: to install the gui, type \"make install_gui\"" - - install_gui: install_cmd gui diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd_2.3.2.bb b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb index a4d5382aaf..b1ac7892dd 100644 --- a/meta/recipes-kernel/trace-cmd/trace-cmd_2.3.2.bb +++ b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb @@ -6,13 +6,7 @@ require trace-cmd.inc LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e \ file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \ - file://trace-input.c;beginline=5;endine=8;md5=dafd8a1cade30b847a8686dd3628cea4 \ -" -SRCREV = "79e08f8edb38c4c5098486caaa87ca90ba00f547" - -PV = "2.3.2+git${SRCPV}" - -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git;branch=trace-cmd-stable-v2.3 \ + file://trace-input.c;beginline=5;endline=8;md5=3ec82f43bbe0cfb5951ff414ef4d44d0 \ " EXTRA_OEMAKE = "\ diff --git a/meta/recipes-lsb4/libpng/libpng12_1.2.51.bb b/meta/recipes-lsb4/libpng/libpng12_1.2.52.bb index 6b2dcba1f1..5b67fe8b53 100644 --- a/meta/recipes-lsb4/libpng/libpng12_1.2.51.bb +++ b/meta/recipes-lsb4/libpng/libpng12_1.2.52.bb @@ -2,8 +2,8 @@ SUMMARY = "PNG image format decoding library" HOMEPAGE = "http://www.libpng.org/" SECTION = "libs" LICENSE = "Libpng" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ec135c8490e3b3d4ba2cc21f84c3a294 \ - file://png.h;beginline=314;endline=428;md5=151cf86c4efc2a7400f8a9a61d743d8e" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4495b57387451782e5f34c2968c35ed0 \ + file://png.h;beginline=314;endline=428;md5=0c93e62d39955f2b879c056165cfad43" DEPENDS = "zlib" PN = "libpng12" @@ -11,8 +11,8 @@ S = "${WORKDIR}/libpng-${PV}" SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.xz" -SRC_URI[md5sum] = "4efba67fa5aa2b785c6fcec2cc3e90c9" -SRC_URI[sha256sum] = "c7d7b813b022afd70474f78bcc3655c7bb54edbf28dd4652e5521cbb6da56d4a" +SRC_URI[md5sum] = "49d5c71929bf69a172147c47b9309fbe" +SRC_URI[sha256sum] = "d4fb0fbf14057ad6d0319034188fc2aecddb493da8e3031b7b072ed28f510ec0" BINCONFIG_GLOB = "${PN}-config" diff --git a/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb b/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb index 968c81ee2b..2d49cc5622 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb @@ -13,5 +13,5 @@ S = "${WORKDIR}/alsa-utils-${PV}" do_install() { install -d ${D}${sbindir} - install -m 0755 ${S}/alsaconf/alsaconf ${D}${sbindir}/ + install -m 0755 ${B}/alsaconf/alsaconf ${D}${sbindir}/ } diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb index 5f35d76a6e..ac5512a7df 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb @@ -25,7 +25,9 @@ SRC_URI[sha256sum] = "f3ff4c89b0125a7797b1b13cd094cc92276e655458274967386e812d03 # EXTRA_OECONF_append_libc-uclibc = " --disable-nls" -inherit autotools-brokensep gettext pkgconfig +PR = "r1" + +inherit autotools gettext pkgconfig # This are all packages that we need to make. Also, the now empty alsa-utils # ipk depends on them. diff --git a/meta/recipes-multimedia/flac/flac-1.3.0/0001-Fix-Makefile.am-altivec-logic.patch b/meta/recipes-multimedia/flac/flac-1.3.0/0001-Fix-Makefile.am-altivec-logic.patch deleted file mode 100644 index d086cc910f..0000000000 --- a/meta/recipes-multimedia/flac/flac-1.3.0/0001-Fix-Makefile.am-altivec-logic.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1b3597cdc7b5e604ea37db29b2a65aab91e263e6 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias <gustavo@zacarias.com.ar> -Date: Wed, 4 Dec 2013 13:31:28 -0300 -Subject: [PATCH] Fix Makefile.am altivec logic - -Upstream-Status: Backport - -Besides SPE (FSL e500v? cores) there are other powerpc processors -that don't support altivec instructions so only enable them when it's -100% sure that the target has it. - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> -Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com> -Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> ---- - src/libFLAC/Makefile.am | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am -index 247e33c..258de40 100644 ---- a/src/libFLAC/Makefile.am -+++ b/src/libFLAC/Makefile.am -@@ -47,8 +47,7 @@ CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM - else - # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific - CPUCFLAGS = --if FLaC__CPU_PPC_SPE --else -+if FLaC__USE_ALTIVEC - CPUCFLAGS += -maltivec -mabi=altivec - endif - #@@@ PPC optimizations temporarily disabled --- -1.8.3.2 - diff --git a/meta/recipes-multimedia/flac/flac_1.3.0.bb b/meta/recipes-multimedia/flac/flac_1.3.1.bb index fdf38e9ea9..f25271f879 100644 --- a/meta/recipes-multimedia/flac/flac_1.3.0.bb +++ b/meta/recipes-multimedia/flac/flac_1.3.1.bb @@ -5,23 +5,21 @@ BUGTRACKER = "http://sourceforge.net/p/flac/bugs/" SECTION = "libs" LICENSE = "GFDL-1.2 & GPLv2+ & LGPLv2.1+ & BSD" LIC_FILES_CHKSUM = "file://COPYING.FDL;md5=ad1419ecc56e060eccf8184a87c4285f \ - file://src/Makefile.am;beginline=1;endline=17;md5=59575c1aa8f5f70d9361b776c2e2bdb5 \ + file://src/Makefile.am;beginline=1;endline=17;md5=0a853b81d9d43d8aad3b53b05cfcc37e \ file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://src/flac/main.c;beginline=1;endline=18;md5=d36a16abc38d5ffd346ac4ba1be1932b \ + file://src/flac/main.c;beginline=1;endline=18;md5=d03a766558d233f9cc3ac5dfafd49deb \ file://COPYING.LGPL;md5=fbc093901857fcd118f065f900982c24 \ - file://src/plugin_common/all.h;beginline=1;endline=18;md5=e33e281151e7f40db2d3d170d9b0c1bb \ - file://COPYING.Xiph;md5=755582d124a03e3001afea59fc02b61b \ + file://src/plugin_common/all.h;beginline=1;endline=18;md5=7c8a3b9e1e66ed0aba765bc6f35da85d \ + file://COPYING.Xiph;md5=a2c4b71c0198682376d483eb5bcc9197 \ file://include/FLAC/all.h;beginline=65;endline=70;md5=64474f2b22e9e77b28d8b8b25c983a48" DEPENDS = "libogg" -SRC_URI = "http://downloads.xiph.org/releases/flac/${BP}.tar.xz \ - file://0001-Fix-Makefile.am-altivec-logic.patch \ - " +SRC_URI = "http://downloads.xiph.org/releases/flac/${BP}.tar.xz" -SRC_URI[md5sum] = "13b5c214cee8373464d3d65dee362cdd" -SRC_URI[sha256sum] = "fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc" +SRC_URI[md5sum] = "b9922c9a0378c88d3e901b234f852698" +SRC_URI[sha256sum] = "4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c" -inherit autotools-brokensep gettext +inherit autotools gettext EXTRA_OECONF = "--disable-oggtest \ --with-ogg-libraries=${STAGING_LIBDIR} \ diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-huffyuvdec-check-width-more-completely-avoid-out-of-.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-huffyuvdec-check-width-more-completely-avoid-out-of-.patch deleted file mode 100644 index 6b60d163fb..0000000000 --- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-huffyuvdec-check-width-more-completely-avoid-out-of-.patch +++ /dev/null @@ -1,30 +0,0 @@ -gst-ffmpeg: huffyuvdec: check width more completely, avoid out of array - accesses - -Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind - -Upstream-Status: Backport - -Signed-off-by: Michael Niedermayer <michaelni@gmx.at> ---- - libavcodec/huffyuv.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c -index 6e88114..ca5bcd8 100644 ---- a/gst-libs/ext/libav/libavcodec/huffyuv.c -+++ b/gst-libs/ext/libav/libavcodec/huffyuv.c -@@ -526,6 +526,10 @@ s->bgr32=1; - assert(0); - } - -+ if (s->predictor == MEDIAN && avctx->pix_fmt == AV_PIX_FMT_YUV422P && avctx->width%4) { -+ av_log(avctx, AV_LOG_ERROR, "width must be a multiple of 4 this colorspace and predictor\n"); -+ return AVERROR_INVALIDDATA; -+ } - alloc_temp(s); - - // av_log(NULL, AV_LOG_DEBUG, "pred:%d bpp:%d hbpp:%d il:%d\n", s->predictor, s->bitstream_bpp, avctx->bits_per_coded_sample, s->interlaced); --- -1.7.5.4 - diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav-9.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav-9.patch index 9055b341dc..1860752202 100644 --- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav-9.patch +++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav-9.patch @@ -111,7 +111,7 @@ diff -uNr gst-ffmpeg-0.10.13.orig/ext/ffmpeg/gstffmpegcodecmap.c gst-ffmpeg-0.10 #include <gst/gst.h> #ifdef HAVE_FFMPEG_UNINSTALLED #include <avcodec.h> -+#include <channel_layout.h>> ++#include <channel_layout.h> #else #include <libavcodec/avcodec.h> +#include <libavutil/channel_layout.h> diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb index 30e5deb1f9..b5c838f9ea 100644 --- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb +++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb @@ -12,9 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" LICENSE_FLAGS = "commercial" HOMEPAGE = "http://www.gstreamer.net/" -DEPENDS = "gstreamer gst-plugins-base zlib bzip2 yasm-native" +DEPENDS = "gstreamer gst-plugins-base zlib bzip2 yasm-native libpostproc" -inherit autotools pkgconfig +inherit autotools-brokensep pkgconfig SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \ file://lower-rank.diff \ @@ -46,7 +46,6 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0001-avcodec-rpza-Perform-pointer-advance-and-checks-befo.patch \ file://gst-ffmpeg-CVE-2013-0855.patch \ file://0001-qdm2dec-fix-buffer-overflow.patch \ - file://0001-huffyuvdec-check-width-more-completely-avoid-out-of-.patch \ file://0001-smackerdec-Check-that-the-last-indexes-are-within-th.patch \ file://0001-avcodec-dsputil-fix-signedness-in-sizeof-comparissio.patch \ file://0001-error-concealment-initialize-block-index.patch \ @@ -57,7 +56,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0001-h264-skip-error-concealment-when-SPS-and-slices-are-.patch \ file://0001-avcodec-smc-fix-off-by-1-error.patch \ file://0002-avcodec-mjpegdec-check-bits-per-pixel-for-changes-si.patch \ - ${@bb.utils.contains('PACKAGECONFIG', 'libav9', 'file://libav-9.patch', '', d)} \ + file://libav-9.patch \ " SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4" @@ -84,7 +83,6 @@ EXTRA_OECONF = "${FFMPEG_EXTRA_CONFIGURE_COMMON}" PACKAGECONFIG ??= "external-libav" PACKAGECONFIG[external-libav] = "--with-system-ffmpeg,,libav" PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" -PACKAGECONFIG[libav9] = ",,," FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" diff --git a/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.19.bb b/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.31.bb index 9e68288844..1e2cd2a4ab 100644 --- a/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.19.bb +++ b/meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.31.bb @@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=259a43dd1c9854b71fc396f74699f4d2" LICENSE_FLAGS = "commercial" GSTREAMER_DEBUG ?= "--disable-debug" -EXTRA_OECONF += "${GSTREAMER_DEBUG}" +EXTRA_OECONF += "${GSTREAMER_DEBUG} --with-gstreamer-api=0.10" acpaths = "-I ${S}/common/m4 -I ${S}/m4" -SRC_URI[md5sum] = "5d95a9a216dd15bc5c00c9414061115c" -SRC_URI[sha256sum] = "30c79d24d8926f75dd4ef0f572942ce155ad541734b36a95591b9c0524dcc0f3" +SRC_URI[md5sum] = "adf0390f3416bb72f91c358528be0c38" +SRC_URI[sha256sum] = "dae0d0559a4e159c0dd92b7e18de059a5783f8d038904c7de4ca6393f7d55c7d" diff --git a/meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.72.bb b/meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.85.bb index f79015403b..7bba41a341 100644 --- a/meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.72.bb +++ b/meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.85.bb @@ -1,6 +1,6 @@ require gst-fluendo.inc -SUMMARY = "Fluendo closed-format mpeg video GStreamer plug-in" +SUMMARY = "Fluendo MPEG Transport Stream and Program Stream demuxer for GStreamer" LICENSE = "MPLv1.1" LIC_FILES_CHKSUM = "file://COPYING;md5=be282f1c3cc9a98cc0dc5c2b25dfc510 \ file://src/gstmpegdemux.h;beginline=1;endline=19;md5=a9e90033f59897b91664d9f2a2ff01dd" @@ -8,5 +8,5 @@ LICENSE_FLAGS = "commercial" acpaths = "-I ${S}/common/m4 -I ${S}/m4" -SRC_URI[md5sum] = "df726579404af65b9536428661ab4322" -SRC_URI[sha256sum] = "a9784bc16352d0fb73de81b9c17142609e8bede46f6d9b881fc3d19673954abf" +SRC_URI[md5sum] = "7c4fb993f80b9ae631b11897733f0970" +SRC_URI[sha256sum] = "df04c91cc8e5d9a892c2492ed989974b4547beaa2a3647649e85113317897424" diff --git a/meta/recipes-multimedia/gstreamer/gst-fluendo.inc b/meta/recipes-multimedia/gstreamer/gst-fluendo.inc index feaf1c7c62..7a77d624f2 100644 --- a/meta/recipes-multimedia/gstreamer/gst-fluendo.inc +++ b/meta/recipes-multimedia/gstreamer/gst-fluendo.inc @@ -1,7 +1,7 @@ SUMMARY = "Fluendo closed-format GStreamer plug-in" SECTION = "multimedia" -HOMEPAGE = "http://www.fluendo.com/resources/source-plugins.php" -DEPENDS = "gstreamer zlib" +HOMEPAGE = "https://core.fluendo.com/gstreamer/trac/wiki" +DEPENDS = "gstreamer gst-plugins-base zlib" inherit autotools pkgconfig diff --git a/meta/recipes-multimedia/gstreamer/gst-player/Add-error-signal-emission-for-missing-plugins.patch b/meta/recipes-multimedia/gstreamer/gst-player/Add-error-signal-emission-for-missing-plugins.patch new file mode 100644 index 0000000000..712d46daa0 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-player/Add-error-signal-emission-for-missing-plugins.patch @@ -0,0 +1,252 @@ +From d64c7edb66f4a64ff49c4306cf77fd269b7079ab Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Mon, 16 Mar 2015 13:45:30 +0200 +Subject: [PATCH] Add error signal emission for missing plugins + +Add a missing plugins error signal to gst-player. Note that this error +does not necessarily mean the playback has completely failed, but in +practice the user experience will be bad (think, e.g. of a mp4 file +where H.264 codec is missing: AAC playback still works...). + +Use the signal in gtk-play to show a infobar if plugins are missing. + +Submitted upstream at https://github.com/sdroege/gst-player/pull/11 + +Upstream-Status: Submitted +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + configure.ac | 2 +- + gtk/gtk-play.c | 54 +++++++++++++++++++++++++++++++++++++++++++++- + lib/gst/player/gstplayer.c | 22 +++++++++++++++++++ + lib/gst/player/gstplayer.h | 3 ++- + 4 files changed, 78 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 90ab74c..6cdb4eb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -53,7 +53,7 @@ AC_SUBST(LT_AGE) + PKG_PROG_PKG_CONFIG + + PKG_CHECK_MODULES(GLIB, [glib-2.0 gobject-2.0]) +-PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0 >= 1.4 gstreamer-video-1.0 >= 1.4]) ++PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0 >= 1.4 gstreamer-video-1.0 >= 1.4 gstreamer-pbutils-1.0]) + + GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" + AC_SUBST(GLIB_PREFIX) +diff --git a/gtk/gtk-play.c b/gtk/gtk-play.c +index b92773b..e2b605a 100644 +--- a/gtk/gtk-play.c ++++ b/gtk/gtk-play.c +@@ -30,6 +30,8 @@ typedef struct + GtkWidget *prev_button, *next_button; + GtkWidget *seekbar; + GtkWidget *video_area; ++ GtkWidget *info_label; ++ GtkWidget *info_bar; + GtkWidget *volume_button; + gulong seekbar_value_changed_signal_id; + gboolean playing; +@@ -141,6 +143,13 @@ play_pause_clicked_cb (GtkButton * button, GtkPlay * play) + } + + static void ++clear_missing_plugins (GtkPlay * play) ++{ ++ gtk_label_set_text (GTK_LABEL (play->info_label), ""); ++ gtk_widget_hide (play->info_bar); ++} ++ ++static void + skip_prev_clicked_cb (GtkButton * button, GtkPlay * play) + { + GList *prev; +@@ -155,6 +164,7 @@ skip_prev_clicked_cb (GtkButton * button, GtkPlay * play) + + gtk_widget_set_sensitive (play->next_button, TRUE); + gst_player_set_uri (play->player, prev->data); ++ clear_missing_plugins (play); + gst_player_play (play->player); + set_title (play, prev->data); + gtk_widget_set_sensitive (play->prev_button, g_list_previous (prev) != NULL); +@@ -175,6 +185,7 @@ skip_next_clicked_cb (GtkButton * button, GtkPlay * play) + + gtk_widget_set_sensitive (play->prev_button, TRUE); + gst_player_set_uri (play->player, next->data); ++ clear_missing_plugins (play); + gst_player_play (play->player); + set_title (play, next->data); + gtk_widget_set_sensitive (play->next_button, g_list_next (next) != NULL); +@@ -193,10 +204,16 @@ volume_changed_cb (GtkScaleButton * button, gdouble value, GtkPlay * play) + gst_player_set_volume (play->player, value); + } + ++void ++info_bar_response_cb (GtkInfoBar * bar, gint response, GtkPlay * play) ++{ ++ gtk_widget_hide (GTK_WIDGET (bar)); ++} ++ + static void + create_ui (GtkPlay * play) + { +- GtkWidget *controls, *main_hbox, *main_vbox; ++ GtkWidget *controls, *main_hbox, *main_vbox, *info_bar, *content_area; + + play->window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + g_signal_connect (G_OBJECT (play->window), "delete-event", +@@ -208,6 +225,20 @@ create_ui (GtkPlay * play) + g_signal_connect (play->video_area, "realize", + G_CALLBACK (video_area_realize_cb), play); + ++ play->info_bar = gtk_info_bar_new (); ++ gtk_info_bar_set_message_type (GTK_INFO_BAR (play->info_bar), ++ GTK_MESSAGE_WARNING); ++ //gtk_info_bar_set_show_close_button (GTK_INFO_BAR (play->info_bar), ++ // TRUE); ++ gtk_widget_set_no_show_all (play->info_bar, TRUE); ++ g_signal_connect (play->info_bar, "response", ++ G_CALLBACK (info_bar_response_cb), play); ++ ++ content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (play->info_bar)); ++ play->info_label = gtk_label_new (""); ++ gtk_container_add (GTK_CONTAINER (content_area), play->info_label); ++ gtk_widget_show (play->info_label); ++ + /* Unified play/pause button */ + play->play_pause_button = + gtk_button_new_from_icon_name ("media-playback-pause", +@@ -258,6 +289,7 @@ create_ui (GtkPlay * play) + + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_pack_start (GTK_BOX (main_vbox), main_hbox, TRUE, TRUE, 0); ++ gtk_box_pack_start (GTK_BOX (main_vbox), play->info_bar, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (main_vbox), controls, FALSE, FALSE, 0); + gtk_container_add (GTK_CONTAINER (play->window), main_vbox); + +@@ -322,6 +354,7 @@ eos_cb (GstPlayer * unused, GtkPlay * play) + gtk_widget_set_sensitive (play->next_button, g_list_next (next) != NULL); + + gst_player_set_uri (play->player, next->data); ++ clear_missing_plugins (play); + gst_player_play (play->player); + set_title (play, next->data); + } else { +@@ -330,6 +363,24 @@ eos_cb (GstPlayer * unused, GtkPlay * play) + } + } + ++static void ++error_cb (GstPlayer * player, GError * err, GtkPlay * play) ++{ ++ char *message; ++ ++ if (g_error_matches (err, gst_player_error_quark (), ++ GST_PLAYER_ERROR_MISSING_PLUGIN)) { ++ // add message to end of any existing message: there may be ++ // multiple missing plugins. ++ message = g_strdup_printf ("%s%s. ", ++ gtk_label_get_text (GTK_LABEL (play->info_label)), err->message); ++ gtk_label_set_text (GTK_LABEL (play->info_label), message); ++ g_free (message); ++ ++ gtk_widget_show (play->info_bar); ++ } ++} ++ + int + main (gint argc, gchar ** argv) + { +@@ -422,6 +473,7 @@ main (gint argc, gchar ** argv) + g_signal_connect (play.player, "video-dimensions-changed", + G_CALLBACK (video_dimensions_changed_cb), &play); + g_signal_connect (play.player, "end-of-stream", G_CALLBACK (eos_cb), &play); ++ g_signal_connect (play.player, "error", G_CALLBACK (error_cb), &play); + + /* We have file(s) that need playing. */ + set_title (&play, g_list_first (play.uris)->data); +diff --git a/lib/gst/player/gstplayer.c b/lib/gst/player/gstplayer.c +index bd682d9..78e7ba1 100644 +--- a/lib/gst/player/gstplayer.c ++++ b/lib/gst/player/gstplayer.c +@@ -47,6 +47,7 @@ + + #include <gst/gst.h> + #include <gst/video/video.h> ++#include <gst/pbutils/missing-plugins.h> + + GST_DEBUG_CATEGORY_STATIC (gst_player_debug); + #define GST_CAT_DEFAULT gst_player_debug +@@ -238,6 +239,7 @@ gst_player_class_init (GstPlayerClass * klass) + g_signal_new ("video-dimensions-changed", G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, 0, NULL, + NULL, NULL, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); ++ + } + + static void +@@ -619,6 +621,21 @@ error_cb (GstBus * bus, GstMessage * msg, gpointer user_data) + g_mutex_unlock (&self->priv->lock); + } + ++static void ++element_cb (GstBus * bus, GstMessage * msg, gpointer user_data) ++{ ++ GstPlayer *self = GST_PLAYER (user_data); ++ ++ if (gst_is_missing_plugin_message (msg)) { ++ gchar *desc; ++ ++ desc = gst_missing_plugin_message_get_description (msg); ++ emit_error (self, g_error_new (GST_PLAYER_ERROR, ++ GST_PLAYER_ERROR_MISSING_PLUGIN, "Missing plugin '%s'", desc)); ++ g_free (desc); ++ } ++} ++ + static gboolean + eos_dispatch (gpointer user_data) + { +@@ -1059,6 +1076,8 @@ gst_player_main (gpointer data) + NULL, NULL); + g_source_attach (bus_source, self->priv->context); + ++ g_signal_connect (G_OBJECT (bus), "message::element", ++ G_CALLBACK (element_cb), self); + g_signal_connect (G_OBJECT (bus), "message::error", G_CALLBACK (error_cb), + self); + g_signal_connect (G_OBJECT (bus), "message::eos", G_CALLBACK (eos_cb), self); +@@ -1560,6 +1579,7 @@ gst_player_error_get_type (void) + static gsize id = 0; + static const GEnumValue values[] = { + {C_ENUM (GST_PLAYER_ERROR_FAILED), "GST_PLAYER_ERROR_FAILED", "failed"}, ++ {C_ENUM (GST_PLAYER_ERROR_MISSING_PLUGIN), "GST_PLAYER_ERROR_MISSING_PLUGIN", "missing-plugin"}, + {0, NULL, NULL} + }; + +@@ -1577,6 +1597,8 @@ gst_player_error_get_name (GstPlayerError error) + switch (error) { + case GST_PLAYER_ERROR_FAILED: + return "failed"; ++ case GST_PLAYER_ERROR_MISSING_PLUGIN: ++ return "missing-plugin"; + } + + g_assert_not_reached (); +diff --git a/lib/gst/player/gstplayer.h b/lib/gst/player/gstplayer.h +index c438513..35fb5bb 100644 +--- a/lib/gst/player/gstplayer.h ++++ b/lib/gst/player/gstplayer.h +@@ -44,7 +44,8 @@ GType gst_player_error_get_type (void); + #define GST_TYPE_PLAYER_ERROR (gst_player_error_get_type ()) + + typedef enum { +- GST_PLAYER_ERROR_FAILED = 0 ++ GST_PLAYER_ERROR_FAILED = 0, ++ GST_PLAYER_ERROR_MISSING_PLUGIN + } GstPlayerError; + + const gchar *gst_player_error_get_name (GstPlayerError error); +-- +2.1.4 + diff --git a/meta/recipes-multimedia/gstreamer/gst-player/Fix-pause-play.patch b/meta/recipes-multimedia/gstreamer/gst-player/Fix-pause-play.patch new file mode 100644 index 0000000000..783c42ad70 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-player/Fix-pause-play.patch @@ -0,0 +1,107 @@ +Fix pause/play + +The current player state is now notified via the state-changed signal, +and in the GTK UI it was only used to keep track of the desired state. + +This is a backport of upstream commit 738479c7a0. + +Upstream-Status: Backport +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> + +--- + gtk/gtk-play.c | 8 ++++++-- + lib/gst/player/gstplayer.c | 12 ------------ + lib/gst/player/gstplayer.h | 2 -- + 3 files changed, 6 insertions(+), 16 deletions(-) + +diff --git a/gtk/gtk-play.c b/gtk/gtk-play.c +index 6e7a098..e2b605a 100644 +--- a/gtk/gtk-play.c ++++ b/gtk/gtk-play.c +@@ -34,6 +34,7 @@ typedef struct + GtkWidget *info_bar; + GtkWidget *volume_button; + gulong seekbar_value_changed_signal_id; ++ gboolean playing; + } GtkPlay; + + /* Compat stubs */ +@@ -118,12 +119,13 @@ play_pause_clicked_cb (GtkButton * button, GtkPlay * play) + { + GtkWidget *image; + +- if (gst_player_is_playing (play->player)) { ++ if (play->playing) { + gst_player_pause (play->player); + image = + gtk_image_new_from_icon_name ("media-playback-start", + GTK_ICON_SIZE_BUTTON); + gtk_button_set_image (GTK_BUTTON (play->play_pause_button), image); ++ play->playing = FALSE; + } else { + gchar *title; + +@@ -136,6 +138,7 @@ play_pause_clicked_cb (GtkButton * button, GtkPlay * play) + title = gst_player_get_uri (play->player); + set_title (play, title); + g_free (title); ++ play->playing = TRUE; + } + } + +@@ -335,7 +338,7 @@ video_dimensions_changed_cb (GstPlayer * unused, gint width, gint height, + static void + eos_cb (GstPlayer * unused, GtkPlay * play) + { +- if (gst_player_is_playing (play->player)) { ++ if (play->playing) { + GList *next = NULL; + gchar *uri; + +@@ -452,6 +455,7 @@ main (gint argc, gchar ** argv) + } + + play.player = gst_player_new (); ++ play.playing = TRUE; + + g_object_set (play.player, "dispatch-to-main-context", TRUE, NULL); + +diff --git a/lib/gst/player/gstplayer.c b/lib/gst/player/gstplayer.c +index 069b284..78e7ba1 100644 +--- a/lib/gst/player/gstplayer.c ++++ b/lib/gst/player/gstplayer.c +@@ -1422,18 +1422,6 @@ gst_player_set_uri (GstPlayer * self, const gchar * val) + g_object_set (self, "uri", val, NULL); + } + +-gboolean +-gst_player_is_playing (GstPlayer * self) +-{ +- gboolean val; +- +- g_return_val_if_fail (GST_IS_PLAYER (self), FALSE); +- +- g_object_get (self, "is-playing", &val, NULL); +- +- return val; +-} +- + GstClockTime + gst_player_get_position (GstPlayer * self) + { +diff --git a/lib/gst/player/gstplayer.h b/lib/gst/player/gstplayer.h +index 6933dd7..35fb5bb 100644 +--- a/lib/gst/player/gstplayer.h ++++ b/lib/gst/player/gstplayer.h +@@ -93,8 +93,6 @@ gchar * gst_player_get_uri (GstPlayer * player); + void gst_player_set_uri (GstPlayer * player, + const gchar * uri); + +-gboolean gst_player_is_playing (GstPlayer * player); +- + GstClockTime gst_player_get_position (GstPlayer * player); + GstClockTime gst_player_get_duration (GstPlayer * player); + +-- +2.1.4 + diff --git a/meta/recipes-multimedia/gstreamer/gst-player/filechooser.patch b/meta/recipes-multimedia/gstreamer/gst-player/filechooser.patch new file mode 100644 index 0000000000..7bf1b034b3 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-player/filechooser.patch @@ -0,0 +1,54 @@ +Upstream-Status: Submitted +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From 43d4b19ab611d844156e26c4840cc54ddb73ae03 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Thu, 26 Feb 2015 17:17:05 +0000 +Subject: [PATCH] gtk-play: show a file chooser if no URIs were passed + +--- + gtk/gtk-play.c | 28 ++++++++++++++++++++++++++-- + 1 file changed, 26 insertions(+), 2 deletions(-) + +diff --git a/gtk/gtk-play.c b/gtk/gtk-play.c +index f015077..9766a72 100644 +--- a/gtk/gtk-play.c ++++ b/gtk/gtk-play.c +@@ -319,8 +319,32 @@ main (gint argc, gchar ** argv) + // FIXME: Add support for playlists and stuff + /* Parse the list of the file names we have to play. */ + if (!file_names) { +- g_print ("Usage: %s FILE(s)|URI(s)\n", APP_NAME); +- return 1; ++ GtkWidget *chooser; ++ int res; ++ ++ chooser = gtk_file_chooser_dialog_new ("Select files to play", NULL, ++ GTK_FILE_CHOOSER_ACTION_OPEN, ++ "_Cancel", GTK_RESPONSE_CANCEL, ++ "_Open", GTK_RESPONSE_ACCEPT, ++ NULL); ++ g_object_set (chooser, ++ "local-only", FALSE, ++ "select-multiple", TRUE, ++ NULL); ++ ++ res = gtk_dialog_run (GTK_DIALOG (chooser)); ++ if (res == GTK_RESPONSE_ACCEPT) { ++ GSList *l; ++ ++ l = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (chooser)); ++ while (l) { ++ play.uris = g_list_append (play.uris, l->data); ++ l = g_slist_delete_link (l, l); ++ } ++ } else { ++ return 0; ++ } ++ gtk_widget_destroy (chooser); + } else { + guint i; + +-- +1.7.10.4 + diff --git a/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop b/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop new file mode 100644 index 0000000000..9fd207b384 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Media Player +Comment=Basic media player +Icon=audio-player +TryExec=gtk-play +Exec=gtk-play +StartupNotify=true +Terminal=false +Type=Application +Categories=GTK;AudioVideo; diff --git a/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch b/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch new file mode 100644 index 0000000000..2cd18bbc95 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch @@ -0,0 +1,71 @@ +As the rest of Sato is GTK+ 2, patch gtk-play to use GTK+ 2. When the rest of +Sato has been ported to GTK+ 3 this patch can be dropped. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@intel.com> + + +diff --git a/configure.ac b/configure.ac +index b8af13b..90ab74c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -60,7 +60,7 @@ AC_SUBST(GLIB_PREFIX) + GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-1.0`" + AC_SUBST(GST_PREFIX) + +-PKG_CHECK_MODULES(GTK, [gtk+-3.0], [have_gtk="yes"], [have_gtk="no"]) ++PKG_CHECK_MODULES(GTK, [gtk+-2.0], [have_gtk="yes"], [have_gtk="no"]) + AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" != "xno") + + GOBJECT_INTROSPECTION_CHECK([1.31.1]) +diff --git a/gtk/gtk-play.c b/gtk/gtk-play.c +index f015077..954d6fb 100644 +--- a/gtk/gtk-play.c ++++ b/gtk/gtk-play.c +@@ -34,6 +34,46 @@ typedef struct + gulong seekbar_value_changed_signal_id; + } GtkPlay; + ++/* Compat stubs */ ++GtkWidget * ++gtk_box_new (GtkOrientation orientation, ++ gint spacing) ++{ ++ switch (orientation) { ++ case GTK_ORIENTATION_HORIZONTAL: ++ return gtk_hbox_new (FALSE, spacing); ++ case GTK_ORIENTATION_VERTICAL: ++ return gtk_vbox_new (FALSE, spacing); ++ } ++} ++ ++GtkWidget* ++gtk_button_new_from_icon_name (const gchar *icon_name, ++ GtkIconSize size) ++{ ++ GtkWidget *button; ++ GtkWidget *image; ++ ++ image = gtk_image_new_from_icon_name (icon_name, size); ++ button = g_object_new (GTK_TYPE_BUTTON, ++ "image", image, ++ NULL); ++ return button; ++} ++ ++GtkWidget * ++gtk_scale_new_with_range (GtkOrientation orientation, ++ gdouble min, ++ gdouble max, ++ gdouble step) ++{ ++ switch (orientation) { ++ case GTK_ORIENTATION_HORIZONTAL: ++ return gtk_hscale_new_with_range (min, max, step); ++ case GTK_ORIENTATION_VERTICAL: ++ return gtk_vscale_new_with_range (min, max, step); ++ } ++} + + static void + set_title (GtkPlay * play, const gchar * title) diff --git a/meta/recipes-multimedia/gstreamer/gst-player_git.bb b/meta/recipes-multimedia/gstreamer/gst-player_git.bb new file mode 100644 index 0000000000..54cfbbc927 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-player_git.bb @@ -0,0 +1,38 @@ +SUMMARY="GStreamer playback helper library and examples" + +LICENSE = "LGPL-2.0+" +LIC_FILES_CHKSUM = "file://lib/gst/player/gstplayer.c;beginline=1;endline=19;md5=03aeca9d8295f811817909075a15ff65" + +DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gtk+" + +SRC_URI = "git://github.com/sdroege/gst-player.git \ + file://filechooser.patch \ + file://gtk2.patch \ + file://Fix-pause-play.patch \ + file://Add-error-signal-emission-for-missing-plugins.patch \ + file://gst-player.desktop" + +SRCREV = "5386c5b984d40ef5434673ed62204e69aaf52645" + +S = "${WORKDIR}/git" + +inherit autotools gtk-doc lib_package pkgconfig + +do_configure_prepend() { + touch ${S}/ChangeLog +} + +EXTRA_OECONF += "ac_cv_path_VALGRIND=no ac_cv_path_GDB=no" + +do_install_append() { + install -m 0644 -D ${WORKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop +} + +FILES_${PN}-bin += "${datadir}/applications/*.desktop" + +RDEPENDS_${PN}-bin = "gstreamer1.0-plugins-base-playback" +RRECOMMENDS_${PN}-bin = "gstreamer1.0-plugins-base-meta \ + gstreamer1.0-plugins-good-meta \ + gstreamer1.0-plugins-bad-meta \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-libav", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}" diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb index 495bb17649..af18281715 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ PR = "r8" -PACKAGECONFIG ?= "jpeg \ +PACKAGECONFIG ?= "jpeg v4l \ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ " @@ -16,7 +16,9 @@ PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" PACKAGECONFIG[gdkpixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf" -PACKAGECONFIG[v4l] = "--with-libv4l2,--without-libv4l2,libv4l" +PACKAGECONFIG[v4l] = "--enable-gst_v4l2 --with-gudev,--disable-gst_v4l2 --without-gudev,udev" +# sub-feature of v4l, but control separately since libv4l is not part of oe-core +PACKAGECONFIG[libv4l] = "--with-libv4l2,--without-libv4l2,libv4l" PACKAGECONFIG[bzip2] = "--enable-bz2,--disable-bz2,bzip2" PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" PACKAGECONFIG[x11] = "--enable-x,--disable-x,virtual/libx11 libxfixes libxdamage" @@ -42,3 +44,4 @@ SRC_URI[md5sum] = "24f98a294a2b521e1b29412bdadae2e6" SRC_URI[sha256sum] = "7e27840e40a7932ef2dc032d7201f9f41afcaf0b437daf5d1d44dc96d9e35ac6" FILES_${PN}-gconfelements += "${sysconfdir}/gconf/schemas/gstreamer-0.10.schemas" +FILES_${PN}-equalizer += "${datadir}/gstreamer-0.10/presets/*.prs" diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc index 7bb567866f..cb1be06d09 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc @@ -7,7 +7,7 @@ python split_gstreamer10_packages () { glibdir = d.getVar('libdir', True) do_split_packages(d, glibdir, '^lib(.*)\.so\.*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True) - do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', d.expand('${PN}-%s'), 'GStreamer plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) + do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', d.expand('${PN}-%s'), 'GStreamer plugin for %s', postinst=postinst, extra_depends='') do_split_packages(d, gst_libdir, 'libgst(.*)\.la$', d.expand('${PN}-%s-dev'), 'GStreamer plugin for %s (development files)', extra_depends=d.expand('${PN}-dev')) do_split_packages(d, gst_libdir, 'libgst(.*)\.a$', d.expand('${PN}-%s-staticdev'), 'GStreamer plugin for %s (static development files)', extra_depends=d.expand('${PN}-staticdev')) } @@ -40,8 +40,7 @@ python set_metapkg_rdepends () { d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package') } -# metapkg has runtime dependency on PN -# each plugin depends on PN, plugin-dev on PN-dev, plugin-staticdev on PN-staticdev +# each plugin-dev depends on PN-dev, plugin-staticdev on PN-staticdev # so we need them even when empty (like in gst-plugins-good case) ALLOW_EMPTY_${PN} = "1" ALLOW_EMPTY_${PN}-dev = "1" @@ -51,8 +50,9 @@ PACKAGES += "${PN}-apps ${PN}-meta ${PN}-glib" FILES_${PN}-apps = "${bindir}" RDEPENDS_${PN}-apps += "perl" +RRECOMMENDS_${PN} += "${PN}-meta" -FILES_${PN} = "${datadir}/gstreamer-${LIBV}" +FILES_${PN} = "" FILES_${PN}-dbg += "${libdir}/gstreamer-${LIBV}/.debug" FILES_${PN}-glib = "${datadir}/glib-2.0" diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc index 26976092d6..c852c53fa9 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc +++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc @@ -19,10 +19,10 @@ require gst-plugins-package.inc PACKAGES_DYNAMIC += "^${PN}-.*" # apply gstreamer hack after Makefile.in.in in source is replaced by our version from -# ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed +# ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed # http://lists.linuxtogo.org/pipermail/openembedded-core/2012-November/032233.html -oe_runconf_prepend() { +oe_runconf_prepend() { if [ -e ${S}/po/Makefile.in.in ]; then sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in fi -} +} diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb index 8bba8312bc..11b1cfb08d 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.4.5.bb @@ -3,7 +3,7 @@ include gstreamer1.0-libav.inc LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \ - file://gst-libs/ext/libav/LICENSE;md5=df1087a33b5cafe5e70b3452aac81515 \ + file://gst-libs/ext/libav/LICENSE;md5=ea66e97a7ac1db978cf3529068a8c948 \ file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ @@ -13,12 +13,14 @@ SRC_URI = " \ http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \ file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \ " -SRC_URI[md5sum] = "ea2d636c24d7c5ae123967ef22e37c07" -SRC_URI[sha256sum] = "fc125521187fa84f3210269a0eecc51f8a856802f1ca4bb251f118dab90c5a9d" +SRC_URI[md5sum] = "f4922a46adbcbe7bd01331ff5dc7979d" +SRC_URI[sha256sum] = "605c62624604f3bb5c870844cc1f2711779cc533b004c2aa1d8c0d58557afbbc" + LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \ --ranlib='${RANLIB}' \ - ${GSTREAMER_1_0_DEBUG}" + ${GSTREAMER_1_0_DEBUG} \ + --cross-prefix='${HOST_PREFIX}'" S = "${WORKDIR}/gst-libav-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb index b0e6b2ecb8..bf1b87e6de 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb @@ -18,7 +18,8 @@ SRCREV = "127202d6f65584891dabf92be031f0d170b0e7f1" LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \ - ${GSTREAMER_1_0_DEBUG}" + ${GSTREAMER_1_0_DEBUG} \ + --cross-prefix='${HOST_PREFIX}'" do_configure_prepend() { cd ${S} diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb index 931a7fcc96..99c84668ef 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb @@ -6,12 +6,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://omx/gstomx.h;beginline=1;endline=21;md5=5c8e1fca32704488e76d2ba9ddfa935f" SRC_URI = " \ - git://anongit.freedesktop.org/gstreamer/gst-omx;branch=master \ - file://0001-omx-fixed-type-error-in-printf-call.patch \ + git://anongit.freedesktop.org/gstreamer/gst-omx;branch=master;name=gst-omx \ + git://anongit.freedesktop.org/gstreamer/common;destsuffix=git/common;branch=master;name=common \ + file://0001-omx-fixed-type-error-in-printf-call.patch \ " + S = "${WORKDIR}/git" -SRCREV = "a2db76b048db278ef0aa798e106b7594264e06c0" +SRCREV_gst-omx = "a2db76b048db278ef0aa798e106b7594264e06c0" +SRCREV_common = "5edcd857b2107cd8b78c16232dd10877513ec157" + +SRCREV_FORMAT = "gst-omx" do_configure_prepend() { cd ${S} diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc index dab0bf54a6..e2752af612 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc @@ -9,7 +9,7 @@ S = "${WORKDIR}/gst-plugins-bad-${PV}" SRC_URI += "file://configure-allow-to-disable-libssh2.patch \ " -inherit gettext +inherit gettext bluetooth # opengl packageconfig factored out to make it easy for distros # and BSP layers to pick either (desktop) opengl, gles2, or no GL @@ -49,7 +49,7 @@ PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2" PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth" PACKAGECONFIG[schroedinger] = "--enable-schro,--disable-schro,schroedinger" PACKAGECONFIG[smoothstreaming] = "--enable-smoothstreaming,--disable-smoothstreaming,libxml2" -PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4" +PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,${BLUEZ}" PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg" PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1" PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" @@ -80,6 +80,7 @@ EXTRA_OECONF += " \ --disable-apple_media \ --disable-avc \ --disable-chromaprint \ + --disable-cocoa \ --disable-daala \ --disable-dc1394 \ --disable-direct3d \ @@ -126,6 +127,7 @@ EXTRA_OECONF += " \ --disable-xvid \ --disable-zbar \ ${GSTREAMER_1_0_ORC} \ + ${@bb.utils.contains("TUNE_FEATURES", "mx32", "--disable-yadif", "", d)} \ " ARM_INSTRUCTION_SET = "arm" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.5.bb index f0116c08a1..59065de811 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.5.bb @@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \ SRC_URI += "file://0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch" -SRC_URI[md5sum] = "20cb190b18dc63017326321cdb7c91e5" -SRC_URI[sha256sum] = "0268db2faaf0bb22e5b709a11633abbca4f3d289b1f513bb262d0bf3f53e19ae" +SRC_URI[md5sum] = "e0bb39412cf4a48fe0397bcf3a7cd451" +SRC_URI[sha256sum] = "152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c" + S = "${WORKDIR}/gst-plugins-bad-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb index 75859f9a89..309505f7db 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb @@ -11,7 +11,6 @@ S = "${WORKDIR}/git" SRCREV = "6e5db57d2446a753aaa76bee268e1f95600b14ce" -PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4" PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc" PACKAGECONFIG[hls] = "--enable-hls,--disable-hls,gnutls" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc index 972ff18160..06eac67be7 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc @@ -35,6 +35,6 @@ EXTRA_OECONF += " \ ${GSTREAMER_1_0_ORC} \ " -FILES_${PN} += "${datadir}/gst-plugins-base" +FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" CACHED_CONFIGUREVARS_append_i586 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/taglist-not-send-to-down-stream-if-all-the-frame-cor.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/taglist-not-send-to-down-stream-if-all-the-frame-cor.patch new file mode 100644 index 0000000000..51fdc7e177 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/taglist-not-send-to-down-stream-if-all-the-frame-cor.patch @@ -0,0 +1,57 @@ +From 68fa1b1425ad2c5f7c5013d0943153a8a6d0934e Mon Sep 17 00:00:00 2001 +From: Jian Li <lj.qfy.sh@gmail.com> +Date: Wed, 24 Sep 2014 17:21:02 +0800 +Subject: [PATCH] taglist not send to down stream if all the frame corrupted + +https://bugzilla.gnome.org/show_bug.cgi?id=737246 + +Upstream status: Pending + +Signed-off-by: Jian Li <lj.qfy.sh@gmail.com> +--- + gst-libs/gst/audio/gstaudiodecoder.c | 9 +++++++++ + gst-libs/gst/video/gstvideodecoder.c | 8 ++++++++ + 2 files changed, 17 insertions(+) + +diff --git a/gst-libs/gst/audio/gstaudiodecoder.c b/gst-libs/gst/audio/gstaudiodecoder.c +index 3504678..3d69efe 100644 +--- a/gst-libs/gst/audio/gstaudiodecoder.c ++++ b/gst-libs/gst/audio/gstaudiodecoder.c +@@ -2083,6 +2083,15 @@ gst_audio_decoder_sink_eventfunc (GstAudioDecoder * dec, GstEvent * event) + gst_audio_decoder_drain (dec); + GST_AUDIO_DECODER_STREAM_UNLOCK (dec); + ++ /* send taglist if no valid frame is decoded util EOS */ ++ if (dec->priv->taglist && dec->priv->taglist_changed) { ++ GST_DEBUG_OBJECT (dec, "codec tag %" GST_PTR_FORMAT, dec->priv->taglist); ++ if (!gst_tag_list_is_empty (dec->priv->taglist)) ++ gst_audio_decoder_push_event (dec, ++ gst_event_new_tag (gst_tag_list_ref (dec->priv->taglist))); ++ dec->priv->taglist_changed = FALSE; ++ } ++ + /* Forward EOS because no buffer or serialized event will come after + * EOS and nothing could trigger another _finish_frame() call. */ + ret = gst_audio_decoder_push_event (dec, event); +diff --git a/gst-libs/gst/video/gstvideodecoder.c b/gst-libs/gst/video/gstvideodecoder.c +index dd8abe3..d9bfe4d 100644 +--- a/gst-libs/gst/video/gstvideodecoder.c ++++ b/gst-libs/gst/video/gstvideodecoder.c +@@ -1024,6 +1024,14 @@ gst_video_decoder_sink_event_default (GstVideoDecoder * decoder, + * parent class' ::sink_event() until a later time. + */ + forward_immediate = TRUE; ++ ++ /* send taglist if no valid frame is decoded util EOS */ ++ if (decoder->priv->tags && decoder->priv->tags_changed) { ++ gst_video_decoder_push_event (decoder, ++ gst_event_new_tag (gst_tag_list_ref (decoder->priv->tags))); ++ decoder->priv->tags_changed = FALSE; ++ } ++ + break; + } + case GST_EVENT_GAP: +-- +1.7.9.5 + diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.4.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.4.5.bb index 0db42cec94..11cf8b4fde 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.4.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.4.5.bb @@ -7,8 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ SRC_URI += "file://do-not-change-eos-event-to-gap-event-if.patch \ file://get-caps-from-src-pad-when-query-caps.patch \ + file://taglist-not-send-to-down-stream-if-all-the-frame-cor.patch \ " -SRC_URI[md5sum] = "a825628225bd0a58c0df87cdd2a5db91" -SRC_URI[sha256sum] = "aea9e25be6691bd3cc0785d005b2b5d70ce313a2c897901680a3f7e7cab5a499" +SRC_URI[md5sum] = "357165af625c0ca353ab47c5d843920e" +SRC_URI[sha256sum] = "77bd8199e7a312d3d71de9b7ddf761a3b78560a2c2a80829d0815ca39cbd551d" + S = "${WORKDIR}/gst-plugins-base-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc index b33ab2b705..37217f004d 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc @@ -55,3 +55,4 @@ EXTRA_OECONF += " \ ${GSTREAMER_1_0_ORC} \ " +FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/decrease_asteriskh263_rank.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/decrease_asteriskh263_rank.patch new file mode 100755 index 0000000000..7f94f50760 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/decrease_asteriskh263_rank.patch @@ -0,0 +1,25 @@ +commit d71d74daac8ed54156ed103958ab455c63c72b0e +Author: Song Bing <b06498@freescale.com> +Date: Mon Nov 10 11:25:47 2014 +0800 + +[asteriskh263] decrease the rank as we havn't this kind of decoder. + +Decrease the rank as we havn't this kind of decoder. + +https://bugzilla.gnome.org/show_bug.cgi?id=739935 + +Upstream Status: Pending + +Signed-off-by: Song Bing <b06498@freescale.com> + +diff --git a/gst/rtp/gstasteriskh263.c b/gst/rtp/gstasteriskh263.c +index a01fbc8..8fa3194 100644 +--- a/gst/rtp/gstasteriskh263.c ++++ b/gst/rtp/gstasteriskh263.c +@@ -226,5 +226,5 @@ gboolean + gst_asteriskh263_plugin_init (GstPlugin * plugin) + { + return gst_element_register (plugin, "asteriskh263", +- GST_RANK_SECONDARY, GST_TYPE_ASTERISK_H263); ++ GST_RANK_SECONDARY - 1, GST_TYPE_ASTERISK_H263); + } diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.4.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.4.5.bb index 441dd51e39..943ab60397 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.4.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.4.5.bb @@ -5,8 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" SRC_URI += "file://0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch \ + file://decrease_asteriskh263_rank.patch \ " -SRC_URI[md5sum] = "eb3a3296b2f6009def1f5a09590ce767" -SRC_URI[sha256sum] = "8559d4270065b30ed5c49b826e1b7a3a2bd5ee9a340ae745a2ae3f9718e4c637" -S = "${WORKDIR}/gst-plugins-good-${PV}" +SRC_URI[md5sum] = "eaf1a6daf73749bc423feac301d60038" +SRC_URI[sha256sum] = "79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641" +S = "${WORKDIR}/gst-plugins-good-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.4.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.4.5.bb index 6d63ba62d4..25cb28c060 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.4.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.4.5.bb @@ -2,7 +2,9 @@ include gstreamer1.0-plugins-ugly.inc LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068 " -SRC_URI[md5sum] = "316974af949ca4654efee704a0164076" -SRC_URI[sha256sum] = "25440435ac4ed795d213f2420a0e7355e4a2e2e76d1f9d020b2073f815e8b071" + +SRC_URI[md5sum] = "6954beed7bb9a93e426dee543ff46393" +SRC_URI[sha256sum] = "5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067" + S = "${WORKDIR}/gst-plugins-ugly-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.4.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.4.1.bb deleted file mode 100644 index 1f34be0e8f..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.4.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include gstreamer1.0-rtsp-server.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d" - -SRC_URI[md5sum] = "e39f8643eb363611c342d87088a29aa0" -SRC_URI[sha256sum] = "10aeacc774e99d81607aeb2748c0a1c6736425b8ae3a9caf8db3cd0c4a08d06e" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.4.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.4.5.bb new file mode 100644 index 0000000000..bb9b42b53f --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.4.5.bb @@ -0,0 +1,6 @@ +include gstreamer1.0-rtsp-server.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d" + +SRC_URI[md5sum] = "a9f9b8899ec7ab33663cda7627db40d3" +SRC_URI[sha256sum] = "3089254bd31b7c1f1cf2c034a3b3551f92878f9e3cab65cef3a901a04c0f1d37" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gstinfo-Shorten-__FILE__-on-all-platforms.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gstinfo-Shorten-__FILE__-on-all-platforms.patch new file mode 100644 index 0000000000..8213c4b8b5 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gstinfo-Shorten-__FILE__-on-all-platforms.patch @@ -0,0 +1,55 @@ +From 81fecd367b016e5ac4fb0c04b84da5c474f30da6 Mon Sep 17 00:00:00 2001 +From: Peter Urbanec <git.user@urbanec.net> +Date: Fri, 27 Feb 2015 01:16:58 +1100 +Subject: [PATCH 1/1] gstinfo: Shorten __FILE__ on all platforms. + +This is useful not only for MSVC, but also with gcc/Linux when doing +cross-compilation builds and out-of-tree builds. + +Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=745213] + +Signed-off-by: Peter Urbanec <git.user@urbanec.net> +--- + gst/gstinfo.c | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/gst/gstinfo.c b/gst/gstinfo.c +index b2a3005..8b61d09 100644 +--- a/gst/gstinfo.c ++++ b/gst/gstinfo.c +@@ -444,7 +444,6 @@ gst_debug_log (GstDebugCategory * category, GstDebugLevel level, + va_end (var_args); + } + +-#ifdef G_OS_WIN32 + /* based on g_basename(), which we can't use because it was deprecated */ + static inline const gchar * + gst_path_basename (const gchar * file_name) +@@ -467,7 +466,6 @@ gst_path_basename (const gchar * file_name) + + return file_name; + } +-#endif + + /** + * gst_debug_log_valist: +@@ -497,12 +495,11 @@ gst_debug_log_valist (GstDebugCategory * category, GstDebugLevel level, + g_return_if_fail (function != NULL); + g_return_if_fail (format != NULL); + +- /* The predefined macro __FILE__ is always the exact path given to the +- * compiler with MSVC, which may or may not be the basename. We work +- * around it at runtime to improve the readability. */ +-#ifdef G_OS_WIN32 ++ /* The predefined macro __FILE__ can be an absolute path in some build ++ * environments, such as MSVC or out-of-tree cross-compiles. This may ++ * be significantly longer than the filename. We work around it at ++ * runtime to improve the readability. */ + file = gst_path_basename (file); +-#endif + + message.message = NULL; + message.format = format; +-- +2.3.0 + diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.4.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.4.5.bb index 56fc4f2083..0a2ce86343 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.4.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.4.5.bb @@ -6,8 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ SRC_URI = " \ http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ file://0001-Fix-crash-with-gst-inspect.patch \ + file://0001-gstinfo-Shorten-__FILE__-on-all-platforms.patch \ " -SRC_URI[md5sum] = "bd0938d680d657249b885162f310702d" -SRC_URI[sha256sum] = "5638f75003282135815c0077d491da11e9a884ad91d4ba6ab3cc78bae0fb452e" +SRC_URI[md5sum] = "88a9289c64a4950ebb4f544980234289" +SRC_URI[sha256sum] = "40801aa7f979024526258a0e94707ba42b8ab6f7d2206e56adbc4433155cb0ae" + S = "${WORKDIR}/gstreamer-${PV}" diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc index 5c327df386..cac836fc3f 100644 --- a/meta/recipes-multimedia/libav/libav.inc +++ b/meta/recipes-multimedia/libav/libav.inc @@ -10,12 +10,19 @@ SECTION = "libs" LICENSE = "GPLv2+" LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ + file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" + +SRC_URI = "http://libav.org/releases/${BP}.tar.xz" + # Provides ffmpeg compat, see http://libav.org/about.html PROVIDES = "ffmpeg" ARM_INSTRUCTION_SET = "arm" -DEPENDS = "zlib libogg yasm-native" +DEPENDS = "alsa-lib zlib libogg yasm-native" INC_PR = "r8" @@ -40,6 +47,7 @@ PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" PACKAGECONFIG[schroedinger] = "--enable-libschroedinger,--disable-libschroedinger,schroedinger" PACKAGECONFIG[speex] = "--enable-libspeex,--disable-libspeex,speex" PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora" +PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" PACKAGECONFIG[x11] = "--enable-x11grab,--disable-x11grab,virtual/libx11 libxfixes libxext xproto virtual/libsdl" PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" @@ -85,10 +93,8 @@ do_install_append() { install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/ } -FFMPEG_LIBS = "libavcodec libavdevice libavformat \ - libavutil libpostproc libswscale libavfilter" - PACKAGES += "${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets" +PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|swscale).*" RSUGGESTS_${PN} = "mplayer" FILES_${PN} = "${bindir}" @@ -140,5 +146,3 @@ python populate_packages_prepend() { for pkg in pkgs: d.appendVar('INSANE_SKIP_%s' % pkg, ' textrel') } - -PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util)|postproc|swscale).*" diff --git a/meta/recipes-multimedia/libav/libav/0001-configure-enable-pic-for-AArch64.patch b/meta/recipes-multimedia/libav/libav/0001-configure-enable-pic-for-AArch64.patch deleted file mode 100644 index d9b22b9b6a..0000000000 --- a/meta/recipes-multimedia/libav/libav/0001-configure-enable-pic-for-AArch64.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 58db99e98f615d79ea90cac8f4bcf11c94e3e7c7 Mon Sep 17 00:00:00 2001 -From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> -Date: Thu, 10 Jan 2013 12:42:19 +0100 -Subject: [PATCH] configure: enable pic for AArch64 - -Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> - -Upstream-Status: Backport ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- git.orig/configure -+++ git/configure -@@ -2393,7 +2393,7 @@ check_host_cflags -std=c99 - check_host_cflags -Wall - - case "$arch" in -- alpha|ia64|mips|parisc|ppc|sparc) -+ alpha|ia64|mips|parisc|ppc|sparc|aarch64) - spic=$shared - ;; - x86) diff --git a/meta/recipes-multimedia/libav/libav_0.8.15.bb b/meta/recipes-multimedia/libav/libav_0.8.15.bb deleted file mode 100644 index 18dc49a12e..0000000000 --- a/meta/recipes-multimedia/libav/libav_0.8.15.bb +++ /dev/null @@ -1,18 +0,0 @@ -require libav.inc - -SRC_URI = "http://libav.org/releases/${BP}.tar.xz \ - file://0001-configure-enable-pic-for-AArch64.patch" - -SRC_URI[md5sum] = "e483ea8f482b5ecd65ee1d09251b0a5b" -SRC_URI[sha256sum] = "495789ec547e93632937f0f36b06f4dd3180bc61518181f124af6746c6218710" - -LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \ - file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" - -PROVIDES += "libpostproc" - -EXTRA_OECONF += " \ - --enable-postproc \ -" diff --git a/meta/recipes-multimedia/libav/libav_9.16.bb b/meta/recipes-multimedia/libav/libav_9.16.bb index d0468859a9..79ff3f84d1 100644 --- a/meta/recipes-multimedia/libav/libav_9.16.bb +++ b/meta/recipes-multimedia/libav/libav_9.16.bb @@ -1,13 +1,4 @@ require libav.inc -LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ - file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" - -SRC_URI = "http://libav.org/releases/${BP}.tar.xz" - SRC_URI[md5sum] = "7b44b75cec24b8e7545e5029e76917e0" SRC_URI[sha256sum] = "ca846473b0b8ed8e3404c52e5e92df6d35cb5fa487eec498525de3ffda4367a0" - -DEFAULT_PREFERENCE = "-1" diff --git a/meta/recipes-multimedia/libav/libpostproc_git.bb b/meta/recipes-multimedia/libav/libpostproc_git.bb new file mode 100644 index 0000000000..88891db09b --- /dev/null +++ b/meta/recipes-multimedia/libav/libpostproc_git.bb @@ -0,0 +1,46 @@ +SUMMARY = "FFmpeg derived postprocessing library" +HOMEPAGE = "http://git.videolan.org/?p=libpostproc.git;a=summary" +SECTION = "libs" +DEPENDS = "libav" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +# because it depends on libav which has commercial flag +LICENSE_FLAGS = "commercial" + +PV = "52.3.0+git${SRCPV}" + +SRCREV = "811db3b957dfde24aef2d0f82e297e5bf552d873" +SRC_URI = "git://github.com/lu-zero/postproc;protocol=https" + +S = "${WORKDIR}/git" + +inherit autotools lib_package pkgconfig + +FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math" +BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" + +EXTRA_FFCONF_armv7a = "--cpu=cortex-a8" +EXTRA_FFCONF ?= "" + +EXTRA_OECONF = " \ + --enable-shared \ + --enable-pthreads \ + --enable-gpl \ + --enable-postproc \ + \ + --cross-prefix=${TARGET_PREFIX} \ + --prefix=${prefix} \ + \ + --arch=${TARGET_ARCH} \ + --target-os="linux" \ + --enable-cross-compile \ + --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ + --extra-ldflags="${TARGET_LDFLAGS}" \ + --sysroot="${STAGING_DIR_TARGET}" \ + ${EXTRA_FFCONF} \ +" + +do_configure() { + ${S}/configure ${EXTRA_OECONF} +} diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.13.bb b/meta/recipes-multimedia/libpng/libpng_1.6.13.bb deleted file mode 100644 index 0c6fd1f4f3..0000000000 --- a/meta/recipes-multimedia/libpng/libpng_1.6.13.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "PNG image format decoding library" -HOMEPAGE = "http://www.libpng.org/" -SECTION = "libs" -LICENSE = "Libpng" -LIC_FILES_CHKSUM = "file://LICENSE;md5=46401ee4b225b9ec066cb96cf1025c0f \ - file://png.h;endline=15;md5=8167a17735fc618d1df109f8b0f839a6 \ - file://png.h;beginline=229;endline=343;md5=5cdf8564a14e2f00339e4437a83b4913" -DEPENDS = "zlib" -LIBV = "16" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \ - " - -SRC_URI[md5sum] = "9822c25466f060142359f80ed142c9e5" -SRC_URI[sha256sum] = "d9c8ce54a5fc8052ed794ca65b553384a74c0608b09ae163cbbb07176018e625" - -BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config" - -inherit autotools binconfig-disabled pkgconfig - -# Work around missing symbols -EXTRA_OECONF_append_arm = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}" - -PACKAGES =+ "${PN}-tools" - -FILES_${PN}-tools = "${bindir}/png-fix-itxt ${bindir}/pngfix" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.16.bb b/meta/recipes-multimedia/libpng/libpng_1.6.16.bb new file mode 100644 index 0000000000..a8677e8a37 --- /dev/null +++ b/meta/recipes-multimedia/libpng/libpng_1.6.16.bb @@ -0,0 +1,28 @@ +SUMMARY = "PNG image format decoding library" +HOMEPAGE = "http://www.libpng.org/" +SECTION = "libs" +LICENSE = "Libpng" +LIC_FILES_CHKSUM = "file://LICENSE;md5=76dbddb73e547d9b3fa16909a98049c0 \ + file://png.h;endline=15;md5=fd8f7ae7b090a168a9e023d0a5d68a3e \ + file://png.h;beginline=229;endline=343;md5=44075eedf4763ada355d8f60ac3296c9" +DEPENDS = "zlib" +LIBV = "16" + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \ + " + +SRC_URI[md5sum] = "23b7286b5d4a86de950fd2ffc5cac742" +SRC_URI[sha256sum] = "42f754df633e4e700544e5913cbe2fd4928bbfccdc07708a5cf84e59827fbe60" + +BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config" + +inherit autotools binconfig-disabled pkgconfig + +# Work around missing symbols +EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}" + +PACKAGES =+ "${PN}-tools" + +FILES_${PN}-tools = "${bindir}/png-fix-itxt ${bindir}/pngfix" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-multimedia/pulseaudio/files/0001-libatomic_ops-Aarch64-basic-port.patch b/meta/recipes-multimedia/pulseaudio/files/0001-libatomic_ops-Aarch64-basic-port.patch new file mode 100644 index 0000000000..a563b8b022 --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/files/0001-libatomic_ops-Aarch64-basic-port.patch @@ -0,0 +1,239 @@ +From aac120d778ae5fc619b2fb8ef18ea18d3d5d20cc Mon Sep 17 00:00:00 2001 +From: Yvan Roux <yvan.roux@linaro.org> +Date: Wed, 23 Jan 2013 17:14:16 +0100 +Subject: [PATCH] Aarch64 basic port + +Adapted-for-OpenEmbedded-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> + + +Upstream-Status: Backport + +It is original from +https://github.com/ivmai/libatomic_ops/commit/cbbf86330fcb600cfe0f895cb970d922456005d6 + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/atomic_ops.h | 4 + src/atomic_ops/sysdeps/Makefile.am | 1 + src/atomic_ops/sysdeps/gcc/aarch64.h | 184 +++++++++++++++++++++++++++++++++++ + 3 files changed, 189 insertions(+) + create mode 100644 src/atomic_ops/sysdeps/gcc/aarch64.h + +--- libatomic_ops-7.2.orig/src/atomic_ops.h ++++ libatomic_ops-7.2/src/atomic_ops.h +@@ -242,10 +242,14 @@ + # endif /* __m68k__ */ + # if defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) \ + || defined(__powerpc64__) || defined(__ppc64__) + # include "atomic_ops/sysdeps/gcc/powerpc.h" + # endif /* __powerpc__ */ ++# if defined(__aarch64__) ++# include "atomic_ops/sysdeps/gcc/aarch64.h" ++# define AO_CAN_EMUL_CAS ++# endif /* __aarch64__ */ + # if defined(__arm__) && !defined(AO_USE_PTHREAD_DEFS) + # include "atomic_ops/sysdeps/gcc/arm.h" + # define AO_CAN_EMUL_CAS + # endif /* __arm__ */ + # if defined(__cris__) || defined(CRIS) +--- libatomic_ops-7.2.orig/src/atomic_ops/sysdeps/Makefile.am ++++ libatomic_ops-7.2/src/atomic_ops/sysdeps/Makefile.am +@@ -24,10 +24,11 @@ nobase_sysdep_HEADERS= generic_pthread.h + standard_ao_double_t.h \ + README \ + \ + armcc/arm_v6.h \ + \ ++ gcc/aarch64.h \ + gcc/alpha.h gcc/arm.h gcc/avr32.h gcc/cris.h \ + gcc/hexagon.h gcc/hppa.h gcc/ia64.h gcc/m68k.h \ + gcc/mips.h gcc/powerpc.h gcc/s390.h \ + gcc/sh.h gcc/sparc.h gcc/x86.h gcc/x86_64.h \ + \ +--- /dev/null ++++ libatomic_ops-7.2/src/atomic_ops/sysdeps/gcc/aarch64.h +@@ -0,0 +1,184 @@ ++/* ++ * Copyright (c) 1991-1994 by Xerox Corporation. All rights reserved. ++ * Copyright (c) 1996-1999 by Silicon Graphics. All rights reserved. ++ * Copyright (c) 1999-2003 by Hewlett-Packard Company. All rights reserved. ++ * ++ * ++ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED ++ * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. ++ * ++ * Permission is hereby granted to use or copy this program ++ * for any purpose, provided the above notices are retained on all copies. ++ * Permission to modify the code and to distribute modified code is granted, ++ * provided the above notices are retained, and a notice that the code was ++ * modified is included with the above copyright notice. ++ * ++ */ ++ ++#include "../read_ordered.h" ++ ++#include "../test_and_set_t_is_ao_t.h" ++ ++AO_INLINE void ++AO_nop_full(void) ++{ ++# ifndef AO_UNIPROCESSOR ++__sync_synchronize (); ++# endif ++} ++#define AO_HAVE_nop_full ++ ++AO_INLINE AO_t ++AO_load(const volatile AO_t *addr) ++{ ++ return __atomic_load_n (addr, __ATOMIC_RELAXED); ++} ++#define AO_HAVE_load ++ ++AO_INLINE AO_t ++AO_load_acquire(const volatile AO_t *addr) ++{ ++ return __atomic_load_n (addr, __ATOMIC_ACQUIRE); ++} ++#define AO_HAVE_load_acquire ++ ++AO_INLINE void ++ AO_store(volatile AO_t *addr, AO_t value) ++{ ++ __atomic_store_n(addr, value, __ATOMIC_RELAXED); ++} ++#define AO_HAVE_store ++ ++AO_INLINE void ++ AO_store_release(volatile AO_t *addr, AO_t value) ++{ ++ __atomic_store_n(addr, value, __ATOMIC_RELEASE); ++} ++#define AO_HAVE_store_release ++ ++AO_INLINE AO_TS_VAL_t ++AO_test_and_set(volatile AO_TS_t *addr) ++{ ++ return __atomic_test_and_set(addr, __ATOMIC_RELAXED); ++} ++# define AO_HAVE_test_and_set ++ ++AO_INLINE AO_TS_VAL_t ++AO_test_and_set_acquire(volatile AO_TS_t *addr) ++{ ++ return __atomic_test_and_set(addr, __ATOMIC_ACQUIRE); ++} ++# define AO_HAVE_test_and_set_acquire ++ ++AO_INLINE AO_TS_VAL_t ++AO_test_and_set_release(volatile AO_TS_t *addr) ++{ ++ return __atomic_test_and_set(addr, __ATOMIC_RELEASE); ++} ++# define AO_HAVE_test_and_set_release ++ ++AO_INLINE AO_TS_VAL_t ++AO_test_and_set_full(volatile AO_TS_t *addr) ++{ ++ return __atomic_test_and_set(addr, __ATOMIC_SEQ_CST); ++} ++# define AO_HAVE_test_and_set_full ++ ++AO_INLINE AO_t ++AO_fetch_and_add(volatile AO_t *p, AO_t incr) ++{ ++ return __atomic_fetch_add(p, incr, __ATOMIC_RELAXED); ++} ++#define AO_HAVE_fetch_and_add ++ ++AO_INLINE AO_t ++AO_fetch_and_add_acquire(volatile AO_t *p, AO_t incr) ++{ ++ return __atomic_fetch_add(p, incr, __ATOMIC_ACQUIRE); ++} ++#define AO_HAVE_fetch_and_add_acquire ++ ++AO_INLINE AO_t ++AO_fetch_and_add_release(volatile AO_t *p, AO_t incr) ++{ ++ return __atomic_fetch_add(p, incr, __ATOMIC_RELEASE); ++} ++#define AO_HAVE_fetch_and_add_release ++ ++AO_INLINE AO_t ++AO_fetch_and_add_full(volatile AO_t *p, AO_t incr) ++{ ++ return __atomic_fetch_add(p, incr, __ATOMIC_SEQ_CST); ++} ++#define AO_HAVE_fetch_and_add_full ++ ++AO_INLINE AO_t ++AO_fetch_and_add1(volatile AO_t *p) ++{ ++ return __atomic_fetch_add(p, 1, __ATOMIC_RELAXED); ++} ++#define AO_HAVE_fetch_and_add1 ++ ++AO_INLINE AO_t ++AO_fetch_and_add1_acquire(volatile AO_t *p) ++{ ++ return __atomic_fetch_add(p, 1, __ATOMIC_ACQUIRE); ++} ++#define AO_HAVE_fetch_and_add1_acquire ++ ++AO_INLINE AO_t ++AO_fetch_and_add1_release(volatile AO_t *p) ++{ ++ return __atomic_fetch_add(p, 1, __ATOMIC_RELEASE); ++} ++#define AO_HAVE_fetch_and_add1_release ++ ++AO_INLINE AO_t ++AO_fetch_and_add1_full(volatile AO_t *p) ++{ ++ return __atomic_fetch_add(p, 1, __ATOMIC_SEQ_CST); ++} ++#define AO_HAVE_fetch_and_add1_full ++ ++AO_INLINE AO_t ++AO_fetch_and_sub1(volatile AO_t *p) ++{ ++ return __atomic_fetch_sub(p, 1, __ATOMIC_RELAXED); ++} ++#define AO_HAVE_fetch_and_sub1 ++ ++AO_INLINE AO_t ++AO_fetch_and_sub1_acquire(volatile AO_t *p) ++{ ++ return __atomic_fetch_sub(p, 1, __ATOMIC_ACQUIRE); ++} ++#define AO_HAVE_fetch_and_sub1_acquire ++ ++AO_INLINE AO_t ++AO_fetch_and_sub1_release(volatile AO_t *p) ++{ ++ return __atomic_fetch_sub(p, 1, __ATOMIC_RELEASE); ++} ++#define AO_HAVE_fetch_and_sub1_release ++ ++AO_INLINE AO_t ++AO_fetch_and_sub1_full(volatile AO_t *p) ++{ ++ return __atomic_fetch_sub(p, 1, __ATOMIC_SEQ_CST); ++} ++#define AO_HAVE_fetch_and_sub1_full ++ ++/* Returns nonzero if the comparison succeeded. */ ++AO_INLINE int ++AO_compare_and_swap(volatile AO_t *addr, AO_t old_val, AO_t new_val) ++{ ++ return __sync_bool_compare_and_swap(addr, old_val, new_val); ++} ++# define AO_HAVE_compare_and_swap ++ ++AO_INLINE AO_t ++AO_fetch_compare_and_swap(volatile AO_t *addr, AO_t old_val, AO_t new_val) ++{ ++ return __sync_val_compare_and_swap(addr, old_val, new_val); ++} ++# define AO_HAVE_fetch_compare_and_swap diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops_7.2.bb b/meta/recipes-multimedia/pulseaudio/libatomics-ops_7.2.bb index 4632d240d2..5a582287b5 100644 --- a/meta/recipes-multimedia/pulseaudio/libatomics-ops_7.2.bb +++ b/meta/recipes-multimedia/pulseaudio/libatomics-ops_7.2.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ PR = "r1" SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-${PV}.tar.gz \ + file://0001-libatomic_ops-Aarch64-basic-port.patch \ " SRC_URI[md5sum] = "890acdc83a7cd10e2e9536062d3741c8" diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index db144a95dd..d6ddc3b609 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -5,14 +5,14 @@ SECTION = "libs/multimedia" LICENSE = "GPLv2+ & LGPLv2.1" LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \ file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://src/pulsecore/resampler.h;beginline=4;endline=23;md5=c3d539b93f8c82a1780bfa3cfa544a95" + file://src/pulsecore/resampler.h;beginline=4;endline=21;md5=09794012ae16912c0270f3280cc8ff84" -DEPENDS = "libatomics-ops liboil libsamplerate0 libsndfile1 libtool" +DEPENDS = "libatomics-ops liboil libsndfile1 libtool" # optional DEPENDS += "udev alsa-lib glib-2.0 dbus gconf" DEPENDS += "json-c gdbm speex libxml-parser-perl-native libcap" -inherit autotools pkgconfig useradd gettext perlnative +inherit autotools pkgconfig useradd gettext perlnative bluetooth systemd # *.desktop rules wont be generated during configure and build will fail # if using --disable-nls @@ -27,18 +27,20 @@ EXTRA_OECONF = "\ --disable-xen \ --with-database=simple \ --without-fftw \ + --without-zsh-completion-dir \ --with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d \ ac_cv_header_valgrind_memcheck_h=no \ " -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', d)}" PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc" PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc" +PACKAGECONFIG[ofono] = "--enable-bluez5-ofono-headset,--disable-bluez5-ofono-headset,ofono" PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" -PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" +PACKAGECONFIG[systemd] = "--enable-systemd-daemon --enable-systemd-login --enable-systemd-journal,--disable-systemd-daemon --disable-systemd-login --disable-systemd-journal,systemd" PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb" PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" @@ -57,10 +59,6 @@ OE_LT_RPATH_ALLOW[export]="1" do_install_append() { install -d ${D}${sysconfdir}/default/volatiles install -m 0644 ${WORKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse - - if [ "x${TARGET_PFPU}" = "xsoft" ] ; then - sed -i -e s:\;\ resample-method\ =\ sinc-fastest:resample-method\ =\ trivial: ${D}${sysconfdir}/pulse/daemon.conf - fi } USERADD_PACKAGES = "pulseaudio-server" @@ -79,11 +77,15 @@ PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple libpulse-mainl #upgrade path: RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf" -PACKAGES_DYNAMIC += "^pulseaudio-lib.* ^pulseaudio-module.* ^libpulse-lib.* ^libpulse-module.* " +PACKAGES_DYNAMIC += "^pulseaudio-lib-.* ^pulseaudio-module-.*" FILES_libpulsecore = "${libdir}/libpulsecore*.so" FILES_libpulsecommon = "${libdir}/pulseaudio/libpulsecommon*.so" -FILES_libpulse = "${libdir}/libpulse.so.*" + +# client.conf configures the behaviour of libpulse, so it belongs in the same +# package. +FILES_libpulse = "${libdir}/libpulse.so.* ${sysconfdir}/pulse/client.conf" + FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*" FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*" @@ -93,15 +95,21 @@ FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir} FILES_${PN}-conf = "${sysconfdir}" FILES_${PN}-bin += "${sysconfdir}/default/volatiles/volatiles.04_pulse" FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules" + +#SYSTEMD_PACKAGES = "${PN}-server" +SYSTEMD_SERVICE_${PN}-server = "pulseaudio.service" + FILES_${PN}-misc = "${bindir}/* ${libdir}/pulseaudio/libpulsedsp.so" # Allow the pulseaudio package to be created empty as a placeholder (-dbg and -dev depend on it) ALLOW_EMPTY_${PN} = "1" +CONFFILES_libpulse = "${sysconfdir}/pulse/client.conf" + CONFFILES_pulseaudio-server = "\ ${sysconfdir}/pulse/default.pa \ ${sysconfdir}/pulse/daemon.conf \ - ${sysconfdir}/pulse/client.conf \ + ${sysconfdir}/pulse/system.pa \ " pkg_postinst_${PN}-server() { diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch deleted file mode 100644 index 467cd2cbd0..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 002b16f0f2176b4c685e210e335bf69c02563ede Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sat, 22 Feb 2014 18:03:10 +0100 -Subject: [PATCH] configure.ac: Check only for libsystemd not libsystemd-login - -* they were merged into libsystemd in systemd-209 - -Upstream-Status: Pending (it would need to be conditional on systemd version for upstream to accept this) - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 388fae2..fff7a83 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1160,7 +1160,7 @@ AC_ARG_ENABLE([systemd], - AS_HELP_STRING([--disable-systemd],[Disable optional systemd support])) - - AS_IF([test "x$enable_systemd" != "xno"], -- [PKG_CHECK_MODULES(SYSTEMD, [ libsystemd-login ], HAVE_SYSTEMD=1, HAVE_SYSTEMD=0)], -+ [PKG_CHECK_MODULES(SYSTEMD, [ libsystemd ], HAVE_SYSTEMD=1, HAVE_SYSTEMD=0)], - HAVE_SYSTEMD=0) - - AS_IF([test "x$enable_systemd" = "xyes" && test "x$HAVE_SYSTEMD" = "x0"], --- -1.8.5.3 - diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/CVE-2014-3970.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/CVE-2014-3970.patch deleted file mode 100644 index d5f33dc42e..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio/CVE-2014-3970.patch +++ /dev/null @@ -1,52 +0,0 @@ -Upstream-Status: Backport - -commit 26b9d22dd24c17eb118d0205bf7b02b75d435e3c upstream - -rtp-recv: fix crash on empty UDP packets (CVE-2014-3970) - -On FIONREAD returning 0 bytes, we cannot return success, as the caller -(rtpoll_work_cb in module-rtp-recv.c) would then try to -pa_memblock_unref(chunk.memblock) and, because memblock is NULL, trigger -an assertion. - -Also we have to read out the possible empty packet from the socket, so -that the kernel doesn't tell us again and again about it. - -Signed-off-by: Alexander E. Patrakov <patrakov@gmail.com> - -diff --git a/src/modules/rtp/rtp.c b/src/modules/rtp/rtp.c -index 9195493..c45981e 100644 ---- a/src/modules/rtp/rtp.c -+++ b/src/modules/rtp/rtp.c -@@ -182,8 +182,29 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool, struct - goto fail; - } - -- if (size <= 0) -- return 0; -+ if (size <= 0) { -+ /* size can be 0 due to any of the following reasons: -+ * -+ * 1. Somebody sent us a perfectly valid zero-length UDP packet. -+ * 2. Somebody sent us a UDP packet with a bad CRC. -+ * -+ * It is unknown whether size can actually be less than zero. -+ * -+ * In the first case, the packet has to be read out, otherwise the -+ * kernel will tell us again and again about it, thus preventing -+ * reception of any further packets. So let's just read it out -+ * now and discard it later, when comparing the number of bytes -+ * received (0) with the number of bytes wanted (1, see below). -+ * -+ * In the second case, recvmsg() will fail, thus allowing us to -+ * return the error. -+ * -+ * Just to avoid passing zero-sized memchunks and NULL pointers to -+ * recvmsg(), let's force allocation of at least one byte by setting -+ * size to 1. -+ */ -+ size = 1; -+ } - - if (c->memchunk.length < (unsigned) size) { - size_t l; diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_5.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_5.0.bb deleted file mode 100644 index 99f0ef3a46..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_5.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -require pulseaudio.inc - -SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.xz \ - file://0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch \ - file://volatiles.04_pulse \ - file://CVE-2014-3970.patch \ -" -SRC_URI[md5sum] = "c43749838612f4860465e83ed62ca38e" -SRC_URI[sha256sum] = "99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939" - -do_compile_prepend() { - mkdir -p ${S}/libltdl - cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl -} diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb new file mode 100644 index 0000000000..91027bf654 --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb @@ -0,0 +1,12 @@ +require pulseaudio.inc + +SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ + file://volatiles.04_pulse \ +" +SRC_URI[md5sum] = "b691e83b7434c678dffacfa3a027750e" +SRC_URI[sha256sum] = "b50640e0b80b1607600accfad2e45aabb79d379bf6354c9671efa2065477f6f6" + +do_compile_prepend() { + mkdir -p ${S}/libltdl + cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl +} diff --git a/meta/recipes-multimedia/sbc/sbc_1.2.bb b/meta/recipes-multimedia/sbc/sbc_1.3.bb index 9cdf01bb74..2d7f31bc1b 100644 --- a/meta/recipes-multimedia/sbc/sbc_1.2.bb +++ b/meta/recipes-multimedia/sbc/sbc_1.3.bb @@ -10,7 +10,7 @@ DEPENDS = "libsndfile1" SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/${BP}.tar.xz" -SRC_URI[md5sum] = "ec65c444ad4c32aa85702641045b19e9" -SRC_URI[sha256sum] = "c2f01ea54f7473704825113a9cdd46a23e67c650eff575f0670c3d9d66c4a5dc" +SRC_URI[md5sum] = "2d8b7841f2c11ab287718d562f2b981c" +SRC_URI[sha256sum] = "e61022cf576f14190241e7071753fdacdce5d1dea89ffd704110fc50be689309" inherit autotools pkgconfig diff --git a/meta/recipes-multimedia/speex/speex_1.2rc1.bb b/meta/recipes-multimedia/speex/speex_1.2rc1.bb index 9fd88a39f3..5ff50b7383 100644 --- a/meta/recipes-multimedia/speex/speex_1.2rc1.bb +++ b/meta/recipes-multimedia/speex/speex_1.2rc1.bb @@ -14,8 +14,6 @@ SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-${PV}.tar.gz" SRC_URI[md5sum] = "c4438b22c08e5811ff10e2b06ee9b9ae" SRC_URI[sha256sum] = "342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6" -PARALLEL_MAKE = "" - inherit autotools pkgconfig lib_package EXTRA_OECONF = " --enable-fixed-point --with-ogg-libraries=${STAGING_LIBDIR} \ diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb index d28e032293..5f6916a430 100644 --- a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb @@ -7,7 +7,7 @@ LICENSE = "MIT" PR = "r4" # Qt4 could NOT be built on MIPS64 with 64 bits userspace -COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32" +COMPATIBLE_HOST_mips64 = "null" inherit packagegroup diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb index d7a457cff9..d4f0fd1d8c 100644 --- a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb @@ -3,7 +3,7 @@ PR = "r2" LICENSE = "MIT" # Qt4 could NOT be built on MIPS64 with 64 bits userspace -COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32" +COMPATIBLE_HOST_mips64 = "null" inherit packagegroup diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb index 0e7c800946..772c151d25 100644 --- a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb @@ -4,6 +4,10 @@ QTLIBPREFIX = "" require packagegroup-qt-toolchain-target.inc +inherit distro_features_check +# depends on qt4-x11-free +REQUIRED_DISTRO_FEATURES = "x11" + RDEPENDS_${PN} += " \ qt4-x11-free-dev \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \ diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc index fc1ccba9a7..02a032658d 100644 --- a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc +++ b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc @@ -1,7 +1,7 @@ LICENSE = "MIT" # Qt4 could NOT be built on MIPS64 with 64 bits userspace -COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32" +COMPATIBLE_HOST_mips64 = "null" inherit packagegroup diff --git a/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb b/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb index fff3620b09..aa1b0b62f2 100644 --- a/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb +++ b/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb @@ -6,6 +6,8 @@ PR = "r3" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +S = "${WORKDIR}" + do_install() { install -d ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/qtdemo-init ${D}${sysconfdir}/init.d/qtdemo diff --git a/meta/recipes-qt/qt4/qt-mobility-1.2.0/fix-compile-error-no-bluez.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/fix-compile-error-no-bluez.patch new file mode 100644 index 0000000000..3f03cf7165 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-mobility-1.2.0/fix-compile-error-no-bluez.patch @@ -0,0 +1,338 @@ +From bb05733bd5a685b00f80ddc73a1b7a9a2ba0eb11 Mon Sep 17 00:00:00 2001 +From: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com> +Date: Thu, 12 May 2011 13:07:13 +1000 +Subject: [PATCH] Fix compile error if bluez is not installed + +Upstream-Status: Backport + +Task-number: QTMOBILITY-1576 +--- + src/connectivity/bluetooth/bluetooth.pri | 1 + + .../bluetooth/qbluetoothdevicediscoveryagent.h | 2 +- + .../bluetooth/qbluetoothdevicediscoveryagent_p.cpp | 2 +- + .../bluetooth/qbluetoothdevicediscoveryagent_p.h | 6 +++--- + .../bluetooth/qbluetoothlocaldevice_p.h | 4 ++-- + .../bluetooth/qbluetoothservicediscoveryagent.h | 2 +- + .../bluetooth/qbluetoothservicediscoveryagent_p.h | 8 ++++---- + .../bluetooth/qbluetoothserviceinfo_p.cpp | 2 +- + .../bluetooth/qbluetoothserviceinfo_p.h | 4 ++-- + src/connectivity/bluetooth/ql2capserver.h | 2 +- + src/connectivity/bluetooth/ql2capserver_p.cpp | 2 +- + src/connectivity/bluetooth/ql2capserver_p.h | 6 +++--- + src/connectivity/bluetooth/qrfcommserver.h | 2 +- + src/connectivity/bluetooth/qrfcommserver_p.cpp | 2 +- + src/connectivity/bluetooth/qrfcommserver_p.h | 6 +++--- + tests/tests.pro | 4 +++- + 16 files changed, 29 insertions(+), 26 deletions(-) + +diff --git a/src/connectivity/bluetooth/bluetooth.pri b/src/connectivity/bluetooth/bluetooth.pri +index 717a1ad..4fa2c15 100644 +--- a/src/connectivity/bluetooth/bluetooth.pri ++++ b/src/connectivity/bluetooth/bluetooth.pri +@@ -103,6 +103,7 @@ symbian { + } + } else:contains(bluez_enabled, yes):contains(QT_CONFIG, dbus) { + QT *= dbus ++ DEFINES += QTM_BLUEZ_BLUETOOTH + + include(bluez/bluez.pri) + +diff --git a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h +index a95c467..00cfd14 100644 +--- a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h ++++ b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h +@@ -101,7 +101,7 @@ private: + Q_DECLARE_PRIVATE(QBluetoothDeviceDiscoveryAgent) + QBluetoothDeviceDiscoveryAgentPrivate *d_ptr; + +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + Q_PRIVATE_SLOT(d_func(), void _q_deviceFound(const QString &address, const QVariantMap &dict)); + Q_PRIVATE_SLOT(d_func(), void _q_propertyChanged(const QString &name, const QDBusVariant &value)); + #endif +diff --git a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp +index 6edbd16..512002d 100644 +--- a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp ++++ b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp +@@ -69,7 +69,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start() + void QBluetoothDeviceDiscoveryAgentPrivate::stop() + { + } +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + void QBluetoothDeviceDiscoveryAgentPrivate::_q_deviceFound(const QString &address, + const QVariantMap &dict) + { +diff --git a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h +index 0e34e05..700e78d 100644 +--- a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h ++++ b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h +@@ -46,7 +46,7 @@ + + #include <QVariantMap> + +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + class OrgBluezManagerInterface; + class OrgBluezAdapterInterface; + class QDBusVariant; +@@ -80,7 +80,7 @@ public: + QString errorDescription); + #endif + +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + void _q_deviceFound(const QString &address, const QVariantMap &dict); + void _q_propertyChanged(const QString &name, const QDBusVariant &value); + #endif +@@ -100,7 +100,7 @@ private: + bool pendingCancel; + bool pendingStart; + +-#if !defined(QT_NO_DBUS) ++#ifdef QTM_BLUEZ_BLUETOOTH + OrgBluezManagerInterface *manager; + OrgBluezAdapterInterface *adapter; + #endif +diff --git a/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h b/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h +index 750c286..381d6b5 100644 +--- a/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h ++++ b/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h +@@ -51,7 +51,7 @@ + #include <btengsettings.h> + #endif + +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + #include <QObject> + #include <QDBusContext> + #include <QDBusObjectPath> +@@ -68,7 +68,7 @@ QTM_BEGIN_NAMESPACE + + class QBluetoothAddress; + +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + class QBluetoothLocalDevicePrivate : public QObject, + protected QDBusContext + { +diff --git a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h +index 6279432..7eeccfc 100644 +--- a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h ++++ b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h +@@ -105,7 +105,7 @@ private: + Q_PRIVATE_SLOT(d_func(), void _q_deviceDiscovered(const QBluetoothDeviceInfo &info)) + Q_PRIVATE_SLOT(d_func(), void _q_deviceDiscoveryFinished()) + Q_PRIVATE_SLOT(d_func(), void _q_serviceDiscoveryFinished()) +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + Q_PRIVATE_SLOT(d_func(), void _q_discoveredServices(QDBusPendingCallWatcher*)) + Q_PRIVATE_SLOT(d_func(), void _q_createdDevice(QDBusPendingCallWatcher*)) + #endif +diff --git a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h +index 5e7da43..f25c293 100644 +--- a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h ++++ b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h +@@ -53,7 +53,7 @@ + #include <btsdp.h> + #endif + +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + class OrgBluezManagerInterface; + class OrgBluezAdapterInterface; + class OrgBluezDeviceInterface; +@@ -99,7 +99,7 @@ public: + void _q_deviceDiscoveryFinished(); + void _q_deviceDiscovered(const QBluetoothDeviceInfo &info); + void _q_serviceDiscoveryFinished(); +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + void _q_discoveredServices(QDBusPendingCallWatcher *watcher); + void _q_createdDevice(QDBusPendingCallWatcher *watcher); + #endif +@@ -123,7 +123,7 @@ private: + #ifdef QTM_SYMBIAN_BLUETOOTH + void startL(const QBluetoothAddress &address); + void initL(const QBluetoothAddress &address); +-#elif !defined(QT_NO_DBUS) ++#elif defined(QTM_BLUEZ_BLUETOOTH) + QVariant readAttributeValue(QXmlStreamReader &xml); + #endif + +@@ -153,7 +153,7 @@ private: + TSdpAttributeID m_currentAttributeId; + + QStack<QVariant> m_stack; +-#elif !defined(QT_NO_DBUS) ++#elif defined(QTM_BLUEZ_BLUETOOTH) + OrgBluezManagerInterface *manager; + OrgBluezAdapterInterface *adapter; + OrgBluezDeviceInterface *device; +diff --git a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp +index 814458c..dd96dcc 100644 +--- a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp ++++ b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp +@@ -79,7 +79,7 @@ void QBluetoothServiceInfoPrivate::removeRegisteredAttribute(quint16 attributeId + Q_UNUSED(attributeId); + } + +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + bool QBluetoothServiceInfoPrivate::registerService() const + { + return false; +diff --git a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h +index 5be7341..8e4254c 100644 +--- a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h ++++ b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h +@@ -72,7 +72,7 @@ public: + + bool ensureSdpConnection() const; + +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + bool registerService() const; + #endif + +@@ -89,7 +89,7 @@ public: + mutable TSdpServRecordHandle serviceRecord; + #endif + +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + mutable OrgBluezServiceInterface *service; + mutable quint32 serviceRecord; + mutable bool registered; +diff --git a/src/connectivity/bluetooth/ql2capserver.h b/src/connectivity/bluetooth/ql2capserver.h +index 99c20a5..bed65a3 100644 +--- a/src/connectivity/bluetooth/ql2capserver.h ++++ b/src/connectivity/bluetooth/ql2capserver.h +@@ -97,7 +97,7 @@ private: + Q_PRIVATE_SLOT(d_func(), void _q_disconnected()) + #endif //QTM_SYMBIAN_BLUETOOTH + +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + Q_PRIVATE_SLOT(d_func(), void _q_newConnection()) + #endif + +diff --git a/src/connectivity/bluetooth/ql2capserver_p.cpp b/src/connectivity/bluetooth/ql2capserver_p.cpp +index 3a2199f..f19977e 100644 +--- a/src/connectivity/bluetooth/ql2capserver_p.cpp ++++ b/src/connectivity/bluetooth/ql2capserver_p.cpp +@@ -101,7 +101,7 @@ QBluetooth::SecurityFlags QL2capServer::securityFlags() const + + + +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + void QL2capServerPrivate::_q_newConnection() + { + } +diff --git a/src/connectivity/bluetooth/ql2capserver_p.h b/src/connectivity/bluetooth/ql2capserver_p.h +index b5e76d9..2823106 100644 +--- a/src/connectivity/bluetooth/ql2capserver_p.h ++++ b/src/connectivity/bluetooth/ql2capserver_p.h +@@ -50,7 +50,7 @@ + #include <bt_sock.h> + #endif //QTM_SYMBIAN_BLUETOOTH + +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + QT_FORWARD_DECLARE_CLASS(QSocketNotifier) + #endif + +@@ -82,7 +82,7 @@ public: + void _q_disconnected(); + #endif //QTM_SYMBIAN_BLUETOOTH + +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + void _q_newConnection(); + #endif + +@@ -103,7 +103,7 @@ protected: + QL2capServer *q_ptr; + + private: +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + QSocketNotifier *socketNotifier; + #endif + }; +diff --git a/src/connectivity/bluetooth/qrfcommserver.h b/src/connectivity/bluetooth/qrfcommserver.h +index 3f348dd..7974ba6 100644 +--- a/src/connectivity/bluetooth/qrfcommserver.h ++++ b/src/connectivity/bluetooth/qrfcommserver.h +@@ -97,7 +97,7 @@ private: + Q_PRIVATE_SLOT(d_func(), void _q_disconnected()) + #endif //QTM_SYMBIAN_BLUETOOTH + +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + Q_PRIVATE_SLOT(d_func(), void _q_newConnection()) + #endif + }; +diff --git a/src/connectivity/bluetooth/qrfcommserver_p.cpp b/src/connectivity/bluetooth/qrfcommserver_p.cpp +index f8145d9..eb14d64 100644 +--- a/src/connectivity/bluetooth/qrfcommserver_p.cpp ++++ b/src/connectivity/bluetooth/qrfcommserver_p.cpp +@@ -90,7 +90,7 @@ quint16 QRfcommServer::serverPort() const + } + + +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + void QRfcommServerPrivate::_q_newConnection() + { + } +diff --git a/src/connectivity/bluetooth/qrfcommserver_p.h b/src/connectivity/bluetooth/qrfcommserver_p.h +index da6e28b..af40df7 100644 +--- a/src/connectivity/bluetooth/qrfcommserver_p.h ++++ b/src/connectivity/bluetooth/qrfcommserver_p.h +@@ -51,7 +51,7 @@ + #include <bt_sock.h> + #endif + +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + QT_FORWARD_DECLARE_CLASS(QSocketNotifier) + #endif + +@@ -83,7 +83,7 @@ public: + void _q_disconnected(); + #endif //QTM_SYMBIAN_BLUETOOTH + +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + void _q_newConnection(); + #endif + +@@ -102,7 +102,7 @@ protected: + QRfcommServer *q_ptr; + + private: +-#ifndef QT_NO_DBUS ++#ifdef QTM_BLUEZ_BLUETOOTH + QSocketNotifier *socketNotifier; + #endif + }; +diff --git a/tests/tests.pro b/tests/tests.pro +index 2f2c355..4800e5e 100644 +--- a/tests/tests.pro ++++ b/tests/tests.pro +@@ -16,7 +16,9 @@ contains(mobility_modules,systeminfo): SUBDIRS += sysinfo-tester + contains(mobility_modules,connectivity) { + SUBDIRS += nfctestserver + +- linux*:!linux-armcc: SUBDIRS += btclient ++ linux*:!linux-armcc:contains(bluez_enabled, yes):contains(QT_CONFIG, dbus) { ++ SUBDIRS += btclient ++ } + } + + symbian { +-- +1.7.1 + diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc index ae1769de3a..56631bb05c 100644 --- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc +++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc @@ -1,9 +1,11 @@ HOMEPAGE = "http://qt-project.org/" DEPENDS = "gstreamer util-linux" +inherit bluetooth + PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}" -PACKAGECONFIG[bluetooth] = ",,bluez4" + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}" +PACKAGECONFIG[bluez4] = ",,bluez4" PACKAGECONFIG[pulseaudio] = ",,pulseaudio" LICENSE = "LGPLv2.1" @@ -20,6 +22,7 @@ SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/qt-mobility/qt-mobility-opens file://qt-mobility-no-xvideo.patch \ file://fix_metaobjectbuilder_build_err.patch \ file://0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch \ + file://fix-compile-error-no-bluez.patch \ " SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8" @@ -65,7 +68,7 @@ maemo5-contacts_enabled = no maemo5-calendar_enabled = no maemo6-landmarks_enabled = no bme_enabled = no -bluez_enabled = ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', 'yes', 'no', d)} +bluez_enabled = ${@bb.utils.contains('PACKAGECONFIG', 'bluez4', 'yes', 'no', d)} proj_enabled = no gstreamer-photography_enabled = no gstreamer-appsrc_enabled = yes diff --git a/meta/recipes-qt/qt4/qt4-4.8.6.inc b/meta/recipes-qt/qt4/qt4-4.8.6.inc index ae6692b50a..19f52a7711 100644 --- a/meta/recipes-qt/qt4/qt4-4.8.6.inc +++ b/meta/recipes-qt/qt4/qt4-4.8.6.inc @@ -22,6 +22,12 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \ file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \ file://0028-Don-t-crash-on-broken-GIF-images.patch \ + file://0029-aarch64_arm64_fix_arch_detection.patch \ + file://0030-aarch64_arm64_qatomic_support.patch \ + file://0031-aarch64_arm64_mkspecs.patch \ + file://0032-aarch64_add_header.patch \ + file://0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch \ + file://Fix-QWSLock-invalid-argument-logs.patch \ file://g++.conf \ file://linux.conf \ " @@ -31,6 +37,14 @@ SRC_URI[sha256sum] = "8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa70 S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" +# disable webkit for mips64 n32 temporarily that fails to compile, +# qt upstream defect: +# https://bugreports.qt-project.org/browse/QTBUG-39224 +QT_CONFIG_FLAGS_append_mips64n32 = " -no-webkit" + +# disable webkit for aarch64 temporarily that fails to compile +QT_CONFIG_FLAGS_append_aarch64 = " -no-webkit" + FILES_${QT_BASE_NAME}-tools_append = " ${bindir}/qml ${bindir}/qmlplugindump" FILES_${QT_BASE_NAME}-tools-dbg_append = " ${bindir}/.debug/qml ${bindir}/.debug/qmlplugindump" diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch new file mode 100644 index 0000000000..fbd32b173d --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.6/0029-aarch64_arm64_fix_arch_detection.patch @@ -0,0 +1,53 @@ +From 800abbba658203fc8e746e3fc780a297cd4110cf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= + <perezmeyer@gmail.com> +Date: Wed, 20 Aug 2014 17:52:49 -0300 +Subject: [PATCH] Fix AArch64/arm64 detection. + +The detection needs to go before arm, else the system will detect AArch64/arm64 +as arm. + +This patch comes from Wookey, he has agreed to put it under BSD or Expat +to allow it's inclusion in here: +<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#255> + +Change-Id: Ic2171c03fca8bb871347940fa3a2bc467776f797 + + +Upstream-Status: Pending + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + configure | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure b/configure +index a9ba7c8..eb88b72 100755 +--- a/configure ++++ b/configure +@@ -3241,17 +3241,17 @@ if [ -z "${CFG_HOST_ARCH}" ]; then + fi + CFG_HOST_ARCH=s390 + ;; +- *:*:arm*) ++ *:*:aarch64*|*:*:arm64*) + if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " ARM (arm)" ++ echo " AArch64 (aarch64)" + fi +- CFG_HOST_ARCH=arm ++ CFG_HOST_ARCH=aarch64 + ;; +- *:*:aarch64*) ++ *:*:arm*) + if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " AArch64 (aarch64)" ++ echo " ARM (arm)" + fi +- CFG_HOST_ARCH=aarch64 ++ CFG_HOST_ARCH=arm + ;; + Linux:*:sparc*) + if [ "$OPT_VERBOSE" = "yes" ]; then +-- +2.1.0 diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0030-aarch64_arm64_qatomic_support.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0030-aarch64_arm64_qatomic_support.patch new file mode 100644 index 0000000000..ba4c2a6b4f --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.6/0030-aarch64_arm64_qatomic_support.patch @@ -0,0 +1,491 @@ +From 294010b562c9846bb2bc4ee9c63ff78adc7c1f4f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= + <perezmeyer@gmail.com> +Date: Sat, 15 Mar 2014 15:40:49 -0300 +Subject: [PATCH] Add qatomic support for AArch64 (aka arm64). + +Patch by Mark Salter <msalter@redhat.com> +licensed under BSD: + +<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#195> + +This patch is known to not be the most correct way +to implement them, as it seems to be possible to do it in a faster way, +but should work non the less until we can provide something better. + +Change-Id: Ib392b27dc54691fd4c2ea9896240ad71fb8128cc + + +Upstream-Status: Pending + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +--- + src/corelib/arch/aarch64/arch.pri | 4 + + src/corelib/arch/aarch64/qatomic_aarch64.cpp | 70 ++++++ + src/corelib/arch/arch.pri | 4 +- + src/corelib/arch/qatomic_aarch64.h | 335 +++++++++++++++++++++++++++ + src/corelib/arch/qatomic_arch.h | 2 + + 5 files changed, 414 insertions(+), 1 deletion(-) + create mode 100644 src/corelib/arch/aarch64/arch.pri + create mode 100644 src/corelib/arch/aarch64/qatomic_aarch64.cpp + create mode 100644 src/corelib/arch/qatomic_aarch64.h + +diff --git a/src/corelib/arch/aarch64/arch.pri b/src/corelib/arch/aarch64/arch.pri +new file mode 100644 +index 0000000..63523d9 +--- /dev/null ++++ b/src/corelib/arch/aarch64/arch.pri +@@ -0,0 +1,4 @@ ++# ++# AArch64 architecture ++# ++SOURCES += $$QT_ARCH_CPP/qatomic_aarch64.cpp +diff --git a/src/corelib/arch/aarch64/qatomic_aarch64.cpp b/src/corelib/arch/aarch64/qatomic_aarch64.cpp +new file mode 100644 +index 0000000..fc851b9 +--- /dev/null ++++ b/src/corelib/arch/aarch64/qatomic_aarch64.cpp +@@ -0,0 +1,70 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2012, 2013 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal ++** ++** This file is part of the QtCore module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception ++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. ++** ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#include <QtCore/qglobal.h> ++ ++#include <unistd.h> ++#ifdef _POSIX_PRIORITY_SCHEDULING ++# include <sched.h> ++#endif ++#include <time.h> ++ ++QT_BEGIN_NAMESPACE ++ ++QT_USE_NAMESPACE ++ ++Q_CORE_EXPORT void qt_atomic_yield(int *count) ++{ ++#ifdef _POSIX_PRIORITY_SCHEDULING ++ if ((*count)++ < 50) { ++ sched_yield(); ++ } else ++#endif ++ { ++ struct timespec tm; ++ tm.tv_sec = 0; ++ tm.tv_nsec = 2000001; ++ nanosleep(&tm, NULL); ++ *count = 0; ++ } ++} ++ ++QT_END_NAMESPACE +diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri +index cd23e5e..f50fca7 100644 +--- a/src/corelib/arch/arch.pri ++++ b/src/corelib/arch/arch.pri +@@ -31,7 +31,9 @@ integrity:HEADERS += arch/qatomic_integrity.h + arch/qatomic_s390.h \ + arch/qatomic_x86_64.h \ + arch/qatomic_sh.h \ +- arch/qatomic_sh4a.h ++ arch/qatomic_sh4a.h \ ++ arch/qatomic_aarch64.h \ ++ + + QT_ARCH_CPP = $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH + DEPENDPATH += $$QT_ARCH_CPP +diff --git a/src/corelib/arch/qatomic_aarch64.h b/src/corelib/arch/qatomic_aarch64.h +new file mode 100644 +index 0000000..de61ca8 +--- /dev/null ++++ b/src/corelib/arch/qatomic_aarch64.h +@@ -0,0 +1,335 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal ++** ++** This file is part of the QtCore module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception ++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. ++** ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#ifndef QATOMIC_AARCH64_H ++#define QATOMIC_AARCH64_H ++ ++QT_BEGIN_HEADER ++ ++QT_BEGIN_NAMESPACE ++ ++#define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE ++ ++inline bool QBasicAtomicInt::isReferenceCountingNative() ++{ return true; } ++inline bool QBasicAtomicInt::isReferenceCountingWaitFree() ++{ return false; } ++ ++#define Q_ATOMIC_INT_TEST_AND_SET_IS_ALWAYS_NATIVE ++ ++inline bool QBasicAtomicInt::isTestAndSetNative() ++{ return true; } ++inline bool QBasicAtomicInt::isTestAndSetWaitFree() ++{ return false; } ++ ++#define Q_ATOMIC_INT_FETCH_AND_STORE_IS_ALWAYS_NATIVE ++ ++inline bool QBasicAtomicInt::isFetchAndStoreNative() ++{ return true; } ++inline bool QBasicAtomicInt::isFetchAndStoreWaitFree() ++{ return false; } ++ ++#define Q_ATOMIC_INT_FETCH_AND_ADD_IS_ALWAYS_NATIVE ++ ++inline bool QBasicAtomicInt::isFetchAndAddNative() ++{ return true; } ++inline bool QBasicAtomicInt::isFetchAndAddWaitFree() ++{ return false; } ++ ++#define Q_ATOMIC_POINTER_TEST_AND_SET_IS_ALWAYS_NATIVE ++ ++template <typename T> ++Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isTestAndSetNative() ++{ return true; } ++template <typename T> ++Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isTestAndSetWaitFree() ++{ return false; } ++ ++#define Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_ALWAYS_NATIVE ++ ++template <typename T> ++Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndStoreNative() ++{ return true; } ++template <typename T> ++Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndStoreWaitFree() ++{ return false; } ++ ++#define Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_ALWAYS_NATIVE ++ ++template <typename T> ++Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddNative() ++{ return true; } ++template <typename T> ++Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree() ++{ return false; } ++ ++#ifndef Q_DATA_MEMORY_BARRIER ++# define Q_DATA_MEMORY_BARRIER asm volatile("dmb sy\n":::"memory") ++#endif ++#ifndef Q_COMPILER_MEMORY_BARRIER ++# define Q_COMPILER_MEMORY_BARRIER asm volatile("":::"memory") ++#endif ++ ++inline bool QBasicAtomicInt::ref() ++{ ++ int newValue; ++ ++ Q_COMPILER_MEMORY_BARRIER; ++ newValue = __atomic_add_fetch(&_q_value, 1, __ATOMIC_ACQ_REL); ++ Q_COMPILER_MEMORY_BARRIER; ++ ++ return newValue != 0; ++} ++ ++inline bool QBasicAtomicInt::deref() ++{ ++ int newValue; ++ ++ Q_COMPILER_MEMORY_BARRIER; ++ newValue = __atomic_sub_fetch(&_q_value, 1, __ATOMIC_ACQ_REL); ++ Q_COMPILER_MEMORY_BARRIER; ++ ++ return newValue != 0; ++} ++ ++inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue) ++{ ++ bool val; ++ ++ Q_COMPILER_MEMORY_BARRIER; ++ val = __atomic_compare_exchange_n (&_q_value, &expectedValue, newValue, ++ false, __ATOMIC_RELAXED, __ATOMIC_RELAXED); ++ Q_COMPILER_MEMORY_BARRIER; ++ return val; ++} ++ ++inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue) ++{ ++ int val; ++ Q_COMPILER_MEMORY_BARRIER; ++ val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED); ++ Q_COMPILER_MEMORY_BARRIER; ++ return val; ++} ++ ++inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd) ++{ ++ int val; ++ Q_COMPILER_MEMORY_BARRIER; ++ val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED); ++ Q_COMPILER_MEMORY_BARRIER; ++ return val; ++} ++ ++template <typename T> ++Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValue, T *newValue) ++{ ++ bool val; ++ Q_COMPILER_MEMORY_BARRIER; ++ val = __atomic_compare_exchange_n (&_q_value, &expectedValue, newValue, ++ false, __ATOMIC_RELAXED, __ATOMIC_RELAXED); ++ Q_COMPILER_MEMORY_BARRIER; ++ return val; ++} ++ ++template <typename T> ++Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue) ++{ ++ T *val; ++ Q_COMPILER_MEMORY_BARRIER; ++ val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED); ++ Q_COMPILER_MEMORY_BARRIER; ++ return val; ++} ++ ++template <typename T> ++Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd) ++{ ++ T *val; ++ Q_COMPILER_MEMORY_BARRIER; ++ val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED); ++ Q_COMPILER_MEMORY_BARRIER; ++ return val; ++} ++ ++inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue) ++{ ++ bool returnValue = testAndSetRelaxed(expectedValue, newValue); ++ Q_DATA_MEMORY_BARRIER; ++ return returnValue; ++} ++ ++inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue) ++{ ++ Q_DATA_MEMORY_BARRIER; ++ return testAndSetRelaxed(expectedValue, newValue); ++} ++ ++inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue) ++{ ++ Q_DATA_MEMORY_BARRIER; ++ bool returnValue = testAndSetRelaxed(expectedValue, newValue); ++ Q_COMPILER_MEMORY_BARRIER; ++ return returnValue; ++} ++ ++inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue) ++{ ++ int returnValue = fetchAndStoreRelaxed(newValue); ++ Q_DATA_MEMORY_BARRIER; ++ return returnValue; ++} ++ ++inline int QBasicAtomicInt::fetchAndStoreRelease(int newValue) ++{ ++ Q_DATA_MEMORY_BARRIER; ++ return fetchAndStoreRelaxed(newValue); ++} ++ ++inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue) ++{ ++ Q_DATA_MEMORY_BARRIER; ++ int returnValue = fetchAndStoreRelaxed(newValue); ++ Q_COMPILER_MEMORY_BARRIER; ++ return returnValue; ++} ++ ++inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd) ++{ ++ int returnValue = fetchAndAddRelaxed(valueToAdd); ++ Q_DATA_MEMORY_BARRIER; ++ return returnValue; ++} ++ ++inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd) ++{ ++ Q_DATA_MEMORY_BARRIER; ++ return fetchAndAddRelaxed(valueToAdd); ++} ++ ++inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd) ++{ ++ Q_DATA_MEMORY_BARRIER; ++ int returnValue = fetchAndAddRelaxed(valueToAdd); ++ Q_COMPILER_MEMORY_BARRIER; ++ return returnValue; ++} ++ ++template <typename T> ++Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetAcquire(T *expectedValue, T *newValue) ++{ ++ bool returnValue = testAndSetRelaxed(expectedValue, newValue); ++ Q_DATA_MEMORY_BARRIER; ++ return returnValue; ++} ++ ++template <typename T> ++Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelease(T *expectedValue, T *newValue) ++{ ++ Q_DATA_MEMORY_BARRIER; ++ return testAndSetRelaxed(expectedValue, newValue); ++} ++ ++template <typename T> ++Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValue, T *newValue) ++{ ++ Q_DATA_MEMORY_BARRIER; ++ bool returnValue = testAndSetAcquire(expectedValue, newValue); ++ Q_COMPILER_MEMORY_BARRIER; ++ return returnValue; ++} ++ ++template <typename T> ++Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue) ++{ ++ T *returnValue = fetchAndStoreRelaxed(newValue); ++ Q_DATA_MEMORY_BARRIER; ++ return returnValue; ++} ++ ++template <typename T> ++Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue) ++{ ++ Q_DATA_MEMORY_BARRIER; ++ return fetchAndStoreRelaxed(newValue); ++} ++ ++template <typename T> ++Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue) ++{ ++ Q_DATA_MEMORY_BARRIER; ++ T *returnValue = fetchAndStoreRelaxed(newValue); ++ Q_COMPILER_MEMORY_BARRIER; ++ return returnValue; ++} ++ ++template <typename T> ++Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddAcquire(qptrdiff valueToAdd) ++{ ++ T *returnValue = fetchAndAddRelaxed(valueToAdd); ++ Q_DATA_MEMORY_BARRIER; ++ return returnValue; ++} ++ ++template <typename T> ++Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueToAdd) ++{ ++ Q_DATA_MEMORY_BARRIER; ++ return fetchAndAddRelaxed(valueToAdd); ++} ++ ++template <typename T> ++Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd) ++{ ++ Q_DATA_MEMORY_BARRIER; ++ T *returnValue = fetchAndAddRelaxed(valueToAdd); ++ Q_COMPILER_MEMORY_BARRIER; ++ return returnValue; ++} ++ ++#undef Q_DATA_MEMORY_BARRIER ++#undef Q_COMPILER_MEMORY_BARRIER ++ ++QT_END_NAMESPACE ++ ++QT_END_HEADER ++ ++#endif // QATOMIC_AARCH64_H +diff --git a/src/corelib/arch/qatomic_arch.h b/src/corelib/arch/qatomic_arch.h +index 141726c..3e96926 100644 +--- a/src/corelib/arch/qatomic_arch.h ++++ b/src/corelib/arch/qatomic_arch.h +@@ -94,6 +94,8 @@ QT_BEGIN_HEADER + # include "QtCore/qatomic_sh4a.h" + #elif defined(QT_ARCH_NACL) + # include "QtCore/qatomic_generic.h" ++#elif defined(QT_ARCH_AARCH64) ++# include "QtCore/qatomic_aarch64.h" + #else + # error "Qt has not been ported to this architecture" + #endif +-- +2.1.0 + diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0031-aarch64_arm64_mkspecs.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0031-aarch64_arm64_mkspecs.patch new file mode 100644 index 0000000000..a01e7ada93 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.6/0031-aarch64_arm64_mkspecs.patch @@ -0,0 +1,124 @@ +From 7090fc80ff630712a90de92403190f647dd38a39 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= + <perezmeyer@gmail.com> +Date: Sat, 15 Mar 2014 15:35:00 -0300 +Subject: [PATCH] mkspecs for AArch64 (aka arm64). + +Patch by Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> +licensed under either Public Domain or BSD: + +<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#179> + +Change-Id: I21f17953234cfb176bac023e52ecdc927fc5c1a9 + + +Upstream-Status: Pending + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +--- + configure | 3 +++ + mkspecs/linux-g++-aarch64/qmake.conf | 27 ++++++++++++++++++++ + mkspecs/linux-g++-aarch64/qplatformdefs.h | 42 +++++++++++++++++++++++++++++++ + 3 files changed, 72 insertions(+) + create mode 100644 mkspecs/linux-g++-aarch64/qmake.conf + create mode 100644 mkspecs/linux-g++-aarch64/qplatformdefs.h + +diff --git a/configure b/configure +index a9ba7c8..e57d053 100755 +--- a/configure ++++ b/configure +@@ -2808,6 +2808,9 @@ if [ "$CFG_EMBEDDED" != "no" ]; then + *86_64) + PLATFORM=qws/linux-x86_64-g++ + ;; ++ aarch64) ++ PLATFORM=linux-aarch64-g++ ++ ;; + *) + PLATFORM=qws/linux-generic-g++ + ;; +diff --git a/mkspecs/linux-g++-aarch64/qmake.conf b/mkspecs/linux-g++-aarch64/qmake.conf +new file mode 100644 +index 0000000..ebc0a92 +--- /dev/null ++++ b/mkspecs/linux-g++-aarch64/qmake.conf +@@ -0,0 +1,27 @@ ++# ++# qmake configuration for linux-g++ ++# ++# Written for GNU/Linux platforms that have both lib and lib64 directories, ++# like the AMD Opteron. ++# ++ ++MAKEFILE_GENERATOR = UNIX ++TARGET_PLATFORM = unix ++TEMPLATE = app ++CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index ++QT += core gui ++QMAKE_INCREMENTAL_STYLE = sublib ++ ++QMAKE_CFLAGS = ++QMAKE_LFLAGS = ++ ++QMAKE_CFLAGS_RELEASE += -O2 ++ ++include(../common/linux.conf) ++include(../common/gcc-base-unix.conf) ++include(../common/g++-unix.conf) ++ ++QMAKE_LIBDIR_X11 = /usr/X11R6/lib64 ++QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 ++ ++load(qt_config) +diff --git a/mkspecs/linux-g++-aarch64/qplatformdefs.h b/mkspecs/linux-g++-aarch64/qplatformdefs.h +new file mode 100644 +index 0000000..562128b +--- /dev/null ++++ b/mkspecs/linux-g++-aarch64/qplatformdefs.h +@@ -0,0 +1,42 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal ++** ++** This file is part of the qmake spec of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception ++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. ++** ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#include "../linux-g++/qplatformdefs.h" +-- +2.1.0 + diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0032-aarch64_add_header.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0032-aarch64_add_header.patch new file mode 100644 index 0000000000..7132224ecc --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.6/0032-aarch64_add_header.patch @@ -0,0 +1,18 @@ +Add missing header for aarch64. And install ../corelib/arch/qatomic_aarch64.h. + +Upstream-Status: Pending + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- +diff -Nru qt-everywhere-opensource-src-4.8.6.orig/include/QtCore/qatomic_aarch64.h qt-everywhere-opensource-src-4.8.6/include/QtCore/qatomic_aarch64.h +--- qt-everywhere-opensource-src-4.8.6.orig/include/QtCore/qatomic_aarch64.h 1970-01-01 08:30:00.000000000 +0830 ++++ qt-everywhere-opensource-src-4.8.6/include/QtCore/qatomic_aarch64.h 2014-09-09 17:18:03.768352551 +0800 +@@ -0,0 +1 @@ ++#include "../../src/corelib/arch/qatomic_aarch64.h" +--- qt-everywhere-opensource-src-4.8.6/include/QtCore/headers.pri.orig 2014-09-09 18:05:37.100430311 +0800 ++++ qt-everywhere-opensource-src-4.8.6/include/QtCore/headers.pri 2014-09-09 18:05:59.112430911 +0800 +@@ -1,3 +1,3 @@ +-SYNCQT.HEADER_FILES = ../corelib/statemachine/qabstractstate.h ../corelib/statemachine/qabstracttransition.h ../corelib/statemachine/qeventtransition.h ../corelib/statemachine/qfinalstate.h ../corelib/statemachine/qhistorystate.h ../corelib/statemachine/qsignaltransition.h ../corelib/statemachine/qstate.h ../corelib/statemachine/qstatemachine.h ../corelib/arch/qatomic_alpha.h ../corelib/arch/qatomic_arch.h ../corelib/arch/qatomic_arm.h ../corelib/arch/qatomic_armv5.h ../corelib/arch/qatomic_armv6.h ../corelib/arch/qatomic_armv7.h ../corelib/arch/qatomic_avr32.h ../corelib/arch/qatomic_bfin.h ../corelib/arch/qatomic_bootstrap.h ../corelib/arch/qatomic_generic.h ../corelib/arch/qatomic_i386.h ../corelib/arch/qatomic_ia64.h ../corelib/arch/qatomic_integrity.h ../corelib/arch/qatomic_m68k.h ../corelib/arch/qatomic_macosx.h ../corelib/arch/qatomic_mips.h ../corelib/arch/qatomic_parisc.h ../corelib/arch/qatomic_powerpc.h ../corelib/arch/qatomic_s390.h ../corelib/arch/qatomic_sh.h ../corelib/arch/qatomic_sh4a.h ../corelib/arch/qatomic_sparc.h ../corelib/arch/qatomic_symbian.h ../corelib/arch/qatomic_vxworks.h ../corelib/arch/qatomic_windows.h ../corelib/arch/qatomic_windowsce.h ../corelib/arch/qatomic_x86_64.h ../corelib/thread/qatomic.h ../corelib/thread/qbasicatomic.h ../corelib/thread/qmutex.h ../corelib/thread/qreadwritelock.h ../corelib/thread/qsemaphore.h ../corelib/thread/qthread.h ../corelib/thread/qthreadstorage.h ../corelib/thread/qwaitcondition.h ../corelib/xml/qxmlstream.h ../corelib/concurrent/qfuture.h ../corelib/concurrent/qfutureinterface.h ../corelib/concurrent/qfuturesynchronizer.h ../corelib/concurrent/qfuturewatcher.h ../corelib/concurrent/qrunnable.h ../corelib/concurrent/qtconcurrentcompilertest.h ../corelib/concurrent/qtconcurrentexception.h ../corelib/concurrent/qtconcurrentfilter.h ../corelib/concurrent/qtconcurrentfilterkernel.h ../corelib/concurrent/qtconcurrentfunctionwrappers.h ../corelib/concurrent/qtconcurrentiteratekernel.h ../corelib/concurrent/qtconcurrentmap.h ../corelib/concurrent/qtconcurrentmapkernel.h ../corelib/concurrent/qtconcurrentmedian.h ../corelib/concurrent/qtconcurrentreducekernel.h ../corelib/concurrent/qtconcurrentresultstore.h ../corelib/concurrent/qtconcurrentrun.h ../corelib/concurrent/qtconcurrentrunbase.h ../corelib/concurrent/qtconcurrentstoredfunctioncall.h ../corelib/concurrent/qtconcurrentthreadengine.h ../corelib/concurrent/qthreadpool.h ../corelib/kernel/qabstracteventdispatcher.h ../corelib/kernel/qabstractitemmodel.h ../corelib/kernel/qbasictimer.h ../corelib/kernel/qcoreapplication.h ../corelib/kernel/qcoreevent.h ../corelib/kernel/qeventloop.h ../corelib/kernel/qfunctions_nacl.h ../corelib/kernel/qfunctions_vxworks.h ../corelib/kernel/qfunctions_wince.h ../corelib/kernel/qmath.h ../corelib/kernel/qmetaobject.h ../corelib/kernel/qmetatype.h ../corelib/kernel/qmimedata.h ../corelib/kernel/qobject.h ../corelib/kernel/qobjectcleanuphandler.h ../corelib/kernel/qobjectdefs.h ../corelib/kernel/qpointer.h ../corelib/kernel/qsharedmemory.h ../corelib/kernel/qsignalmapper.h ../corelib/kernel/qsocketnotifier.h ../corelib/kernel/qsystemsemaphore.h ../corelib/kernel/qtimer.h ../corelib/kernel/qtranslator.h ../corelib/kernel/qvariant.h ../corelib/plugin/qfactoryinterface.h ../corelib/plugin/qlibrary.h ../corelib/plugin/qplugin.h ../corelib/plugin/qpluginloader.h ../corelib/plugin/quuid.h ../corelib/global/qconfig-dist.h ../corelib/global/qconfig-large.h ../corelib/global/qconfig-medium.h ../corelib/global/qconfig-minimal.h ../corelib/global/qconfig-nacl.h ../corelib/global/qconfig-small.h ../corelib/global/qendian.h ../corelib/global/qfeatures.h ../corelib/global/qglobal.h ../corelib/global/qlibraryinfo.h ../corelib/global/qnamespace.h ../corelib/global/qnumeric.h ../corelib/global/qt_windows.h ../corelib/global/qconfig.h ../corelib/codecs/qtextcodec.h ../corelib/codecs/qtextcodecplugin.h ../corelib/io/qabstractfileengine.h ../corelib/io/qbuffer.h ../corelib/io/qdatastream.h ../corelib/io/qdebug.h ../corelib/io/qdir.h ../corelib/io/qdiriterator.h ../corelib/io/qfile.h ../corelib/io/qfileinfo.h ../corelib/io/qfilesystemwatcher.h ../corelib/io/qfsfileengine.h ../corelib/io/qiodevice.h ../corelib/io/qprocess.h ../corelib/io/qresource.h ../corelib/io/qsettings.h ../corelib/io/qtemporaryfile.h ../corelib/io/qtextstream.h ../corelib/io/qurl.h ../corelib/animation/qabstractanimation.h ../corelib/animation/qanimationgroup.h ../corelib/animation/qparallelanimationgroup.h ../corelib/animation/qpauseanimation.h ../corelib/animation/qpropertyanimation.h ../corelib/animation/qsequentialanimationgroup.h ../corelib/animation/qvariantanimation.h ../corelib/tools/qalgorithms.h ../corelib/tools/qbitarray.h ../corelib/tools/qbytearray.h ../corelib/tools/qbytearraymatcher.h ../corelib/tools/qcache.h ../corelib/tools/qchar.h ../corelib/tools/qcontainerfwd.h ../corelib/tools/qcontiguouscache.h ../corelib/tools/qcryptographichash.h ../corelib/tools/qdatetime.h ../corelib/tools/qeasingcurve.h ../corelib/tools/qelapsedtimer.h ../corelib/tools/qhash.h ../corelib/tools/qiterator.h ../corelib/tools/qline.h ../corelib/tools/qlinkedlist.h ../corelib/tools/qlist.h ../corelib/tools/qlocale.h ../corelib/tools/qlocale_blackberry.h ../corelib/tools/qmap.h ../corelib/tools/qmargins.h ../corelib/tools/qpair.h ../corelib/tools/qpoint.h ../corelib/tools/qqueue.h ../corelib/tools/qrect.h ../corelib/tools/qregexp.h ../corelib/tools/qscopedpointer.h ../corelib/tools/qscopedvaluerollback.h ../corelib/tools/qset.h ../corelib/tools/qshareddata.h ../corelib/tools/qsharedpointer.h ../corelib/tools/qsharedpointer_impl.h ../corelib/tools/qsize.h ../corelib/tools/qstack.h ../corelib/tools/qstring.h ../corelib/tools/qstringbuilder.h ../corelib/tools/qstringlist.h ../corelib/tools/qstringmatcher.h ../corelib/tools/qtextboundaryfinder.h ../corelib/tools/qtimeline.h ../corelib/tools/qvarlengtharray.h ../corelib/tools/qvector.h ../../include/QtCore/QtCore ++SYNCQT.HEADER_FILES = ../corelib/statemachine/qabstractstate.h ../corelib/statemachine/qabstracttransition.h ../corelib/statemachine/qeventtransition.h ../corelib/statemachine/qfinalstate.h ../corelib/statemachine/qhistorystate.h ../corelib/statemachine/qsignaltransition.h ../corelib/statemachine/qstate.h ../corelib/statemachine/qstatemachine.h ../corelib/arch/qatomic_alpha.h ../corelib/arch/qatomic_arch.h ../corelib/arch/qatomic_arm.h ../corelib/arch/qatomic_armv5.h ../corelib/arch/qatomic_armv6.h ../corelib/arch/qatomic_armv7.h ../corelib/arch/qatomic_aarch64.h ../corelib/arch/qatomic_avr32.h ../corelib/arch/qatomic_bfin.h ../corelib/arch/qatomic_bootstrap.h ../corelib/arch/qatomic_generic.h ../corelib/arch/qatomic_i386.h ../corelib/arch/qatomic_ia64.h ../corelib/arch/qatomic_integrity.h ../corelib/arch/qatomic_m68k.h ../corelib/arch/qatomic_macosx.h ../corelib/arch/qatomic_mips.h ../corelib/arch/qatomic_parisc.h ../corelib/arch/qatomic_powerpc.h ../corelib/arch/qatomic_s390.h ../corelib/arch/qatomic_sh.h ../corelib/arch/qatomic_sh4a.h ../corelib/arch/qatomic_sparc.h ../corelib/arch/qatomic_symbian.h ../corelib/arch/qatomic_vxworks.h ../corelib/arch/qatomic_windows.h ../corelib/arch/qatomic_windowsce.h ../corelib/arch/qatomic_x86_64.h ../corelib/thread/qatomic.h ../corelib/thread/qbasicatomic.h ../corelib/thread/qmutex.h ../corelib/thread/qreadwritelock.h ../corelib/thread/qsemaphore.h ../corelib/thread/qthread.h ../corelib/thread/qthreadstorage.h ../corelib/thread/qwaitcondition.h ../corelib/xml/qxmlstream.h ../corelib/concurrent/qfuture.h ../corelib/concurrent/qfutureinterface.h ../corelib/concurrent/qfuturesynchronizer.h ../corelib/concurrent/qfuturewatcher.h ../corelib/concurrent/qrunnable.h ../corelib/concurrent/qtconcurrentcompilertest.h ../corelib/concurrent/qtconcurrentexception.h ../corelib/concurrent/qtconcurrentfilter.h ../corelib/concurrent/qtconcurrentfilterkernel.h ../corelib/concurrent/qtconcurrentfunctionwrappers.h ../corelib/concurrent/qtconcurrentiteratekernel.h ../corelib/concurrent/qtconcurrentmap.h ../corelib/concurrent/qtconcurrentmapkernel.h ../corelib/concurrent/qtconcurrentmedian.h ../corelib/concurrent/qtconcurrentreducekernel.h ../corelib/concurrent/qtconcurrentresultstore.h ../corelib/concurrent/qtconcurrentrun.h ../corelib/concurrent/qtconcurrentrunbase.h ../corelib/concurrent/qtconcurrentstoredfunctioncall.h ../corelib/concurrent/qtconcurrentthreadengine.h ../corelib/concurrent/qthreadpool.h ../corelib/kernel/qabstracteventdispatcher.h ../corelib/kernel/qabstractitemmodel.h ../corelib/kernel/qbasictimer.h ../corelib/kernel/qcoreapplication.h ../corelib/kernel/qcoreevent.h ../corelib/kernel/qeventloop.h ../corelib/kernel/qfunctions_nacl.h ../corelib/kernel/qfunctions_vxworks.h ../corelib/kernel/qfunctions_wince.h ../corelib/kernel/qmath.h ../corelib/kernel/qmetaobject.h ../corelib/kernel/qmetatype.h ../corelib/kernel/qmimedata.h ../corelib/kernel/qobject.h ../corelib/kernel/qobjectcleanuphandler.h ../corelib/kernel/qobjectdefs.h ../corelib/kernel/qpointer.h ../corelib/kernel/qsharedmemory.h ../corelib/kernel/qsignalmapper.h ../corelib/kernel/qsocketnotifier.h ../corelib/kernel/qsystemsemaphore.h ../corelib/kernel/qtimer.h ../corelib/kernel/qtranslator.h ../corelib/kernel/qvariant.h ../corelib/plugin/qfactoryinterface.h ../corelib/plugin/qlibrary.h ../corelib/plugin/qplugin.h ../corelib/plugin/qpluginloader.h ../corelib/plugin/quuid.h ../corelib/global/qconfig-dist.h ../corelib/global/qconfig-large.h ../corelib/global/qconfig-medium.h ../corelib/global/qconfig-minimal.h ../corelib/global/qconfig-nacl.h ../corelib/global/qconfig-small.h ../corelib/global/qendian.h ../corelib/global/qfeatures.h ../corelib/global/qglobal.h ../corelib/global/qlibraryinfo.h ../corelib/global/qnamespace.h ../corelib/global/qnumeric.h ../corelib/global/qt_windows.h ../corelib/global/qconfig.h ../corelib/codecs/qtextcodec.h ../corelib/codecs/qtextcodecplugin.h ../corelib/io/qabstractfileengine.h ../corelib/io/qbuffer.h ../corelib/io/qdatastream.h ../corelib/io/qdebug.h ../corelib/io/qdir.h ../corelib/io/qdiriterator.h ../corelib/io/qfile.h ../corelib/io/qfileinfo.h ../corelib/io/qfilesystemwatcher.h ../corelib/io/qfsfileengine.h ../corelib/io/qiodevice.h ../corelib/io/qprocess.h ../corelib/io/qresource.h ../corelib/io/qsettings.h ../corelib/io/qtemporaryfile.h ../corelib/io/qtextstream.h ../corelib/io/qurl.h ../corelib/animation/qabstractanimation.h ../corelib/animation/qanimationgroup.h ../corelib/animation/qparallelanimationgroup.h ../corelib/animation/qpauseanimation.h ../corelib/animation/qpropertyanimation.h ../corelib/animation/qsequentialanimationgroup.h ../corelib/animation/qvariantanimation.h ../corelib/tools/qalgorithms.h ../corelib/tools/qbitarray.h ../corelib/tools/qbytearray.h ../corelib/tools/qbytearraymatcher.h ../corelib/tools/qcache.h ../corelib/tools/qchar.h ../corelib/tools/qcontainerfwd.h ../corelib/tools/qcontiguouscache.h ../corelib/tools/qcryptographichash.h ../corelib/tools/qdatetime.h ../corelib/tools/qeasingcurve.h ../corelib/tools/qelapsedtimer.h ../corelib/tools/qhash.h ../corelib/tools/qiterator.h ../corelib/tools/qline.h ../corelib/tools/qlinkedlist.h ../corelib/tools/qlist.h ../corelib/tools/qlocale.h ../corelib/tools/qlocale_blackberry.h ../corelib/tools/qmap.h ../corelib/tools/qmargins.h ../corelib/tools/qpair.h ../corelib/tools/qpoint.h ../corelib/tools/qqueue.h ../corelib/tools/qrect.h ../corelib/tools/qregexp.h ../corelib/tools/qscopedpointer.h ../corelib/tools/qscopedvaluerollback.h ../corelib/tools/qset.h ../corelib/tools/qshareddata.h ../corelib/tools/qsharedpointer.h ../corelib/tools/qsharedpointer_impl.h ../corelib/tools/qsize.h ../corelib/tools/qstack.h ../corelib/tools/qstring.h ../corelib/tools/qstringbuilder.h ../corelib/tools/qstringlist.h ../corelib/tools/qstringmatcher.h ../corelib/tools/qtextboundaryfinder.h ../corelib/tools/qtimeline.h ../corelib/tools/qvarlengtharray.h ../corelib/tools/qvector.h ../../include/QtCore/QtCore + SYNCQT.HEADER_CLASSES = ../../include/QtCore/QAbstractState ../../include/QtCore/QAbstractTransition ../../include/QtCore/QEventTransition ../../include/QtCore/QFinalState ../../include/QtCore/QHistoryState ../../include/QtCore/QSignalTransition ../../include/QtCore/QState ../../include/QtCore/QStateMachine ../../include/QtCore/QAtomicInt ../../include/QtCore/QAtomicPointer ../../include/QtCore/QBasicAtomicInt ../../include/QtCore/QBasicAtomicPointer ../../include/QtCore/QMutex ../../include/QtCore/QMutexLocker ../../include/QtCore/QMutexData ../../include/QtCore/QReadWriteLock ../../include/QtCore/QReadLocker ../../include/QtCore/QWriteLocker ../../include/QtCore/QSemaphore ../../include/QtCore/QThread ../../include/QtCore/QThreadStorageData ../../include/QtCore/QThreadStorage ../../include/QtCore/QWaitCondition ../../include/QtCore/QXmlStreamStringRef ../../include/QtCore/QXmlStreamAttribute ../../include/QtCore/QXmlStreamAttributes ../../include/QtCore/QXmlStreamNamespaceDeclaration ../../include/QtCore/QXmlStreamNamespaceDeclarations ../../include/QtCore/QXmlStreamNotationDeclaration ../../include/QtCore/QXmlStreamNotationDeclarations ../../include/QtCore/QXmlStreamEntityDeclaration ../../include/QtCore/QXmlStreamEntityDeclarations ../../include/QtCore/QXmlStreamEntityResolver ../../include/QtCore/QXmlStreamReader ../../include/QtCore/QXmlStreamWriter ../../include/QtCore/QFuture ../../include/QtCore/QFutureIterator ../../include/QtCore/QMutableFutureIterator ../../include/QtCore/QFutureInterfaceBase ../../include/QtCore/QFutureInterface ../../include/QtCore/QFutureSynchronizer ../../include/QtCore/QFutureWatcherBase ../../include/QtCore/QFutureWatcher ../../include/QtCore/QRunnable ../../include/QtCore/QtConcurrentFilter ../../include/QtCore/QtConcurrentMap ../../include/QtCore/QtConcurrentRun ../../include/QtCore/QThreadPool ../../include/QtCore/QAbstractEventDispatcher ../../include/QtCore/QModelIndex ../../include/QtCore/QPersistentModelIndex ../../include/QtCore/QModelIndexList ../../include/QtCore/QAbstractItemModel ../../include/QtCore/QAbstractTableModel ../../include/QtCore/QAbstractListModel ../../include/QtCore/QBasicTimer ../../include/QtCore/QCoreApplication ../../include/QtCore/QtCleanUpFunction ../../include/QtCore/QEvent ../../include/QtCore/QTimerEvent ../../include/QtCore/QChildEvent ../../include/QtCore/QCustomEvent ../../include/QtCore/QDynamicPropertyChangeEvent ../../include/QtCore/QEventLoop ../../include/QtCore/QMetaMethod ../../include/QtCore/QMetaEnum ../../include/QtCore/QMetaProperty ../../include/QtCore/QMetaClassInfo ../../include/QtCore/QMetaType ../../include/QtCore/QMetaTypeId ../../include/QtCore/QMetaTypeId2 ../../include/QtCore/QMimeData ../../include/QtCore/QObjectList ../../include/QtCore/QObjectData ../../include/QtCore/QObject ../../include/QtCore/QObjectUserData ../../include/QtCore/QObjectCleanupHandler ../../include/QtCore/QGenericArgument ../../include/QtCore/QGenericReturnArgument ../../include/QtCore/QArgument ../../include/QtCore/QReturnArgument ../../include/QtCore/QMetaObject ../../include/QtCore/QMetaObjectAccessor ../../include/QtCore/QMetaObjectExtraData ../../include/QtCore/QPointer ../../include/QtCore/QSharedMemory ../../include/QtCore/QSignalMapper ../../include/QtCore/QSocketNotifier ../../include/QtCore/QSystemSemaphore ../../include/QtCore/QTimer ../../include/QtCore/QTranslator ../../include/QtCore/QVariant ../../include/QtCore/QVariantList ../../include/QtCore/QVariantMap ../../include/QtCore/QVariantHash ../../include/QtCore/QVariantComparisonHelper ../../include/QtCore/QFactoryInterface ../../include/QtCore/QLibrary ../../include/QtCore/QtPlugin ../../include/QtCore/QtPluginInstanceFunction ../../include/QtCore/QPluginLoader ../../include/QtCore/QUuid ../../include/QtCore/QtEndian ../../include/QtCore/QtGlobal ../../include/QtCore/QIntegerForSize ../../include/QtCore/QNoImplicitBoolCast ../../include/QtCore/Q_INT8 ../../include/QtCore/Q_UINT8 ../../include/QtCore/Q_INT16 ../../include/QtCore/Q_UINT16 ../../include/QtCore/Q_INT32 ../../include/QtCore/Q_UINT32 ../../include/QtCore/Q_INT64 ../../include/QtCore/Q_UINT64 ../../include/QtCore/Q_LLONG ../../include/QtCore/Q_ULLONG ../../include/QtCore/Q_LONG ../../include/QtCore/Q_ULONG ../../include/QtCore/QSysInfo ../../include/QtCore/QtMsgHandler ../../include/QtCore/QGlobalStatic ../../include/QtCore/QGlobalStaticDeleter ../../include/QtCore/QBool ../../include/QtCore/QTypeInfo ../../include/QtCore/QFlag ../../include/QtCore/QIncompatibleFlag ../../include/QtCore/QFlags ../../include/QtCore/QForeachContainer ../../include/QtCore/QForeachContainerBase ../../include/QtCore/QLibraryInfo ../../include/QtCore/Qt ../../include/QtCore/QInternal ../../include/QtCore/QCOORD ../../include/QtCore/QtConfig ../../include/QtCore/QTextCodec ../../include/QtCore/QTextEncoder ../../include/QtCore/QTextDecoder ../../include/QtCore/QTextCodecFactoryInterface ../../include/QtCore/QTextCodecPlugin ../../include/QtCore/QAbstractFileEngine ../../include/QtCore/QAbstractFileEngineHandler ../../include/QtCore/QAbstractFileEngineIterator ../../include/QtCore/QBuffer ../../include/QtCore/QDataStream ../../include/QtCore/QtDebug ../../include/QtCore/QDebug ../../include/QtCore/QNoDebug ../../include/QtCore/QDir ../../include/QtCore/QDirIterator ../../include/QtCore/QFile ../../include/QtCore/QFileInfo ../../include/QtCore/QFileInfoList ../../include/QtCore/QFileInfoListIterator ../../include/QtCore/QFileSystemWatcher ../../include/QtCore/QFSFileEngine ../../include/QtCore/QIODevice ../../include/QtCore/Q_PID ../../include/QtCore/QProcessEnvironment ../../include/QtCore/QProcess ../../include/QtCore/QResource ../../include/QtCore/QSettings ../../include/QtCore/QTemporaryFile ../../include/QtCore/QTextStream ../../include/QtCore/QTextStreamFunction ../../include/QtCore/QTextStreamManipulator ../../include/QtCore/QTS ../../include/QtCore/QTextIStream ../../include/QtCore/QTextOStream ../../include/QtCore/QUrl ../../include/QtCore/QAbstractAnimation ../../include/QtCore/QAnimationDriver ../../include/QtCore/QAnimationGroup ../../include/QtCore/QParallelAnimationGroup ../../include/QtCore/QPauseAnimation ../../include/QtCore/QPropertyAnimation ../../include/QtCore/QSequentialAnimationGroup ../../include/QtCore/QVariantAnimation ../../include/QtCore/QtAlgorithms ../../include/QtCore/QBitArray ../../include/QtCore/QBitRef ../../include/QtCore/QByteArray ../../include/QtCore/QByteRef ../../include/QtCore/QByteArrayMatcher ../../include/QtCore/QCache ../../include/QtCore/QLatin1Char ../../include/QtCore/QChar ../../include/QtCore/QtContainerFwd ../../include/QtCore/QContiguousCacheData ../../include/QtCore/QContiguousCacheTypedData ../../include/QtCore/QContiguousCache ../../include/QtCore/QCryptographicHash ../../include/QtCore/QDate ../../include/QtCore/QTime ../../include/QtCore/QDateTime ../../include/QtCore/QEasingCurve ../../include/QtCore/QElapsedTimer ../../include/QtCore/QHashData ../../include/QtCore/QHashDummyValue ../../include/QtCore/QHashDummyNode ../../include/QtCore/QHashNode ../../include/QtCore/QHash ../../include/QtCore/QMultiHash ../../include/QtCore/QHashIterator ../../include/QtCore/QMutableHashIterator ../../include/QtCore/QLine ../../include/QtCore/QLineF ../../include/QtCore/QLinkedListData ../../include/QtCore/QLinkedListNode ../../include/QtCore/QLinkedList ../../include/QtCore/QLinkedListIterator ../../include/QtCore/QMutableLinkedListIterator ../../include/QtCore/QListData ../../include/QtCore/QList ../../include/QtCore/QListIterator ../../include/QtCore/QMutableListIterator ../../include/QtCore/QSystemLocale ../../include/QtCore/QLocale ../../include/QtCore/QBBSystemLocaleData ../../include/QtCore/QMapData ../../include/QtCore/QMapNode ../../include/QtCore/QMapPayloadNode ../../include/QtCore/QMap ../../include/QtCore/QMultiMap ../../include/QtCore/QMapIterator ../../include/QtCore/QMutableMapIterator ../../include/QtCore/QMargins ../../include/QtCore/QPair ../../include/QtCore/QPoint ../../include/QtCore/QPointF ../../include/QtCore/QQueue ../../include/QtCore/QRect ../../include/QtCore/QRectF ../../include/QtCore/QRegExp ../../include/QtCore/QScopedPointerDeleter ../../include/QtCore/QScopedPointerArrayDeleter ../../include/QtCore/QScopedPointerPodDeleter ../../include/QtCore/QScopedPointer ../../include/QtCore/QScopedArrayPointer ../../include/QtCore/QScopedValueRollback ../../include/QtCore/QSet ../../include/QtCore/QSetIterator ../../include/QtCore/QMutableSetIterator ../../include/QtCore/QSharedData ../../include/QtCore/QSharedDataPointer ../../include/QtCore/QExplicitlySharedDataPointer ../../include/QtCore/QSharedPointer ../../include/QtCore/QWeakPointer ../../include/QtCore/QSize ../../include/QtCore/QSizeF ../../include/QtCore/QStack ../../include/QtCore/QStdWString ../../include/QtCore/QString ../../include/QtCore/QLatin1String ../../include/QtCore/QCharRef ../../include/QtCore/QConstString ../../include/QtCore/QStringRef ../../include/QtCore/QLatin1Literal ../../include/QtCore/QAbstractConcatenable ../../include/QtCore/QConcatenable ../../include/QtCore/QStringBuilder ../../include/QtCore/QStringListIterator ../../include/QtCore/QMutableStringListIterator ../../include/QtCore/QStringList ../../include/QtCore/QStringMatcher ../../include/QtCore/QTextBoundaryFinder ../../include/QtCore/QTimeLine ../../include/QtCore/QVarLengthArray ../../include/QtCore/QVectorData ../../include/QtCore/QVectorTypedData ../../include/QtCore/QVector ../../include/QtCore/QVectorIterator ../../include/QtCore/QMutableVectorIterator + SYNCQT.PRIVATE_HEADER_FILES = ../corelib/statemachine/qabstractstate_p.h ../corelib/statemachine/qabstracttransition_p.h ../corelib/statemachine/qeventtransition_p.h ../corelib/statemachine/qhistorystate_p.h ../corelib/statemachine/qsignaleventgenerator_p.h ../corelib/statemachine/qsignaltransition_p.h ../corelib/statemachine/qstate_p.h ../corelib/statemachine/qstatemachine_p.h ../corelib/thread/qmutex_p.h ../corelib/thread/qmutexpool_p.h ../corelib/thread/qorderedmutexlocker_p.h ../corelib/thread/qreadwritelock_p.h ../corelib/thread/qthread_p.h ../corelib/xml/qxmlstream_p.h ../corelib/xml/qxmlutils_p.h ../corelib/concurrent/qfutureinterface_p.h ../corelib/concurrent/qfuturewatcher_p.h ../corelib/concurrent/qthreadpool_p.h ../corelib/kernel/qabstracteventdispatcher_p.h ../corelib/kernel/qabstractitemmodel_p.h ../corelib/kernel/qcore_mac_p.h ../corelib/kernel/qcore_symbian_p.h ../corelib/kernel/qcore_unix_p.h ../corelib/kernel/qcoreapplication_p.h ../corelib/kernel/qcorecmdlineargs_p.h ../corelib/kernel/qcoreglobaldata_p.h ../corelib/kernel/qcrashhandler_p.h ../corelib/kernel/qeventdispatcher_blackberry_p.h ../corelib/kernel/qeventdispatcher_glib_p.h ../corelib/kernel/qeventdispatcher_symbian_p.h ../corelib/kernel/qeventdispatcher_unix_p.h ../corelib/kernel/qeventdispatcher_win_p.h ../corelib/kernel/qfunctions_p.h ../corelib/kernel/qmetaobject_p.h ../corelib/kernel/qobject_p.h ../corelib/kernel/qsharedmemory_p.h ../corelib/kernel/qsystemerror_p.h ../corelib/kernel/qsystemsemaphore_p.h ../corelib/kernel/qtranslator_p.h ../corelib/kernel/qvariant_p.h ../corelib/kernel/qwineventnotifier_p.h ../corelib/plugin/qelfparser_p.h ../corelib/plugin/qfactoryloader_p.h ../corelib/plugin/qlibrary_p.h ../corelib/plugin/qsystemlibrary_p.h ../corelib/global/qnumeric_p.h ../corelib/global/qt_pch.h ../corelib/codecs/qfontlaocodec_p.h ../corelib/codecs/qiconvcodec_p.h ../corelib/codecs/qisciicodec_p.h ../corelib/codecs/qlatincodec_p.h ../corelib/codecs/qsimplecodec_p.h ../corelib/codecs/qtextcodec_p.h ../corelib/codecs/qtsciicodec_p.h ../corelib/codecs/qutfcodec_p.h ../corelib/io/qabstractfileengine_p.h ../corelib/io/qdatastream_p.h ../corelib/io/qdataurl_p.h ../corelib/io/qdir_p.h ../corelib/io/qfile_p.h ../corelib/io/qfileinfo_p.h ../corelib/io/qfilesystemengine_p.h ../corelib/io/qfilesystementry_p.h ../corelib/io/qfilesystemiterator_p.h ../corelib/io/qfilesystemmetadata_p.h ../corelib/io/qfilesystemwatcher_dnotify_p.h ../corelib/io/qfilesystemwatcher_fsevents_p.h ../corelib/io/qfilesystemwatcher_inotify_p.h ../corelib/io/qfilesystemwatcher_kqueue_p.h ../corelib/io/qfilesystemwatcher_p.h ../corelib/io/qfilesystemwatcher_symbian_p.h ../corelib/io/qfilesystemwatcher_win_p.h ../corelib/io/qfsfileengine_iterator_p.h ../corelib/io/qfsfileengine_p.h ../corelib/io/qiodevice_p.h ../corelib/io/qnoncontiguousbytedevice_p.h ../corelib/io/qprocess_p.h ../corelib/io/qresource_iterator_p.h ../corelib/io/qresource_p.h ../corelib/io/qsettings_p.h ../corelib/io/qtldurl_p.h ../corelib/io/qurltlds_p.h ../corelib/io/qwindowspipewriter_p.h ../corelib/animation/qabstractanimation_p.h ../corelib/animation/qanimationgroup_p.h ../corelib/animation/qparallelanimationgroup_p.h ../corelib/animation/qpropertyanimation_p.h ../corelib/animation/qsequentialanimationgroup_p.h ../corelib/animation/qvariantanimation_p.h ../corelib/tools/qbytedata_p.h ../corelib/tools/qdatetime_p.h ../corelib/tools/qharfbuzz_p.h ../corelib/tools/qlocale_data_p.h ../corelib/tools/qlocale_p.h ../corelib/tools/qlocale_tools_p.h ../corelib/tools/qpodlist_p.h ../corelib/tools/qringbuffer_p.h ../corelib/tools/qscopedpointer_p.h ../corelib/tools/qsimd_p.h ../corelib/tools/qtools_p.h ../corelib/tools/qunicodetables_p.h diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0033-configure-support-c-0x-standard-for-directfd.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0033-configure-support-c-0x-standard-for-directfd.patch new file mode 100644 index 0000000000..f3face5755 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.6/0033-configure-support-c-0x-standard-for-directfd.patch @@ -0,0 +1,40 @@ +configure: support c++0x standard for directfd + +While directfd upgrade to 1.7.6, it always includes directfb++ utils +when C++ is used and set c++0x as c++ standard. +(In git://git.directfb.org/git/directfb/core/DirectFB.git +commit b444bcae3197be9faf883460dcc239ef757d5922, and commit +522beeb76f2a8d2dee30d928d2a5955bd06cf25c) + +The directfd in qt4 is c++, and there was a build failure: +... +| qdirectfbwindowsurface.cpp:336:69: error: in C++98 'rect' must be +initialized by constructor, not by '{...}' +| const DFBRectangle rect = { r.x(), r.y(), r.width(), r.height() }; +... + +The g++ used c++98 as default c++ standard, we should +explicitly set c++0x for directfd in qt4. + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure b/configure +index 5724bd6..ecc2f8b 100755 +--- a/configure ++++ b/configure +@@ -6656,6 +6656,7 @@ if [ "$PLATFORM_QWS" = "yes" ]; then + if [ "${screen}" = "directfb" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then + if test -n "$PKG_CONFIG" && "$PKG_CONFIG" --exists directfb 2>/dev/null; then + QT_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null` ++ QT_CFLAGS_DIRECTFB="$QT_CFLAGS_DIRECTFB -std=c++0x" + QT_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null` + elif directfb-config --version >/dev/null 2>&1; then + QT_CFLAGS_DIRECTFB=`directfb-config --cflags 2>/dev/null` +-- +1.9.1 + diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch new file mode 100644 index 0000000000..8ff4ad5062 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.6/0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch @@ -0,0 +1,44 @@ +From e50aa2252cdd5cb53eef7d8c4503c7edff634f68 Mon Sep 17 00:00:00 2001 +From: "Richard J. Moore" <rich@kde.org> +Date: Tue, 24 Feb 2015 19:02:35 +0000 +Subject: [PATCH] Fix a division by zero when processing malformed BMP files. + +This fixes a division by 0 when processing a maliciously crafted BMP +file. No impact beyond DoS. + +Backport of 661f6bfd032dacc62841037732816a583640e187 + +Upstream-Status: Backport + +Task-number: QTBUG-44547 +Change-Id: I43f06e752b11cb50669101460902a82b885ae618 +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +Signed-off-by: Jonathan Liu <net147@gmail.com> +--- + src/gui/image/qbmphandler.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp +index b22e842..30fa9e0 100644 +--- a/src/gui/image/qbmphandler.cpp ++++ b/src/gui/image/qbmphandler.cpp +@@ -319,10 +319,16 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int + } + } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) { + red_shift = calc_shift(red_mask); ++ if (((red_mask >> red_shift) + 1) == 0) ++ return false; + red_scale = 256 / ((red_mask >> red_shift) + 1); + green_shift = calc_shift(green_mask); ++ if (((green_mask >> green_shift) + 1) == 0) ++ return false; + green_scale = 256 / ((green_mask >> green_shift) + 1); + blue_shift = calc_shift(blue_mask); ++ if (((blue_mask >> blue_shift) + 1) == 0) ++ return false; + blue_scale = 256 / ((blue_mask >> blue_shift) + 1); + } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) { + blue_mask = 0x000000ff; +-- +2.3.1 + diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/Fix-QWSLock-invalid-argument-logs.patch b/meta/recipes-qt/qt4/qt4-4.8.6/Fix-QWSLock-invalid-argument-logs.patch new file mode 100644 index 0000000000..1f5f00f716 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.6/Fix-QWSLock-invalid-argument-logs.patch @@ -0,0 +1,98 @@ +From 52c34001bad85c3032618070b1d6b2a3c6880715 Mon Sep 17 00:00:00 2001 +From: Neil Jerram <n...@ossau.homelinux.net> +Date: Thu, 8 Nov 2012 08:18:32 +0000 +Subject: [PATCH] Fix QWSLock "invalid argument" logs + +There was no known actual problem associated with these logs, but they +were spamming the log, so I thought it worth trying to understand and +fix them. + +The confusion is that there are two different ways of creating QWSLock +objects. "QWSLock()" creates an object that creates a new set of +semaphores, whereas "QWSLock(id)" creates an object that aliases the +existing set of semaphores with ID id. What seems to happen is that +each application creates a semaphore set scoped to that +application (QWSDisplay::Data::clientLock in qapplication_qws.cpp), +then this semaphore set is passed by complex means to +places (QWSClientPrivate and QWSMemorySurface) that use the semaphores +for a short period and then delete their QWSLock objects. + +The problem was that the QWSLock destructor always destroyed the +semaphore set, even when that QWSLock hadn't create the semaphores +itself, hence making the semaphores invalid for other QWSLock objects +still referencing the same set. + +Clearly a QWSLock object shouldn't destroy the semaphore set if it +didn't create it itself, and that is confirmed by the fact that one of +the implementations inside QWSLock already implements this logic, with +the 'owned' flag. The fix is to implement this for the #ifndef +QT_POSIX_IPC case - which is what is used in QtMoko - just as is +already implemented for the #ifdef QT_POSIX_IPC case. + +Original patch can be found here: + http://www.mail-archive.com/community@lists.openmoko.org/msg65512.html + +Upstream-Status: Submitted + +Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> + (Removed the commented-out debug statements from the original patch.) + +--- + +diff --git a/src/gui/embedded/qwslock.cpp b/src/gui/embedded/qwslock.cpp +index 9914a24..1055785 100644 +--- a/src/gui/embedded/qwslock.cpp ++++ b/src/gui/embedded/qwslock.cpp +@@ -83,9 +83,12 @@ QWSLock::QWSLock(int id) : semId(id) + QWSSignalHandler::instance()->addWSLock(this); + #endif + ++ owned = false; ++ + #ifndef QT_POSIX_IPC + if (semId == -1) { + semId = semget(IPC_PRIVATE, 3, IPC_CREAT | 0666); ++ owned = true; + if (semId == -1) { + perror("QWSLock::QWSLock"); + qFatal("Unable to create semaphore"); +@@ -100,7 +104,6 @@ QWSLock::QWSLock(int id) : semId(id) + } + #else + sems[0] = sems[1] = sems[2] = SEM_FAILED; +- owned = false; + + if (semId == -1) { + // ### generate really unique IDs +@@ -134,9 +137,11 @@ QWSLock::~QWSLock() + + if (semId != -1) { + #ifndef QT_POSIX_IPC +- qt_semun semval; +- semval.val = 0; +- semctl(semId, 0, IPC_RMID, semval); ++ if (owned) { ++ qt_semun semval; ++ semval.val = 0; ++ semctl(semId, 0, IPC_RMID, semval); ++ } + semId = -1; + #else + // emulate the SEM_UNDO behavior for the BackingStore lock +diff --git a/src/gui/embedded/qwslock_p.h b/src/gui/embedded/qwslock_p.h +index d324e4f..d867d20 100644 +--- a/src/gui/embedded/qwslock_p.h ++++ b/src/gui/embedded/qwslock_p.h +@@ -86,8 +86,8 @@ private: + int lockCount[2]; + #ifdef QT_POSIX_IPC + sem_t *sems[3]; +- bool owned; + #endif ++ bool owned; + }; + + QT_END_NAMESPACE + +-- +1.7.10.4 diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index e87de4b379..ef5cf2cf24 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc @@ -9,7 +9,9 @@ QT4EDEPENDS = "" QT_BASE_LIB ?= "libqt-embedded" # Set necessary variables in the profile -SRC_URI += "file://qte.sh" +SRC_URI += "file://qte.sh \ + file://0033-configure-support-c-0x-standard-for-directfd.patch \ +" QT_EMBEDDED_FLAGS ?= " \ -embedded $QT_ARCH \ diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc index bb16da666a..70bda7358f 100644 --- a/meta/recipes-qt/qt4/qt4-native.inc +++ b/meta/recipes-qt/qt4/qt4-native.inc @@ -18,6 +18,10 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever file://0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch \ file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \ file://0021-configure-make-qt4-native-work-with-long-building-pa.patch \ + file://0029-aarch64_arm64_fix_arch_detection.patch \ + file://0030-aarch64_arm64_qatomic_support.patch \ + file://0031-aarch64_arm64_mkspecs.patch \ + file://0032-aarch64_add_header.patch \ file://g++.conf \ file://linux.conf \ " diff --git a/meta/recipes-qt/qt4/qt4_arch.inc b/meta/recipes-qt/qt4/qt4_arch.inc index c1d35ab726..07512db713 100644 --- a/meta/recipes-qt/qt4/qt4_arch.inc +++ b/meta/recipes-qt/qt4/qt4_arch.inc @@ -4,6 +4,7 @@ ARM_INSTRUCTION_SET = "arm" set_arch() { case ${TARGET_ARCH} in + aarch64) QT_ARCH=aarch64 ;; arm*) QT_ARCH=arm ;; i*86*) QT_ARCH=i386 ;; mips*) QT_ARCH=mips ;; diff --git a/meta/recipes-rt/rt-tests/files/Makefile-fix-gzip-command.patch b/meta/recipes-rt/rt-tests/files/Makefile-fix-gzip-command.patch new file mode 100644 index 0000000000..0a35ddc740 --- /dev/null +++ b/meta/recipes-rt/rt-tests/files/Makefile-fix-gzip-command.patch @@ -0,0 +1,30 @@ +From 07b5ed42d7041ccc084889eaa96817aa097bf461 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Tue, 3 Feb 2015 03:10:25 +0000 +Subject: [PATCH] Makefile: fix gzip command + +The "-c" doesn't work in command "gzip file -c", need use "gzip -c file" + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 219a591..c7d147a 100644 +--- a/Makefile ++++ b/Makefile +@@ -144,7 +144,7 @@ install_hwlatdetect: hwlatdetect + install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \ + rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \ + ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \ +- gzip src/hwlatdetect/hwlatdetect.8 -c >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ ++ gzip -c src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ + fi + + .PHONY: release +-- +2.0.1 + diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc index 7fbe6d45b8..4942701531 100644 --- a/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/meta/recipes-rt/rt-tests/rt-tests.inc @@ -7,6 +7,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests.git file://0002-rt-tests-Break-out-install_hwlatdetect.patch \ file://added-missing-dependencies.patch \ file://hackbench-fix-error-check.patch \ + file://Makefile-fix-gzip-command.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-sato/gaku/gaku_git.bb b/meta/recipes-sato/gaku/gaku_git.bb deleted file mode 100644 index 5e1cba55fa..0000000000 --- a/meta/recipes-sato/gaku/gaku_git.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Simple music player using GTK+ and GStreamer" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://main.c;beginline=1;endline=20;md5=0c02b4ef945956832b37a036b9cc103a" -DEPENDS = "gtk+ gstreamer libowl-av" - -RDEPENDS_${PN} = "gst-plugins-base-audioconvert \ - gst-plugins-base-audioresample \ - gst-plugins-base-typefindfunctions \ - gst-plugins-base-playbin" - -RRECOMMENDS_${PN} = "gst-plugins-good-id3demux \ - gst-plugins-base-vorbis \ - gst-plugins-base-alsa \ - gst-plugins-base-ogg \ - ${COMMERCIAL_AUDIO_PLUGINS}" - -SRCREV = "a0be2fe4b5f12b8b07f4e3bd624b3729657f0ac5" -PV = "0.1+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/${BPN}" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb index 6d4b96a1f9..62836f94d3 100644 --- a/meta/recipes-sato/images/core-image-sato-sdk.bb +++ b/meta/recipes-sato/images/core-image-sato-sdk.bb @@ -6,9 +6,10 @@ form a standalone SDK." QT4PKG = "qt4-pkgs" QT4PKG_mips64 = "" +QT4PKG_mips64n32 = "" IMAGE_FEATURES += "dev-pkgs tools-sdk ${QT4PKG} \ tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh" -IMAGE_INSTALL += "kernel-dev" +IMAGE_INSTALL += "kernel-devsrc" diff --git a/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch b/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch deleted file mode 100644 index 388f51f07f..0000000000 --- a/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -after gcc linking has changed, all the libraries must be explicitely specified to for linking. -This patch avoids this linking error: - -| make[2]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/matchbox-desktop-2.0+svnr2096-r0/matchbox-desktop-2/src'^M -| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -Wall -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o matchbox-desktop main.o taku-category-bar.o desktop.o ../libtaku/libtaku.a -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -ldbus-1 -lpthread -lrt -lstartup-notification-1 ../libtaku/libinotify.a^M -| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: F^A: invalid DSO for symbol `XFree' definition^M -| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so.6: could not read symbols: Bad value^M -| collect2: ld returned 1 exit status^M -| make[2]: *** [matchbox-desktop] Error 1 - -Nitin A Kamble <nitin.a.kamble@intel.com> -Date: 2011/01/11 - -Upstream-Status: Accepted - -Index: matchbox-desktop-2/configure.ac -=================================================================== ---- matchbox-desktop-2.orig/configure.ac -+++ matchbox-desktop-2/configure.ac -@@ -14,7 +14,7 @@ if test x$inotify_support = xyes; then - AC_DEFINE(WITH_INOTIFY, [1], [If inotify is enabled]) - fi - --PKG_CHECK_MODULES(GTK, gtk+-2.0) -+PKG_CHECK_MODULES(GTK, [gtk+-2.0 x11]) - - AC_ARG_ENABLE(startup_notification, - AC_HELP_STRING([--disable-startup-notification], [disable startup notification support]), diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb deleted file mode 100644 index 120f086445..0000000000 --- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Matchbox Window Manager Desktop" -LICENSE = "GPLv2.0+" -DEPENDS = "libmatchbox startup-notification" -SECTION = "x11/wm" - -SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2" - -SRC_URI[md5sum] = "3335a30b1a1aacfb39f23b505254765c" -SRC_URI[sha256sum] = "ecb025d3660d80a9850973111b4fdfffaa50b47cbf0c5467b508d28d65146793" - -EXTRA_OECONF = "--enable-startup-notification --enable-dnotify" - -inherit autotools pkgconfig - -FILES_${PN} = "${bindir}/* \ - ${datadir}/applications \ - ${libdir}/matchbox/desktop/*.so \ - ${datadir}/matchbox-desktop \ - ${datadir}/pixmaps \ - ${sysconfdir}/matchbox" - -FILES_${PN}-dev += "${libdir}/matchbox-desktop \ - ${includedir}/matchbox-desktop \ - ${libdir}/matchbox/desktop/*.*a \ - ${datadir}/matchbox/desktop/modules/*a" - -FILES_${PN}-dbg += "${libdir}/matchbox/desktop/.debug/" diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb deleted file mode 100644 index c52e7f2ca4..0000000000 --- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Matchbox Window Manager Desktop" -LICENSE = "GPLv2.0+" -DEPENDS = "gtk+ startup-notification" -SECTION = "x11/wm" -PR = "r2" - -SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/2.0/matchbox-desktop-${PV}.tar.bz2 \ - file://dso_linking_change_build_fix.patch" - -SRC_URI[md5sum] = "b0a4a47130272e2adab4e9feb43a6c9c" -SRC_URI[sha256sum] = "be33ff0bc8a9b1eee6af360a5118e470e69a6292ecc9e154ec6f349fce5c5f75" - -EXTRA_OECONF = "--enable-startup-notification" - -inherit autotools pkgconfig diff --git a/meta/recipes-sato/midori/midori_0.5.5.bb b/meta/recipes-sato/midori/midori_0.5.5.bb deleted file mode 100644 index a9379e7fff..0000000000 --- a/meta/recipes-sato/midori/midori_0.5.5.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "A lightweight web browser" -HOMEPAGE = "http://www.twotoasts.de/index.php?/pages/midori_summary.html" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -DEPENDS = "webkit-gtk libsoup-2.4 openssl python-native python-docutils-native librsvg-native libnotify libunique libxscrnsaver" - -SRC_URI = "http://www.midori-browser.org/downloads/${BPN}_${PV}_all_.tar.bz2 \ -" - -SRC_URI[md5sum] = "b99e87d4b73a4732ed1c1e591f0242ac" -SRC_URI[sha256sum] = "ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62" - -# midori depends on webkit-gtk, and webkit-gtk can NOT be built on -# MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily. -COMPATIBLE_HOST_mips64 = "mips64.*-linux$" - -inherit gtk-icon-cache pkgconfig vala pythonnative - -do_configure() { - sed -i -e 's:, shell=False::g' -e s:/usr/X11R6/include::g -e s:/usr/X11R6/lib::g wscript - ./configure \ - --prefix=${prefix} \ - --bindir=${bindir} \ - --sbindir=${sbindir} \ - --libexecdir=${libexecdir} \ - --datadir=${datadir} \ - --sysconfdir=${sysconfdir} \ - --sharedstatedir=${sharedstatedir} \ - --localstatedir=${localstatedir} \ - --libdir=${libdir} \ - --includedir=${includedir} \ - --infodir=${infodir} \ - --mandir=${mandir} \ - --disable-gtk3 \ - --disable-zeitgeist \ -} - -PARALLEL_MAKE = "" -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install() { - oe_runmake DESTDIR=${D} install -} - -RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme" - -FILES_${PN}-dev += "${datadir}/vala/vapi" diff --git a/meta/recipes-sato/midori/midori_0.5.8.bb b/meta/recipes-sato/midori/midori_0.5.8.bb new file mode 100644 index 0000000000..3aabdd4385 --- /dev/null +++ b/meta/recipes-sato/midori/midori_0.5.8.bb @@ -0,0 +1,26 @@ +SUMMARY = "A lightweight web browser" +HOMEPAGE = "http://midori-browser.org/" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +DEPENDS = "webkit-gtk libsoup-2.4 openssl python-native python-docutils-native librsvg-native libnotify libxscrnsaver" + +SRC_URI = "https://launchpad.net/midori/trunk/0.5.8/+download/${BPN}-${PV}.tar.bz2;subdir=${BPN}-${PV}" +SRC_URI[md5sum] = "b89e25e74199d705e74767499a415976" +SRC_URI[sha256sum] = "af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381" + +# midori depends on webkit-gtk, and webkit-gtk can NOT be built on +# MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily. +COMPATIBLE_HOST_mips64n32 = "null" + +inherit gtk-icon-cache pkgconfig vala pythonnative cmake + +EXTRA_OECMAKE = " \ + -DCMAKE_INSTALL_PREFIX=${prefix} \ + -DUSE_ZEITGEIST=0 \ +" + +TARGET_CC_ARCH += "${LDFLAGS}" + +RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme" + +FILES_${PN} += "${datadir}/appdata" diff --git a/meta/recipes-sato/owl-video-widget/libowl-av_git.bb b/meta/recipes-sato/owl-video-widget/libowl-av_git.bb deleted file mode 100644 index 2b768d5916..0000000000 --- a/meta/recipes-sato/owl-video-widget/libowl-av_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "OpenedHand Widget Library Audio/Video" -HOMEPAGE = "http://www.o-hand.com" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" - -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \ - file://libowl-av/owl-video-widget.h;endline=22;md5=0d4caab10952acdf470086c25c7f70c8 \ - file://libowl-av/owl-audio-player.h;endline=22;md5=4af2d44f206a086f9f03881236f7390b" - -SECTION = "x11" -DEPENDS = "gtk+ gstreamer gst-plugins-base" -RDEPENDS_${PN} = "gst-meta-base" -RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video" - -SRCREV = "03030c41ea578cfa74a2ffceb875675b248318ae" -PV = "0.1+git${SRCPV}" -PR = "r3" - - -SRC_URI = "git://git.yoctoproject.org/${BPN}" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig diff --git a/meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.desktop b/meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.desktop deleted file mode 100644 index e7af07ee64..0000000000 --- a/meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Video -Exec=video -Icon=video-player -Terminal=false -Type=Application -Categories=AudioVideo;Video;Player; -X-MB-SingleInstance=true -StartupNotify=true -Comment=Video Player diff --git a/meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.png b/meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.png Binary files differdeleted file mode 100644 index f463fe1864..0000000000 --- a/meta/recipes-sato/owl-video-widget/owl-video/owl-video-widget.png +++ /dev/null diff --git a/meta/recipes-sato/owl-video-widget/owl-video/stock_media-play.png b/meta/recipes-sato/owl-video-widget/owl-video/stock_media-play.png Binary files differdeleted file mode 100644 index c2b9c582a1..0000000000 --- a/meta/recipes-sato/owl-video-widget/owl-video/stock_media-play.png +++ /dev/null diff --git a/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-0.png b/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-0.png Binary files differdeleted file mode 100644 index f3f57143d4..0000000000 --- a/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-0.png +++ /dev/null diff --git a/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-max.png b/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-max.png Binary files differdeleted file mode 100644 index 03f5a03b45..0000000000 --- a/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-max.png +++ /dev/null diff --git a/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-med.png b/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-med.png Binary files differdeleted file mode 100644 index f774e42bb1..0000000000 --- a/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-med.png +++ /dev/null diff --git a/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-min.png b/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-min.png Binary files differdeleted file mode 100644 index f3f57143d4..0000000000 --- a/meta/recipes-sato/owl-video-widget/owl-video/stock_volume-min.png +++ /dev/null diff --git a/meta/recipes-sato/owl-video-widget/owl-video_git.bb b/meta/recipes-sato/owl-video-widget/owl-video_git.bb deleted file mode 100644 index db83154846..0000000000 --- a/meta/recipes-sato/owl-video-widget/owl-video_git.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "OpenedHand Widget Library video widget" -HOMEPAGE = "http://o-hand.com/" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" -LICENSE = "LGPLv2.1 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \ - file://src/video.c;endline=22;md5=e8e9f23c3691c11af7d8fc03264ca9da \ - file://src/bacon-volume.c;endline=20;md5=798804562b24e30bac482ba91c45e46d" -SECTION = "x11" -DEPENDS = "libowl-av" - -SRCREV = "07ab48f331a5e6e0d169e4892c7eb1fc22dc0b9d" -PV = "0.1+git${SRCPV}" -PR = "r2" - -S = "${WORKDIR}/git" - -SRC_URI = "git://git.yoctoproject.org/${BPN} \ - file://owl-video-widget.png \ - file://stock_media-play.png \ - file://stock_volume-0.png \ - file://stock_volume-min.png \ - file://stock_volume-med.png \ - file://stock_volume-max.png \ - file://owl-video-widget.desktop" - -inherit autotools pkgconfig - -do_install_append () { - install -d ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_media-play.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_volume-0.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_volume-min.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_volume-med.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_volume-max.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/owl-video-widget.png ${D}/${datadir}/pixmaps - - install -d ${D}/${datadir}/applications - install -m 0644 ${WORKDIR}/owl-video-widget.desktop ${D}/${datadir}/applications -} - -FILES_${PN} += "${datadir}/video" diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb index bc3e0fd260..2d046c4f7b 100644 --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb +++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb @@ -8,7 +8,9 @@ PR = "r33" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit packagegroup +inherit packagegroup distro_features_check +# rdepends on x11vnc +REQUIRED_DISTRO_FEATURES = "x11" PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games" @@ -49,7 +51,7 @@ WEB ?= "" SUMMARY_${PN}-apps = "Sato desktop - applications" RDEPENDS_${PN}-apps = "\ leafpad \ - gaku \ + gst-player-bin \ x11vnc \ matchbox-terminal \ sato-screenshot \ diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.1.2.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb index 14c5cd5d63..14f58ae68f 100644 --- a/meta/recipes-sato/pcmanfm/pcmanfm_1.1.2.bb +++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb @@ -13,15 +13,15 @@ DEPENDS_append_poky = " libowl" COMPATIBLE_HOST = '(x86_64.*|i.86.*|aarch64.*|arm.*|mips.*|powerpc.*|sh.*)-(linux|freebsd.*)' -SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \ +SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.xz \ file://gnome-fs-directory.png \ file://gnome-fs-regular.png \ file://gnome-mime-text-plain.png \ file://emblem-symbolic-link.png \ file://no-desktop.patch" -SRC_URI[md5sum] = "41104699e653ff2b0a9a9e80a257d6a2" -SRC_URI[sha256sum] = "23ee33b34066ac83ce9a98bc9930049e69839438fb60489bd453bec8c2068950" +SRC_URI[md5sum] = "c993402d407b0a3fc076f842ac1bc5c9" +SRC_URI[sha256sum] = "cfa8d82fc63be147045174bef074807e1e32ce8c6bf4dbd8fad49e260bcf6380" inherit autotools pkgconfig @@ -31,3 +31,5 @@ do_install_append () { install -m 0644 ${WORKDIR}/*.png ${D}/${datadir}/pixmaps } + +FILES_${PN} += "${libdir}/pcmanfm" diff --git a/meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch b/meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch new file mode 100644 index 0000000000..63ab0b888d --- /dev/null +++ b/meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch @@ -0,0 +1,30 @@ +Fix printf's for time_t value add castings because ISOC90 +don't support long long int that is used in x32 ABI for +time_t. + +Upstream-Status: Backport + +Signed-off-by: AnÃbal Limón <anibal.limon@linux.intel.com> + +--- a/magnets.c 2015-03-15 11:57:39.106674811 +0000 ++++ b/magnets.c 2015-03-15 11:57:58.638674795 +0000 +@@ -2562,7 +2562,7 @@ + goto done; + } + s = new_game(NULL, p, desc); +- printf("%s:%s (seed %ld)\n", id, desc, seed); ++ printf("%s:%s (seed %ld)\n", id, desc, (long) seed); + if (aux) { + /* We just generated this ourself. */ + if (verbose || print) { +--- a/signpost.c 2015-03-15 11:58:52.866674751 +0000 ++++ b/signpost.c 2015-03-15 11:59:08.190674738 +0000 +@@ -2393,7 +2393,7 @@ + } + } + +- sprintf(newseed, "%lu", time(NULL)); ++ sprintf(newseed, "%lu", (unsigned long) time(NULL)); + seedstr = dupstr(newseed); + + if (id || !stdin_desc) { diff --git a/meta/recipes-sato/puzzles/puzzles_r10116.bb b/meta/recipes-sato/puzzles/puzzles_r10116.bb index 6ee4d962b2..3bc2c85bb1 100644 --- a/meta/recipes-sato/puzzles/puzzles_r10116.bb +++ b/meta/recipes-sato/puzzles/puzzles_r10116.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc" SRC_URI = "svn://svn.tartarus.org/sgt;module=puzzles;rev=${MOD_PV} \ file://fix-compiling-failure-with-option-g-O.patch \ + file://puzzles_x32_abi_time.patch \ " S = "${WORKDIR}/${BPN}" diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc new file mode 100644 index 0000000000..04a43c079e --- /dev/null +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc @@ -0,0 +1,58 @@ +SECTION = "x11/utils" +SUMMARY = "rxvt terminal clone supporting unicode" +DESCRIPTION = "rxvt-unicode is a clone of the well known \ +terminal emulator rxvt, modified to store text in Unicode \ +(either UCS-2 or UCS-4) and to use locale-correct input and \ +output. It also supports mixing multiple fonts at the \ +same time, including Xft fonts." +DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf" + +SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ + file://xwc.patch \ + file://rxvt.desktop \ + file://rxvt.png" + +inherit autotools update-alternatives + +PROVIDES = "virtual/x-terminal-emulator" +ALTERNATIVE_${PN} = "x-terminal-emulator" +ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt" + +CFLAGS_append = " -fpermissive" + +EXTRA_OECONF = "--enable-xim \ + --enable-utmp --enable-wtmp --enable-lastlog \ + --with-term=rxvt --enable-keepscrolling \ + --enable-xft --with-name=rxvt --enable-frills \ + --enable-swapscreen --enable-transparency \ + --with-codesets=eu --enable-pointer-blank \ + --enable-text-blink --enable-rxvt-scroll \ + --enable-combining --disable-perl \ + --with-x=${STAGING_DIR_HOST}${prefix}" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[startup] = "--enable-startup-notification,--disable-startup-notification,startup-notification," + +do_configure_prepend () { + if [ ! -e ${S}/acinclude.m4 ]; then + cp ${S}/aclocal.m4 ${S}/acinclude.m4 + fi +} + +do_compile_prepend () { + echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h + echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h + echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h + echo '#define HAVE_XLOCALE 1' >> config.h +} + +do_install_append () { + install -d ${D}/${datadir} + install -d ${D}/${datadir}/applications + install -d ${D}/${datadir}/pixmaps/ + + install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications +} + +FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb index 3a1ea6633b..3480ec74bf 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb @@ -1,65 +1,8 @@ -SECTION = "x11/utils" -SUMMARY = "rxvt terminal clone supporting unicode" -DESCRIPTION = "rxvt-unicode is a clone of the well known \ -terminal emulator rxvt, modified to store text in Unicode \ -(either UCS-2 or UCS-4) and to use locale-correct input and \ -output. It also supports mixing multiple fonts at the \ -same time, including Xft fonts." +require rxvt-unicode.inc + LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://src/main.C;beginline=1;endline=31;md5=775485398a09fa7aee6f90464af88432" -DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf" - -SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ - file://xwc.patch \ - file://rxvt.desktop \ - file://rxvt.png" - SRC_URI[md5sum] = "4a5b823f08d21036f94a6c51e94d025b" SRC_URI[sha256sum] = "e73e13fe64b59fd3c8e6e20c00f149d388741f141b8155e4700d3ed40aa94b4e" - -inherit autotools update-alternatives - -PROVIDES = "virtual/x-terminal-emulator" -ALTERNATIVE_${PN} = "x-terminal-emulator" -ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt" - -CFLAGS_append = " -fpermissive" - -EXTRA_OECONF = "--enable-menubar --enable-xim \ - --enable-utmp --enable-wtmp --enable-lastlog \ - --disable-strings --with-term=rxvt --enable-keepscrolling \ - --enable-xft --with-name=rxvt --enable-frills \ - --enable-swapscreen --enable-transparency \ - --with-codesets=eu \ - --enable-cursor-blink --enable-pointer-blank \ - --enable-text-blink --enable-rxvt-scroll \ - --enable-combining --enable-shared \ - --enable-xgetdefault \ - --disable-perl \ - --with-x=${STAGING_DIR_HOST}${prefix}" - -do_configure_prepend () { - if [ ! -e ${S}/acinclude.m4 ]; then - cp ${S}/aclocal.m4 ${S}/acinclude.m4 - fi -} - -do_compile_prepend () { - echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h - echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h - echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h - echo '#define HAVE_XLOCALE 1' >> config.h -} - -do_install_append () { - install -d ${D}/${datadir} - install -d ${D}/${datadir}/applications - install -d ${D}/${datadir}/pixmaps/ - - install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications -} - -FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb new file mode 100644 index 0000000000..7049495e6d --- /dev/null +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb @@ -0,0 +1,8 @@ +require rxvt-unicode.inc + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://src/main.C;beginline=1;endline=31;md5=7dac0395806570856e037f98aba8513b" + +SRC_URI[md5sum] = "a9a06c608258c5fd247c3725d8f44582" +SRC_URI[sha256sum] = "75270ed72bc5895a64a1d7392bf45a622204192371c3965bd3dd978dc088956b" diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb index 29f8a7993f..15c73cfca8 100644 --- a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb +++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb @@ -32,7 +32,7 @@ SRC_URI[md5sum] = "dcbf9d5e2e6391f857c29a57528b32a6" SRC_URI[sha256sum] = "ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7" # webkit-gtk can NOT be built on MIPS64 with n32 ABI -COMPATIBLE_HOST_mips64 = "mips64.*-linux$" +COMPATIBLE_HOST_mips64n32 = "null" inherit autotools lib_package gtk-doc pkgconfig @@ -50,6 +50,8 @@ EXTRA_OECONF = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \ UNICODE_CFLAGS=-D_REENTRANT \ " +EXTRA_OECONF_append_armv5 = " --disable-jit" +EXTRA_OECONF_append_armv6 = " --disable-jit" #default unicode backend icu breaks in cross-compile when target and host are different endian type EXTRA_OECONF_append_powerpc = " --with-unicode-backend=glib" diff --git a/meta/recipes-support/apr/apr-util_1.5.3.bb b/meta/recipes-support/apr/apr-util_1.5.4.bb index 063a787396..6a14d14d41 100644 --- a/meta/recipes-support/apr/apr-util_1.5.3.bb +++ b/meta/recipes-support/apr/apr-util_1.5.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://apr.apache.org/" SECTION = "libs" DEPENDS = "apr expat gdbm" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \ @@ -15,8 +15,8 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "71a11d037240b292f824ba1eb537b4e3" -SRC_URI[sha256sum] = "76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743" +SRC_URI[md5sum] = "866825c04da827c6e5f53daff5569f42" +SRC_URI[sha256sum] = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19" EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \ @@ -28,22 +28,36 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --with-expat=${STAGING_DIR_HOST}${prefix}" -inherit autotools-brokensep lib_package binconfig +inherit autotools lib_package binconfig + +PR = "r1" OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" do_configure_append() { if [ "${CLASSOVERRIDE}" = "class-target" ]; then - cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk + cp ${STAGING_DATADIR}/apr/apr_rules.mk ${B}/build/rules.mk fi } do_configure_prepend_class-native() { - cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${S}/build/rules.mk + mkdir ${B}/build + cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${B}/build/rules.mk } do_configure_append_class-native() { - sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk + sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${B}/build/rules.mk # sometimes there isn't SHELL - sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk + sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${B}/build/rules.mk +} + +do_configure_prepend_class-nativesdk() { + cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk +} + +do_configure_append_class-nativesdk() { + sed -i "s#\(apr_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${S}/build/rules.mk + sed -i "s#\(apr_builders\)=.*#\1=${STAGING_DATADIR}/build-1#" ${S}/build/rules.mk + sed -i "s#\(top_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${S}/build/rules.mk + sed -i "s#\(LIBTOOL=\$(apr_builddir)\).*#\1/libtool#" ${S}/build/rules.mk } FILES_${PN} += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so" @@ -54,7 +68,7 @@ FILES_${PN}-staticdev += "${libdir}/apr-util-1/apr_dbm_gdbm.a" inherit ptest do_compile_ptest() { - cd ${S}/test + cd ${B}/test oe_runmake } @@ -62,6 +76,6 @@ do_install_ptest() { t=${D}${PTEST_PATH}/test mkdir $t for i in testall data; do \ - cp -r ${S}/test/$i $t; \ + cp -r ${B}/test/$i $t; \ done } diff --git a/meta/recipes-support/apr/apr_1.5.1.bb b/meta/recipes-support/apr/apr_1.5.1.bb index a27b2338d1..985ef67530 100644 --- a/meta/recipes-support/apr/apr_1.5.1.bb +++ b/meta/recipes-support/apr/apr_1.5.1.bb @@ -7,7 +7,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=4dfd4cd216828c8cae5de5a12f3844c8 \ file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://configure_fixes.patch \ diff --git a/meta/recipes-support/atk/at-spi2-atk_2.12.1.bb b/meta/recipes-support/atk/at-spi2-atk_2.14.1.bb index 4431c3d9eb..23913899ce 100644 --- a/meta/recipes-support/atk/at-spi2-atk_2.12.1.bb +++ b/meta/recipes-support/atk/at-spi2-atk_2.14.1.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "ae11df528f1f038987797f39c8357f81" -SRC_URI[sha256sum] = "5fa9c527bdec028e06797563cd52d49bcf06f638549df983424d88db89bb1336" +SRC_URI[md5sum] = "5c6a085249a6d4e792ead86dca183504" +SRC_URI[sha256sum] = "058f34ea60edf0a5f831c9f2bdd280fe95c1bcafb76e466e44aa0fb356d17bcb" DEPENDS = "dbus glib-2.0 atk at-spi2-core" diff --git a/meta/recipes-support/atk/at-spi2-core_2.12.0.bb b/meta/recipes-support/atk/at-spi2-core_2.14.1.bb index e67155ccbd..1a1ce6c5ee 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.12.0.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.14.1.bb @@ -4,17 +4,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" -SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ - file://core_acinclude_m4.patch \ - " +SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "b12ad0e0924706f5e7f51216241068ef" -SRC_URI[sha256sum] = "db550edd98e53b4252521459c2dcaf0f3b060a9bad52489b9dbadbaedad3fb89" +SRC_URI[md5sum] = "a37993cc50d90465c9aeed95e2ac439a" +SRC_URI[sha256sum] = "eef9660b14fdf0fb1f30d1be7c72d591fa7cbb87b00ca3a444425712f46ce657" DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native" -inherit autotools gtk-doc pkgconfig +inherit autotools gtk-doc pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" -EXTRA_OECONF = "--disable-introspection --disable-xevie" +EXTRA_OECONF = "--disable-introspection --disable-xevie --with-dbus-daemondir=${bindir}" FILES_${PN} += "${datadir}/dbus-1/services/*.service" diff --git a/meta/recipes-support/atk/atk_2.12.0.bb b/meta/recipes-support/atk/atk_2.14.0.bb index 9112bbb6c2..e0e9be3be9 100644 --- a/meta/recipes-support/atk/atk_2.12.0.bb +++ b/meta/recipes-support/atk/atk_2.14.0.bb @@ -5,8 +5,8 @@ SECTION = "x11/libs" LICENSE = "GPLv2+ & LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \ - file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7" + file://atk/atkutil.c;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 \ + file://atk/atk.h;endline=18;md5=fcd7710187e0eae485e356c30d1b0c3b" DEPENDS = "glib-2.0" @@ -14,8 +14,8 @@ inherit gnomebase gtk-doc GNOME_COMPRESS_TYPE = "xz" -SRC_URI[archive.md5sum] = "930238dec55fdbf8eda9975b44f07b76" -SRC_URI[archive.sha256sum] = "48a8431974639c5a59c24fcd3ece1a19709872d5dfe78907524d9f5e9993f18f" +SRC_URI[archive.md5sum] = "ecb7ca8469a5650581b1227d78051b8b" +SRC_URI[archive.sha256sum] = "2875cc0b32bfb173c066c22a337f79793e0c99d2cc5e81c4dac0d5a523b8fbad" BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/atk/files/core_acinclude_m4.patch b/meta/recipes-support/atk/files/core_acinclude_m4.patch deleted file mode 100644 index 29c538e2c3..0000000000 --- a/meta/recipes-support/atk/files/core_acinclude_m4.patch +++ /dev/null @@ -1,40 +0,0 @@ -at-spi2-core: fix alignof m4 macro - -DBIND_CHECK_ALIGNOF does not work when cross-compiling, so we modify -it to use AC_CHECK_ALIGNOF. - -Upstream-Status: Pending - -Signed-off-by: joe.slater@windriver.com - - ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -2,7 +2,26 @@ - # type alignment test # - ####################### - --AC_DEFUN([DBIND_CHECK_ALIGNOF], -+AC_DEFUN([DBIND_CHECK_ALIGNOF],[ -+AC_CHECK_ALIGNOF($1,[ -+#include <stdio.h> -+#include <stdlib.h> -+#define DBUS_API_SUBJECT_TO_CHANGE -+#include <dbus/dbus.h> -+typedef struct {char s1;} dbind_struct; -+typedef void *dbind_pointer; -+]) -+ -+dnl Note that we substitute for names like @DBIND_ALIGNOF_DBIND_STRUCT@, but -+dnl we #define names like ALIGNOF_DBIND_STRUCT in config.h! -+dnl -+AC_SUBST(translit(dbind_alignof_$1, [a-z *], [A-Z_P]),[$ac_cv_alignof_$1]) -+ -+]) -+ -+dnl The following does not work for cross-compilation. -+dnl -+AC_DEFUN([xDBIND_CHECK_ALIGNOF], - [changequote(<<, >>)dnl - dnl The name to #define. - define(<<AC_TYPE_NAME>>, diff --git a/meta/recipes-support/attr/acl.inc b/meta/recipes-support/attr/acl.inc index bc9fd6dda3..b2bc8bac28 100644 --- a/meta/recipes-support/attr/acl.inc +++ b/meta/recipes-support/attr/acl.inc @@ -36,4 +36,4 @@ do_install_ptest() { cp ${S}/include/builddefs ${S}/include/buildmacros ${S}/include/buildrules ${D}${PTEST_PATH}/include/ } -RDEPENDS_${PN}-ptest = "bash coreutils perl perl-module-filehandle perl-module-getopt-std perl-module-posix shadow" +RDEPENDS_${PN}-ptest = "acl bash coreutils perl perl-module-filehandle perl-module-getopt-std perl-module-posix shadow" diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc index 72f623e593..b17e9b10a4 100644 --- a/meta/recipes-support/attr/ea-acl.inc +++ b/meta/recipes-support/attr/ea-acl.inc @@ -7,7 +7,7 @@ inherit autotools-brokensep gettext # the package comes with a custom config.h.in, it cannot be # overwritten by autoheader -export AUTOHEADER = "true" +EXTRA_AUTORECONF += "--exclude=autoheader" EXTRA_OECONF = "INSTALL_USER=root INSTALL_GROUP=root" EXTRA_OECONF_append_class-native = " --enable-gettext=no" diff --git a/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch b/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch index 4737d9c430..b3298ce2db 100644 --- a/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch +++ b/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch @@ -9,7 +9,7 @@ Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> @@ -106,6 +106,16 @@ AC_ARG_WITH(python,[ --with-python[[=AR fi ]) - + +AC_ARG_WITH(dev-dsp,[ --with-dev-dsp enables dev/dsp for entropy producing. auto for auto-detecting dev/dep on host. [[default=no]]],[ + if test "$withval" = yes; then + AC_DEFINE([HAVE_DEV_DSP], 1) diff --git a/meta/recipes-support/boost/bjam-native_1.56.0.bb b/meta/recipes-support/boost/bjam-native_1.57.0.bb index d85d1a96cb..d85d1a96cb 100644 --- a/meta/recipes-support/boost/bjam-native_1.56.0.bb +++ b/meta/recipes-support/boost/bjam-native_1.57.0.bb diff --git a/meta/recipes-support/boost/boost-1.56.0.inc b/meta/recipes-support/boost/boost-1.57.0.inc index 24c32b4c6f..809419dbac 100644 --- a/meta/recipes-support/boost/boost-1.56.0.inc +++ b/meta/recipes-support/boost/boost-1.57.0.inc @@ -13,7 +13,7 @@ BOOST_P = "boost_${BOOST_VER}" SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" -SRC_URI[md5sum] = "a744cf167b05d72335f27c88115f211d" -SRC_URI[sha256sum] = "134732acaf3a6e7eba85988118d943f0fa6b7f0850f65131fff89823ad30ff1d" +SRC_URI[md5sum] = "1be49befbdd9a5ce9def2983ba3e7b76" +SRC_URI[sha256sum] = "910c8c022a33ccec7f088bd65d4f14b466588dda94ba2124e78b8c57db264967" S = "${WORKDIR}/${BOOST_P}" diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index d34ca7cbf1..6b42133aed 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -5,6 +5,8 @@ DEPENDS = "bjam-native zlib bzip2" ARM_INSTRUCTION_SET = "arm" BOOST_LIBS = "\ + atomic \ + chrono \ date_time \ filesystem \ graph \ @@ -90,7 +92,8 @@ EQD = '\"' #boost.bb: "... '-sGCC=... '${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}config${EQD}'${SQD} ..." BJAM_CONF = "${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}boost/config/platform/${TARGET_OS}.hpp${EQD}'${SQD}" -BJAM_TOOLS = "-sTOOLS=gcc \ +BJAM_TOOLS = "--ignore-site-config \ + '-sTOOLS=gcc' \ '-sGCC=${CC} '${BJAM_CONF} \ '-sGXX=${CXX} '${BJAM_CONF} \ '-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \ diff --git a/meta/recipes-support/boost/boost/0001-Added-support-for-extending-operations-to-GCC-atomic.patch b/meta/recipes-support/boost/boost/0001-Added-support-for-extending-operations-to-GCC-atomic.patch deleted file mode 100644 index feece81532..0000000000 --- a/meta/recipes-support/boost/boost/0001-Added-support-for-extending-operations-to-GCC-atomic.patch +++ /dev/null @@ -1,412 +0,0 @@ -From 415db7054723291042e4ff1ffa8fdd5bc8b07163 Mon Sep 17 00:00:00 2001 -From: Andrey Semashev <andrey.semashev@gmail.com> -Date: Sat, 27 Sep 2014 20:40:09 +0400 -Subject: [PATCH] Added support for extending operations to GCC atomic backend. - -Fix for #10446. Some platforms (e.g. Raspberry Pi) only support atomic ops of some particular size but not less. Use extending arithmetic operations for these platforms. Also, make sure bools are always treated as 8-bit values, even if the actual type is larger. This makes its use in atomic<>, atomic_flag and lock pool more consistent. - -Upstream-Status: Backport [https://svn.boost.org/trac/boost/ticket/10446] -Signed-off-by: Peter A. Bigot <pab@pabigot.com> - ---- - include/boost/atomic/capabilities.hpp | 1 + - include/boost/atomic/detail/atomic_template.hpp | 2 +- - include/boost/atomic/detail/caps_gcc_atomic.hpp | 82 +++++------ - include/boost/atomic/detail/ops_gcc_atomic.hpp | 184 +++++++++++++++++++++--- - 4 files changed, 206 insertions(+), 63 deletions(-) - -diff --git a/include/boost/atomic/capabilities.hpp b/include/boost/atomic/capabilities.hpp -index 658dd22..05bbb0f 100644 ---- a/include/boost/atomic/capabilities.hpp -+++ b/include/boost/atomic/capabilities.hpp -@@ -142,6 +142,7 @@ - #define BOOST_ATOMIC_ADDRESS_LOCK_FREE BOOST_ATOMIC_POINTER_LOCK_FREE - - #ifndef BOOST_ATOMIC_BOOL_LOCK_FREE -+// We store bools in 1-byte storage in all backends - #define BOOST_ATOMIC_BOOL_LOCK_FREE BOOST_ATOMIC_INT8_LOCK_FREE - #endif - -diff --git a/include/boost/atomic/detail/atomic_template.hpp b/include/boost/atomic/detail/atomic_template.hpp -index 4fd6d79..bc3922a 100644 ---- a/include/boost/atomic/detail/atomic_template.hpp -+++ b/include/boost/atomic/detail/atomic_template.hpp -@@ -234,7 +234,7 @@ class base_atomic< bool, int > - { - private: - typedef bool value_type; -- typedef atomics::detail::operations< storage_size_of< value_type >::value, false > operations; -+ typedef atomics::detail::operations< 1u, false > operations; - - protected: - typedef value_type value_arg_type; -diff --git a/include/boost/atomic/detail/caps_gcc_atomic.hpp b/include/boost/atomic/detail/caps_gcc_atomic.hpp -index 8299ad0..f4e7a70 100644 ---- a/include/boost/atomic/detail/caps_gcc_atomic.hpp -+++ b/include/boost/atomic/detail/caps_gcc_atomic.hpp -@@ -29,66 +29,48 @@ - #define BOOST_ATOMIC_DETAIL_X86_HAS_CMPXCHG16B 1 - #endif - --#if __GCC_ATOMIC_BOOL_LOCK_FREE == 2 --#define BOOST_ATOMIC_FLAG_LOCK_FREE 2 --#else --#define BOOST_ATOMIC_FLAG_LOCK_FREE 0 --#endif --#if __GCC_ATOMIC_CHAR_LOCK_FREE == 2 --#define BOOST_ATOMIC_CHAR_LOCK_FREE 2 --#else --#define BOOST_ATOMIC_CHAR_LOCK_FREE 0 --#endif --#if __GCC_ATOMIC_CHAR16_T_LOCK_FREE == 2 --#define BOOST_ATOMIC_CHAR16_T_LOCK_FREE 2 --#else --#define BOOST_ATOMIC_CHAR16_T_LOCK_FREE 0 --#endif --#if __GCC_ATOMIC_CHAR32_T_LOCK_FREE == 2 --#define BOOST_ATOMIC_CHAR32_T_LOCK_FREE 2 -+#if defined(BOOST_ATOMIC_DETAIL_X86_HAS_CMPXCHG16B) && (defined(BOOST_HAS_INT128) || !defined(BOOST_NO_ALIGNMENT)) -+#define BOOST_ATOMIC_INT128_LOCK_FREE 2 - #else --#define BOOST_ATOMIC_CHAR32_T_LOCK_FREE 0 -+#define BOOST_ATOMIC_INT128_LOCK_FREE 0 - #endif --#if __GCC_ATOMIC_WCHAR_T_LOCK_FREE == 2 --#define BOOST_ATOMIC_WCHAR_T_LOCK_FREE 2 -+ -+#if __GCC_ATOMIC_LLONG_LOCK_FREE == 2 -+#define BOOST_ATOMIC_LLONG_LOCK_FREE 2 - #else --#define BOOST_ATOMIC_WCHAR_T_LOCK_FREE 0 -+#define BOOST_ATOMIC_LLONG_LOCK_FREE BOOST_ATOMIC_INT128_LOCK_FREE - #endif --#if __GCC_ATOMIC_SHORT_LOCK_FREE == 2 --#define BOOST_ATOMIC_SHORT_LOCK_FREE 2 -+ -+#if __GCC_ATOMIC_LONG_LOCK_FREE == 2 -+#define BOOST_ATOMIC_LONG_LOCK_FREE 2 - #else --#define BOOST_ATOMIC_SHORT_LOCK_FREE 0 -+#define BOOST_ATOMIC_LONG_LOCK_FREE BOOST_ATOMIC_LLONG_LOCK_FREE - #endif -+ - #if __GCC_ATOMIC_INT_LOCK_FREE == 2 - #define BOOST_ATOMIC_INT_LOCK_FREE 2 - #else --#define BOOST_ATOMIC_INT_LOCK_FREE 0 --#endif --#if __GCC_ATOMIC_LONG_LOCK_FREE == 2 --#define BOOST_ATOMIC_LONG_LOCK_FREE 2 --#else --#define BOOST_ATOMIC_LONG_LOCK_FREE 0 -+#define BOOST_ATOMIC_INT_LOCK_FREE BOOST_ATOMIC_LONG_LOCK_FREE - #endif --#if __GCC_ATOMIC_LLONG_LOCK_FREE == 2 --#define BOOST_ATOMIC_LLONG_LOCK_FREE 2 -+ -+#if __GCC_ATOMIC_SHORT_LOCK_FREE == 2 -+#define BOOST_ATOMIC_SHORT_LOCK_FREE 2 - #else --#define BOOST_ATOMIC_LLONG_LOCK_FREE 0 -+#define BOOST_ATOMIC_SHORT_LOCK_FREE BOOST_ATOMIC_INT_LOCK_FREE - #endif --#if defined(BOOST_ATOMIC_DETAIL_X86_HAS_CMPXCHG16B) && (defined(BOOST_HAS_INT128) || !defined(BOOST_NO_ALIGNMENT)) --#define BOOST_ATOMIC_INT128_LOCK_FREE 2 -+ -+#if __GCC_ATOMIC_CHAR_LOCK_FREE == 2 -+#define BOOST_ATOMIC_CHAR_LOCK_FREE 2 - #else --#define BOOST_ATOMIC_INT128_LOCK_FREE 0 -+#define BOOST_ATOMIC_CHAR_LOCK_FREE BOOST_ATOMIC_SHORT_LOCK_FREE - #endif -+ - #if __GCC_ATOMIC_POINTER_LOCK_FREE == 2 - #define BOOST_ATOMIC_POINTER_LOCK_FREE 2 - #else - #define BOOST_ATOMIC_POINTER_LOCK_FREE 0 - #endif --#if __GCC_ATOMIC_BOOL_LOCK_FREE == 2 --#define BOOST_ATOMIC_BOOL_LOCK_FREE 2 --#else --#define BOOST_ATOMIC_BOOL_LOCK_FREE 0 --#endif -+ - - #define BOOST_ATOMIC_INT8_LOCK_FREE BOOST_ATOMIC_CHAR_LOCK_FREE - -@@ -128,6 +110,24 @@ - #define BOOST_ATOMIC_INT64_LOCK_FREE 0 - #endif - -+ -+#if __GCC_ATOMIC_WCHAR_T_LOCK_FREE == 2 -+#define BOOST_ATOMIC_WCHAR_T_LOCK_FREE 2 -+#elif BOOST_ATOMIC_DETAIL_SIZEOF_WCHAR_T == 8 -+#define BOOST_ATOMIC_WCHAR_T_LOCK_FREE BOOST_ATOMIC_INT64_LOCK_FREE -+#elif BOOST_ATOMIC_DETAIL_SIZEOF_WCHAR_T == 4 -+#define BOOST_ATOMIC_WCHAR_T_LOCK_FREE BOOST_ATOMIC_INT32_LOCK_FREE -+#elif BOOST_ATOMIC_DETAIL_SIZEOF_WCHAR_T == 2 -+#define BOOST_ATOMIC_WCHAR_T_LOCK_FREE BOOST_ATOMIC_INT16_LOCK_FREE -+#elif BOOST_ATOMIC_DETAIL_SIZEOF_WCHAR_T == 1 -+#define BOOST_ATOMIC_WCHAR_T_LOCK_FREE BOOST_ATOMIC_INT8_LOCK_FREE -+#else -+#define BOOST_ATOMIC_WCHAR_T_LOCK_FREE 0 -+#endif -+ -+#define BOOST_ATOMIC_CHAR32_T_LOCK_FREE BOOST_ATOMIC_INT32_LOCK_FREE -+#define BOOST_ATOMIC_CHAR16_T_LOCK_FREE BOOST_ATOMIC_INT16_LOCK_FREE -+ - #define BOOST_ATOMIC_THREAD_FENCE 2 - #define BOOST_ATOMIC_SIGNAL_FENCE 2 - -diff --git a/include/boost/atomic/detail/ops_gcc_atomic.hpp b/include/boost/atomic/detail/ops_gcc_atomic.hpp -index 2297791..2e4c37b 100644 ---- a/include/boost/atomic/detail/ops_gcc_atomic.hpp -+++ b/include/boost/atomic/detail/ops_gcc_atomic.hpp -@@ -24,6 +24,15 @@ - #include <boost/atomic/detail/ops_cas_based.hpp> - #endif - -+#if __GCC_ATOMIC_LLONG_LOCK_FREE != BOOST_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LONG_LOCK_FREE != BOOST_ATOMIC_LONG_LOCK_FREE ||\ -+ __GCC_ATOMIC_INT_LOCK_FREE != BOOST_ATOMIC_INT_LOCK_FREE || __GCC_ATOMIC_SHORT_LOCK_FREE != BOOST_ATOMIC_SHORT_LOCK_FREE ||\ -+ __GCC_ATOMIC_CHAR_LOCK_FREE != BOOST_ATOMIC_CHAR_LOCK_FREE || __GCC_ATOMIC_BOOL_LOCK_FREE != BOOST_ATOMIC_BOOL_LOCK_FREE ||\ -+ __GCC_ATOMIC_WCHAR_T_LOCK_FREE != BOOST_ATOMIC_WCHAR_T_LOCK_FREE -+// There are platforms where we need to use larger storage types -+#include <boost/atomic/detail/int_sizes.hpp> -+#include <boost/atomic/detail/ops_extending_cas_based.hpp> -+#endif -+ - #ifdef BOOST_HAS_PRAGMA_ONCE - #pragma once - #endif -@@ -154,73 +163,206 @@ struct gcc_atomic_operations - } - }; - --#if BOOST_ATOMIC_INT8_LOCK_FREE > 0 -+#if BOOST_ATOMIC_INT128_LOCK_FREE > 0 -+#if defined(__clang__) && defined(BOOST_ATOMIC_DETAIL_X86_HAS_CMPXCHG16B) -+ -+// Workaround for clang bug: http://llvm.org/bugs/show_bug.cgi?id=19149 -+// Clang 3.4 does not implement 128-bit __atomic* intrinsics even though it defines __GCC_HAVE_SYNC_COMPARE_AND_SWAP_16 - template< bool Signed > --struct operations< 1u, Signed > : -- public gcc_atomic_operations< typename make_storage_type< 1u, Signed >::type > -+struct operations< 16u, Signed > : -+ public cas_based_operations< gcc_dcas_x86_64< Signed > > - { - }; -+ -+#else -+ -+template< bool Signed > -+struct operations< 16u, Signed > : -+ public gcc_atomic_operations< typename make_storage_type< 16u, Signed >::type > -+{ -+}; -+ -+#endif - #endif - --#if BOOST_ATOMIC_INT16_LOCK_FREE > 0 -+ -+#if BOOST_ATOMIC_INT64_LOCK_FREE > 0 -+#if defined(__clang__) && defined(BOOST_ATOMIC_DETAIL_X86_HAS_CMPXCHG8B) -+ -+// Workaround for clang bug http://llvm.org/bugs/show_bug.cgi?id=19355 - template< bool Signed > --struct operations< 2u, Signed > : -- public gcc_atomic_operations< typename make_storage_type< 2u, Signed >::type > -+struct operations< 8u, Signed > : -+ public cas_based_operations< gcc_dcas_x86< Signed > > -+{ -+}; -+ -+#elif (BOOST_ATOMIC_DETAIL_SIZEOF_LLONG == 8 && __GCC_ATOMIC_LLONG_LOCK_FREE != BOOST_ATOMIC_LLONG_LOCK_FREE) ||\ -+ (BOOST_ATOMIC_DETAIL_SIZEOF_LONG == 8 && __GCC_ATOMIC_LONG_LOCK_FREE != BOOST_ATOMIC_LONG_LOCK_FREE) ||\ -+ (BOOST_ATOMIC_DETAIL_SIZEOF_INT == 8 && __GCC_ATOMIC_INT_LOCK_FREE != BOOST_ATOMIC_INT_LOCK_FREE) ||\ -+ (BOOST_ATOMIC_DETAIL_SIZEOF_SHORT == 8 && __GCC_ATOMIC_SHORT_LOCK_FREE != BOOST_ATOMIC_SHORT_LOCK_FREE) ||\ -+ (BOOST_ATOMIC_DETAIL_SIZEOF_WCHAR_T == 8 && __GCC_ATOMIC_WCHAR_T_LOCK_FREE != BOOST_ATOMIC_WCHAR_T_LOCK_FREE) -+ -+#define BOOST_ATOMIC_DETAIL_INT64_EXTENDED -+ -+template< bool Signed > -+struct operations< 8u, Signed > : -+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 16u, Signed >::type >, 8u, Signed > - { - }; -+ -+#else -+ -+template< bool Signed > -+struct operations< 8u, Signed > : -+ public gcc_atomic_operations< typename make_storage_type< 8u, Signed >::type > -+{ -+}; -+ -+#endif - #endif - - #if BOOST_ATOMIC_INT32_LOCK_FREE > 0 -+#if (BOOST_ATOMIC_DETAIL_SIZEOF_LLONG == 4 && __GCC_ATOMIC_LLONG_LOCK_FREE != BOOST_ATOMIC_LLONG_LOCK_FREE) ||\ -+ (BOOST_ATOMIC_DETAIL_SIZEOF_LONG == 4 && __GCC_ATOMIC_LONG_LOCK_FREE != BOOST_ATOMIC_LONG_LOCK_FREE) ||\ -+ (BOOST_ATOMIC_DETAIL_SIZEOF_INT == 4 && __GCC_ATOMIC_INT_LOCK_FREE != BOOST_ATOMIC_INT_LOCK_FREE) ||\ -+ (BOOST_ATOMIC_DETAIL_SIZEOF_SHORT == 4 && __GCC_ATOMIC_SHORT_LOCK_FREE != BOOST_ATOMIC_SHORT_LOCK_FREE) ||\ -+ (BOOST_ATOMIC_DETAIL_SIZEOF_WCHAR_T == 4 && __GCC_ATOMIC_WCHAR_T_LOCK_FREE != BOOST_ATOMIC_WCHAR_T_LOCK_FREE) -+ -+#define BOOST_ATOMIC_DETAIL_INT32_EXTENDED -+ -+#if !defined(BOOST_ATOMIC_DETAIL_INT64_EXTENDED) -+ -+template< bool Signed > -+struct operations< 4u, Signed > : -+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 8u, Signed >::type >, 4u, Signed > -+{ -+}; -+ -+#else // !defined(BOOST_ATOMIC_DETAIL_INT64_EXTENDED) -+ -+template< bool Signed > -+struct operations< 4u, Signed > : -+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 16u, Signed >::type >, 4u, Signed > -+{ -+}; -+ -+#endif // !defined(BOOST_ATOMIC_DETAIL_INT64_EXTENDED) -+ -+#else -+ - template< bool Signed > - struct operations< 4u, Signed > : - public gcc_atomic_operations< typename make_storage_type< 4u, Signed >::type > - { - }; -+ -+#endif - #endif - --#if BOOST_ATOMIC_INT64_LOCK_FREE > 0 --#if defined(__clang__) && defined(BOOST_ATOMIC_DETAIL_X86_HAS_CMPXCHG8B) -+#if BOOST_ATOMIC_INT16_LOCK_FREE > 0 -+#if (BOOST_ATOMIC_DETAIL_SIZEOF_LLONG == 2 && __GCC_ATOMIC_LLONG_LOCK_FREE != BOOST_ATOMIC_LLONG_LOCK_FREE) ||\ -+ (BOOST_ATOMIC_DETAIL_SIZEOF_LONG == 2 && __GCC_ATOMIC_LONG_LOCK_FREE != BOOST_ATOMIC_LONG_LOCK_FREE) ||\ -+ (BOOST_ATOMIC_DETAIL_SIZEOF_INT == 2 && __GCC_ATOMIC_INT_LOCK_FREE != BOOST_ATOMIC_INT_LOCK_FREE) ||\ -+ (BOOST_ATOMIC_DETAIL_SIZEOF_SHORT == 2 && __GCC_ATOMIC_SHORT_LOCK_FREE != BOOST_ATOMIC_SHORT_LOCK_FREE) ||\ -+ (BOOST_ATOMIC_DETAIL_SIZEOF_WCHAR_T == 2 && __GCC_ATOMIC_WCHAR_T_LOCK_FREE != BOOST_ATOMIC_WCHAR_T_LOCK_FREE) -+ -+#define BOOST_ATOMIC_DETAIL_INT16_EXTENDED -+ -+#if !defined(BOOST_ATOMIC_DETAIL_INT32_EXTENDED) - --// Workaround for clang bug http://llvm.org/bugs/show_bug.cgi?id=19355 - template< bool Signed > --struct operations< 8u, Signed > : -- public cas_based_operations< gcc_dcas_x86< Signed > > -+struct operations< 2u, Signed > : -+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 4u, Signed >::type >, 2u, Signed > -+{ -+}; -+ -+#elif !defined(BOOST_ATOMIC_DETAIL_INT64_EXTENDED) -+ -+template< bool Signed > -+struct operations< 2u, Signed > : -+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 8u, Signed >::type >, 2u, Signed > - { - }; - - #else - - template< bool Signed > --struct operations< 8u, Signed > : -- public gcc_atomic_operations< typename make_storage_type< 8u, Signed >::type > -+struct operations< 2u, Signed > : -+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 16u, Signed >::type >, 2u, Signed > -+{ -+}; -+ -+#endif -+ -+#else -+ -+template< bool Signed > -+struct operations< 2u, Signed > : -+ public gcc_atomic_operations< typename make_storage_type< 2u, Signed >::type > - { - }; - - #endif - #endif - --#if BOOST_ATOMIC_INT128_LOCK_FREE > 0 --#if defined(__clang__) && defined(BOOST_ATOMIC_DETAIL_X86_HAS_CMPXCHG16B) -+#if BOOST_ATOMIC_INT8_LOCK_FREE > 0 -+#if (BOOST_ATOMIC_DETAIL_SIZEOF_LLONG == 1 && __GCC_ATOMIC_LLONG_LOCK_FREE != BOOST_ATOMIC_LLONG_LOCK_FREE) ||\ -+ (BOOST_ATOMIC_DETAIL_SIZEOF_LONG == 1 && __GCC_ATOMIC_LONG_LOCK_FREE != BOOST_ATOMIC_LONG_LOCK_FREE) ||\ -+ (BOOST_ATOMIC_DETAIL_SIZEOF_INT == 1 && __GCC_ATOMIC_INT_LOCK_FREE != BOOST_ATOMIC_INT_LOCK_FREE) ||\ -+ (BOOST_ATOMIC_DETAIL_SIZEOF_SHORT == 1 && __GCC_ATOMIC_SHORT_LOCK_FREE != BOOST_ATOMIC_SHORT_LOCK_FREE) ||\ -+ (BOOST_ATOMIC_DETAIL_SIZEOF_WCHAR_T == 1 && __GCC_ATOMIC_WCHAR_T_LOCK_FREE != BOOST_ATOMIC_WCHAR_T_LOCK_FREE) ||\ -+ (__GCC_ATOMIC_CHAR_LOCK_FREE != BOOST_ATOMIC_CHAR_LOCK_FREE) ||\ -+ (__GCC_ATOMIC_BOOL_LOCK_FREE != BOOST_ATOMIC_BOOL_LOCK_FREE) -+ -+#if !defined(BOOST_ATOMIC_DETAIL_INT16_EXTENDED) - --// Workaround for clang bug: http://llvm.org/bugs/show_bug.cgi?id=19149 --// Clang 3.4 does not implement 128-bit __atomic* intrinsics even though it defines __GCC_HAVE_SYNC_COMPARE_AND_SWAP_16 - template< bool Signed > --struct operations< 16u, Signed > : -- public cas_based_operations< gcc_dcas_x86_64< Signed > > -+struct operations< 1u, Signed > : -+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 2u, Signed >::type >, 1u, Signed > -+{ -+}; -+ -+#elif !defined(BOOST_ATOMIC_DETAIL_INT32_EXTENDED) -+ -+template< bool Signed > -+struct operations< 1u, Signed > : -+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 4u, Signed >::type >, 1u, Signed > -+{ -+}; -+ -+#elif !defined(BOOST_ATOMIC_DETAIL_INT64_EXTENDED) -+ -+template< bool Signed > -+struct operations< 1u, Signed > : -+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 8u, Signed >::type >, 1u, Signed > - { - }; - - #else - - template< bool Signed > --struct operations< 16u, Signed > : -- public gcc_atomic_operations< typename make_storage_type< 16u, Signed >::type > -+struct operations< 1u, Signed > : -+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 16u, Signed >::type >, 1u, Signed > -+{ -+}; -+ -+#endif -+ -+#else -+ -+template< bool Signed > -+struct operations< 1u, Signed > : -+ public gcc_atomic_operations< typename make_storage_type< 1u, Signed >::type > - { - }; - - #endif - #endif - -+#undef BOOST_ATOMIC_DETAIL_INT16_EXTENDED -+#undef BOOST_ATOMIC_DETAIL_INT32_EXTENDED -+#undef BOOST_ATOMIC_DETAIL_INT64_EXTENDED -+ - BOOST_FORCEINLINE void thread_fence(memory_order order) BOOST_NOEXCEPT - { - __atomic_thread_fence(atomics::detail::convert_memory_order_to_gcc(order)); --- -1.8.5.5 - diff --git a/meta/recipes-support/boost/boost_1.56.0.bb b/meta/recipes-support/boost/boost_1.57.0.bb index dcc77bb87e..c09d5f431f 100644 --- a/meta/recipes-support/boost/boost_1.56.0.bb +++ b/meta/recipes-support/boost/boost_1.57.0.bb @@ -3,5 +3,4 @@ include boost.inc SRC_URI += "\ file://arm-intrinsics.patch \ - file://0001-Added-support-for-extending-operations-to-GCC-atomic.patch;striplevel=2 \ " diff --git a/meta/recipes-support/ca-certificates/ca-certificates/0001-Update-mozilla-certdata.txt-to-version-1.98.patch b/meta/recipes-support/ca-certificates/ca-certificates/0001-Update-mozilla-certdata.txt-to-version-1.98.patch deleted file mode 100644 index 19fa6bf654..0000000000 --- a/meta/recipes-support/ca-certificates/ca-certificates/0001-Update-mozilla-certdata.txt-to-version-1.98.patch +++ /dev/null @@ -1,227 +0,0 @@ -From 9d9b795cf1066eb62db3cb5bb5cf56bdf7159b98 Mon Sep 17 00:00:00 2001 -From: Michael Shuler <michael@pbandjelly.org> -Date: Sat, 12 Apr 2014 07:56:56 -0500 -Subject: [PATCH] Update mozilla/certdata.txt to version 1.98 - -This update only removes an untrusted cert for "Bogus kuix.de", which was -used for testing by mozilla. - -Upstream-Status: Backport -Signed-off-by: Saul Wold <sgw@linux.intel.com> - ---- - mozilla/certdata.txt | 182 --------------------------------------------------- - mozilla/nssckbi.h | 4 +- - 2 files changed, 2 insertions(+), 184 deletions(-) - -diff --git a/mozilla/certdata.txt b/mozilla/certdata.txt -index ae9cbc7..ca4c66b 100644 ---- a/mozilla/certdata.txt -+++ b/mozilla/certdata.txt -@@ -21686,188 +21686,6 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # --# Certificate "Bogus kuix.de" --# --# Issuer: CN=UTN-USERFirst-Hardware,OU=http://www.usertrust.com,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US --# Serial Number:72:03:21:05:c5:0c:08:57:3d:8e:a5:30:4e:fe:e8:b0 --# Subject: CN=kuix.de,OU=Comodo Trial SSL,OU=TEST USE ONLY - NO WARRANTY ATTACHED,OU=For Testing Purposes Only,O=Kai Engert,STREET=Test Street,L=Test City,ST=Test State,postalCode=12345,C=DE --# Not Valid Before: Thu Mar 17 00:00:00 2011 --# Not Valid After : Sat Apr 16 23:59:59 2011 --# Fingerprint (MD5): F7:5F:98:BC:D8:64:0C:16:E5:AE:EE:AA:00:F6:1F:07 --# Fingerprint (SHA1): 82:61:4B:EC:97:48:15:DE:CC:9A:CC:6E:84:21:71:79:B2:64:20:40 --CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE --CKA_TOKEN CK_BBOOL CK_TRUE --CKA_PRIVATE CK_BBOOL CK_FALSE --CKA_MODIFIABLE CK_BBOOL CK_FALSE --CKA_LABEL UTF8 "Bogus kuix.de" --CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 --CKA_SUBJECT MULTILINE_OCTAL --\060\201\361\061\013\060\011\006\003\125\004\006\023\002\104\105 --\061\016\060\014\006\003\125\004\021\023\005\061\062\063\064\065 --\061\023\060\021\006\003\125\004\010\023\012\124\145\163\164\040 --\123\164\141\164\145\061\022\060\020\006\003\125\004\007\023\011 --\124\145\163\164\040\103\151\164\171\061\024\060\022\006\003\125 --\004\011\023\013\124\145\163\164\040\123\164\162\145\145\164\061 --\023\060\021\006\003\125\004\012\023\012\113\141\151\040\105\156 --\147\145\162\164\061\042\060\040\006\003\125\004\013\023\031\106 --\157\162\040\124\145\163\164\151\156\147\040\120\165\162\160\157 --\163\145\163\040\117\156\154\171\061\055\060\053\006\003\125\004 --\013\023\044\124\105\123\124\040\125\123\105\040\117\116\114\131 --\040\055\040\116\117\040\127\101\122\122\101\116\124\131\040\101 --\124\124\101\103\110\105\104\061\031\060\027\006\003\125\004\013 --\023\020\103\157\155\157\144\157\040\124\162\151\141\154\040\123 --\123\114\061\020\060\016\006\003\125\004\003\023\007\153\165\151 --\170\056\144\145 --END --CKA_ID UTF8 "0" --CKA_ISSUER MULTILINE_OCTAL --\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123 --\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060 --\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153 --\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023 --\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116 --\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023 --\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162 --\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125 --\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163 --\164\055\110\141\162\144\167\141\162\145 --END --CKA_SERIAL_NUMBER MULTILINE_OCTAL --\002\020\162\003\041\005\305\014\010\127\075\216\245\060\116\376 --\350\260 --END --CKA_VALUE MULTILINE_OCTAL --\060\202\005\154\060\202\004\124\240\003\002\001\002\002\020\162 --\003\041\005\305\014\010\127\075\216\245\060\116\376\350\260\060 --\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201 --\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013 --\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006 --\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040 --\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124 --\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164 --\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150 --\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162 --\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003 --\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055 --\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063 --\061\067\060\060\060\060\060\060\132\027\015\061\061\060\064\061 --\066\062\063\065\071\065\071\132\060\201\361\061\013\060\011\006 --\003\125\004\006\023\002\104\105\061\016\060\014\006\003\125\004 --\021\023\005\061\062\063\064\065\061\023\060\021\006\003\125\004 --\010\023\012\124\145\163\164\040\123\164\141\164\145\061\022\060 --\020\006\003\125\004\007\023\011\124\145\163\164\040\103\151\164 --\171\061\024\060\022\006\003\125\004\011\023\013\124\145\163\164 --\040\123\164\162\145\145\164\061\023\060\021\006\003\125\004\012 --\023\012\113\141\151\040\105\156\147\145\162\164\061\042\060\040 --\006\003\125\004\013\023\031\106\157\162\040\124\145\163\164\151 --\156\147\040\120\165\162\160\157\163\145\163\040\117\156\154\171 --\061\055\060\053\006\003\125\004\013\023\044\124\105\123\124\040 --\125\123\105\040\117\116\114\131\040\055\040\116\117\040\127\101 --\122\122\101\116\124\131\040\101\124\124\101\103\110\105\104\061 --\031\060\027\006\003\125\004\013\023\020\103\157\155\157\144\157 --\040\124\162\151\141\154\040\123\123\114\061\020\060\016\006\003 --\125\004\003\023\007\153\165\151\170\056\144\145\060\201\237\060 --\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201 --\215\000\060\201\211\002\201\201\000\270\252\216\365\227\107\007 --\137\345\170\166\156\223\153\216\337\113\074\333\231\057\161\123 --\051\156\245\363\044\117\110\045\043\100\001\354\012\025\013\354 --\156\310\236\046\043\146\373\351\333\330\050\205\041\117\036\337 --\173\114\345\143\301\013\262\142\126\224\123\313\277\234\241\115 --\331\207\305\151\110\074\261\277\245\150\122\041\035\172\334\224 --\117\104\156\107\045\035\237\234\222\322\067\035\371\133\133\262 --\335\076\030\327\363\207\146\255\243\364\316\217\321\157\360\271 --\264\357\261\352\025\143\012\316\201\002\003\001\000\001\243\202 --\001\332\060\202\001\326\060\037\006\003\125\035\043\004\030\060 --\026\200\024\241\162\137\046\033\050\230\103\225\135\007\067\325 --\205\226\235\113\322\303\105\060\035\006\003\125\035\016\004\026 --\004\024\100\217\071\046\234\114\206\043\231\306\121\011\246\346 --\362\301\376\247\366\267\060\016\006\003\125\035\017\001\001\377 --\004\004\003\002\005\240\060\014\006\003\125\035\023\001\001\377 --\004\002\060\000\060\035\006\003\125\035\045\004\026\060\024\006 --\010\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005 --\007\003\002\060\106\006\003\125\035\040\004\077\060\075\060\073 --\006\014\053\006\001\004\001\262\061\001\002\001\003\004\060\053 --\060\051\006\010\053\006\001\005\005\007\002\001\026\035\150\164 --\164\160\163\072\057\057\163\145\143\165\162\145\056\143\157\155 --\157\144\157\056\143\157\155\057\103\120\123\060\173\006\003\125 --\035\037\004\164\060\162\060\070\240\066\240\064\206\062\150\164 --\164\160\072\057\057\143\162\154\056\143\157\155\157\144\157\143 --\141\056\143\157\155\057\125\124\116\055\125\123\105\122\106\151 --\162\163\164\055\110\141\162\144\167\141\162\145\056\143\162\154 --\060\066\240\064\240\062\206\060\150\164\164\160\072\057\057\143 --\162\154\056\143\157\155\157\144\157\056\156\145\164\057\125\124 --\116\055\125\123\105\122\106\151\162\163\164\055\110\141\162\144 --\167\141\162\145\056\143\162\154\060\161\006\010\053\006\001\005 --\005\007\001\001\004\145\060\143\060\073\006\010\053\006\001\005 --\005\007\060\002\206\057\150\164\164\160\072\057\057\143\162\164 --\056\143\157\155\157\144\157\143\141\056\143\157\155\057\125\124 --\116\101\144\144\124\162\165\163\164\123\145\162\166\145\162\103 --\101\056\143\162\164\060\044\006\010\053\006\001\005\005\007\060 --\001\206\030\150\164\164\160\072\057\057\157\143\163\160\056\143 --\157\155\157\144\157\143\141\056\143\157\155\060\037\006\003\125 --\035\021\004\030\060\026\202\007\153\165\151\170\056\144\145\202 --\013\167\167\167\056\153\165\151\170\056\144\145\060\015\006\011 --\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000 --\216\141\036\046\036\242\331\031\320\360\324\275\211\371\352\222 --\021\171\152\136\173\174\237\176\071\163\011\126\121\346\206\124 --\307\155\106\166\122\312\152\250\064\300\140\076\003\316\263\311 --\110\227\321\237\246\241\152\017\376\167\321\036\020\263\127\200 --\251\006\046\204\246\373\172\067\023\316\204\314\167\171\011\056 --\342\104\276\037\254\167\156\167\106\101\333\260\262\151\221\164 --\321\200\226\141\061\014\057\012\317\265\320\334\010\055\353\366 --\165\202\336\212\056\272\075\007\220\140\071\126\203\341\202\312 --\043\254\337\343\317\115\160\127\301\270\267\223\232\355\334\213 --\336\112\240\125\050\002\253\103\014\124\227\150\030\242\353\071 --\341\271\374\277\163\200\144\063\022\173\207\140\002\347\076\160 --\311\207\312\251\066\074\005\361\006\136\161\012\016\012\066\231 --\260\207\347\151\132\261\240\060\116\175\141\130\313\306\250\226 --\200\136\175\301\052\377\233\112\112\353\051\147\212\017\157\346 --\031\355\202\317\201\127\341\044\255\242\321\372\332\024\227\260 --\154\174\107\306\327\224\021\041\354\326\132\322\335\217\177\221 --END -- --# Trust for Certificate "Bogus kuix.de" --# Issuer: CN=UTN-USERFirst-Hardware,OU=http://www.usertrust.com,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US --# Serial Number:72:03:21:05:c5:0c:08:57:3d:8e:a5:30:4e:fe:e8:b0 --# Subject: CN=kuix.de,OU=Comodo Trial SSL,OU=TEST USE ONLY - NO WARRANTY ATTACHED,OU=For Testing Purposes Only,O=Kai Engert,STREET=Test Street,L=Test City,ST=Test State,postalCode=12345,C=DE --# Not Valid Before: Thu Mar 17 00:00:00 2011 --# Not Valid After : Sat Apr 16 23:59:59 2011 --# Fingerprint (MD5): F7:5F:98:BC:D8:64:0C:16:E5:AE:EE:AA:00:F6:1F:07 --# Fingerprint (SHA1): 82:61:4B:EC:97:48:15:DE:CC:9A:CC:6E:84:21:71:79:B2:64:20:40 --CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST --CKA_TOKEN CK_BBOOL CK_TRUE --CKA_PRIVATE CK_BBOOL CK_FALSE --CKA_MODIFIABLE CK_BBOOL CK_FALSE --CKA_LABEL UTF8 "Bogus kuix.de" --CKA_CERT_SHA1_HASH MULTILINE_OCTAL --\202\141\113\354\227\110\025\336\314\232\314\156\204\041\161\171 --\262\144\040\100 --END --CKA_CERT_MD5_HASH MULTILINE_OCTAL --\367\137\230\274\330\144\014\026\345\256\356\252\000\366\037\007 --END --CKA_ISSUER MULTILINE_OCTAL --\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123 --\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060 --\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153 --\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023 --\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116 --\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023 --\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162 --\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125 --\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163 --\164\055\110\141\162\144\167\141\162\145 --END --CKA_SERIAL_NUMBER MULTILINE_OCTAL --\002\020\162\003\041\005\305\014\010\127\075\216\245\060\116\376 --\350\260 --END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_NOT_TRUSTED --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED --CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -- --# - # Certificate "Go Daddy Root Certificate Authority - G2" - # - # Issuer: CN=Go Daddy Root Certificate Authority - G2,O="GoDaddy.com, Inc.",L=Scottsdale,ST=Arizona,C=US -diff --git a/mozilla/nssckbi.h b/mozilla/nssckbi.h -index fe89ed3..ba43e70 100644 ---- a/mozilla/nssckbi.h -+++ b/mozilla/nssckbi.h -@@ -45,8 +45,8 @@ - * of the comment in the CK_VERSION type definition. - */ - #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1 --#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 97 --#define NSS_BUILTINS_LIBRARY_VERSION "1.97" -+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 98 -+#define NSS_BUILTINS_LIBRARY_VERSION "1.98" - - /* These version numbers detail the semantic changes to the ckfw engine. */ - #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1 --- -1.8.3.1 - diff --git a/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch b/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch index 7e0ee4cd24..6a5d6da676 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch +++ b/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch @@ -4,13 +4,15 @@ update-ca-certificates: find SYSROOT relative to its own location This makes the script relocatable. ---- ca-certificates-20130119.orig/sbin/update-ca-certificates -+++ ca-certificates-20130119/sbin/update-ca-certificates -@@ -37,11 +37,44 @@ do +Index: git/sbin/update-ca-certificates +=================================================================== +--- git.orig/sbin/update-ca-certificates ++++ git/sbin/update-ca-certificates +@@ -37,6 +37,39 @@ do shift done - --CERTSCONF=$SYSROOT/etc/ca-certificates.conf + ++ +if [ -z "$SYSROOT" ]; then + local_which () { + if [ $# -lt 1 ]; then @@ -43,13 +45,6 @@ This makes the script relocatable. + SYSROOT= + fi +fi -+ + CERTSCONF=$SYSROOT/etc/ca-certificates.conf CERTSDIR=$SYSROOT/usr/share/ca-certificates -+CERTSCONF=$SYSROOT/etc/ca-certificates.conf -+ETCCERTSDIR=$SYSROOT/etc/ssl/certs LOCALCERTSDIR=$SYSROOT/usr/local/share/ca-certificates - CERTBUNDLE=ca-certificates.crt --ETCCERTSDIR=$SYSROOT/etc/ssl/certs - - cleanup() { - rm -f "$TEMPBUNDLE" diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20140325.bb b/meta/recipes-support/ca-certificates/ca-certificates_20141019.bb index a277036cfb..421b87ec02 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates_20140325.bb +++ b/meta/recipes-support/ca-certificates/ca-certificates_20141019.bb @@ -5,14 +5,14 @@ This derived from Debian's CA Certificates." HOMEPAGE = "http://packages.debian.org/sid/ca-certificates" SECTION = "misc" LICENSE = "GPL-2.0+ & MPL-2.0" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=0ee6c253e6406c76bfe261deaf5a60b5" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=48d2baf97986999e776b43c8dd9e0c5a" # This is needed to ensure we can run the postinst at image creation time DEPENDS = "ca-certificates-native" DEPENDS_class-native = "" # tag: debian/20140325 + 2 -SRCREV = "1ce8e63dcfea6b9258da356dc023895e6f694144" +SRCREV = "2b8a047c78aadbecd90bf8e49ccf68898a211610" SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \ file://0001-update-ca-certificates-remove-c-rehash.patch \ @@ -20,8 +20,6 @@ SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \ file://default-sysroot.patch \ file://sbindir.patch" -SRC_URI += "file://0001-Update-mozilla-certdata.txt-to-version-1.98.patch" - S = "${WORKDIR}/git" inherit allarch @@ -31,6 +29,10 @@ EXTRA_OEMAKE = "\ 'SBINDIR=${sbindir}' \ " +do_compile_prepend() { + oe_runmake clean +} + do_install () { install -d ${D}${datadir}/ca-certificates \ ${D}${sysconfdir}/ssl/certs \ diff --git a/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/meta/recipes-support/consolekit/consolekit_0.4.6.bb index dfbd11c2d1..66a892a7df 100644 --- a/meta/recipes-support/consolekit/consolekit_0.4.6.bb +++ b/meta/recipes-support/consolekit/consolekit_0.4.6.bb @@ -9,7 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ DEPENDS = "glib-2.0 glib-2.0-native dbus dbus-glib virtual/libx11" RDEPENDS_${PN} += "base-files" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${PV}.tar.xz \ file://sepbuildfix.patch \ diff --git a/meta/recipes-support/createrepo/createrepo/createrepo-dbpath.patch b/meta/recipes-support/createrepo/createrepo/createrepo-dbpath.patch new file mode 100644 index 0000000000..72755981a9 --- /dev/null +++ b/meta/recipes-support/createrepo/createrepo/createrepo-dbpath.patch @@ -0,0 +1,61 @@ +createrepo: Implement --dbpath command line option + +--dbpath option allows to specify path to the directory +with rpm database. By default createrepo uses or creates +rpm database in /var/lib/rpm/ + +Upstream-Status: Pending + +Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> + +--- createrepo-0.4.11.orig/genpkgmetadata.py 2015-03-30 22:18:19.904000000 +0300 ++++ createrepo-0.4.11/genpkgmetadata.py 2015-03-30 22:28:49.208000000 +0300 +@@ -65,6 +65,7 @@ + -p, --pretty = output xml files in pretty format. + --update = update existing metadata (if present) + -d, --database = generate the sqlite databases. ++ --dbpath <dir> = specify path to rpm db directory. + """) + + sys.exit(retval) +@@ -72,10 +73,13 @@ + class MetaDataGenerator: + def __init__(self, cmds): + self.cmds = cmds +- self.ts = rpm.TransactionSet() + self.pkgcount = 0 + self.files = [] + ++ if self.cmds['dbpath']: ++ rpm.addMacro("_dbpath", self.cmds['dbpath']) ++ self.ts = rpm.TransactionSet() ++ + def _os_path_walk(self, top, func, arg): + """Directory tree walk with callback function. + copy of os.path.walk, fixes the link/stating problem +@@ -435,6 +439,7 @@ + cmds['dir-pattern-match'] = ['.*bin\/.*', '^\/etc\/.*'] + cmds['skip-symlinks'] = False + cmds['pkglist'] = [] ++ cmds['dbpath'] = None + + try: + gopts, argsleft = getopt.getopt(args, 'phqVvndg:s:x:u:c:o:CSi:', ['help', 'exclude=', +@@ -442,7 +447,7 @@ + 'baseurl=', 'groupfile=', 'checksum=', + 'version', 'pretty', 'split', 'outputdir=', + 'noepoch', 'checkts', 'database', 'update', +- 'skip-symlinks', 'pkglist=']) ++ 'skip-symlinks', 'pkglist=', 'dbpath=']) + except getopt.error, e: + errorprint(_('Options Error: %s.') % e) + usage() +@@ -516,6 +521,8 @@ + cmds['skip-symlinks'] = True + elif arg in ['-i', '--pkglist']: + cmds['pkglist'] = a ++ elif arg == '--dbpath': ++ cmds['dbpath'] = os.path.realpath(a) + + except ValueError, e: + errorprint(_('Options Error: %s') % e) diff --git a/meta/recipes-support/createrepo/createrepo_0.4.11.bb b/meta/recipes-support/createrepo/createrepo_0.4.11.bb index 49b45fc3b8..adc193e428 100644 --- a/meta/recipes-support/createrepo/createrepo_0.4.11.bb +++ b/meta/recipes-support/createrepo/createrepo_0.4.11.bb @@ -14,6 +14,7 @@ SRC_URI= "http://createrepo.baseurl.org/download/${BP}.tar.gz \ file://python-scripts-should-use-interpreter-from-env.patch \ file://createrepo-rpm549.patch \ file://recommends.patch \ + file://createrepo-dbpath.patch \ file://rpm-createsolvedb.py \ " diff --git a/meta/recipes-support/curl/curl/CVE-2014-3613.patch b/meta/recipes-support/curl/curl/CVE-2014-3613.patch deleted file mode 100644 index 3e2fee0413..0000000000 --- a/meta/recipes-support/curl/curl/CVE-2014-3613.patch +++ /dev/null @@ -1,269 +0,0 @@ -From 545e322cc8c383ccdfb4ad85a1634c2b719a1adf Mon Sep 17 00:00:00 2001 -From: Tim Ruehsen <tim.ruehsen@gmx.de> -Date: Tue, 19 Aug 2014 21:01:28 +0200 -Subject: [PATCH] cookies: only use full host matches for hosts used as IP - address - -By not detecting and rejecting domain names for partial literal IP -addresses properly when parsing received HTTP cookies, libcurl can be -fooled to both send cookies to wrong sites and to allow arbitrary sites -to set cookies for others. - -CVE-2014-3613 - -Bug: http://curl.haxx.se/docs/adv_20140910A.html - -Upstream-Status: Backport - -Signed-off-by: Chong Lu <Chong.Lu@windriver.com> ---- - lib/cookie.c | 50 ++++++++++++++++++++++++++++++++++++++---------- - tests/data/test1105 | 3 +-- - tests/data/test31 | 55 +++++++++++++++++++++++++++-------------------------- - tests/data/test8 | 3 ++- - 4 files changed, 71 insertions(+), 40 deletions(-) - -diff --git a/lib/cookie.c b/lib/cookie.c -index 0590643..46904ac 100644 ---- a/lib/cookie.c -+++ b/lib/cookie.c -@@ -93,10 +93,11 @@ Example set of cookies: - #include "curl_memory.h" - #include "share.h" - #include "strtoofft.h" - #include "rawstr.h" - #include "curl_memrchr.h" -+#include "inet_pton.h" - - /* The last #include file should be: */ - #include "memdebug.h" - - static void freecookie(struct Cookie *co) -@@ -317,10 +318,32 @@ static void remove_expired(struct CookieInfo *cookies) - } - co = nx; - } - } - -+/* -+ * Return true if the given string is an IP(v4|v6) address. -+ */ -+static bool isip(const char *domain) -+{ -+ struct in_addr addr; -+#ifdef ENABLE_IPV6 -+ struct in6_addr addr6; -+#endif -+ -+ if(Curl_inet_pton(AF_INET, domain, &addr) -+#ifdef ENABLE_IPV6 -+ || Curl_inet_pton(AF_INET6, domain, &addr6) -+#endif -+ ) { -+ /* domain name given as IP address */ -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ - /**************************************************************************** - * - * Curl_cookie_add() - * - * Add a single cookie line to the cookie keeping object. -@@ -437,28 +460,31 @@ Curl_cookie_add(struct SessionHandle *data, - badcookie = TRUE; /* out of memory bad */ - break; - } - } - else if(Curl_raw_equal("domain", name)) { -+ bool is_ip; -+ - /* Now, we make sure that our host is within the given domain, - or the given domain is not valid and thus cannot be set. */ - - if('.' == whatptr[0]) - whatptr++; /* ignore preceding dot */ - -- if(!domain || tailmatch(whatptr, domain)) { -- const char *tailptr=whatptr; -- if(tailptr[0] == '.') -- tailptr++; -- strstore(&co->domain, tailptr); /* don't prefix w/dots -- internally */ -+ is_ip = isip(domain ? domain : whatptr); -+ -+ if(!domain -+ || (is_ip && !strcmp(whatptr, domain)) -+ || (!is_ip && tailmatch(whatptr, domain))) { -+ strstore(&co->domain, whatptr); - if(!co->domain) { - badcookie = TRUE; - break; - } -- co->tailmatch=TRUE; /* we always do that if the domain name was -- given */ -+ if(!is_ip) -+ co->tailmatch=TRUE; /* we always do that if the domain name was -+ given */ - } - else { - /* we did not get a tailmatch and then the attempted set domain - is not a domain to which the current host belongs. Mark as - bad. */ -@@ -966,17 +992,21 @@ struct Cookie *Curl_cookie_getlist(struct CookieInfo *c, - struct Cookie *newco; - struct Cookie *co; - time_t now = time(NULL); - struct Cookie *mainco=NULL; - size_t matches = 0; -+ bool is_ip; - - if(!c || !c->cookies) - return NULL; /* no cookie struct or no cookies in the struct */ - - /* at first, remove expired cookies */ - remove_expired(c); - -+ /* check if host is an IP(v4|v6) address */ -+ is_ip = isip(host); -+ - co = c->cookies; - - while(co) { - /* only process this cookie if it is not expired or had no expire - date AND that if the cookie requires we're secure we must only -@@ -984,12 +1014,12 @@ struct Cookie *Curl_cookie_getlist(struct CookieInfo *c, - if((!co->expires || (co->expires > now)) && - (co->secure?secure:TRUE)) { - - /* now check if the domain is correct */ - if(!co->domain || -- (co->tailmatch && tailmatch(co->domain, host)) || -- (!co->tailmatch && Curl_raw_equal(host, co->domain)) ) { -+ (co->tailmatch && !is_ip && tailmatch(co->domain, host)) || -+ ((!co->tailmatch || is_ip) && Curl_raw_equal(host, co->domain)) ) { - /* the right part of the host matches the domain stuff in the - cookie data */ - - /* now check the left part of the path with the cookies path - requirement */ -diff --git a/tests/data/test1105 b/tests/data/test1105 -index 25f194c..9564775 100644 ---- a/tests/data/test1105 -+++ b/tests/data/test1105 -@@ -57,10 +57,9 @@ userid=myname&password=mypassword - # Netscape HTTP Cookie File - # http://curl.haxx.se/docs/http-cookies.html - # This file was generated by libcurl! Edit at your own risk. - - 127.0.0.1 FALSE /we/want/ FALSE 0 foobar name --.127.0.0.1 TRUE "/silly/" FALSE 0 mismatch this --.0.0.1 TRUE / FALSE 0 partmatch present -+127.0.0.1 FALSE "/silly/" FALSE 0 mismatch this - </file> - </verify> - </testcase> -diff --git a/tests/data/test31 b/tests/data/test31 -index 38af83b..dfcac04 100644 ---- a/tests/data/test31 -+++ b/tests/data/test31 -@@ -49,11 +49,12 @@ Set-Cookie: nodomainnovalue - Set-Cookie: nodomain=value; expires=Fri Feb 2 11:56:27 GMT 2035
- Set-Cookie: novalue; domain=reallysilly
- Set-Cookie: test=yes; domain=foo.com; expires=Sat Feb 2 11:56:27 GMT 2030
- Set-Cookie: test2=yes; domain=se; expires=Sat Feb 2 11:56:27 GMT 2030
- Set-Cookie: magic=yessir; path=/silly/; HttpOnly
--Set-Cookie: blexp=yesyes; domain=.0.0.1; domain=.0.0.1; expiry=totally bad;
-+Set-Cookie: blexp=yesyes; domain=127.0.0.1; domain=127.0.0.1; expiry=totally bad;
-+Set-Cookie: partialip=nono; domain=.0.0.1;
-
- boo - </data> - </reply> - -@@ -93,36 +94,36 @@ Accept: */* - <file name="log/jar31.txt" mode="text"> - # Netscape HTTP Cookie File - # http://curl.haxx.se/docs/http-cookies.html - # This file was generated by libcurl! Edit at your own risk. - --.127.0.0.1 TRUE /silly/ FALSE 0 ismatch this --.127.0.0.1 TRUE /overwrite FALSE 0 overwrite this2 --.127.0.0.1 TRUE /secure1/ TRUE 0 sec1value secure1 --.127.0.0.1 TRUE /secure2/ TRUE 0 sec2value secure2 --.127.0.0.1 TRUE /secure3/ TRUE 0 sec3value secure3 --.127.0.0.1 TRUE /secure4/ TRUE 0 sec4value secure4 --.127.0.0.1 TRUE /secure5/ TRUE 0 sec5value secure5 --.127.0.0.1 TRUE /secure6/ TRUE 0 sec6value secure6 --.127.0.0.1 TRUE /secure7/ TRUE 0 sec7value secure7 --.127.0.0.1 TRUE /secure8/ TRUE 0 sec8value secure8 --.127.0.0.1 TRUE /secure9/ TRUE 0 secure very1 --#HttpOnly_.127.0.0.1 TRUE /p1/ FALSE 0 httpo1 value1 --#HttpOnly_.127.0.0.1 TRUE /p2/ FALSE 0 httpo2 value2 --#HttpOnly_.127.0.0.1 TRUE /p3/ FALSE 0 httpo3 value3 --#HttpOnly_.127.0.0.1 TRUE /p4/ FALSE 0 httpo4 value4 --#HttpOnly_.127.0.0.1 TRUE /p4/ FALSE 0 httponly myvalue1 --#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec myvalue2 --#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec2 myvalue3 --#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec3 myvalue4 --#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec4 myvalue5 --#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec5 myvalue6 --#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec6 myvalue7 --#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec7 myvalue8 --#HttpOnly_.127.0.0.1 TRUE /p4/ TRUE 0 httpandsec8 myvalue9 --.127.0.0.1 TRUE / FALSE 0 partmatch present -+127.0.0.1 FALSE /silly/ FALSE 0 ismatch this -+127.0.0.1 FALSE /overwrite FALSE 0 overwrite this2 -+127.0.0.1 FALSE /secure1/ TRUE 0 sec1value secure1 -+127.0.0.1 FALSE /secure2/ TRUE 0 sec2value secure2 -+127.0.0.1 FALSE /secure3/ TRUE 0 sec3value secure3 -+127.0.0.1 FALSE /secure4/ TRUE 0 sec4value secure4 -+127.0.0.1 FALSE /secure5/ TRUE 0 sec5value secure5 -+127.0.0.1 FALSE /secure6/ TRUE 0 sec6value secure6 -+127.0.0.1 FALSE /secure7/ TRUE 0 sec7value secure7 -+127.0.0.1 FALSE /secure8/ TRUE 0 sec8value secure8 -+127.0.0.1 FALSE /secure9/ TRUE 0 secure very1 -+#HttpOnly_127.0.0.1 FALSE /p1/ FALSE 0 httpo1 value1 -+#HttpOnly_127.0.0.1 FALSE /p2/ FALSE 0 httpo2 value2 -+#HttpOnly_127.0.0.1 FALSE /p3/ FALSE 0 httpo3 value3 -+#HttpOnly_127.0.0.1 FALSE /p4/ FALSE 0 httpo4 value4 -+#HttpOnly_127.0.0.1 FALSE /p4/ FALSE 0 httponly myvalue1 -+#HttpOnly_127.0.0.1 FALSE /p4/ TRUE 0 httpandsec myvalue2 -+#HttpOnly_127.0.0.1 FALSE /p4/ TRUE 0 httpandsec2 myvalue3 -+#HttpOnly_127.0.0.1 FALSE /p4/ TRUE 0 httpandsec3 myvalue4 -+#HttpOnly_127.0.0.1 FALSE /p4/ TRUE 0 httpandsec4 myvalue5 -+#HttpOnly_127.0.0.1 FALSE /p4/ TRUE 0 httpandsec5 myvalue6 -+#HttpOnly_127.0.0.1 FALSE /p4/ TRUE 0 httpandsec6 myvalue7 -+#HttpOnly_127.0.0.1 FALSE /p4/ TRUE 0 httpandsec7 myvalue8 -+#HttpOnly_127.0.0.1 FALSE /p4/ TRUE 0 httpandsec8 myvalue9 -+127.0.0.1 FALSE / FALSE 0 partmatch present - 127.0.0.1 FALSE /we/want/ FALSE 2054030187 nodomain value - #HttpOnly_127.0.0.1 FALSE /silly/ FALSE 0 magic yessir --.0.0.1 TRUE /we/want/ FALSE 0 blexp yesyes -+127.0.0.1 FALSE /we/want/ FALSE 0 blexp yesyes - </file> - </verify> - </testcase> -diff --git a/tests/data/test8 b/tests/data/test8 -index 4d54541..030fd55 100644 ---- a/tests/data/test8 -+++ b/tests/data/test8 -@@ -40,11 +40,12 @@ Set-Cookie: mismatch=this; domain=%HOSTIP; path="/silly/"; - Set-Cookie: partmatch=present; domain=.0.0.1; path=/w; - Set-Cookie: duplicate=test; domain=.0.0.1; domain=.0.0.1; path=/donkey; - Set-Cookie: cookie=yes; path=/we; - Set-Cookie: cookie=perhaps; path=/we/want; - Set-Cookie: nocookie=yes; path=/WE; --Set-Cookie: blexp=yesyes; domain=.0.0.1; domain=.0.0.1; expiry=totally bad; -+Set-Cookie: blexp=yesyes; domain=%HOSTIP; domain=%HOSTIP; expiry=totally bad; -+Set-Cookie: partialip=nono; domain=.0.0.1; - - </file> - <precheck> - perl -e 'if ("%HOSTIP" !~ /\.0\.0\.1$/) {print "Test only works for HOSTIPs ending with .0.0.1"; exit(1)}' - </precheck> --- -2.1.0 - diff --git a/meta/recipes-support/curl/curl/CVE-2014-3620.patch b/meta/recipes-support/curl/curl/CVE-2014-3620.patch deleted file mode 100644 index d11f1908af..0000000000 --- a/meta/recipes-support/curl/curl/CVE-2014-3620.patch +++ /dev/null @@ -1,69 +0,0 @@ -From fd7ae600adf23a9a1ed619165c5058bdec216e9c Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg <daniel@haxx.se> -Date: Tue, 19 Aug 2014 21:11:20 +0200 -Subject: [PATCH] cookies: reject incoming cookies set for TLDs - -Test 61 was modified to verify this. - -CVE-2014-3620 - -Reported-by: Tim Ruehsen -URL: http://curl.haxx.se/docs/adv_20140910B.html - -Upstream-Status: Backport - -Signed-off-by: Chong Lu <Chong.Lu@windriver.com> ---- - lib/cookie.c | 6 ++++++ - tests/data/test61 | 1 + - 2 files changed, 7 insertions(+) - -diff --git a/lib/cookie.c b/lib/cookie.c -index 46904ac..375485f 100644 ---- a/lib/cookie.c -+++ b/lib/cookie.c -@@ -461,19 +461,25 @@ Curl_cookie_add(struct SessionHandle *data, - break; - } - } - else if(Curl_raw_equal("domain", name)) { - bool is_ip; -+ const char *dotp; - - /* Now, we make sure that our host is within the given domain, - or the given domain is not valid and thus cannot be set. */ - - if('.' == whatptr[0]) - whatptr++; /* ignore preceding dot */ - - is_ip = isip(domain ? domain : whatptr); - -+ /* check for more dots */ -+ dotp = strchr(whatptr, '.'); -+ if(!dotp) -+ domain=":"; -+ - if(!domain - || (is_ip && !strcmp(whatptr, domain)) - || (!is_ip && tailmatch(whatptr, domain))) { - strstore(&co->domain, whatptr); - if(!co->domain) { -diff --git a/tests/data/test61 b/tests/data/test61 -index d2de279..e6dbbb9 100644 ---- a/tests/data/test61 -+++ b/tests/data/test61 -@@ -21,10 +21,11 @@ Set-Cookie: test=yes; httponly; domain=foo.com; expires=Fri Feb 2 11:56:27 GMT 2 - SET-COOKIE: test2=yes; domain=host.foo.com; expires=Fri Feb 2 11:56:27 GMT 2035
- Set-Cookie: test3=maybe; domain=foo.com; path=/moo; secure
- Set-Cookie: test4=no; domain=nope.foo.com; path=/moo; secure
- Set-Cookie: test5=name; domain=anything.com; path=/ ; secure
- Set-Cookie: fake=fooledyou; domain=..com; path=/;
-+Set-Cookie: supercookie=fooledyou; domain=.com; path=/;^M - Content-Length: 4
-
- boo - </data> - </reply> --- -2.1.0 - diff --git a/meta/recipes-support/curl/curl/CVE-2015-3143.patch b/meta/recipes-support/curl/curl/CVE-2015-3143.patch new file mode 100644 index 0000000000..745e9456f3 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2015-3143.patch @@ -0,0 +1,38 @@ +From d7d1bc8f08eea1a85ab0d794bc1561659462d937 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Thu, 16 Apr 2015 13:26:46 +0200 +Subject: [PATCH] ConnectionExists: for NTLM re-use, require credentials to + match + +Upstream-Status: Backport + +CVE-2015-3143 + +Bug: http://curl.haxx.se/docs/adv_20150422A.html +Reported-by: Paras Sethia +Signed-off-by: Daniel Stenberg <daniel@haxx.se> +Signed-off-by: Maxin B. John <maxin.john@enea.com> +--- + lib/url.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/url.c b/lib/url.c +index 018bb88..ee3d176 100644 +--- a/lib/url.c ++++ b/lib/url.c +@@ -3207,11 +3207,11 @@ ConnectionExists(struct SessionHandle *data, + strcmp(check->localdev, needle->localdev)) + continue; + } + + if((!(needle->handler->flags & PROTOPT_CREDSPERREQUEST)) || +- wantNTLMhttp) { ++ (wantNTLMhttp || check->ntlm.state != NTLMSTATE_NONE)) { + /* This protocol requires credentials per connection or is HTTP+NTLM, + so verify that we're using the same name and password as well */ + if(!strequal(needle->user, check->user) || + !strequal(needle->passwd, check->passwd)) { + /* one of them was different */ +-- +2.1.4 + diff --git a/meta/recipes-support/curl/curl/CVE-2015-3144.patch b/meta/recipes-support/curl/curl/CVE-2015-3144.patch new file mode 100644 index 0000000000..ca6d7448a1 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2015-3144.patch @@ -0,0 +1,45 @@ +From 6218ded6001ea330e589f92b6b2fa12777752b5d Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Thu, 16 Apr 2015 23:52:04 +0200 +Subject: [PATCH] fix_hostname: zero length host name caused -1 index offset +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Backport + +If a URL is given with a zero-length host name, like in "http://:80" or +just ":80", `fix_hostname()` will index the host name pointer with a -1 +offset (as it blindly assumes a non-zero length) and both read and +assign that address. + +CVE-2015-3144 + +Bug: http://curl.haxx.se/docs/adv_20150422D.html +Reported-by: Hanno Böck +Signed-off-by: Daniel Stenberg <daniel@haxx.se> +Signed-off-by: Maxin B. John <maxin.john@enea.com> +--- + lib/url.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/url.c b/lib/url.c +index ee3d176..f033dbc 100644 +--- a/lib/url.c ++++ b/lib/url.c +@@ -3625,11 +3625,11 @@ static void fix_hostname(struct SessionHandle *data, + + /* set the name we use to display the host name */ + host->dispname = host->name; + + len = strlen(host->name); +- if(host->name[len-1] == '.') ++ if(len && (host->name[len-1] == '.')) + /* strip off a single trailing dot if present, primarily for SNI but + there's no use for it */ + host->name[len-1]=0; + + if(!is_ASCII_name(host->name)) { +-- +2.1.4 + diff --git a/meta/recipes-support/curl/curl/CVE-2015-3145.patch b/meta/recipes-support/curl/curl/CVE-2015-3145.patch new file mode 100644 index 0000000000..15a998289e --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2015-3145.patch @@ -0,0 +1,70 @@ +From ea595c516bc936a514753597aa6c59fd6eb0765e Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Thu, 16 Apr 2015 16:37:40 +0200 +Subject: [PATCH] cookie: cookie parser out of boundary memory access +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Backport + +The internal libcurl function called sanitize_cookie_path() that cleans +up the path element as given to it from a remote site or when read from +a file, did not properly validate the input. If given a path that +consisted of a single double-quote, libcurl would index a newly +allocated memory area with index -1 and assign a zero to it, thus +destroying heap memory it wasn't supposed to. + +CVE-2015-3145 + +Bug: http://curl.haxx.se/docs/adv_20150422C.html +Reported-by: Hanno Böck +Signed-off-by: Daniel Stenberg <daniel@haxx.se> +Signed-off-by: Maxin B. John <maxin.john@enea.com> +--- + lib/cookie.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/lib/cookie.c b/lib/cookie.c +index 0864f6b..0127926 100644 +--- a/lib/cookie.c ++++ b/lib/cookie.c +@@ -223,15 +223,18 @@ static char *sanitize_cookie_path(const char *cookie_path) + char *new_path = strdup(cookie_path); + if(!new_path) + return NULL; + + /* some stupid site sends path attribute with '"'. */ ++ len = strlen(new_path); + if(new_path[0] == '\"') { +- memmove((void *)new_path, (const void *)(new_path + 1), strlen(new_path)); ++ memmove((void *)new_path, (const void *)(new_path + 1), len); ++ len--; + } +- if(new_path[strlen(new_path) - 1] == '\"') { +- new_path[strlen(new_path) - 1] = 0x0; ++ if(len && (new_path[len - 1] == '\"')) { ++ new_path[len - 1] = 0x0; ++ len--; + } + + /* RFC6265 5.2.4 The Path Attribute */ + if(new_path[0] != '/') { + /* Let cookie-path be the default-path. */ +@@ -239,12 +242,11 @@ static char *sanitize_cookie_path(const char *cookie_path) + new_path = strdup("/"); + return new_path; + } + + /* convert /hoge/ to /hoge */ +- len = strlen(new_path); +- if(1 < len && new_path[len - 1] == '/') { ++ if(len && new_path[len - 1] == '/') { + new_path[len - 1] = 0x0; + } + + return new_path; + } +-- +2.1.4 + diff --git a/meta/recipes-support/curl/curl/CVE-2015-3148.patch b/meta/recipes-support/curl/curl/CVE-2015-3148.patch new file mode 100644 index 0000000000..13df14e5c4 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2015-3148.patch @@ -0,0 +1,50 @@ +From 6abfb512ed22c2de891a4398616d81a2a0690b5a Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Sat, 18 Apr 2015 23:50:16 +0200 +Subject: [PATCH] http_done: close Negotiate connections when done + +Upstream-Status: Backport + +When doing HTTP requests Negotiate authenticated, the entire connnection +may become authenticated and not just the specific HTTP request which is +otherwise how HTTP works, as Negotiate can basically use NTLM under the +hood. curl was not adhering to this fact but would assume that such +requests would also be authenticated per request. + +CVE-2015-3148 + +Bug: http://curl.haxx.se/docs/adv_20150422B.html +Reported-by: Isaac Boukris +Signed-off-by: Daniel Stenberg <daniel@haxx.se> +Signed-off-by: Maxin B. John <maxin.john@enea.com> +--- + lib/http.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/lib/http.c b/lib/http.c +index 4c1cfc5..2a226fb 100644 +--- a/lib/http.c ++++ b/lib/http.c +@@ -1433,12 +1433,18 @@ CURLcode Curl_http_done(struct connectdata *conn, + + Curl_unencode_cleanup(conn); + + #ifdef USE_SPNEGO + if(data->state.proxyneg.state == GSS_AUTHSENT || +- data->state.negotiate.state == GSS_AUTHSENT) ++ data->state.negotiate.state == GSS_AUTHSENT) { ++ /* add forbid re-use if http-code != 401 as a WA ++ * only needed for 401 that failed handling ++ * otherwie state will be RECV with current code */ ++ if((data->req.httpcode != 401) && (data->req.httpcode != 407)) ++ connclose(conn, "Negotiate transfer completed"); + Curl_cleanup_negotiate(data); ++ } + #endif + + /* set the proper values (possibly modified on POST) */ + conn->fread_func = data->set.fread_func; /* restore */ + conn->fread_in = data->set.in; /* restore */ +-- +2.1.4 + diff --git a/meta/recipes-support/curl/curl_7.37.1.bb b/meta/recipes-support/curl/curl_7.40.0.bb index 8b854d7a8c..2b39d11411 100644 --- a/meta/recipes-support/curl/curl_7.37.1.bb +++ b/meta/recipes-support/curl/curl_7.40.0.bb @@ -7,17 +7,19 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://pkgconfig_fix.patch \ - file://CVE-2014-3613.patch \ - file://CVE-2014-3620.patch \ -" + file://CVE-2015-3143.patch \ + file://CVE-2015-3144.patch \ + file://CVE-2015-3145.patch \ + file://CVE-2015-3148.patch \ + " # curl likes to set -g0 in CFLAGS, so we stop it # from mucking around with debug options # SRC_URI += " file://configure_ac.patch" -SRC_URI[md5sum] = "95c627abcf6494f5abe55effe7cd6a57" -SRC_URI[sha256sum] = "c3ef3cd148f3778ddbefb344117d7829db60656efe1031f9e3065fc0faa25136" +SRC_URI[md5sum] = "8d30594212e65657a5c32030f0998fa9" +SRC_URI[sha256sum] = "899109eb3900fa6b8a2f995df7f449964292776a04763e94fae640700f883fba" inherit autotools pkgconfig binconfig multilib_header @@ -31,6 +33,7 @@ PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump" PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2" +PACKAGECONFIG[smb] = "--enable-smb,--disable-smb," EXTRA_OECONF = "--without-libidn \ --enable-crypto-auth \ diff --git a/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch b/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch new file mode 100644 index 0000000000..329bff5d3b --- /dev/null +++ b/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch @@ -0,0 +1,30 @@ +From c640ff9340f358a00835816d0fea03d27a7be978 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Tue, 31 Mar 2015 00:56:44 -0700 +Subject: [PATCH] Makefile: let libso_target depend on bt_rec + +Fixed parallel issue: +libtool: link: `bt_rec.lo' is not a valid libtool object +Makefile:867: recipe for target 'libdb-6.0.la' failed +make: *** [libdb-6.0.la] Error 1 + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index e451f70..0a42375 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS) + $(LN) -s $(libdb_version) $(libdb) + + # Shared C library. +-$(libso_target): $(C_OBJS) ++$(libso_target): $(C_OBJS) bt_rec@o@ + $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) \ + $(LIBCSO_LIBS) + $(RM) $(libdb) diff --git a/meta/recipes-support/db/db_6.0.30.bb b/meta/recipes-support/db/db_6.0.30.bb index 47fb296daa..9eae5c7a5e 100644 --- a/meta/recipes-support/db/db_6.0.30.bb +++ b/meta/recipes-support/db/db_6.0.30.bb @@ -18,6 +18,7 @@ RCONFLICTS_${PN} = "db3" SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.. \ file://fix-parallel-build.patch \ + file://Makefile-let-libso_target-depend-on-bt_rec.patch \ " SRC_URI[md5sum] = "ad28eb86ad3203b5422844db179c585b" diff --git a/meta/recipes-support/debianutils/debianutils_4.4.bb b/meta/recipes-support/debianutils/debianutils_4.4.bb new file mode 100644 index 0000000000..346eaf16eb --- /dev/null +++ b/meta/recipes-support/debianutils/debianutils_4.4.bb @@ -0,0 +1,35 @@ +SUMMARY = "Miscellaneous utilities specific to Debian" +SECTION = "base" +LICENSE = "GPLv2 & SMAIL_GPL" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=f01a5203d50512fc4830b4332b696a9f" + +SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.gz" +SRC_URI[md5sum] = "c0cb076754d7f4eb1e3397d00916647f" +SRC_URI[sha256sum] = "190850cdd6b5302e0a1ba1aaed1bc7074d67d3bd8d04c613f242f7145afa53a6" + +inherit autotools update-alternatives + +do_configure_prepend() { + sed -i -e 's:tempfile.1 which.1:which.1:g' ${S}/Makefile.am +} + +do_install_append() { + if [ "${base_bindir}" != "${bindir}" ]; then + # Debian places some utils into ${base_bindir} as does busybox + install -d ${D}${base_bindir} + for app in run-parts tempfile; do + mv ${D}${bindir}/$app ${D}${base_bindir}/$app + done + fi +} + +ALTERNATIVE_PRIORITY="100" +ALTERNATIVE_${PN} = "add-shell installkernel remove-shell run-parts savelog tempfile which" + +ALTERNATIVE_LINK_NAME[add-shell]="${sbindir}/add-shell" +ALTERNATIVE_LINK_NAME[installkernel]="${sbindir}/installkernel" +ALTERNATIVE_LINK_NAME[remove-shell]="${sbindir}/remove-shell" +ALTERNATIVE_LINK_NAME[run-parts]="${base_bindir}/run-parts" +ALTERNATIVE_LINK_NAME[savelog]="${bindir}/savelog" +ALTERNATIVE_LINK_NAME[tempfile]="${base_bindir}/tempfile" +ALTERNATIVE_LINK_NAME[which]="${bindir}/which" diff --git a/meta/recipes-support/gmp/gmp.inc b/meta/recipes-support/gmp/gmp.inc index 6aedc85f58..558ee06799 100644 --- a/meta/recipes-support/gmp/gmp.inc +++ b/meta/recipes-support/gmp/gmp.inc @@ -4,9 +4,9 @@ DESCRIPTION = "GMP is a free library for arbitrary precision arithmetic, operati HOMEPAGE = "http://gmplib.org/" LICENSE = "GPLv3 LGPLv3" -REVISION = "" +REVISION ?= "" -SRC_URI = "ftp://ftp.gmplib.org/pub/gmp-${PV}/gmp-${PV}${REVISION}.tar.bz2 \ +SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \ file://configure.patch \ file://amd64.patch " diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb index c688e9d1d7..482de99d4d 100644 --- a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb +++ b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb @@ -13,7 +13,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ DEPENDS = "glib-2.0" -inherit autotools-brokensep pkgconfig +inherit autotools pkgconfig + +PR = "r1" PACKAGECONFIG ??= "" PACKAGECONFIG[journald] = "--with-systemd-journal,--without-systemd-journal,systemd,systemd" diff --git a/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch b/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch new file mode 100644 index 0000000000..3dc506c2f2 --- /dev/null +++ b/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch @@ -0,0 +1,16 @@ +Upstream-Status: Pending +Signed-off-by: Saul Wold <sgw@linux.intel.com> +Index: gnupg-2.1.0/dirmngr/Makefile.am +=================================================================== +--- gnupg-2.1.0.orig/dirmngr/Makefile.am ++++ gnupg-2.1.0/dirmngr/Makefile.am +@@ -71,7 +71,8 @@ endif + dirmngr_LDADD = $(libcommontlsnpth) $(libcommonpth) \ + ../gl/libgnu.a $(DNSLIBS) $(LIBASSUAN_LIBS) \ + $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ +- $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) ++ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) \ ++ $(GPG_ERROR_LIBS) + if !USE_LDAPWRAPPER + dirmngr_LDADD += $(ldaplibs) + endif diff --git a/meta/recipes-support/gnupg/gnupg/pkgconfig.patch b/meta/recipes-support/gnupg/gnupg/pkgconfig.patch index ae92392dae..5e036bac90 100644 --- a/meta/recipes-support/gnupg/gnupg/pkgconfig.patch +++ b/meta/recipes-support/gnupg/gnupg/pkgconfig.patch @@ -5,11 +5,11 @@ Upstream-Status: Rejected RP 2014/5/22 -Index: gnupg-2.0.22/m4/gnupg-pth.m4 +Index: gnupg-2.1.0/m4/gnupg-pth.m4 =================================================================== ---- gnupg-2.0.22.orig/m4/gnupg-pth.m4 2013-10-04 12:32:53.000000000 +0000 -+++ gnupg-2.0.22/m4/gnupg-pth.m4 2014-05-13 21:33:21.000000000 +0000 -@@ -17,33 +17,9 @@ +--- gnupg-2.1.0.orig/m4/gnupg-pth.m4 ++++ gnupg-2.1.0/m4/gnupg-pth.m4 +@@ -17,33 +17,9 @@ dnl implied warranty of MERCHANTABILITY # Taken and modified from the m4 macros which come with Pth. AC_DEFUN([GNUPG_PTH_VERSION_CHECK], [ @@ -44,7 +44,7 @@ Index: gnupg-2.0.22/m4/gnupg-pth.m4 if test $have_pth = yes; then AC_MSG_RESULT(yes) AC_MSG_CHECKING([whether PTH installation is sane]) -@@ -51,9 +29,9 @@ +@@ -51,9 +27,9 @@ AC_DEFUN([GNUPG_PTH_VERSION_CHECK], _gnupg_pth_save_cflags=$CFLAGS _gnupg_pth_save_ldflags=$LDFLAGS _gnupg_pth_save_libs=$LIBS @@ -57,30 +57,34 @@ Index: gnupg-2.0.22/m4/gnupg-pth.m4 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pth.h> ], [[ pth_init ();]])], -@@ -81,23 +59,11 @@ +@@ -80,26 +56,13 @@ AC_DEFUN([GNUPG_PTH_VERSION_CHECK], + # PTH_CLFAGS and PTH_LIBS are AS_SUBST. # AC_DEFUN([GNUPG_PATH_PTH], -+[ -[ AC_ARG_WITH(pth-prefix, - AC_HELP_STRING([--with-pth-prefix=PFX], -- [prefix where GNU Pth is installed]), +- [prefix where GNU Pth is installed (optional)]), - pth_config_prefix="$withval", pth_config_prefix="") - if test x$pth_config_prefix != x ; then - PTH_CONFIG="$pth_config_prefix/bin/pth-config" - fi - AC_PATH_PROG(PTH_CONFIG, pth-config, no) ++[ tmp=ifelse([$1], ,1.3.7,$1) - if test "$PTH_CONFIG" != "no"; then - GNUPG_PTH_VERSION_CHECK($tmp) -- if test $have_pth = yes; then +- if test $have_pth = yes; then - PTH_CFLAGS=`$PTH_CONFIG --cflags` - PTH_LIBS=`$PTH_CONFIG --ldflags` - PTH_LIBS="$PTH_LIBS `$PTH_CONFIG --libs --all`" +- AC_DEFINE(HAVE_PTH, 1, + GNUPG_PTH_VERSION_CHECK($tmp) + if test $have_pth = yes; then - AC_DEFINE(HAVE_PTH, 1, ++ AC_DEFINE(HAVE_PTH, 1, [Defined if the GNU Pth is available]) - fi fi AC_SUBST(PTH_CFLAGS) AC_SUBST(PTH_LIBS) + ]) +- diff --git a/meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch b/meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch new file mode 100644 index 0000000000..c6dbf1b75a --- /dev/null +++ b/meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch @@ -0,0 +1,72 @@ +Upstream-Status: Inappropriate [openembedded specific] + +Signed-off-by: Saul Wold <sgw@linux.intel.com> + + +Index: gnupg-2.1.0/m4/npth.m4 +=================================================================== +--- gnupg-2.1.0.orig/m4/npth.m4 ++++ gnupg-2.1.0/m4/npth.m4 +@@ -17,10 +17,10 @@ AC_DEFUN([_AM_PATH_NPTH_CONFIG], + if test "x$npth_config_prefix" != x ; then + NPTH_CONFIG="$npth_config_prefix/bin/npth-config" + fi +- AC_PATH_PROG(NPTH_CONFIG, npth-config, no) ++ AC_PATH_PROG(PKGCONFIG, pkg-config, no) + +- if test "$NPTH_CONFIG" != "no" ; then +- npth_version=`$NPTH_CONFIG --version` ++ if test "$PKGCONFIG" != "no" ; then ++ npth_version=`$PKGCONFIG --modversion npth` + fi + npth_version_major=`echo $npth_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` +@@ -45,7 +45,7 @@ AC_DEFUN([AM_PATH_NPTH], + + AC_MSG_CHECKING(for NPTH - version >= $min_npth_version) + ok=no +- if test "$NPTH_CONFIG" != "no" ; then ++ if test "$PKGCONFIG" != "no" ; then + req_major=`echo $min_npth_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` + req_minor=`echo $min_npth_version | \ +@@ -66,28 +66,9 @@ AC_DEFUN([AM_PATH_NPTH], + fi + if test $ok = yes; then + AC_MSG_RESULT([yes ($npth_version)]) +- else +- AC_MSG_RESULT(no) +- fi +- if test $ok = yes; then +- # If we have a recent NPTH, we should also check that the +- # API is compatible. +- if test "$req_npth_api" -gt 0 ; then +- tmp=`$NPTH_CONFIG --api-version 2>/dev/null || echo 0` +- if test "$tmp" -gt 0 ; then +- AC_MSG_CHECKING([NPTH API version]) +- if test "$req_npth_api" -eq "$tmp" ; then +- AC_MSG_RESULT([okay]) +- else +- ok=no +- AC_MSG_RESULT([does not match. want=$req_npth_api got=$tmp]) +- fi +- fi +- fi +- fi +- if test $ok = yes; then +- NPTH_CFLAGS=`$NPTH_CONFIG --cflags` +- NPTH_LIBS=`$NPTH_CONFIG --libs` ++ NPTH_CFLAGS=`$PKGCONFIG --cflags npth` ++ NPTH_LIBS=`$PKGCONFIG --libs npth` ++ AC_MSG_WARN([[GOT HERE - $NPTH_LIBS ]]) + ifelse([$2], , :, [$2]) + npth_config_host=`$NPTH_CONFIG --host 2>/dev/null || echo none` + if test x"$npth_config_host" != xnone ; then +@@ -103,6 +84,7 @@ AC_DEFUN([AM_PATH_NPTH], + fi + fi + else ++ AC_MSG_RESULT(no) + NPTH_CFLAGS="" + NPTH_LIBS="" + ifelse([$3], , :, [$3]) diff --git a/meta/recipes-support/gnupg/gnupg_2.0.26.bb b/meta/recipes-support/gnupg/gnupg_2.1.1.bb index 92dd3bd643..a7c42545bd 100644 --- a/meta/recipes-support/gnupg/gnupg_2.0.26.bb +++ b/meta/recipes-support/gnupg/gnupg_2.1.1.bb @@ -4,21 +4,21 @@ LICENSE = "GPLv3 & LGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6" -DEPENDS = "${PTH} libassuan libksba zlib bzip2 readline libgcrypt" -PTH = "pth" -PTH_libc-uclibc = "npth" +DEPENDS = "npth libassuan libksba zlib bzip2 readline libgcrypt" inherit autotools gettext texinfo pkgconfig SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://pkgconfig.patch" + file://pkgconfig.patch \ + file://use-pkgconfig-instead-of-npth-config.patch \ + file://dirmngr-uses-libgpg-error.patch \ + " -SRC_URI[md5sum] = "fa7e704aad33eb114d1840164455aec1" -SRC_URI[sha256sum] = "7758e30dc382ae7a7167ed41b7f936aa50af5ea2d6fccdef663b5b750b65b8e0" +SRC_URI[md5sum] = "9a314c3dcef0a091de90b6aa4d467db5" +SRC_URI[sha256sum] = "70ecd01d2875db62624c911c2fd815742f50aef5492698eb3bfc09a08690ce49" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ - --without-libcurl \ --with-zlib=${STAGING_LIBDIR}/.. \ --with-bzip2=${STAGING_LIBDIR}/.. \ --with-readline=${STAGING_LIBDIR}/.. \ @@ -37,3 +37,5 @@ do_install_append() { ln -sf gpg2 ${D}${bindir}/gpg ln -sf gpgv2 ${D}${bindir}/gpgv } + +RDEPENDS_${PN} = "gnutls" diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index 12b26cc97d..45fb529fa1 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc @@ -17,7 +17,7 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1] SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz" -inherit autotools-brokensep texinfo binconfig pkgconfig gettext lib_package +inherit autotools texinfo binconfig pkgconfig gettext lib_package EXTRA_OECONF="--disable-rpath \ --with-included-libtasn1 \ diff --git a/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch b/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file mode 100644 index 0000000000..44a9934b5d --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch @@ -0,0 +1,31 @@ +From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Sat, 17 Jan 2015 17:02:15 +0000 +Subject: [PATCH] configure.ac: fix sed command + +The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors +when the S contains "bitbake", fix to "sed 's/\.bak$//'`" + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c6818a0..1c4582d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then + dnl replace libopts-generated files with distributed backups, if present + missing_baks= + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do +- nam=`echo $i|sed 's/.bak//g'` ++ nam=`echo $i|sed 's/\.bak$//'` + if test -f $i;then + cp -f $i $nam + else +-- +2.0.1 + diff --git a/meta/recipes-support/gnutls/gnutls_3.3.12.bb b/meta/recipes-support/gnutls/gnutls_3.3.12.bb new file mode 100644 index 0000000000..0d6ec756e6 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls_3.3.12.bb @@ -0,0 +1,7 @@ +require gnutls.inc + +SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ + file://configure.ac-fix-sed-command.patch \ + " +SRC_URI[md5sum] = "a37b20b4352a5f542367ded904729c90" +SRC_URI[sha256sum] = "67ab3e92c5d48f3323b897d7c1aa0bb2af6f3a84f5bd9931cda163a7ff32299b" diff --git a/meta/recipes-support/gnutls/gnutls_3.3.5.bb b/meta/recipes-support/gnutls/gnutls_3.3.5.bb deleted file mode 100644 index b3daa49249..0000000000 --- a/meta/recipes-support/gnutls/gnutls_3.3.5.bb +++ /dev/null @@ -1,7 +0,0 @@ -require gnutls.inc - -SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ - " - -SRC_URI[md5sum] = "1f396dcf3c14ea67de7243821006d1a2" -SRC_URI[sha256sum] = "48f34ae032692c498e782e9f1369506572be40ecf7f3f3604b0b00bad1b10477" diff --git a/meta/recipes-support/gpgme/gpgme-1.4.3/disable_gpgconf_check.patch b/meta/recipes-support/gpgme/gpgme-1.4.3/disable_gpgconf_check.patch deleted file mode 100644 index df0953069c..0000000000 --- a/meta/recipes-support/gpgme/gpgme-1.4.3/disable_gpgconf_check.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1.2.0, gpgme will check if gpgconf & g13(from 1.3.0) exist, and cause -configure failure if not founding them in cross-compile environment. We can -add the gnupg-native to get them, but still have some issues: - -1. need add new package: libksba, update libassuan(not in sato), and extend - native support in some other packages(libgcrypt, libgpg-error, pth...) -2. Even we have gnupg, the g13 only exist in development branch, so that we - still have the g13 check failure in configure. - -I have searched the compile log, and found gpgconf/g13 are not used. So use a -simple method here, throw a warning mesg rather than an error here just like in -non-cross-compile environment. - -Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> - -Upstream-Status: Inappropriate [embedded specific] - -Index: gpgme-1.3.0/configure.ac -=================================================================== ---- gpgme-1.3.0.orig/configure.ac 2010-07-21 09:38:09.000000000 +0800 -+++ gpgme-1.3.0/configure.ac 2010-07-21 09:39:19.000000000 +0800 -@@ -574,7 +574,7 @@ - *** Could not find gpgconf, install gpgconf or use --with-gpgconf=PATH to enable it - ***]) - else -- AC_MSG_ERROR([ -+ AC_MSG_WARN([ - *** - *** Can not determine path to gpgconf when cross-compiling, use --with-gpgconf=PATH - ***]) -@@ -670,7 +670,7 @@ - *** Could not find g13, install g13 or use --with-g13=PATH to enable it - ***]) - else -- AC_MSG_ERROR([ -+ AC_MSG_WARN([ - *** - *** Can not determine path to g13 when cross-compiling, use --with-g13=PATH - ***]) diff --git a/meta/recipes-support/gpgme/gpgme_1.4.3.bb b/meta/recipes-support/gpgme/gpgme_1.4.3.bb index ca1e5f9344..98fd68b837 100644 --- a/meta/recipes-support/gpgme/gpgme_1.4.3.bb +++ b/meta/recipes-support/gpgme/gpgme_1.4.3.bb @@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \ - file://disable_gpgconf_check.patch \ file://gpgme.pc" SRC_URI[md5sum] = "334e524cffa8af4e2f43ae8afe585672" @@ -18,9 +17,8 @@ SRC_URI[sha256sum] = "2d1cc12411753752d9c5b9037e6fd3fd363517af720154768cc7b46b60 DEPENDS = "libgpg-error libassuan" -EXTRA_OECONF = "--with-gpg=${bindir}/gpg --without-gpgsm" - BINCONFIG = "${bindir}/gpgme-config" +EXTRA_OECONF = "--with-gpg=${bindir}/gpg --without-gpgsm --with-gpgconf=no --with-g13=no" inherit autotools texinfo binconfig-disabled pkgconfig diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc index 15d002dbef..f4254b5f5c 100644 --- a/meta/recipes-support/icu/icu.inc +++ b/meta/recipes-support/icu/icu.inc @@ -1,5 +1,8 @@ SUMMARY = "International Component for Unicode libraries" -DESCRIPTION = "The International Component for Unicode (ICU) is a mature, portable set of C/C++ and Java libraries for Unicode support, software internationalization (I18N) and globalization (G11N), giving applications the same results on all platforms." +DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ +portable set of C/C++ and Java libraries for Unicode support, software \ +internationalization (I18N) and globalization (G11N), giving applications the \ +same results on all platforms." HOMEPAGE = "http://site.icu-project.org/" LICENSE = "ICU" @@ -10,7 +13,6 @@ S = "${WORKDIR}/icu/source" SPDX_S = "${WORKDIR}/icu" STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" -PARALLEL_MAKE = "" CPPFLAGS_append_libc-uclibc = " -DU_TIMEZONE=0" BINCONFIG = "${bindir}/icu-config" @@ -24,23 +26,13 @@ EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" EXTRA_OECONF_class-native = "" EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" -# ICU puts custom m4 autoconf functions in aclocal.m4. -# However, this file is deleted in our build system. -# To make it work, we copy aclocal.m4 to acinclude.m4. -# This is a bug of ICU. See bug reference: -# http://bugs.icu-project.org/trac/ticket/9790 -do_configure_prepend() { - [ -f ${S}/acinclude.m4 ] || cp ${S}/aclocal.m4 ${S}/acinclude.m4 -} - do_install_append_class-native() { mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} - } PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio" @@ -56,4 +48,3 @@ FILES_libicutu = "${libdir}/libicutu.so.*" FILES_libicuio = "${libdir}/libicuio.so.*" BBCLASSEXTEND = "native nativesdk" - diff --git a/meta/recipes-support/icu/icu_53.1.bb b/meta/recipes-support/icu/icu_54.1.bb index d93af68438..45b5cb6001 100644 --- a/meta/recipes-support/icu/icu_53.1.bb +++ b/meta/recipes-support/icu/icu_54.1.bb @@ -1,6 +1,6 @@ require icu.inc -LIC_FILES_CHKSUM = "file://../license.html;md5=8b139ac5b93769623bd343318048238c" +LIC_FILES_CHKSUM = "file://../license.html;md5=9890f5ff4ed056a0c2fa84848b9b6066" def icu_download_version(d): pvsplit = d.getVar('PV', True).split('.') @@ -16,6 +16,6 @@ SRC_URI = "${BASE_SRC_URI} \ SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " +SRC_URI[md5sum] = "e844caed8f2ca24c088505b0d6271bc0" +SRC_URI[sha256sum] = "d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3" -SRC_URI[md5sum] = "b73baa6fbdfef197608d1f69300919b9" -SRC_URI[sha256sum] = "6fa74fb5aac070c23eaba1711a7178fe582c59867484c5ec07c49002787a9a28" diff --git a/meta/recipes-support/libassuan/libassuan_2.1.2.bb b/meta/recipes-support/libassuan/libassuan_2.2.0.bb index 97dec6a76a..d3a61ccc26 100644 --- a/meta/recipes-support/libassuan/libassuan_2.1.2.bb +++ b/meta/recipes-support/libassuan/libassuan_2.2.0.bb @@ -13,8 +13,8 @@ DEPENDS = "libgpg-error" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-${PV}.tar.bz2 \ file://libassuan-add-pkgconfig-support.patch" -SRC_URI[md5sum] = "1dc4c3e1dbfb3939bfa2d72db8e136ba" -SRC_URI[sha256sum] = "39f8a7c9349aaaf7ccd937b90660153ec4d2d4df2465018754e5bcae5b1db77b" +SRC_URI[md5sum] = "a104faed3e97b9c302c5d67cc22b1d60" +SRC_URI[sha256sum] = "7df58ed70be4b694f77efd1f3b3f103c6311b6b71e04a370382f9fe8204f6ec6" BINCONFIG = "${bindir}/libassuan-config" @@ -24,3 +24,5 @@ do_configure_prepend () { # Else these could be used in prefernce to those in aclocal-copy rm -f ${S}/m4/*.m4 } + +BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/libcap/libcap/fix-CAP_LAST_CAP.patch b/meta/recipes-support/libcap/libcap/fix-CAP_LAST_CAP.patch deleted file mode 100644 index a5571883d3..0000000000 --- a/meta/recipes-support/libcap/libcap/fix-CAP_LAST_CAP.patch +++ /dev/null @@ -1,39 +0,0 @@ -fix CAP_LAST_CAP - -Upstream-Status: pending - -Two new capability CAP_BLOCK_SUSPEND and CAP_WAKE_ALARM have been added into -kernel, but libcap did not update them. -Once libcap uses its capability.h (the default value of KERNEL_HEADERS), and -application always use capability.h from kernel, that will make cap_get_flag -return wrong value. - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - libcap/include/linux/capability.h | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/libcap/include/linux/capability.h b/libcap/include/linux/capability.h -index 4924f2a..57026be 100644 ---- a/libcap/include/linux/capability.h -+++ b/libcap/include/linux/capability.h -@@ -360,7 +360,15 @@ struct cpu_vfs_cap_data { - CAP_SYS_ADMIN is not acceptable anymore. */ - #define CAP_SYSLOG 34 - --#define CAP_LAST_CAP CAP_SYSLOG -+/* Allow triggering something that will wake the system */ -+ -+#define CAP_WAKE_ALARM 35 -+ -+/* Allow preventing system suspends */ -+ -+#define CAP_BLOCK_SUSPEND 36 -+ -+#define CAP_LAST_CAP CAP_BLOCK_SUSPEND - - #define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP) - --- -1.7.10.4 - diff --git a/meta/recipes-support/libcap/libcap_2.22.bb b/meta/recipes-support/libcap/libcap_2.22.bb deleted file mode 100644 index a989bb6a6b..0000000000 --- a/meta/recipes-support/libcap/libcap_2.22.bb +++ /dev/null @@ -1,6 +0,0 @@ -require libcap.inc - -PR = "r6" - -SRC_URI[md5sum] = "b4896816b626bea445f0b3849bdd4077" -SRC_URI[sha256sum] = "e1cae65d8febf2579be37c255d2e058715785ead481a4e6a4357a06aff84721f" diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap_2.24.bb index 0e28ea04a9..75cf5d415d 100644 --- a/meta/recipes-support/libcap/libcap.inc +++ b/meta/recipes-support/libcap/libcap_2.24.bb @@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1" DEPENDS = "perl-native-runtime" -SRC_URI = "${DEBIAN_MIRROR}/main/libc/libcap2/${BPN}2_${PV}.orig.tar.gz \ - file://fix-CAP_LAST_CAP.patch" +SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz" -PR = "r1" +SRC_URI[md5sum] = "d43ab9f680435a7fff35b4ace8d45b80" +SRC_URI[sha256sum] = "cee4568f78dc851d726fc93f25f4ed91cc223b1fe8259daa4a77158d174e6c65" inherit lib_package @@ -56,8 +56,10 @@ do_install_append() { # Move the library to base_libdir install -d ${D}${base_libdir} if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mv ${D}${libdir}/* ${D}${base_libdir} - rmdir ${D}${libdir} + mv ${D}${libdir}/libcap* ${D}${base_libdir} + if [ -d ${D}${libdir}/security ]; then + mv ${D}${libdir}/security ${D}${base_libdir} + fi fi } diff --git a/meta/recipes-support/libcroco/libcroco_0.6.8.bb b/meta/recipes-support/libcroco/libcroco_0.6.8.bb index 278934e68d..88696a4f47 100644 --- a/meta/recipes-support/libcroco/libcroco_0.6.8.bb +++ b/meta/recipes-support/libcroco/libcroco_0.6.8.bb @@ -11,11 +11,11 @@ SECTION = "x11/utils" DEPENDS = "glib-2.0 libxml2 zlib" BBCLASSEXTEND = "native" EXTRA_OECONF += "--enable-Bsymbolic=auto" -PR = "r1" +PR = "r2" BINCONFIG = "${bindir}/croco-0.6-config" -inherit autotools-brokensep pkgconfig gnomebase gtk-doc binconfig-disabled +inherit autotools pkgconfig gnomebase gtk-doc binconfig-disabled GNOME_COMPRESS_TYPE = "xz" diff --git a/meta/recipes-support/libevdev/libevdev_1.2.2.bb b/meta/recipes-support/libevdev/libevdev_1.3.bb index db4ffc6a5e..7206b307e0 100644 --- a/meta/recipes-support/libevdev/libevdev_1.2.2.bb +++ b/meta/recipes-support/libevdev/libevdev_1.3.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \ file://libevdev/libevdev.h;endline=21;md5=7ff4f0b5113252c2f1a828e0bbad98d1" SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz" -SRC_URI[md5sum] = "7c1ee9c2069489b2a25dfde6f8e2ff6a" -SRC_URI[sha256sum] = "860e9a1d5594393ff1f711cdeaf048efe354992019068408abbcfa4914ad6709" +SRC_URI[md5sum] = "ab67de8f949e84ae2abb48af09eda423" +SRC_URI[sha256sum] = "265411ce79a592b3074e9d07fb97d462745d0c7ef178254a6f720245ed253446" inherit autotools pkgconfig diff --git a/meta/recipes-support/libevent/libevent_2.0.21.bb b/meta/recipes-support/libevent/libevent_2.0.21.bb index 5a1ff3b1b0..1230e92b2e 100644 --- a/meta/recipes-support/libevent/libevent_2.0.21.bb +++ b/meta/recipes-support/libevent/libevent_2.0.21.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=45c5316ff684bcfe2f9f86d8b1279559" PR = "r1" -SRC_URI = "http://github.com/downloads/libevent/libevent/${BPN}-${PV}-stable.tar.gz \ +SRC_URI = "${SOURCEFORGE_MIRROR}/levent/${BP}-stable.tar.gz \ file://obsolete_automake_macros.patch \ file://disable_tests.patch \ " diff --git a/meta/recipes-support/libfm/libfm-1.1.2.2/fix-make-parallelism-issue.patch b/meta/recipes-support/libfm/libfm-1.1.2.2/fix-make-parallelism-issue.patch deleted file mode 100644 index 5d39d1954d..0000000000 --- a/meta/recipes-support/libfm/libfm-1.1.2.2/fix-make-parallelism-issue.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix make parallelism issue - -- remove pkginclude_HEADERS ( LIBFM_INCLUDES and LIBFM_GTK_INCLUDES -variables are empty) -- if we don't remove it then we will have a race condition between the code -that tries to symlink ${includedir}/libfm-1.0 to ${includedir}/libfm and the -am autogenerated code from the pkginclude_HEADERS definition which -tries to create pkgincludedir (${includedir}/libfm); -- if pkgincludedir is created before the symlink the symlink will be created -in the ${includedir}/libfm dir and it will have libfm-1.0 as name which is -wrong (we need the ${includedir}/libfm symlink for pcmanfm) - -Upstream-Status: Pending -Signed-off-by: Constantin Musca <constantinx.musca@intel.com> - -Index: libfm-1.1.0/src/Makefile.am -=================================================================== ---- libfm-1.1.0.orig/src/Makefile.am -+++ libfm-1.1.0/src/Makefile.am -@@ -211,11 +211,6 @@ libfmgtkinclude_HEADERS = \ - gtk/fm-gtk-marshal.h \ - $(NULL) - --pkginclude_HEADERS = \ -- $(LIBFM_INCLUDES) \ -- $(LIBFM_GTK_INCLUDES) \ -- $(NULL) -- - EXTRA_LTLIBRARIES = libfm-gtk.la libfm-gtk3.la - - lib_LTLIBRARIES = libfm.la @LIBFM_GTK_LTLIBRARIES@ diff --git a/meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch b/meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch deleted file mode 100644 index 58a2f09d66..0000000000 --- a/meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd libfm-1.1.2.2/configure.ac libfm-1.1.2.2/configure.ac ---- libfm-1.1.2.2/configure.ac 2013-08-22 23:16:09.000000000 +0300 -+++ libfm-1.1.2.2/configure.ac 2013-10-25 01:35:18.110323079 +0300 -@@ -3,7 +3,7 @@ - - AC_PREREQ([2.63]) - AC_INIT([libfm], [1.1.2.2], [http://pcmanfm.sourceforge.net/]) --AM_INIT_AUTOMAKE([-Wall -Werror foreign]) -+AM_INIT_AUTOMAKE([-Wall foreign]) - AC_CONFIG_MACRO_DIR(m4) - AC_CONFIG_HEADERS([config.h]) diff --git a/meta/recipes-support/libfm/libfm-extra_1.2.3.bb b/meta/recipes-support/libfm/libfm-extra_1.2.3.bb new file mode 100644 index 0000000000..85bcc3c0c3 --- /dev/null +++ b/meta/recipes-support/libfm/libfm-extra_1.2.3.bb @@ -0,0 +1,23 @@ +SUMMARY = "Library for file management" +HOMEPAGE = "http://pcmanfm.sourceforge.net/" + +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://src/fm-extra.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007" + +SECTION = "x11/libs" +DEPENDS = "glib-2.0 intltool-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz" + +SRC_URI[md5sum] = "3ff38200701658f7e80e25ed395d92dd" +SRC_URI[sha256sum] = "c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a916e2c295230b2344e1fbf9" + +S = "${WORKDIR}/libfm-${PV}" + +EXTRA_OECONF = "--with-extra-only --with-gtk=no" + +PR = "r1" + +inherit autotools pkgconfig gtk-doc + +do_configure[dirs] =+ "${S}/m4" diff --git a/meta/recipes-support/libfm/libfm_1.1.2.2.bb b/meta/recipes-support/libfm/libfm_1.1.2.2.bb deleted file mode 100644 index 10f31d9911..0000000000 --- a/meta/recipes-support/libfm/libfm_1.1.2.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Library for file management" -HOMEPAGE = "http://pcmanfm.sourceforge.net/" - -LICENSE = "GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://src/fm.h;endline=22;md5=e64555171770a551e3b51cc06fc62f1a \ - file://src/base/fm-config.h;endline=23;md5=ad0fc418c3cf041eea35ddb3daf37f17" - -SECTION = "x11/libs" -DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native libexif" - -SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \ - file://fix-make-parallelism-issue.patch \ - file://ignore_automake_warnings.patch \ - " - -SRC_URI[md5sum] = "ea3d09b23ef4c37cb84ae57ea16b8f08" -SRC_URI[sha256sum] = "158e2b6974350d2dab15932b496bb4d448553e60bbf7cdfe4d6e9bd99d19d682" - -inherit autotools-brokensep pkgconfig gtk-doc - -do_configure[dirs] =+ "${S}/m4" - -PACKAGES += "${PN}-mime" -FILES_${PN}-mime = "${datadir}/mime/" diff --git a/meta/recipes-support/libfm/libfm_1.2.3.bb b/meta/recipes-support/libfm/libfm_1.2.3.bb new file mode 100644 index 0000000000..629502f68f --- /dev/null +++ b/meta/recipes-support/libfm/libfm_1.2.3.bb @@ -0,0 +1,38 @@ +SUMMARY = "Library for file management" +HOMEPAGE = "http://pcmanfm.sourceforge.net/" + +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://src/fm.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007 \ + file://src/base/fm-config.h;beginline=10;endline=23;md5=ef1f84da64b3c01cca447212f7ef6007 \ + file://src/fm-gtk.h;beginline=6;endline=19;md5=646baa4955c04fe768f2ca27b92ac8dd" + + +SECTION = "x11/libs" +DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native libexif libfm-extra" + +SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz" + +SRC_URI[md5sum] = "3ff38200701658f7e80e25ed395d92dd" +SRC_URI[sha256sum] = "c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a916e2c295230b2344e1fbf9" + +PR = "r1" + +inherit autotools pkgconfig gtk-doc + +do_configure[dirs] =+ "${S}/m4" + +PACKAGES += "${PN}-mime" +FILES_${PN}-mime = "${datadir}/mime/" +FILES_${PN}-dbg += "${libdir}/libfm/modules/.debug" + +do_install_append () { + # remove files which are part of libfm-extra + rm -f ${D}${includedir}/libfm-1.0/fm-xml-file.h + rm -f ${D}${includedir}/libfm-1.0/fm-version.h + rm -f ${D}${includedir}/libfm-1.0/fm-extra.h + rm -f ${D}${libdir}/pkgconfig/libfm-extra.pc + rm -f ${D}${libdir}/libfm-extra.so* + rm -f ${D}${libdir}/libfm-extra.a + rm -f ${D}${libdir}/libfm-extra.la +} diff --git a/meta/recipes-support/libgcrypt/files/libgcrypt-1.6.1-make-arm-asm-fPIC-friendly.patch b/meta/recipes-support/libgcrypt/files/libgcrypt-1.6.1-make-arm-asm-fPIC-friendly.patch deleted file mode 100644 index 340087279d..0000000000 --- a/meta/recipes-support/libgcrypt/files/libgcrypt-1.6.1-make-arm-asm-fPIC-friendly.patch +++ /dev/null @@ -1,169 +0,0 @@ -Fix ARM assembly when building __PIC__ - -* cipher/camellia-arm.S (GET_DATA_POINTER): New. -(_gcry_camellia_arm_encrypt_block): Use GET_DATA_POINTER. -(_gcry_camellia_arm_decrypt_block): Ditto. -* cipher/cast5-arm.S (GET_DATA_POINTER): New. -(_gcry_cast5_arm_encrypt_block, _gcry_cast5_arm_decrypt_block) -(_gcry_cast5_arm_enc_blk2, _gcry_cast5_arm_dec_blk2): Use -GET_DATA_POINTER. -* cipher/rijndael-arm.S (GET_DATA_POINTER): New. -(_gcry_aes_arm_encrypt_block, _gcry_aes_arm_decrypt_block): Use -GET_DATA_POINTER. --- - -Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi> - -Upstream-Status: Backport - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - cipher/camellia-arm.S | 17 +++++++++++++++-- - cipher/cast5-arm.S | 21 +++++++++++++++++---- - cipher/rijndael-arm.S | 17 +++++++++++++++-- - 3 files changed, 47 insertions(+), 8 deletions(-) - -diff --git a/cipher/camellia-arm.S b/cipher/camellia-arm.S -index c30d194..cdeaf8b 100644 ---- a/cipher/camellia-arm.S -+++ b/cipher/camellia-arm.S -@@ -28,6 +28,19 @@ - .syntax unified - .arm - -+#ifdef __PIC__ -+# define GET_DATA_POINTER(reg, name, rtmp) \ -+ ldr reg, 1f; \ -+ ldr rtmp, 2f; \ -+ b 3f; \ -+ 1: .word _GLOBAL_OFFSET_TABLE_-(3f+8); \ -+ 2: .word name(GOT); \ -+ 3: add reg, pc, reg; \ -+ ldr reg, [reg, rtmp]; -+#else -+# define GET_DATA_POINTER(reg, name, rtmp) ldr reg, =name -+#endif -+ - /* struct camellia_ctx: */ - #define key_table 0 - -@@ -261,7 +274,7 @@ _gcry_camellia_arm_encrypt_block: - */ - push {%r1, %r4-%r11, %ip, %lr}; - -- ldr RTAB1, =.Lcamellia_sp1110; -+ GET_DATA_POINTER(RTAB1, .Lcamellia_sp1110, RTAB3); - mov RMASK, #0xff; - add RTAB3, RTAB1, #(2 * 4); - push {%r3}; -@@ -309,7 +322,7 @@ _gcry_camellia_arm_decrypt_block: - */ - push {%r1, %r4-%r11, %ip, %lr}; - -- ldr RTAB1, =.Lcamellia_sp1110; -+ GET_DATA_POINTER(RTAB1, .Lcamellia_sp1110, RTAB3); - mov RMASK, #0xff; - add RTAB3, RTAB1, #(2 * 4); - mov RMASK, RMASK, lsl#4 /* byte mask */ -diff --git a/cipher/cast5-arm.S b/cipher/cast5-arm.S -index ce7fa93..db96db4 100644 ---- a/cipher/cast5-arm.S -+++ b/cipher/cast5-arm.S -@@ -30,6 +30,19 @@ - - .extern _gcry_cast5_s1to4; - -+#ifdef __PIC__ -+# define GET_DATA_POINTER(reg, name, rtmp) \ -+ ldr reg, 1f; \ -+ ldr rtmp, 2f; \ -+ b 3f; \ -+ 1: .word _GLOBAL_OFFSET_TABLE_-(3f+8); \ -+ 2: .word name(GOT); \ -+ 3: add reg, pc, reg; \ -+ ldr reg, [reg, rtmp]; -+#else -+# define GET_DATA_POINTER(reg, name, rtmp) ldr reg, =name -+#endif -+ - /* structure of crypto context */ - #define Km 0 - #define Kr (Km + (16 * 4)) -@@ -260,7 +273,7 @@ _gcry_cast5_arm_encrypt_block: - */ - push {%r1, %r4-%r11, %ip, %lr}; - -- ldr Rs1, =_gcry_cast5_s1to4; -+ GET_DATA_POINTER(Rs1, _gcry_cast5_s1to4, Rs2); - mov RMASK, #(0xff << 2); - add Rs2, Rs1, #(0x100*4); - add Rs3, Rs1, #(0x100*4*2); -@@ -306,7 +319,7 @@ _gcry_cast5_arm_decrypt_block: - */ - push {%r1, %r4-%r11, %ip, %lr}; - -- ldr Rs1, =_gcry_cast5_s1to4; -+ GET_DATA_POINTER(Rs1, _gcry_cast5_s1to4, Rs2); - mov RMASK, #(0xff << 2); - add Rs2, Rs1, #(0x100 * 4); - add Rs3, Rs1, #(0x100 * 4 * 2); -@@ -500,7 +513,7 @@ _gcry_cast5_arm_enc_blk2: - */ - push {%lr}; - -- ldr Rs1, =_gcry_cast5_s1to4; -+ GET_DATA_POINTER(Rs1, _gcry_cast5_s1to4, Rs2); - mov RMASK, #(0xff << 2); - add Rs2, Rs1, #(0x100 * 4); - -@@ -631,7 +644,7 @@ _gcry_cast5_arm_dec_blk2: - * [RR0, RL0], [RR1, RL1]: dst - */ - -- ldr Rs1, =_gcry_cast5_s1to4; -+ GET_DATA_POINTER(Rs1, _gcry_cast5_s1to4, Rs2); - mov RMASK, #(0xff << 2); - add Rs2, Rs1, #(0x100 * 4); - -diff --git a/cipher/rijndael-arm.S b/cipher/rijndael-arm.S -index 22c350c..421c3b4 100644 ---- a/cipher/rijndael-arm.S -+++ b/cipher/rijndael-arm.S -@@ -28,6 +28,19 @@ - .syntax unified - .arm - -+#ifdef __PIC__ -+# define GET_DATA_POINTER(reg, name, rtmp) \ -+ ldr reg, 1f; \ -+ ldr rtmp, 2f; \ -+ b 3f; \ -+ 1: .word _GLOBAL_OFFSET_TABLE_-(3f+8); \ -+ 2: .word name(GOT); \ -+ 3: add reg, pc, reg; \ -+ ldr reg, [reg, rtmp]; -+#else -+# define GET_DATA_POINTER(reg, name, rtmp) ldr reg, =name -+#endif -+ - /* register macros */ - #define CTX %r0 - #define RTAB %lr -@@ -249,7 +262,7 @@ _gcry_aes_arm_encrypt_block: - 2: - sub %sp, #16; - -- ldr RTAB, =.LtableE0; -+ GET_DATA_POINTER(RTAB, .LtableE0, RMASK); - - str %r1, [%sp, #4]; /* dst */ - mov RMASK, #0xff; -@@ -503,7 +516,7 @@ _gcry_aes_arm_decrypt_block: - 2: - sub %sp, #16; - -- ldr RTAB, =.LtableD0; -+ GET_DATA_POINTER(RTAB, .LtableD0, RMASK); - - mov RMASK, #0xff; - str %r1, [%sp, #4]; /* dst */ diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc index 43e0291a7b..eea67aa58d 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt.inc +++ b/meta/recipes-support/libgcrypt/libgcrypt.inc @@ -18,7 +18,9 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \ BINCONFIG = "${bindir}/libgcrypt-config" -inherit autotools-brokensep texinfo binconfig-disabled pkgconfig +PR = "r1" + +inherit autotools texinfo binconfig-disabled pkgconfig EXTRA_OECONF = "--disable-asm --with-capabilities" diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.6.1.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.6.1.bb deleted file mode 100644 index 903ed661ed..0000000000 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.6.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require libgcrypt.inc - -SRC_URI += "file://libgcrypt-1.6.1-make-arm-asm-fPIC-friendly.patch" - -SRC_URI[md5sum] = "d155aa1b06fa879175922ba28f6a6509" -SRC_URI[sha256sum] = "7c1007197bef49c3b8740cf6af8b4eb4eb74c7a69796ebcf555d928c287255de" diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb new file mode 100644 index 0000000000..c49c0e7c17 --- /dev/null +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.6.2.bb @@ -0,0 +1,4 @@ +require libgcrypt.inc + +SRC_URI[md5sum] = "d19adc062edff0ebc7e887212733ef1f" +SRC_URI[sha256sum] = "936921644b9c81e2395e18a554a9a5f9252aae3976f8afc3e4229ee9d785e627" diff --git a/meta/recipes-support/libgpg-error/libgpg-error-1.12/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch index 89c9d22bf2..96476badaa 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error-1.12/pkgconfig.patch +++ b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch @@ -5,11 +5,11 @@ Upstream-Status: Pending -Index: libgpg-error-1.12/configure.ac +Index: libgpg-error-1.17/configure.ac =================================================================== ---- libgpg-error-1.12.orig/configure.ac 2014-05-13 21:14:26.846393236 +0000 -+++ libgpg-error-1.12/configure.ac 2014-05-13 21:14:26.926393236 +0000 -@@ -217,6 +217,7 @@ +--- libgpg-error-1.17.orig/configure.ac ++++ libgpg-error-1.17/configure.ac +@@ -521,6 +521,7 @@ AC_CONFIG_FILES([src/Makefile tests/Make AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd]) AC_CONFIG_FILES([src/versioninfo.rc]) AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) @@ -17,11 +17,11 @@ Index: libgpg-error-1.12/configure.ac AC_OUTPUT -Index: libgpg-error-1.12/src/Makefile.am +Index: libgpg-error-1.17/src/Makefile.am =================================================================== ---- libgpg-error-1.12.orig/src/Makefile.am 2014-05-13 21:14:26.846393236 +0000 -+++ libgpg-error-1.12/src/Makefile.am 2014-05-13 21:14:26.934393236 +0000 -@@ -37,13 +37,15 @@ +--- libgpg-error-1.17.orig/src/Makefile.am ++++ libgpg-error-1.17/src/Makefile.am +@@ -74,13 +74,15 @@ nodist_include_HEADERS = gpg-error.h bin_SCRIPTS = gpg-error-config m4datadir = $(datadir)/aclocal m4data_DATA = gpg-error.m4 @@ -31,17 +31,17 @@ Index: libgpg-error-1.12/src/Makefile.am EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ mkerrnos.awk errnos.in README \ mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \ - mkheader.awk gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \ + mkheader.c gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \ err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \ -- gpg-error.def.in versioninfo.rc.in -+ gpg-error.def.in versioninfo.rc.in gpg-error.pc.in +- gpg-error.vers gpg-error.def.in versioninfo.rc.in \ ++ gpg-error.vers gpg-error.def.in versioninfo.rc.in gpg-error.pc \ + $(lock_obj_pub) BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ - err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h \ -Index: libgpg-error-1.12/src/gpg-error.pc.in +Index: libgpg-error-1.17/src/gpg-error.pc.in =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libgpg-error-1.12/src/gpg-error.pc.in 2014-05-13 21:48:20.266382916 +0000 +--- /dev/null ++++ libgpg-error-1.17/src/gpg-error.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -54,11 +54,11 @@ Index: libgpg-error-1.12/src/gpg-error.pc.in +Version: @VERSION@ +Libs: -L${libdir} -lgpg-error +Cflags: -I${includedir} -Index: libgpg-error-1.12/src/gpg-error.m4 +Index: libgpg-error-1.17/src/gpg-error.m4 =================================================================== ---- libgpg-error-1.12.orig/src/gpg-error.m4 2014-05-13 21:45:02.038383922 +0000 -+++ libgpg-error-1.12/src/gpg-error.m4 2014-05-13 21:47:08.362383281 +0000 -@@ -15,58 +15,14 @@ +--- libgpg-error-1.17.orig/src/gpg-error.m4 ++++ libgpg-error-1.17/src/gpg-error.m4 +@@ -26,73 +26,13 @@ dnl is added to the gpg_config_script_wa dnl AC_DEFUN([AM_PATH_GPG_ERROR], [ AC_REQUIRE([AC_CANONICAL_HOST]) @@ -70,7 +70,7 @@ Index: libgpg-error-1.12/src/gpg-error.m4 - AC_HELP_STRING([--with-libgpg-error-prefix=PFX], - [prefix where GPG Error is installed (optional)]), - [gpg_error_config_prefix="$withval"]) - +- - dnl Accept --with-gpg-error-prefix and make it work the same as - dnl --with-libgpg-error-prefix above, for backwards compatibility, - dnl but do not document this old, inconsistently-named option. @@ -78,14 +78,27 @@ Index: libgpg-error-1.12/src/gpg-error.m4 - [gpg_error_config_prefix="$withval"]) + min_gpg_error_version=ifelse([$1], ,0.0,$1) -- if test x$gpg_error_config_prefix != x ; then -- if test x${GPG_ERROR_CONFIG+set} != xset ; then -- GPG_ERROR_CONFIG=$gpg_error_config_prefix/bin/gpg-error-config +- if test x"${GPG_ERROR_CONFIG}" = x ; then +- if test x"${gpg_error_config_prefix}" != x ; then +- GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config" +- else +- case "${SYSROOT}" in +- /*) +- if test -x "${SYSROOT}/bin/gpg-error-config" ; then +- GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config" +- fi +- ;; +- '') +- ;; +- *) +- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) +- ;; +- esac - fi - fi + PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no]) -- AC_PATH_TOOL(GPG_ERROR_CONFIG, gpg-error-config, no) +- AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) - min_gpg_error_version=ifelse([$1], ,0.0,$1) - AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) - ok=no @@ -113,6 +126,8 @@ Index: libgpg-error-1.12/src/gpg-error.m4 if test $ok = yes; then - GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags` - GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` +- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null` +- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null` - AC_MSG_RESULT([yes ($gpg_error_config_version)]) ifelse([$2], , :, [$2]) - gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none` @@ -120,12 +135,14 @@ Index: libgpg-error-1.12/src/gpg-error.m4 if test x"$gpg_error_config_host" != xnone ; then if test x"$gpg_error_config_host" != x"$host" ; then AC_MSG_WARN([[ -@@ -80,9 +36,6 @@ +@@ -107,11 +47,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], fi fi else - GPG_ERROR_CFLAGS="" - GPG_ERROR_LIBS="" +- GPG_ERROR_MT_CFLAGS="" +- GPG_ERROR_MT_LIBS="" - AC_MSG_RESULT(no) ifelse([$3], , :, [$3]) fi diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.12.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.12.bb deleted file mode 100644 index af9574d8fd..0000000000 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.12.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Small library that defines common error values for all GnuPG components" -HOMEPAGE = "http://www.gnupg.org/related_software/libgpg-error/" -BUGTRACKER = "https://bugs.g10code.com/gnupg/index" - -LICENSE = "GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://src/gpg-error.h.in;endline=23;md5=6ac0378874589a44d53512b3786b4bc0 \ - file://src/init.c;endline=20;md5=b69742f2a8827d494c6f6a4b1768416c" - - -SECTION = "libs" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \ - file://pkgconfig.patch" - -SRC_URI[md5sum] = "8f0eb41a344d19ac2aa9bd101dfb9ce6" -SRC_URI[sha256sum] = "cafc9ed6a87c53a35175d5a1220a96ca386696eef2fa059cc0306211f246e55f" - -BINCONFIG = "${bindir}/gpg-error-config" - -inherit autotools binconfig-disabled pkgconfig gettext - -FILES_${PN}-dev += "${bindir}/gpg-error" - -do_install_append() { - # we don't have common lisp in OE - rm -rf "${D}${datadir}/common-lisp/" -} - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.18.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.18.bb new file mode 100644 index 0000000000..c9a47a3573 --- /dev/null +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.18.bb @@ -0,0 +1,51 @@ +SUMMARY = "Small library that defines common error values for all GnuPG components" +HOMEPAGE = "http://www.gnupg.org/related_software/libgpg-error/" +BUGTRACKER = "https://bugs.g10code.com/gnupg/index" + +LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://src/gpg-error.h.in;endline=23;md5=8b204918f0ca707136394d8bb20c7ebc \ + file://src/init.c;endline=20;md5=8f5a9b59634f4aebcd0ec9d3ebd53bfe" + + +SECTION = "libs" + +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \ + file://pkgconfig.patch" +SRC_URI[md5sum] = "12312802d2065774b787cbfc22cc04e9" +SRC_URI[sha256sum] = "9ff1d6e61d4cef7c1d0607ceef6d40dc33f3da7a3094170c3718c00153d80810" + +BINCONFIG = "${bindir}/gpg-error-config" + +inherit autotools binconfig-disabled pkgconfig gettext +CPPFLAGS += "-P" +do_compile_prepend() { + TARGET_FILE=linux-gnu + if [ ${TARGET_OS} != "linux" ]; then + TARGET_FILE=${TARGET_OS} + fi + + case ${TARGET_ARCH} in + aarch64_be) TUPLE=aarch64-unknown-linux-gnu ;; + arm) TUPLE=arm-unknown-linux-gnueabi ;; + armeb) TUPLE=arm-unknown-linux-gnueabi ;; + i586|i686) TUPLE=i486-pc-linux-gnu ;; + mips64el) TUPLE=mipsel-unknown-linux-gnu ;; + mips64) TUPLE=mips-unknown-linux-gnu ;; + x86_64) TUPLE=x86_64-pc-linux-gnu ;; + *) TUPLE=${TARGET_ARCH}-unknown-linux-gnu ;; + esac + + cp ${S}/src/syscfg/lock-obj-pub.$TUPLE.h \ + ${S}/src/syscfg/lock-obj-pub.$TARGET_FILE.h +} + +do_install_append() { + # we don't have common lisp in OE + rm -rf "${D}${datadir}/common-lisp/" +} + +FILES_${PN}-dev += "${bindir}/gpg-error" + +BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/libical/libical_1.0.0.bb b/meta/recipes-support/libical/libical_1.0.0.bb index 07b549ecf2..be6b635caf 100644 --- a/meta/recipes-support/libical/libical_1.0.0.bb +++ b/meta/recipes-support/libical/libical_1.0.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \ file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6" SECTION = "libs" -SRC_URI = "https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz" +SRC_URI = "https://github.com/${BPN}/${BPN}/archive/v${PV}.tar.gz" SRC_URI[md5sum] = "f4b8e33ae5efb2f025eb43ce69682a36" SRC_URI[sha256sum] = "0072e83834092315772e6719b85fc8b11530b1ff53f4d108315fb38cddbce8c2" diff --git a/meta/recipes-support/libksba/libksba_1.3.0.bb b/meta/recipes-support/libksba/libksba_1.3.2.bb index 13ad437629..cce08c302c 100644 --- a/meta/recipes-support/libksba/libksba_1.3.0.bb +++ b/meta/recipes-support/libksba/libksba_1.3.2.bb @@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fd541d83f75d038c4e0617b672ed8bda \ file://COPYING.GPLv3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \ file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " -PR = "r1" DEPENDS = "libgpg-error" @@ -17,8 +16,8 @@ inherit autotools binconfig-disabled pkgconfig texinfo SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \ file://ksba-add-pkgconfig-support.patch" -SRC_URI[md5sum] = "cd86fad9c9d360b2cf80449f8a4a4075" -SRC_URI[sha256sum] = "5a61eed50550d4d0dcb47457ce7b6a90f8e719d42a3b25f7e79333e8cd721971" +SRC_URI[md5sum] = "c3c9a66e22d87fe3ae59865250b8a09c" +SRC_URI[sha256sum] = "eb95537955dfc2845690a4cc3836074fa6d0a2c2ca2cbf1759364d3bd9868406" do_configure_prepend () { # Else these could be used in preference to those in aclocal-copy diff --git a/meta/recipes-support/libnl/libnl_3.2.25.bb b/meta/recipes-support/libnl/libnl_3.2.25.bb index dcaa85d3af..97814fb134 100644 --- a/meta/recipes-support/libnl/libnl_3.2.25.bb +++ b/meta/recipes-support/libnl/libnl_3.2.25.bb @@ -3,6 +3,7 @@ HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" SECTION = "libs/network" PE = "1" +PR = "r1" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" @@ -17,7 +18,7 @@ SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \ SRC_URI[md5sum] = "03f74d0cd5037cadc8cdfa313bbd195c" SRC_URI[sha256sum] = "8beb7590674957b931de6b7f81c530b85dc7c1ad8fbda015398bc1e8d1ce8ec5" -inherit autotools-brokensep pkgconfig +inherit autotools pkgconfig FILES_${PN} = "${libdir}/libnl-3.so.* \ ${libdir}/libnl.so.* \ diff --git a/meta/recipes-support/libpcre/libpcre/Makefile b/meta/recipes-support/libpcre/libpcre/Makefile index 5419d71f7f..708d807d08 100644 --- a/meta/recipes-support/libpcre/libpcre/Makefile +++ b/meta/recipes-support/libpcre/libpcre/Makefile @@ -65,7 +65,7 @@ am__test_logs1 = $(TESTS:=.log) am__test_logs2 = $(am__test_logs1:.log=.log) TEST_LOGS = $(am__test_logs2:.test.log=.log) MKDIR_P = /bin/mkdir -p -PACKAGE_STRING = PCRE 8.34 +PACKAGE_STRING = PCRE 8.36 SHELL = /bin/sh srcdir = . top_srcdir = . diff --git a/meta/recipes-support/libpcre/libpcre_8.35.bb b/meta/recipes-support/libpcre/libpcre_8.36.bb index 92098c8c51..a4b7f6d985 100644 --- a/meta/recipes-support/libpcre/libpcre_8.35.bb +++ b/meta/recipes-support/libpcre/libpcre_8.36.bb @@ -14,8 +14,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/pcre/pcre/${PV}/pcre-${PV}.tar.bz2 \ file://Makefile \ " -SRC_URI[md5sum] = "6aacb23986adccd9b3bc626c00979958" -SRC_URI[sha256sum] = "a961c1c78befef263cc130756eeca7b674b4e73a81533293df44e4265236865b" +SRC_URI[md5sum] = "b767bc9af0c20bc9c1fe403b0d41ad97" +SRC_URI[sha256sum] = "ef833457de0c40e82f573e34528f43a751ff20257ad0e86d272ed5637eb845bb" S = "${WORKDIR}/pcre-${PV}" @@ -28,8 +28,6 @@ BINCONFIG = "${bindir}/pcre-config" inherit autotools binconfig-disabled ptest -PARALLEL_MAKE = "" - EXTRA_OECONF = "\ --enable-newline-is-lf \ --enable-rebuild-chartables \ diff --git a/meta/recipes-support/libproxy/libproxy_0.4.11.bb b/meta/recipes-support/libproxy/libproxy_0.4.11.bb index a53a197615..3367c85156 100644 --- a/meta/recipes-support/libproxy/libproxy_0.4.11.bb +++ b/meta/recipes-support/libproxy/libproxy_0.4.11.bb @@ -29,7 +29,7 @@ do_configure_prepend() { } python() { - if bb.utils.contains("INCOMPATIBLE_LICENSE", "GPLv3", "x", "", d) == "x" or bb.utils.contains("DISTRO_FEATURES", "x11", "x", "", d) == "": + if incompatible_license_contains("GPLv3", "x", "", d) == "x" or bb.utils.contains("DISTRO_FEATURES", "x11", "x", "", d) == "": d.setVar("EXTRA_OECMAKE", d.getVar("EXTRA_OECMAKE").replace("-DWITH_GNOME=yes", "-DWITH_GNOME=no")) d.setVar("DEPENDS", " ".join(i for i in d.getVar("DEPENDS").split() if i != "gconf")) } diff --git a/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch b/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch index a330c73412..d4489165bf 100644 --- a/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch +++ b/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch @@ -16,11 +16,11 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> gnulib-m4/iconv.m4 | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) -diff --git a/gnulib-m4/iconv.m4 b/gnulib-m4/iconv.m4 -index f46ff14..de0a5e9 100644 ---- a/gnulib-m4/iconv.m4 -+++ b/gnulib-m4/iconv.m4 -@@ -126,17 +126,6 @@ int main () +Index: libunistring-0.9.4/gnulib-m4/iconv.m4 +=================================================================== +--- libunistring-0.9.4.orig/gnulib-m4/iconv.m4 2014-11-03 17:41:29.755011917 +0000 ++++ libunistring-0.9.4/gnulib-m4/iconv.m4 2014-11-03 17:43:03.795014480 +0000 +@@ -159,17 +159,6 @@ } } #endif @@ -34,9 +34,7 @@ index f46ff14..de0a5e9 100644 - && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) - /* Try HP-UX names. */ - && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) -- return 1; - return 0; - }], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], - [case "$host_os" in --- -1.7.4 +- result |= 16; + return result; + }]])], + [am_cv_func_iconv_works=yes], diff --git a/meta/recipes-support/libunistring/libunistring/libunistring_fix_for_automake_1.12.patch b/meta/recipes-support/libunistring/libunistring/libunistring_fix_for_automake_1.12.patch deleted file mode 100644 index 5d831d5491..0000000000 --- a/meta/recipes-support/libunistring/libunistring/libunistring_fix_for_automake_1.12.patch +++ /dev/null @@ -1,81 +0,0 @@ -Upstream-Status: Pending - -automake 1.12 has deprecated use of mkdir_p, and it recommends -use of MKDIR_P instead. Changed the code to avoid these kind -of warning-errors. - -| make[2]: /build/tmp/work/x86_64-linux/libunistring-native-0.9.3-r2/image/srv/home/nitin/builds2/build0/tmp/sysroots/x86_64-linux/usr/share/doc/libunistring: Command not found -| make[2]: *** [install-html-split] Error 127 - -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> -2012/07/10 - -Index: libunistring-0.9.3/doc/Makefile.am -=================================================================== ---- libunistring-0.9.3.orig/doc/Makefile.am -+++ libunistring-0.9.3/doc/Makefile.am -@@ -87,7 +87,7 @@ TEXI2DVI = @TEXI2DVI@ $(TEXINCLUDES) - # The install-dvi target is already defined by automake. - - installdirs-dvi: -- $(mkdir_p) $(DESTDIR)$(dvidir) -+ $(MKDIR_P) $(DESTDIR)$(dvidir) - - uninstall-dvi: - $(RM) $(DESTDIR)$(dvidir)/libunistring.dvi -@@ -105,7 +105,7 @@ libunistring.ps: libunistring.dvi - # The install-ps target is already defined by automake. - - installdirs-ps: -- $(mkdir_p) $(DESTDIR)$(psdir) -+ $(MKDIR_P) $(DESTDIR)$(psdir) - - uninstall-ps: - $(RM) $(DESTDIR)$(psdir)/libunistring.ps -@@ -120,7 +120,7 @@ TEXI2PDF = @TEXI2DVI@ --pdf $(TEXINCLUDE - # The install-pdf target is already defined by automake. - - installdirs-pdf: -- $(mkdir_p) $(DESTDIR)$(pdfdir) -+ $(MKDIR_P) $(DESTDIR)$(pdfdir) - - uninstall-pdf: - $(RM) $(DESTDIR)$(pdfdir)/libunistring.pdf -@@ -151,17 +151,17 @@ libunistring_toc.html: libunistring.texi - } - - install-html-monolithic: libunistring.html -- $(mkdir_p) $(DESTDIR)$(htmldir) -+ $(MKDIR_P) $(DESTDIR)$(htmldir) - $(INSTALL_DATA) `if test -f libunistring.html; then echo .; else echo $(srcdir); fi`/libunistring.html $(DESTDIR)$(htmldir)/libunistring.html - - install-html-split: libunistring_toc.html -- $(mkdir_p) $(DESTDIR)$(htmldir) -+ $(MKDIR_P) $(DESTDIR)$(htmldir) - for file in `if test -f libunistring_toc.html; then echo .; else echo $(srcdir); fi`/libunistring_*.html; do \ - $(INSTALL_DATA) $$file $(DESTDIR)$(htmldir)/`basename $$file`; \ - done - - installdirs-html: -- $(mkdir_p) $(DESTDIR)$(htmldir) -+ $(MKDIR_P) $(DESTDIR)$(htmldir) - - uninstall-html-monolithic: - $(RM) $(DESTDIR)$(htmldir)/libunistring.html -@@ -170,14 +170,14 @@ uninstall-html-split: - $(RM) $(DESTDIR)$(htmldir)/libunistring_*.html - - dist-html-monolithic: -- $(mkdir_p) $(distdir)/ -+ $(MKDIR_P) $(distdir)/ - file=libunistring.html; \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ - cp -p $$d/$$file $(distdir)/$$file || exit 1 - - # We would like to put libunistring_*.html into EXTRA_DIST, but it doesn't work. - dist-html-split: libunistring_toc.html -- $(mkdir_p) $(distdir)/ -+ $(MKDIR_P) $(distdir)/ - file=libunistring_toc.html; \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ - for file in `cd $$d && echo libunistring_*.html`; do \ diff --git a/meta/recipes-support/libunistring/libunistring/parallelmake.patch b/meta/recipes-support/libunistring/libunistring/parallelmake.patch deleted file mode 100644 index 21025b8e9d..0000000000 --- a/meta/recipes-support/libunistring/libunistring/parallelmake.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix a parallel make race where cdefs.h uses the unused-parameter.h header file -but has no dependency listed. This can result in an empty cdefs.h file which -results in a build failure like: - -| In file included from striconveh.c:30:0: -| unistr.h:193:48: error: expected ';', ',' or ')' before '_GL_UNUSED_PARAMETER' -| In file included from striconveh.c:30:0: -| unistr.h:263:54: error: expected ';', ',' or ')' before '_GL_UNUSED_PARAMETER' - -Upstream-Status: Pending - -RP 2012/4/12 - -Index: libunistring-0.9.3/lib/Makefile.am -=================================================================== ---- libunistring-0.9.3.orig/lib/Makefile.am 2012-04-12 07:45:41.450059820 +0000 -+++ libunistring-0.9.3/lib/Makefile.am 2012-04-12 07:48:45.434055559 +0000 -@@ -157,7 +157,7 @@ - - # unistring/cdefs.h is not public, but is included by other header files. - nobase_nodist_include_HEADERS += unistring/cdefs.h --unistring/cdefs.h : unistring/cdefs.in.h -+unistring/cdefs.h : unistring/cdefs.in.h $(UNUSED_PARAMETER_H) - @MKDIR_P@ unistring - rm -f $@-t $@ - sed -e '/definition of _GL_UNUSED_PARAMETER/r $(UNUSED_PARAMETER_H)' \ diff --git a/meta/recipes-support/libunistring/libunistring_0.9.3.bb b/meta/recipes-support/libunistring/libunistring_0.9.4.bb index db1651b2a6..89b1dc26f1 100644 --- a/meta/recipes-support/libunistring/libunistring_0.9.3.bb +++ b/meta/recipes-support/libunistring/libunistring_0.9.4.bb @@ -18,15 +18,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6" SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \ - file://parallelmake.patch \ - file://libunistring_fix_for_automake_1.12.patch \ file://iconv-m4-remove-the-test-to-convert-euc-jp.patch \ " -SRC_URI[md5sum] = "db8eca3b64163abadf8c40e5cecc261f" -SRC_URI[sha256sum] = "610d3ec724fbdaa654afe3cff20b9f4d504be3fd296fded2e0f7f764041006a3" - -PR = "r3" +SRC_URI[md5sum] = "c24a6a3838d9ad4a41a62549312c4226" +SRC_URI[sha256sum] = "f5246d63286a42902dc096d6d44541fbe4204b6c02d6d5d28b457c9882ddd8a6" inherit autotools texinfo BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libunwind/libunwind-1.1/AArch64-port.patch b/meta/recipes-support/libunwind/libunwind-1.1/AArch64-port.patch new file mode 100644 index 0000000000..228ec322d5 --- /dev/null +++ b/meta/recipes-support/libunwind/libunwind-1.1/AArch64-port.patch @@ -0,0 +1,2529 @@ +From ac6c0a6535975f1dc2da6e4e2766614baac2a14a Mon Sep 17 00:00:00 2001 +From: Yvan Roux <yvan.roux@linaro.org> +Date: Sat, 11 May 2013 09:18:23 -0600 +Subject: [PATCH] AArch64 port. + +Upstream-Status: Backport + +--- + Makefile.am | 6 + README | 1 + configure.ac | 6 + include/libunwind-aarch64.h | 187 ++++++++++++++++++++++ + include/libunwind.h.in | 4 + include/tdep-aarch64/dwarf-config.h | 52 ++++++ + include/tdep-aarch64/jmpbuf.h | 33 +++ + include/tdep-aarch64/libunwind_i.h | 294 +++++++++++++++++++++++++++++++++++ + include/tdep/dwarf-config.h | 4 + include/tdep/jmpbuf.h | 2 + include/tdep/libunwind_i.h.in | 4 + src/Makefile.am | 39 ++++ + src/aarch64/Gcreate_addr_space.c | 60 +++++++ + src/aarch64/Gget_proc_info.c | 39 ++++ + src/aarch64/Gget_save_loc.c | 100 +++++++++++ + src/aarch64/Gglobal.c | 57 ++++++ + src/aarch64/Ginit.c | 187 ++++++++++++++++++++++ + src/aarch64/Ginit_local.c | 55 ++++++ + src/aarch64/Ginit_remote.c | 45 +++++ + src/aarch64/Gis_signal_frame.c | 64 +++++++ + src/aarch64/Gregs.c | 113 +++++++++++++ + src/aarch64/Gresume.c | 177 +++++++++++++++++++++ + src/aarch64/Gstep.c | 129 +++++++++++++++ + src/aarch64/Lcreate_addr_space.c | 5 + src/aarch64/Lget_proc_info.c | 5 + src/aarch64/Lget_save_loc.c | 5 + src/aarch64/Lglobal.c | 5 + src/aarch64/Linit.c | 5 + src/aarch64/Linit_local.c | 5 + src/aarch64/Linit_remote.c | 5 + src/aarch64/Lis_signal_frame.c | 5 + src/aarch64/Lregs.c | 5 + src/aarch64/Lresume.c | 5 + src/aarch64/Lstep.c | 5 + src/aarch64/gen-offsets.c | 68 ++++++++ + src/aarch64/init.h | 127 +++++++++++++++ + src/aarch64/is_fpreg.c | 32 +++ + src/aarch64/offsets.h | 49 +++++ + src/aarch64/regname.c | 106 ++++++++++++ + src/aarch64/siglongjmp.S | 12 + + src/aarch64/unwind_i.h | 43 +++++ + src/coredump/_UCD_access_reg_linux.c | 5 + src/ptrace/_UPT_reg_offset.c | 36 ++++ + 43 files changed, 2184 insertions(+), 7 deletions(-) + create mode 100644 include/libunwind-aarch64.h + create mode 100644 include/tdep-aarch64/dwarf-config.h + create mode 100644 include/tdep-aarch64/jmpbuf.h + create mode 100644 include/tdep-aarch64/libunwind_i.h + create mode 100644 src/aarch64/Gcreate_addr_space.c + create mode 100644 src/aarch64/Gget_proc_info.c + create mode 100644 src/aarch64/Gget_save_loc.c + create mode 100644 src/aarch64/Gglobal.c + create mode 100644 src/aarch64/Ginit.c + create mode 100644 src/aarch64/Ginit_local.c + create mode 100644 src/aarch64/Ginit_remote.c + create mode 100644 src/aarch64/Gis_signal_frame.c + create mode 100644 src/aarch64/Gregs.c + create mode 100644 src/aarch64/Gresume.c + create mode 100644 src/aarch64/Gstep.c + create mode 100644 src/aarch64/Lcreate_addr_space.c + create mode 100644 src/aarch64/Lget_proc_info.c + create mode 100644 src/aarch64/Lget_save_loc.c + create mode 100644 src/aarch64/Lglobal.c + create mode 100644 src/aarch64/Linit.c + create mode 100644 src/aarch64/Linit_local.c + create mode 100644 src/aarch64/Linit_remote.c + create mode 100644 src/aarch64/Lis_signal_frame.c + create mode 100644 src/aarch64/Lregs.c + create mode 100644 src/aarch64/Lresume.c + create mode 100644 src/aarch64/Lstep.c + create mode 100644 src/aarch64/gen-offsets.c + create mode 100644 src/aarch64/init.h + create mode 100644 src/aarch64/is_fpreg.c + create mode 100644 src/aarch64/offsets.h + create mode 100644 src/aarch64/regname.c + create mode 100644 src/aarch64/siglongjmp.S + create mode 100644 src/aarch64/unwind_i.h + +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,6 +2,9 @@ include_HEADERS = include/libunwind-dyna + include/libunwind-ptrace.h \ + include/libunwind-coredump.h + ++if ARCH_AARCH64 ++include_HEADERS += include/libunwind-aarch64.h ++endif + if ARCH_ARM + include_HEADERS += include/libunwind-arm.h + endif +@@ -41,6 +44,9 @@ SUBDIRS = src tests doc + noinst_HEADERS = include/dwarf.h include/dwarf_i.h include/dwarf-eh.h \ + include/compiler.h include/libunwind_i.h include/mempool.h \ + include/remote.h \ ++ include/tdep-aarch64/dwarf-config.h \ ++ include/tdep-aarch64/jmpbuf.h \ ++ include/tdep-aarch64/libunwind_i.h \ + include/tdep-arm/dwarf-config.h include/tdep-arm/ex_tables.h \ + include/tdep-arm/jmpbuf.h include/tdep-arm/libunwind_i.h \ + include/tdep-ia64/jmpbuf.h include/tdep-ia64/rse.h \ +--- a/README ++++ b/README +@@ -9,6 +9,7 @@ several architecture/operating-system co + Linux/IA-64: Fully tested and supported. + Linux/PARISC: Works well, but C library missing unwind-info. + HP-UX/IA-64: Mostly works but known to have some serious limitations. ++ Linux/AArch64: Newly added. + Linux/PPC64: Newly added. + Linux/SuperH: Newly added. + FreeBSD/i386: Newly added. +--- a/configure.ac ++++ b/configure.ac +@@ -104,7 +104,7 @@ SET_ARCH([$target_cpu],[target_arch]) + + AC_ARG_ENABLE(coredump, + AS_HELP_STRING([--enable-coredump],[building libunwind-coredump library]),, +- [AS_CASE([$host_arch], [arm*|mips*|sh*|x86*], [enable_coredump=yes], [enable_coredump=no])] ++ [AS_CASE([$host_arch], [aarch64*|arm*|mips*|sh*|x86*], [enable_coredump=yes], [enable_coredump=no])] + ) + + AC_MSG_CHECKING([if we should build libunwind-coredump]) +@@ -121,6 +121,7 @@ AC_MSG_RESULT([$target_os]) + + AM_CONDITIONAL(BUILD_COREDUMP, test x$enable_coredump = xyes) + AM_CONDITIONAL(REMOTE_ONLY, test x$target_arch != x$host_arch) ++AM_CONDITIONAL(ARCH_AARCH64, test x$target_arch = xaarch64) + AM_CONDITIONAL(ARCH_ARM, test x$target_arch = xarm) + AM_CONDITIONAL(ARCH_IA64, test x$target_arch = xia64) + AM_CONDITIONAL(ARCH_HPPA, test x$target_arch = xhppa) +@@ -137,7 +138,7 @@ AM_CONDITIONAL(OS_FREEBSD, expr x$target + AC_MSG_CHECKING([for ELF helper width]) + case "${target_arch}" in + (arm|hppa|ppc32|x86|sh) use_elf32=yes; AC_MSG_RESULT([32]);; +-(ia64|ppc64|x86_64) use_elf64=yes; AC_MSG_RESULT([64]);; ++(aarch64|ia64|ppc64|x86_64) use_elf64=yes; AC_MSG_RESULT([64]);; + (mips) use_elfxx=yes; AC_MSG_RESULT([xx]);; + *) AC_MSG_ERROR([Unknown ELF target: ${target_arch}]) + esac +@@ -186,6 +187,7 @@ AS_HELP_STRING([--enable-cxx-exceptions] + # C++ exception handling doesn't work too well on x86 + case $target_arch in + x86*) enable_cxx_exceptions=no;; ++ aarch64*) enable_cxx_exceptions=no;; + arm*) enable_cxx_exceptions=no;; + mips*) enable_cxx_exceptions=no;; + *) enable_cxx_exceptions=yes;; +--- /dev/null ++++ b/include/libunwind-aarch64.h +@@ -0,0 +1,187 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2001-2004 Hewlett-Packard Co ++ Contributed by David Mosberger-Tang <davidm@hpl.hp.com> ++ Copyright (C) 2013 Linaro Limited ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#ifndef LIBUNWIND_H ++#define LIBUNWIND_H ++ ++#if defined(__cplusplus) || defined(c_plusplus) ++extern "C" { ++#endif ++ ++#include <inttypes.h> ++#include <stddef.h> ++#include <ucontext.h> ++ ++#define UNW_TARGET aarch64 ++#define UNW_TARGET_AARCH64 1 ++ ++#define _U_TDEP_QP_TRUE 0 /* see libunwind-dynamic.h */ ++ ++/* This needs to be big enough to accommodate "struct cursor", while ++ leaving some slack for future expansion. Changing this value will ++ require recompiling all users of this library. Stack allocation is ++ relatively cheap and unwind-state copying is relatively rare, so we ++ want to err on making it rather too big than too small. */ ++ ++#define UNW_TDEP_CURSOR_LEN 4096 ++ ++typedef uint64_t unw_word_t; ++typedef int64_t unw_sword_t; ++ ++typedef long double unw_tdep_fpreg_t; ++ ++typedef struct ++ { ++ /* no aarch64-specific auxiliary proc-info */ ++ } ++unw_tdep_proc_info_t; ++ ++typedef enum ++ { ++ /* 64-bit general registers. */ ++ UNW_AARCH64_X0, ++ UNW_AARCH64_X1, ++ UNW_AARCH64_X2, ++ UNW_AARCH64_X3, ++ UNW_AARCH64_X4, ++ UNW_AARCH64_X5, ++ UNW_AARCH64_X6, ++ UNW_AARCH64_X7, ++ UNW_AARCH64_X8, ++ ++ /* Temporary registers. */ ++ UNW_AARCH64_X9, ++ UNW_AARCH64_X10, ++ UNW_AARCH64_X11, ++ UNW_AARCH64_X12, ++ UNW_AARCH64_X13, ++ UNW_AARCH64_X14, ++ UNW_AARCH64_X15, ++ ++ /* Intra-procedure-call temporary registers. */ ++ UNW_AARCH64_X16, ++ UNW_AARCH64_X17, ++ ++ /* Callee-saved registers. */ ++ UNW_AARCH64_X18, ++ UNW_AARCH64_X19, ++ UNW_AARCH64_X20, ++ UNW_AARCH64_X21, ++ UNW_AARCH64_X22, ++ UNW_AARCH64_X23, ++ UNW_AARCH64_X24, ++ UNW_AARCH64_X25, ++ UNW_AARCH64_X26, ++ UNW_AARCH64_X27, ++ UNW_AARCH64_X28, ++ ++ /* 64-bit frame pointer. */ ++ UNW_AARCH64_X29, ++ ++ /* 64-bit link register. */ ++ UNW_AARCH64_X30, ++ ++ /* 64-bit stack pointer. */ ++ UNW_AARCH64_SP = 31, ++ UNW_AARCH64_PC, ++ UNW_AARCH64_PSTATE, ++ ++ /* 128-bit FP/Advanced SIMD registers. */ ++ UNW_AARCH64_V0 = 64, ++ UNW_AARCH64_V1, ++ UNW_AARCH64_V2, ++ UNW_AARCH64_V3, ++ UNW_AARCH64_V4, ++ UNW_AARCH64_V5, ++ UNW_AARCH64_V6, ++ UNW_AARCH64_V7, ++ UNW_AARCH64_V8, ++ UNW_AARCH64_V9, ++ UNW_AARCH64_V10, ++ UNW_AARCH64_V11, ++ UNW_AARCH64_V12, ++ UNW_AARCH64_V13, ++ UNW_AARCH64_V14, ++ UNW_AARCH64_V15, ++ UNW_AARCH64_V16, ++ UNW_AARCH64_V17, ++ UNW_AARCH64_V18, ++ UNW_AARCH64_V19, ++ UNW_AARCH64_V20, ++ UNW_AARCH64_V21, ++ UNW_AARCH64_V22, ++ UNW_AARCH64_V23, ++ UNW_AARCH64_V24, ++ UNW_AARCH64_V25, ++ UNW_AARCH64_V26, ++ UNW_AARCH64_V27, ++ UNW_AARCH64_V28, ++ UNW_AARCH64_V29, ++ UNW_AARCH64_V30, ++ UNW_AARCH64_V31, ++ ++ UNW_AARCH64_FPSR, ++ UNW_AARCH64_FPCR, ++ ++ /* For AArch64, the CFA is the value of SP (x31) at the call site of the ++ previous frame. */ ++ UNW_AARCH64_CFA = UNW_AARCH64_SP, ++ ++ UNW_TDEP_LAST_REG = UNW_AARCH64_FPCR, ++ ++ UNW_TDEP_IP = UNW_AARCH64_X30, ++ UNW_TDEP_SP = UNW_AARCH64_SP, ++ UNW_TDEP_EH = UNW_AARCH64_X0, ++ ++ } ++aarch64_regnum_t; ++ ++/* Use R0 through R3 to pass exception handling information. */ ++#define UNW_TDEP_NUM_EH_REGS 4 ++ ++typedef struct unw_tdep_save_loc ++ { ++ /* Additional target-dependent info on a save location. */ ++ } ++unw_tdep_save_loc_t; ++ ++ ++/* On AArch64, we can directly use ucontext_t as the unwind context. */ ++typedef ucontext_t unw_tdep_context_t; ++ ++#include "libunwind-common.h" ++#include "libunwind-dynamic.h" ++ ++#define unw_tdep_getcontext(uc) (getcontext (uc), 0) ++#define unw_tdep_is_fpreg UNW_ARCH_OBJ(is_fpreg) ++ ++extern int unw_tdep_is_fpreg (int); ++ ++#if defined(__cplusplus) || defined(c_plusplus) ++} ++#endif ++ ++#endif /* LIBUNWIND_H */ +--- a/include/libunwind.h.in ++++ b/include/libunwind.h.in +@@ -3,7 +3,9 @@ + + #ifndef UNW_REMOTE_ONLY + +-#if defined __arm__ ++#if defined __aarch64__ ++#include "libunwind-aarch64.h" ++#elif defined __arm__ + # include "libunwind-arm.h" + #elif defined __hppa__ + # include "libunwind-hppa.h" +--- /dev/null ++++ b/include/tdep-aarch64/dwarf-config.h +@@ -0,0 +1,52 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2008 CodeSourcery ++ Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> ++ Copyright (C) 2013 Linaro Limited ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#ifndef dwarf_config_h ++#define dwarf_config_h ++ ++/* This matches the value udes by GCC (see ++ gcc/config/aarch64/aarch64.h:DWARF_FRAME_REGISTERS. */ ++#define DWARF_NUM_PRESERVED_REGS 97 ++ ++/* Return TRUE if the ADDR_SPACE uses big-endian byte-order. */ ++#define dwarf_is_big_endian(addr_space) 0 ++ ++#define dwarf_to_unw_regnum(reg) (((reg) <= UNW_AARCH64_V31) ? (reg) : 0) ++ ++/* Convert a pointer to a dwarf_cursor structure to a pointer to ++ unw_cursor_t. */ ++#define dwarf_to_cursor(c) ((unw_cursor_t *) (c)) ++ ++typedef struct dwarf_loc ++ { ++ unw_word_t val; ++#ifndef UNW_LOCAL_ONLY ++ unw_word_t type; /* see DWARF_LOC_TYPE_* macros. */ ++#endif ++ } ++dwarf_loc_t; ++ ++#endif /* dwarf_config_h */ +--- /dev/null ++++ b/include/tdep-aarch64/jmpbuf.h +@@ -0,0 +1,33 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2008 CodeSourcery ++ Copyright (C) 2013 Linaro Limited ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++/* Use glibc's jump-buffer indices; NPTL peeks at SP: */ ++ ++/* FIXME for AArch64 */ ++ ++#define JB_SP 13 ++#define JB_RP 14 ++#define JB_MASK_SAVED 15 ++#define JB_MASK 16 +--- /dev/null ++++ b/include/tdep-aarch64/libunwind_i.h +@@ -0,0 +1,294 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2001-2005 Hewlett-Packard Co ++ Contributed by David Mosberger-Tang <davidm@hpl.hp.com> ++ Copyright (C) 2013 Linaro Limited ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#ifndef AARCH64_LIBUNWIND_I_H ++#define AARCH64_LIBUNWIND_I_H ++ ++/* Target-dependent definitions that are internal to libunwind but need ++ to be shared with target-independent code. */ ++ ++#include <stdlib.h> ++#include <libunwind.h> ++ ++#include "elf64.h" ++#include "mempool.h" ++#include "dwarf.h" ++ ++typedef struct ++ { ++ /* no aarch64-specific fast trace */ ++ } ++unw_tdep_frame_t; ++ ++#ifdef UNW_LOCAL_ONLY ++ ++typedef unw_word_t aarch64_loc_t; ++ ++#else /* !UNW_LOCAL_ONLY */ ++ ++typedef struct aarch64_loc ++ { ++ unw_word_t w0, w1; ++ } ++aarch64_loc_t; ++ ++#endif /* !UNW_LOCAL_ONLY */ ++ ++struct unw_addr_space ++ { ++ struct unw_accessors acc; ++ int big_endian; ++ unw_caching_policy_t caching_policy; ++#ifdef HAVE_ATOMIC_OPS_H ++ AO_t cache_generation; ++#else ++ uint32_t cache_generation; ++#endif ++ unw_word_t dyn_generation; /* see dyn-common.h */ ++ unw_word_t dyn_info_list_addr; /* (cached) dyn_info_list_addr */ ++ struct dwarf_rs_cache global_cache; ++ struct unw_debug_frame_list *debug_frames; ++ }; ++ ++struct cursor ++ { ++ struct dwarf_cursor dwarf; /* must be first */ ++ enum ++ { ++ AARCH64_SCF_NONE, ++ AARCH64_SCF_LINUX_RT_SIGFRAME, ++ } ++ sigcontext_format; ++ unw_word_t sigcontext_addr; ++ unw_word_t sigcontext_sp; ++ unw_word_t sigcontext_pc; ++ }; ++ ++#define DWARF_GET_LOC(l) ((l).val) ++ ++#ifdef UNW_LOCAL_ONLY ++# define DWARF_NULL_LOC DWARF_LOC (0, 0) ++# define DWARF_IS_NULL_LOC(l) (DWARF_GET_LOC (l) == 0) ++# define DWARF_LOC(r, t) ((dwarf_loc_t) { .val = (r) }) ++# define DWARF_IS_REG_LOC(l) 0 ++# define DWARF_REG_LOC(c,r) (DWARF_LOC((unw_word_t) \ ++ tdep_uc_addr((c)->as_arg, (r)), 0)) ++# define DWARF_MEM_LOC(c,m) DWARF_LOC ((m), 0) ++# define DWARF_FPREG_LOC(c,r) (DWARF_LOC((unw_word_t) \ ++ tdep_uc_addr((c)->as_arg, (r)), 0)) ++ ++static inline int ++dwarf_getfp (struct dwarf_cursor *c, dwarf_loc_t loc, unw_fpreg_t *val) ++{ ++ if (!DWARF_GET_LOC (loc)) ++ return -1; ++ *val = *(unw_fpreg_t *) DWARF_GET_LOC (loc); ++ return 0; ++} ++ ++static inline int ++dwarf_putfp (struct dwarf_cursor *c, dwarf_loc_t loc, unw_fpreg_t val) ++{ ++ if (!DWARF_GET_LOC (loc)) ++ return -1; ++ *(unw_fpreg_t *) DWARF_GET_LOC (loc) = val; ++ return 0; ++} ++ ++static inline int ++dwarf_get (struct dwarf_cursor *c, dwarf_loc_t loc, unw_word_t *val) ++{ ++ if (!DWARF_GET_LOC (loc)) ++ return -1; ++ *val = *(unw_word_t *) DWARF_GET_LOC (loc); ++ return 0; ++} ++ ++static inline int ++dwarf_put (struct dwarf_cursor *c, dwarf_loc_t loc, unw_word_t val) ++{ ++ if (!DWARF_GET_LOC (loc)) ++ return -1; ++ *(unw_word_t *) DWARF_GET_LOC (loc) = val; ++ return 0; ++} ++ ++#else /* !UNW_LOCAL_ONLY */ ++# define DWARF_LOC_TYPE_FP (1 << 0) ++# define DWARF_LOC_TYPE_REG (1 << 1) ++# define DWARF_NULL_LOC DWARF_LOC (0, 0) ++# define DWARF_IS_NULL_LOC(l) \ ++ ({ dwarf_loc_t _l = (l); _l.val == 0 && _l.type == 0; }) ++# define DWARF_LOC(r, t) ((dwarf_loc_t) { .val = (r), .type = (t) }) ++# define DWARF_IS_REG_LOC(l) (((l).type & DWARF_LOC_TYPE_REG) != 0) ++# define DWARF_IS_FP_LOC(l) (((l).type & DWARF_LOC_TYPE_FP) != 0) ++# define DWARF_REG_LOC(c,r) DWARF_LOC((r), DWARF_LOC_TYPE_REG) ++# define DWARF_MEM_LOC(c,m) DWARF_LOC ((m), 0) ++# define DWARF_FPREG_LOC(c,r) DWARF_LOC((r), (DWARF_LOC_TYPE_REG \ ++ | DWARF_LOC_TYPE_FP)) ++ ++static inline int ++dwarf_getfp (struct dwarf_cursor *c, dwarf_loc_t loc, unw_fpreg_t *val) ++{ ++ char *valp = (char *) &val; ++ unw_word_t addr; ++ int ret; ++ ++ if (DWARF_IS_NULL_LOC (loc)) ++ return -UNW_EBADREG; ++ ++ if (DWARF_IS_REG_LOC (loc)) ++ return (*c->as->acc.access_fpreg) (c->as, DWARF_GET_LOC (loc), ++ val, 0, c->as_arg); ++ ++ addr = DWARF_GET_LOC (loc); ++ if ((ret = (*c->as->acc.access_mem) (c->as, addr + 0, (unw_word_t *) valp, ++ 0, c->as_arg)) < 0) ++ return ret; ++ ++ return (*c->as->acc.access_mem) (c->as, addr + 4, (unw_word_t *) valp + 1, 0, ++ c->as_arg); ++} ++ ++static inline int ++dwarf_putfp (struct dwarf_cursor *c, dwarf_loc_t loc, unw_fpreg_t val) ++{ ++ char *valp = (char *) &val; ++ unw_word_t addr; ++ int ret; ++ ++ if (DWARF_IS_NULL_LOC (loc)) ++ return -UNW_EBADREG; ++ ++ if (DWARF_IS_REG_LOC (loc)) ++ return (*c->as->acc.access_fpreg) (c->as, DWARF_GET_LOC (loc), ++ &val, 1, c->as_arg); ++ ++ addr = DWARF_GET_LOC (loc); ++ if ((ret = (*c->as->acc.access_mem) (c->as, addr + 0, (unw_word_t *) valp, ++ 1, c->as_arg)) < 0) ++ return ret; ++ ++ return (*c->as->acc.access_mem) (c->as, addr + 4, (unw_word_t *) valp + 1, ++ 1, c->as_arg); ++} ++ ++static inline int ++dwarf_get (struct dwarf_cursor *c, dwarf_loc_t loc, unw_word_t *val) ++{ ++ if (DWARF_IS_NULL_LOC (loc)) ++ return -UNW_EBADREG; ++ ++ /* If a code-generator were to save a value of type unw_word_t in a ++ floating-point register, we would have to support this case. I ++ suppose it could happen with MMX registers, but does it really ++ happen? */ ++ assert (!DWARF_IS_FP_LOC (loc)); ++ ++ if (DWARF_IS_REG_LOC (loc)) ++ return (*c->as->acc.access_reg) (c->as, DWARF_GET_LOC (loc), val, ++ 0, c->as_arg); ++ else ++ return (*c->as->acc.access_mem) (c->as, DWARF_GET_LOC (loc), val, ++ 0, c->as_arg); ++} ++ ++static inline int ++dwarf_put (struct dwarf_cursor *c, dwarf_loc_t loc, unw_word_t val) ++{ ++ if (DWARF_IS_NULL_LOC (loc)) ++ return -UNW_EBADREG; ++ ++ /* If a code-generator were to save a value of type unw_word_t in a ++ floating-point register, we would have to support this case. I ++ suppose it could happen with MMX registers, but does it really ++ happen? */ ++ assert (!DWARF_IS_FP_LOC (loc)); ++ ++ if (DWARF_IS_REG_LOC (loc)) ++ return (*c->as->acc.access_reg) (c->as, DWARF_GET_LOC (loc), &val, ++ 1, c->as_arg); ++ else ++ return (*c->as->acc.access_mem) (c->as, DWARF_GET_LOC (loc), &val, ++ 1, c->as_arg); ++} ++ ++#endif /* !UNW_LOCAL_ONLY */ ++ ++ ++ ++#define tdep_getcontext_trace unw_getcontext ++#define tdep_init_done UNW_OBJ(init_done) ++#define tdep_init UNW_OBJ(init) ++/* Platforms that support UNW_INFO_FORMAT_TABLE need to define ++ tdep_search_unwind_table. */ ++#define tdep_search_unwind_table dwarf_search_unwind_table ++#define tdep_find_unwind_table dwarf_find_unwind_table ++#define tdep_uc_addr UNW_OBJ(uc_addr) ++#define tdep_get_elf_image UNW_ARCH_OBJ(get_elf_image) ++#define tdep_access_reg UNW_OBJ(access_reg) ++#define tdep_access_fpreg UNW_OBJ(access_fpreg) ++#define tdep_fetch_frame(c,ip,n) do {} while(0) ++#define tdep_cache_frame(c,rs) do {} while(0) ++#define tdep_reuse_frame(c,rs) do {} while(0) ++#define tdep_stash_frame(c,rs) do {} while(0) ++#define tdep_trace(cur,addr,n) (-UNW_ENOINFO) ++ ++#ifdef UNW_LOCAL_ONLY ++# define tdep_find_proc_info(c,ip,n) \ ++ dwarf_find_proc_info((c)->as, (ip), &(c)->pi, (n), \ ++ (c)->as_arg) ++# define tdep_put_unwind_info(as,pi,arg) \ ++ dwarf_put_unwind_info((as), (pi), (arg)) ++#else ++# define tdep_find_proc_info(c,ip,n) \ ++ (*(c)->as->acc.find_proc_info)((c)->as, (ip), &(c)->pi, (n), \ ++ (c)->as_arg) ++# define tdep_put_unwind_info(as,pi,arg) \ ++ (*(as)->acc.put_unwind_info)((as), (pi), (arg)) ++#endif ++ ++#define tdep_get_as(c) ((c)->dwarf.as) ++#define tdep_get_as_arg(c) ((c)->dwarf.as_arg) ++#define tdep_get_ip(c) ((c)->dwarf.ip) ++#define tdep_big_endian(as) ((as)->big_endian) ++ ++extern int tdep_init_done; ++ ++extern void tdep_init (void); ++extern int tdep_search_unwind_table (unw_addr_space_t as, unw_word_t ip, ++ unw_dyn_info_t *di, unw_proc_info_t *pi, ++ int need_unwind_info, void *arg); ++extern void *tdep_uc_addr (unw_tdep_context_t *uc, int reg); ++extern int tdep_get_elf_image (struct elf_image *ei, pid_t pid, unw_word_t ip, ++ unsigned long *segbase, unsigned long *mapoff, ++ char *path, size_t pathlen); ++extern int tdep_access_reg (struct cursor *c, unw_regnum_t reg, ++ unw_word_t *valp, int write); ++extern int tdep_access_fpreg (struct cursor *c, unw_regnum_t reg, ++ unw_fpreg_t *valp, int write); ++ ++#endif /* AARCH64_LIBUNWIND_I_H */ +--- a/include/tdep/dwarf-config.h ++++ b/include/tdep/dwarf-config.h +@@ -1,7 +1,9 @@ + /* Provide a real file - not a symlink - as it would cause multiarch conflicts + when multiple different arch releases are installed simultaneously. */ + +-#if defined __arm__ ++#if defined __aarch64__ ++# include "tdep-aarch64/dwarf-config.h" ++#elif defined __arm__ + # include "tdep-arm/dwarf-config.h" + #elif defined __hppa__ + # include "tdep-hppa/dwarf-config.h" +--- a/include/tdep/jmpbuf.h ++++ b/include/tdep/jmpbuf.h +@@ -3,6 +3,8 @@ + + #ifndef UNW_REMOTE_ONLY + ++#if defined __aarch64__ ++# include "tdep-aarch64/jmpbuf.h" + #if defined __arm__ + # include "tdep-arm/jmpbuf.h" + #elif defined __hppa__ +--- a/include/tdep/libunwind_i.h.in ++++ b/include/tdep/libunwind_i.h.in +@@ -3,7 +3,9 @@ + + #ifndef UNW_REMOTE_ONLY + +-#if defined __arm__ ++#if defined __aarch64__ ++# include "tdep-aarch64/libunwind_i.h" ++#elif defined __arm__ + # include "tdep-arm/libunwind_i.h" + #elif defined __hppa__ + # include "tdep-hppa/libunwind_i.h" +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -170,6 +170,28 @@ libunwind_elfxx_la_SOURCES = elfxx.c + noinst_LTLIBRARIES += $(LIBUNWIND_ELF) + libunwind_la_LIBADD += $(LIBUNWIND_ELF) + ++# The list of files that go into libunwind and libunwind-aarch64: ++noinst_HEADERS += aarch64/init.h aarch64/offsets.h aarch64/unwind_i.h ++libunwind_la_SOURCES_aarch64_common = $(libunwind_la_SOURCES_common) \ ++ aarch64/is_fpreg.c aarch64/regname.c ++ ++# The list of files that go into libunwind: ++libunwind_la_SOURCES_aarch64 = $(libunwind_la_SOURCES_aarch64_common) \ ++ $(libunwind_la_SOURCES_local) \ ++ aarch64/Lcreate_addr_space.c aarch64/Lget_proc_info.c \ ++ aarch64/Lget_save_loc.c aarch64/Lglobal.c aarch64/Linit.c \ ++ aarch64/Linit_local.c aarch64/Linit_remote.c \ ++ aarch64/Lis_signal_frame.c aarch64/Lregs.c aarch64/Lresume.c \ ++ aarch64/Lstep.c ++ ++libunwind_aarch64_la_SOURCES_aarch64 = $(libunwind_la_SOURCES_aarch64_common) \ ++ $(libunwind_la_SOURCES_generic) \ ++ aarch64/Gcreate_addr_space.c aarch64/Gget_proc_info.c \ ++ aarch64/Gget_save_loc.c aarch64/Gglobal.c aarch64/Ginit.c \ ++ aarch64/Ginit_local.c aarch64/Ginit_remote.c \ ++ aarch64/Gis_signal_frame.c aarch64/Gregs.c aarch64/Gresume.c \ ++ aarch64/Gstep.c ++ + # The list of files that go into libunwind and libunwind-arm: + noinst_HEADERS += arm/init.h arm/offsets.h arm/unwind_i.h + libunwind_la_SOURCES_arm_common = $(libunwind_la_SOURCES_common) \ +@@ -418,6 +440,18 @@ if OS_FREEBSD + libunwind_coredump_la_SOURCES += coredump/_UCD_access_reg_freebsd.c + endif + ++if ARCH_AARCH64 ++ lib_LTLIBRARIES += libunwind-aarch64.la ++ libunwind_la_SOURCES = $(libunwind_la_SOURCES_aarch64) ++ libunwind_aarch64_la_SOURCES = $(libunwind_aarch64_la_SOURCES_aarch64) ++ libunwind_aarch64_la_LDFLAGS = $(COMMON_SO_LDFLAGS) -version-info $(SOVERSION) ++ libunwind_aarch64_la_LIBADD = libunwind-dwarf-generic.la ++ libunwind_aarch64_la_LIBADD += libunwind-elf64.la ++if !REMOTE_ONLY ++ libunwind_aarch64_la_LIBADD += libunwind.la -lc ++endif ++ libunwind_setjmp_la_SOURCES += aarch64/siglongjmp.S ++else + if ARCH_ARM + lib_LTLIBRARIES += libunwind-arm.la + libunwind_la_SOURCES = $(libunwind_la_SOURCES_arm) +@@ -545,6 +579,7 @@ endif # ARCH_MIPS + endif # ARCH_HPPA + endif # ARCH_IA64 + endif # ARCH_ARM ++endif # ARCH_AARCH64 + + # libunwind-setjmp depends on libunwind-$(arch). Therefore must be added + # at the end. +@@ -567,7 +602,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I + AM_CCASFLAGS = $(AM_CPPFLAGS) + noinst_HEADERS += unwind/unwind-internal.h + +-EXTRA_DIST = $(libunwind_la_SOURCES_arm) \ ++EXTRA_DIST = $(libunwind_la_SOURCES_aarch64) \ ++ $(libunwind_la_SOURCES_arm) \ + $(libunwind_la_SOURCES_hppa) \ + $(libunwind_la_SOURCES_ia64) \ + $(libunwind_la_SOURCES_mips) \ +@@ -579,6 +615,7 @@ EXTRA_DIST = $(libunwind_la_SOURCES_arm) + $(libunwind_la_SOURCES_common) \ + $(libunwind_la_SOURCES_local) \ + $(libunwind_la_SOURCES_generic) \ ++ $(libunwind_aarch64_la_SOURCES_aarch64) \ + $(libunwind_arm_la_SOURCES_arm) \ + $(libunwind_hppa_la_SOURCES_hppa) \ + $(libunwind_ia64_la_SOURCES_ia64) \ +--- /dev/null ++++ b/src/aarch64/Gcreate_addr_space.c +@@ -0,0 +1,60 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> ++ Copyright (C) 2013 Linaro Limited ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#include <string.h> ++#include <stdlib.h> ++ ++#include "unwind_i.h" ++ ++PROTECTED unw_addr_space_t ++unw_create_addr_space (unw_accessors_t *a, int byte_order) ++{ ++#ifdef UNW_LOCAL_ONLY ++ return NULL; ++#else ++ unw_addr_space_t as; ++ ++ /* AArch64 supports little-endian and big-endian. */ ++ if (byte_order != 0 && byte_order != __LITTLE_ENDIAN ++ && byte_order != __BIG_ENDIAN) ++ return NULL; ++ ++ as = malloc (sizeof (*as)); ++ if (!as) ++ return NULL; ++ ++ memset (as, 0, sizeof (*as)); ++ ++ as->acc = *a; ++ ++ /* Default to little-endian for AArch64. */ ++ if (byte_order == 0 || byte_order == __LITTLE_ENDIAN) ++ as->big_endian = 0; ++ else ++ as->big_endian = 1; ++ ++ return as; ++#endif ++} +--- /dev/null ++++ b/src/aarch64/Gget_proc_info.c +@@ -0,0 +1,39 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2008 CodeSourcery ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#include "unwind_i.h" ++ ++PROTECTED int ++unw_get_proc_info (unw_cursor_t *cursor, unw_proc_info_t *pi) ++{ ++ struct cursor *c = (struct cursor *) cursor; ++ int ret; ++ ++ ret = dwarf_make_proc_info (&c->dwarf); ++ if (ret < 0) ++ return ret; ++ ++ *pi = c->dwarf.pi; ++ return 0; ++} +--- /dev/null ++++ b/src/aarch64/Gget_save_loc.c +@@ -0,0 +1,100 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2008 CodeSourcery ++ Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> ++ Copyright (C) 2013 Linaro Limited ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#include "unwind_i.h" ++ ++PROTECTED int ++unw_get_save_loc (unw_cursor_t *cursor, int reg, unw_save_loc_t *sloc) ++{ ++ struct cursor *c = (struct cursor *) cursor; ++ dwarf_loc_t loc; ++ ++ switch (reg) ++ { ++ case UNW_AARCH64_X0: ++ case UNW_AARCH64_X1: ++ case UNW_AARCH64_X2: ++ case UNW_AARCH64_X3: ++ case UNW_AARCH64_X4: ++ case UNW_AARCH64_X5: ++ case UNW_AARCH64_X6: ++ case UNW_AARCH64_X7: ++ case UNW_AARCH64_X8: ++ case UNW_AARCH64_X9: ++ case UNW_AARCH64_X10: ++ case UNW_AARCH64_X11: ++ case UNW_AARCH64_X12: ++ case UNW_AARCH64_X13: ++ case UNW_AARCH64_X14: ++ case UNW_AARCH64_X15: ++ case UNW_AARCH64_X16: ++ case UNW_AARCH64_X17: ++ case UNW_AARCH64_X18: ++ case UNW_AARCH64_X19: ++ case UNW_AARCH64_X20: ++ case UNW_AARCH64_X21: ++ case UNW_AARCH64_X22: ++ case UNW_AARCH64_X23: ++ case UNW_AARCH64_X24: ++ case UNW_AARCH64_X25: ++ case UNW_AARCH64_X26: ++ case UNW_AARCH64_X27: ++ case UNW_AARCH64_X28: ++ case UNW_AARCH64_X29: ++ case UNW_AARCH64_X30: ++ case UNW_AARCH64_SP: ++ case UNW_AARCH64_PC: ++ case UNW_AARCH64_PSTATE: ++ loc = c->dwarf.loc[reg]; ++ break; ++ ++ default: ++ loc = DWARF_NULL_LOC; /* default to "not saved" */ ++ break; ++ } ++ ++ memset (sloc, 0, sizeof (*sloc)); ++ ++ if (DWARF_IS_NULL_LOC (loc)) ++ { ++ sloc->type = UNW_SLT_NONE; ++ return 0; ++ } ++ ++#if !defined(UNW_LOCAL_ONLY) ++ if (DWARF_IS_REG_LOC (loc)) ++ { ++ sloc->type = UNW_SLT_REG; ++ sloc->u.regnum = DWARF_GET_LOC (loc); ++ } ++ else ++#endif ++ { ++ sloc->type = UNW_SLT_MEMORY; ++ sloc->u.addr = DWARF_GET_LOC (loc); ++ } ++ return 0; ++} +--- /dev/null ++++ b/src/aarch64/Gglobal.c +@@ -0,0 +1,57 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2008 CodeSourcery ++ Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> ++ Copyright (C) 2013 Linaro Limited ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#include "unwind_i.h" ++#include "dwarf_i.h" ++ ++HIDDEN define_lock (aarch64_lock); ++HIDDEN int tdep_init_done; ++ ++HIDDEN void ++tdep_init (void) ++{ ++ intrmask_t saved_mask; ++ ++ sigfillset (&unwi_full_mask); ++ ++ lock_acquire (&aarch64_lock, saved_mask); ++ { ++ if (tdep_init_done) ++ /* another thread else beat us to it... */ ++ goto out; ++ ++ mi_init (); ++ ++ dwarf_init (); ++ ++#ifndef UNW_REMOTE_ONLY ++ aarch64_local_addr_space_init (); ++#endif ++ tdep_init_done = 1; /* signal that we're initialized... */ ++ } ++ out: ++ lock_release (&aarch64_lock, saved_mask); ++} +--- /dev/null ++++ b/src/aarch64/Ginit.c +@@ -0,0 +1,187 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2008 CodeSourcery ++ Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> ++ Copyright (C) 2013 Linaro Limited ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#include <stdlib.h> ++#include <string.h> ++ ++#include "unwind_i.h" ++ ++#ifdef UNW_REMOTE_ONLY ++ ++/* unw_local_addr_space is a NULL pointer in this case. */ ++PROTECTED unw_addr_space_t unw_local_addr_space; ++ ++#else /* !UNW_REMOTE_ONLY */ ++ ++static struct unw_addr_space local_addr_space; ++ ++PROTECTED unw_addr_space_t unw_local_addr_space = &local_addr_space; ++ ++static inline void * ++uc_addr (ucontext_t *uc, int reg) ++{ ++ if (reg >= UNW_AARCH64_X0 && reg <= UNW_AARCH64_V31) ++ return &uc->uc_mcontext.regs[reg]; ++ else ++ return NULL; ++} ++ ++# ifdef UNW_LOCAL_ONLY ++ ++HIDDEN void * ++tdep_uc_addr (ucontext_t *uc, int reg) ++{ ++ return uc_addr (uc, reg); ++} ++ ++# endif /* UNW_LOCAL_ONLY */ ++ ++HIDDEN unw_dyn_info_list_t _U_dyn_info_list; ++ ++/* XXX fix me: there is currently no way to locate the dyn-info list ++ by a remote unwinder. On ia64, this is done via a special ++ unwind-table entry. Perhaps something similar can be done with ++ DWARF2 unwind info. */ ++ ++static void ++put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) ++{ ++ /* it's a no-op */ ++} ++ ++static int ++get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, ++ void *arg) ++{ ++ *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; ++ return 0; ++} ++ ++static int ++access_mem (unw_addr_space_t as, unw_word_t addr, unw_word_t *val, int write, ++ void *arg) ++{ ++ if (write) ++ { ++ Debug (16, "mem[%lx] <- %lx\n", addr, *val); ++ *(unw_word_t *) addr = *val; ++ } ++ else ++ { ++ *val = *(unw_word_t *) addr; ++ Debug (16, "mem[%lx] -> %lx\n", addr, *val); ++ } ++ return 0; ++} ++ ++static int ++access_reg (unw_addr_space_t as, unw_regnum_t reg, unw_word_t *val, int write, ++ void *arg) ++{ ++ unw_word_t *addr; ++ ucontext_t *uc = arg; ++ ++ if (unw_is_fpreg (reg)) ++ goto badreg; ++ ++ if (!(addr = uc_addr (uc, reg))) ++ goto badreg; ++ ++ if (write) ++ { ++ *(unw_word_t *) addr = *val; ++ Debug (12, "%s <- %lx\n", unw_regname (reg), *val); ++ } ++ else ++ { ++ *val = *(unw_word_t *) addr; ++ Debug (12, "%s -> %lx\n", unw_regname (reg), *val); ++ } ++ return 0; ++ ++ badreg: ++ Debug (1, "bad register number %u\n", reg); ++ return -UNW_EBADREG; ++} ++ ++static int ++access_fpreg (unw_addr_space_t as, unw_regnum_t reg, unw_fpreg_t *val, ++ int write, void *arg) ++{ ++ ucontext_t *uc = arg; ++ unw_fpreg_t *addr; ++ ++ if (!unw_is_fpreg (reg)) ++ goto badreg; ++ ++ if (!(addr = uc_addr (uc, reg))) ++ goto badreg; ++ ++ if (write) ++ { ++ Debug (12, "%s <- %08lx.%08lx.%08lx\n", unw_regname (reg), ++ ((long *)val)[0], ((long *)val)[1], ((long *)val)[2]); ++ *(unw_fpreg_t *) addr = *val; ++ } ++ else ++ { ++ *val = *(unw_fpreg_t *) addr; ++ Debug (12, "%s -> %08lx.%08lx.%08lx\n", unw_regname (reg), ++ ((long *)val)[0], ((long *)val)[1], ((long *)val)[2]); ++ } ++ return 0; ++ ++ badreg: ++ Debug (1, "bad register number %u\n", reg); ++ /* attempt to access a non-preserved register */ ++ return -UNW_EBADREG; ++} ++ ++static int ++get_static_proc_name (unw_addr_space_t as, unw_word_t ip, ++ char *buf, size_t buf_len, unw_word_t *offp, ++ void *arg) ++{ ++ return _Uelf64_get_proc_name (as, getpid (), ip, buf, buf_len, offp); ++} ++ ++HIDDEN void ++aarch64_local_addr_space_init (void) ++{ ++ memset (&local_addr_space, 0, sizeof (local_addr_space)); ++ local_addr_space.caching_policy = UNW_CACHE_GLOBAL; ++ local_addr_space.acc.find_proc_info = dwarf_find_proc_info; ++ local_addr_space.acc.put_unwind_info = put_unwind_info; ++ local_addr_space.acc.get_dyn_info_list_addr = get_dyn_info_list_addr; ++ local_addr_space.acc.access_mem = access_mem; ++ local_addr_space.acc.access_reg = access_reg; ++ local_addr_space.acc.access_fpreg = access_fpreg; ++ local_addr_space.acc.resume = aarch64_local_resume; ++ local_addr_space.acc.get_proc_name = get_static_proc_name; ++ unw_flush_cache (&local_addr_space, 0, 0); ++} ++ ++#endif /* !UNW_REMOTE_ONLY */ +--- /dev/null ++++ b/src/aarch64/Ginit_local.c +@@ -0,0 +1,55 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2008 CodeSourcery ++ Copyright (C) 2011-2013 Linaro Limited ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#include "unwind_i.h" ++#include "init.h" ++ ++#ifdef UNW_REMOTE_ONLY ++ ++PROTECTED int ++unw_init_local (unw_cursor_t *cursor, unw_context_t *uc) ++{ ++ return -UNW_EINVAL; ++} ++ ++#else /* !UNW_REMOTE_ONLY */ ++ ++PROTECTED int ++unw_init_local (unw_cursor_t *cursor, unw_context_t *uc) ++{ ++ struct cursor *c = (struct cursor *) cursor; ++ ++ if (!tdep_init_done) ++ tdep_init (); ++ ++ Debug (1, "(cursor=%p)\n", c); ++ ++ c->dwarf.as = unw_local_addr_space; ++ c->dwarf.as_arg = uc; ++ ++ return common_init (c, 1); ++} ++ ++#endif /* !UNW_REMOTE_ONLY */ +--- /dev/null ++++ b/src/aarch64/Ginit_remote.c +@@ -0,0 +1,45 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2008 CodeSourcery ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#include "init.h" ++#include "unwind_i.h" ++ ++PROTECTED int ++unw_init_remote (unw_cursor_t *cursor, unw_addr_space_t as, void *as_arg) ++{ ++#ifdef UNW_LOCAL_ONLY ++ return -UNW_EINVAL; ++#else /* !UNW_LOCAL_ONLY */ ++ struct cursor *c = (struct cursor *) cursor; ++ ++ if (!tdep_init_done) ++ tdep_init (); ++ ++ Debug (1, "(cursor=%p)\n", c); ++ ++ c->dwarf.as = as; ++ c->dwarf.as_arg = as_arg; ++ return common_init (c, 0); ++#endif /* !UNW_LOCAL_ONLY */ ++} +--- /dev/null ++++ b/src/aarch64/Gis_signal_frame.c +@@ -0,0 +1,64 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> ++ Copyright (C) 2013 Linaro Limited ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#include "unwind_i.h" ++ ++/* The restorer stub will always have the form: ++ ++ d2801168 movz x8, #0x8b ++ d4000001 svc #0x0 ++*/ ++ ++PROTECTED int ++unw_is_signal_frame (unw_cursor_t *cursor) ++{ ++#ifdef __linux__ ++ struct cursor *c = (struct cursor *) cursor; ++ unw_word_t w0, ip; ++ unw_addr_space_t as; ++ unw_accessors_t *a; ++ void *arg; ++ int ret; ++ ++ as = c->dwarf.as; ++ a = unw_get_accessors (as); ++ arg = c->dwarf.as_arg; ++ ++ ip = c->dwarf.ip; ++ ++ ret = (*a->access_mem) (as, ip, &w0, 0, arg); ++ if (ret < 0) ++ return ret; ++ ++ /* FIXME: distinguish 32bit insn vs 64bit registers. */ ++ if (w0 != 0xd4000001d2801168) ++ return 0; ++ ++ return 1; ++ ++#else ++ return -UNW_ENOINFO; ++#endif ++} +--- /dev/null ++++ b/src/aarch64/Gregs.c +@@ -0,0 +1,113 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2008 CodeSourcery ++ Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> ++ Copyright (C) 2013 Linaro Limited ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#include "unwind_i.h" ++ ++HIDDEN int ++tdep_access_reg (struct cursor *c, unw_regnum_t reg, unw_word_t *valp, ++ int write) ++{ ++ dwarf_loc_t loc = DWARF_NULL_LOC; ++ unsigned int mask; ++ ++ switch (reg) ++ { ++ case UNW_AARCH64_X0: ++ case UNW_AARCH64_X1: ++ case UNW_AARCH64_X2: ++ case UNW_AARCH64_X3: ++ mask = 1 << reg; ++ if (write) ++ { ++ c->dwarf.eh_args[reg] = *valp; ++ c->dwarf.eh_valid_mask |= mask; ++ return 0; ++ } ++ else if ((c->dwarf.eh_valid_mask & mask) != 0) ++ { ++ *valp = c->dwarf.eh_args[reg]; ++ return 0; ++ } ++ else ++ loc = c->dwarf.loc[reg]; ++ break; ++ ++ case UNW_AARCH64_X4: ++ case UNW_AARCH64_X5: ++ case UNW_AARCH64_X6: ++ case UNW_AARCH64_X7: ++ case UNW_AARCH64_X8: ++ case UNW_AARCH64_X9: ++ case UNW_AARCH64_X10: ++ case UNW_AARCH64_X11: ++ case UNW_AARCH64_X12: ++ case UNW_AARCH64_X13: ++ case UNW_AARCH64_X14: ++ case UNW_AARCH64_X15: ++ case UNW_AARCH64_X16: ++ case UNW_AARCH64_X17: ++ case UNW_AARCH64_X18: ++ case UNW_AARCH64_X19: ++ case UNW_AARCH64_X20: ++ case UNW_AARCH64_X21: ++ case UNW_AARCH64_X22: ++ case UNW_AARCH64_X23: ++ case UNW_AARCH64_X24: ++ case UNW_AARCH64_X25: ++ case UNW_AARCH64_X26: ++ case UNW_AARCH64_X27: ++ case UNW_AARCH64_X28: ++ case UNW_AARCH64_X29: ++ case UNW_AARCH64_X30: ++ case UNW_AARCH64_PC: ++ case UNW_AARCH64_PSTATE: ++ loc = c->dwarf.loc[reg]; ++ break; ++ ++ case UNW_AARCH64_SP: ++ if (write) ++ return -UNW_EREADONLYREG; ++ *valp = c->dwarf.cfa; ++ return 0; ++ ++ default: ++ Debug (1, "bad register number %u\n", reg); ++ return -UNW_EBADREG; ++ } ++ ++ if (write) ++ return dwarf_put (&c->dwarf, loc, *valp); ++ else ++ return dwarf_get (&c->dwarf, loc, valp); ++} ++ ++HIDDEN int ++tdep_access_fpreg (struct cursor *c, unw_regnum_t reg, unw_fpreg_t *valp, ++ int write) ++{ ++ Debug (1, "bad register number %u\n", reg); ++ return -UNW_EBADREG; ++} +--- /dev/null ++++ b/src/aarch64/Gresume.c +@@ -0,0 +1,177 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2008 CodeSourcery ++ Copyright (C) 2011-2013 Linaro Limited ++ Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#include "unwind_i.h" ++#include "offsets.h" ++ ++#ifndef UNW_REMOTE_ONLY ++ ++HIDDEN inline int ++aarch64_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg) ++{ ++#ifdef __linux__ ++ struct cursor *c = (struct cursor *) cursor; ++ unw_tdep_context_t *uc = c->dwarf.as_arg; ++ ++ if (c->sigcontext_format == AARCH64_SCF_NONE) ++ { ++ /* Since there are no signals involved here we restore the non scratch ++ registers only. */ ++ unsigned long regs[11]; ++ regs[0] = uc->uc_mcontext.regs[19]; ++ regs[1] = uc->uc_mcontext.regs[20]; ++ regs[2] = uc->uc_mcontext.regs[21]; ++ regs[3] = uc->uc_mcontext.regs[22]; ++ regs[4] = uc->uc_mcontext.regs[23]; ++ regs[5] = uc->uc_mcontext.regs[24]; ++ regs[6] = uc->uc_mcontext.regs[25]; ++ regs[7] = uc->uc_mcontext.regs[26]; ++ regs[8] = uc->uc_mcontext.regs[27]; ++ regs[9] = uc->uc_mcontext.regs[28]; ++ regs[10] = uc->uc_mcontext.regs[30]; /* LR */ ++ unsigned long sp = uc->uc_mcontext.sp; ++ ++ struct regs_overlay { ++ char x[sizeof(regs)]; ++ }; ++ ++ asm volatile ( ++ "ldp x19, x20, [%0]\n" ++ "ldp x21, x22, [%0,16]\n" ++ "ldp x23, x24, [%0,32]\n" ++ "ldp x25, x26, [%0,48]\n" ++ "ldp x27, x28, [%0,64]\n" ++ "ldr x30, [%0,80]\n" ++ "mov sp, %1\n" ++ "ret \n" ++ : ++ : "r" (regs), ++ "r" (sp), ++ "m" (*(struct regs_overlay *)regs) ++ ); ++ } ++ else ++ { ++ struct sigcontext *sc = (struct sigcontext *) c->sigcontext_addr; ++ ++ if (c->dwarf.eh_valid_mask & 0x1) sc->regs[0] = c->dwarf.eh_args[0]; ++ if (c->dwarf.eh_valid_mask & 0x2) sc->regs[1] = c->dwarf.eh_args[1]; ++ if (c->dwarf.eh_valid_mask & 0x4) sc->regs[2] = c->dwarf.eh_args[2]; ++ if (c->dwarf.eh_valid_mask & 0x8) sc->regs[3] = c->dwarf.eh_args[3]; ++ ++ sc->regs[4] = uc->uc_mcontext.regs[4]; ++ sc->regs[5] = uc->uc_mcontext.regs[5]; ++ sc->regs[6] = uc->uc_mcontext.regs[6]; ++ sc->regs[7] = uc->uc_mcontext.regs[7]; ++ sc->regs[8] = uc->uc_mcontext.regs[8]; ++ sc->regs[9] = uc->uc_mcontext.regs[9]; ++ sc->regs[10] = uc->uc_mcontext.regs[10]; ++ sc->regs[11] = uc->uc_mcontext.regs[11]; ++ sc->regs[12] = uc->uc_mcontext.regs[12]; ++ sc->regs[13] = uc->uc_mcontext.regs[13]; ++ sc->regs[14] = uc->uc_mcontext.regs[14]; ++ sc->regs[15] = uc->uc_mcontext.regs[15]; ++ sc->regs[16] = uc->uc_mcontext.regs[16]; ++ sc->regs[17] = uc->uc_mcontext.regs[17]; ++ sc->regs[18] = uc->uc_mcontext.regs[18]; ++ sc->regs[19] = uc->uc_mcontext.regs[19]; ++ sc->regs[20] = uc->uc_mcontext.regs[20]; ++ sc->regs[21] = uc->uc_mcontext.regs[21]; ++ sc->regs[22] = uc->uc_mcontext.regs[22]; ++ sc->regs[23] = uc->uc_mcontext.regs[23]; ++ sc->regs[24] = uc->uc_mcontext.regs[24]; ++ sc->regs[25] = uc->uc_mcontext.regs[25]; ++ sc->regs[26] = uc->uc_mcontext.regs[26]; ++ sc->regs[27] = uc->uc_mcontext.regs[27]; ++ sc->regs[28] = uc->uc_mcontext.regs[28]; ++ sc->regs[29] = uc->uc_mcontext.regs[29]; ++ sc->regs[30] = uc->uc_mcontext.regs[30]; ++ sc->sp = uc->uc_mcontext.sp; ++ sc->pc = uc->uc_mcontext.pc; ++ sc->pstate = uc->uc_mcontext.pstate; ++ ++ asm volatile ( ++ "mov sp, %0\n" ++ "ret %1\n" ++ : : "r" (c->sigcontext_sp), "r" (c->sigcontext_pc) ++ ); ++ } ++ unreachable(); ++#else ++ printf ("%s: implement me\n", __FUNCTION__); ++#endif ++ return -UNW_EINVAL; ++} ++ ++#endif /* !UNW_REMOTE_ONLY */ ++ ++static inline void ++establish_machine_state (struct cursor *c) ++{ ++ unw_addr_space_t as = c->dwarf.as; ++ void *arg = c->dwarf.as_arg; ++ unw_fpreg_t fpval; ++ unw_word_t val; ++ int reg; ++ ++ Debug (8, "copying out cursor state\n"); ++ ++ for (reg = 0; reg <= UNW_AARCH64_PSTATE; ++reg) ++ { ++ Debug (16, "copying %s %d\n", unw_regname (reg), reg); ++ if (unw_is_fpreg (reg)) ++ { ++ if (tdep_access_fpreg (c, reg, &fpval, 0) >= 0) ++ as->acc.access_fpreg (as, reg, &fpval, 1, arg); ++ } ++ else ++ { ++ if (tdep_access_reg (c, reg, &val, 0) >= 0) ++ as->acc.access_reg (as, reg, &val, 1, arg); ++ } ++ } ++} ++ ++PROTECTED int ++unw_resume (unw_cursor_t *cursor) ++{ ++ struct cursor *c = (struct cursor *) cursor; ++ ++ Debug (1, "(cursor=%p)\n", c); ++ ++ if (!c->dwarf.ip) ++ { ++ /* This can happen easily when the frame-chain gets truncated ++ due to bad or missing unwind-info. */ ++ Debug (1, "refusing to resume execution at address 0\n"); ++ return -UNW_EINVAL; ++ } ++ ++ establish_machine_state (c); ++ ++ return (*c->dwarf.as->acc.resume) (c->dwarf.as, (unw_cursor_t *) c, ++ c->dwarf.as_arg); ++} +--- /dev/null ++++ b/src/aarch64/Gstep.c +@@ -0,0 +1,129 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2008 CodeSourcery ++ Copyright (C) 2011-2013 Linaro Limited ++ Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#include "unwind_i.h" ++#include "offsets.h" ++ ++PROTECTED int ++unw_handle_signal_frame (unw_cursor_t *cursor) ++{ ++ struct cursor *c = (struct cursor *) cursor; ++ int ret; ++ unw_word_t sc_addr, sp, sp_addr = c->dwarf.cfa; ++ struct dwarf_loc sp_loc = DWARF_LOC (sp_addr, 0); ++ ++ if ((ret = dwarf_get (&c->dwarf, sp_loc, &sp)) < 0) ++ return -UNW_EUNSPEC; ++ ++ ret = unw_is_signal_frame (cursor); ++ Debug(1, "unw_is_signal_frame()=%d\n", ret); ++ ++ /* Save the SP and PC to be able to return execution at this point ++ later in time (unw_resume). */ ++ c->sigcontext_sp = c->dwarf.cfa; ++ c->sigcontext_pc = c->dwarf.ip; ++ ++ if (ret) ++ { ++ c->sigcontext_format = AARCH64_SCF_LINUX_RT_SIGFRAME; ++ sc_addr = sp_addr + sizeof (siginfo_t) + LINUX_UC_MCONTEXT_OFF; ++ } ++ else ++ return -UNW_EUNSPEC; ++ ++ c->sigcontext_addr = sc_addr; ++ ++ /* Update the dwarf cursor. ++ Set the location of the registers to the corresponding addresses of the ++ uc_mcontext / sigcontext structure contents. */ ++ c->dwarf.loc[UNW_AARCH64_X0] = DWARF_LOC (sc_addr + LINUX_SC_X0_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X1] = DWARF_LOC (sc_addr + LINUX_SC_X1_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X2] = DWARF_LOC (sc_addr + LINUX_SC_X2_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X3] = DWARF_LOC (sc_addr + LINUX_SC_X3_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X4] = DWARF_LOC (sc_addr + LINUX_SC_X4_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X5] = DWARF_LOC (sc_addr + LINUX_SC_X5_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X6] = DWARF_LOC (sc_addr + LINUX_SC_X6_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X7] = DWARF_LOC (sc_addr + LINUX_SC_X7_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X8] = DWARF_LOC (sc_addr + LINUX_SC_X8_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X9] = DWARF_LOC (sc_addr + LINUX_SC_X9_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X10] = DWARF_LOC (sc_addr + LINUX_SC_X10_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X11] = DWARF_LOC (sc_addr + LINUX_SC_X11_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X12] = DWARF_LOC (sc_addr + LINUX_SC_X12_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X13] = DWARF_LOC (sc_addr + LINUX_SC_X13_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X14] = DWARF_LOC (sc_addr + LINUX_SC_X14_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X15] = DWARF_LOC (sc_addr + LINUX_SC_X15_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X16] = DWARF_LOC (sc_addr + LINUX_SC_X16_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X17] = DWARF_LOC (sc_addr + LINUX_SC_X17_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X18] = DWARF_LOC (sc_addr + LINUX_SC_X18_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X19] = DWARF_LOC (sc_addr + LINUX_SC_X19_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X20] = DWARF_LOC (sc_addr + LINUX_SC_X20_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X21] = DWARF_LOC (sc_addr + LINUX_SC_X21_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X22] = DWARF_LOC (sc_addr + LINUX_SC_X22_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X23] = DWARF_LOC (sc_addr + LINUX_SC_X23_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X24] = DWARF_LOC (sc_addr + LINUX_SC_X24_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X25] = DWARF_LOC (sc_addr + LINUX_SC_X25_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X26] = DWARF_LOC (sc_addr + LINUX_SC_X26_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X27] = DWARF_LOC (sc_addr + LINUX_SC_X27_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X28] = DWARF_LOC (sc_addr + LINUX_SC_X28_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X29] = DWARF_LOC (sc_addr + LINUX_SC_X29_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_X30] = DWARF_LOC (sc_addr + LINUX_SC_X30_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_SP] = DWARF_LOC (sc_addr + LINUX_SC_SP_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_PC] = DWARF_LOC (sc_addr + LINUX_SC_PC_OFF, 0); ++ c->dwarf.loc[UNW_AARCH64_PSTATE] = DWARF_LOC (sc_addr + LINUX_SC_PSTATE_OFF, 0); ++ ++ /* Set SP/CFA and PC/IP. */ ++ dwarf_get (&c->dwarf, c->dwarf.loc[UNW_AARCH64_SP], &c->dwarf.cfa); ++ dwarf_get (&c->dwarf, c->dwarf.loc[UNW_AARCH64_PC], &c->dwarf.ip); ++ ++ c->dwarf.pi_valid = 0; ++ ++ return 1; ++} ++ ++PROTECTED int ++unw_step (unw_cursor_t *cursor) ++{ ++ struct cursor *c = (struct cursor *) cursor; ++ int ret; ++ ++ Debug (1, "(cursor=%p, ip=0x%016lx, cfa=0x%016lx))\n", ++ c, c->dwarf.ip, c->dwarf.cfa); ++ ++ /* Check if this is a signal frame. */ ++ if (unw_is_signal_frame (cursor)) ++ return unw_handle_signal_frame (cursor); ++ ++ ret = dwarf_step (&c->dwarf); ++ Debug(1, "dwarf_step()=%d\n", ret); ++ ++ if (unlikely (ret == -UNW_ESTOPUNWIND)) ++ return ret; ++ ++ if (unlikely (ret < 0)) ++ return 0; ++ ++ return (c->dwarf.ip == 0) ? 0 : 1; ++} +--- /dev/null ++++ b/src/aarch64/Lcreate_addr_space.c +@@ -0,0 +1,5 @@ ++#define UNW_LOCAL_ONLY ++#include <libunwind.h> ++#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) ++#include "Gcreate_addr_space.c" ++#endif +--- /dev/null ++++ b/src/aarch64/Lget_proc_info.c +@@ -0,0 +1,5 @@ ++#define UNW_LOCAL_ONLY ++#include <libunwind.h> ++#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) ++#include "Gget_proc_info.c" ++#endif +--- /dev/null ++++ b/src/aarch64/Lget_save_loc.c +@@ -0,0 +1,5 @@ ++#define UNW_LOCAL_ONLY ++#include <libunwind.h> ++#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) ++#include "Gget_save_loc.c" ++#endif +--- /dev/null ++++ b/src/aarch64/Lglobal.c +@@ -0,0 +1,5 @@ ++#define UNW_LOCAL_ONLY ++#include <libunwind.h> ++#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) ++#include "Gglobal.c" ++#endif +--- /dev/null ++++ b/src/aarch64/Linit.c +@@ -0,0 +1,5 @@ ++#define UNW_LOCAL_ONLY ++#include <libunwind.h> ++#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) ++#include "Ginit.c" ++#endif +--- /dev/null ++++ b/src/aarch64/Linit_local.c +@@ -0,0 +1,5 @@ ++#define UNW_LOCAL_ONLY ++#include <libunwind.h> ++#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) ++#include "Ginit_local.c" ++#endif +--- /dev/null ++++ b/src/aarch64/Linit_remote.c +@@ -0,0 +1,5 @@ ++#define UNW_LOCAL_ONLY ++#include <libunwind.h> ++#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) ++#include "Ginit_remote.c" ++#endif +--- /dev/null ++++ b/src/aarch64/Lis_signal_frame.c +@@ -0,0 +1,5 @@ ++#define UNW_LOCAL_ONLY ++#include <libunwind.h> ++#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) ++#include "Gis_signal_frame.c" ++#endif +--- /dev/null ++++ b/src/aarch64/Lregs.c +@@ -0,0 +1,5 @@ ++#define UNW_LOCAL_ONLY ++#include <libunwind.h> ++#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) ++#include "Gregs.c" ++#endif +--- /dev/null ++++ b/src/aarch64/Lresume.c +@@ -0,0 +1,5 @@ ++#define UNW_LOCAL_ONLY ++#include <libunwind.h> ++#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) ++#include "Gresume.c" ++#endif +--- /dev/null ++++ b/src/aarch64/Lstep.c +@@ -0,0 +1,5 @@ ++#define UNW_LOCAL_ONLY ++#include <libunwind.h> ++#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) ++#include "Gstep.c" ++#endif +--- /dev/null ++++ b/src/aarch64/gen-offsets.c +@@ -0,0 +1,68 @@ ++#include <stdio.h> ++#include <stddef.h> ++#include <ucontext.h> ++#include <asm/sigcontext.h> ++ ++#define UC(N,X) \ ++ printf ("#define LINUX_UC_" N "_OFF\t0x%X\n", offsetof (ucontext_t, X)) ++ ++#define SC(N,X) \ ++ printf ("#define LINUX_SC_" N "_OFF\t0x%X\n", offsetof (struct sigcontext, X)) ++ ++int ++main (void) ++{ ++ printf ( ++"/* Linux-specific definitions: */\n\n" ++ ++"/* Define various structure offsets to simplify cross-compilation. */\n\n" ++ ++"/* Offsets for AArch64 Linux \"ucontext_t\": */\n\n"); ++ ++ UC ("FLAGS", uc_flags); ++ UC ("LINK", uc_link); ++ UC ("STACK", uc_stack); ++ UC ("MCONTEXT", uc_mcontext); ++ UC ("SIGMASK", uc_sigmask); ++ ++ printf ("\n/* Offsets for AArch64 Linux \"struct sigcontext\": */\n\n"); ++ ++ SC ("R0", regs[0]); ++ SC ("R1", regs[1]); ++ SC ("R2", regs[2]); ++ SC ("R3", regs[3]); ++ SC ("R4", regs[4]); ++ SC ("R5", regs[5]); ++ SC ("R6", regs[6]); ++ SC ("R7", regs[7]); ++ SC ("R8", regs[8]); ++ SC ("R9", regs[9]); ++ SC ("R10", regs[10]); ++ SC ("R11", regs[11]); ++ SC ("R12", regs[12]); ++ SC ("R13", regs[13]); ++ SC ("R14", regs[14]); ++ SC ("R15", regs[15]); ++ SC ("R16", regs[16]); ++ SC ("R17", regs[17]); ++ SC ("R18", regs[18]); ++ SC ("R19", regs[19]); ++ SC ("R20", regs[20]); ++ SC ("R21", regs[21]); ++ SC ("R22", regs[22]); ++ SC ("R23", regs[23]); ++ SC ("R24", regs[24]); ++ SC ("R25", regs[25]); ++ SC ("R26", regs[26]); ++ SC ("R27", regs[27]); ++ SC ("R28", regs[28]); ++ SC ("R29", regs[29]); ++ SC ("R30", regs[30]); ++ SC ("R31", regs[31]); ++ ++ SC ("PC", pc); ++ SC ("SP", sp); ++ SC ("Fault", fault_address); ++ SC ("state", pstate); ++ return 0; ++} +--- /dev/null ++++ b/src/aarch64/init.h +@@ -0,0 +1,127 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> ++ Copyright (C) 2013 Linaro Limited ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#include "unwind_i.h" ++ ++static inline int ++common_init (struct cursor *c, unsigned use_prev_instr) ++{ ++ int ret, i; ++ ++ c->dwarf.loc[UNW_AARCH64_X0] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X0); ++ c->dwarf.loc[UNW_AARCH64_X1] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X1); ++ c->dwarf.loc[UNW_AARCH64_X2] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X2); ++ c->dwarf.loc[UNW_AARCH64_X3] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X3); ++ c->dwarf.loc[UNW_AARCH64_X4] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X4); ++ c->dwarf.loc[UNW_AARCH64_X5] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X5); ++ c->dwarf.loc[UNW_AARCH64_X6] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X6); ++ c->dwarf.loc[UNW_AARCH64_X7] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X7); ++ c->dwarf.loc[UNW_AARCH64_X8] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X8); ++ c->dwarf.loc[UNW_AARCH64_X9] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X9); ++ c->dwarf.loc[UNW_AARCH64_X10] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X10); ++ c->dwarf.loc[UNW_AARCH64_X11] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X11); ++ c->dwarf.loc[UNW_AARCH64_X12] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X12); ++ c->dwarf.loc[UNW_AARCH64_X13] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X13); ++ c->dwarf.loc[UNW_AARCH64_X14] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X14); ++ c->dwarf.loc[UNW_AARCH64_X15] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X15); ++ c->dwarf.loc[UNW_AARCH64_X16] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X16); ++ c->dwarf.loc[UNW_AARCH64_X17] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X17); ++ c->dwarf.loc[UNW_AARCH64_X18] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X18); ++ c->dwarf.loc[UNW_AARCH64_X19] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X19); ++ c->dwarf.loc[UNW_AARCH64_X20] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X20); ++ c->dwarf.loc[UNW_AARCH64_X21] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X21); ++ c->dwarf.loc[UNW_AARCH64_X22] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X22); ++ c->dwarf.loc[UNW_AARCH64_X23] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X23); ++ c->dwarf.loc[UNW_AARCH64_X24] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X24); ++ c->dwarf.loc[UNW_AARCH64_X25] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X25); ++ c->dwarf.loc[UNW_AARCH64_X26] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X26); ++ c->dwarf.loc[UNW_AARCH64_X27] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X27); ++ c->dwarf.loc[UNW_AARCH64_X28] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X28); ++ c->dwarf.loc[UNW_AARCH64_X29] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X29); ++ c->dwarf.loc[UNW_AARCH64_X30] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X30); ++ c->dwarf.loc[UNW_AARCH64_SP] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_SP); ++ c->dwarf.loc[UNW_AARCH64_PC] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_PC); ++ c->dwarf.loc[UNW_AARCH64_PSTATE] = DWARF_REG_LOC (&c->dwarf, ++ UNW_AARCH64_PSTATE); ++ c->dwarf.loc[UNW_AARCH64_V0] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V0); ++ c->dwarf.loc[UNW_AARCH64_V1] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V1); ++ c->dwarf.loc[UNW_AARCH64_V2] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V2); ++ c->dwarf.loc[UNW_AARCH64_V3] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V3); ++ c->dwarf.loc[UNW_AARCH64_V4] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V4); ++ c->dwarf.loc[UNW_AARCH64_V5] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V5); ++ c->dwarf.loc[UNW_AARCH64_V6] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V6); ++ c->dwarf.loc[UNW_AARCH64_V7] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V7); ++ c->dwarf.loc[UNW_AARCH64_V8] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V8); ++ c->dwarf.loc[UNW_AARCH64_V9] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V9); ++ c->dwarf.loc[UNW_AARCH64_V10] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V10); ++ c->dwarf.loc[UNW_AARCH64_V11] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V11); ++ c->dwarf.loc[UNW_AARCH64_V12] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V12); ++ c->dwarf.loc[UNW_AARCH64_V13] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V13); ++ c->dwarf.loc[UNW_AARCH64_V14] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V14); ++ c->dwarf.loc[UNW_AARCH64_V15] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V15); ++ c->dwarf.loc[UNW_AARCH64_V16] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V16); ++ c->dwarf.loc[UNW_AARCH64_V17] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V17); ++ c->dwarf.loc[UNW_AARCH64_V18] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V18); ++ c->dwarf.loc[UNW_AARCH64_V19] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V19); ++ c->dwarf.loc[UNW_AARCH64_V20] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V20); ++ c->dwarf.loc[UNW_AARCH64_V21] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V21); ++ c->dwarf.loc[UNW_AARCH64_V22] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V22); ++ c->dwarf.loc[UNW_AARCH64_V23] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V23); ++ c->dwarf.loc[UNW_AARCH64_V24] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V24); ++ c->dwarf.loc[UNW_AARCH64_V25] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V25); ++ c->dwarf.loc[UNW_AARCH64_V26] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V26); ++ c->dwarf.loc[UNW_AARCH64_V27] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V27); ++ c->dwarf.loc[UNW_AARCH64_V28] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V28); ++ c->dwarf.loc[UNW_AARCH64_V29] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V29); ++ c->dwarf.loc[UNW_AARCH64_V30] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V30); ++ c->dwarf.loc[UNW_AARCH64_V31] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V31); ++ ++ for (i = UNW_AARCH64_PSTATE + 1; i < UNW_AARCH64_V0; ++i) ++ c->dwarf.loc[i] = DWARF_NULL_LOC; ++ ++ ret = dwarf_get (&c->dwarf, c->dwarf.loc[UNW_AARCH64_PC], &c->dwarf.ip); ++ if (ret < 0) ++ return ret; ++ ++ ret = dwarf_get (&c->dwarf, c->dwarf.loc[UNW_AARCH64_SP], &c->dwarf.cfa); ++ if (ret < 0) ++ return ret; ++ ++ c->sigcontext_format = AARCH64_SCF_NONE; ++ c->sigcontext_addr = 0; ++ c->sigcontext_sp = 0; ++ c->sigcontext_pc = 0; ++ ++ c->dwarf.args_size = 0; ++ c->dwarf.ret_addr_column = 0; ++ c->dwarf.stash_frames = 0; ++ c->dwarf.use_prev_instr = use_prev_instr; ++ c->dwarf.pi_valid = 0; ++ c->dwarf.pi_is_dynamic = 0; ++ c->dwarf.hint = 0; ++ c->dwarf.prev_rs = 0; ++ ++ return 0; ++} +--- /dev/null ++++ b/src/aarch64/is_fpreg.c +@@ -0,0 +1,32 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2008 CodeSourcery ++ Copyright (C) 2013 Linaro Limited ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#include "libunwind_i.h" ++ ++PROTECTED int ++unw_is_fpreg (int regnum) ++{ ++ return (regnum >= UNW_AARCH64_V0 && regnum <= UNW_AARCH64_V31); ++} +--- /dev/null ++++ b/src/aarch64/offsets.h +@@ -0,0 +1,49 @@ ++/* Linux-specific definitions: */ ++ ++/* Define various structure offsets to simplify cross-compilation. */ ++ ++/* Offsets for AArch64 Linux "ucontext_t": */ ++ ++#define LINUX_UC_FLAGS_OFF 0x0 ++#define LINUX_UC_LINK_OFF 0x8 ++#define LINUX_UC_STACK_OFF 0x10 ++#define LINUX_UC_SIGMASK_OFF 0x28 ++#define LINUX_UC_MCONTEXT_OFF 0xb0 ++ ++/* Offsets for AArch64 Linux "struct sigcontext": */ ++ ++#define LINUX_SC_FAULTADDRESS_OFF 0x00 ++#define LINUX_SC_X0_OFF 0x008 ++#define LINUX_SC_X1_OFF 0x010 ++#define LINUX_SC_X2_OFF 0x018 ++#define LINUX_SC_X3_OFF 0x020 ++#define LINUX_SC_X4_OFF 0x028 ++#define LINUX_SC_X5_OFF 0x030 ++#define LINUX_SC_X6_OFF 0x038 ++#define LINUX_SC_X7_OFF 0x040 ++#define LINUX_SC_X8_OFF 0x048 ++#define LINUX_SC_X9_OFF 0x050 ++#define LINUX_SC_X10_OFF 0x058 ++#define LINUX_SC_X11_OFF 0x060 ++#define LINUX_SC_X12_OFF 0x068 ++#define LINUX_SC_X13_OFF 0x070 ++#define LINUX_SC_X14_OFF 0x078 ++#define LINUX_SC_X15_OFF 0x080 ++#define LINUX_SC_X16_OFF 0x088 ++#define LINUX_SC_X17_OFF 0x090 ++#define LINUX_SC_X18_OFF 0x098 ++#define LINUX_SC_X19_OFF 0x0a0 ++#define LINUX_SC_X20_OFF 0x0a8 ++#define LINUX_SC_X21_OFF 0x0b0 ++#define LINUX_SC_X22_OFF 0x0b8 ++#define LINUX_SC_X23_OFF 0x0c0 ++#define LINUX_SC_X24_OFF 0x0c8 ++#define LINUX_SC_X25_OFF 0x0d0 ++#define LINUX_SC_X26_OFF 0x0d8 ++#define LINUX_SC_X27_OFF 0x0e0 ++#define LINUX_SC_X28_OFF 0x0e8 ++#define LINUX_SC_X29_OFF 0x0f0 ++#define LINUX_SC_X30_OFF 0x0f8 ++#define LINUX_SC_SP_OFF 0x100 ++#define LINUX_SC_PC_OFF 0x108 ++#define LINUX_SC_PSTATE_OFF 0x110 +--- /dev/null ++++ b/src/aarch64/regname.c +@@ -0,0 +1,106 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> ++ Copyright (C) 2013 Linaro Limited ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#include "unwind_i.h" ++ ++static const char *const regname[] = ++ { ++ [UNW_AARCH64_X0] = "x0", ++ [UNW_AARCH64_X1] = "x1", ++ [UNW_AARCH64_X2] = "x2", ++ [UNW_AARCH64_X3] = "x3", ++ [UNW_AARCH64_X4] = "x4", ++ [UNW_AARCH64_X5] = "x5", ++ [UNW_AARCH64_X6] = "x6", ++ [UNW_AARCH64_X7] = "x7", ++ [UNW_AARCH64_X8] = "x8", ++ [UNW_AARCH64_X9] = "x9", ++ [UNW_AARCH64_X10] = "x10", ++ [UNW_AARCH64_X11] = "x11", ++ [UNW_AARCH64_X12] = "x12", ++ [UNW_AARCH64_X13] = "x13", ++ [UNW_AARCH64_X14] = "x14", ++ [UNW_AARCH64_X15] = "x15", ++ [UNW_AARCH64_X16] = "ip0", ++ [UNW_AARCH64_X17] = "ip1", ++ [UNW_AARCH64_X18] = "x18", ++ [UNW_AARCH64_X19] = "x19", ++ [UNW_AARCH64_X20] = "x20", ++ [UNW_AARCH64_X21] = "x21", ++ [UNW_AARCH64_X22] = "x22", ++ [UNW_AARCH64_X23] = "x23", ++ [UNW_AARCH64_X24] = "x24", ++ [UNW_AARCH64_X25] = "x25", ++ [UNW_AARCH64_X26] = "x26", ++ [UNW_AARCH64_X27] = "x27", ++ [UNW_AARCH64_X28] = "x28", ++ [UNW_AARCH64_X29] = "fp", ++ [UNW_AARCH64_X30] = "lr", ++ [UNW_AARCH64_SP] = "sp", ++ [UNW_AARCH64_PC] = "pc", ++ [UNW_AARCH64_V0] = "v0", ++ [UNW_AARCH64_V1] = "v1", ++ [UNW_AARCH64_V2] = "v2", ++ [UNW_AARCH64_V3] = "v3", ++ [UNW_AARCH64_V4] = "v4", ++ [UNW_AARCH64_V5] = "v5", ++ [UNW_AARCH64_V6] = "v6", ++ [UNW_AARCH64_V7] = "v7", ++ [UNW_AARCH64_V8] = "v8", ++ [UNW_AARCH64_V9] = "v9", ++ [UNW_AARCH64_V10] = "v10", ++ [UNW_AARCH64_V11] = "v11", ++ [UNW_AARCH64_V12] = "v12", ++ [UNW_AARCH64_V13] = "v13", ++ [UNW_AARCH64_V14] = "v14", ++ [UNW_AARCH64_V15] = "v15", ++ [UNW_AARCH64_V16] = "v16", ++ [UNW_AARCH64_V17] = "v17", ++ [UNW_AARCH64_V18] = "v18", ++ [UNW_AARCH64_V19] = "v19", ++ [UNW_AARCH64_V20] = "v20", ++ [UNW_AARCH64_V21] = "v21", ++ [UNW_AARCH64_V22] = "v22", ++ [UNW_AARCH64_V23] = "v23", ++ [UNW_AARCH64_V24] = "v24", ++ [UNW_AARCH64_V25] = "v25", ++ [UNW_AARCH64_V26] = "v26", ++ [UNW_AARCH64_V27] = "v27", ++ [UNW_AARCH64_V28] = "v28", ++ [UNW_AARCH64_V29] = "v29", ++ [UNW_AARCH64_V30] = "v30", ++ [UNW_AARCH64_V31] = "v31", ++ [UNW_AARCH64_FPSR] = "fpsr", ++ [UNW_AARCH64_FPCR] = "fpcr", ++ }; ++ ++PROTECTED const char * ++unw_regname (unw_regnum_t reg) ++{ ++ if (reg < (unw_regnum_t) ARRAY_SIZE (regname) && regname[reg] != NULL) ++ return regname[reg]; ++ else ++ return "???"; ++} +--- /dev/null ++++ b/src/aarch64/siglongjmp.S +@@ -0,0 +1,12 @@ ++ /* Dummy implementation for now. */ ++ ++ .global _UI_siglongjmp_cont ++ .global _UI_longjmp_cont ++ ++_UI_siglongjmp_cont: ++_UI_longjmp_cont: ++ ret ++#ifdef __linux__ ++ /* We do not need executable stack. */ ++ .section .note.GNU-stack,"",%progbits ++#endif +--- /dev/null ++++ b/src/aarch64/unwind_i.h +@@ -0,0 +1,43 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2008 CodeSourcery ++ Copyright (C) 2013 Linaro Limited ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#ifndef unwind_i_h ++#define unwind_i_h ++ ++#include <stdint.h> ++ ++#include <libunwind-aarch64.h> ++ ++#include "libunwind_i.h" ++ ++#define aarch64_lock UNW_OBJ(lock) ++#define aarch64_local_resume UNW_OBJ(local_resume) ++#define aarch64_local_addr_space_init UNW_OBJ(local_addr_space_init) ++ ++extern void aarch64_local_addr_space_init (void); ++extern int aarch64_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, ++ void *arg); ++ ++#endif /* unwind_i_h */ +--- a/src/coredump/_UCD_access_reg_linux.c ++++ b/src/coredump/_UCD_access_reg_linux.c +@@ -39,7 +39,10 @@ _UCD_access_reg (unw_addr_space_t as, + return -UNW_EINVAL; + } + +-#if defined(UNW_TARGET_ARM) ++#if defined(UNW_TARGET_AARCH64) ++ if (regnum < 0 || regnum >= UNW_AARCH64_FPCR) ++ goto badreg; ++#elif defined(UNW_TARGET_ARM) + if (regnum < 0 || regnum >= 16) + goto badreg; + #elif defined(UNW_TARGET_SH) +--- a/src/ptrace/_UPT_reg_offset.c ++++ b/src/ptrace/_UPT_reg_offset.c +@@ -1,6 +1,7 @@ + /* libunwind - a platform-independent unwind library + Copyright (C) 2003-2004 Hewlett-Packard Co + Contributed by David Mosberger-Tang <davidm@hpl.hp.com> ++ Copyright (C) 2013 Linaro Limited + + This file is part of libunwind. + +@@ -501,6 +502,41 @@ const int _UPT_reg_offset[UNW_REG_LAST + + [UNW_ARM_R15] = 0x3c, + #elif defined(UNW_TARGET_MIPS) + #elif defined(UNW_TARGET_SH) ++#elif defined(UNW_TARGET_AARCH64) ++ [UNW_AARCH64_X0] = 0x00, ++ [UNW_AARCH64_X1] = 0x08, ++ [UNW_AARCH64_X2] = 0x10, ++ [UNW_AARCH64_X3] = 0x18, ++ [UNW_AARCH64_X4] = 0x20, ++ [UNW_AARCH64_X5] = 0x28, ++ [UNW_AARCH64_X6] = 0x30, ++ [UNW_AARCH64_X7] = 0x38, ++ [UNW_AARCH64_X8] = 0x40, ++ [UNW_AARCH64_X9] = 0x48, ++ [UNW_AARCH64_X10] = 0x50, ++ [UNW_AARCH64_X11] = 0x58, ++ [UNW_AARCH64_X12] = 0x60, ++ [UNW_AARCH64_X13] = 0x68, ++ [UNW_AARCH64_X14] = 0x70, ++ [UNW_AARCH64_X15] = 0x78, ++ [UNW_AARCH64_X16] = 0x80, ++ [UNW_AARCH64_X17] = 0x88, ++ [UNW_AARCH64_X18] = 0x90, ++ [UNW_AARCH64_X19] = 0x98, ++ [UNW_AARCH64_X20] = 0xa0, ++ [UNW_AARCH64_X21] = 0xa8, ++ [UNW_AARCH64_X22] = 0xb0, ++ [UNW_AARCH64_X23] = 0xb8, ++ [UNW_AARCH64_X24] = 0xc0, ++ [UNW_AARCH64_X25] = 0xc8, ++ [UNW_AARCH64_X26] = 0xd0, ++ [UNW_AARCH64_X27] = 0xd8, ++ [UNW_AARCH64_X28] = 0xe0, ++ [UNW_AARCH64_X29] = 0xe8, ++ [UNW_AARCH64_X30] = 0xf0, ++ [UNW_AARCH64_SP] = 0xf8, ++ [UNW_AARCH64_PC] = 0x100, ++ [UNW_AARCH64_PSTATE] = 0x108 + #else + # error Fix me. + #endif diff --git a/meta/recipes-support/libunwind/libunwind-1.1/Fix-test-case-link-failure-on-PowerPC-systems-with-Altivec.patch b/meta/recipes-support/libunwind/libunwind-1.1/Fix-test-case-link-failure-on-PowerPC-systems-with-Altivec.patch new file mode 100644 index 0000000000..dc0f5c1b47 --- /dev/null +++ b/meta/recipes-support/libunwind/libunwind-1.1/Fix-test-case-link-failure-on-PowerPC-systems-with-Altivec.patch @@ -0,0 +1,28 @@ +Fix test case link failure on PowerPC systems with Altivec + +Upstream-Status:backport + +On systems where the system compiler supports Altivec by default, +the libunwind Makefile will attempt to build an extra test case +ppc64-test-altivec. Unfortunately, the link step will fail since +the Makefile does not actually link against the libunwind library. + +Fixed by adding the appropriate LDADD macro. + +Signed-off-by: Ulrich Weigand <address@hidden> +--- + tests/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 0e30536..9c76628 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -201,3 +201,4 @@ Lia64_test_rbs_LDADD = $(LIBUNWIND_local) + Lia64_test_readonly_LDADD = $(LIBUNWIND_local) + ia64_test_dyn1_LDADD = $(LIBUNWIND) + ia64_test_sig_LDADD = $(LIBUNWIND) ++ppc64_test_altivec_LDADD = $(LIBUNWIND) +-- +1.8.5 + diff --git a/meta/recipes-support/libunwind/libunwind-1.1/Link-libunwind-to-libgcc_s-rather-than-libgcc.patch b/meta/recipes-support/libunwind/libunwind-1.1/Link-libunwind-to-libgcc_s-rather-than-libgcc.patch new file mode 100644 index 0000000000..0e55c91b80 --- /dev/null +++ b/meta/recipes-support/libunwind/libunwind-1.1/Link-libunwind-to-libgcc_s-rather-than-libgcc.patch @@ -0,0 +1,42 @@ +From 508ca17a7be01d1cc960d9a07d0af4513948fb8d Mon Sep 17 00:00:00 2001 +From: Thierry Reding <treding@nvidia.com> +Date: Fri, 27 Jun 2014 08:40:33 +0200 +Subject: [PATCH] Link libunwind to libgcc_s rather than libgcc + +For some architectures, -lgcc and -lgcc_s are not equivalent. On ARM for +example, libgcc_s.so.1 contains some symbols needed by libunwind which +are not present in libgcc. + +This causes the following link error when building the X.Org X server +with libunwind support: + + CCLD Xorg + /usr/lib/libunwind.so: undefined reference to `__aeabi_unwind_cpp_pr0' + /usr/lib/libunwind.so: undefined reference to `__aeabi_unwind_cpp_pr1' + +Linking against libgcc_s explicitly solves this problem. + +Upstream-Status: Backport + +Signed-off-by: Thierry Reding <treding@nvidia.com> +Signed-off-by: Jonathan Liu <net147@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index cffe19b..3beb5f2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -258,7 +258,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[#ifndef __INTEL_COMPILER + + if test x$GCC = xyes -a x$intel_compiler != xyes; then + CFLAGS="${CFLAGS} -fexceptions -Wall -Wsign-compare" +- LIBCRTS="-lgcc" ++ LIBCRTS="-lgcc_s" + fi + AC_MSG_RESULT([$intel_compiler]) + +-- +2.3.2 + diff --git a/meta/recipes-support/libunwind/libunwind-1.1/Support-building-with-older-compilers.patch b/meta/recipes-support/libunwind/libunwind-1.1/Support-building-with-older-compilers.patch new file mode 100644 index 0000000000..268b702dcb --- /dev/null +++ b/meta/recipes-support/libunwind/libunwind-1.1/Support-building-with-older-compilers.patch @@ -0,0 +1,72 @@ +From 10b064ffe902d5af31bb49bd8e4f03c545f8d462 Mon Sep 17 00:00:00 2001 +From: Ladislav Michl <ladis@linux-mips.org> +Date: Tue, 13 Nov 2012 11:19:47 +0100 +Subject: [PATCH] Support building with older compilers. + +Add a check for __builtin_unreachable. + +Upstream-Status: Pending +--- + configure.ac | 11 +++++++++++ + include/libunwind_i.h | 6 ++++++ + src/arm/Gresume.c | 2 +- + src/sh/Gresume.c | 2 +- + 4 files changed, 19 insertions(+), 2 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -285,6 +285,17 @@ if test x$have__builtin___clear_cache = + fi + AC_MSG_RESULT([$have__builtin___clear_cache]) + ++AC_MSG_CHECKING([for __builtin_unreachable]) ++AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([[]], [[__builtin_unreachable()]])], ++ [have__builtin_unreachable=yes], ++ [have__builtin_unreachable=no]) ++if test x$have__builtin_unreachable = xyes; then ++ AC_DEFINE([HAVE__BUILTIN_UNREACHABLE], [1], ++ [Defined if __builtin_unreachable() is available]) ++fi ++AC_MSG_RESULT([$have__builtin_unreachable]) ++ + AC_MSG_CHECKING([for __sync atomics]) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[]], [[ +--- a/include/libunwind_i.h ++++ b/include/libunwind_i.h +@@ -72,6 +72,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE + # endif + #endif + ++#if defined(HAVE__BUILTIN_UNREACHABLE) ++# define unreachable() __builtin_unreachable() ++#else ++# define unreachable() do { } while (1) ++#endif ++ + #ifdef DEBUG + # define UNW_DEBUG 1 + #else +--- a/src/arm/Gresume.c ++++ b/src/arm/Gresume.c +@@ -96,7 +96,7 @@ arm_local_resume (unw_addr_space_t as, u + : : "r" (c->sigcontext_sp), "r" (c->sigcontext_pc) + ); + } +- __builtin_unreachable(); ++ unreachable(); + #else + printf ("%s: implement me\n", __FUNCTION__); + #endif +--- a/src/sh/Gresume.c ++++ b/src/sh/Gresume.c +@@ -109,7 +109,7 @@ sh_local_resume (unw_addr_space_t as, un + "r" (c->sigcontext_pc) + ); + } +- __builtin_unreachable(); ++ unreachable(); + #endif + return -UNW_EINVAL; + } diff --git a/meta/recipes-support/libunwind/libunwind.inc b/meta/recipes-support/libunwind/libunwind.inc index b27b9e5994..2a65631b2c 100644 --- a/meta/recipes-support/libunwind/libunwind.inc +++ b/meta/recipes-support/libunwind/libunwind.inc @@ -8,9 +8,10 @@ SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" inherit autotools PACKAGECONFIG ??= "" -PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,lzma" +PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz" EXTRA_OECONF_arm = "--enable-debug-frame" +EXTRA_OECONF_aarch64 = "--enable-debug-frame" CFLAGS += "${ATOMICOPS}" ATOMICOPS_armv5 = "-DAO_USE_PTHREAD_DEFS=1" diff --git a/meta/recipes-support/libunwind/libunwind_1.1.bb b/meta/recipes-support/libunwind/libunwind_1.1.bb index bc38e36440..ee6f522d68 100644 --- a/meta/recipes-support/libunwind/libunwind_1.1.bb +++ b/meta/recipes-support/libunwind/libunwind_1.1.bb @@ -1,4 +1,11 @@ require libunwind.inc +SRC_URI += "\ + file://Support-building-with-older-compilers.patch \ + file://AArch64-port.patch \ + file://Fix-test-case-link-failure-on-PowerPC-systems-with-Altivec.patch \ + file://Link-libunwind-to-libgcc_s-rather-than-libgcc.patch \ +" + SRC_URI[md5sum] = "fb4ea2f6fbbe45bf032cd36e586883ce" SRC_URI[sha256sum] = "9dfe0fcae2a866de9d3942c66995e4b460230446887dbdab302d41a8aee8d09a" diff --git a/meta/recipes-support/liburcu/liburcu/Revert-Blacklist-ARM-gcc-4.8.0-4.8.1-4.8.2.patch b/meta/recipes-support/liburcu/liburcu/Revert-Blacklist-ARM-gcc-4.8.0-4.8.1-4.8.2.patch new file mode 100644 index 0000000000..535a7384cb --- /dev/null +++ b/meta/recipes-support/liburcu/liburcu/Revert-Blacklist-ARM-gcc-4.8.0-4.8.1-4.8.2.patch @@ -0,0 +1,47 @@ +From 7b3df100346128d780f218b881d563d1fd12e310 Mon Sep 17 00:00:00 2001 +From: Jonathan Liu <net147@gmail.com> +Date: Mon, 20 Oct 2014 13:46:10 +1100 +Subject: [PATCH] Revert "Blacklist ARM gcc 4.8.0, 4.8.1, 4.8.2" + +This reverts commit 4b79310aa3d408ba30fee02cc497a68072d38a99. +OE-Core is using a patched GCC 4.8.2 which is able to compile liburcu +properly. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Jonathan Liu <net147@gmail.com> +--- + urcu/compiler.h | 19 ------------------- + 1 file changed, 19 deletions(-) + +diff --git a/urcu/compiler.h b/urcu/compiler.h +index 1e30903..19534f0 100644 +--- a/urcu/compiler.h ++++ b/urcu/compiler.h +@@ -108,23 +108,4 @@ + + #define CAA_ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + +-/* +- * Don't allow compiling with buggy compiler. +- */ +- +-#ifdef __GNUC__ +-# define URCU_GCC_VERSION (__GNUC__ * 10000 \ +- + __GNUC_MINOR__ * 100 \ +- + __GNUC_PATCHLEVEL__) +- +-/* +- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58854 +- */ +-# ifdef __ARMEL__ +-# if URCU_GCC_VERSION >= 40800 && URCU_GCC_VERSION <= 40802 +-# error Your gcc version produces clobbered frame accesses +-# endif +-# endif +-#endif +- + #endif /* _URCU_COMPILER_H */ +-- +2.1.2 + diff --git a/meta/recipes-support/liburcu/liburcu/aarch64.patch b/meta/recipes-support/liburcu/liburcu/aarch64.patch new file mode 100644 index 0000000000..c6cc8c2fd3 --- /dev/null +++ b/meta/recipes-support/liburcu/liburcu/aarch64.patch @@ -0,0 +1,19 @@ +libucru: recognize aarch64 + +Make the same as "arm" internally. + +Upstream-Status: Pending + +Signed-off-by: joe.slater@windriver.com + + +--- a/configure.ac ++++ b/configure.ac +@@ -77,6 +77,7 @@ AS_CASE([$host_cpu], + [alpha*], [ARCHTYPE="alpha"], + [ia64], [ARCHTYPE="gcc"], + [arm*], [ARCHTYPE="arm"], ++ [aarch64], [ARCHTYPE="arm"], + [mips*], [ARCHTYPE="mips"], + [tile*], [ARCHTYPE="gcc"], + [ARCHTYPE="unknown"] diff --git a/meta/recipes-support/liburcu/liburcu_0.8.4.bb b/meta/recipes-support/liburcu/liburcu_0.8.6.bb index cd7af24baa..263b77e995 100644 --- a/meta/recipes-support/liburcu/liburcu_0.8.4.bb +++ b/meta/recipes-support/liburcu/liburcu_0.8.6.bb @@ -8,10 +8,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0f060c30a27922ce9c0d557a639b4fa3 \ file://urcu/uatomic/x86.h;beginline=4;endline=21;md5=220552f72c55b102f2ee35929734ef42" SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ + file://Revert-Blacklist-ARM-gcc-4.8.0-4.8.1-4.8.2.patch \ + file://aarch64.patch \ " -SRC_URI[md5sum] = "2ca6671b20a550aa0e8020a1a9a96fd4" -SRC_URI[sha256sum] = "96c0a157e94a15b1506efe9aedd98145e6eb41a3fbcf5b0d118b7a783b22fe12" +SRC_URI[md5sum] = "834d91d939dd55108a05763be9879856" +SRC_URI[sha256sum] = "b1a5d3bce014ba7a702759bc60b692c1cd46ff0e8a5b53f0d0a95e22db74ab21" S = "${WORKDIR}/userspace-rcu-${PV}" CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" diff --git a/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch b/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch new file mode 100644 index 0000000000..b88440dec9 --- /dev/null +++ b/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch @@ -0,0 +1,30 @@ +From 340f911f9e3f4ff6b01682c5341c959060782af2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 2 Apr 2015 19:18:45 -0700 +Subject: [PATCH] usb.h: Include sys/types.h + +We need the definitions for things like u_intX_t + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libusb/usb.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libusb/usb.h b/libusb/usb.h +index 84e730f..caffae2 100644 +--- a/libusb/usb.h ++++ b/libusb/usb.h +@@ -31,6 +31,8 @@ + + #include <dirent.h> + ++#include <sys/types.h> ++ + /* + * USB spec information + * +-- +2.1.4 + diff --git a/meta/recipes-support/libusb/libusb-compat_0.1.5.bb b/meta/recipes-support/libusb/libusb-compat_0.1.5.bb index 74761d6a44..646872cb96 100644 --- a/meta/recipes-support/libusb/libusb-compat_0.1.5.bb +++ b/meta/recipes-support/libusb/libusb-compat_0.1.5.bb @@ -18,7 +18,9 @@ BBCLASSEXTEND = "native nativesdk" PE = "1" -SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \ + file://0001-usb.h-Include-sys-types.h.patch \ + " SRC_URI[md5sum] = "2780b6a758a1e2c2943bdbf7faf740e4" SRC_URI[sha256sum] = "404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a" diff --git a/meta/recipes-support/lz4/lz4_svn.bb b/meta/recipes-support/lz4/lz4_svn.bb index bbd5d9391f..363e439eea 100644 --- a/meta/recipes-support/lz4/lz4_svn.bb +++ b/meta/recipes-support/lz4/lz4_svn.bb @@ -2,11 +2,10 @@ SUMMARY = "Extremely Fast Compression algorithm" DESCRIPTION = "LZ4 is a very fast lossless compression algorithm, providing compression speed at 400 MB/s per core, scalable with multi-cores CPU. It also features an extremely fast decoder, with speed in multiple GB/s per core, typically reaching RAM speed limits on multi-core systems." LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0b0d063f37a4477b54af2459477dcafd \ - file://Makefile;md5=68938168b5cee826476a13e1b8d1f480" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0b0d063f37a4477b54af2459477dcafd" # Upstream names releases after SVN revs -SRCREV = "122" +SRCREV = "127" PV = "r${SRCREV}" SRC_URI = "svn://lz4.googlecode.com/svn/;module=trunk;protocol=http" diff --git a/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch b/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch index c26891b46f..db3a70e803 100644 --- a/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch +++ b/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch @@ -25,7 +25,7 @@ index ab2be5f..6913c2f 100644 @@ -3523,6 +3523,20 @@ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU8p)0)==8) if ((void)0, n__n > 0) do { *d__n++ = *s__n++; } while (--n__n > 0); \ LZO_BLOCK_END - + +/* Debian-specific change: we know that our compiler inlines memcpy() with + * constant n to be as fast as handwritten code, and knows which architectures + * need things correctly aligned. */ @@ -50,7 +50,7 @@ index dfaa676..1cc1b53 100644 @@ -333,6 +333,20 @@ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU8p)0)==8) if ((void)0, n__n > 0) do { *d__n++ = *s__n++; } while (--n__n > 0); \ LZO_BLOCK_END - + +/* Debian-specific change: we know that our compiler inlines memcpy() with + * constant n to be as fast as handwritten code, and knows which architectures + * need things correctly aligned. */ diff --git a/meta/recipes-support/lzo/lzo/run-ptest b/meta/recipes-support/lzo/lzo/run-ptest new file mode 100644 index 0000000000..2ea7745f70 --- /dev/null +++ b/meta/recipes-support/lzo/lzo/run-ptest @@ -0,0 +1,8 @@ +#!/bin/sh + +./lzotest -mavail -n10 -q /etc/services +LZOTEST=./lzotest /bin/sh -e "./check.sh" "/etc" +./align +./chksum +./simple +./testmini diff --git a/meta/recipes-support/lzo/lzo_2.08.bb b/meta/recipes-support/lzo/lzo_2.09.bb index af06e29a6f..2978617bbd 100644 --- a/meta/recipes-support/lzo/lzo_2.08.bb +++ b/meta/recipes-support/lzo/lzo_2.09.bb @@ -3,17 +3,18 @@ HOMEPAGE = "http://www.oberhumer.com/opensource/lzo/" SECTION = "libs" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://src/lzo_init.c;beginline=5;endline=25;md5=a6e25df9a83b24629e847846ccdd8054" + file://src/lzo_init.c;beginline=5;endline=25;md5=355023835a9b9eeb70ab895395e951ff" SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \ file://0001-Use-memcpy-instead-of-reinventing-it.patch \ file://acinclude.m4 \ + file://run-ptest \ " -SRC_URI[md5sum] = "fcec64c26a0f4f4901468f360029678f" -SRC_URI[sha256sum] = "ac1b3e4dee46febe9fd28737eb7f5692d3232ef1a01da10444394c3d47536614" +SRC_URI[md5sum] = "c7ffc9a103afe2d1bba0b015e7aa887f" +SRC_URI[sha256sum] = "f294a7ced313063c057c504257f437c8335c41bfeed23531ee4e6a2b87bcb34c" -inherit autotools +inherit autotools ptest EXTRA_OECONF = "--enable-shared" @@ -21,4 +22,14 @@ do_configure_prepend () { cp ${WORKDIR}/acinclude.m4 ${S}/ } +do_install_ptest() { + t=${D}${PTEST_PATH} + cp ${S}/util/check.sh $t + cp ${B}/minilzo/testmini $t + for i in tests/align tests/chksum lzotest/lzotest examples/simple + do cp ${B}/`dirname $i`/.libs/`basename $i` $t; \ + done +} + + BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch b/meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch new file mode 100644 index 0000000000..527589f71c --- /dev/null +++ b/meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch @@ -0,0 +1,36 @@ +Fix get of FLAGS register in x32 ABI, + +x32 ABI requires to have 64-bit variable to store FLAGS register +instead of size_t that is 32-bit variable, this fix operand +type mismatch when try to pop previous pushf value. + +Upstream-status: Submitted + +Signed-off-by: AnÃbal Limón <anibal.limon@linux.intel.com> + +Index: lzop-1.03/src/miniacc.h +=================================================================== +--- lzop-1.03.orig/src/miniacc.h ++++ lzop-1.03/src/miniacc.h +@@ -754,6 +754,9 @@ + #elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64) + # define ACC_ARCH_AMD64 1 + # define ACC_INFO_ARCH "amd64" ++# if defined(__ILP32__) ++# define ACC_ARCH_AMD64_X32 1 ++# endif + #elif defined(__thumb__) || (defined(_M_ARM) && defined(_M_THUMB)) + # define ACC_ARCH_ARM 1 + # define ACC_ARCH_ARM_THUMB 1 +@@ -6787,7 +6790,11 @@ ACCLIB_PUBLIC_NOINLINE(void, acc_debug_n + ACCLIB_PUBLIC_NOINLINE(int, acc_debug_align_check_query) (void) + { + #if (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_ASM_SYNTAX_GNUC) ++# if defined(ACC_ARCH_AMD64_X32) ++ unsigned long long r; ++# else + size_t r; ++# endif + __asm__ __volatile__("pushf\n pop %0\n" : "=a" (r) : : __ACC_ASM_CLOBBER); + return (int)(r >> 18) & 1; + #elif (ACC_ARCH_I386) && (ACC_ASM_SYNTAX_MSC) diff --git a/meta/recipes-support/lzop/lzop_1.03.bb b/meta/recipes-support/lzop/lzop_1.03.bb index abfc81cfb9..1fcd81df6c 100644 --- a/meta/recipes-support/lzop/lzop_1.03.bb +++ b/meta/recipes-support/lzop/lzop_1.03.bb @@ -12,7 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dfeaf3dc4beef4f5a7bdbc35b197f39e \ file://src/lzop.c;beginline=5;endline=21;md5=6797bd3ed0a1a49327b7ebf9366ebd86" SRC_URI = "http://www.lzop.org/download/${BP}.tar.gz \ - file://acinclude.m4" + file://acinclude.m4 \ + file://x32_abi_miniacc_h.patch " SRC_URI[md5sum] = "006c5e27fb78cdd14a628fdfa5aa1905" SRC_URI[sha256sum] = "c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9" diff --git a/meta/recipes-support/neon/neon-0.30.0/pkgconfig.patch b/meta/recipes-support/neon/neon/pkgconfig.patch index 1a2550c6fb..239dba8e25 100644 --- a/meta/recipes-support/neon/neon-0.30.0/pkgconfig.patch +++ b/meta/recipes-support/neon/neon/pkgconfig.patch @@ -4,15 +4,12 @@ Upstream-Status: Inappropriate [configuration] neon.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- neon-0.28.1.orig/neon.pc.in -+++ neon-0.28.1/neon.pc.in -@@ -4,8 +4,8 @@ libdir=@libdir@ - includedir=@includedir@ - - Name: neon +--- neon-0.30.1.orig/neon.pc.in ++++ neon-0.30.1/neon.pc.in +@@ -7,5 +7,5 @@ Name: neon Description: HTTP/WebDAV client library Version: @NEON_VERSION@ + Libs: -L${libdir} -lneon @NEON_PC_LIBS@ -Libs.private: @NEON_LIBS@ +Libs.private: -L${libdir} -lz -lgcrypt -lgpg-error -lexpat -lgnutls - Libs: -L${libdir} -lneon @NEON_PC_LIBS@ Cflags: -I${includedir}/neon @NEON_CFLAGS@ diff --git a/meta/recipes-support/neon/neon_0.30.0.bb b/meta/recipes-support/neon/neon_0.30.1.bb index 61bd7d9269..9245244eb8 100644 --- a/meta/recipes-support/neon/neon_0.30.0.bb +++ b/meta/recipes-support/neon/neon_0.30.1.bb @@ -11,8 +11,8 @@ BBCLASSEXTEND = "native" SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \ file://pkgconfig.patch" -SRC_URI[md5sum] = "fb60b3a124eeec441937a812c456fd94" -SRC_URI[sha256sum] = "2962cfcb5d30f3272e3d2fa0e473434419770a3801afe3d46e5d1650787990c2" +SRC_URI[md5sum] = "231adebe5c2f78fded3e3df6e958878e" +SRC_URI[sha256sum] = "00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd" BINCONFIG = "${bindir}/neon-config" diff --git a/meta/recipes-support/npth/npth/pkgconfig.patch b/meta/recipes-support/npth/npth/pkgconfig.patch new file mode 100644 index 0000000000..178ed54c22 --- /dev/null +++ b/meta/recipes-support/npth/npth/pkgconfig.patch @@ -0,0 +1,49 @@ +Added npth pkgconfig file + +Upstream-Status: Incompatible [oe-core specific] + +Signed-off-by: Saul Wold <sgw@linux.intel.com> + +Index: npth-1.1/src/npth.pc.in +=================================================================== +--- /dev/null ++++ npth-1.1/src/npth.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: npth ++Description: a new portable posix threading library ++Version: @VERSION@ ++Libs: -L${libdir} -lnpth -lpthread ++Cflags: -I${includedir} +Index: npth-1.1/src/Makefile.am +=================================================================== +--- npth-1.1.orig/src/Makefile.am ++++ npth-1.1/src/Makefile.am +@@ -27,8 +27,10 @@ + # License along with this program; if not, see <http://www.gnu.org/licenses/>. + + ## Process this file with automake to produce Makefile.in ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = npth.pc + +-EXTRA_DIST = libnpth.vers ++EXTRA_DIST = libnpth.vers npth.pc + # versioninfo.rc.in + nodist_include_HEADERS = npth.h + +Index: npth-1.1/configure.ac +=================================================================== +--- npth-1.1.orig/configure.ac ++++ npth-1.1/configure.ac +@@ -337,6 +337,7 @@ src/Makefile + w32/Makefile + tests/Makefile]) + AC_CONFIG_FILES(npth-config, chmod +x npth-config) ++AC_CONFIG_FILES([src/npth.pc]) + AC_OUTPUT + + echo " diff --git a/meta/recipes-support/npth/npth_0.91.bb b/meta/recipes-support/npth/npth_1.1.bb index 7105b94e3d..72a194e784 100644 --- a/meta/recipes-support/npth/npth_0.91.bb +++ b/meta/recipes-support/npth/npth_1.1.bb @@ -7,9 +7,11 @@ LIC_FILES_CHKSUM = "\ file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6\ " SRC_URI = "ftp://ftp.gnupg.org/gcrypt/npth/npth-${PV}.tar.bz2 \ + file://pkgconfig.patch \ " -SRC_URI[md5sum] = "87712f0cee656c390b49773923e26e7f" -SRC_URI[sha256sum] = "caef86ced4a331e162897818a5b924860c8d6003e52da5bdf76da00e8e0dfae1" + +SRC_URI[md5sum] = "aaffc8ef3e955ab50a1905809f268a23" +SRC_URI[sha256sum] = "896c561eb2ec8da35f11828fb04a3fbff12d41ff657c799056d7dc4a66e5df7f" BINCONFIG = "${bindir}/npth-config" diff --git a/meta/recipes-support/nspr/nspr_4.10.7.bb b/meta/recipes-support/nspr/nspr_4.10.8.bb index 69e9dfa6a3..944994e17f 100644 --- a/meta/recipes-support/nspr/nspr_4.10.7.bb +++ b/meta/recipes-support/nspr/nspr_4.10.8.bb @@ -13,16 +13,15 @@ SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-$ SRC_URI += "file://nspr.pc.in" -SRC_URI[md5sum] = "6e06919e4b56efed501e05d8b45ec10e" -SRC_URI[sha256sum] = "389af5cfa863ea9bc6de7b30c15f8a4f9bddd8002f8c6fdc8b33caef43893938" +SRC_URI[md5sum] = "8d7c5bd0a5b0a7d0e705be66479030a0" +SRC_URI[sha256sum] = "507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15" S = "${WORKDIR}/nspr-${PV}/nspr" RDEPENDS_${PN}-dev += "perl" TARGET_CC_ARCH += "${LDFLAGS}" -TESTS = "runtests.pl \ - runtests.sh \ +TESTS = " \ accept \ acceptread \ acceptreademu \ @@ -138,7 +137,9 @@ TESTS = "runtests.pl \ xnotify \ zerolen" -inherit autotools-brokensep +PR = "r1" + +inherit autotools do_compile_prepend() { oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX" LDFLAGS="" CC=gcc -C config export @@ -154,8 +155,11 @@ do_install_append() { sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nspr.pc sed -i s:OEINCDIR:${includedir}:g ${D}${libdir}/pkgconfig/nspr.pc sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nspr.pc - cd ${S}/pr/tests + mkdir -p ${D}${libdir}/nspr/tests + install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests + install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests + cd ${B}/pr/tests install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests # delete compile-et.pl and perr.properties from ${bindir} because these are diff --git a/meta/recipes-support/nss/files/nss-3.15.1-fix-CVE-2013-1739.patch b/meta/recipes-support/nss/files/nss-3.15.1-fix-CVE-2013-1739.patch deleted file mode 100644 index 1a159c3934..0000000000 --- a/meta/recipes-support/nss/files/nss-3.15.1-fix-CVE-2013-1739.patch +++ /dev/null @@ -1,81 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: yzhu1 <yanjun.zhu@windriver.com> - ---- a/nss/lib/ssl/ssl3con.c -+++ b/nss/lib/ssl/ssl3con.c -@@ -10509,7 +10509,7 @@ ssl_RemoveSSLv3CBCPadding(sslBuffer *pla - /* SSLv3 padding bytes are random and cannot be checked. */ - t = plaintext->len; - t -= paddingLength+overhead; -- /* If len >= padding_length+overhead then the MSB of t is zero. */ -+ /* If len >= paddingLength+overhead then the MSB of t is zero. */ - good = DUPLICATE_MSB_TO_ALL(~t); - /* SSLv3 requires that the padding is minimal. */ - t = blockSize - (paddingLength+1); -@@ -10742,7 +10742,7 @@ ssl3_HandleRecord(sslSocket *ss, SSL3Cip - } - } - -- good = (unsigned)-1; -+ good = ~0U; - minLength = crSpec->mac_size; - if (cipher_def->type == type_block) { - /* CBC records have a padding length byte at the end. */ -@@ -10756,14 +10756,7 @@ ssl3_HandleRecord(sslSocket *ss, SSL3Cip - /* We can perform this test in variable time because the record's total - * length and the ciphersuite are both public knowledge. */ - if (cText->buf->len < minLength) { -- SSL_DBG(("%d: SSL3[%d]: HandleRecord, record too small.", -- SSL_GETPID(), ss->fd)); -- /* must not hold spec lock when calling SSL3_SendAlert. */ -- ssl_ReleaseSpecReadLock(ss); -- SSL3_SendAlert(ss, alert_fatal, bad_record_mac); -- /* always log mac error, in case attacker can read server logs. */ -- PORT_SetError(SSL_ERROR_BAD_MAC_READ); -- return SECFailure; -+ goto decrypt_loser; - } - - if (cipher_def->type == type_block && -@@ -10831,11 +10824,18 @@ ssl3_HandleRecord(sslSocket *ss, SSL3Cip - return SECFailure; - } - -+ if (cipher_def->type == type_block && -+ ((cText->buf->len - ivLen) % cipher_def->block_size) != 0) { -+ goto decrypt_loser; -+ } -+ - /* decrypt from cText buf to plaintext. */ - rv = crSpec->decode( - crSpec->decodeContext, plaintext->buf, (int *)&plaintext->len, - plaintext->space, cText->buf->buf + ivLen, cText->buf->len - ivLen); -- good &= SECStatusToMask(rv); -+ if (rv != SECSuccess) { -+ goto decrypt_loser; -+ } - - PRINT_BUF(80, (ss, "cleartext:", plaintext->buf, plaintext->len)); - -@@ -10843,7 +10843,7 @@ ssl3_HandleRecord(sslSocket *ss, SSL3Cip - - /* If it's a block cipher, check and strip the padding. */ - if (cipher_def->type == type_block) { -- const unsigned int blockSize = cipher_def->iv_size; -+ const unsigned int blockSize = cipher_def->block_size; - const unsigned int macSize = crSpec->mac_size; - - if (crSpec->version <= SSL_LIBRARY_VERSION_3_0) { -@@ -10899,10 +10899,11 @@ ssl3_HandleRecord(sslSocket *ss, SSL3Cip - } - - if (good == 0) { -+decrypt_loser: - /* must not hold spec lock when calling SSL3_SendAlert. */ - ssl_ReleaseSpecReadLock(ss); - -- SSL_DBG(("%d: SSL3[%d]: mac check failed", SSL_GETPID(), ss->fd)); -+ SSL_DBG(("%d: SSL3[%d]: decryption failed", SSL_GETPID(), ss->fd)); - - if (!IS_DTLS(ss)) { - SSL3_SendAlert(ss, alert_fatal, bad_record_mac); diff --git a/meta/recipes-support/nss/files/nss-3.15.1-fix-CVE-2013-1741.patch b/meta/recipes-support/nss/files/nss-3.15.1-fix-CVE-2013-1741.patch deleted file mode 100644 index 21da0c03b5..0000000000 --- a/meta/recipes-support/nss/files/nss-3.15.1-fix-CVE-2013-1741.patch +++ /dev/null @@ -1,92 +0,0 @@ -Upstream-Status: backport -yanjun.zhu <yanjun.zhu@windriver.com> ---- a/nss/lib/util/secport.c -+++ b/nss/lib/util/secport.c -@@ -69,13 +69,22 @@ PORTCharConversionFunc ucs4Utf8ConvertFu - PORTCharConversionFunc ucs2Utf8ConvertFunc; - PORTCharConversionWSwapFunc ucs2AsciiConvertFunc; - -+/* NSPR memory allocation functions (PR_Malloc, PR_Calloc, and PR_Realloc) -+ * use the PRUint32 type for the size parameter. Before we pass a size_t or -+ * unsigned long size to these functions, we need to ensure it is <= half of -+ * the maximum PRUint32 value to avoid truncation and catch a negative size. -+ */ -+#define MAX_SIZE (PR_UINT32_MAX >> 1) -+ - void * - PORT_Alloc(size_t bytes) - { -- void *rv; -+ void *rv = NULL; - -- /* Always allocate a non-zero amount of bytes */ -- rv = (void *)PR_Malloc(bytes ? bytes : 1); -+ if (bytes <= MAX_SIZE) { -+ /* Always allocate a non-zero amount of bytes */ -+ rv = PR_Malloc(bytes ? bytes : 1); -+ } - if (!rv) { - ++port_allocFailures; - PORT_SetError(SEC_ERROR_NO_MEMORY); -@@ -86,9 +95,11 @@ PORT_Alloc(size_t bytes) - void * - PORT_Realloc(void *oldptr, size_t bytes) - { -- void *rv; -+ void *rv = NULL; - -- rv = (void *)PR_Realloc(oldptr, bytes); -+ if (bytes <= MAX_SIZE) { -+ rv = PR_Realloc(oldptr, bytes); -+ } - if (!rv) { - ++port_allocFailures; - PORT_SetError(SEC_ERROR_NO_MEMORY); -@@ -99,10 +110,12 @@ PORT_Realloc(void *oldptr, size_t bytes) - void * - PORT_ZAlloc(size_t bytes) - { -- void *rv; -+ void *rv = NULL; - -- /* Always allocate a non-zero amount of bytes */ -- rv = (void *)PR_Calloc(1, bytes ? bytes : 1); -+ if (bytes <= MAX_SIZE) { -+ /* Always allocate a non-zero amount of bytes */ -+ rv = PR_Calloc(1, bytes ? bytes : 1); -+ } - if (!rv) { - ++port_allocFailures; - PORT_SetError(SEC_ERROR_NO_MEMORY); -@@ -209,6 +222,10 @@ PORT_NewArena(unsigned long chunksize) - { - PORTArenaPool *pool; - -+ if (chunksize > MAX_SIZE) { -+ PORT_SetError(SEC_ERROR_NO_MEMORY); -+ return NULL; -+ } - pool = PORT_ZNew(PORTArenaPool); - if (!pool) { - return NULL; -@@ -224,8 +241,6 @@ PORT_NewArena(unsigned long chunksize) - return(&pool->arena); - } - --#define MAX_SIZE 0x7fffffffUL -- - void * - PORT_ArenaAlloc(PLArenaPool *arena, size_t size) - { -@@ -330,6 +345,11 @@ PORT_ArenaGrow(PLArenaPool *arena, void - PORTArenaPool *pool = (PORTArenaPool *)arena; - PORT_Assert(newsize >= oldsize); - -+ if (newsize > MAX_SIZE) { -+ PORT_SetError(SEC_ERROR_NO_MEMORY); -+ return NULL; -+ } -+ - if (ARENAPOOL_MAGIC == pool->magic ) { - PZ_Lock(pool->lock); - /* Do we do a THREADMARK check here? */ diff --git a/meta/recipes-support/nss/files/nss-3.15.1-fix-CVE-2013-5605.patch b/meta/recipes-support/nss/files/nss-3.15.1-fix-CVE-2013-5605.patch deleted file mode 100644 index 7203d02c78..0000000000 --- a/meta/recipes-support/nss/files/nss-3.15.1-fix-CVE-2013-5605.patch +++ /dev/null @@ -1,18 +0,0 @@ -signed-off-by: Ryan Sleevi <ryan.sleevi@gmail.com> -Upstream-Status: Backport -reference:https://hg.mozilla.org/projects/nss/rev/e79a09364b5e - ---- a/nss/lib/ssl/ssl3con.c -+++ b/nss/lib/ssl/ssl3con.c -@@ -781,6 +781,11 @@ static SECStatus - Null_Cipher(void *ctx, unsigned char *output, int *outputLen, int maxOutputLen, - const unsigned char *input, int inputLen) - { -+ if (inputLen > maxOutputLen) { -+ *outputLen = 0; /* Match PK11_CipherOp in setting outputLen */ -+ PORT_SetError(SEC_ERROR_OUTPUT_LEN); -+ return SECFailure; -+ } - *outputLen = inputLen; - if (input != output) - PORT_Memcpy(output, input, inputLen); diff --git a/meta/recipes-support/nss/files/nss-CVE-2013-1740.patch b/meta/recipes-support/nss/files/nss-CVE-2013-1740.patch deleted file mode 100644 index db3d6f9103..0000000000 --- a/meta/recipes-support/nss/files/nss-CVE-2013-1740.patch +++ /dev/null @@ -1,916 +0,0 @@ -nss: CVE-2013-1740 - -Upstream-Status: Backport - -the patch comes from: -http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-1740 -https://bugzilla.mozilla.org/show_bug.cgi?id=919877 -https://bugzilla.mozilla.org/show_bug.cgi?id=713933 - -changeset: 10946:f28426e944ae -user: Wan-Teh Chang <wtc@google.com> -date: Tue Nov 26 16:44:39 2013 -0800 -summary: Bug 713933: Handle the return value of both ssl3_HandleRecord calls - -changeset: 10945:774c7dec7565 -user: Wan-Teh Chang <wtc@google.com> -date: Mon Nov 25 19:16:23 2013 -0800 -summary: Bug 713933: Declare the |falseStart| local variable in the smallest - -changeset: 10848:141fae8fb2e8 -user: Wan-Teh Chang <wtc@google.com> -date: Mon Sep 23 11:25:41 2013 -0700 -summary: Bug 681839: Allow SSL_HandshakeNegotiatedExtension to be called before the handshake is finished, r=brian@briansmith.org - -changeset: 10898:1b9c43d28713 -user: Brian Smith <brian@briansmith.org> -date: Thu Oct 31 15:40:42 2013 -0700 -summary: Bug 713933: Make SSL False Start work with asynchronous certificate validation, r=wtc - -Signed-off-by: Li Wang <li.wang@windriver.com> ---- - nss/lib/ssl/ssl.def | 7 ++ - nss/lib/ssl/ssl.h | 54 +++++++++++--- - nss/lib/ssl/ssl3con.c | 188 +++++++++++++++++++++++++++++++++++------------ - nss/lib/ssl/ssl3gthr.c | 63 ++++++++++++---- - nss/lib/ssl/sslauth.c | 10 +-- - nss/lib/ssl/sslimpl.h | 22 +++++- - nss/lib/ssl/sslinfo.c | 10 +-- - nss/lib/ssl/sslreveal.c | 9 +-- - nss/lib/ssl/sslsecur.c | 139 ++++++++++++++++++++++++++++------- - nss/lib/ssl/sslsock.c | 12 ++- - 10 files changed, 386 insertions(+), 128 deletions(-) - -diff --git a/nss/lib/ssl/ssl.def b/nss/lib/ssl/ssl.def -index fbf7fc5..e937bd4 100644 ---- a/nss/lib/ssl/ssl.def -+++ b/nss/lib/ssl/ssl.def -@@ -163,3 +163,10 @@ SSL_SetStapledOCSPResponses; - ;+ local: - ;+*; - ;+}; -+;+NSS_3.15.3 { # NSS 3.15.3 release -+;+ global: -+SSL_RecommendedCanFalseStart; -+SSL_SetCanFalseStartCallback; -+;+ local: -+;+*; -+;+}; -diff --git a/nss/lib/ssl/ssl.h b/nss/lib/ssl/ssl.h -index 6db0e34..ddeaaef 100644 ---- a/nss/lib/ssl/ssl.h -+++ b/nss/lib/ssl/ssl.h -@@ -121,14 +121,17 @@ SSL_IMPORT PRFileDesc *DTLS_ImportFD(PRFileDesc *model, PRFileDesc *fd); - #define SSL_ENABLE_FALSE_START 22 /* Enable SSL false start (off by */ - /* default, applies only to */ - /* clients). False start is a */ --/* mode where an SSL client will start sending application data before */ --/* verifying the server's Finished message. This means that we could end up */ --/* sending data to an imposter. However, the data will be encrypted and */ --/* only the true server can derive the session key. Thus, so long as the */ --/* cipher isn't broken this is safe. Because of this, False Start will only */ --/* occur on RSA or DH ciphersuites where the cipher's key length is >= 80 */ --/* bits. The advantage of False Start is that it saves a round trip for */ --/* client-speaks-first protocols when performing a full handshake. */ -+/* mode where an SSL client will start sending application data before -+ * verifying the server's Finished message. This means that we could end up -+ * sending data to an imposter. However, the data will be encrypted and -+ * only the true server can derive the session key. Thus, so long as the -+ * cipher isn't broken this is safe. The advantage of false start is that -+ * it saves a round trip for client-speaks-first protocols when performing a -+ * full handshake. -+ * -+ * In addition to enabling this option, the application must register a -+ * callback using the SSL_SetCanFalseStartCallback function. -+ */ - - /* For SSL 3.0 and TLS 1.0, by default we prevent chosen plaintext attacks - * on SSL CBC mode cipher suites (see RFC 4346 Section F.3) by splitting -@@ -653,14 +656,45 @@ SSL_IMPORT SECStatus SSL_SetMaxServerCacheLocks(PRUint32 maxLocks); - SSL_IMPORT SECStatus SSL_InheritMPServerSIDCache(const char * envString); - - /* --** Set the callback on a particular socket that gets called when we finish --** performing a handshake. -+** Set the callback that gets called when a TLS handshake is complete. The -+** handshake callback is called after verifying the peer's Finished message and -+** before processing incoming application data. -+** -+** For the initial handshake: If the handshake false started (see -+** SSL_ENABLE_FALSE_START), then application data may already have been sent -+** before the handshake callback is called. If we did not false start then the -+** callback will get called before any application data is sent. - */ - typedef void (PR_CALLBACK *SSLHandshakeCallback)(PRFileDesc *fd, - void *client_data); - SSL_IMPORT SECStatus SSL_HandshakeCallback(PRFileDesc *fd, - SSLHandshakeCallback cb, void *client_data); - -+/* Applications that wish to enable TLS false start must set this callback -+** function. NSS will invoke the functon to determine if a particular -+** connection should use false start or not. SECSuccess indicates that the -+** callback completed successfully, and if so *canFalseStart indicates if false -+** start can be used. If the callback does not return SECSuccess then the -+** handshake will be canceled. NSS's recommended criteria can be evaluated by -+** calling SSL_RecommendedCanFalseStart. -+** -+** If no false start callback is registered then false start will never be -+** done, even if the SSL_ENABLE_FALSE_START option is enabled. -+**/ -+typedef SECStatus (PR_CALLBACK *SSLCanFalseStartCallback)( -+ PRFileDesc *fd, void *arg, PRBool *canFalseStart); -+ -+SSL_IMPORT SECStatus SSL_SetCanFalseStartCallback( -+ PRFileDesc *fd, SSLCanFalseStartCallback callback, void *arg); -+ -+/* This function sets *canFalseStart according to the recommended criteria for -+** false start. These criteria may change from release to release and may depend -+** on which handshake features have been negotiated and/or properties of the -+** certifciates/keys used on the connection. -+*/ -+SSL_IMPORT SECStatus SSL_RecommendedCanFalseStart(PRFileDesc *fd, -+ PRBool *canFalseStart); -+ - /* - ** For the server, request a new handshake. For the client, begin a new - ** handshake. If flushCache is non-zero, the SSL3 cache entry will be -diff --git a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c -index 61d24d9..f39ba09 100644 ---- a/nss/lib/ssl/ssl3con.c -+++ b/nss/lib/ssl/ssl3con.c -@@ -2535,7 +2535,7 @@ ssl3_SendRecord( sslSocket * ss, - SSL_TRC(3, ("%d: SSL3[%d] SendRecord type: %s nIn=%d", - SSL_GETPID(), ss->fd, ssl3_DecodeContentType(type), - nIn)); -- PRINT_BUF(3, (ss, "Send record (plain text)", pIn, nIn)); -+ PRINT_BUF(50, (ss, "Send record (plain text)", pIn, nIn)); - - PORT_Assert( ss->opt.noLocks || ssl_HaveXmitBufLock(ss) ); - -@@ -6674,36 +6674,73 @@ done: - return rv; - } - -+static SECStatus -+ssl3_CheckFalseStart(sslSocket *ss) -+{ -+ PORT_Assert( ss->opt.noLocks || ssl_HaveSSL3HandshakeLock(ss) ); -+ PORT_Assert( !ss->ssl3.hs.authCertificatePending ); -+ PORT_Assert( !ss->ssl3.hs.canFalseStart ); -+ -+ if (!ss->canFalseStartCallback) { -+ SSL_TRC(3, ("%d: SSL[%d]: no false start callback so no false start", -+ SSL_GETPID(), ss->fd)); -+ } else { -+ PRBool maybeFalseStart; -+ SECStatus rv; -+ -+ /* An attacker can control the selected ciphersuite so we only wish to -+ * do False Start in the case that the selected ciphersuite is -+ * sufficiently strong that the attack can gain no advantage. -+ * Therefore we always require an 80-bit cipher. */ -+ ssl_GetSpecReadLock(ss); -+ maybeFalseStart = ss->ssl3.cwSpec->cipher_def->secret_key_size >= 10; -+ ssl_ReleaseSpecReadLock(ss); -+ -+ if (!maybeFalseStart) { -+ SSL_TRC(3, ("%d: SSL[%d]: no false start due to weak cipher", -+ SSL_GETPID(), ss->fd)); -+ } else { -+ rv = (ss->canFalseStartCallback)(ss->fd, -+ ss->canFalseStartCallbackData, -+ &ss->ssl3.hs.canFalseStart); -+ if (rv == SECSuccess) { -+ SSL_TRC(3, ("%d: SSL[%d]: false start callback returned %s", -+ SSL_GETPID(), ss->fd, -+ ss->ssl3.hs.canFalseStart ? "TRUE" : "FALSE")); -+ } else { -+ SSL_TRC(3, ("%d: SSL[%d]: false start callback failed (%s)", -+ SSL_GETPID(), ss->fd, -+ PR_ErrorToName(PR_GetError()))); -+ } -+ return rv; -+ } -+ } -+ -+ ss->ssl3.hs.canFalseStart = PR_FALSE; -+ return SECSuccess; -+} -+ - PRBool --ssl3_CanFalseStart(sslSocket *ss) { -- PRBool rv; -+ssl3_WaitingForStartOfServerSecondRound(sslSocket *ss) -+{ -+ PRBool result = PR_FALSE; - - PORT_Assert( ss->opt.noLocks || ssl_HaveSSL3HandshakeLock(ss) ); - -- /* XXX: does not take into account whether we are waiting for -- * SSL_AuthCertificateComplete or SSL_RestartHandshakeAfterCertReq. If/when -- * that is done, this function could return different results each time it -- * would be called. -- */ -+ switch (ss->ssl3.hs.ws) { -+ case wait_new_session_ticket: -+ result = PR_TRUE; -+ break; -+ case wait_change_cipher: -+ result = !ssl3_ExtensionNegotiated(ss, ssl_session_ticket_xtn); -+ break; -+ case wait_finished: -+ break; -+ default: -+ PR_NOT_REACHED("ssl3_WaitingForStartOfServerSecondRound"); -+ } - -- ssl_GetSpecReadLock(ss); -- rv = ss->opt.enableFalseStart && -- !ss->sec.isServer && -- !ss->ssl3.hs.isResuming && -- ss->ssl3.cwSpec && -- -- /* An attacker can control the selected ciphersuite so we only wish to -- * do False Start in the case that the selected ciphersuite is -- * sufficiently strong that the attack can gain no advantage. -- * Therefore we require an 80-bit cipher and a forward-secret key -- * exchange. */ -- ss->ssl3.cwSpec->cipher_def->secret_key_size >= 10 && -- (ss->ssl3.hs.kea_def->kea == kea_dhe_dss || -- ss->ssl3.hs.kea_def->kea == kea_dhe_rsa || -- ss->ssl3.hs.kea_def->kea == kea_ecdhe_ecdsa || -- ss->ssl3.hs.kea_def->kea == kea_ecdhe_rsa); -- ssl_ReleaseSpecReadLock(ss); -- return rv; -+ return result; - } - - static SECStatus ssl3_SendClientSecondRound(sslSocket *ss); -@@ -6785,6 +6822,9 @@ ssl3_SendClientSecondRound(sslSocket *ss) - } - if (ss->ssl3.hs.authCertificatePending && - (sendClientCert || ss->ssl3.sendEmptyCert || ss->firstHsDone)) { -+ SSL_TRC(3, ("%d: SSL3[%p]: deferring ssl3_SendClientSecondRound because" -+ " certificate authentication is still pending.", -+ SSL_GETPID(), ss->fd)); - ss->ssl3.hs.restartTarget = ssl3_SendClientSecondRound; - return SECWouldBlock; - } -@@ -6822,14 +6862,50 @@ ssl3_SendClientSecondRound(sslSocket *ss) - goto loser; /* err code was set. */ - } - -- /* XXX: If the server's certificate hasn't been authenticated by this -- * point, then we may be leaking this NPN message to an attacker. -+ /* This must be done after we've set ss->ssl3.cwSpec in -+ * ssl3_SendChangeCipherSpecs because SSL_GetChannelInfo uses information -+ * from cwSpec. This must be done before we call ssl3_CheckFalseStart -+ * because the false start callback (if any) may need the information from -+ * the functions that depend on this being set. - */ -+ ss->enoughFirstHsDone = PR_TRUE; -+ - if (!ss->firstHsDone) { -+ /* XXX: If the server's certificate hasn't been authenticated by this -+ * point, then we may be leaking this NPN message to an attacker. -+ */ - rv = ssl3_SendNextProto(ss); - if (rv != SECSuccess) { - goto loser; /* err code was set. */ - } -+ -+ if (ss->opt.enableFalseStart) { -+ if (!ss->ssl3.hs.authCertificatePending) { -+ /* When we fix bug 589047, we will need to know whether we are -+ * false starting before we try to flush the client second -+ * round to the network. With that in mind, we purposefully -+ * call ssl3_CheckFalseStart before calling ssl3_SendFinished, -+ * which includes a call to ssl3_FlushHandshake, so that -+ * no application develops a reliance on such flushing being -+ * done before its false start callback is called. -+ */ -+ ssl_ReleaseXmitBufLock(ss); -+ rv = ssl3_CheckFalseStart(ss); -+ ssl_GetXmitBufLock(ss); -+ if (rv != SECSuccess) { -+ goto loser; -+ } -+ } else { -+ /* The certificate authentication and the server's Finished -+ * message are racing each other. If the certificate -+ * authentication wins, then we will try to false start in -+ * ssl3_AuthCertificateComplete. -+ */ -+ SSL_TRC(3, ("%d: SSL3[%p]: deferring false start check because" -+ " certificate authentication is still pending.", -+ SSL_GETPID(), ss->fd)); -+ } -+ } - } - - rv = ssl3_SendFinished(ss, 0); -@@ -6844,10 +6920,7 @@ ssl3_SendClientSecondRound(sslSocket *ss) - else - ss->ssl3.hs.ws = wait_change_cipher; - -- /* Do the handshake callback for sslv3 here, if we can false start. */ -- if (ss->handshakeCallback != NULL && ssl3_CanFalseStart(ss)) { -- (ss->handshakeCallback)(ss->fd, ss->handshakeCallbackData); -- } -+ PORT_Assert(ssl3_WaitingForStartOfServerSecondRound(ss)); - - return SECSuccess; - -@@ -9421,13 +9494,6 @@ ssl3_AuthCertificate(sslSocket *ss) - - ss->ssl3.hs.authCertificatePending = PR_TRUE; - rv = SECSuccess; -- -- /* XXX: Async cert validation and False Start don't work together -- * safely yet; if we leave False Start enabled, we may end up false -- * starting (sending application data) before we -- * SSL_AuthCertificateComplete has been called. -- */ -- ss->opt.enableFalseStart = PR_FALSE; - } - - if (rv != SECSuccess) { -@@ -9551,6 +9617,12 @@ ssl3_AuthCertificateComplete(sslSocket *ss, PRErrorCode error) - } else if (ss->ssl3.hs.restartTarget != NULL) { - sslRestartTarget target = ss->ssl3.hs.restartTarget; - ss->ssl3.hs.restartTarget = NULL; -+ -+ if (target == ssl3_FinishHandshake) { -+ SSL_TRC(3,("%d: SSL3[%p]: certificate authentication lost the race" -+ " with peer's finished message", SSL_GETPID(), ss->fd)); -+ } -+ - rv = target(ss); - /* Even if we blocked here, we have accomplished enough to claim - * success. Any remaining work will be taken care of by subsequent -@@ -9560,7 +9632,29 @@ ssl3_AuthCertificateComplete(sslSocket *ss, PRErrorCode error) - rv = SECSuccess; - } - } else { -- rv = SECSuccess; -+ SSL_TRC(3, ("%d: SSL3[%p]: certificate authentication won the race with" -+ " peer's finished message", SSL_GETPID(), ss->fd)); -+ -+ PORT_Assert(!ss->firstHsDone); -+ PORT_Assert(!ss->sec.isServer); -+ PORT_Assert(!ss->ssl3.hs.isResuming); -+ PORT_Assert(ss->ssl3.hs.ws == wait_new_session_ticket || -+ ss->ssl3.hs.ws == wait_change_cipher || -+ ss->ssl3.hs.ws == wait_finished); -+ -+ /* ssl3_SendClientSecondRound deferred the false start check because -+ * certificate authentication was pending, so we do it now if we still -+ * haven't received any of the server's second round yet. -+ */ -+ if (ss->opt.enableFalseStart && -+ !ss->firstHsDone && -+ !ss->sec.isServer && -+ !ss->ssl3.hs.isResuming && -+ ssl3_WaitingForStartOfServerSecondRound(ss)) { -+ rv = ssl3_CheckFalseStart(ss); -+ } else { -+ rv = SECSuccess; -+ } - } - - done: -@@ -10023,9 +10117,6 @@ xmit_loser: - return rv; - } - -- ss->gs.writeOffset = 0; -- ss->gs.readOffset = 0; -- - if (ss->ssl3.hs.kea_def->kea == kea_ecdhe_rsa) { - effectiveExchKeyType = kt_rsa; - } else { -@@ -10090,6 +10181,9 @@ xmit_loser: - return rv; - } - -+/* The return type is SECStatus instead of void because this function needs -+ * to have type sslRestartTarget. -+ */ - SECStatus - ssl3_FinishHandshake(sslSocket * ss) - { -@@ -10099,19 +10193,16 @@ ssl3_FinishHandshake(sslSocket * ss) - - /* The first handshake is now completed. */ - ss->handshake = NULL; -- ss->firstHsDone = PR_TRUE; - - if (ss->ssl3.hs.cacheSID) { - (*ss->sec.cache)(ss->sec.ci.sid); - ss->ssl3.hs.cacheSID = PR_FALSE; - } - -+ ss->ssl3.hs.canFalseStart = PR_FALSE; /* False Start phase is complete */ - ss->ssl3.hs.ws = idle_handshake; - -- /* Do the handshake callback for sslv3 here, if we cannot false start. */ -- if (ss->handshakeCallback != NULL && !ssl3_CanFalseStart(ss)) { -- (ss->handshakeCallback)(ss->fd, ss->handshakeCallbackData); -- } -+ ssl_FinishHandshake(ss); - - return SECSuccess; - } -@@ -11045,7 +11136,6 @@ process_it: - - ssl_ReleaseSSL3HandshakeLock(ss); - return rv; -- - } - - /* -diff --git a/nss/lib/ssl/ssl3gthr.c b/nss/lib/ssl/ssl3gthr.c -index 6d62515..03e369d 100644 ---- a/nss/lib/ssl/ssl3gthr.c -+++ b/nss/lib/ssl/ssl3gthr.c -@@ -275,11 +275,17 @@ ssl3_GatherCompleteHandshake(sslSocket *ss, int flags) - { - SSL3Ciphertext cText; - int rv; -- PRBool canFalseStart = PR_FALSE; -+ PRBool keepGoing = PR_TRUE; - - SSL_TRC(30, ("ssl3_GatherCompleteHandshake")); - -+ /* ssl3_HandleRecord may end up eventually calling ssl_FinishHandshake, -+ * which requires the 1stHandshakeLock, which must be acquired before the -+ * RecvBufLock. -+ */ -+ PORT_Assert( ss->opt.noLocks || ssl_Have1stHandshakeLock(ss) ); - PORT_Assert( ss->opt.noLocks || ssl_HaveRecvBufLock(ss) ); -+ - do { - PRBool handleRecordNow = PR_FALSE; - -@@ -368,20 +374,48 @@ ssl3_GatherCompleteHandshake(sslSocket *ss, int flags) - if (rv < 0) { - return ss->recvdCloseNotify ? 0 : rv; - } -+ if (rv == (int) SECSuccess && ss->gs.buf.len > 0) { -+ /* We have application data to return to the application. This -+ * prioritizes returning application data to the application over -+ * completing any renegotiation handshake we may be doing. -+ */ -+ PORT_Assert(ss->firstHsDone); -+ PORT_Assert(cText.type == content_application_data); -+ break; -+ } - -- /* If we kicked off a false start in ssl3_HandleServerHelloDone, break -- * out of this loop early without finishing the handshake. -- */ -- if (ss->opt.enableFalseStart) { -- ssl_GetSSL3HandshakeLock(ss); -- canFalseStart = (ss->ssl3.hs.ws == wait_change_cipher || -- ss->ssl3.hs.ws == wait_new_session_ticket) && -- ssl3_CanFalseStart(ss); -- ssl_ReleaseSSL3HandshakeLock(ss); -+ PORT_Assert(keepGoing); -+ ssl_GetSSL3HandshakeLock(ss); -+ if (ss->ssl3.hs.ws == idle_handshake) { -+ /* We are done with the current handshake so stop trying to -+ * handshake. Note that it would be safe to test ss->firstHsDone -+ * instead of ss->ssl3.hs.ws. By testing ss->ssl3.hs.ws instead, -+ * we prioritize completing a renegotiation handshake over sending -+ * application data. -+ */ -+ PORT_Assert(ss->firstHsDone); -+ PORT_Assert(!ss->ssl3.hs.canFalseStart); -+ keepGoing = PR_FALSE; -+ } else if (ss->ssl3.hs.canFalseStart) { -+ /* Prioritize sending application data over trying to complete -+ * the handshake if we're false starting. -+ * -+ * If we were to do this check at the beginning of the loop instead -+ * of here, then this function would become be a no-op after -+ * receiving the ServerHelloDone in the false start case, and we -+ * would never complete the handshake. -+ */ -+ PORT_Assert(!ss->firstHsDone); -+ -+ if (ssl3_WaitingForStartOfServerSecondRound(ss)) { -+ keepGoing = PR_FALSE; -+ } else { -+ ss->ssl3.hs.canFalseStart = PR_FALSE; -+ } - } -- } while (ss->ssl3.hs.ws != idle_handshake && -- !canFalseStart && -- ss->gs.buf.len == 0); -+ ssl_ReleaseSSL3HandshakeLock(ss); -+ } while (keepGoing); -+ - - ss->gs.readOffset = 0; - ss->gs.writeOffset = ss->gs.buf.len; -@@ -404,7 +438,10 @@ ssl3_GatherAppDataRecord(sslSocket *ss, int flags) - { - int rv; - -+ /* ssl3_GatherCompleteHandshake requires both of these locks. */ -+ PORT_Assert( ss->opt.noLocks || ssl_Have1stHandshakeLock(ss) ); - PORT_Assert( ss->opt.noLocks || ssl_HaveRecvBufLock(ss) ); -+ - do { - rv = ssl3_GatherCompleteHandshake(ss, flags); - } while (rv > 0 && ss->gs.buf.len == 0); -diff --git a/nss/lib/ssl/sslauth.c b/nss/lib/ssl/sslauth.c -index d2f57bf..cb956d4 100644 ---- a/nss/lib/ssl/sslauth.c -+++ b/nss/lib/ssl/sslauth.c -@@ -60,7 +60,6 @@ SSL_SecurityStatus(PRFileDesc *fd, int *op, char **cp, int *kp0, int *kp1, - sslSocket *ss; - const char *cipherName; - PRBool isDes = PR_FALSE; -- PRBool enoughFirstHsDone = PR_FALSE; - - ss = ssl_FindSocket(fd); - if (!ss) { -@@ -78,14 +77,7 @@ SSL_SecurityStatus(PRFileDesc *fd, int *op, char **cp, int *kp0, int *kp1, - *op = SSL_SECURITY_STATUS_OFF; - } - -- if (ss->firstHsDone) { -- enoughFirstHsDone = PR_TRUE; -- } else if (ss->version >= SSL_LIBRARY_VERSION_3_0 && -- ssl3_CanFalseStart(ss)) { -- enoughFirstHsDone = PR_TRUE; -- } -- -- if (ss->opt.useSecurity && enoughFirstHsDone) { -+ if (ss->opt.useSecurity && ss->enoughFirstHsDone) { - if (ss->version < SSL_LIBRARY_VERSION_3_0) { - cipherName = ssl_cipherName[ss->sec.cipherType]; - } else { -diff --git a/nss/lib/ssl/sslimpl.h b/nss/lib/ssl/sslimpl.h -index 90e9567..bf0d67f 100644 ---- a/nss/lib/ssl/sslimpl.h -+++ b/nss/lib/ssl/sslimpl.h -@@ -842,6 +842,8 @@ const ssl3CipherSuiteDef *suite_def; - /* Shared state between ssl3_HandleFinished and ssl3_FinishHandshake */ - PRBool cacheSID; - -+ PRBool canFalseStart; /* Can/did we False Start */ -+ - /* clientSigAndHash contains the contents of the signature_algorithms - * extension (if any) from the client. This is only valid for TLS 1.2 - * or later. */ -@@ -1116,6 +1118,10 @@ struct sslSocketStr { - unsigned long clientAuthRequested; - unsigned long delayDisabled; /* Nagle delay disabled */ - unsigned long firstHsDone; /* first handshake is complete. */ -+ unsigned long enoughFirstHsDone; /* enough of the first handshake is -+ * done for callbacks to be able to -+ * retrieve channel security -+ * parameters from the SSL socket. */ - unsigned long handshakeBegun; - unsigned long lastWriteBlocked; - unsigned long recvdCloseNotify; /* received SSL EOF. */ -@@ -1156,6 +1162,8 @@ const unsigned char * preferredCipher; - void *badCertArg; - SSLHandshakeCallback handshakeCallback; - void *handshakeCallbackData; -+ SSLCanFalseStartCallback canFalseStartCallback; -+ void *canFalseStartCallbackData; - void *pkcs11PinArg; - SSLNextProtoCallback nextProtoCallback; - void *nextProtoArg; -@@ -1358,7 +1366,19 @@ extern void ssl3_SetAlwaysBlock(sslSocket *ss); - - extern SECStatus ssl_EnableNagleDelay(sslSocket *ss, PRBool enabled); - --extern PRBool ssl3_CanFalseStart(sslSocket *ss); -+extern void ssl_FinishHandshake(sslSocket *ss); -+ -+/* Returns PR_TRUE if we are still waiting for the server to respond to our -+ * client second round. Once we've received any part of the server's second -+ * round then we don't bother trying to false start since it is almost always -+ * the case that the NewSessionTicket, ChangeCipherSoec, and Finished messages -+ * were sent in the same packet and we want to process them all at the same -+ * time. If we were to try to false start in the middle of the server's second -+ * round, then we would increase the number of I/O operations -+ * (SSL_ForceHandshake/PR_Recv/PR_Send/etc.) needed to finish the handshake. -+ */ -+extern PRBool ssl3_WaitingForStartOfServerSecondRound(sslSocket *ss); -+ - extern SECStatus - ssl3_CompressMACEncryptRecord(ssl3CipherSpec * cwSpec, - PRBool isServer, -diff --git a/nss/lib/ssl/sslinfo.c b/nss/lib/ssl/sslinfo.c -index 9f2597e..d0c23b7 100644 ---- a/nss/lib/ssl/sslinfo.c -+++ b/nss/lib/ssl/sslinfo.c -@@ -26,7 +26,6 @@ SSL_GetChannelInfo(PRFileDesc *fd, SSLChannelInfo *info, PRUintn len) - sslSocket * ss; - SSLChannelInfo inf; - sslSessionID * sid; -- PRBool enoughFirstHsDone = PR_FALSE; - - if (!info || len < sizeof inf.length) { - PORT_SetError(SEC_ERROR_INVALID_ARGS); -@@ -43,14 +42,7 @@ SSL_GetChannelInfo(PRFileDesc *fd, SSLChannelInfo *info, PRUintn len) - memset(&inf, 0, sizeof inf); - inf.length = PR_MIN(sizeof inf, len); - -- if (ss->firstHsDone) { -- enoughFirstHsDone = PR_TRUE; -- } else if (ss->version >= SSL_LIBRARY_VERSION_3_0 && -- ssl3_CanFalseStart(ss)) { -- enoughFirstHsDone = PR_TRUE; -- } -- -- if (ss->opt.useSecurity && enoughFirstHsDone) { -+ if (ss->opt.useSecurity && ss->enoughFirstHsDone) { - sid = ss->sec.ci.sid; - inf.protocolVersion = ss->version; - inf.authKeyBits = ss->sec.authKeyBits; -diff --git a/nss/lib/ssl/sslreveal.c b/nss/lib/ssl/sslreveal.c -index dc14794..d972998 100644 ---- a/nss/lib/ssl/sslreveal.c -+++ b/nss/lib/ssl/sslreveal.c -@@ -77,7 +77,6 @@ SSL_HandshakeNegotiatedExtension(PRFileDesc * socket, - { - /* some decisions derived from SSL_GetChannelInfo */ - sslSocket * sslsocket = NULL; -- PRBool enoughFirstHsDone = PR_FALSE; - - if (!pYes) { - PORT_SetError(SEC_ERROR_INVALID_ARGS); -@@ -93,14 +92,8 @@ SSL_HandshakeNegotiatedExtension(PRFileDesc * socket, - - *pYes = PR_FALSE; - -- if (sslsocket->firstHsDone) { -- enoughFirstHsDone = PR_TRUE; -- } else if (sslsocket->ssl3.initialized && ssl3_CanFalseStart(sslsocket)) { -- enoughFirstHsDone = PR_TRUE; -- } -- - /* according to public API SSL_GetChannelInfo, this doesn't need a lock */ -- if (sslsocket->opt.useSecurity && enoughFirstHsDone) { -+ if (sslsocket->opt.useSecurity) { - if (sslsocket->ssl3.initialized) { /* SSL3 and TLS */ - /* now we know this socket went through ssl3_InitState() and - * ss->xtnData got initialized, which is the only member accessed by -diff --git a/nss/lib/ssl/sslsecur.c b/nss/lib/ssl/sslsecur.c -index 49bb42b..d0df442 100644 ---- a/nss/lib/ssl/sslsecur.c -+++ b/nss/lib/ssl/sslsecur.c -@@ -97,23 +97,13 @@ ssl_Do1stHandshake(sslSocket *ss) - ss->securityHandshake = 0; - } - if (ss->handshake == 0) { -- ssl_GetRecvBufLock(ss); -- ss->gs.recordLen = 0; -- ssl_ReleaseRecvBufLock(ss); -- -- SSL_TRC(3, ("%d: SSL[%d]: handshake is completed", -- SSL_GETPID(), ss->fd)); -- /* call handshake callback for ssl v2 */ -- /* for v3 this is done in ssl3_HandleFinished() */ -- if ((ss->handshakeCallback != NULL) && /* has callback */ -- (!ss->firstHsDone) && /* only first time */ -- (ss->version < SSL_LIBRARY_VERSION_3_0)) { /* not ssl3 */ -- ss->firstHsDone = PR_TRUE; -- (ss->handshakeCallback)(ss->fd, ss->handshakeCallbackData); -+ /* for v3 this is done in ssl3_FinishHandshake */ -+ if (!ss->firstHsDone && ss->version < SSL_LIBRARY_VERSION_3_0) { -+ ssl_GetRecvBufLock(ss); -+ ss->gs.recordLen = 0; -+ ssl_FinishHandshake(ss); -+ ssl_ReleaseRecvBufLock(ss); - } -- ss->firstHsDone = PR_TRUE; -- ss->gs.writeOffset = 0; -- ss->gs.readOffset = 0; - break; - } - rv = (*ss->handshake)(ss); -@@ -134,6 +124,24 @@ ssl_Do1stHandshake(sslSocket *ss) - return rv; - } - -+void -+ssl_FinishHandshake(sslSocket *ss) -+{ -+ PORT_Assert( ss->opt.noLocks || ssl_Have1stHandshakeLock(ss) ); -+ PORT_Assert( ss->opt.noLocks || ssl_HaveRecvBufLock(ss) ); -+ -+ SSL_TRC(3, ("%d: SSL[%d]: handshake is completed", SSL_GETPID(), ss->fd)); -+ -+ ss->firstHsDone = PR_TRUE; -+ ss->enoughFirstHsDone = PR_TRUE; -+ ss->gs.writeOffset = 0; -+ ss->gs.readOffset = 0; -+ -+ if (ss->handshakeCallback) { -+ (ss->handshakeCallback)(ss->fd, ss->handshakeCallbackData); -+ } -+} -+ - /* - * Handshake function that blocks. Used to force a - * retry on a connection on the next read/write. -@@ -206,6 +214,7 @@ SSL_ResetHandshake(PRFileDesc *s, PRBool asServer) - ssl_Get1stHandshakeLock(ss); - - ss->firstHsDone = PR_FALSE; -+ ss->enoughFirstHsDone = PR_FALSE; - if ( asServer ) { - ss->handshake = ssl2_BeginServerHandshake; - ss->handshaking = sslHandshakingAsServer; -@@ -221,6 +230,8 @@ SSL_ResetHandshake(PRFileDesc *s, PRBool asServer) - ssl_ReleaseRecvBufLock(ss); - - ssl_GetSSL3HandshakeLock(ss); -+ ss->ssl3.hs.canFalseStart = PR_FALSE; -+ ss->ssl3.hs.restartTarget = NULL; - - /* - ** Blow away old security state and get a fresh setup. -@@ -331,6 +342,71 @@ SSL_HandshakeCallback(PRFileDesc *fd, SSLHandshakeCallback cb, - return SECSuccess; - } - -+/* Register an application callback to be called when false start may happen. -+** Acquires and releases HandshakeLock. -+*/ -+SECStatus -+SSL_SetCanFalseStartCallback(PRFileDesc *fd, SSLCanFalseStartCallback cb, -+ void *arg) -+{ -+ sslSocket *ss; -+ -+ ss = ssl_FindSocket(fd); -+ if (!ss) { -+ SSL_DBG(("%d: SSL[%d]: bad socket in SSL_SetCanFalseStartCallback", -+ SSL_GETPID(), fd)); -+ return SECFailure; -+ } -+ -+ if (!ss->opt.useSecurity) { -+ PORT_SetError(SEC_ERROR_INVALID_ARGS); -+ return SECFailure; -+ } -+ -+ ssl_Get1stHandshakeLock(ss); -+ ssl_GetSSL3HandshakeLock(ss); -+ -+ ss->canFalseStartCallback = cb; -+ ss->canFalseStartCallbackData = arg; -+ -+ ssl_ReleaseSSL3HandshakeLock(ss); -+ ssl_Release1stHandshakeLock(ss); -+ -+ return SECSuccess; -+} -+ -+SECStatus -+SSL_RecommendedCanFalseStart(PRFileDesc *fd, PRBool *canFalseStart) -+{ -+ sslSocket *ss; -+ -+ *canFalseStart = PR_FALSE; -+ ss = ssl_FindSocket(fd); -+ if (!ss) { -+ SSL_DBG(("%d: SSL[%d]: bad socket in SSL_RecommendedCanFalseStart", -+ SSL_GETPID(), fd)); -+ return SECFailure; -+ } -+ -+ if (!ss->ssl3.initialized) { -+ PORT_SetError(SEC_ERROR_INVALID_ARGS); -+ return SECFailure; -+ } -+ -+ if (ss->version < SSL_LIBRARY_VERSION_3_0) { -+ PORT_SetError(SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SSL2); -+ return SECFailure; -+ } -+ -+ /* Require a forward-secret key exchange. */ -+ *canFalseStart = ss->ssl3.hs.kea_def->kea == kea_dhe_dss || -+ ss->ssl3.hs.kea_def->kea == kea_dhe_rsa || -+ ss->ssl3.hs.kea_def->kea == kea_ecdhe_ecdsa || -+ ss->ssl3.hs.kea_def->kea == kea_ecdhe_rsa; -+ -+ return SECSuccess; -+} -+ - /* Try to make progress on an SSL handshake by attempting to read the - ** next handshake from the peer, and sending any responses. - ** For non-blocking sockets, returns PR_ERROR_WOULD_BLOCK if it cannot -@@ -524,6 +600,9 @@ DoRecv(sslSocket *ss, unsigned char *out, int len, int flags) - int amount; - int available; - -+ /* ssl3_GatherAppDataRecord may call ssl_FinishHandshake, which needs the -+ * 1stHandshakeLock. */ -+ ssl_Get1stHandshakeLock(ss); - ssl_GetRecvBufLock(ss); - - available = ss->gs.writeOffset - ss->gs.readOffset; -@@ -590,6 +669,7 @@ DoRecv(sslSocket *ss, unsigned char *out, int len, int flags) - - done: - ssl_ReleaseRecvBufLock(ss); -+ ssl_Release1stHandshakeLock(ss); - return rv; - } - -@@ -1156,7 +1236,7 @@ ssl_SecureRead(sslSocket *ss, unsigned char *buf, int len) - int - ssl_SecureSend(sslSocket *ss, const unsigned char *buf, int len, int flags) - { -- int rv = 0; -+ int rv = 0; - - SSL_TRC(2, ("%d: SSL[%d]: SecureSend: sending %d bytes", - SSL_GETPID(), ss->fd, len)); -@@ -1191,19 +1271,15 @@ ssl_SecureSend(sslSocket *ss, const unsigned char *buf, int len, int flags) - ss->writerThread = PR_GetCurrentThread(); - /* If any of these is non-zero, the initial handshake is not done. */ - if (!ss->firstHsDone) { -- PRBool canFalseStart = PR_FALSE; -+ PRBool falseStart = PR_FALSE; - ssl_Get1stHandshakeLock(ss); -- if (ss->version >= SSL_LIBRARY_VERSION_3_0) { -+ if (ss->opt.enableFalseStart && -+ ss->version >= SSL_LIBRARY_VERSION_3_0) { - ssl_GetSSL3HandshakeLock(ss); -- if ((ss->ssl3.hs.ws == wait_change_cipher || -- ss->ssl3.hs.ws == wait_finished || -- ss->ssl3.hs.ws == wait_new_session_ticket) && -- ssl3_CanFalseStart(ss)) { -- canFalseStart = PR_TRUE; -- } -+ falseStart = ss->ssl3.hs.canFalseStart; - ssl_ReleaseSSL3HandshakeLock(ss); - } -- if (!canFalseStart && -+ if (!falseStart && - (ss->handshake || ss->nextHandshake || ss->securityHandshake)) { - rv = ssl_Do1stHandshake(ss); - } -@@ -1228,6 +1304,17 @@ ssl_SecureSend(sslSocket *ss, const unsigned char *buf, int len, int flags) - goto done; - } - -+ if (!ss->firstHsDone) { -+ PORT_Assert(ss->version >= SSL_LIBRARY_VERSION_3_0); -+#ifdef DEBUG -+ ssl_GetSSL3HandshakeLock(ss); -+ PORT_Assert(ss->ssl3.hs.canFalseStart); -+ ssl_ReleaseSSL3HandshakeLock(ss); -+#endif -+ SSL_TRC(3, ("%d: SSL[%d]: SecureSend: sending data due to false start", -+ SSL_GETPID(), ss->fd)); -+ } -+ - /* Send out the data using one of these functions: - * ssl2_SendClear, ssl2_SendStream, ssl2_SendBlock, - * ssl3_SendApplicationData -diff --git a/nss/lib/ssl/sslsock.c b/nss/lib/ssl/sslsock.c -index cd4a7a7..73e069b 100644 ---- a/nss/lib/ssl/sslsock.c -+++ b/nss/lib/ssl/sslsock.c -@@ -349,6 +349,8 @@ ssl_DupSocket(sslSocket *os) - ss->badCertArg = os->badCertArg; - ss->handshakeCallback = os->handshakeCallback; - ss->handshakeCallbackData = os->handshakeCallbackData; -+ ss->canFalseStartCallback = os->canFalseStartCallback; -+ ss->canFalseStartCallbackData = os->canFalseStartCallbackData; - ss->pkcs11PinArg = os->pkcs11PinArg; - - /* Create security data */ -@@ -2341,10 +2343,14 @@ ssl_Poll(PRFileDesc *fd, PRInt16 how_flags, PRInt16 *p_out_flags) - } else if (new_flags & PR_POLL_WRITE) { - /* The caller is trying to write, but the handshake is - ** blocked waiting for data to read, and the first -- ** handshake has been sent. so do NOT to poll on write. -+ ** handshake has been sent. So do NOT to poll on write -+ ** unless we did false start. - */ -- new_flags ^= PR_POLL_WRITE; /* don't select on write. */ -- new_flags |= PR_POLL_READ; /* do select on read. */ -+ if (!(ss->version >= SSL_LIBRARY_VERSION_3_0 && -+ ss->ssl3.hs.canFalseStart)) { -+ new_flags ^= PR_POLL_WRITE; /* don't select on write. */ -+ } -+ new_flags |= PR_POLL_READ; /* do select on read. */ - } - } - } else if ((new_flags & PR_POLL_READ) && (SSL_DataPending(fd) > 0)) { --- -1.7.9.5 - diff --git a/meta/recipes-support/nss/files/nss-CVE-2013-5606.patch b/meta/recipes-support/nss/files/nss-CVE-2013-5606.patch deleted file mode 100644 index f30475b16b..0000000000 --- a/meta/recipes-support/nss/files/nss-CVE-2013-5606.patch +++ /dev/null @@ -1,48 +0,0 @@ -nss: CVE-2013-5606 - -Upstream-Status: Backport - -the patch comes from: -http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-5606 -https://bugzilla.mozilla.org/show_bug.cgi?id=910438 -http://hg.mozilla.org/projects/nss/rev/d29898e0981c - -The CERT_VerifyCert function in lib/certhigh/certvfy.c in -Mozilla Network Security Services (NSS) 3.15 before 3.15.3 provides -an unexpected return value for an incompatible key-usage certificate -when the CERTVerifyLog argument is valid, which might allow remote -attackers to bypass intended access restrictions via a crafted certificate. - -Signed-off-by: Li Wang <li.wang@windriver.com> ---- - nss/lib/certhigh/certvfy.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/nss/lib/certhigh/certvfy.c b/nss/lib/certhigh/certvfy.c -index f364ceb..f450205 100644 ---- a/nss/lib/certhigh/certvfy.c -+++ b/nss/lib/certhigh/certvfy.c -@@ -1312,7 +1312,7 @@ CERT_VerifyCert(CERTCertDBHandle *handle, CERTCertificate *cert, - PORT_SetError(SEC_ERROR_UNTRUSTED_CERT); - LOG_ERROR_OR_EXIT(log,cert,0,flags); - } else if (trusted) { -- goto winner; -+ goto done; - } - - -@@ -1340,7 +1340,10 @@ CERT_VerifyCert(CERTCertDBHandle *handle, CERTCertificate *cert, - } - } - --winner: -+done: -+ if (log && log->head) { -+ return SECFailure; -+ } - return(SECSuccess); - - loser: --- -1.7.9.5 - diff --git a/meta/recipes-support/nss/files/nss-CVE-2014-1492.patch b/meta/recipes-support/nss/files/nss-CVE-2014-1492.patch deleted file mode 100644 index 1be8a17870..0000000000 --- a/meta/recipes-support/nss/files/nss-CVE-2014-1492.patch +++ /dev/null @@ -1,68 +0,0 @@ -nss: CVE-2014-1492 - -Upstream-Status: Backport - -the patch comes from: -http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-1492 -https://bugzilla.mozilla.org/show_bug.cgi?id=903885 - -changeset: 11063:709d4e597979 -user: Kai Engert <kaie@kuix.de> -date: Wed Mar 05 18:38:55 2014 +0100 -summary: Bug 903885, address requests to clarify comments from wtc - -changeset: 11046:2ffa40a3ff55 -tag: tip -user: Wan-Teh Chang <wtc@google.com> -date: Tue Feb 25 18:17:08 2014 +0100 -summary: Bug 903885, fix IDNA wildcard handling v4, r=kaie - -changeset: 11045:15ea62260c21 -user: Christian Heimes <sites@cheimes.de> -date: Mon Feb 24 17:50:25 2014 +0100 -summary: Bug 903885, fix IDNA wildcard handling, r=kaie - -Signed-off-by: Li Wang <li.wang@windriver.com> ---- - nss/lib/certdb/certdb.c | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/nss/lib/certdb/certdb.c b/nss/lib/certdb/certdb.c -index b7d22bd..91877b7 100644 ---- a/nss/lib/certdb/certdb.c -+++ b/nss/lib/certdb/certdb.c -@@ -1381,7 +1381,7 @@ cert_TestHostName(char * cn, const char * hn) - return rv; - } - } else { -- /* New approach conforms to RFC 2818. */ -+ /* New approach conforms to RFC 6125. */ - char *wildcard = PORT_Strchr(cn, '*'); - char *firstcndot = PORT_Strchr(cn, '.'); - char *secondcndot = firstcndot ? PORT_Strchr(firstcndot+1, '.') : NULL; -@@ -1390,14 +1390,17 @@ cert_TestHostName(char * cn, const char * hn) - /* For a cn pattern to be considered valid, the wildcard character... - * - may occur only in a DNS name with at least 3 components, and - * - may occur only as last character in the first component, and -- * - may be preceded by additional characters -+ * - may be preceded by additional characters, and -+ * - must not be preceded by an IDNA ACE prefix (xn--) - */ - if (wildcard && secondcndot && secondcndot[1] && firsthndot -- && firstcndot - wildcard == 1 -- && secondcndot - firstcndot > 1 -- && PORT_Strrchr(cn, '*') == wildcard -+ && firstcndot - wildcard == 1 /* wildcard is last char in first component */ -+ && secondcndot - firstcndot > 1 /* second component is non-empty */ -+ && PORT_Strrchr(cn, '*') == wildcard /* only one wildcard in cn */ - && !PORT_Strncasecmp(cn, hn, wildcard - cn) -- && !PORT_Strcasecmp(firstcndot, firsthndot)) { -+ && !PORT_Strcasecmp(firstcndot, firsthndot) -+ /* If hn starts with xn--, then cn must start with wildcard */ -+ && (PORT_Strncasecmp(hn, "xn--", 4) || wildcard == cn)) { - /* valid wildcard pattern match */ - return SECSuccess; - } --- -1.7.9.5 - diff --git a/meta/recipes-support/nss/files/nss-CVE-2014-1544.patch b/meta/recipes-support/nss/files/nss-CVE-2014-1544.patch deleted file mode 100644 index d6434dfe23..0000000000 --- a/meta/recipes-support/nss/files/nss-CVE-2014-1544.patch +++ /dev/null @@ -1,41 +0,0 @@ -nss: CVE-2014-1544 - -the patch comes from: -https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2014-1544 -https://hg.mozilla.org/projects/nss/rev/204f22c527f8 - -author Robert Relyea <rrelyea@redhat.com> -https://bugzilla.mozilla.org/show_bug.cgi?id=963150 -Bug 963150: Add nssCertificate_AddRef and nssCertificate_Destroy calls -to PK11_ImportCert to prevent nssTrustDomain_AddCertsToCache from -freeing the CERTCertificate associated with the NSSCertificate. r=wtc. - -Upstream-Status: Pending -Signed-off-by: Li Wang <li.wang@windriver.com> ---- - nss/lib/pk11wrap/pk11cert.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/nss/lib/pk11wrap/pk11cert.c b/nss/lib/pk11wrap/pk11cert.c -index 39168b9..3f3edb1 100644 ---- a/nss/lib/pk11wrap/pk11cert.c -+++ b/nss/lib/pk11wrap/pk11cert.c -@@ -981,8 +981,15 @@ PK11_ImportCert(PK11SlotInfo *slot, CERTCertificate *cert, - * CERTCertificate, and finish - */ - nssPKIObject_AddInstance(&c->object, certobj); -+ /* nssTrustDomain_AddCertsToCache may release a reference to 'c' and -+ * replace 'c' by a different value. So we add a reference to 'c' to -+ * prevent 'c' from being destroyed. */ -+ nssCertificate_AddRef(c); - nssTrustDomain_AddCertsToCache(STAN_GetDefaultTrustDomain(), &c, 1); -+ /* XXX should we pass the original value of 'c' to -+ * STAN_ForceCERTCertificateUpdate? */ - (void)STAN_ForceCERTCertificateUpdate(c); -+ nssCertificate_Destroy(c); - SECITEM_FreeItem(keyID,PR_TRUE); - return SECSuccess; - loser: --- -1.7.9.5 - diff --git a/meta/recipes-support/nss/files/nss-CVE-2014-1568.patch b/meta/recipes-support/nss/files/nss-CVE-2014-1568.patch deleted file mode 100644 index dbdb00ce2b..0000000000 --- a/meta/recipes-support/nss/files/nss-CVE-2014-1568.patch +++ /dev/null @@ -1,670 +0,0 @@ -nss: CVE-2014-1568 - -the patch comes from: -http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-1568 -https://bugzilla.mozilla.org/show_bug.cgi?id=1064636 -nss ng log: -===== -changeset: 11252:ad411fb64046 -user: Kai Engert <kaie@kuix.de> -date: Tue Sep 23 19:28:34 2014 +0200 -summary: Fix bug 1064636, patch part 2, r=rrelyea -===== -changeset: 11253:4e90910ad2f9 -user: Kai Engert <kaie@kuix.de> -date: Tue Sep 23 19:28:45 2014 +0200 -summary: Fix bug 1064636, patch part 3, r=rrelyea -===== -changeset: 11254:fb7208e91ae8 -user: Kai Engert <kaie@kuix.de> -date: Tue Sep 23 19:28:52 2014 +0200 -summary: Fix bug 1064636, patch part 1, r=rrelyea -===== -changeset: 11255:8dd6c6ac977d -user: Kai Engert <kaie@kuix.de> -date: Tue Sep 23 19:39:40 2014 +0200 -summary: Bug 1064636, follow up commit to fix Windows build bustage - -Upstream-Status: Backport -Signed-off-by: Li Wang <li.wang@windriver.com> ---- - nss/lib/cryptohi/secvfy.c | 202 +++++++++++++++++++++++++++----------------- - nss/lib/softoken/pkcs11c.c | 69 +++++++-------- - nss/lib/util/manifest.mn | 2 + - nss/lib/util/nssutil.def | 6 ++ - nss/lib/util/pkcs1sig.c | 169 ++++++++++++++++++++++++++++++++++++ - nss/lib/util/pkcs1sig.h | 30 +++++++ - 6 files changed, 360 insertions(+), 118 deletions(-) - create mode 100644 nss/lib/util/pkcs1sig.c - create mode 100644 nss/lib/util/pkcs1sig.h - -diff --git a/nss/lib/cryptohi/secvfy.c b/nss/lib/cryptohi/secvfy.c -index c1ac39b..0a20672 100644 ---- a/nss/lib/cryptohi/secvfy.c -+++ b/nss/lib/cryptohi/secvfy.c -@@ -12,78 +12,111 @@ - #include "secasn1.h" - #include "secoid.h" - #include "pk11func.h" -+#include "pkcs1sig.h" - #include "secdig.h" - #include "secerr.h" - #include "keyi.h" - - /* --** Decrypt signature block using public key --** Store the hash algorithm oid tag in *tagp --** Store the digest in the digest buffer --** Store the digest length in *digestlen -+** Recover the DigestInfo from an RSA PKCS#1 signature. -+** -+** If givenDigestAlg != SEC_OID_UNKNOWN, copy givenDigestAlg to digestAlgOut. -+** Otherwise, parse the DigestInfo structure and store the decoded digest -+** algorithm into digestAlgOut. -+** -+** Store the encoded DigestInfo into digestInfo. -+** Store the DigestInfo length into digestInfoLen. -+** -+** This function does *not* verify that the AlgorithmIdentifier in the -+** DigestInfo identifies givenDigestAlg or that the DigestInfo is encoded -+** correctly; verifyPKCS1DigestInfo does that. -+** - ** XXX this is assuming that the signature algorithm has WITH_RSA_ENCRYPTION - */ - static SECStatus --DecryptSigBlock(SECOidTag *tagp, unsigned char *digest, -- unsigned int *digestlen, unsigned int maxdigestlen, -- SECKEYPublicKey *key, const SECItem *sig, char *wincx) -+recoverPKCS1DigestInfo(SECOidTag givenDigestAlg, -+ /*out*/ SECOidTag* digestAlgOut, -+ /*out*/ unsigned char** digestInfo, -+ /*out*/ unsigned int* digestInfoLen, -+ SECKEYPublicKey* key, -+ const SECItem* sig, void* wincx) - { -- SGNDigestInfo *di = NULL; -- unsigned char *buf = NULL; -- SECStatus rv; -- SECOidTag tag; -- SECItem it; -- -- if (key == NULL) goto loser; -- -+ SGNDigestInfo* di = NULL; -+ SECItem it; -+ PRBool rv = SECSuccess; -+ -+ PORT_Assert(digestAlgOut); -+ PORT_Assert(digestInfo); -+ PORT_Assert(digestInfoLen); -+ PORT_Assert(key); -+ PORT_Assert(key->keyType == rsaKey); -+ PORT_Assert(sig); -+ -+ it.data = NULL; - it.len = SECKEY_PublicKeyStrength(key); -- if (!it.len) goto loser; -- it.data = buf = (unsigned char *)PORT_Alloc(it.len); -- if (!buf) goto loser; -+ if (it.len != 0) { -+ it.data = (unsigned char *)PORT_Alloc(it.len); -+ } -+ if (it.len == 0 || it.data == NULL ) { -+ rv = SECFailure; -+ } - -- /* decrypt the block */ -- rv = PK11_VerifyRecover(key, (SECItem *)sig, &it, wincx); -- if (rv != SECSuccess) goto loser; -+ if (rv == SECSuccess) { -+ /* decrypt the block */ -+ rv = PK11_VerifyRecover(key, sig, &it, wincx); -+ } - -- di = SGN_DecodeDigestInfo(&it); -- if (di == NULL) goto sigloser; -+ if (rv == SECSuccess) { -+ if (givenDigestAlg != SEC_OID_UNKNOWN) { -+ /* We don't need to parse the DigestInfo if the caller gave us the -+ * digest algorithm to use. Later verifyPKCS1DigestInfo will verify -+ * that the DigestInfo identifies the given digest algorithm and -+ * that the DigestInfo is encoded absolutely correctly. -+ */ -+ *digestInfoLen = it.len; -+ *digestInfo = (unsigned char*)it.data; -+ *digestAlgOut = givenDigestAlg; -+ return SECSuccess; -+ } -+ } - -- /* -- ** Finally we have the digest info; now we can extract the algorithm -- ** ID and the signature block -- */ -- tag = SECOID_GetAlgorithmTag(&di->digestAlgorithm); -- /* Check that tag is an appropriate algorithm */ -- if (tag == SEC_OID_UNKNOWN) { -- goto sigloser; -- } -- /* make sure the "parameters" are not too bogus. */ -- if (di->digestAlgorithm.parameters.len > 2) { -- goto sigloser; -- } -- if (di->digest.len > maxdigestlen) { -- PORT_SetError(SEC_ERROR_OUTPUT_LEN); -- goto loser; -+ if (rv == SECSuccess) { -+ /* The caller didn't specify a digest algorithm to use, so choose the -+ * digest algorithm by parsing the AlgorithmIdentifier within the -+ * DigestInfo. -+ */ -+ di = SGN_DecodeDigestInfo(&it); -+ if (!di) { -+ rv = SECFailure; -+ } - } -- PORT_Memcpy(digest, di->digest.data, di->digest.len); -- *tagp = tag; -- *digestlen = di->digest.len; -- goto done; - -- sigloser: -- PORT_SetError(SEC_ERROR_BAD_SIGNATURE); -+ if (rv == SECSuccess) { -+ *digestAlgOut = SECOID_GetAlgorithmTag(&di->digestAlgorithm); -+ if (*digestAlgOut == SEC_OID_UNKNOWN) { -+ rv = SECFailure; -+ } -+ } - -- loser: -- rv = SECFailure; -+ if (di) { -+ SGN_DestroyDigestInfo(di); -+ } -+ -+ if (rv == SECSuccess) { -+ *digestInfoLen = it.len; -+ *digestInfo = (unsigned char*)it.data; -+ } else { -+ if (it.data) { -+ PORT_Free(it.data); -+ } -+ *digestInfo = NULL; -+ *digestInfoLen = 0; -+ PORT_SetError(SEC_ERROR_BAD_SIGNATURE); -+ } - -- done: -- if (di != NULL) SGN_DestroyDigestInfo(di); -- if (buf != NULL) PORT_Free(buf); -- - return rv; - } - -- - struct VFYContextStr { - SECOidTag hashAlg; /* the hash algorithm */ - SECKEYPublicKey *key; -@@ -99,14 +132,14 @@ struct VFYContextStr { - union { - unsigned char buffer[1]; - -- /* the digest in the decrypted RSA signature */ -- unsigned char rsadigest[HASH_LENGTH_MAX]; - /* the full DSA signature... 40 bytes */ - unsigned char dsasig[DSA_MAX_SIGNATURE_LEN]; - /* the full ECDSA signature */ - unsigned char ecdsasig[2 * MAX_ECKEY_LEN]; - } u; -- unsigned int rsadigestlen; -+ unsigned int pkcs1RSADigestInfoLen; -+ /* the encoded DigestInfo from a RSA PKCS#1 signature */ -+ unsigned char *pkcs1RSADigestInfo; - void * wincx; - void *hashcx; - const SECHashObject *hashobj; -@@ -117,6 +150,17 @@ struct VFYContextStr { - * VFY_EndWithSignature call. */ - }; - -+static SECStatus -+verifyPKCS1DigestInfo(const VFYContext* cx, const SECItem* digest) -+{ -+ SECItem pkcs1DigestInfo; -+ pkcs1DigestInfo.data = cx->pkcs1RSADigestInfo; -+ pkcs1DigestInfo.len = cx->pkcs1RSADigestInfoLen; -+ return _SGN_VerifyPKCS1DigestInfo( -+ cx->hashAlg, digest, &pkcs1DigestInfo, -+ PR_TRUE /*XXX: unsafeAllowMissingParameters*/); -+} -+ - /* - * decode the ECDSA or DSA signature from it's DER wrapping. - * The unwrapped/raw signature is placed in the buffer pointed -@@ -376,16 +420,16 @@ vfy_CreateContext(const SECKEYPublicKey *key, const SECItem *sig, - cx->encAlg = encAlg; - cx->hashAlg = hashAlg; - cx->key = SECKEY_CopyPublicKey(key); -+ cx->pkcs1RSADigestInfo = NULL; - rv = SECSuccess; - if (sig) { - switch (type) { - case rsaKey: -- rv = DecryptSigBlock(&cx->hashAlg, cx->u.buffer, &cx->rsadigestlen, -- HASH_LENGTH_MAX, cx->key, sig, (char*)wincx); -- if (cx->hashAlg != hashAlg && hashAlg != SEC_OID_UNKNOWN) { -- PORT_SetError(SEC_ERROR_BAD_SIGNATURE); -- rv = SECFailure; -- } -+ rv = recoverPKCS1DigestInfo(hashAlg, &cx->hashAlg, -+ &cx->pkcs1RSADigestInfo, -+ &cx->pkcs1RSADigestInfoLen, -+ cx->key, -+ sig, wincx); - break; - case dsaKey: - case ecKey: -@@ -469,6 +513,9 @@ VFY_DestroyContext(VFYContext *cx, PRBool freeit) - if (cx->key) { - SECKEY_DestroyPublicKey(cx->key); - } -+ if (cx->pkcs1RSADigestInfo) { -+ PORT_Free(cx->pkcs1RSADigestInfo); -+ } - if (freeit) { - PORT_ZFree(cx, sizeof(VFYContext)); - } -@@ -548,21 +595,25 @@ VFY_EndWithSignature(VFYContext *cx, SECItem *sig) - } - break; - case rsaKey: -+ { -+ SECItem digest; -+ digest.data = final; -+ digest.len = part; - if (sig) { -- SECOidTag hashid = SEC_OID_UNKNOWN; -- rv = DecryptSigBlock(&hashid, cx->u.buffer, &cx->rsadigestlen, -- HASH_LENGTH_MAX, cx->key, sig, (char*)cx->wincx); -- if ((rv != SECSuccess) || (hashid != cx->hashAlg)) { -- PORT_SetError(SEC_ERROR_BAD_SIGNATURE); -+ SECOidTag hashid; -+ PORT_Assert(cx->hashAlg != SEC_OID_UNKNOWN); -+ rv = recoverPKCS1DigestInfo(cx->hashAlg, &hashid, -+ &cx->pkcs1RSADigestInfo, -+ &cx->pkcs1RSADigestInfoLen, -+ cx->key, -+ sig, cx->wincx); -+ PORT_Assert(cx->hashAlg == hashid); -+ if (rv != SECSuccess) { - return SECFailure; - } - } -- if ((part != cx->rsadigestlen) || -- PORT_Memcmp(final, cx->u.buffer, part)) { -- PORT_SetError(SEC_ERROR_BAD_SIGNATURE); -- return SECFailure; -- } -- break; -+ return verifyPKCS1DigestInfo(cx, &digest); -+ } - default: - PORT_SetError(SEC_ERROR_BAD_SIGNATURE); - return SECFailure; /* shouldn't happen */ -@@ -595,12 +646,7 @@ vfy_VerifyDigest(const SECItem *digest, const SECKEYPublicKey *key, - if (cx != NULL) { - switch (key->keyType) { - case rsaKey: -- if ((digest->len != cx->rsadigestlen) || -- PORT_Memcmp(digest->data, cx->u.buffer, digest->len)) { -- PORT_SetError(SEC_ERROR_BAD_SIGNATURE); -- } else { -- rv = SECSuccess; -- } -+ rv = verifyPKCS1DigestInfo(cx, digest); - break; - case dsaKey: - case ecKey: -diff --git a/nss/lib/softoken/pkcs11c.c b/nss/lib/softoken/pkcs11c.c -index 89b5bd8..ba6dcfa 100644 ---- a/nss/lib/softoken/pkcs11c.c -+++ b/nss/lib/softoken/pkcs11c.c -@@ -23,6 +23,7 @@ - #include "blapi.h" - #include "pkcs11.h" - #include "pkcs11i.h" -+#include "pkcs1sig.h" - #include "lowkeyi.h" - #include "secder.h" - #include "secdig.h" -@@ -2580,54 +2581,42 @@ sftk_hashCheckSign(SFTKHashVerifyInfo *info, unsigned char *sig, - } - - SECStatus --RSA_HashCheckSign(SECOidTag hashOid, NSSLOWKEYPublicKey *key, -+RSA_HashCheckSign(SECOidTag digestOid, NSSLOWKEYPublicKey *key, - unsigned char *sig, unsigned int sigLen, -- unsigned char *digest, unsigned int digestLen) -+ unsigned char *digestData, unsigned int digestLen) - { -+ unsigned char *pkcs1DigestInfoData; -+ SECItem pkcs1DigestInfo; -+ SECItem digest; -+ unsigned int bufferSize; -+ SECStatus rv; - -- SECItem it; -- SGNDigestInfo *di = NULL; -- SECStatus rv = SECSuccess; -- -- it.data = NULL; -- -- if (key == NULL) goto loser; -- -- it.len = nsslowkey_PublicModulusLen(key); -- if (!it.len) goto loser; -+ /* pkcs1DigestInfo.data must be less than key->u.rsa.modulus.len */ -+ bufferSize = key->u.rsa.modulus.len; -+ pkcs1DigestInfoData = PORT_ZAlloc(bufferSize); -+ if (!pkcs1DigestInfoData) { -+ PORT_SetError(SEC_ERROR_NO_MEMORY); -+ return SECFailure; -+ } - -- it.data = (unsigned char *) PORT_Alloc(it.len); -- if (it.data == NULL) goto loser; -+ pkcs1DigestInfo.data = pkcs1DigestInfoData; -+ pkcs1DigestInfo.len = bufferSize; - - /* decrypt the block */ -- rv = RSA_CheckSignRecover(key, it.data, &it.len, it.len, sig, sigLen); -- if (rv != SECSuccess) goto loser; -- -- di = SGN_DecodeDigestInfo(&it); -- if (di == NULL) goto loser; -- if (di->digest.len != digestLen) goto loser; -- -- /* make sure the tag is OK */ -- if (SECOID_GetAlgorithmTag(&di->digestAlgorithm) != hashOid) { -- goto loser; -- } -- /* make sure the "parameters" are not too bogus. */ -- if (di->digestAlgorithm.parameters.len > 2) { -- goto loser; -- } -- /* Now check the signature */ -- if (PORT_Memcmp(digest, di->digest.data, di->digest.len) == 0) { -- goto done; -+ rv = RSA_CheckSignRecover(key, pkcs1DigestInfo.data, -+ &pkcs1DigestInfo.len, pkcs1DigestInfo.len, -+ sig, sigLen); -+ if (rv != SECSuccess) { -+ PORT_SetError(SEC_ERROR_BAD_SIGNATURE); -+ } else { -+ digest.data = (PRUint8*) digestData; -+ digest.len = digestLen; -+ rv = _SGN_VerifyPKCS1DigestInfo( -+ digestOid, &digest, &pkcs1DigestInfo, -+ PR_TRUE /*XXX: unsafeAllowMissingParameters*/); - } - -- loser: -- PORT_SetError(SEC_ERROR_BAD_SIGNATURE); -- rv = SECFailure; -- -- done: -- if (it.data != NULL) PORT_Free(it.data); -- if (di != NULL) SGN_DestroyDigestInfo(di); -- -+ PORT_Free(pkcs1DigestInfoData); - return rv; - } - -diff --git a/nss/lib/util/manifest.mn b/nss/lib/util/manifest.mn -index ed54a16..9ff3758 100644 ---- a/nss/lib/util/manifest.mn -+++ b/nss/lib/util/manifest.mn -@@ -22,6 +22,7 @@ EXPORTS = \ - pkcs11t.h \ - pkcs11n.h \ - pkcs11u.h \ -+ pkcs1sig.h \ - portreg.h \ - secasn1.h \ - secasn1t.h \ -@@ -58,6 +59,7 @@ CSRCS = \ - nssrwlk.c \ - nssilock.c \ - oidstring.c \ -+ pkcs1sig.c \ - portreg.c \ - secalgid.c \ - secasn1d.c \ -diff --git a/nss/lib/util/nssutil.def b/nss/lib/util/nssutil.def -index 86a0ad7..9d98df2 100644 ---- a/nss/lib/util/nssutil.def -+++ b/nss/lib/util/nssutil.def -@@ -271,3 +271,9 @@ SECITEM_ZfreeArray; - ;+ local: - ;+ *; - ;+}; -+;+NSSUTIL_3.17.1 { # NSS Utilities 3.17.1 release -+;+ global: -+_SGN_VerifyPKCS1DigestInfo; -+;+ local: -+;+ *; -+;+}; -diff --git a/nss/lib/util/pkcs1sig.c b/nss/lib/util/pkcs1sig.c -new file mode 100644 -index 0000000..03b16f5 ---- /dev/null -+++ b/nss/lib/util/pkcs1sig.c -@@ -0,0 +1,169 @@ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. -+ */ -+ -+#include "pkcs1sig.h" -+#include "hasht.h" -+#include "secerr.h" -+#include "secasn1t.h" -+#include "secoid.h" -+ -+typedef struct pkcs1PrefixStr pkcs1Prefix; -+struct pkcs1PrefixStr { -+ unsigned int len; -+ PRUint8 *data; -+}; -+ -+typedef struct pkcs1PrefixesStr pkcs1Prefixes; -+struct pkcs1PrefixesStr { -+ unsigned int digestLen; -+ pkcs1Prefix prefixWithParams; -+ pkcs1Prefix prefixWithoutParams; -+}; -+ -+/* The value for SGN_PKCS1_DIGESTINFO_MAX_PREFIX_LEN_EXCLUDING_OID is based on -+ * the possible prefix encodings as explained below. -+ */ -+#define MAX_PREFIX_LEN_EXCLUDING_OID 10 -+ -+static SECStatus -+encodePrefix(const SECOidData *hashOid, unsigned int digestLen, -+ pkcs1Prefix *prefix, PRBool withParams) -+{ -+ /* with params coding is: -+ * Sequence (2 bytes) { -+ * Sequence (2 bytes) { -+ * Oid (2 bytes) { -+ * Oid value (derOid->oid.len) -+ * } -+ * NULL (2 bytes) -+ * } -+ * OCTECT (2 bytes); -+ * -+ * without params coding is: -+ * Sequence (2 bytes) { -+ * Sequence (2 bytes) { -+ * Oid (2 bytes) { -+ * Oid value (derOid->oid.len) -+ * } -+ * } -+ * OCTECT (2 bytes); -+ */ -+ -+ unsigned int innerSeqLen = 2 + hashOid->oid.len; -+ unsigned int outerSeqLen = 2 + innerSeqLen + 2 + digestLen; -+ unsigned int extra = 0; -+ -+ if (withParams) { -+ innerSeqLen += 2; -+ outerSeqLen += 2; -+ extra = 2; -+ } -+ -+ if (innerSeqLen >= 128 || -+ outerSeqLen >= 128 || -+ (outerSeqLen + 2 - digestLen) > -+ (MAX_PREFIX_LEN_EXCLUDING_OID + hashOid->oid.len)) { -+ /* this is actually a library failure, It shouldn't happen */ -+ PORT_SetError(SEC_ERROR_INVALID_ARGS); -+ return SECFailure; -+ } -+ -+ prefix->len = 6 + hashOid->oid.len + extra + 2; -+ prefix->data = PORT_Alloc(prefix->len); -+ if (!prefix->data) { -+ PORT_SetError(SEC_ERROR_NO_MEMORY); -+ return SECFailure; -+ } -+ -+ prefix->data[0] = SEC_ASN1_SEQUENCE|SEC_ASN1_CONSTRUCTED; -+ prefix->data[1] = outerSeqLen; -+ prefix->data[2] = SEC_ASN1_SEQUENCE|SEC_ASN1_CONSTRUCTED; -+ prefix->data[3] = innerSeqLen; -+ prefix->data[4] = SEC_ASN1_OBJECT_ID; -+ prefix->data[5] = hashOid->oid.len; -+ PORT_Memcpy(&prefix->data[6], hashOid->oid.data, hashOid->oid.len); -+ if (withParams) { -+ prefix->data[6 + hashOid->oid.len] = SEC_ASN1_NULL; -+ prefix->data[6 + hashOid->oid.len + 1] = 0; -+ } -+ prefix->data[6 + hashOid->oid.len + extra] = SEC_ASN1_OCTET_STRING; -+ prefix->data[6 + hashOid->oid.len + extra + 1] = digestLen; -+ -+ return SECSuccess; -+} -+ -+SECStatus -+_SGN_VerifyPKCS1DigestInfo(SECOidTag digestAlg, -+ const SECItem* digest, -+ const SECItem* dataRecoveredFromSignature, -+ PRBool unsafeAllowMissingParameters) -+{ -+ SECOidData *hashOid; -+ pkcs1Prefixes pp; -+ const pkcs1Prefix* expectedPrefix; -+ SECStatus rv, rv2, rv3; -+ -+ if (!digest || !digest->data || -+ !dataRecoveredFromSignature || !dataRecoveredFromSignature->data) { -+ PORT_SetError(SEC_ERROR_INVALID_ARGS); -+ return SECFailure; -+ } -+ -+ hashOid = SECOID_FindOIDByTag(digestAlg); -+ if (hashOid == NULL) { -+ PORT_SetError(SEC_ERROR_INVALID_ARGS); -+ return SECFailure; -+ } -+ -+ pp.digestLen = digest->len; -+ pp.prefixWithParams.data = NULL; -+ pp.prefixWithoutParams.data = NULL; -+ -+ rv2 = encodePrefix(hashOid, pp.digestLen, &pp.prefixWithParams, PR_TRUE); -+ rv3 = encodePrefix(hashOid, pp.digestLen, &pp.prefixWithoutParams, PR_FALSE); -+ -+ rv = SECSuccess; -+ if (rv2 != SECSuccess || rv3 != SECSuccess) { -+ rv = SECFailure; -+ } -+ -+ if (rv == SECSuccess) { -+ /* We don't attempt to avoid timing attacks on these comparisons because -+ * signature verification is a public key operation, not a private key -+ * operation. -+ */ -+ -+ if (dataRecoveredFromSignature->len == -+ pp.prefixWithParams.len + pp.digestLen) { -+ expectedPrefix = &pp.prefixWithParams; -+ } else if (unsafeAllowMissingParameters && -+ dataRecoveredFromSignature->len == -+ pp.prefixWithoutParams.len + pp.digestLen) { -+ expectedPrefix = &pp.prefixWithoutParams; -+ } else { -+ PORT_SetError(SEC_ERROR_BAD_SIGNATURE); -+ rv = SECFailure; -+ } -+ } -+ -+ if (rv == SECSuccess) { -+ if (memcmp(dataRecoveredFromSignature->data, expectedPrefix->data, -+ expectedPrefix->len) || -+ memcmp(dataRecoveredFromSignature->data + expectedPrefix->len, -+ digest->data, digest->len)) { -+ PORT_SetError(SEC_ERROR_BAD_SIGNATURE); -+ rv = SECFailure; -+ } -+ } -+ -+ if (pp.prefixWithParams.data) { -+ PORT_Free(pp.prefixWithParams.data); -+ } -+ if (pp.prefixWithoutParams.data) { -+ PORT_Free(pp.prefixWithoutParams.data); -+ } -+ -+ return rv; -+} -diff --git a/nss/lib/util/pkcs1sig.h b/nss/lib/util/pkcs1sig.h -new file mode 100644 -index 0000000..7c52b15 ---- /dev/null -+++ b/nss/lib/util/pkcs1sig.h -@@ -0,0 +1,30 @@ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. -+ */ -+ -+#ifndef _PKCS1SIG_H_ -+#define _PKCS1SIG_H_ -+ -+#include "hasht.h" -+#include "seccomon.h" -+#include "secoidt.h" -+ -+/* SGN_VerifyPKCS1DigestInfo verifies that the length of the digest is correct -+ * for the given algorithm, then verifies that the recovered data from the -+ * PKCS#1 signature is a properly-formatted DigestInfo that identifies the -+ * given digest algorithm, then verifies that the digest in the DigestInfo -+ * matches the given digest. -+ * -+ * dataRecoveredFromSignature must be the result of calling PK11_VerifyRecover -+ * or equivalent. -+ * -+ * If unsafeAllowMissingParameters is true (not recommended), then a DigestInfo -+ * without the mandatory ASN.1 NULL parameter will also be accepted. -+ */ -+SECStatus _SGN_VerifyPKCS1DigestInfo(SECOidTag digestAlg, -+ const SECItem* digest, -+ const SECItem* dataRecoveredFromSignature, -+ PRBool unsafeAllowMissingParameters); -+ -+#endif /* _PKCS1SIG_H_ */ --- -1.7.9.5 diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc index 008bdad5c7..665e4e6a09 100644 --- a/meta/recipes-support/nss/nss.inc +++ b/meta/recipes-support/nss/nss.inc @@ -16,24 +16,17 @@ SRC_URI = "\ file://nss-fix-support-cross-compiling.patch \ file://nss-no-rpath-for-cross-compiling.patch \ file://nss-fix-incorrect-shebang-of-perl.patch \ - file://nss-3.15.1-fix-CVE-2013-1741.patch \ - file://nss-3.15.1-fix-CVE-2013-5605.patch \ - file://nss-CVE-2014-1492.patch \ - file://nss-CVE-2013-1740.patch \ - file://nss-3.15.1-fix-CVE-2013-1739.patch \ - file://nss-CVE-2013-5606.patch \ - file://nss-CVE-2014-1544.patch \ - file://nss-CVE-2014-1568.patch \ + file://nss-fix-nsinstall-build.patch \ " SRC_URI_append = "\ file://nss.pc.in \ file://signlibs.sh \ " inherit siteinfo -PR = "r0" + DEPENDS = "sqlite3 nspr zlib nss-native" DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" -RDEPENDS_${PN} = "perl" +RDEPENDS_${PN}-smime = "perl" TD = "${S}/tentative-dist" TDS = "${S}/tentative-dist-staging" @@ -79,10 +72,16 @@ do_compile() { if [ "${SITEINFO_BITS}" = "64" ]; then export USE_64=1 + elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then + export USE_X32=1 fi - make -C ./nss CCC="${CXX}" \ - OS_TEST=${OS_TEST} \ + # We can modify CC in the environment, but if we set it via an + # argument to make, nsinstall, a host program, will also build with it! + # + export CC="${CC} -g" + make -C ./nss CCC="${CXX} -g" \ + OS_TEST=${OS_TEST} } @@ -118,6 +117,8 @@ do_install() { fi if [ "${SITEINFO_BITS}" = "64" ]; then export USE_64=1 + elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then + export USE_X32=1 fi make -C ./nss \ @@ -196,6 +197,10 @@ pkg_postinst_${PN} () { signlibs.sh } +PACKAGES =+ "${PN}-smime" +FILES_${PN}-smime = "\ + ${bindir}/smime \ +" FILES_${PN} = "\ ${sysconfdir} \ ${bindir} \ @@ -207,9 +212,6 @@ FILES_${PN}-dev = "\ ${libdir}/pkgconfig/* \ ${includedir}/* \ " -FILES_${PN}-dbg = "\ - ${bindir}/.debug/* \ - ${libdir}/.debug/* \ - " +# FILES_${PN}-dbg is populated automatically BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/nss/files/nss-fix-incorrect-shebang-of-perl.patch b/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch index 547594d5b6..547594d5b6 100644 --- a/meta/recipes-support/nss/files/nss-fix-incorrect-shebang-of-perl.patch +++ b/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch diff --git a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch new file mode 100644 index 0000000000..866de07ea8 --- /dev/null +++ b/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch @@ -0,0 +1,35 @@ +Fix nss multilib build on openSUSE 11.x 32bit + +While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will +fail with error: + +* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled + +It caused by the '-m64' option which passed to host gcc. + +The nsinstall was built first while nss starting to build, it only runs +on host to install built files, it doesn't need any cross-compling or +multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this +error. + +Upstream-Status: Pending + +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> +=================================================== +diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile +index 1850bcb..5aee84f 100644 +--- a/nss/coreconf/nsinstall/Makefile ++++ b/nss/coreconf/nsinstall/Makefile +@@ -18,6 +18,12 @@ INTERNAL_TOOLS = 1 + + include $(DEPTH)/coreconf/config.mk + ++# nsinstall is unfit for cross-compiling/multilib-build since it was ++# always run on local host to install built files. This change intends ++# to clean the '-m64' from ARCHFLAG and LDFLAGS. ++ARCHFLAG = ++LDFLAGS = ++ + ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) + PROGRAM = + else diff --git a/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch b/meta/recipes-support/nss/nss/nss-fix-support-cross-compiling.patch index f0b3550bff..f0b3550bff 100644 --- a/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch +++ b/meta/recipes-support/nss/nss/nss-fix-support-cross-compiling.patch diff --git a/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch b/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch index 7661dc93a0..7661dc93a0 100644 --- a/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch +++ b/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch diff --git a/meta/recipes-support/nss/files/nss.pc.in b/meta/recipes-support/nss/nss/nss.pc.in index 200f635c65..200f635c65 100644 --- a/meta/recipes-support/nss/files/nss.pc.in +++ b/meta/recipes-support/nss/nss/nss.pc.in diff --git a/meta/recipes-support/nss/files/signlibs.sh b/meta/recipes-support/nss/nss/signlibs.sh index 1ec79f4576..1ec79f4576 100644 --- a/meta/recipes-support/nss/files/signlibs.sh +++ b/meta/recipes-support/nss/nss/signlibs.sh diff --git a/meta/recipes-support/nss/nss_3.15.1.bb b/meta/recipes-support/nss/nss_3.15.1.bb deleted file mode 100644 index 7b06f00cde..0000000000 --- a/meta/recipes-support/nss/nss_3.15.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require nss.inc - -SRC_URI += "\ - http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_1_RTM/src/${BPN}-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "fb68f4d210ac9397dd0d3c39c4f938eb" -SRC_URI[sha256sum] = "f994106a33d1f3210f4151bbb3419a1c28fd1cb545caa7dc9afdebd6da626284" - diff --git a/meta/recipes-support/nss/nss_3.17.3.bb b/meta/recipes-support/nss/nss_3.17.3.bb new file mode 100644 index 0000000000..e7d0780fb8 --- /dev/null +++ b/meta/recipes-support/nss/nss_3.17.3.bb @@ -0,0 +1,7 @@ +require nss.inc + +SRC_URI += "\ + http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_3_RTM/src/${BP}.tar.gz \ +" +SRC_URI[md5sum] = "fba7489e1b26f2a0bfe5527430fd61e1" +SRC_URI[sha256sum] = "f4d5e9035a2f84f25f35c283de3b0ff60d72e918748de25eaf017ed201fa21d5" diff --git a/meta/recipes-support/pinentry/pinentry_0.8.4.bb b/meta/recipes-support/pinentry/pinentry_0.9.0.bb index acc69923ba..10b329b15e 100644 --- a/meta/recipes-support/pinentry/pinentry_0.8.4.bb +++ b/meta/recipes-support/pinentry/pinentry_0.9.0.bb @@ -8,19 +8,17 @@ HOMEPAGE = "http://www.gnupg.org/related_software/pinentry/index.en.html" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e" -inherit autotools-brokensep +PR = "r1" -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \ - " +inherit autotools -SRC_URI[md5sum] = "e2b6f94471ba1e978f6e5bf6b275189b" -SRC_URI[sha256sum] = "359db3bf46cb743ba0b3aeef259f6107271ca888ba3e22c1cba525c9aca35612" +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2" + +SRC_URI[md5sum] = "40a05856cb3accf6679987b7899b0f5a" +SRC_URI[sha256sum] = "90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab" EXTRA_OECONF = "--disable-rpath \ - --disable-dependency-tracking \ - --disable-glibtest \ - --disable-pinentry-gtk \ - --disable-pinentry-qt \ + --disable-dependency-tracking \ " PACKAGECONFIG ??= "ncurses libcap" diff --git a/meta/recipes-support/ptest-runner/ptest-runner_1.0.bb b/meta/recipes-support/ptest-runner/ptest-runner_1.0.bb index 7443811d8c..bc1b0a4d46 100644 --- a/meta/recipes-support/ptest-runner/ptest-runner_1.0.bb +++ b/meta/recipes-support/ptest-runner/ptest-runner_1.0.bb @@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d INHIBIT_DEFAULT_DEPS = "1" +S = "${WORKDIR}" + do_install () { mkdir -p ${D}${bindir} install -m 0755 ${WORKDIR}/ptest-runner ${D}${bindir} diff --git a/meta/recipes-support/pth/files/pth-fix-parallel.patch b/meta/recipes-support/pth/files/pth-fix-parallel.patch new file mode 100644 index 0000000000..08edaff157 --- /dev/null +++ b/meta/recipes-support/pth/files/pth-fix-parallel.patch @@ -0,0 +1,48 @@ +From df06b8170745eac347acb95f9f374f257621254f Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 29 Jan 2015 18:11:00 -0800 +Subject: [PATCH] Makefile.in: fix for parallel build + +Fixed: +* do_compile + pth_uctx.c:31:19: fatal error: pth_p.h: No such file or directory + #include "pth_p.h" + ^ +compilation terminated. +make: *** [pth_uctx.lo] Error 1 + +* do_install: + cp: cannot create regular file `image/usr/lib/pkgconfig/#INST@15507#': No such file or directory + +Upstream-Status: Pending +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile.in | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index de0390d..381a0ee 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -219,7 +219,8 @@ test_pthread: test_pthread.o test_common.o libpthread.la + + # install the package + install: all-for-install +- @$(MAKE) $(MKFLAGS) install-dirs install-pth @INSTALL_PTHREAD@ install-pkgconfigDATA ++ @$(MAKE) $(MKFLAGS) install-dirs ++ @$(MAKE) $(MKFLAGS) install-pth @INSTALL_PTHREAD@ install-pkgconfigDATA + @touch .done-install >/dev/null 2>&1 || $(TRUE) + @$(MAKE) $(MKFLAGS) what-next + install-dirs: +@@ -432,7 +433,7 @@ TAGS: + ## (AUTOMATICALLY UPDATED - DO NOT EDIT) + ## + +-$(LOBJS): Makefile ++$(LOBJS): Makefile pth_p.h + + # DO NOT REMOVE + pth_attr.lo: pth_attr.c pth_p.h pth_vers.c pth.h pth_acdef.h pth_acmac.h +-- +1.7.9.5 + diff --git a/meta/recipes-support/pth/pth_2.0.7.bb b/meta/recipes-support/pth/pth_2.0.7.bb index 416e788e5d..9037769b79 100644 --- a/meta/recipes-support/pth/pth_2.0.7.bb +++ b/meta/recipes-support/pth/pth_2.0.7.bb @@ -13,13 +13,13 @@ python __anonymous () { } SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz \ - file://pth-add-pkgconfig-support.patch" + file://pth-add-pkgconfig-support.patch \ + file://pth-fix-parallel.patch \ + " SRC_URI[md5sum] = "9cb4a25331a4c4db866a31cbe507c793" SRC_URI[sha256sum] = "72353660c5a2caafd601b20e12e75d865fd88f6cf1a088b306a3963f0bc77232" -PARALLEL_MAKE="" - BINCONFIG = "${bindir}/pth-config" inherit autotools binconfig-disabled pkgconfig diff --git a/meta/recipes-support/serf/serf/env.patch b/meta/recipes-support/serf/serf/env.patch new file mode 100644 index 0000000000..9d073e9abf --- /dev/null +++ b/meta/recipes-support/serf/serf/env.patch @@ -0,0 +1,28 @@ +'scons' cleans the environment which breaks ccache builds because +CCACHEDIR can point to an unexpected location: + +| ccache arm-linux-gnueabi-gcc ... context.c +| ccache: failed to create .../serf/1.3.6-r0/.home/.ccache (No such file or directory) + +Issue is described in + + http://www.scons.org/wiki/ImportingEnvironmentSettings + +and because 'bitbake' cleans environment we can pass it completely +instead of trying to enumerate needed env. + +Upstream-Status: Inappropriate + + +Index: serf-1.3.6/SConstruct +=================================================================== +--- serf-1.3.6.orig/SConstruct ++++ serf-1.3.6/SConstruct +@@ -149,6 +149,7 @@ if sys.platform == 'win32': + env = Environment(variables=opts, + tools=('default', 'textfile',), + CPPPATH=['.', ], ++ ENV = os.environ, + ) + + env.Append(BUILDERS = { diff --git a/meta/recipes-support/serf/serf_1.3.7.bb b/meta/recipes-support/serf/serf_1.3.8.bb index 5230ef7387..aa7918b5c3 100644 --- a/meta/recipes-support/serf/serf_1.3.7.bb +++ b/meta/recipes-support/serf/serf_1.3.8.bb @@ -1,20 +1,19 @@ -SRC_URI = "http://serf.googlecode.com/svn/src_releases/serf-1.3.7.tar.bz2 \ - file://norpath.patch" -SRC_URI[md5sum] = "0a6fa745df4517dd8f79c75c538919bc" -SRC_URI[sha256sum] = "ecccb74e665e6ea7539271e126a21d0f7eeddfeaa8ce090adb3aec6682f9f0ae" +SRC_URI = "http://serf.googlecode.com/svn/src_releases/serf-${PV}.tar.bz2 \ + file://norpath.patch \ + file://env.patch" + +SRC_URI[md5sum] = "2e4efe57ff28cb3202a112e90f0c2889" +SRC_URI[sha256sum] = "e0500be065dbbce490449837bb2ab624e46d64fc0b090474d9acaa87c82b2590" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" DEPENDS = "python-scons-native openssl apr apr-util util-linux expat" -FULLCC = "${STAGING_BINDIR_TOOLCHAIN}/${CC}" -FULLCC_class-native = "${CC}" - do_compile() { ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} \ - CC="${FULLCC}" \ + CC="${CC}" \ APR=`which apr-1-config` APU=`which apu-1-config` \ CFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" \ OPENSSL="${STAGING_EXECPREFIXDIR}" diff --git a/meta/recipes-support/sqlite/sqlite3_3.8.6.0.bb b/meta/recipes-support/sqlite/sqlite3_3.8.7.4.bb index 32f60ebbeb..4c73d304da 100644 --- a/meta/recipes-support/sqlite/sqlite3_3.8.6.0.bb +++ b/meta/recipes-support/sqlite/sqlite3_3.8.7.4.bb @@ -10,8 +10,8 @@ PE = "3" SQLITE_PV = "${@sqlite_download_version(d)}" SRC_URI = "http://www.sqlite.org/2014/sqlite-autoconf-${SQLITE_PV}.tar.gz" -SRC_URI[md5sum] = "f7e4a156b583abeba349629e2364224b" -SRC_URI[sha256sum] = "53bab14255bc16c3d73fdbe54b364c1764709d68dda167587f8026c98b9f4e95" +SRC_URI[md5sum] = "33bb8db0038317ce1b0480ca1185c7ba" +SRC_URI[sha256sum] = "86370f139405fdfe03334fd618171a74e50f589f17ccbe5933361ed1f58359ec" S = "${WORKDIR}/sqlite-autoconf-${SQLITE_PV}" diff --git a/meta/recipes-support/taglib/taglib_1.9.1.bb b/meta/recipes-support/taglib/taglib_1.9.1.bb index 55e345f1cc..1f278144e3 100644 --- a/meta/recipes-support/taglib/taglib_1.9.1.bb +++ b/meta/recipes-support/taglib/taglib_1.9.1.bb @@ -12,8 +12,6 @@ SRC_URI = "http://taglib.github.io/releases/${BP}.tar.gz" SRC_URI[md5sum] = "0d35df96822bbd564c5504cb3c2e4d86" SRC_URI[sha256sum] = "72d371cd1419a87ae200447a53bff2be219283071e80fd12337928cc967dc71a" -S = "${WORKDIR}/${BP}" - BINCONFIG = "${bindir}/taglib-config" inherit cmake pkgconfig binconfig-disabled @@ -27,6 +25,6 @@ do_configure_prepend () { rm -f ${S}/admin/ltmain.sh rm -f ${S}/admin/libtool.m4.in # Don't have a floating dependeny on boost - sed -i -e "s/atomic.hpp/atomic-not-exist.hpp/" ${S}/ConfigureChecks.cmake + sed -i -e "s/atomic.hpp/atomic-not-exist.hpp/" ${S}/ConfigureChecks.cmake ${S}/taglib/toolkit/trefcounter.cpp } diff --git a/meta/site/arm-32 b/meta/site/arm-32 new file mode 100644 index 0000000000..81fd8d3103 --- /dev/null +++ b/meta/site/arm-32 @@ -0,0 +1,47 @@ +# definitions assuming 32-bit arm architecture + +# apache +ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4} +ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4} + +# glib +glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} +glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} +glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} + +# glib-2.0 +glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} +glib_cv_sizeof_intmax_t=${glib_cv_sizeof_intmax_t=8} +glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4} +glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4} +glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} +ac_cv_alignof_guint32=4 +ac_cv_alignof_guint64=8 +ac_cv_alignof_unsigned_long=4 + +# jikes +ac_cv_sizeof_wchar_t=4 + +# ORBit2 +ac_cv_alignof_CORBA_boolean=1 +ac_cv_alignof_CORBA_char=1 +ac_cv_alignof_CORBA_double=8 +ac_cv_alignof_CORBA_float=4 +ac_cv_alignof_CORBA_long=4 +ac_cv_alignof_CORBA_long_double=8 +ac_cv_alignof_CORBA_long_long=8 +ac_cv_alignof_CORBA_octet=1 +ac_cv_alignof_CORBA_pointer=4 +ac_cv_alignof_CORBA_short=2 +ac_cv_alignof_CORBA_struct=1 +ac_cv_alignof_CORBA_wchar=2 + +# at-spi2-core +ac_cv_alignof_char=1 +ac_cv_alignof_dbind_pointer=4 +ac_cv_alignof_dbind_struct=1 +ac_cv_alignof_dbus_bool_t=4 +ac_cv_alignof_dbus_int16_t=2 +ac_cv_alignof_dbus_int32_t=4 +ac_cv_alignof_dbus_int64_t=8 +ac_cv_alignof_double=8 diff --git a/meta/site/arm-64 b/meta/site/arm-64 new file mode 100644 index 0000000000..90c09b2d54 --- /dev/null +++ b/meta/site/arm-64 @@ -0,0 +1,46 @@ +# definitions assuming 64-bit arm architecture + +# general +ac_cv_sizeof_wchar_t=4 +ac_cv_sizeof_size_t=8 +ac_cv_sizeof_ssize_t=8 +ac_cv_alignof_char=1 +ac_cv_alignof_double=8 + +# glib +#glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} +#glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} +#glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} + +# glib-2.0 +#glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} +#glib_cv_sizeof_intmax_t=${glib_cv_sizeof_intmax_t=8} +#glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4} +#glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4} +#glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} +ac_cv_alignof_guint32=4 +ac_cv_alignof_guint64=8 +ac_cv_alignof_unsigned_long=8 + +# ORBit2 (should be in meta-gnome/site/arm-64) +#ac_cv_alignof_CORBA_boolean=1 +#ac_cv_alignof_CORBA_char=1 +#ac_cv_alignof_CORBA_double=8 +#ac_cv_alignof_CORBA_float=4 +#ac_cv_alignof_CORBA_long=4 +#ac_cv_alignof_CORBA_long_double=8 +#ac_cv_alignof_CORBA_long_long=8 +#ac_cv_alignof_CORBA_octet=1 +#ac_cv_alignof_CORBA_pointer=4 +#ac_cv_alignof_CORBA_short=2 +#ac_cv_alignof_CORBA_struct=1 +#ac_cv_alignof_CORBA_wchar=2 + +# at-spi2-core +ac_cv_alignof_dbind_pointer=8 +ac_cv_alignof_dbind_struct=1 +ac_cv_alignof_dbus_bool_t=4 +ac_cv_alignof_dbus_int16_t=2 +ac_cv_alignof_dbus_int32_t=4 +ac_cv_alignof_dbus_int64_t=8 + diff --git a/meta/site/arm-common b/meta/site/arm-common index 1893dc0ab8..12e5d4592a 100644 --- a/meta/site/arm-common +++ b/meta/site/arm-common @@ -11,7 +11,6 @@ ac_cv_sctp=${ac_cv_sctp=no} # apache ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} apr_cv_process_shared_works=${apr_cv_process_shared_works=no} -ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4} apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes} # bash @@ -51,8 +50,6 @@ ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes} am_cv_func_working_getline=${am_cv_func_working_getline=yes} # glib -glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} -glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} glib_cv_stack_grows=${glib_cv_stack_grows=no} glib_cv_uscore=${glib_cv_uscore=no} glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes} @@ -60,7 +57,6 @@ glib_cv_has__inline=${glib_cv_has__inline=yes} glib_cv_has__inline__=${glib_cv_has__inline__=yes} glib_cv_hasinline=${glib_cv_hasinline=yes} glib_cv_sane_realloc=${glib_cv_sane_realloc=yes} -glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} glib_cv_uscore=${glib_cv_uscore=no} glib_cv_va_val_copy=${glib_cv_va_val_copy=yes} glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no} @@ -70,15 +66,7 @@ glib_cv_sys_pthread_cond_timedwait_posix=${glib_cv_sys_pthread_cond_timedwait_po # glib-2.0 glib_cv_long_long_format=${glib_cv_long_long_format=ll} -glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} -glib_cv_sizeof_intmax_t=${glib_cv_sizeof_intmax_t=8} -glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4} -glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4} -glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} glib_cv_sys_use_pid_niceness_surrogate=${glib_cv_sys_use_pid_niceness_surrogate=yes} -ac_cv_alignof_guint32=4 -ac_cv_alignof_guint64=8 -ac_cv_alignof_unsigned_long=4 #gstreamer as_cv_unaligned_access=${as_cv_unaligned_access=no} @@ -86,9 +74,6 @@ as_cv_unaligned_access=${as_cv_unaligned_access=no} # httppc ac_cv_strerror_r_SUSv3=${ac_cv_strerror_r_SUSv3=no} -# jikes -ac_cv_sizeof_wchar_t=4 - # lftp ac_cv_need_trio=${ac_cv_need_trio=no} lftp_cv_va_val_copy=${lftp_cv_va_val_copy=yes} @@ -119,20 +104,6 @@ mysql_cv_func_atomic_add=${mysql_cv_func_atomic_add=no} ac_cv_regexec_segfault_emptystr=${ac_cv_regexec_segfault_emptystr=no} nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no} -# ORBit2 -ac_cv_alignof_CORBA_boolean=1 -ac_cv_alignof_CORBA_char=1 -ac_cv_alignof_CORBA_double=8 -ac_cv_alignof_CORBA_float=4 -ac_cv_alignof_CORBA_long=4 -ac_cv_alignof_CORBA_long_double=8 -ac_cv_alignof_CORBA_long_long=8 -ac_cv_alignof_CORBA_octet=1 -ac_cv_alignof_CORBA_pointer=4 -ac_cv_alignof_CORBA_short=2 -ac_cv_alignof_CORBA_struct=1 -ac_cv_alignof_CORBA_wchar=2 - # php ac_cv_pread=${ac_cv_pread=no} ac_cv_pwrite=${ac_cv_pwrite=no} @@ -186,12 +157,3 @@ jm_cv_func_working_readdir=yes # evolution-data-server ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes} -# at-spi2-core -ac_cv_alignof_char=1 -ac_cv_alignof_dbind_pointer=4 -ac_cv_alignof_dbind_struct=1 -ac_cv_alignof_dbus_bool_t=4 -ac_cv_alignof_dbus_int16_t=2 -ac_cv_alignof_dbus_int32_t=4 -ac_cv_alignof_dbus_int64_t=8 -ac_cv_alignof_double=8 |
