Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/11 20:33:00+01:00 reciva.com!pb
suppress PARALLEL_MAKE for pciutils

2005/06/11 20:12:19+01:00 reciva.com!pb
set KERNEL_CCSUFFIX to 3.3.4 for epia, pending availability of gcc-cross-kernel 3.4.4

2005/06/11 20:08:07+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/11 20:05:35+01:00 reciva.com!pb
remove preference for binutils_csl-arm-20050603 due to "stfpls" problem

BKrev: 42ab3e17pU3U_O8qsBteBt0JRESXaA

diff --git a/packages/binutils/binutils_csl-arm-20050603.bb b/packages/binutils/binutils_csl-arm-20050603.bb
index e69de29..4e1813b 100644 (file)
--- a/packages/binutils/binutils_csl-arm-20050603.bb
+++ b/packages/binutils/binutils_csl-arm-20050603.bb
@@ -0,0 +1,123 @@
+SECTION = "devel"
+inherit autotools gettext
+
+DESCRIPTION = "A GNU collection of binary utilities"
+HOMEPAGE = "http://www.gnu.org/software/binutils/"
+LICENSE = "GPL"
+MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
+PV = "2.15.99+csl-arm+cvs20050603"
+PR = "r0"
+OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
+DEFAULT_PREFERENCE = "-1"
+#DEFAULT_PREFERENCE_arm-linux = "1"
+#DEFAULT_PREFERENCE_arm-linuxeabi = "1"
+
+PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
+
+FILES_${PN} = " \
+       ${bindir}/${TARGET_PREFIX}* \
+       ${libdir}/lib*-*.so \
+       ${prefix}/${TARGET_SYS}/bin/*"
+
+FILES_${PN}-dev = " \
+       ${includedir} \
+       ${libdir}/*.a \
+       ${libdir}/*.la \
+       ${libdir}/libbfd.so \
+       ${libdir}/libopcodes.so"
+
+FILES_${PN}-symlinks = " \
+       ${bindir}/addr2line \
+       ${bindir}/ar \
+       ${bindir}/as \
+       ${bindir}/c++filt \
+       ${bindir}/gprof \
+       ${bindir}/ld \
+       ${bindir}/nm \
+       ${bindir}/objcopy \
+       ${bindir}/objdump \
+       ${bindir}/ranlib \
+       ${bindir}/readelf \
+       ${bindir}/size \
+       ${bindir}/strings \
+       ${bindir}/strip"
+
+SRC_URI = "cvs://anoncvs:anoncvs@sources.redhat.com/cvs/src;module=binutils;method=pserver;localdir=src;tag=binutils-csl-arm-2005q1-branch;date=20050603 \
+     file://ld_makefile.patch;patch=1 \
+     file://better_file_error.patch;patch=1 \
+     file://signed_char_fix.patch;patch=1"
+
+S = "${WORKDIR}/src"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+EXTRA_OECONF = "--with-sysroot=${prefix} \
+               --program-prefix=${TARGET_PREFIX} \
+               --enable-shared"
+
+# This is necessary due to a bug in the binutils Makefiles
+EXTRA_OEMAKE = "configure-build-libiberty all"
+
+export AR = "${HOST_PREFIX}ar"
+export AS = "${HOST_PREFIX}as"
+export LD = "${HOST_PREFIX}ld"
+export NM = "${HOST_PREFIX}nm"
+export RANLIB = "${HOST_PREFIX}ranlib"
+export OBJCOPY = "${HOST_PREFIX}objcopy"
+export OBJDUMP = "${HOST_PREFIX}objdump"
+
+export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
+export AS_FOR_TARGET = "${TARGET_PREFIX}as"
+export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
+export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
+export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
+
+export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+
+export CC = "${CCACHE} ${HOST_PREFIX}gcc"
+
+do_configure () {
+       (cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
+       oe_runconf
+}
+
+do_stage () {
+       oe_libinstall -so -a -C opcodes libopcodes ${STAGING_LIBDIR}/
+       oe_libinstall -a -C libiberty libiberty ${STAGING_LIBDIR}/
+       oe_libinstall -so -a -C bfd libbfd ${STAGING_LIBDIR}/
+       install -m 0644 ${S}/include/dis-asm.h ${STAGING_INCDIR}/
+       install -m 0644 ${S}/include/symcat.h ${STAGING_INCDIR}/
+       install -m 0644 ${S}/include/libiberty.h ${STAGING_INCDIR}/
+       install -m 0644 ${S}/include/ansidecl.h ${STAGING_INCDIR}/
+       install -m 0644 ${S}/include/bfdlink.h ${STAGING_INCDIR}/
+       install -m 0644 bfd/bfd.h ${STAGING_INCDIR}/
+}
+
+do_install () {
+       autotools_do_install
+
+       # We don't really need these, so we'll remove them...
+       rm -rf ${D}${libdir}/ldscripts
+
+       # Fix the /usr/${TARGET_SYS}/bin/* links
+       for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do
+               rm -f $l
+               ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
+                       | tr -s / \
+                       | sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
+       done
+
+       # Install the libiberty header
+       install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
+       install -m 644 ${S}/include/libiberty.h ${D}${includedir}
+
+       cd ${D}${bindir}
+
+       # Symlinks for ease of running these on the native target
+       for p in ${TARGET_SYS}-* ; do
+               ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
+       done
+}

diff --git a/packages/linux/linux-epia_2.6.11.bb b/packages/linux/linux-epia_2.6.11.bb
index e69de29..1b2ee9b 100644 (file)
--- a/packages/linux/linux-epia_2.6.11.bb
+++ b/packages/linux/linux-epia_2.6.11.bb
@@ -0,0 +1,28 @@
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for VIA EPiA"
+LICENSE = "GPL"
+PR = "r0"
+
+KERNEL_CCSUFFIX = "-3.3.4"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+          http://hem.bredband.net/ekmlar/patch-vt1211-2.6.txt;patch=1 \
+           file://epia_defconfig"
+S = "${WORKDIR}/linux-${PV}"
+
+COMPATIBLE_HOST = 'i.86.*-linux'
+
+inherit kernel
+
+ARCH = "i386"
+KERNEL_IMAGETYPE = "bzImage"
+
+# Don't want kernel in rootfs
+FILES_kernel = ""
+ALLOW_EMPTY_kernel = "1"
+PACKAGES += "kernel-image"
+FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
+
+do_configure_prepend() {
+       install -m 0644 ${WORKDIR}/epia_defconfig ${S}/.config
+}

diff --git a/packages/pciutils/pciutils_2.1.11.bb b/packages/pciutils/pciutils_2.1.11.bb
index cb77a6b..792b34f 100644 (file)
--- a/packages/pciutils/pciutils_2.1.11.bb
+++ b/packages/pciutils/pciutils_2.1.11.bb
@@ -6,6 +6,8 @@ LICENSE = "GPLv2"
 
 PR="r1"
 
+PARALLEL_MAKE = ""
+
 SRC_URI = "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-${PV}.tar.bz2 \
           file://configure.patch;patch=1 \
           file://configure-uclibc.patch;patch=1 \