diff options
60 files changed, 796 insertions, 163 deletions
diff --git a/classes/canadian-sdk.bbclass b/classes/canadian-sdk.bbclass index d73b62f485..6b4fdf878a 100644 --- a/classes/canadian-sdk.bbclass +++ b/classes/canadian-sdk.bbclass @@ -24,9 +24,12 @@ LDFLAGS = "${SDK_LDFLAGS}" # and otherwise just DEPENDS_prepend = "virtual/${HOST_PREFIX}binutils " -SDK_PATH_sdk-mingw32 = "/OpenEmbedded/${SDK_NAME}" + +# On mingw systems we want to have the real sysroot default to c:/... and +# assume that the default install will be on the C drive. This can be changed +# by setting SDK_REALPATH_MINGW. SDK_REALPATH = "${SDK_PATH}" -SDK_REALPATH_sdk-mingw32 = "C:/OpenEmbedded/${SDK_NAME}" +SDK_REALPATH_MINGW ?= "C:" # Path prefixes prefix = "${SDK_PATH}" diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 3e519c3253..9fc5f0718d 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -184,7 +184,7 @@ def package_qa_make_fatal_error(error_class, name, path,d): TODO: Load a whitelist of known errors """ - return not error_class in [0, 5, 7, 9] + return not error_class in [0, 5, 7] def package_qa_write_error(error_class, name, path, d): """ diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 136f01c228..f31e56de89 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -629,6 +629,7 @@ OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUIL # Include the rest of the config files. ################################################################## +require conf/collections.inc include conf/site.conf include conf/auto.conf include conf/local.conf diff --git a/conf/checksums.ini b/conf/checksums.ini index 0b05edff44..c638792cb8 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1970,6 +1970,10 @@ sha256=fce50bc26351bbbe31154d9a734cb433ec8fb404efc5febd50c149e5eaf62449 md5=dc3fc7209752207c23e7c94ab886b340 sha256=636eef7f400c2f3df489c0d2fa21507e88692113561e75a40a26c52bc422d7fc +[ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz] +md5=9de56d4a161a723228220b0f425dc711 +sha256=f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e + [ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.57.tar.bz2] md5=407ea53787ce13f5ca427e9a51e05bc2 sha256=e1035aa2c21fae2a934d1ab56c774ce9d22717881dab8a1a5b16d294fb793489 @@ -2562,6 +2566,10 @@ sha256=6fe3c4b2d45a50582f832bc77deb4e3da74a15ea8e09dbb214b9c44e7c3378fc md5=9d22ee4dafa3a194457caf4706f9cf01 sha256=487a33a452f0edcf1f8bb8fc23dff5c7a82edec3f3f8b65632b6c945e961ee9b +[http://downloads.sourceforge.net/mingw/binutils-2.19.1-src.tar.gz] +md5=ad3f2b5fdcd599a772ad75fec2c384d8 +sha256=2df529b1ac0a621efb87b5b53dbc0167c566f8bebbd6a8ce19964b05845fd2e7 + [ftp://ftp.gnu.org/gnu/binutils/binutils-2.19.1.tar.bz2] md5=09a8c5821a2dfdbb20665bc0bd680791 sha256=3e8225b4d7ace0a2039de752e11fd6922d3b89a7259a292c347391c4788739f6 @@ -6930,14 +6938,26 @@ sha256=37b3286c2bfb68da9df983f60721f868e29897f7a426306748fee93b25c5fb61 md5=88785071f29ed0e0b6b61057a1079442 sha256=1159457a0e4c054b709547ae21ff624aebab2033e0d9e5bf46c9cf88b1970606 +[http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2] +md5=88785071f29ed0e0b6b61057a1079442 +sha256=1159457a0e4c054b709547ae21ff624aebab2033e0d9e5bf46c9cf88b1970606 + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2] md5=ad9f97a4d04982ccf4fd67cb464879f3 sha256=985cbb23a486570a8783395a42a8689218f5218a0ccdd6bec590eef341367bb7 +[http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2] +md5=ad9f97a4d04982ccf4fd67cb464879f3 +sha256=985cbb23a486570a8783395a42a8689218f5218a0ccdd6bec590eef341367bb7 + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2] md5=a4a3eb15c96030906d8494959eeda23c sha256=cfc0efbcc6fcde0d416a32dfb246c9df022515a312683fac412578c4fd09a9bc +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2] +md5=a4a3eb15c96030906d8494959eeda23c +sha256=cfc0efbcc6fcde0d416a32dfb246c9df022515a312683fac412578c4fd09a9bc + [http://ftp.nluug.nl/languages/gcc/snapshots/4.2-20060513/gcc-4.2-20060513.tar.bz2] md5=ac6d19831220c4aeef4475492725486f sha256=98bdb26cd2644f2290e34453d9115b88bcff940bd1feb88db5a0fc557ec0ea5e @@ -6946,30 +6966,58 @@ sha256=98bdb26cd2644f2290e34453d9115b88bcff940bd1feb88db5a0fc557ec0ea5e md5=cba410e6ff70f7d7f4be7a0267707fd0 sha256=ca0a12695b3bccfa8628509e08cb9ed7d8ed48deff0a299e4cb8de87d2c1fced +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.1/gcc-4.2.1.tar.bz2] +md5=cba410e6ff70f7d7f4be7a0267707fd0 +sha256=ca0a12695b3bccfa8628509e08cb9ed7d8ed48deff0a299e4cb8de87d2c1fced + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.2/gcc-4.2.2.tar.bz2] md5=7ae33781417a35a2eb03ee098a9f4490 sha256=673b85d780a082c014ded4ac11f8269a3fe893b4dbb584d65b8602d50b3872b1 +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.2/gcc-4.2.2.tar.bz2] +md5=7ae33781417a35a2eb03ee098a9f4490 +sha256=673b85d780a082c014ded4ac11f8269a3fe893b4dbb584d65b8602d50b3872b1 + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.3/gcc-4.2.3.tar.bz2] md5=ef2a4d9991b3644115456ea05b2b8163 sha256=5df9a267091eea09179651ad2a2302fe99f780ac7e598278e7f47b2339fa2e80 +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.3/gcc-4.2.3.tar.bz2] +md5=ef2a4d9991b3644115456ea05b2b8163 +sha256=5df9a267091eea09179651ad2a2302fe99f780ac7e598278e7f47b2339fa2e80 + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2] md5=d79f553e7916ea21c556329eacfeaa16 sha256=afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2] +md5=d79f553e7916ea21c556329eacfeaa16 +sha256=afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.1/gcc-4.3.1.tar.bz2] md5=4afa0290cc3a41ac8822666f1110de98 sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5 +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.1/gcc-4.3.1.tar.bz2] +md5=4afa0290cc3a41ac8822666f1110de98 +sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5 + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2] md5=5dfac5da961ecd5f227c3175859a486d sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165 +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2] +md5=5dfac5da961ecd5f227c3175859a486d +sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165 + [ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2] md5=cc3c5565fdb9ab87a05ddb106ba0bd1f sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2] +md5=cc3c5565fdb9ab87a05ddb106ba0bd1f +sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de + [http://gcc.releasenotes.org/releases/gcc-4.3.3/gcc-4.3.3.tar.bz2] md5=cc3c5565fdb9ab87a05ddb106ba0bd1f sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de @@ -7810,6 +7858,10 @@ sha256=cea63cddf79864d306198c7a84091af0b4685816b352ae253a3e2bfac5e67cb7 md5=7f2a8cee97e62ebfa284363dc93b3178 sha256=9605f7aee1b8d58cac10dd514c2bdfa340089d85b149db828816d18ac3ebaff8 +[http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/2.27/gnome-bluetooth-2.27.1.tar.bz2] +md5=4a7c977086af47fe43ea08b29ab93503 +sha256=939c8a8f819b8c39e4e355a764b2a47c6959d57029c5134a51a282d7cccd60c5 + [http://ftp.gnome.org/pub/GNOME/sources/gnome-common/2.18/gnome-common-2.18.0.tar.bz2] md5=567172e685fc0783b1d6ab9843a85d6a sha256=ba28c1017e7e4212db16ada3f44cb446b6637c9c4fe16c0e2c2a51c94c46bc5b @@ -9230,6 +9282,10 @@ sha256=5149991a219e8f2059350ed9d52bb110c0695da6eb9fe256e9e213e69f83929f md5=5bfa5605d9565ff01138d7a574cc2614 sha256=fc029984019736eab2b0f10ce28d48ff88f8ceed7a1739cb4b71b851c4b89b91 +[http://downloads.sourceforge.net/gsoap2/gsoap_2.7.13.tar.gz] +md5=fffb49eb1db7ff03643a4313115dc3b1 +sha256=3d40a528b8f3309f392945dca2ecaee5a698f4ee00a6036907a57c4f25a6a479 + [http://downloads.sourceforge.net/gsoap2/gsoap_2.7.7.tar.gz] md5=a0bbbfdc135034cd778537f979121df7 sha256=7b531f1b6481fbe1a21620a86649f42cb2de9cf086e7bdde46335137d3ca11dc @@ -14146,6 +14202,10 @@ sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36 md5=8c198831cc0495596c78134b8849e9ad sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36 +[http://ftp.gnome.org/pub/GNOME/sources/libunique/1.0/libunique-1.0.8.tar.bz2] +md5=02b9e41c70ca738e1aa914f400fc1f05 +sha256=d627a10f523af14e9ead655ebab3a26e7faeea006bdfa7739bc4c04058ddf4c6 + [http://downloads.sourceforge.net/upnp/libupnp-1.3.1.tar.gz] md5=6646be5e31e58188e8f47c6ce64faa4c sha256=4d0d6a5302222757fb36ee21d8f8e1b3de849c2de658ab1105272f32ff78767d @@ -18242,6 +18302,10 @@ sha256=362e4b4473f2f7a3bfa28ea73e80ec00a2fe525a1aceb5f66e1c528a900bd735 md5=b97d3a725ab93662adf09acfbc49efeb sha256=56fc9e6324539537324b071e5b51c3388df9bfa92fb7e210b989b463122fc333 +[https://alioth.debian.org/frs/download.php/2795/pcsc-lite-1.5.2.tar.bz2] +md5=d7d466621bec39354351f09349f6374c +sha256=a0c11b0b5cc46d4c4ec499b875cfdc4e766fdf12fe2f6ea635e1b11ab7b8821e + [http://handhelds.org/~zecke/oe_packages/pdamaze_V1.0.0.tar.gz] md5=bf27dd51fe03c8b475080b74de043a13 sha256=99d6bc6b360baabd6044e8883d467cc6ed7955f9ab66d8f87f61e3cc757fb97a @@ -18658,6 +18722,10 @@ sha256=ac7e7d311b07abd27b084041bcc943398df303bc86601f281891537bdf1a4e0b md5=b05e1d7f0cac9cc4e096aa21409dee55 sha256=91f75eb29c07271fcbfa2082c8300690efe4a72f2fbf35dace98108b0c6f7ba3 +[ftp://ftp.us.postgresql.org/pub/mirrors/postgresql/source/v8.1.8/postgresql-8.1.8.tar.bz2] +md5=b05e1d7f0cac9cc4e096aa21409dee55 +sha256=91f75eb29c07271fcbfa2082c8300690efe4a72f2fbf35dace98108b0c6f7ba3 + [ftp://ftp-archives.postgresql.org/pub/source/v8.2.4/postgresql-8.2.4.tar.bz2] md5=af7ec100a33c41bfb8d87b5e0ec2f44a sha256=8ff6afab743e894c0d96e668dcf9b3d3c1044719d6def45ef7390c64b54ed268 @@ -21166,6 +21234,10 @@ sha256=7eedc4ece1c82668c06222ef85457206139253e24a50e5b5d2401a41baee28c1 md5=860fe417ea5e9ca2d2b2225192b85b87 sha256=ecfbca297c26eff6cb04c2c45af1ee5c21d4a123a05f8b056a1c81ffcdfa1e3a +[http://www.dest-unreach.org/socat/download/socat-1.3.2.1.tar.bz2] +md5=860fe417ea5e9ca2d2b2225192b85b87 +sha256=ecfbca297c26eff6cb04c2c45af1ee5c21d4a123a05f8b056a1c81ffcdfa1e3a + [http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/socketcan-driver-at91.patch] md5=fe6945121eaea5e9c570e3dad54d7569 sha256=578db455270592833156358f79205b21701aa12b64142da16df08fb36fca3322 @@ -23138,6 +23210,10 @@ sha256=7f2f0492b0e1f9f96bd416e6c7a34e77c46faa20eeaff28c81c5932c91534ffc md5=5e6c4ce07091725d9afdac7cf00e553c sha256=d0425be8572be85b8a7ae802a19bcb73fdeac74906f7bcbbc129697ea6a86f3a +[http://download.gnome.org/sources/vala/0.6/vala-0.6.0.tar.bz2] +md5=9e5888a79757eb0f47df118b39762ed6 +sha256=9d1cb3661e6c15059e4eecce323b3f118c243d1f17a1883e2b2d7ca0a16987e5 + [http://www.valgrind.org/downloads/valgrind-3.2.1.tar.bz2] md5=9407d33961186814cef0e6ecedfd6318 sha256=7f9a15d7be16ca03a0912191e8d55a486bf69690e11bb76ccece3eaff3730a33 @@ -23398,6 +23474,10 @@ sha256=c762525fdbf5f5dd32c6c950f2a63d8c1b15ec3dc7afca5d2dc3dbd1b129a00d md5=66480128b9dabcced2e4c8db3e60fa50 sha256=6c5bfb2edae5c289233b6cd65393bb7414a2d30ad4d1239c207a659a4232d91a +[http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/watchdog-5.6.tar.gz] +md5=6df285569dd1d85528b983c98c9b2b7c +sha256=a2c7d6726e092315dbb047211b754528e4532521678a30e16f60a31bb86a7f74 + [http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/watchdog_5.3.1.tar.gz] md5=ba97ddce396bfccd8d409bc3141d7ef4 sha256=b7bf9feeedea26d7e06935369a1a556089426e94f9ead946018526c96cd9b12e diff --git a/conf/collections.inc b/conf/collections.inc new file mode 100644 index 0000000000..abd9bd383b --- /dev/null +++ b/conf/collections.inc @@ -0,0 +1,133 @@ +# Take a list of directories in COLLECTIONS, in priority order (highest to +# lowest), and use those to populate BBFILES, BBFILE_COLLECTIONS, +# BBFILE_PATTERN_*, and BBFILE_PRIORITY_*. By default, COLLECTIONS is +# prepopulated with the locations the user specified in their BBPATH. +# Note that it will not overwrite existing BBFILES or BBFILE_* variables, so +# you'll need to remove those from your config in order to use this. +# +# Specifying an archive in COLLECTIONS is also supported. Any archives of a +# supported format will be unpacked into COLLECTIONS_UNPACKDIR and used from +# there. + +COLLECTIONS = "${@' '.join(d.getVar('BBPATH', 1).split(':'))}" +COLLECTIONS_UNPACKDIR = "${TMPDIR}/collections" + +def collection_unpack(collection, name, d): + """ Unpack a collection archive and return the path to it. """ + import bb + import os + from md5 import md5 + + handlers = { + ("tar"): "tar x --no-same-owner -f %s", + ("tar.gz", "tgz", "tar.Z"): "tar xz --no-same-owner -f %s", + ("tar.bz2", "tbz", "tbz2"): "tar xj --no-same-owner -f %s", + ("zip", "jar"): "unzip -q -o %s", + } + + outpath = os.path.join(d.getVar("COLLECTIONS_UNPACKDIR", 1), name) + + try: + collectiondata = open(collection, "r").read() + except IOError: + bb.fatal("Unable to open %s to calculate md5 sum" % collection) + + md5obj = md5() + md5obj.update(collectiondata) + md5sum = md5obj.hexdigest() + + md5file = os.path.join(outpath, "md5") + if os.path.exists(md5file): + try: + oldmd5sum = open(md5file).read() + except IOError: + pass + else: + if oldmd5sum == md5sum: + bb.debug(1, "Using existing %s for collection %s" % (outpath, name)) + return outpath + + bb.note("Removing old unpacked collection at %s" % outpath) + os.system("rm -rf %s" % outpath) + + try: + cmd = (cmd for (exts, cmd) in handlers.iteritems() + for e in exts + if collection.endswith(e)).next() + cmd = "cd %s && PATH=\"%s\" %s" % (outpath, d.getVar("PATH", 1), cmd) + except StopIteration: + bb.fatal("Unable to find unpack handler for %s" % collection) + + if not os.path.isdir(outpath): + os.makedirs(outpath) + + bb.note("Unpacking %s to %s/" % (collection, outpath)) + ret = os.system(cmd % collection) + if ret != 0: + bb.fatal("Unable to unpack %s" % collection) + + md5out = open(md5file, "w") + md5out.write(md5sum) + md5out.close() + return outpath + +def collections_setup(d): + """ Populate collection and bbfiles metadata from the COLLECTIONS var. """ + import bb + import os + from itertools import izip, chain + from glob import glob + + def setifunset(k, v): + if d.getVar(k, 0) is None: + d.setVar(k, v) + + collections = d.getVar("COLLECTIONS", 1) + if not collections: + return + globbed = (glob(path) for path in collections.split()) + collections = list(chain(*globbed)) + + collectionmap = {} + namemap = {} + for collection in collections: + if collection.endswith(os.sep): + collection = collection[:-1] + basename = os.path.basename(collection).split(os.path.extsep)[0] + if namemap.get(basename): + basename = "%s-%s" % (basename, hash(collection)) + namemap[basename] = collection + collectionmap[collection] = basename + + for (collection, priority) in izip(collectionmap, xrange(len(collections), 0, -1)): + if not os.path.exists(collection): + bb.fatal("Collection %s does not exist" % collection) + + name = collectionmap[collection] + if not name: + bb.fatal("Unable to determine collection name for %s" % collection) + + if not os.path.isdir(collection): + del collectionmap[collection] + unpacked = collection_unpack(collection, name, d) + if unpacked: + collection = unpacked + collectionmap[collection] = name + else: + bb.fatal("Unable to unpack collection %s" % collection) + + setifunset("BBFILE_PATTERN_%s" % name, "^%s/" % collection) + setifunset("BBFILE_PRIORITY_%s" % name, str(priority)) + + setifunset("BBFILE_COLLECTIONS", " ".join(collectionmap.values())) + setifunset("BBFILES", " ".join(collectionmap.keys())) + +addhandler collections_eh +python collections_eh () { + from bb.event import getName + + if getName(e) == "ConfigParsed": + collections_setup(e.data) + + return NotHandled +} diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index cf66f0028b..1f7a5fdf5b 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -256,7 +256,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "39786" +EFL_SRCREV ?= "39886" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eina-native ?= "${EFL_SRCREV}" diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 8d1eb899de..3b06e8fcf7 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r23" +MACHINE_KERNEL_PR = "r25" KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 61b636bebb..5e4e1ac579 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -38,7 +38,8 @@ GUI_MACHINE_CLASS_poodle = "smallscreen" KERNEL_IMAGE_MAXSIZE = "1294336" -KERNEL_IMAGETYPE ?= "zImage" +ZAURUS_KERNEL_IMAGETYPE ?= "zImage" +KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}" MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" diff --git a/recipes/angstrom/e-wm-config-angstrom.bb b/recipes/angstrom/e-wm-config-angstrom.bb index a2c6f93657..4b47e05069 100644 --- a/recipes/angstrom/e-wm-config-angstrom.bb +++ b/recipes/angstrom/e-wm-config-angstrom.bb @@ -2,9 +2,9 @@ DESCRIPTION = "Enlightenment DR17 theme for Angstrom" LICENSE = "MIT/BSD" DEPENDS = "edje-native eet-native" RDEPENDS = "e-wm" -RRECOMMENDS_${PN} = "places" +RRECOMMENDS_${PN} = "places systray" -PR = "r4" +PR = "r5" SRC_URI = " \ file://e.src \ @@ -18,6 +18,11 @@ do_configure() { cp ${WORKDIR}/*.src ${WORKDIR}/*.desktop ${WORKDIR}/*.png ${S}/ } +# [09:16:17] * koen mumbles something about binary config file +# [09:16:19] <raster> eet -d e.cfg config e.src +# [09:16:29] <raster> will get u a test dump of it (as e.src) +# [09:17:09] <raster> eet -e e.cfg config e.src 1 +# [09:17:12] <raster> will re-encode do_compile() { for i in *.src ; do diff --git a/recipes/angstrom/e-wm-config-angstrom/e.src b/recipes/angstrom/e-wm-config-angstrom/e.src index 33514247d2..859323dc23 100644 --- a/recipes/angstrom/e-wm-config-angstrom/e.src +++ b/recipes/angstrom/e-wm-config-angstrom/e.src @@ -1,5 +1,5 @@ group "E_Config" struct { - value "config_version" int: 65836; + value "config_version" int: 65839; value "show_splash" int: 0; value "init_default_theme" string: "default.edj"; value "desktop_default_name" string: "Desktop %i, %i"; @@ -10,6 +10,7 @@ group "E_Config" struct { value "border_shade_transition" int: 3; value "border_shade_speed" double: 3000.0000000000000000000000000; value "framerate" double: 25.0000000000000000000000000; + value "priority" int: 0; value "image_cache" int: 4096; value "font_cache" int: 512; value "edje_cache" int: 32; @@ -19,8 +20,6 @@ group "E_Config" struct { value "use_virtual_roots" int: 0; value "show_desktop_icons" int: 1; value "edge_flip_dragging" int: 1; - value "edge_flip_moving" int: 1; - value "edge_flip_timeout" double: 0.2500000000000000000000000; value "evas_engine_default" int: 1; value "evas_engine_container" int: 0; value "evas_engine_init" int: 0; @@ -43,15 +42,15 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "start"; + value "name" string: "syscon"; value "enabled" uchar: 1; - value "delayed" uchar: 0; + value "delayed" uchar: 1; value "priority" int: 0; } } group "modules" list { group "E_Config_Module" struct { - value "name" string: "ibar"; + value "name" string: "msgbus_lang"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: 0; @@ -59,7 +58,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "ibox"; + value "name" string: "connman"; value "enabled" uchar: 1; value "delayed" uchar: 0; value "priority" int: 0; @@ -67,7 +66,7 @@ group "E_Config" struct { } group "modules" list { group "E_Config_Module" struct { - value "name" string: "clock"; + value "name" string: "places"; |