[oe-commits] org.oe.dev merge of '445066af3cf565c9d88cd6187570272cfa926958'
florian commit
openembedded-commits at lists.openembedded.org
Wed Aug 8 17:19:15 UTC 2007
merge of '445066af3cf565c9d88cd6187570272cfa926958'
and '76d3b20f964cec7e37a6e3a20c6298ed35aee629'
Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 70aa18fe06d3e3a4ad005666e02d3c53f91a5fa1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=70aa18fe06d3e3a4ad005666e02d3c53f91a5fa1
Files:
1
packages/oprofile/oprofile-0.9.1
packages/oprofile/oprofile-0.9.1/acinclude.m4
packages/oprofile/oprofile-0.9.1/no_arm_mapping_syms.patch
conf/distro/angstrom-2008.1.conf
packages/glibc/eglibc-package.bbclass
packages/oprofile/oprofile_0.9.3.bb
packages/p3scan/files/configure.in-add-newline.patch
packages/xorg-lib/pixman_0.9.4.bb
classes/update-rc.d.bbclass
packages/angstrom/angstrom-x11-image.bb
packages/cairo/cairo_git.bb
packages/glibc/eglibc_svn.bb
packages/matchbox2/matchbox-panel-2_svn.bb
packages/openmoko2/openmoko-terminal2_1.0.0.bb
packages/oprofile/oprofile_cvs.bb
packages/p3scan/p3scan_2.9.05d.bb
packages/gpe-bootsplash/files/splash-l.svg
packages/gpe-bootsplash/files/splash-p.svg
packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
packages/gpe-bootsplash/gpe-bootsplash_svn.bb
packages/tasks/task-gpe-base.bb
Diffs:
#
# mt diff -r445066af3cf565c9d88cd6187570272cfa926958 -r70aa18fe06d3e3a4ad005666e02d3c53f91a5fa1
#
#
#
# delete "packages/oprofile/oprofile-0.9.1"
#
# delete "packages/oprofile/oprofile-0.9.1/acinclude.m4"
#
# delete "packages/oprofile/oprofile-0.9.1/no_arm_mapping_syms.patch"
#
# add_file "conf/distro/angstrom-2008.1.conf"
# content [db66ecf290b2cc5303e089d928c440e0e7fb7614]
#
# add_file "packages/glibc/eglibc-package.bbclass"
# content [8328c4054f3e1a11f234ea681bc3158fa3acbacd]
#
# add_file "packages/oprofile/oprofile_0.9.3.bb"
# content [f756427d410e1704dcdc1e0d1000a9e01fbc4313]
#
# add_file "packages/p3scan/files/configure.in-add-newline.patch"
# content [d85a0e848c2f072859edc2d4ed3896e7089cf873]
#
# add_file "packages/xorg-lib/pixman_0.9.4.bb"
# content [6002cacba559357ff4f92dcd51bf84eb62218310]
#
# patch "classes/update-rc.d.bbclass"
# from [8812f2d73cbeef9536c5598c2f3c1888e35b0aa3]
# to [aad4a9f7c2ea238e727751a6fd3e2675923cc9be]
#
# patch "packages/angstrom/angstrom-x11-image.bb"
# from [1b1ff2576e45aeb4cea7016dd081d42334955b36]
# to [72ac30a3a1a9a6405bfbb3ec0914d706d5e61d82]
#
# patch "packages/cairo/cairo_git.bb"
# from [1c00263d6ad25fddad7c49bea1163479c265e3eb]
# to [dd7161f8e758e0a6da0647250f2845ac50953f43]
#
# patch "packages/glibc/eglibc_svn.bb"
# from [58b807f12553100239940bff59a0d4d5e378fd21]
# to [879645d294cfb3a060b88f5cd32e7d3c3607e39e]
#
# patch "packages/matchbox2/matchbox-panel-2_svn.bb"
# from [280611ffa65d272ecb799b3c5a914b7a059bba7d]
# to [f48c21f7a7a584341bb86d796bb80db3245c52ee]
#
# patch "packages/openmoko2/openmoko-terminal2_1.0.0.bb"
# from [dac523cf78aa60821651434210c00c5eb6511343]
# to [004503598ec2b6d3ed4f81cb2d826000ba15ad1e]
#
# patch "packages/oprofile/oprofile_cvs.bb"
# from [e1e2c8e310c52cdb0da917f1a463dcfb90ed1be9]
# to [219f961286e4c839f32b63f5e425108ac7e3dacd]
#
# patch "packages/p3scan/p3scan_2.9.05d.bb"
# from [d8576cf93e4277e8e1f962ffc4bf08fa7cf3eef0]
# to [d16800fce7f242b13af682bd3f5659d757ceb2a8]
#
============================================================
--- conf/distro/angstrom-2008.1.conf db66ecf290b2cc5303e089d928c440e0e7fb7614
+++ conf/distro/angstrom-2008.1.conf db66ecf290b2cc5303e089d928c440e0e7fb7614
@@ -0,0 +1,36 @@
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Angstrom <http://www.angstrom-distribution.org>
+#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices
+#@MAINTAINER: Koen Kooi <koen at dominion.kabel.utwente.nl>
+#@MAINTAINER: Michael 'Mickey' Lauer <mickey at Vanille-media.de>
+#@--------------------------------------------------------------------
+
+# This is a testbed for unstable and/or untested things, while angstrom-2007.1
+# is aiming for stability and a release.
+# Use this at your own risk, we welcome bugreports filed at
+# http://bugs.openembedded.org
+# In doubt, use DISTRO="angstrom-2007.1"
+
+require conf/distro/angstrom-2007.1.conf
+
+#DISTRO_VERSION = "2008.1"
+DISTRO_VERSION = "2008.1-test-${DATE}"
+DISTRO_REVISION = "0"
+
+PREFERRED_VERSION_gcc ?= "4.2.1"
+PREFERRED_VERSION_gcc-cross ?= "4.2.1"
+
+PREFERRED_VERSION_binutils ?= "2.17.50.0.12"
+PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12"
+PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.12"
+
+#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.22"
+
+#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing.
+PREFERRED_VERSION_glibc ?= "2.6"
+PREFERRED_VERSION_glibc-intermediate ?= "2.6"
+PREFERRED_VERSION_glibc-initial ?= "2.6"
+
+
============================================================
--- packages/glibc/eglibc-package.bbclass 8328c4054f3e1a11f234ea681bc3158fa3acbacd
+++ packages/glibc/eglibc-package.bbclass 8328c4054f3e1a11f234ea681bc3158fa3acbacd
@@ -0,0 +1,319 @@
+#
+# 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 eglibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+python __anonymous () {
+ import bb, re
+ uc_os = (re.match('.*uclibc*', bb.data.getVar('TARGET_OS', d, 1)) != None)
+ if uc_os:
+ raise bb.parse.SkipPackage("incompatible with target %s" %
+ bb.data.getVar('TARGET_OS', d, 1))
+}
+
+
+# Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION
+# is set. The idea is to avoid running localedef on the target (at first boot)
+# to decrease initial boot time and avoid localedef being killed by the OOM
+# killer which used to effectively break i18n on machines with < 128MB RAM.
+
+# default to disabled until qemu works for everyone
+ENABLE_BINARY_LOCALE_GENERATION ?= "0"
+
+# BINARY_LOCALE_ARCHES is a space separated list of regular expressions
+BINARY_LOCALE_ARCHES ?= "arm.*"
+
+PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile"
+PACKAGES_DYNAMIC = "eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*"
+
+libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*"
+
+FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir}/* ${datadir}/zoneinfo"
+FILES_ldd = "${bindir}/ldd"
+FILES_libsegfault = "/lib/libSegFault*"
+FILES_eglibc-extra-nss = "/lib/libnss*"
+FILES_sln = "/sbin/sln"
+FILES_eglibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen"
+FILES_nscd = "${sbindir}/nscd*"
+FILES_eglibc-utils = "${bindir}/* ${sbindir}/*"
+FILES_eglibc-gconv = "${libdir}/gconv/*"
+FILES_${PN}-dbg += "${libexecdir}/getconf/.debug ${libdir}/gconv/.debug"
+FILES_catchsegv = "${bindir}/catchsegv"
+RDEPENDS_catchsegv = "libsegfault"
+FILES_eglibc-pcprofile = "/lib/libpcprofile.so"
+FILES_eglibc-thread-db = "/lib/libthread_db*"
+FILES_localedef = "${bindir}/localedef"
+RPROVIDES_eglibc-dev += "libc-dev"
+
+DESCRIPTION_sln = "eglibc: create symbolic links between files"
+DESCRIPTION_nscd = "eglibc: name service cache daemon for passwd, group, and hosts"
+DESCRIPTION_eglibc-extra-nss = "eglibc: nis, nisplus and hesiod search services"
+DESCRIPTION_ldd = "eglibc: print shared library dependencies"
+DESCRIPTION_localedef = "eglibc: compile locale definition files"
+DESCRIPTION_eglibc-utils = "eglibc: misc utilities like iconf, local, gencat, tzselect, rpcinfo, ..."
+
+def get_eglibc_fpu_setting(bb, d):
+ if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+ return "--without-fp"
+ return ""
+
+EXTRA_OECONF += "${@get_eglibc_fpu_setting(bb, d)}"
+
+OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
+
+do_install() {
+ oe_runmake install_root=${D} install
+ for r in ${rpcsvc}; do
+ h=`echo $r|sed -e's,\.x$,.h,'`
+ install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/
+ done
+ install -m 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/
+ install -d ${D}${libdir}/locale
+ make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED"
+ # get rid of some broken files...
+ for i in ${GLIBC_BROKEN_LOCALES}; do
+ grep -v $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp
+ mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED
+ done
+ rm -f ${D}/etc/rpc
+}
+
+TMP_LOCALE="/tmp/locale${libdir}/locale"
+
+locale_base_postinst() {
+#!/bin/sh
+
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
+rm -rf ${TMP_LOCALE}
+mkdir -p ${TMP_LOCALE}
+if [ -f ${libdir}/locale/locale-archive ]; then
+ cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/
+fi
+localedef --inputfile=${datadir}/i18n/locales/%s --charmap=%s --prefix=/tmp/locale %s
+mkdir -p ${libdir}/locale/
+mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/
+rm -rf ${TMP_LOCALE}
+}
+
+locale_base_postrm() {
+#!/bin/sh
+
+rm -rf ${TMP_LOCALE}
+mkdir -p ${TMP_LOCALE}
+if [ -f ${libdir}/locale/locale-archive ]; then
+ cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/
+fi
+localedef --delete-from-archive --inputfile=${datadir}/locales/%s --charmap=%s --prefix=/tmp/locale %s
+mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/
+rm -rf ${TMP_LOCALE}
+}
+
+python __anonymous () {
+ enabled = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", d, 1)
+
+ if enabled and int(enabled):
+ import re
+
+ target_arch = bb.data.getVar("TARGET_ARCH", d, 1)
+ binary_arches = bb.data.getVar("BINARY_LOCALE_ARCHES", d, 1) or ""
+
+ for regexp in binary_arches.split(" "):
+ r = re.compile(regexp)
+
+ if r.match(target_arch):
+ depends = bb.data.getVar("DEPENDS", d, 1)
+ depends = "%s qemu-native" % depends
+ bb.data.setVar("DEPENDS", depends, d)
+ bb.data.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "1", d)
+ break
+}
+
+do_prep_locale_tree() {
+ treedir=${WORKDIR}/locale-tree
+ rm -rf $treedir
+ mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale
+ cp -a ${D}${datadir}/i18n $treedir/${datadir}/i18n
+ # unzip to avoid parsing errors
+ for i in $treedir/${datadir}/i18n/charmaps/*gz; do
+ gunzip $i
+ done
+ ls ${D}/lib/* | xargs -iBLAH cp -a BLAH $treedir/lib
+ if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then
+ cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib
+ fi
+ install -m 0755 ${D}${bindir}/localedef $treedir/bin
+}
+
+do_collect_bins_from_locale_tree() {
+ treedir=${WORKDIR}/locale-tree
+
+ mkdir -p ${D}${libdir}
+ cp -a $treedir/${libdir}/locale ${D}${libdir}
+}
+
+python package_do_split_gconvs () {
+ import os, re
+ if (bb.data.getVar('PACKAGE_NO_GCONV', d, 1) == '1'):
+ bb.note("package requested not splitting gconvs")
+ return
+
+ if not bb.data.getVar('PACKAGES', d, 1):
+ return
+
+ libdir = bb.data.getVar('libdir', d, 1)
+ if not libdir:
+ bb.error("libdir not defined")
+ return
+ datadir = bb.data.getVar('datadir', d, 1)
+ if not datadir:
+ bb.error("datadir not defined")
+ return
+
+ gconv_libdir = base_path_join(libdir, "gconv")
+ charmap_dir = base_path_join(datadir, "i18n", "charmaps")
+ locales_dir = base_path_join(datadir, "i18n", "locales")
+ binary_locales_dir = base_path_join(libdir, "locale")
+
+ do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='eglibc-gconv-%s', description='gconv module for character set %s', extra_depends='eglibc-gconv')
+
+ do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='eglibc-charmap-%s', description='character map for %s encoding', extra_depends='')
+
+ def calc_locale_deps(fn, pkg, file_regex, output_pattern, group):
+ deps = []
+ f = open(fn, "r")
+ c_re = re.compile('^copy "(.*)"')
+ i_re = re.compile('^include "(\w+)".*')
+ for l in f.readlines():
+ m = c_re.match(l) or i_re.match(l)
+ if m:
+ dp = legitimize_package_name('eglibc-localedata-%s' % m.group(1))
+ if not dp in deps:
+ deps.append(dp)
+ f.close()
+ if deps != []:
+ bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d)
+
+ do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='eglibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='')
+ bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' eglibc-gconv', d)
+
+ supported = bb.data.getVar('GLIBC_GENERATE_LOCALES', d, 1)
+ if not supported or supported == "all":
+ f = open(base_path_join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r")
+ supported = f.readlines()
+ f.close()
+ else:
+ supported = supported.split()
+ supported = map(lambda s:s.replace(".", " ") + "\n", supported)
+
+ dot_re = re.compile("(.*)\.(.*)")
+
+ # Collate the locales by base and encoding
+ encodings = {}
+ for l in supported:
+ l = l[:-1]
+ (locale, charset) = l.split(" ")
+ m = dot_re.match(locale)
+ if m:
+ locale = m.group(1)
+ if not encodings.has_key(locale):
+ encodings[locale] = []
+ encodings[locale].append(charset)
+
+ def output_locale_source(name, locale, encoding):
+ pkgname = 'locale-base-' + legitimize_package_name(name)
+
+ bb.data.setVar('RDEPENDS_%s' % pkgname, 'localedef eglibc-localedata-%s eglibc-charmap-%s' % (legitimize_package_name(locale), legitimize_package_name(encoding)), d)
+ rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
+ m = re.match("(.*)_(.*)", name)
+ if m:
+ rprovides += ' virtual-locale-%s' % m.group(1)
+ bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d)
+ bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d)
+ bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d)
+ bb.data.setVar('pkg_postinst_%s' % pkgname, bb.data.getVar('locale_base_postinst', d, 1) % (locale, encoding, locale), d)
+ bb.data.setVar('pkg_postrm_%s' % pkgname, bb.data.getVar('locale_base_postrm', d, 1) % (locale, encoding, locale), d)
+
+ def output_locale_binary(name, locale, encoding):
+ target_arch = bb.data.getVar("TARGET_ARCH", d, 1)
+ qemu = "qemu-%s -r 2.6.16" % target_arch
+ pkgname = 'locale-base-' + legitimize_package_name(name)
+ m = re.match("(.*)\.(.*)", name)
+ if m:
+ eglibc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-",""))
+ else:
+ eglibc_name = name
+ bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('eglibc-binary-localedata-%s' % eglibc_name), d)
+ rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
+ m = re.match("(.*)_(.*)", name)
+ if m:
+ rprovides += ' virtual-locale-%s' % m.group(1)
+ bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d)
+ bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d)
+ bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d)
+
+ treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree")
+ path = bb.data.getVar("PATH", d, 1)
+ i18npath = base_path_join(treedir, datadir, "i18n")
+
+ localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name)
+ cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts)
+ bb.note("generating locale %s (%s)" % (locale, encoding))
+ if os.system(cmd):
+ raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd)
+
+ def output_locale(name, locale, encoding):
+ use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1)
+ if use_bin:
+ output_locale_binary(name, locale, encoding)
+ else:
+ output_locale_source(name, locale, encoding)
+
+ use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1)
+ if use_bin:
+ bb.note("preparing tree for binary locale generation")
+ bb.build.exec_func("do_prep_locale_tree", d)
+
+ # Reshuffle names so that UTF-8 is preferred over other encodings
+ non_utf8 = []
+ for l in encodings.keys():
+ if len(encodings[l]) == 1:
+ output_locale(l, l, encodings[l][0])
+ if encodings[l][0] != "UTF-8":
+ non_utf8.append(l)
+ else:
+ if "UTF-8" in encodings[l]:
+ output_locale(l, l, "UTF-8")
+ encodings[l].remove("UTF-8")
+ else:
+ non_utf8.append(l)
+ for e in encodings[l]:
+ output_locale('%s.%s' % (l, e), l, e)
+
+ if non_utf8 != []:
+ bb.note("the following locales are supported only in legacy encodings:")
+ bb.note(" " + " ".join(non_utf8))
+
+ use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1)
+ if use_bin:
+ bb.note("collecting binary locales from locale tree")
+ bb.build.exec_func("do_collect_bins_from_locale_tree", d)
+ do_split_packages(d, binary_locales_dir, file_regex='(.*)', output_pattern='eglibc-binary-localedata-%s', description='binary locale definition for %s', extra_depends='', allow_dirs=True)
+ else:
+ bb.note("generation of binary locales disabled. this may break i18n!")
+
+}
+
+# We want to do this indirection so that we can safely 'return'
+# from the called function even though we're prepending
+python populate_packages_prepend () {
+ if bb.data.getVar('DEBIAN_NAMES', d, 1):
+ bb.data.setVar('PKG_eglibc', 'libc6', d)
+ bb.data.setVar('PKG_eglibc-dev', 'libc6-dev', d)
+ bb.build.exec_func('package_do_split_gconvs', d)
+}
============================================================%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r76d3b20f964cec7e37a6e3a20c6298ed35aee629 -r70aa18fe06d3e3a4ad005666e02d3c53f91a5fa1
#
#
#
# patch "packages/gpe-bootsplash/files/splash-l.svg"
# from [e5b37c3b72eaeeaebd2e64eb3bad70b1d71c5262]
# to [c50e45ea0b3790fddabd9310d8523cf64c6c8fd3]
#
# patch "packages/gpe-bootsplash/files/splash-p.svg"
# from [6c6bb3d4395e33842b850a293b3819a22d52e114]
# to [d56edda0e1f901b8722c0b17c28bea2bbe8bae99]
#
# patch "packages/gpe-bootsplash/gpe-bootsplash_1.15.bb"
# from [075897d68ce037cb915939be717f54cec47b5cd2]
# to [ec2e88f8463e277d67b8e301d189e6d150571985]
#
# patch "packages/gpe-bootsplash/gpe-bootsplash_svn.bb"
# from [69c40d83cd9e1cc9f3270d6a602a0bf31943c3ca]
# to [cbe4f652d45f3cd419507cbe69faba34984e0396]
#
# patch "packages/tasks/task-gpe-base.bb"
# from [7b0ff364b7354fca91acc52789a7ec6ca3a9190b]
# to [45d607f3e11edf402d5e91f0cc3f7444e0713c27]
#
============================================================
--- packages/gpe-bootsplash/files/splash-l.svg e5b37c3b72eaeeaebd2e64eb3bad70b1d71c5262
+++ packages/gpe-bootsplash/files/splash-l.svg c50e45ea0b3790fddabd9310d8523cf64c6c8fd3
@@ -6,15 +6,17 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg1"
sodipodi:version="0.32"
- inkscape:version="0.42"
+ inkscape:version="0.45"
width="8.0000000cm"
height="6.0000000cm"
sodipodi:docname="splash-l.svg"
- sodipodi:docbase="/home/koen/Desktop">
+ sodipodi:docbase="/home/fuchs/Projekte/oe/dev/packages/gpe-bootsplash/files"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ sodipodi:modified="true">
<metadata
id="metadata27">
<rdf:RDF>
@@ -35,15 +37,15 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="2.0000000"
+ inkscape:zoom="2"
inkscape:cx="130.17183"
inkscape:cy="82.153473"
inkscape:window-width="1024"
inkscape:window-height="746"
showguides="true"
snaptoguides="true"
- inkscape:window-x="1171"
- inkscape:window-y="138"
+ inkscape:window-x="261"
+ inkscape:window-y="139"
inkscape:current-layer="svg1" />
<path
style="fill:#9ca3c2;fill-rule:evenodd;stroke:#000000;stroke-width:0.86250001;stroke-linecap:round;stroke-linejoin:round;"
@@ -157,8 +159,7 @@
sodipodi:nodetypes="cssssss" />
</g>
<path
- transform="scale(1.016596,0.983675)"
- style="font-size:24.295891px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans"
- d="M 32.449651,158.02394 L 32.449651,153.26679 L 28.534786,153.26679 L 28.534786,151.29749 L 34.822297,151.29749 L 34.822297,158.90182 C 33.896949,159.55826 32.876713,160.05651 31.761584,160.39659 C 30.646428,160.72876 29.456152,160.89485 28.190753,160.89485 C 25.422659,160.89485 23.255645,160.08815 21.689704,158.47475 C 20.131664,156.85344 19.352646,154.59943 19.352648,151.71271 C 19.352646,148.81809 20.131664,146.56408 21.689704,144.95067 C 23.255645,143.32938 25.422659,142.51872 28.190753,142.51871 C 29.345429,142.51872 30.440799,142.66108 31.476867,142.94578 C 32.520816,143.23052 33.481737,143.64968 34.359631,144.20328 L 34.359631,146.75388 C 33.473828,146.00255 32.532680,145.43707 31.536183,145.05744 C 30.539659,144.67783 29.491742,144.48802 28.392428,144.48800 C 26.225403,144.48802 24.596188,145.09304 23.504778,146.30308 C 22.421265,147.51314 21.879511,149.31635 21.879515,151.71271 C 21.879511,154.10118 22.421265,155.90043 23.504778,157.11048 C 24.596188,158.32053 26.225403,158.92555 28.392428,158.92555 C 29.238660,158.92555 29.993951,158.85437 30.658304,158.71201 C 31.322631,158.56175 31.919747,158.33239 32.449651,158.02394 M 41.608064,144.80831 L 41.608064,151.46358 L 44.621324,151.46358 C 45.736458,151.46359 46.598518,151.17492 47.207507,150.59756 C 47.816475,150.02023 48.120964,149.19771 48.120976,148.13001 C 48.120964,147.07024 47.816475,146.25168 47.207507,145.67432 C 46.598518,145.09700 45.736458,144.80832 44.621324,144.80831 L 41.608064,144.80831 M 39.211692,142.83901 L 44.621324,142.83901 C 46.606427,142.83903 48.105147,143.28983 49.117487,144.19142 C 50.137711,145.08513 50.647829,146.39799 50.647843,148.13001 C 50.647829,149.87787 50.137711,151.19864 49.117487,152.09233 C 48.105147,152.98603 46.606427,153.43288 44.621324,153.43288 L 41.608064,153.43288 L 41.608064,160.55081 L 39.211692,160.55081 L 39.211692,142.83901 M 53.874640,142.83901 L 65.073527,142.83901 L 65.073527,144.85576 L 56.271012,144.85576 L 56.271012,150.09931 L 64.705767,150.09931 L 64.705767,152.11606 L 56.271012,152.11606 L 56.271012,158.53406 L 65.287065,158.53406 L 65.287065,160.55081 L 53.874640,160.55081 L 53.874640,142.83901 M 79.261950,158.53406 L 87.625525,158.53406 L 87.625525,160.55081 L 76.379185,160.55081 L 76.379185,158.53406 C 77.288697,157.59292 78.526425,156.33146 80.092375,154.74969 C 81.666223,153.16003 82.654825,152.13584 83.058182,151.67712 C 83.825329,150.81507 84.359173,150.08746 84.659718,149.49428 C 84.968152,148.89322 85.122374,148.30402 85.122384,147.72666 C 85.122374,146.78553 84.790204,146.01837 84.125873,145.42520 C 83.469432,144.83205 82.611326,144.53547 81.551552,144.53545 C 80.800209,144.53547 80.005373,144.66597 79.167044,144.92694 C 78.336614,145.18795 77.446873,145.58339 76.497817,146.11326 L 76.497817,143.69316 C 77.462690,143.30565 78.364295,143.01302 79.202633,142.81529 C 80.040963,142.61758 80.808117,142.51872 81.504100,142.51871 C 83.338937,142.51872 84.802067,142.97743 85.893494,143.89484 C 86.984899,144.81228 87.530606,146.03814 87.530619,147.57244 C 87.530606,148.30006 87.392202,148.99208 87.115406,149.64851 C 86.846494,150.29704 86.352194,151.06419 85.632503,151.94997 C 85.434772,152.17934 84.806021,152.84368 83.746250,153.94299 C 82.686460,155.03442 81.191695,156.56477 79.261950,158.53406 M 92.667394,157.53755 L 95.170535,157.53755 L 95.170535,160.55081 L 92.667394,160.55081 L 92.667394,157.53755 M 99.797195,142.83901 L 111.18589,142.83901 L 111.18589,143.85925 L 104.75602,160.55081 L 102.25288,160.55081 L 108.30313,144.85576 L 99.797195,144.85576 L 99.797195,142.83901"
- id="text1432" />
+ style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ d="M 33.285156,155.60233 L 33.285156,150.90311 L 29.417969,150.90311 L 29.417969,148.95779 L 35.628906,148.95779 L 35.628906,156.46951 C 34.714828,157.11795 33.707017,157.61014 32.605469,157.94608 C 31.503894,158.2742 30.328114,158.43826 29.078125,158.43826 C 26.343743,158.43826 24.20312,157.64139 22.65625,156.04764 C 21.117185,154.44608 20.347655,152.21952 20.347656,149.36795 C 20.347655,146.50859 21.117185,144.28203 22.65625,142.68826 C 24.20312,141.08672 26.343743,140.28594 29.078125,140.28592 C 30.218739,140.28594 31.300769,140.42656 32.324219,140.70779 C 33.355454,140.98906 34.304672,141.40312 35.171875,141.94998 L 35.171875,144.46951 C 34.29686,143.72734 33.367173,143.16875 32.382812,142.79373 C 31.398425,142.41875 30.36327,142.23125 29.277344,142.23123 C 27.136711,142.23125 25.527337,142.8289 24.449219,144.0242 C 23.378902,145.21953 22.843746,147.00077 22.84375,149.36795 C 22.843746,151.72733 23.378902,153.50467 24.449219,154.69998 C 25.527337,155.8953 27.136711,156.49295 29.277344,156.49295 C 30.11327,156.49295 30.859363,156.42264 31.515625,156.28201 C 32.171862,156.13358 32.761705,155.90702 33.285156,155.60233 M 42.332031,142.54764 L 42.332031,149.12186 L 45.308594,149.12186 C 46.410147,149.12187 47.261709,148.83671 47.863281,148.26639 C 48.464833,147.69609 48.765614,146.88359 48.765625,145.82889 C 48.765614,144.78203 48.464833,143.97343 47.863281,143.40311 C 47.261709,142.83281 46.410147,142.54765 45.308594,142.54764 L 42.332031,142.54764 M 39.964844,140.60233 L 45.308594,140.60233 C 47.269522,140.60234 48.749989,141.04765 49.75,141.93826 C 50.757799,142.82109 51.261705,144.11796 51.261719,145.82889 C 51.261705,147.55546 50.757799,148.86015 49.75,149.74295 C 48.749989,150.62577 47.269522,151.06718 45.308594,151.06717 L 42.332031,151.06717 L 42.332031,158.09842 L 39.964844,158.09842 L 39.964844,140.60233 M 54.449219,140.60233 L 65.511719,140.60233 L 65.511719,142.59451 L 56.816406,142.59451 L 56.816406,147.7742 L 65.148438,147.7742 L 65.148438,149.76639 L 56.816406,149.76639 L 56.816406,156.10623 L 65.722656,156.10623 L 65.722656,158.09842 L 54.449219,158.09842 L 54.449219,140.60233 M 79.527344,156.10623 L 87.789062,156.10623 L 87.789062,158.09842 L 76.679688,158.09842 L 76.679688,156.10623 C 77.578122,155.17655 78.800777,153.93045 80.347656,152.36795 C 81.902337,150.79765 82.878898,149.78593 83.277344,149.33279 C 84.035147,148.48124 84.56249,147.76249 84.859375,147.17654 C 85.164052,146.58281 85.316396,146.00078 85.316406,145.43045 C 85.316396,144.50078 84.988271,143.74296 84.332031,143.15701 C 83.683585,142.57109 82.83593,142.27812 81.789062,142.27811 C 81.046869,142.27812 80.261713,142.40703 79.433594,142.66483 C 78.613278,142.92265 77.734372,143.31328 76.796875,143.8367 L 76.796875,141.44608 C 77.749997,141.06328 78.640621,140.77422 79.46875,140.57889 C 80.29687,140.38359 81.054681,140.28594 81.742188,140.28592 C 83.554679,140.28594 84.99999,140.73906 86.078125,141.64529 C 87.156238,142.55156 87.6953,143.7625 87.695312,145.27811 C 87.6953,145.99687 87.558581,146.68046 87.285156,147.32889 C 87.019519,147.96952 86.531238,148.72733 85.820312,149.60233 C 85.624989,149.8289 85.003896,150.48515 83.957031,151.57108 C 82.910148,152.64921 81.433587,154.16092 79.527344,156.10623 M 92.769531,155.12186 L 95.242188,155.12186 L 95.242188,158.09842 L 92.769531,158.09842 L 92.769531,155.12186 M 105.47266,149.78983 C 104.34765,149.78983 103.46093,150.09061 102.8125,150.69217 C 102.17187,151.29374 101.85156,152.12186 101.85156,153.17654 C 101.85156,154.23124 102.17187,155.05936 102.8125,155.66092 C 103.46093,156.26248 104.34765,156.56326 105.47266,156.56326 C 106.59765,156.56326 107.48437,156.26248 108.13281,155.66092 C 108.78124,155.05155 109.10546,154.22342 109.10547,153.17654 C 109.10546,152.12186 108.78124,151.29374 108.13281,150.69217 C 107.49218,150.09061 106.60546,149.78983 105.47266,149.78983 M 103.10547,148.78201 C 102.08984,148.53202 101.29687,148.05937 100.72656,147.36404 C 100.16406,146.66874 99.88281,145.82109 99.882812,144.82108 C 99.88281,143.42265 100.3789,142.31718 101.37109,141.50467 C 102.37109,140.69219 103.73828,140.28594 105.47266,140.28592 C 107.21483,140.28594 108.58202,140.69219 109.57422,141.50467 C 110.56639,142.31718 111.06249,143.42265 111.0625,144.82108 C 111.06249,145.82109 110.77733,146.66874 110.20703,147.36404 C 109.64452,148.05937 108.85936,148.53202 107.85156,148.78201 C 108.99218,149.04765 109.87889,149.56718 110.51172,150.34061 C 111.15233,151.11405 111.47264,152.05936 111.47266,153.17654 C 111.47264,154.87186 110.95311,156.17264 109.91406,157.07889 C 108.8828,157.98514 107.40233,158.43826 105.47266,158.43826 C 103.54296,158.43826 102.05859,157.98514 101.01953,157.07889 C 99.988279,156.17264 99.472655,154.87186 99.472656,153.17654 C 99.472655,152.05936 99.792967,151.11405 100.43359,150.34061 C 101.07422,149.56718 101.96484,149.04765 103.10547,148.78201 M 102.23828,145.04373 C 102.23828,145.94999 102.51953,146.65702 103.08203,147.16483 C 103.65234,147.67265 104.44921,147.92655 105.47266,147.92654 C 106.48827,147.92655 107.28124,147.67265 107.85156,147.16483 C 108.42968,146.65702 108.71874,145.94999 108.71875,145.04373 C 108.71874,144.1375 108.42968,143.43047 107.85156,142.92264 C 107.28124,142.41484 106.48827,142.16094 105.47266,142.16092 C 104.44921,142.16094 103.65234,142.41484 103.08203,142.92264 C 102.51953,143.43047 102.23828,144.1375 102.23828,145.04373"
+ id="text2179" />
</svg>
============================================================
--- packages/gpe-bootsplash/files/splash-p.svg 6c6bb3d4395e33842b850a293b3819a22d52e114
+++ packages/gpe-bootsplash/files/splash-p.svg d56edda0e1f901b8722c0b17c28bea2bbe8bae99
@@ -6,15 +6,17 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg1"
sodipodi:version="0.32"
- inkscape:version="0.42"
+ inkscape:version="0.45"
width="170.00000pt"
height="226.00000pt"
sodipodi:docname="splash-p.svg"
- sodipodi:docbase="/home/koen/Desktop">
+ sodipodi:docbase="/home/fuchs/Projekte/oe/dev/packages/gpe-bootsplash/files"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ sodipodi:modified="true">
<metadata
id="metadata1148">
<rdf:RDF>
@@ -52,14 +54,14 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="2.0000000"
+ inkscape:zoom="2"
inkscape:cx="123.79126"
- inkscape:cy="136.70730"
- inkscape:window-width="674"
+ inkscape:cy="146.29532"
+ inkscape:window-width="893"
inkscape:window-height="682"
showguides="true"
snaptoguides="true"
- inkscape:window-x="1066"
+ inkscape:window-x="697"
inkscape:window-y="190"
inkscape:current-layer="svg1"
showborder="true"
@@ -178,7 +180,7 @@
sodipodi:nodetypes="cssssss" />
</g>
<path
- style="font-size:24.000000px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans"
- d="M 70.932617,129.37206 L 70.932617,124.67284 L 67.065430,124.67284 L 67.065430,122.72753 L 73.276367,122.72753 L 73.276367,130.23925 C 72.362289,130.88769 71.354477,131.37988 70.252930,131.71581 C 69.151355,132.04394 67.975575,132.20800 66.725586,132.20800 C 63.991204,132.20800 61.850581,131.41113 60.303711,129.81738 C 58.764646,128.21582 57.995116,125.98926 57.995117,123.13769 C 57.995116,120.27832 58.764646,118.05176 60.303711,116.45800 C 61.850581,114.85645 63.991204,114.05567 66.725586,114.05566 C 67.866200,114.05567 68.948230,114.19630 69.971680,114.47753 C 71.002915,114.75880 71.952133,115.17286 72.819336,115.71972 L 72.819336,118.23925 C 71.944321,117.49708 71.014634,116.93848 70.030273,116.56347 C 69.045886,116.18848 68.010731,116.00098 66.924805,116.00097 C 64.784172,116.00098 63.174798,116.59864 62.096680,117.79394 C 61.026363,118.98926 60.491207,120.77051 60.491211,123.13769 C 60.491207,125.49707 61.026363,127.27441 62.096680,128.46972 C 63.174798,129.66503 64.784172,130.26269 66.924805,130.26269 C 67.760731,130.26269 68.506824,130.19238 69.163086,130.05175 C 69.819323,129.90331 70.409166,129.67675 70.932617,129.37206 M 79.979492,116.31738 L 79.979492,122.89159 L 82.956055,122.89159 C 84.057608,122.89160 84.909170,122.60645 85.510742,122.03613 C 86.112294,121.46582 86.413075,120.65332 86.413086,119.59863 C 86.413075,118.55176 86.112294,117.74317 85.510742,117.17284 C 84.909170,116.60255 84.057608,116.31739 82.956055,116.31738 L 79.979492,116.31738 M 77.612305,114.37206 L 82.956055,114.37206 C 84.916983,114.37208 86.397450,114.81739 87.397461,115.70800 C 88.405260,116.59083 88.909166,117.88770 88.909180,119.59863 C 88.909166,121.32520 88.405260,122.62988 87.397461,123.51269 C 86.397450,124.39551 84.916983,124.83691 82.956055,124.83691 L 79.979492,124.83691 L 79.979492,131.86816 L 77.612305,131.86816 L 77.612305,114.37206 M 92.096680,114.37206 L 103.15918,114.37206 L 103.15918,116.36425 L 94.463867,116.36425 L 94.463867,121.54394 L 102.79590,121.54394 L 102.79590,123.53613 L 94.463867,123.53613 L 94.463867,129.87597 L 103.37012,129.87597 L 103.37012,131.86816 L 92.096680,131.86816 L 92.096680,114.37206 M 117.17480,129.87597 L 125.43652,129.87597 L 125.43652,131.86816 L 114.32715,131%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list