diff options
| -rw-r--r-- | conf/machine/nokia770.conf | 2 | ||||
| -rw-r--r-- | conf/machine/tune-arm926ejs.conf | 2 | ||||
| -rw-r--r-- | packages/lirc/lirc-config.inc | 0 | ||||
| -rw-r--r-- | packages/lirc/lirc-modules_0.7.0.bb | 10 | ||||
| -rw-r--r-- | packages/lirc/lirc_0.7.0.bb | 6 |
5 files changed, 6 insertions, 14 deletions
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 693f9a4807..468e1e9c54 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -2,7 +2,7 @@ #@NAME: Nokia 770 internet tablet #@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv4 armv5te arm926ejs" +IPKG_ARCHS = "all arm armv4 armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/conf/machine/tune-arm926ejs.conf b/conf/machine/tune-arm926ejs.conf index b07b603054..4e62a749dc 100644 --- a/conf/machine/tune-arm926ejs.conf +++ b/conf/machine/tune-arm926ejs.conf @@ -1,2 +1,2 @@ TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" -PACKAGE_ARCH = "arm926ejs" +PACKAGE_ARCH = "armv5te" diff --git a/packages/lirc/lirc-config.inc b/packages/lirc/lirc-config.inc new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/lirc/lirc-config.inc diff --git a/packages/lirc/lirc-modules_0.7.0.bb b/packages/lirc/lirc-modules_0.7.0.bb index 7e63c561fc..99b0fabd31 100644 --- a/packages/lirc/lirc-modules_0.7.0.bb +++ b/packages/lirc/lirc-modules_0.7.0.bb @@ -12,15 +12,11 @@ S = "${WORKDIR}/lirc-${PV}" inherit autotools module-base -EXTRA_OECONF = "--with-kerneldir=${STAGING_KERNEL_DIR}" -EXTRA_OECONF_append_epia = " --with-driver=serial" -EXTRA_OECONF_append_collie = " --with-driver=sa1100 --without-x" -EXTRA_OECONF_append_h3600 = " --with-driver=sa1100 --without-x" -EXTRA_OECONF_append_beagle = " --with-driver=sa1100 --without-x" -EXTRA_OECONF_append_simpad = " --with-driver=sa1100 --without-x" +include lirc-config.inc do_compile() { - cd drivers && oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" + # ${KERNEL_LD} doesn't understand the LDFLAGS, so suppress them + cd drivers && oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" LDFLAGS="" } fakeroot do_install() { diff --git a/packages/lirc/lirc_0.7.0.bb b/packages/lirc/lirc_0.7.0.bb index 4de5432aae..3ab40a60d2 100644 --- a/packages/lirc/lirc_0.7.0.bb +++ b/packages/lirc/lirc_0.7.0.bb @@ -16,11 +16,7 @@ inherit autotools module-base update-rc.d INITSCRIPT_NAME = "lirc" INITSCRIPT_PARAMS = "defaults 20" -EXTRA_OECONF_epia = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=serial" -EXTRA_OECONF_collie = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x" -EXTRA_OECONF_h3600 = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x" -EXTRA_OECONF_beagle = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x" -EXTRA_OECONF_simpad = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x" +include lirc-config.inc EXTRA_OEMAKE = 'SUBDIRS="daemons tools"' |