diff options
author | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-08-25 17:00:30 +0000 |
---|---|---|
committer | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-08-25 17:00:30 +0000 |
commit | 3cdc3b52b167778be7f2c45b1a885f0af7864f97 (patch) | |
tree | b0e6176e9c836a3cae4f1f835e51156e9e114184 /packages/linux/linux-omap.inc | |
parent | afba23ee6fd6c6c0262b0b46cace12a9087f3670 (diff) | |
parent | 3ea8eeaef5fced41a090c1230642d51db358a544 (diff) |
merge of '7222928a192dd87d681067dcc74025c3a2ecf986'
and 'c9235531d0eda1ab2165b6651685887b61d57ba1'
Diffstat (limited to 'packages/linux/linux-omap.inc')
-rw-r--r-- | packages/linux/linux-omap.inc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/packages/linux/linux-omap.inc b/packages/linux/linux-omap.inc index e4ce5a1e3c..6bc1363737 100644 --- a/packages/linux/linux-omap.inc +++ b/packages/linux/linux-omap.inc @@ -11,13 +11,21 @@ module_autoload_ohci-hcd_omap5912osk = "ohci-hcd" do_configure_prepend() { - if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then - install -m 0644 ${WORKDIR}/defconfig.eabi ${S}/.config + rm -f ${S}/.config || true + + if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then + echo "CONFIG_AEABI=y" >> ${S}/.config + echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else - install -m 0644 ${WORKDIR}/defconfig ${S}/.config + echo "# CONFIG_AEABI is not set" >> ${S}/.config + echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config fi - oe_runmake oldconfig + sed -e '/CONFIG_AEABI/d' \ + -e '/CONFIG_OABI_COMPAT=/d' \ + '${WORKDIR}/defconfig' >>'${S}/.config' + + yes '' | oe_runmake oldconfig } do_deploy() { install -d ${DEPLOY_DIR_IMAGE} |