From 5c889a3bff1539bf19b368a1739f592ef456aaef Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Thu, 2 Jun 2005 21:40:10 +0000 Subject: [PATCH] Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/06/02 22:13:59+01:00 reciva.com!pb Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded into mill.internal.reciva.com:/nexus/home/pb/oe/oe 2005/06/02 22:07:26+01:00 reciva.com!pb factor out lirc machine specifics into an .inc file. avoid feeding LDFLAGS to the kernel linker, since it doesn't like them. 2005/06/02 22:59:55+02:00 utwente.nl!koen nokia770.conf: remove arm926ejs from archs 2005/06/02 22:56:13+02:00 utwente.nl!koen tune-arm926ejs.conf: set arch to armv5te instead of arm926ejs as Phil pointed out BKrev: 429f7cbanu_8PuI52mw_rYQD7m0Dkg --- conf/machine/nokia770.conf | 2 +- conf/machine/tune-arm926ejs.conf | 2 +- packages/lirc/lirc-config.inc | 0 packages/lirc/lirc-modules_0.7.0.bb | 10 +++------- packages/lirc/lirc_0.7.0.bb | 6 +----- 5 files changed, 6 insertions(+), 14 deletions(-) create mode 100644 packages/lirc/lirc-config.inc 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 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"' -- 2.39.5