diff options
91 files changed, 27961 insertions, 45 deletions
diff --git a/classes/module_strip.bbclass b/classes/module_strip.bbclass index 116e8b902f..63e6569799 100644 --- a/classes/module_strip.bbclass +++ b/classes/module_strip.bbclass @@ -5,7 +5,11 @@ do_strip_modules () { if test -e ${WORKDIR}/install/$p/lib/modules; then modules="`find ${WORKDIR}/install/$p/lib/modules -name \*${KERNEL_OBJECT_SUFFIX}`" if [ -n "$modules" ]; then - ${STRIP} -v -g $modules + for module in $modules ; do + if ! [ -d "$module" ] ; then + ${STRIP} -v -g $module + fi + done # NM="${CROSS_DIR}/bin/${HOST_PREFIX}nm" OBJCOPY="${CROSS_DIR}/bin/${HOST_PREFIX}objcopy" strip_module $modules fi fi diff --git a/classes/package.bbclass b/classes/package.bbclass index 27d5a3a685..7d3068852f 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -275,7 +275,7 @@ python populate_packages () { for root, dirs, files in os.walk(dvar): for f in files: file = os.path.join(root, f) - if not os.path.islink(file) and isexec(file): + if not os.path.islink(file) and not os.path.isdir(file) and isexec(file): stripfunc += "\trunstrip %s || st=1\n" % (file) if not stripfunc == "": from bb import build diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 0cb5128e17..af6d905490 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -1,6 +1,6 @@ inherit package DEPENDS_prepend="${@["ipkg-utils-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}" -BOOTSTRAP_EXTRA_RDEPENDS += "ipkg-collateral ipkg ipkg-link" +BOOTSTRAP_EXTRA_RDEPENDS += "ipkg-collateral ipkg" PACKAGEFUNCS += "do_package_ipk" python package_ipk_fn () { diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index ae87c2ed2d..8cea393b43 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -17,7 +17,7 @@ do_build[nostamp] = 1 IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS}" -IPKG_INSTALL += "ipkg ipkg-link ipkg-collateral" +IPKG_INSTALL += "ipkg ipkg-collateral" ROOTFS_POSTPROCESS_COMMAND ?= "" diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 756ce7675e..e63bdfc54e 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -188,12 +188,14 @@ IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.r IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}" IMAGE_CMD_ext2.gz = "mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" +IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ." IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." EXTRA_IMAGECMD = "" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" EXTRA_IMAGECMD_squashfs = "-le -b 16384" +EXTRA_IMAGECMD_squashfs-lzma = "-le -b 16384" IMAGE_ROOTFS_SIZE_ext2 = "65536" IMAGE_ROOTFS_SIZE_ext2.gz = "65536" @@ -203,6 +205,7 @@ IMAGE_DEPENDS_cramfs = "cramfs-native" IMAGE_DEPENDS_ext2 = "genext2fs-native" IMAGE_DEPENDS_ext2.gz = "genext2fs-native" IMAGE_DEPENDS_squashfs = "squashfs-tools-native" +IMAGE_DEPENDS_squashfs-lzma = "squashfs-lzma-tools-native" EXTRA_IMAGEDEPENDS = "" ################################################################## diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 0c5186c3a8..48915e6554 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -22,7 +22,7 @@ MAINTAINER = "Angstrom Developers <angstrom-distro-devel@linuxtogo.org>" #use ipkg package format with debian style naming #use multimachine buildrules -INHERIT += "package_ipk debian multimachine" +INHERIT += "package_ipk debian multimachine sanity" #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable PREFERRED_PROVIDER_qemu-native = "qemu-native" diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index 6be29e5c1b..6dbf0dc31f 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -56,6 +56,10 @@ PREFERRED_VERSION_binutils-cross = "2.16" PREFERRED_VERSION_binutils = "2.16" PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" +PREFERRED_VERSION_gcc = "3.4.4" +PREFERRED_VERSION_gcc-cross = "3.4.4" +PREFERRED_VERSION_gcc-cross-initial = "3.4.4" + # # Opie # diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf index 08bb29189d..095cd95d31 100755 --- a/conf/machine/netbook-pro.conf +++ b/conf/machine/netbook-pro.conf @@ -5,7 +5,7 @@ INHERIT += "linux-kernel-base" TARGET_ARCH = "arm" -IPKG_EXTRA_ARCHS = "armv5te" +IPKG_EXTRA_ARCHS = "arm armv4 armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" @@ -17,15 +17,6 @@ XSERVER = "xserver-kdrive-epson" MACHINE_FEATURES = "kernel26 touchscreen keyboard apm alsa pcmcia bluetooth irda usbhost" -#ship in rootfs: -NBP_MODULES = " apm \ - pcmcia-core \ - ipv6 " -BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${NBP_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" - -GPE_EXTRA_INSTALL += "gpe-mini-browser" - # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttySA0 vt100" diff --git a/packages/ntp/ntp_4.2.2p3.bb b/packages/ntp/ntp_4.2.2p3.bb index 886f36253a..4509a2d1d8 100644 --- a/packages/ntp/ntp_4.2.2p3.bb +++ b/packages/ntp/ntp_4.2.2p3.bb @@ -7,7 +7,7 @@ SECTION = "console/network" PRIORITY = "optional" LICENSE = "ntp" -SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz \ +SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \ file://ipv6only-workaround.patch;patch=1 \ file://ntpd \ file://ntp.conf \ diff --git a/packages/python/python-pycairo_1.2.2.bb b/packages/python/python-pycairo_1.2.2.bb index 548d972c50..46638d2794 100644 --- a/packages/python/python-pycairo_1.2.2.bb +++ b/packages/python/python-pycairo_1.2.2.bb @@ -3,12 +3,13 @@ SECTION = "python-devel" HOMEPAGE = "http://cairographics.org/pycairo" LICENSE = "LGPL MPL" DEPENDS = "cairo" +PR = "ml1" SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz \ file://fix-pkgconfig-dir.patch;patch=1" S = "${WORKDIR}/pycairo-${PV}" -inherit distutils +inherit distutils pkgconfig do_stage() { install -d ${STAGING_INCDIR} diff --git a/packages/stage-manager/stagemanager-native_0.0.1.bb b/packages/stage-manager/stagemanager-native_0.0.1.bb index 281c42c395..7074d37307 100644 --- a/packages/stage-manager/stagemanager-native_0.0.1.bb +++ b/packages/stage-manager/stagemanager-native_0.0.1.bb @@ -1,4 +1,5 @@ DESCRIPTION = "Helper script for packaged-staging.bbclass" +PR = "r1" SRC_URI = "file://stage-manager" LICENSE = "GPLv2" @@ -7,6 +8,9 @@ PACKAGE_ARCH = "all" inherit native +DEPENDS = " " +PACKAGE_DEPENDS = " " +PATCHTOOL = "" INHIBIT_DEFAULT_DEPS = "1" do_install() { diff --git a/packages/xorg-lib/xorg-headers-native.bb b/packages/xorg-lib/xorg-headers-native.bb new file mode 100644 index 0000000000..f88bcc7aee --- /dev/null +++ b/packages/xorg-lib/xorg-headers-native.bb @@ -0,0 +1,9 @@ +inherit native + +SRC_URI = "file://X11" + +do_stage() { + install -d ${STAGING_INCDIR} + cp -pPfR ${WORKDIR}/X11 ${STAGING_INCDIR} +} + diff --git a/packages/xorg-lib/ |