diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-07-31 13:53:31 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-08-07 12:21:23 +0200 |
| commit | 40d5df1a54bb45587d58e467cb8e4694025ac8bf (patch) | |
| tree | 48822860212d59a9ab9f548089d3c7989ab6e041 | |
| parent | 5a5198ff6eccb097b785c22a256a072a41c7f2cd (diff) | |
| download | meta-openembedded-40d5df1a54bb45587d58e467cb8e4694025ac8bf.tar.gz | |
fbreader: drop machine overrides
* sorry forgot to move them to .bbappend before merging to meta-oe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/fbreader/fbreader_0.12.10.bb | 5 | ||||
| -rw-r--r-- | meta-oe/recipes-support/fbreader/fbreader_git.bb | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/meta-oe/recipes-support/fbreader/fbreader_0.12.10.bb b/meta-oe/recipes-support/fbreader/fbreader_0.12.10.bb index 40fc6317ea..4786846649 100644 --- a/meta-oe/recipes-support/fbreader/fbreader_0.12.10.bb +++ b/meta-oe/recipes-support/fbreader/fbreader_0.12.10.bb | |||
| @@ -15,11 +15,6 @@ READER_ARCH ?= "desktop" | |||
| 15 | READER_UI ?= "gtk" | 15 | READER_UI ?= "gtk" |
| 16 | READER_STATUS ?= "release" | 16 | READER_STATUS ?= "release" |
| 17 | 17 | ||
| 18 | # because of defaults overriden in machine config | ||
| 19 | PACKAGE_ARCH_om-gta01 = "${MACHINE_ARCH}" | ||
| 20 | PACKAGE_ARCH_om-gta02 = "${MACHINE_ARCH}" | ||
| 21 | PACKAGE_ARCH_om-gta04 = "${MACHINE_ARCH}" | ||
| 22 | |||
| 23 | FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary ${libdir}/zlibrary" | 18 | FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary ${libdir}/zlibrary" |
| 24 | FILES_${PN}-dbg += "${libdir}/zlibrary/ui/.debug/" | 19 | FILES_${PN}-dbg += "${libdir}/zlibrary/ui/.debug/" |
| 25 | 20 | ||
diff --git a/meta-oe/recipes-support/fbreader/fbreader_git.bb b/meta-oe/recipes-support/fbreader/fbreader_git.bb index 8baec79ccc..937bdc8282 100644 --- a/meta-oe/recipes-support/fbreader/fbreader_git.bb +++ b/meta-oe/recipes-support/fbreader/fbreader_git.bb | |||
| @@ -19,10 +19,6 @@ READER_ARCH ?= "desktop" | |||
| 19 | READER_UI ?= "gtk" | 19 | READER_UI ?= "gtk" |
| 20 | READER_STATUS ?= "release" | 20 | READER_STATUS ?= "release" |
| 21 | 21 | ||
| 22 | # because of defaults overriden in machine config | ||
| 23 | PACKAGE_ARCH_om-gta01 = "${MACHINE_ARCH}" | ||
| 24 | PACKAGE_ARCH_om-gta02 = "${MACHINE_ARCH}" | ||
| 25 | |||
| 26 | FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary ${libdir}/zlibrary" | 22 | FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary ${libdir}/zlibrary" |
| 27 | FILES_${PN}-dbg += "${libdir}/zlibrary/ui/.debug/" | 23 | FILES_${PN}-dbg += "${libdir}/zlibrary/ui/.debug/" |
| 28 | 24 | ||