diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-11-11 21:29:00 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-11-11 21:29:00 +0100 |
| commit | 177ca0dc717faafb67d9fa2f6236eccc182b8038 (patch) | |
| tree | 843c031d556cd7c2924f8353495e68630be6c815 | |
| parent | 369ec69e5e703942ad5ec7e85d0356a4781efeab (diff) | |
| parent | 1fb0688430d6a65b527b3105dfa019da2514d267 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
22 files changed, 484 insertions, 363 deletions
diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index dad54a5f56..b3b2236709 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -2,7 +2,6 @@ FILES_${PN}-dev += "${bindir}/*-config" # The namespaces can clash here hence the two step replace def get_binconfig_mangle(d): - import bb.data s = "-e ''" if not bb.data.inherits_class('native', d): optional_quote = r"\(\"\?\)" diff --git a/classes/manifest.bbclass b/classes/manifest.bbclass index 687f4b756e..8d714d3bbc 100644 --- a/classes/manifest.bbclass +++ b/classes/manifest.bbclass @@ -1,6 +1,6 @@ python read_manifest () { - import sys, bb.manifest + import sys mfn = bb.data.getVar("MANIFEST", d, 1) if os.access(mfn, os.R_OK): # we have a manifest, so emit do_stage and do_populate_pkgs, diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index c65efd8b12..013f22dead 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -27,7 +27,6 @@ PSTAGE_NATIVEDEPENDS = "\ BB_STAMP_WHITELIST = "${PSTAGE_NATIVEDEPENDS}" python () { - import bb pstage_allowed = True # These classes encode staging paths into the binary data so can only be diff --git a/classes/patch.bbclass b/classes/patch.bbclass index dfb8ec960f..bb49fed7a1 100644 --- a/classes/patch.bbclass +++ b/classes/patch.bbclass @@ -76,8 +76,6 @@ def patch_init(d): def __str__(self): return "Patch Error: %s" % self.msg - import bb, bb.data, bb.fetch - class PatchSet(object): defaults = { "strippath": 1 @@ -457,8 +455,6 @@ do_patch[depends] = "${PATCHDEPENDENCY}" python patch_do_patch() { import re - import bb.fetch - patch_init(d) src_uri = (bb.data.getVar('SRC_URI', d, 1) or '').split() diff --git a/classes/recipe_sanity.bbclass b/classes/recipe_sanity.bbclass index 29f4a8fada..d929da6319 100644 --- a/classes/recipe_sanity.bbclass +++ b/classes/recipe_sanity.bbclass @@ -1,10 +1,8 @@ def __note(msg, d): - import bb bb.note("%s: recipe_sanity: %s" % (d.getVar("P", 1), msg)) __recipe_sanity_badtargetvars = "RDEPENDS RPROVIDES" def bad_target_vars(cfgdata, d): - import bb.data if bb.data.inherits_class("native", d) or \ bb.data.inherits_class("cross", d): return @@ -43,14 +41,12 @@ def var_renames_overwrite(cfgdata, d): __note("rename of variable '%s' to '%s' overwrote existing value '%s' with '%s'." % (key, newkey, oldvalue, newvalue), d) def incorrect_nonempty_PACKAGES(cfgdata, d): - import bb.data if bb.data.inherits_class("native", d) or \ bb.data.inherits_class("cross", d): if d.getVar("PACKAGES", 1): return True def can_use_autotools_base(cfgdata, d): - import bb cfg = d.getVar("do_configure", 1) if not bb.data.inherits_class("autotools", d): return False @@ -68,8 +64,6 @@ def can_use_autotools_base(cfgdata, d): return True def can_remove_FILESPATH(cfgdata, d): - import os - import bb expected = cfgdata.get("FILESPATH") #expected = "${@':'.join([os.path.normpath(os.path.join(fp, p, o)) for fp in d.getVar('FILESPATHBASE', 1).split(':') for p in d.getVar('FILESPATHPKG', 1).split(':') for o in (d.getVar('OVERRIDES', 1) + ':').split(':') if os.path.exists(os.path.join(fp, p, o))])}:${FILESDIR}" expectedpaths = bb.data.expand(expected, d) @@ -84,8 +78,6 @@ def can_remove_FILESPATH(cfgdata, d): return expected != unexpanded def can_remove_FILESDIR(cfgdata, d): - import os - import bb expected = cfgdata.get("FILESDIR") #expected = "${@bb.which(d.getVar('FILESPATH', 1), '.')}" unexpanded = d.getVar("FILESDIR", 0) @@ -102,7 +94,6 @@ def can_remove_FILESDIR(cfgdata, d): expanded == bb.data.expand(expected, d)) def can_remove_others(p, cfgdata, d): - import bb for k in ["S", "PV", "PN", "DESCRIPTION", "LICENSE", "DEPENDS", "SECTION", "PACKAGES", "EXTRA_OECONF", "EXTRA_OEMAKE"]: #for k in cfgdata: diff --git a/conf/checksums.ini b/conf/checksums.ini index d646dbe938..becb121253 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -8778,6 +8778,10 @@ sha256=4224a522ac4ee0fd89eb337e7505e280dfb05e2fe1ad44339ba8874081c0451a md5=fc62e989cf31d015f31628609fc3757a sha256=098baa84c74af5b21d27ec6e8ba6f1a393de88327cefbcd9e90c9b4edda9a36c +[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.10.1.tar.bz2] +md5=ee71dedf724dc775e4efec9b823ed3be +sha256=cbad3e637eab613184405a87a2bf08a41991a0e512a3ced60d120effc73de667 + [http://www.kegel.com/crosstool/crosstool-0.43/patches/glibc-2.3.6/glibc-fp-byteorder.patch] md5=c89aac92d100761a767b9d5619fe582f sha256=3033d84fd9a62d20a8cb0d42645d7cd5a28d2d108afcb4cc2d89db3dc1e328df @@ -8802,6 +8806,10 @@ sha256=07de78810a5320d696792b67131c4cf3d6654aee015a6b74820d66fb00799000 md5=99536b508af988e7cc6275944d12b491 sha256=27ac255ee701036191118f7a6a4191b24741f5909dccfc9eec4ab611a39e182f +[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.10.1.tar.bz2] +md5=8ef88560ec608d5923ee05eb5f0e15ea +sha256=0fa72d1dd06a30642d3bb20a659f4ed0f4af54a205d7102896b68169b38676dc + [ftp://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-2.2.5.tar.gz] md5=c766a79a51668d7fa33f175a249655b4 sha256=c027824ee6593a838e0883bdd4bf8bd455b3dcf4ff0aa77fe82452819d882f47 @@ -8842,6 +8850,10 @@ sha256=3e481996259af87c3581da23481970a27de679e3c87cfa9a5a59751cd20c7b44 md5=7d5d86031cb15403e4d246658209ee81 sha256=824c97b83f1ec2894ee0e824db6d542c40b978d2f6c4364c7411777e44b15a64 +[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.10.1.tar.bz2] +md5=816b2d48a95ddc23b27fea03a1996443 +sha256=b1f1ec9720036a3a33598b8478eef102535444a083d5b5813a6981ed74ab4071 + [ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.16/glibmm-2.16.2.tar.bz2] md5=408054366f0acc01014f4c4af2304da5 sha256=f033f6f39c32fc17ecce63087e41408671a3a43d698c83de2528af3fc7276d28 diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc new file mode 100644 index 0000000000..769ec7c4c7 --- /dev/null +++ b/conf/distro/include/preferred-shr-versions.inc @@ -0,0 +1,32 @@ +# Upgraded +# use newer version then preferred by default +PREFERRED_VERSION_dbus ?= "1.3.0" +PREFERRED_VERSION_autoconf = "2.63" +PREFERRED_VERSION_autoconf-native = "2.63" +PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2" +PREFERRED_VERSION_mtd-utils-native ?= "1.2.0+git" +PREFERRED_VERSION_strace ?= "4.5.15" + +# we need new headers for libc, now OLDEST_KERNEL_linux-gnueabi = "2.6.24" +PREFERRED_VERSION_linux-libc-headers = "2.6.29" + +# upgrades used in Angstrom +PREFERRED_VERSION_gtk+ = "2.18.3" +PREFERRED_VERSION_hal = "0.5.13" +PREFERRED_VERSION_libtool = "2.2.6a" +PREFERRED_VERSION_libtool-native = "2.2.6a" +PREFERRED_VERSION_libtool-cross = "2.2.6a" +PREFERRED_VERSION_libtool-sdk = "2.2.6a" +PREFERRED_VERSION_udev = "141" +PREFERRED_VERSION_usbutils = "0.82" +PREFERRED_VERSION_wpa-supplicant = "0.6.9" +UDEV_GE_141 = "1" + +# Downgraded +# python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py +PREFERRED_VERSION_python-pygtk ?= "2.10.4" +PREFERRED_VERSION_gpe-gallery ?= "0.97" +PREFERRED_VERSION_boost ?= "1.33.1" +PREFERRED_VERSION_man-pages ?= "2.41" +PREFERRED_VERSION_xchat ?= "2.8.4" +PREFERRED_VERSION_x11vnc ?= "0.9.3" diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index b86963ff29..e8cc25057d 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -16,6 +16,7 @@ SRCREV_pn-misc-vapi ?= "${FSO_CORNUCOPIA_SRCREV}" # FSO Projects -- Misc SRCREV_pn-dbus-hlid ?= "39e804f28808247df2573788cb99897d4d765e69" SRCREV_pn-frameworkd ?= "a2dfde0fb46a745f5c07e6a1ab44e4b95b7dde80" +SRCREV_pn-frameworkd-config-shr_FSO_REV = ${SRCREV_pn-frameworkd} SRCREV_pn-fso-abyss ?= "8ce3c6e40c4852de7dcca502f65784f6b18ca6bf" SRCREV_pn-fso-term ?= "e0d92222e3e5a62025089c60a625f1836c510915" SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index ca88ae564d..06fdf4d12b 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -12,44 +12,74 @@ # you know what that means? like... a, b, c, d, e, f, g... SRCREV_pn-accelges ?= "206" +SRCREV_pn-advancedcaching ?= "9c3661f5573d2dd712437f1590070153d12e4c02" SRCREV_pn-aircrack-ng ?= "802" +SRCREV_pn-alsa-scenarii-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-alsa-scenario ?= "8bd7f83d847424eb44704cf1649974b2fda8d8f1" SRCREV_pn-app-restarter ?= "4552" SRCREV_pn-assassin ?= "268" SRCREV_pn-assassin-thumbnail ?= "4690" SRCREV_pn-aufs2-util ?= "f35ba2292fe40aa94aa83713e0b2719f35a25768" SRCREV_pn-bfin-uclibc ?= "1857" +SRCREV_pn-blipomoko ?= "93295f36f7b45c691df247cb2a65227facf13654" SRCREV_pn-bootchart-lite ?= "4" +SRCREV_pn-bt-configure ?= "9654c88ff74bca89cf747937cbec67421d2f1cbc" SRCREV_pn-bubble-keyboard ?= "194" +SRCREV_pn-calc ?= "3f4382138b71b0c31d6722604399e12a37bcebe8" SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" SRCREV_pn-cdparanoia ?= "16684" +SRCREV_pn-clutter ?= "3240" SRCREV_pn-clutter-box2d ?= "3197" SRCREV_pn-clutter-cairo ?= "3210" SRCREV_pn-clutter-gst ?= "3188" +SRCREV_pn-clutter-gtk ?= "70f4b0cbd568dfa265484a03be3bd08ad15ed12e" SRCREV_pn-clutter-gtk-0.6 ?= "2ba362a1a223c2b28541030a80aa11191615340a" SRCREV_pn-clutter-gtk-0.8 ?= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd" -SRCREV_pn-clutter-gtk ?= "70f4b0cbd568dfa265484a03be3bd08ad15ed12e" -SRCREV_pn-clutter ?= "3240" SRCREV_pn-comic-reader ?= "54" SRCREV_pn-contact ?= "1410" SRCREV_pn-dasher-gpe ?= "1251" -SRCREV_pn-dbus-c++-native ?= "13131" SRCREV_pn-dbus-c++ ?= "13131" +SRCREV_pn-dbus-c++-native ?= "13131" SRCREV_pn-dfu-util ?= "4160" SRCREV_pn-dfu-util-native ?= "4160" SRCREV_pn-diversity-daemon ?= "571" SRCREV_pn-diversity-radar ?= "453" +SRCREV_pn-e-tasks ?= "14" +SRCREV_pn-e-wm-config-illume-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-e-wm-sysactions-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-e-wm-theme-illume-gry ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-e-wm-theme-illume-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-e-wm-theme-illume-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-e-wm-theme-illume-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-e-wm-theme-illume-sixteen ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-ebrainy ?= "21" SRCREV_pn-eds-dbus ?= "736" +SRCREV_pn-elementary-theme-gry ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-elementary-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-elementary-theme-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-elementary-theme-sixteen ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-elf2flt ?= "1786" +SRCREV_pn-elmdentica ?= "171" SRCREV_pn-enlazar ?= "37" +SRCREV_pn-enotes ?= "19" +SRCREV_pn-epdfview ?= "345" +SRCREV_pn-epiphany ?= "7837" SRCREV_pn-essential-dialer ?= "194" +SRCREV_pn-etk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-etk-theme-ninja ?= "5" +SRCREV_pn-etk-theme-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-ezx-boot-usb-native ?= "2371" SRCREV_pn-ezx-gen-blob ?= "2426" SRCREV_pn-ezxd ?= "2074" -SRCREV_pn-elf2flt ?= "1786" -SRCREV_pn-epiphany ?= "7837" -SRCREV_pn-etk-theme-ninja ?= "5" SRCREV_pn-fbgrab-viewer-native ?= "1943" +SRCREV_pn-ffalarms ?= "67" SRCREV_pn-flashrom ?= "3682" +SRCREV_pn-frameworkd-config-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-frameworkd-config-shr_SHR_REV = ${SRCREV_pn-frameworkd-config-shr} +SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b" +SRCREV_pn-fsoraw ?= "20" SRCREV_pn-fstests ?= "204" SRCREV_pn-gabriel ?= "38" SRCREV_pn-gabriel-native ?= "38" @@ -60,25 +90,47 @@ SRCREV_pn-gcc-cross-initial ?= ${GCCREV} SRCREV_pn-gcc-cross-intermediate ?= ${GCCREV} SRCREV_pn-gcc-cross-sdk ?= ${GCCREV} SRCREV_pn-gconf-dbus ?= "641" +SRCREV_pn-glamo-dri-tests ?= "445f370be5bd76643efb65d8ff7414b133753cfa" SRCREV_pn-gnet ?= "495" SRCREV_pn-gpe-conf ?= "9900" SRCREV_pn-gpe-contacts ?= "9312" SRCREV_pn-gpe-gallery ?= "9376" SRCREV_pn-gpe-mini-browser2 ?= "9900" SRCREV_pn-gpe-sketchbook ?= "9547" +SRCREV_pn-gpe-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-gridpad ?= "194" -SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" +SRCREV_pn-gtk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" +SRCREV_pn-icon-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-illume-keyboard-arabic ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-browse ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-danish ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-default-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-dutch ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-dvorak ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-french ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-german ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-hebrew ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-numeric-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-russian ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboard-russian-terminal ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" SRCREV_pn-illume-theme-asu ?= "4881" SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5" +SRCREV_pn-intone ?= "66" +SRCREV_pn-intone-video ?= "9" SRCREV_pn-intuition ?= "194" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" SRCREV_pn-libcalenabler2 ?= "1410" +SRCREV_pn-libdrm ?= "89cc98c0d5c1b43a883f13210c472339dde1a4cf" +SRCREV_pn-libdrm_om-gta02 ?= "67a3eb2188a38a5000af0ad4ac3a0eba43cab574" SRCREV_pn-libefso ?= "194" SRCREV_pn-libfakekey ?= "1455" +SRCREV_pn-libframeworkd-phonegui ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" +SRCREV_pn-libframeworkd-phonegui-efl ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" +SRCREV_pn-libframeworkd-phonegui-efl-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f" SRCREV_pn-libgee ?= "0bddeeefb3bd5b003d77301705dbad181cddcaf6" SRCREV_pn-libgee-native ?= "0bddeeefb3bd5b003d77301705dbad181cddcaf6" @@ -91,6 +143,9 @@ SRCREV_pn-libmokopanelui2 ?= "4568" SRCREV_pn-libmokoui2 ?= "4342" SRCREV_pn-libnl2 ?= "dc273a12da9f0116e80fa81d63beb820e632dd17" SRCREV_pn-libowl ?= "277" +SRCREV_pn-libphone-ui ?= "4455bce1643fcfba0538b17242f47935b869b159" +SRCREV_pn-libphone-ui-shr ?= "29363d678d77182bde8c617ab7c56114150d6ff9" +SRCREV_pn-libphone-utils ?= "f1377146556da8a68a84cf10a5f516c5f7b6015b" SRCREV_pn-librfid ?= "2094" SRCREV_pn-libsnmp-perl ?= "17367" SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb" @@ -98,18 +153,21 @@ SRCREV_pn-libw100 ?= "47" SRCREV_pn-libxcalibrate ?= "209d83af61ed38a002c8096377deac292b3e396c" SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-bfin ?= "3758" +SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1089" SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7" SRCREV_pn-linux-openmoko-2.6.28 ?= "8aa6cdde17381dd8865d10ba15ee62c092ec2ba5" +SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9" SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12" -SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a" +SRCREV_pn-linux-openmoko-shr-devel ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5" +SRCREV_pn-linux-openmoko-shr-drm-devel ?= "c848d00bd43c47e7f11724330380e0c68ec7ae5e" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-madbutterfly ?= "ecd1842714b5e982f3138cbdd358517d57be6aa3" SRCREV_pn-maemo-mapper ?= "118" -SRCREV_pn-mamonaim_e_applet ?= "51c747849f71981bd1dc9eb1807df4993ad97d04" SRCREV_pn-mamona_input_methods ?= "7e6a8cc947689a045d0fba90015da599275347d9" +SRCREV_pn-mamonaim_e_applet ?= "51c747849f71981bd1dc9eb1807df4993ad97d04" SRCREV_pn-matchbox-config-gtk ?= "1614" SRCREV_pn-matchbox-desktop-2 ?= "2096" SRCREV_pn-matchbox-keyboard ?= "1910" @@ -119,13 +177,15 @@ SRCREV_pn-matchbox-panel-2-icon-themes ?= "1907" SRCREV_pn-matchbox-stroke ?= "1820" SRCREV_pn-matchbox-terminal ?= "1612" SRCREV_pn-matchbox-wm-2 ?= "2087" +SRCREV_pn-mesa-dri ?= "c02cd82b463661def7842f910dc561313559df80" +SRCREV_pn-mesa-dri_om-gta02 ?= "a8a1c12262998e5fa3a857eebf857c6d3a95f85e" SRCREV_pn-midori ?= "400139644371c0b675723f9a986ddab4445a8794" SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce" SRCREV_pn-moko-gtk-engine ?= "4734" SRCREV_pn-mokoko ?= "127" +SRCREV_pn-mokonnect ?= "110" SRCREV_pn-mpd-alsa ?= "6952" SRCREV_pn-mplayer-maemo ?= "342" -SRCREV_pn-multicat ?= "f894801916cc4d0e912e4553490dc215276c52a9" SRCREV_pn-multitap-pad ?= "373" SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b" SRCREV_pn-navit ?= "1096" @@ -133,15 +193,15 @@ SRCREV_pn-neod ?= "4617" SRCREV_pn-net-snmp ?= "17367" SRCREV_pn-netsurf ?= "3859" SRCREV_pn-numptyphysics ?= "109" +SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-ohm ?= "edfe25d49d67884bf004de7ae0724c162bb5e65e" SRCREV_pn-om-locations ?= "942e88a1b689ffe3f11a2d982cce389cc965b2ec" +SRCREV_pn-om-neon ?= "68" SRCREV_pn-om-settings ?= "74" +SRCREV_pn-omgps ?= "109" +SRCREV_pn-omoney ?= "29" SRCREV_pn-ompower ?= "4727" -SRCREV_pn-oh-puzzles ?= "22" -SRCREV_pn-osb-browser ?= "125" -SRCREV_pn-osb-jscore ?= "117" -SRCREV_pn-osb-nrcit ?= "125" -SRCREV_pn-osb-nrcore ?= "126" +SRCREV_pn-omview ?= "34" SRCREV_pn-openbsc ?= "d46299da00f923b24043aa37fa2bae17ffcc1ff7" SRCREV_pn-openezx-kernel ?= "43b844d1d38f0343272d3f0f844f80666186c526" SRCREV_pn-openmoko-agpsui ?= "7" @@ -183,32 +243,43 @@ SRCREV_pn-openmoko-today2 ?= "4168" SRCREV_pn-openmoko-today2-folders ?= "3704" SRCREV_pn-openmoko-toolchain-scripts ?= "4913" SRCREV_pn-openmoko-worldclock2 ?= "3365" +SRCREV_pn-openmoocow ?= "39648419825cddfea1cb1321e552a12b71fede14" SRCREV_pn-openocd ?= "517" SRCREV_pn-openocd-native ?= "517" +SRCREV_pn-opimd-utils ?= "0e7007fff120c8cc4c579c0c7e57883798e6d23e" SRCREV_pn-opkg ?= "240" SRCREV_pn-opkg-native ?= "240" SRCREV_pn-opkg-sdk ?= "240" SRCREV_pn-opkg-utils ?= "4578" SRCREV_pn-opkg-utils-native ?= "4595" SRCREV_pn-oprofileui ?= "173" +SRCREV_pn-osb-browser ?= "125" +SRCREV_pn-osb-jscore ?= "117" +SRCREV_pn-osb-nrcit ?= "125" +SRCREV_pn-osb-nrcore ?= "126" SRCREV_pn-packagekit ?= "96823118e98515dd41748e8c7bdb9cf7b1d4a95f" SRCREV_pn-paroli ?= "9279b50ed72a94100d7f0f49090043134302f2eb" +SRCREV_pn-phonefsod ?= "beb2fe989bfbf6b180a58d247db302082504fa01" +SRCREV_pn-phoneui-apps ?= "c27e620302d0ea956da777f76a4aa217ae8366c6" +SRCREV_pn-phoneuid ?= "19f40dcc6fdb442ea9f4d7521c60d68f4042977c" SRCREV_pn-portaudio-v19 ?= "1387" SRCREV_pn-psplash ?= "249" SRCREV_pn-pty-forward-native ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba" SRCREV_pn-pyefl-sudoku ?= "49" SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141" +SRCREV_pn-pyphonelog ?= "0355bf623b31d695e53cc3cf77fb992e58b449a5" +SRCREV_pn-pythm ?= "19" SRCREV_pn-python-coherence ?= "1161" SRCREV_pn-python-connexion ?= "1439" SRCREV_pn-python-formencode ?= "3148" SRCREV_pn-python-gsmd ?= "148" +SRCREV_pn-python-phoneutils ?= "f1377146556da8a68a84cf10a5f516c5f7b6015b" SRCREV_pn-python-pycrypto ?= "d087280d7e9643a3e3f68f209932119fe6738b3c" SRCREV_pn-python-pyyaml ?= "344" QEMUSRCREV ?= "4242" -SRCREV_pn-tslib ?= "77" +SRCREV_pn-qemu ?= "${QEMUSRCREV}" SRCREV_pn-qemu-native ?= "${QEMUSRCREV}" SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}" -SRCREV_pn-qemu ?= "${QEMUSRCREV}" SRCREV_pn-qi ?= "3b8513d8b3d9615ebda605de4bda18371aa3f359" SRCREV_pn-remoko ?= "121" SRCREV_pn-remoko-server ?= "121" @@ -216,6 +287,21 @@ SRCREV_pn-s3c24xx-gpio ?= "4949" SRCREV_pn-s3c64xx-gpio ?= "4949" SRCREV_pn-serial-forward ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba" SRCREV_pn-settings-daemon ?= "2006" +SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf" +SRCREV_pn-shr-installer ?= "f17fa104639113fb0d3212b6bba366c092854cde" +SRCREV_pn-shr-launcher ?= "87" +SRCREV_pn-shr-settings ?= "4177f9d7ef34e3be7796585ca8c94cc2dea3f253" +SRCREV_pn-shr-specs ?= "a881cd133439737708d4d4d150500246ceff7c7d" +SRCREV_pn-shr-splash ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" +SRCREV_pn-shr-splash-theme-dontpanic ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-shr-splash-theme-handy ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-shr-splash-theme-logo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-shr-splash-theme-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-shr-splash-theme-simple ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-shr-splash-theme-tux ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-shr-theme ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" +SRCREV_pn-shr-theme-gtk-e17lookalike ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-shr-today ?= "7b69649a9df0e85f0c0f7985fd1d93543c3b11e2" SRCREV_pn-sjf2410-linux-native ?= "4268" SRCREV_pn-socketcan-modules ?= "917" SRCREV_pn-socketcan-utils-test ?= "917" @@ -225,6 +311,7 @@ SRCREV_pn-table ?= "2191" SRCREV_pn-tichy ?= "ab68d849502009cf3214df48ffa8075a10cc2177" SRCREV_pn-tmut ?= "60" SRCREV_pn-toscoterm ?= "f02add76f365a2fecd2dbefc230ceaab20244f96" +SRCREV_pn-tslib ?= "77" SRCREV_pn-u-boot-bug ?= "8674" SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" @@ -296,6 +383,7 @@ SRCREV_pn-elementary-alarm ?= "${EFL_SRCREV}" SRCREV_pn-elementary-sms ?= "${EFL_SRCREV}" SRCREV_pn-emphasis ?= "${EFL_SRCREV}" SRCREV_pn-ephoto ?= "${EFL_SRCREV}" +SRCREV_pn-eve ?= "${EFL_SRCREV}" SRCREV_pn-examine ?= "${EFL_SRCREV}" SRCREV_pn-exhibit ?= "${EFL_SRCREV}" SRCREV_pn-expedite ?= "${EFL_SRCREV}" diff --git a/conf/distro/include/shr-autorev-unstable.inc b/conf/distro/include/shr-autorev-unstable.inc deleted file mode 100644 index 5e7a0ddfa3..0000000000 --- a/conf/distro/include/shr-autorev-unstable.inc +++ /dev/null @@ -1,128 +0,0 @@ - -# SHR - override revs for shr-unstable - - -# KERNEL -SRCREV_pn-linux-openmoko-shr-devel = "${AUTOREV}" - -PREFERRED_VERSION_vala-native = "0.7.4+0.7.5-fso2" - - -# FSO stuff -SRCREV_pn-dbus-hlid = "${AUTOREV}" -SRCREV_pn-frameworkd = "${AUTOREV}" -SRCREV_pn-frameworkd-config-shr = "${AUTOREV}" -SRCREV_pn-frameworkd-config-shr_FSO_REV = "${AUTOREV}" -SRCREV_pn-frameworkd-config-shr_SHR_REV = "${AUTOREV}" -SRCREV_pn-fsod = "${AUTOREV}" -SRCREV_pn-fsodeviced = "${AUTOREV}" -SRCREV_pn-fsonetworkd = "${AUTOREV}" -SRCREV_pn-fsousaged = "${AUTOREV}" -SRCREV_pn-fsoraw = "${AUTOREV}" -SRCREV_pn-fso-abyss = "${AUTOREV}" -SRCREV_pn-fso-apm = "${AUTOREV}" -SRCREV_pn-fso-term = "${AUTOREV}" -SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}" -SRCREV_pn-fso-gpsd = "${AUTOREV}" -SRCREV_pn-fso-monitord = "${AUTOREV}" -SRCREV_pn-fso-sounds = "${AUTOREV}" -SRCREV_pn-fso-specs = "${AUTOREV}" -SRCREV_pn-fso-term = "${AUTOREV}" -SRCREV_pn-gsmd2 = "${AUTOREV}" -SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}" -SRCREV_pn-libascenario = "${AUTOREV}" -SRCREV_pn-libfsobasics = "${AUTOREV}" -SRCREV_pn-libfsoframework = "${AUTOREV}" -SRCREV_pn-libfsotransport = "${AUTOREV}" -SRCREV_pn-libframeworkd-glib = "${AUTOREV}" -SRCREV_pn-libfso-glib = "${AUTOREV}" -SRCREV_pn-libgsm0710 = "${AUTOREV}" -SRCREV_pn-libgsm0710mux = "${AUTOREV}" -SRCREV_pn-mickeydbus = "${AUTOREV}" -SRCREV_pn-mickeyterm = "${AUTOREV}" -SRCREV_pn-misc-vapi = "${AUTOREV}" -SRCREV_pn-python-pytrc = "${AUTOREV}" -SRCREV_pn-vala-dbus-binding-tool-native = "6071da6ad645e1200eb2aee88d254ada348d361b" -SRCREV_pn-vala = "${AUTOREV}" -SRCREV_pn-zhone = "${AUTOREV}" - - -# SHR stuff -SRCREV_pn-libhito = "${AUTOREV}" -SRCREV_pn-neod = "${AUTOREV}" -SRCREV_pn-shr-settings = "${AUTOREV}" -SRCREV_pn-ophonekitd = "${AUTOREV}" -SRCREV_pn-ophonekitd-vala = "${AUTOREV}" -SRCREV_pn-libmodulo = "${AUTOREV}" -SRCREV_pn-shr-messages = "${AUTOREV}" -SRCREV_pn-shr-contacts = "${AUTOREV}" -SRCREV_pn-shr-dialer = "${AUTOREV}" -SRCREV_pn-libframeworkd-phonegui = "${AUTOREV}" -SRCREV_pn-libframeworkd-phonegui-efl = "${AUTOREV}" -SRCREV_pn-libframeworkd-phonegui-efl2 = "${AUTOREV}" -SRCREV_pn-libframeworkd-phonegui-gtk = "${AUTOREV}" -SRCREV_pn-libframeworkd-phonegui-gtk2 = "${AUTOREV}" -SRCREV_pn-opimd-utils = "${AUTOREV}" -SRCREV_pn-pyphonelog = "${AUTOREV}" -SRCREV_pn-shr-theme = "${AUTOREV}" -SRCREV_pn-shr-theme-brave = "${AUTOREV}" -SRCREV_pn-shr-theme-gtk-e17lookalike = "${AUTOREV}" -SRCREV_pn-shr-splash = "${AUTOREV}" -SRCREV_pn-shr-splash-theme-simple = "${AUTOREV}" -SRCREV_pn-shr-splash-theme-dontpanic = "${AUTOREV}" -SRCREV_pn-shr-splash-theme-handy = "${AUTOREV}" -SRCREV_pn-shr-splash-theme-dociswatchingyou = "${AUTOREV}" -SRCREV_pn-shr-installer = "${AUTOREV}" -SRCREV_pn-shr-config = "${AUTOREV}" -SRCREV_pn-alsa-scenarii-shr = "${AUTOREV}" -SRCREV_pn-libphone-utils = "${AUTOREV}" -SRCREV_pn-python-phoneutils = "${AUTOREV}" - - -# E17 stuff -EFL_SRCREV = "41040" -SRCREV_pn-python-elementary = "41040" -SRCREV_pn-e-wm-config-illume-shr = "${AUTOREV}" -SRCREV_pn-e-wm-sysactions-shr = "${AUTOREV}" -SRCREV_pn-e-wm-theme-illume-shr = "${AUTOREV}" -SRCREV_pn-e-wm-theme-illume-sixteen = "${AUTOREV}" -SRCREV_pn-elementary-theme-sixteen = "${AUTOREV}" -SRCREV_pn-e-wm-menu-shr = "${AUTOREV}" -SRCREV_pn-e-wm-illume-dict-pl = "${AUTOREV}" -SRCREV_pn-etk-theme-shr = "${AUTOREV}" -SRCREV_pn-libeflvala = "${AUTOREV}" - -SRCREV_pn-illume-keyboard-german = "${AUTOREV}" -SRCREV_pn-illume-keyboard-arabic = "${AUTOREV}" -SRCREV_pn-illume-keyboard-browse = "${AUTOREV}" -SRCREV_pn-illume-keyboard-danish = "${AUTOREV}" -SRCREV_pn-illume-keyboard-default-alt = "${AUTOREV}" -SRCREV_pn-illume-keyboard-dutch = "${AUTOREV}" -SRCREV_pn-illume-keyboard-dvorak = "${AUTOREV}" -SRCREV_pn-illume-keyboard-french = "${AUTOREV}" -SRCREV_pn-illume-keyboard-hebrew = "${AUTOREV}" -SRCREV_pn-illume-keyboard-numeric-alt = "${AUTOREV}" -SRCREV_pn-illume-keyboard-russian-terminal = "${AUTOREV}" -SRCREV_pn-illume-keyboard-russian = "${AUTOREV}" - -# Other stuff -SRCREV_pn-navit = "${AUTOREV}" -SRCREV_pn-omview = "${AUTOREV}" -SRCREV_pn-pythm = "${AUTOREV}" -SRCREV_pn-omoney = "29" -SRCREV_pn-enotes = "19" -SRCREV_pn-ebrainy = "${AUTOREV}" -SRCREV_pn-boost-signals2 = "52299" -SRCREV_pn-dbus-c++-native = "${AUTOREV}" -SRCREV_pn-dbus-c++ = "${AUTOREV}" -SRCREV_pn-openmoocow = "${AUTOREV}" -SRCREV_pn-libmokoui2 = "4695" -SRCREV_pn-intone = "${AUTOREV}" -SRCREV_pn-connman = "aac35324deb8c0b57f881338d87cb36b0979e7df" -SRCREV_pn-msn-pecan = "${AUTOREV}" -SRCREV_pn-omgps = "${AUTOREV}" -SRCREV_pn-shr-launcher = "${AUTOREV}" -SRCREV_pn-e-tasks = "${AUTOREV}" -SRCREV_pn-mokonnect = "${AUTOREV}" -SRCREV_pn-elmdentica = "${AUTOREV}" -SRCREV_pn-vala-terminal = "${AUTOREV}" diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc index 1605e8607a..78735fddce 100644 --- a/conf/distro/include/shr-autorev.inc +++ b/conf/distro/include/shr-autorev.inc @@ -1,140 +1,14 @@ -# SHR conf file - -# We need to override some machine stuff as well; include the machine- -# specific file here (if it exists). -#include conf/distro/include/shr-${MACHINE}.conf - -# Nail down some SRCREV's for the kernels. There is a real potential problem -# here, in that git hashes are hashes, not incrementing version numbers. Thus -# we need to have something else in the kernel version string that gets bumped -# with each change. So if you change one of these, go to the kernel recipe -# and bump the OEV value up as well. -SRCREV_pn-linux-eten = "df9715883efa3e6a88866813168fabb1c16b0b7a" -SRCREV_pn-linux-openmoko-shr-devel = "2d158aae9d8d36f575504f59884ed8e80802efe2" - -# FSO stuff -SRCREV_pn-dbus-hlid = "39e804f28808247df2573788cb99897d4d765e69" -SRCREV_pn-frameworkd = "e96a204768744130859ab091162ec5c976854d49" +# SHR autorev include SRCREV_pn-frameworkd-config-shr = "${AUTOREV}" -SRCREV_pn-frameworkd-config-shr_FSO_REV = "e96a204768744130859ab091162ec5c976854d49" +SRCREV_pn-frameworkd-config-shr_FSO_REV = "${AUTOREV}" SRCREV_pn-frameworkd-config-shr_SHR_REV = "${AUTOREV}" -SRCREV_pn-fsod = "${AUTOREV}" -SRCREV_pn-fsodeviced = "${AUTOREV}" -SRCREV_pn-fsonetworkd = "${AUTOREV}" -SRCREV_pn-fsousaged = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7" -SRCREV_pn-fsoraw = "${AUTOREV}" -SRCREV_pn-fso-abyss = "ff68be1581069ca494a559e85f6299246888d3b5" -SRCREV_pn-fso-apm = "${AUTOREV}" -SRCREV_pn-fso-term = "${AUTOREV}" -SRCREV_pn-fso-gsm0710muxd = "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4" -SRCREV_pn-fso-gpsd = "78fe48dffb923175bde9f0aabc3500a9264a57e0" -SRCREV_pn-fso-monitord = "${AUTOREV}" -SRCREV_pn-fso-sounds = "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815" -SRCREV_pn-fso-specs = "${AUTOREV}" -SRCREV_pn-fso-term = "${AUTOREV}" -SRCREV_pn-gsmd2 = "${AUTOREV}" -SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}" -SRCREV_pn-libascenario = "${AUTOREV}" -SRCREV_pn-libfsobasics = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7" -SRCREV_pn-libfsoframework = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7" -SRCREV_pn-libfsotransport = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7" -SRCREV_pn-libframeworkd-glib = "680276e4cddabeb1edd088ddd421f363dd106a50" -SRCREV_pn-libfso-glib = "9d292508739452b55b80ec40ec57405a5de2159f" -SRCREV_pn-libgsm0710 = "3bb80ba6cc9f86ed3996f88bfa2986cc572489d6" -SRCREV_pn-libgsm0710mux = "8e3e7533b286d8086bce8fa09bce23bb9f18bb98" -SRCREV_pn-mickeydbus = "6d7f51b5189a00a07d9b88100a565f46fcb62644" -SRCREV_pn-mickeyterm = "6d7f51b5189a00a07d9b88100a565f46fcb62644" -SRCREV_pn-misc-vapi = "${AUTOREV}" -SRCREV_pn-python-pytrc = "f15ff7c58946a2fd6ba767628b2fe5d6f46ff9bb" -SRCREV_pn-vala-dbus-binding-tool-native = "6071da6ad645e1200eb2aee88d254ada348d361b" -SRCREV_pn-vala = "${AUTOREV}" -SRCREV_pn-zhone = "${AUTOREV}" - -# SHR stuff -SHRREV = "c3d97171723d8e824cb5acf58b711aa78b3b82d9" - -SRCREV_pn-libhito = "${AUTOREV}" -SRCREV_pn-neod = "${AUTOREV}" -SRCREV_pn-shr-settings = "4e0fbe17e4fddd18b0455ec4d007ab3f1d19918e" -SRCREV_pn-ophonekitd = "${SHRREV}" -SRCREV_pn-ophonekitd-vala = "${AUTOREV}" -SRCREV_pn-libmodulo = "${AUTOREV}" -SRCREV_pn-shr-messages = "${SHRREV}" -SRCREV_pn-shr-contacts = "${SHRREV}" -SRCREV_pn-shr-dialer = "${SHRREV}" -SRCREV_pn-libframeworkd-phonegui = "${SHRREV}" -SRCREV_pn-libframeworkd-phonegui-efl = "${SHRREV}" -SRCREV_pn-libframeworkd-phonegui-efl2 = "${AUTOREV}" -SRCREV_pn-libframeworkd-phonegui-gtk = "${AUTOREV}" -SRCREV_pn-libframeworkd-phonegui-gtk2 = "${AUTOREV}" -SRCREV_pn-opimd-utils = "${AUTOREV}" -SRCREV_pn-pyphonelog = "9da559f0242a32aa5d0b72c795f53d7d9ef8c973" -SRCREV_pn-shr-theme = "${AUTOREV}" -SRCREV_pn-shr-theme-brave = "${AUTOREV}" -SRCREV_pn-shr-theme-gtk-e17lookalike = "${AUTOREV}" -SRCREV_pn-shr-splash = "${AUTOREV}" -SRCREV_pn-shr-splash-theme-simple = "${AUTOREV}" -SRCREV_pn-shr-splash-theme-dontpanic = "${AUTOREV}" -SRCREV_pn-shr-splash-theme-handy = "${AUTOREV}" -SRCREV_pn-shr-splash-theme-niebiee = "${AUTOREV}" -SRCREV_pn-shr-installer = "${AUTOREV}" -SRCREV_pn-shr-config = "${AUTOREV}" SRCREV_pn-alsa-scenarii-shr = "${AUTOREV}" +SRCREV_pn-shr-settings = "${AUTOREV}" +SRCREV_pn-shr-specs = "${AUTOREV}" +SRCREV_pn-phoneui-apps = "${AUTOREV}" +SRCREV_pn-phoneuid = "${AUTOREV}" +SRCREV_pn-phonefsod = "${AUTOREV}" +SRCREV_pn-libphone-ui = "${AUTOREV}" +SRCREV_pn-libphone-ui-shr = "${AUTOREV}" SRCREV_pn-libphone-utils = "${AUTOREV}" -SRCREV_pn-python-phoneutils = "${AUTOREV}" - - -# E17 stuff -EFL_SRCREV = "41040" -SRCREV_pn-python-elementary = "41040" -SRCREV_pn-e-wm-config-illume-shr = "${AUTOREV}" -SRCREV_pn-e-wm-sysactions-shr = "${AUTOREV}" -SRCREV_pn-e-wm-theme-illume-shr = "${AUTOREV}" -SRCREV_pn-e-wm-theme-illume-sixteen = "${AUTOREV}" -SRCREV_pn-e-wm-theme-illume-niebiee = "${AUTOREV}" -SRCREV_pn-elementary-theme-sixteen = "${AUTOREV}" -SRCREV_pn-elementary-theme-niebiee = "${AUTOREV}" -SRCREV_pn-e-wm-menu-shr = "${AUTOREV}" -SRCREV_pn-e-wm-illume-dict-pl = "${AUTOREV}" -SRCREV_pn-etk-theme-shr = "${AUTOREV}" -SRCREV_pn-libeflvala = "${AUTOREV}" - -SRCREV_pn-illume-keyboard-german = "${AUTOREV}" -SRCREV_pn-illume-keyboard-arabic = "${AUTOREV}" -SRCREV_pn-illume-keyboard-browse = "${AUTOREV}" -SRCREV_pn-illume-keyboard-danish = "${AUTOREV}" -SRCREV_pn-illume-keyboard-default-alt = "${AUTOREV}" -SRCREV_pn-illume-keyboard-dutch = "${AUTOREV}" -SRCREV_pn-illume-keyboard-dvorak = "${AUTOREV}" -SRCREV_pn-illume-keyboard-french = "${AUTOREV}" -SRCREV_pn-illume-keyboard-hebrew = "${AUTOREV}" -SRCREV_pn-illume-keyboard-numeric-alt = "${AUTOREV}" -SRCREV_pn-illume-keyboard-russian-terminal = "${AUTOREV}" -SRCREV_pn-illume-keyboard-russian = "${AUTOREV}" - - -# Other stuff -SRCREV_pn-bt-configure = "${AUTOREV}" -SRCREV_pn-navit = "2309" -SRCREV_pn-omview = "${AUTOREV}" -SRCREV_pn-pythm = "${AUTOREV}" -SRCREV_pn-omoney = "29" -SRCREV_pn-enotes = "19" -SRCREV_pn-ebrainy = "${AUTOREV}" -SRCREV_pn-boost-signals2 = "52299" -SRCREV_pn-dbus-c++-native = "${AUTOREV}" -SRCREV_pn-dbus-c++ = "${AUTOREV}" -SRCREV_pn-openmoocow = "${AUTOREV}" -SRCREV_pn-libmokoui2 = "4695" -SRCREV_pn-intone = "${AUTOREV}" -SRCREV_pn-connman = "aac35324deb8c0b57f881338d87cb36b0979e7df" -SRCREV_pn-msn-pecan = "${AUTOREV}" -SRCREV_pn-omgps = "${AUTOREV}" -SRCREV_pn-shr-today = "${AUTOREV}" -SRCREV_pn-shr-launcher = "${AUTOREV}" -SRCREV_pn-e-tasks = "${AUTOREV}" -SRCREV_pn-mokonnect = "${AUTOREV}" -SRCREV_pn-elmdentica = "${AUTOREV}" -SRCREV_pn-vala-terminal = "${AUTOREV}" - diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf new file mode 100644 index 0000000000..e45fc07334 --- /dev/null +++ b/conf/distro/shr.conf @@ -0,0 +1,97 @@ +#----------------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: SHR +#@DESCRIPTION: Linux Distribution Configuration for Mobile Phones +#----------------------------------------------------------------------------- + +# set default locale for images - we have to do that before +# including angstrom-2007-for-openmoko.inc because otherwise +# it will be already set to en-gb +IMAGE_LINGUAS ?= "en-us" + +# Set the toolchain type (internal, external) and brand (generic, csl etc.) +TOOLCHAIN_TYPE ?= "internal" +TOOLCHAIN_BRAND ?= "" + +#LIBC = "glibc" + +require conf/distro/include/preferred-xorg-versions-X11R7.5.inc +require conf/distro/include/preferred-shr-versions.inc +require conf/distro/include/shr-autorev.inc + +include conf/distro/minimal.conf + +# +# Header +# +DISTRO_NAME = "shr" +DISTRO_VERSION = "-${DATE}" +DISTRO_REVISION = "2" +DISTRO_PR = ".4" +#DISTRO_TYPE = "release" +DISTRO_TYPE = "debug" +DISTRO = "shr" + +#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable +PREFERRED_PROVIDER_qemu-native = "qemu-native" +ENABLE_BINARY_LOCALE_GENERATION ?= "1" + +# We only want to build UTF8 locales +LOCALE_UTF8_ONLY = "1" + +INHERIT += "testlab" + +CVS_TARBALL_STASH += "http://build.shr-project.org/sources/" + +PREMIRRORS = "(ftp|https?)$://.*/.* http://build.shr-project.org/sources/" + +DISTRO_FEED_PREFIX ?= "shr-dev" +DISTRO_FEED_URI ?= "http://build.shr-project.org/shr-testing/ipk" + +AB_DEPLOY_EXTRA ?= "" +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE_ARCH}/${AB_DEPLOY_EXTRA}" + +IMAGE_INITSCRIPTS = "initscripts-shr" +DISTRO_INITSCRIPTS = "initscripts-shr" +DISTRO_DEV_MANAGER = "udev" + +IPKG_VARIANT = "opkg" + +# Same kernel so same usb +PACKAGE_ARCH_pn-usb-gadget-mode_om-gta01 = "armv4t" +PACKAGE_ARCH_pn-usb-gadget-mode_om-gta02 = "armv4t" +# same kernel so same keymaps +PACKAGE_ARCH_pn-keymaps_om-gta01 = "armv4t" +PACKAGE_ARCH_pn-keymaps_om-gta02 = "armv4t" +# neod knows about both machines +PACKAGE_ARCH_pn-neod_om-gta01 = "armv4t" +PACKAGE_ARCH_pn-neod_om-gta02 = "armv4t" + +PREFERRED_PROVIDER_gconf = "gconf" +PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-logo" +PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr" +PREFERRED_PROVIDER_gpsd = "fso-gpsd" +PREFERRED_PROVIDER_e-wm-menu = "e-wm-menu-shr" +PREFERRED_PROVIDER_openmoko-alsa-scenarios = "alsa-scenarii-shr" +PREFERRED_PROVIDER_virtual/alsa-scenarios = "alsa-scenarii-shr" +PREFERRED_PROVIDER_libfribidi = "fribidi" +PREFERRED_PROVIDER_bluez-libs = "bluez4" +PREFERRED_PROVIDER_bluez-utils = "bluez4" +PREFERRED_PROVIDER_classpath = "classpath" +PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" +PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" +PREFERRED_PROVIDER_virtual/gail = "gtk+" +PREFERRED_PROVIDER_opkg = "opkg" +PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" +PREFERRED_PROVIDER_atd = "atd-over-fso" + +# Helper to say what image we built +SHR_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/shr-version" +ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${SHR_VERSION_FILE};cd $OLD_PWD;" +ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;" +ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;" +ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${SHR_VERSION_FILE};" +ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${SHR_VERSION_FILE};" + +#Package customization +EXTRA_OECONF-pn_qemu += " --target-list=arm-linux-user,arm-softmmu" diff --git a/recipes/addons/devshell.bb b/recipes/addons/devshell.bb index 9ac6821e0e..5921125d12 100644 --- a/recipes/addons/devshell.bb +++ b/recipes/addons/devshell.bb @@ -11,9 +11,6 @@ do_configure() { def devshell_emit_env(o, d, all=False, funcwhitelist=None): """Emits all items in the data store in a format such that it can be sourced by a shell.""" - import bb - import bb.data - env = bb.data.keys(d) for e in env: diff --git a/recipes/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch b/recipes/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch new file mode 100644 index 0000000000..09200dd43b --- /dev/null +++ b/recipes/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch @@ -0,0 +1,35 @@ +--- glibc-2.9.orig/configure.in 2009-10-22 15:38:13.000000000 +0200 ++++ glibc-2.9/configure.in 2009-10-22 15:37:33.000000000 +0200 +@@ -844,10 +844,10 @@ + # Accept binutils 2.13 or newer. + AC_CHECK_PROG_VER(AS, $AS, --version, + [GNU assembler.* \([0-9]*\.[0-9.]*\)], +- [2.1[3-9]*], AS=: critic_missing="$critic_missing as") ++ [2.1[3-9]* | 2.2* ], AS=: critic_missing="$critic_missing as") + AC_CHECK_PROG_VER(LD, $LD, --version, + [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], +- [2.1[3-9]*], LD=: critic_missing="$critic_missing ld") ++ [2.1[3-9]* | 2.2* ], LD=: critic_missing="$critic_missing ld") + + # We need the physical current working directory. We cannot use the + # "pwd -P" shell builtin since that's not portable. Instead we try to +--- glibc-2.9.orig/configure 2009-02-26 22:28:17.000000000 +0100 ++++ glibc-2.9/configure 2009-10-22 15:43:11.000000000 +0200 +@@ -4531,7 +4531,7 @@ + ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 2.1[3-9]*) ++ 2.1[3-9]* | 2.2*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + +@@ -4594,7 +4594,7 @@ + ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 2.1[3-9]*) ++ 2.1[3-9]* | 2.2*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + diff --git a/recipes/glibc/glibc-initial_2.10.1.bb b/recipes/glibc/glibc-initial_2.10.1.bb new file mode 100644 index 0000000000..d66297090f --- /dev/null +++ b/recipes/glibc/glibc-initial_2.10.1.bb @@ -0,0 +1,6 @@ +require glibc_${PV}.bb +require glibc-initial.inc + +do_configure_prepend () { + unset CFLAGS +} diff --git a/recipes/glibc/glibc_2.10.1.bb b/recipes/glibc/glibc_2.10.1.bb new file mode 100644 index 0000000000..27fbef5222 --- /dev/null +++ b/recipes/glibc/glibc_2.10.1.bb @@ -0,0 +1,151 @@ +require glibc.inc + +ARM_INSTRUCTION_SET = "arm" + +PACKAGES_DYNAMIC = "libc6*" +RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" + +# the -isystem in bitbake.conf screws up glibc do_stage +BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" +TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" + + +FILESPATHPKG =. "glibc-2.4:" + +GLIBC_ADDONS ?= "ports,nptl,libidn" + +GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN" + +# +# 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. +# +# 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)) +} + +RDEPENDS_${PN}-dev = "linux-libc-headers-dev" + +SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \ + file://nscd-init.patch;patch=1;pnum=0 \ + file://arm-memcpy.patch;patch=1 \ + file://arm-longlong.patch;patch=1 \ + file://fhs-linux-paths.patch;patch=1 \ + file://dl-cache-libcmp.patch;patch=1 \ + file://ldsocache-varrun.patch;patch=1 \ + file://nptl-crosscompile.patch;patch=1 \ + file://glibc-check_pf.patch;patch=1;pnum=0 \ + file://ldd-unbash.patch;patch=1 \ + file://glibc-arm-IO-acquire-lock-fix.diff;patch=1 \ + file://generic-bits_select.h \ + file://generic-bits_types.h \ + file://generic-bits_typesizes.h \ + file://generic-bits_time.h \ + file://etc/ld.so.conf \ + file://generate-supported.mk \ + file://march-i686.patch;patch=1;pnum=0 \ + file://arm-lowlevellock-include-tls.patch;patch=1 \ + file://glibc-2.9-enable-binutils-2.2.patch;patch=1 \ + file://armv4t-interworking.patch;patch=1 \ + " + +# Build fails on sh3 and sh4 without additional patches +SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1" +SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1" + +#powerpc patches to add support for soft-float +SRC_URI_append_powerpc= " file://powerpc-sqrt-hack.diff;patch=1" + +S = "${WORKDIR}/glibc-${PV}" +B = "${WORKDIR}/build-${TARGET_SYS}" + +EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ + --without-cvs --disable-profile --disable-debug --without-gd \ + --enable-clocale=gnu \ + --enable-add-ons=${GLIBC_ADDONS} \ + --with-headers=${STAGING_INCDIR} \ + --without-selinux \ + ${GLIBC_EXTRA_OECONF}" + +EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}" + +do_munge() { + # Integrate ports and libidn into tree + mv ${WORKDIR}/glibc-ports-${PV} ${S}/ports + mv ${WORKDIR}/glibc-libidn-${PV} ${S}/libidn + + # Ports isn't really working... Fix it + # Some of this is rather dirty, but it seems to be the only + # quick way to get this cruft to compile + rm -rf ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads + ln -s nptl ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads + cp ${S}/nptl/sysdeps/pthread/bits/sigthread.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/ + cp ${S}/sysdeps/unix/sysv/linux/i386/bits/wchar.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/ + cp ${S}/sysdeps/wordsize-32/bits/wordsize.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/ + cp ${WORKDIR}/generic-bits_select.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/select.h + cp ${WORKDIR}/generic-bits_types.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/types.h + cp ${WORKDIR}/generic-bits_typesizes.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/typesizes.h + cp ${WORKDIR}/generic-bits_time.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/time.h + # Copy in generic stuff for not yet implemented headers + for i in ${S}/bits/*.h; do + F=`basename $i` + [ "$F" = "local_lim.h" ] && continue + [ "$F" = "errno.h" ] && continue + test -e ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/$F || test -e ${S}/ports/sysdeps/arm/bits/$F || test -e ${S}/sysdeps/unix/sysv/linux/bits/$F || test -e ${S}/sysdeps/ieee754/bits/$F || cp $i ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/ + done + # This is harmful; we need to get the one from nptl/sysdeps/pthreads + rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/libc-lock.h + # Obsoleted by sysdeps/arm/{fpu,eabi}/bits/fenv.h + rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/fenv.h + # Obsoleted by sysdeps/gnu/bits/utmp.h + rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/utmp.h +} + +addtask munge before do_patch after do_unpack + + +do_configure () { +# /var/db was not included to FHS + sed -i s:/var/db/nscd:/var/run/nscd: ${S}/nscd/nscd.h +# override this function to avoid the autoconf/automake/aclocal/autoheader +# calls for now +# don't pass CPPFLAGS into configure, since it upsets the kernel-headers +# version check and doesn't really help with anything + if [ -z "`which rpcgen`" ]; then + echo "rpcgen not found. Install glibc-devel." + exit 1 + fi + (cd ${S} && gnu-configize) || die "failure in running gnu-configize" + CPPFLAGS="" oe_runconf +} + +rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \ + yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \ + rusers.x spray.x nfs_prot.x rquota.x key_prot.x" + +do_compile () { + # -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging + unset LDFLAGS + base_do_compile + ( + cd ${S}/sunrpc/rpcsvc + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + rpcgen -h $r -o $h || oewarn "unable to generate header for $r" + done + ) +} + +require glibc-stage.inc + +require glibc-package.bbclass diff --git a/recipes/module-init-tools/module-init-tools-cross_3.2.2.bb b/recipes/module-init-tools/module-init-tools-cross_3.2.2.bb index eb2027b384..c8a35c766b 100644 --- a/recipes/module-init-tools/module-init-tools-cross_3.2.2.bb +++ b/recipes/module-init-tools/module-init-tools-cross_3.2.2.bb @@ -1,5 +1,5 @@ -LICENSE = "GPL" -require module-init-tools_${PV}.bb + +require module-init-tools.inc inherit cross DEFAULT_PREFERENCE = "0" PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" diff --git a/recipes/module-init-tools/module-init-tools.inc b/recipes/module-init-tools/module-init-tools.inc new file mode 100644 index 0000000000..59e93d4533 --- /dev/null +++ b/recipes/module-init-tools/module-init-tools.inc @@ -0,0 +1,25 @@ +DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ +removing kernel modules for Linux (versions 2.5.48 and above). It serves \ +the same function that the modutils package serves for Linux 2.4." +LICENSE = "GPL" +SECTION = "base" +PR = "r5" + +PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" +RDEPENDS_${PN} += "module-init-tools-depmod" + +FILES_module-init-tools-depmod = "${sbindir}/depmod.26" +FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ + file://ignore_arch_directory;patch=1 \ + file://modutils_extension;patch=1 \ + file://no_man_rebuild;patch=1 \ + file://manpagesopt;patch=1 \ + file://module-init-tools-remove-index.patch;patch=1 " +S = "${WORKDIR}/module-init-tools-${PV}" + +EXTRA_OECONF = "--disable-manpages" + + +inherit autotools diff --git a/recipes/module-init-tools/module-init-tools_3.2.1.bb b/recipes/module-init-tools/module-init-tools_3.2.1.bb index 91c0efcd64..6481913ca7 100644 --- a/recipes/module-init-tools/module-init-tools_3.2.1.bb +++ b/recipes/module-init-tools/module-init-tools_3.2.1.bb @@ -1,30 +1,14 @@ -DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ -removing kernel modules for Linux (versions 2.5.48 and above). It serves \ -the same function that the modutils package serves for Linux 2.4." -LICENSE = "GPL" -SECTION = "base" -PR = "r1" - -PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" -RDEPENDS_${PN} += "module-init-tools-depmod" - -FILES_module-init-tools-depmod = "${sbindir}/depmod.26" -FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" +require module-init-tools.inc SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ file://ignore_arch_directory;patch=1 \ file://modutils_extension;patch=1 \ file://no_man_rebuild;patch=1 \ file://manpagesopt;patch=1 " -S = "${WORKDIR}/module-init-tools-${PV}" - -EXTRA_OECONF = "--disable-manpages" bindir = "/bin" sbindir = "/sbin" -inherit autotools - do_install() { autotools_do_install for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do diff --git a/recipes/module-init-tools/module-init-tools_3.2.2.bb b/recipes/module-init-tools/module-init-tools_3.2.2.bb index a56bac7a82..4e2cba8d6f 100644 --- a/recipes/module-init-tools/module-init-tools_3.2.2.bb +++ b/recipes/module-init-tools/module-init-tools_3.2.2.bb @@ -1,31 +1,8 @@ -DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ -removing kernel modules for Linux (versions 2.5.48 and above). It serves \ -the same function that the modutils package serves for Linux 2.4." -LICENSE = "GPL" -SECTION = "base" -PR = "r5" - -PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" -RDEPENDS_${PN} += "module-init-tools-depmod" - -FILES_module-init-tools-depmod = "${sbindir}/depmod.26" -FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ - file://ignore_arch_directory;patch=1 \ - file://modutils_extension;patch=1 \ - file://no_man_rebuild;patch=1 \ - file://manpagesopt;patch=1 \ - file://module-init-tools-remove-index.patch;patch=1 " -S = "${WORKDIR}/module-init-tools-${PV}" - -EXTRA_OECONF = "--disable-manpages" +require module-init-tools.inc bindir = "/bin" sbindir = "/sbin" -inherit autotools - do_install() { autotools_do_install for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do diff --git a/recipes/module-init-tools/module-init-tools_3.4.bb b/recipes/module-init-tools/module-init-tools_3.4.bb index caea00d194..0b94c3b317 100644 --- a/recipes/module-init-tools/module-init-tools_3.4.bb +++ b/recipes/module-init-tools/module-init-tools_3.4.bb @@ -1,29 +1,12 @@ -DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ -removing kernel modules for Linux (versions 2.5.48 and above). It serves \ -the same function that the modutils package serves for Linux 2.4." -LICENSE = "GPL" -SECTION = "base" - -PR = "r1" - -PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" -RDEPENDS_${PN} += "module-init-tools-depmod" - -FILES_module-init-tools-depmod = "${sbindir}/depmod.26" -FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" +require module-init-tools.inc SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ file://modutils_extension;patch=1 \ " -S = "${WORKDIR}/module-init-tools-${PV}" - -EXTRA_OECONF = "--disable-manpages" bindir = "/bin" sbindir = "/sbin" -inherit autotools - do_configure_prepend() { sed -i -e /MAN5\ =/d -e /MAN8\ =/d Makefile.am } diff --git a/recipes/mysql/mysql_4.1.22.bb b/recipes/mysql/mysql_4.1.22.bb index 9e5ff885f9..1dacff6781 100644 --- a/recipes/mysql/mysql_4.1.22.bb +++ b/recipes/mysql/mysql_4.1.22.bb @@ -38,9 +38,11 @@ do_stage() { oe_libinstall -a -C libmysqld libmysqld ${STAGING_LIBDIR} } -do_stage_append() { - sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config - sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config +SYSROOT_PREPROCESS_FUNCS += "mysqlmangle" + +mysqlmangle() { + sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}\', ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/mysql_config + sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/mysql_config } do_install() { |