diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-02-15 20:20:32 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-02-15 20:20:32 +0000 |
| commit | 342f01d322bcc1ee34549fdc8f8db7555568b329 (patch) | |
| tree | b298385cc8df877bda080abab8a173011e27247e /packages | |
| parent | 330fe728fbcc78cc404239b2f799fafb33fc64f2 (diff) | |
| parent | c1cd7092d2359fa9661dffbfb0542338f419caff (diff) | |
merge of '17456d839ed6d5a9ca1e700a26784cc663820a4d'
and 'ffd5b1436a28fe33ef6213ae4b0371af61aad94f'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linux/ixp4xx-kernel.inc | 2 | ||||
| -rw-r--r-- | packages/openobex/openobex_1.2.bb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index d848427921..57d3028742 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -337,7 +337,7 @@ install_image() { do_install_append() { # Overwrite the unshimmed generic image with a shimmed one (but without # any command line or machine id override). - rm -f '${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERISON}' + rm -f '${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}' install_image '${MACHINE_ARCH}' # Add the machine specific images, with appropriate suffixes diff --git a/packages/openobex/openobex_1.2.bb b/packages/openobex/openobex_1.2.bb index 81f9ff68ed..e6ec335978 100644 --- a/packages/openobex/openobex_1.2.bb +++ b/packages/openobex/openobex_1.2.bb @@ -5,7 +5,7 @@ SECTION = "libs" PROVIDES = "openobex-apps" DEPENDS = "libusb bluez-libs" LICENSE = "GPL" -PR = "r4" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \ file://disable-cable-test.patch;patch=1" \ @@ -30,5 +30,4 @@ PACKAGES += "openobex-apps" FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev += "${bindir}/openobex-config" FILES_${PN}-apps = "${bindir}/*" -DEBIAN_NOAUTONAME_${PN} = "1" DEBIAN_NOAUTONAME_${PN}-apps = "1" |