diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-08-13 11:04:58 +0200 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-08-13 11:04:58 +0200 |
| commit | 294f5bb1395138045b1bf9403d9cc47014b1a825 (patch) | |
| tree | b278f0a46c6f1e9bd806e2d94d87c35d485437a6 | |
| parent | 4b2780d203083dc4647fc81e7d978579620bfeaf (diff) | |
| parent | 8786dbcabdb3f9c0dec743298af8b4e7005a3b0a (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
173 files changed, 733 insertions, 4604 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6f0fb5c4eb..67a65c44a5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -227,7 +227,7 @@ Recipes: altboot, webcam-server Person: Michael 'Mickey' Lauer Mail: mlauer@vanille-media.de -Distros: Openmoko, Minimal +Distros: Minimal Machines: om-gta01, om-gta02, htcdream, htcraphael, palmpre, a780, a1200, a910 Interests: Core OE infrastructure, Python, EFL, Vala, Freesmartphone.org Recipes: efl1/*, busybox/*, dbus/*, dropbear/*, freesmartphone/*, gstreamer/*, *python*, vala/ diff --git a/classes/srctree.bbclass b/classes/srctree.bbclass index 7232c26b12..1a88613a0b 100644 --- a/classes/srctree.bbclass +++ b/classes/srctree.bbclass @@ -50,7 +50,7 @@ def merge_tasks(d): __gather_taskdeps(task, items) return items - newtask = "do_populate_sysroot" + newtask = "do_populate_sysroot_post" mergedtasks = gather_taskdeps(newtask) mergedtasks.pop() deltasks = gather_taskdeps("do_patch") @@ -83,17 +83,22 @@ def merge_tasks(d): d.setVarFlag(task, "deps", deps) # Pull cross recipe task deps over - depends = (d.getVarFlag(task, "depends") or "" - for task in mergedtasks[:-1] - if not task in deltasks) - d.setVarFlag("do_populate_sysroot", "depends", " ".join(depends)) + depends = [] + deptask = [] + for task in mergedtasks[:-1]: + if not task in deltasks: + depends.append(d.getVarFlag(task, "depends") or "") + deptask.append(d.getVarFlag(task, "deptask") or "") + + d.setVarFlag("do_populate_sysroot_post", "depends", " ".join(depends)) + d.setVarFlag("do_populate_sysroot_post", "deptask", " ".join(deptask)) python () { merge_tasks(d) } -# Manually run do_install & all of its deps, then do_stage -python do_populate_sysroot () { +# Manually run do_install & all of its deps +python do_populate_sysroot_post () { from os.path import exists from bb.build import exec_task, exec_func from bb import note @@ -105,11 +110,11 @@ python do_populate_sysroot () { if not dep in seen: rec_exec_task(dep, seen) seen.add(task) - #if not exists("%s.%s" % (stamp, task)): - note("%s: executing task %s" % (d.getVar("PF", True), task)) - exec_task(task, d) + if not exists("%s.%s" % (stamp, task)): + note("%s: executing task %s" % (d.getVar("PF", True), task)) + exec_func(task, d) - rec_exec_task("do_install", set()) - exec_func("do_stage", d) + rec_exec_task("do_populate_sysroot", set()) } -do_populate_sysroot[lockfiles] += "${S}/.lock" +addtask populate_sysroot_post after do_populate_sysroot +do_populate_sysroot_post[lockfiles] += "${S}/.lock" diff --git a/conf/bitbake.conf b/conf/bitbake.conf index abe500a099..677c76a2f7 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -364,8 +364,10 @@ IMAGE_CMD_yaffs2 = "mkyaffs2image ${EXTRA_IMAGECMD} ${IMAGE_ROOTFS} ${DEPLOY_DIR IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" IMAGE_CMD_ext2 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}" IMAGE_CMD_ext2.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${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" +IMAGE_CMD_ext2.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext2.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.bz2" IMAGE_CMD_ext3 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" IMAGE_CMD_ext3.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz" +IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.bz2" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma" IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ." @@ -395,8 +397,10 @@ IMAGE_DEPENDS_yaffs2 = "yaffs2-utils-native" IMAGE_DEPENDS_cramfs = "cramfs-native" IMAGE_DEPENDS_ext2 = "genext2fs-native" IMAGE_DEPENDS_ext2.gz = "genext2fs-native" +IMAGE_DEPENDS_ext2.bz2 = "genext2fs-native" IMAGE_DEPENDS_ext3 = "genext2fs-native e2fsprogs-native" IMAGE_DEPENDS_ext3.gz = "genext2fs-native e2fsprogs-native" +IMAGE_DEPENDS_ext3.bz2 = "genext2fs-native e2fsprogs-native" IMAGE_DEPENDS_cpio.gz.u-boot = "u-boot-mkimage-native" IMAGE_DEPENDS_cpio.lzma = "lzma-native" IMAGE_DEPENDS_squashfs = "squashfs-tools-native" diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc deleted file mode 100644 index 73ab17e6b0..0000000000 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ /dev/null @@ -1,235 +0,0 @@ -#@-------------------------------------------------------------------- -#@TYPE: Distribution -#@NAME: Angstrom <http://www.angstrom-distribution.org> -#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices -#@MAINTAINER: Koen Kooi <koen@openembedded.org> -#@-------------------------------------------------------------------- - -DISTRO_VERSION = "2007.11RC3" -DISTRO_REVISION = "51" - -require conf/distro/include/sane-srcdates.inc -require conf/distro/include/sane-srcrevs.inc - -#Images built can have to modes: -# 'debug': empty rootpassword, strace included -# 'release' no root password, no strace and gdb by default -DISTRO_TYPE ?= "debug" -#DISTRO_TYPE = "release" - -# Ship just basic locale by default. Locales are big (~1Mb uncompr.), so -# shipping some adhoc subset will be still useless and size burden for -# users of all other languages/countries. Instead, worth to make it easy -# to install additional languages: installer/wizard + metapackages which -# will RRECOMMEND as much as possible content for a given language -# (locales, UI transalations, help, etc. - useless for pros, but really -# helpful for common users). -# Also, it appears that no locales fit in 16Mb for now. "C" locale rules! -IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}' - -# set feed path variables -FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${LIBC}/" - - -#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback -CVS_TARBALL_STASH ?= "http://www.angstrom-distribution.org/unstable/sources/" - -#Make sure we use 2.6 on machines with a 2.4/2.6 selector -KERNEL = "kernel26" -MACHINE_KERNEL_VERSION = "2.6" -PCMCIA_MANAGER = "pcmciautils" - -#Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" -PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}" -RDEPENDS_kernel-base_hx4700 = "" -RDEPENDS_kernel-base_htcuniversal = "" - -PREFERRED_PROVIDER_libgsmd = "libgsmd" - -# older gtk-webcore releases don't work on ARM/EABI -# We need to switch to a fixed SRCDATE or release as soon as possible -PREFERRED_VERSION_osb-browser = "0.5.0+svn${SRCDATE}" -PREFERRED_VERSION_osb-jscore = "0.5.2+svn${SRCDATE}" -PREFERRED_VERSION_osb-nrcit = "0.5.2+svn${SRCDATE}" -PREFERRED_VERSION_osb-nrcore = "0.5.2+svn${SRCDATE}" - -PREFERRED_PROVIDER_avahi = "avahi" - -#Small machines prefer kdrive, but we might ship full Xorg in other images -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" -PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" - -#use EABI ready toolchain -PREFERRED_VERSION_gcc ?= "4.1.2" -PREFERRED_VERSION_gcc-cross ?= "4.1.2" -PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2" -PREFERRED_VERSION_gcc-cross-intermediate ?= "4.1.2" - -PREFERRED_VERSION_gcc_dht-walnut ?= "4.1.1" -PREFERRED_VERSION_gcc-cross_dht-walnut ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk_dht-walnut ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial_dht-walnut ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-intermediate_dht-walnut ?= "4.1.1" - -PREFERRED_VERSION_gcc_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-intermediate_xilinx-ml403 ?= "4.1.1" - -PREFERRED_VERSION_gcc_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-intermediate_mpc8323e-rdb ?= "4.1.1" - -PREFERRED_VERSION_binutils ?= "2.18" -PREFERRED_VERSION_binutils-cross ?= "2.18" -PREFERRED_VERSION_binutils-cross-sdk ?= "2.18" - -#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc_avr32 = "avr32-gcc-cross" -PREFERRED_VERSION_avr32-gcc = "4.1.2" -PREFERRED_VERSION_avr32-gcc-cross = "4.1.2" -PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.0.2" -PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.0.2" -PREFERRED_VERSION_gcc-cross-intermediate_avr32 = "4.0.2" - -PREFERRED_VERSION_binutils_avr32 = "2.17" -PREFERRED_VERSION_binutils-cross_avr32 = "2.17" -PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" - -#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against -PREFERRED_VERSION_linux-libc-headers ?= "2.6.20" -PREFERRED_VERSION_linux-libc-headers_bfin = "2.6.21" - -#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing. -PREFERRED_VERSION_glibc ?= "2.5" -PREFERRED_VERSION_uclibc ?= "0.9.29" -PREFERRED_VERSION_uclibc-initial ?= "0.9.29" - -#there's is no avr32 patch for 0.9.29 -PREFERRED_VERSION_uclibc_avr32 = "0.9.28" -PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28" - -PREFERRED_VERSION_glibc-initial ?= "2.5" - -# To use an EABI compatible version 3 series gcc, either uncomment -# the lines below or set them in local.conf: -# -# PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3" -# PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3" -# PREFERRED_VERSION_gcc-cross-intermediate = "3.4.4+csl-arm-2005q3" - -#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom -require conf/distro/include/preferred-xorg-versions.inc -require conf/distro/include/preferred-gpe-versions-2.8.inc -require conf/distro/include/preferred-e-versions.inc - - -# Virtuals: -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" - -#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo) -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc" - -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibceabi-libc-for-gcc = "uclibc-initial" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibceabi-libc-for-gcc = "uclibc-initial" - -# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines -PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" -PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" -PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" - -PREFERRED_PROVIDER_virtual/db ?= "db" -PREFERRED_PROVIDER_virtual/db-native ?= "db-native" -PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" -PREFERRED_PROVIDER_virtual/libx11-native ?= "libx11-native" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" - -# Others: -PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" -PREFERRED_PROVIDER_dbus-glib = "dbus-glib" -PREFERRED_PROVIDER_esound ?= "pulseaudio" -PREFERRED_PROVIDER_gconf ?= "gconf-dbus" -PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs" -PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs" -PREFERRED_PROVIDER_tslib ?= "tslib" -PREFERRED_PROVIDER_tslib-conf ?= "tslib" -PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" -PREFERRED_PROVIDER_ntp ?= "ntp" -PREFERRED_PROVIDER_hotplug = "udev" -PREFERRED_PROVIDER_libxss = "libxss" - -# we don't ship gtk-directfb by default -PREFERRED_PROVIDER_gtk+ ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" - - -#Silence a warning during parsing -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" - -#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH} -ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" -require conf/distro/include/angstrom${ARM_ABI}.inc - -# do some task-base stuff here - -# We want to ship extra debug utils in the rootfs when doing a debug build -DEBUG_APPS ?= "" -DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}' - -#this should go away soon -EXTRA_STUFF ?= "" - - -# Angstrom want to ship some extra stuff. This should be moved into task-base eventually -# contains ipkg specific stuff as well :( - -#work around a bitbake bug where mtd-utils-native isn't created so do_rootfs fails -DISTRO_EXTRA_DEPENDS += " \ - mtd-utils-native \ - " - -DISTRO_EXTRA_RDEPENDS += "\ - update-modules \ -# ${@base_contains("MACHINE_FEATURES", "screen", "exquisite", "",d)} \ - angstrom-version \ - opkg opkg-collateral distro-feed-configs \ - util-linux-mount util-linux-umount \ - ${EXTRA_STUFF} \ - ${DEBUG_APPS} \ - " - -DISTRO_EXTRA_RRECOMMENDS += " \ - kernel-module-vfat \ - kernel-module-ext2 \ - kernel-module-af-packet \ - openssh-sftp-server \ - " - -SEPPUKU_NEWREPORT = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" - diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index b97049a7e6..93678f3811 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -20,7 +20,6 @@ PREFERRED_VERSION_gtk+ = "2.20.1" PREFERRED_VERSION_gtk+-native = "2.20.1" PREFERRED_VERSION_gtkmm = "2.20.0" PREFERRED_VERSION_hal = "0.5.14" -PREFERRED_VERSION_jpeg = "6b" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" PREFERRED_VERSION_libsdl-x11 = "1.2.14" diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index 9b9dd097ac..23d320ce03 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -44,7 +44,7 @@ PREFERRED_VERSION_glib-2.0-native = "2.24.1" UDEV_GE_141 = "1" PREFERRED_VERSION_postgresql = "8.4.4" -ANGSTROM_QT_VERSION ?= "4.6.2+4.7.0-beta1" +ANGSTROM_QT_VERSION ?= "4.6.3+4.7.0-beta2" PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}" diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc index 53d202a383..f50106851c 100644 --- a/conf/distro/include/preferred-xorg-versions-live.inc +++ b/conf/distro/include/preferred-xorg-versions-live.inc @@ -1,4 +1,4 @@ -#Wed Aug 4 08:58:39 CEST 2010 +#Thu Aug 12 11:37:37 CEST 2010 #app PREFERRED_VERSION_appres ?= "1.0.2" PREFERRED_VERSION_bdftopcf ?= "1.0.2" @@ -46,7 +46,7 @@ PREFERRED_VERSION_xconsole ?= "1.0.3" PREFERRED_VERSION_xcursorgen ?= "1.0.3" PREFERRED_VERSION_xcursorgen-native ?= "1.0.3" PREFERRED_VERSION_xdbedizzy ?= "1.0.2" -PREFERRED_VERSION_xditview ?= "1.0.1" +PREFERRED_VERSION_xditview ?= "1.0.2" PREFERRED_VERSION_xdm ?= "1.1.10" PREFERRED_VERSION_xdpyinfo ?= "1.1.0" PREFERRED_VERSION_xdriinfo ?= "1.0.3" @@ -91,7 +91,7 @@ PREFERRED_VERSION_xrandr ?= "1.3.3" PREFERRED_VERSION_xrdb ?= "1.0.6" PREFERRED_VERSION_xrefresh ?= "1.0.3" PREFERRED_VERSION_xrx ?= "1.0.3" -PREFERRED_VERSION_xset ?= "1.1.0" +PREFERRED_VERSION_xset ?= "1.2.0" PREFERRED_VERSION_xsetmode ?= "1.0.0" PREFERRED_VERSION_xsetpointer ?= "1.0.1" PREFERRED_VERSION_xsetroot ?= "1.0.3" @@ -112,7 +112,7 @@ PREFERRED_VERSION_xorg-docs ?= "1.5" PREFERRED_VERSION_xorg-sgml-doctools ?= "1.5" #driver PREFERRED_VERSION_xf86-input-acecad ?= "1.4.0" -PREFERRED_VERSION_xf86-input-aiptek ?= "1.3.0" +PREFERRED_VERSION_xf86-input-aiptek ?= "1.3.1" PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.2" PREFERRED_VERSION_xf86-input-citron ?= "2.2.2" PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.1" @@ -138,11 +138,11 @@ PREFERRED_VERSION_xf86-input-summa ?= "1.2.0" PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.99.1" PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0" PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0" -PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.9" +PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.10" PREFERRED_VERSION_xf86-input-void ?= "1.3.0" PREFERRED_VERSION_xf86-video-apm ?= "1.2.3" PREFERRED_VERSION_xf86-video-ark ?= "0.7.3" -PREFERRED_VERSION_xf86-video-ast ?= "0.89.9" +PREFERRED_VERSION_xf86-video-ast ?= "0.91.10" PREFERRED_VERSION_xf86-video-ati ?= "6.13.1" PREFERRED_VERSION_xf86-video-chips ?= "1.2.3" PREFERRED_VERSION_xf86-video-cirrus ?= "1.3.2" @@ -151,7 +151,7 @@ PREFERRED_VERSION_xf86-video-dummy ?= "0.3.4" PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.2" PREFERRED_VERSION_xf86-video-geode ?= "2.11.8" PREFERRED_VERSION_xf86-video-glint ?= "1.2.4" -PREFERRED_VERSION_xf86-video-i128 ?= "1.3.3" +PREFERRED_VERSION_xf86-video-i128 ?= "1.3.4" PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2" PREFERRED_VERSION_xf86-video-i810 ?= "1.7.4" PREFERRED_VERSION_xf86-video-impact ?= "0.2.0" @@ -189,11 +189,11 @@ PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1" PREFERRED_VERSION_xf86-video-vesa ?= "2.3.0" PREFERRED_VERSION_xf86-video-vga ?= "4.1.0" PREFERRED_VERSION_xf86-video-via ?= "0.2.2" -PREFERRED_VERSION_xf86-video-vmware ?= "11.0.1" +PREFERRED_VERSION_xf86-video-vmware ?= "11.0.2" PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.4" PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0" -PREFERRED_VERSION_xf86-video-xgi ?= "1.5.1" -PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.4" +PREFERRED_VERSION_xf86-video-xgi ?= "1.6.0" +PREFERRED_VERSION_xf86-video-xgixp ?= "1.8.0" #font PREFERRED_VERSION_encodings ?= "1.0.3" PREFERRED_VERSION_font-adobe-100dpi ?= "1.0.1" @@ -242,8 +242,8 @@ PREFERRED_VERSION_libice-native ?= "1.0.6" PREFERRED_VERSION_libsm ?= "1.1.1" PREFERRED_VERSION_libsm-native ?= "1.1.1" PREFERRED_VERSION_libwindowswm ?= "1.0.1" -PREFERRED_VERSION_libx11 ?= "1.3.4" -PREFERRED_VERSION_libx11-native ?= "1.3.4" +PREFERRED_VERSION_libx11 ?= "1.3.5" +PREFERRED_VERSION_libx11-native ?= "1.3.5" PREFERRED_VERSION_libxscrnsaver ?= "1.2.0" PREFERRED_VERSION_libxtrap ?= "1.0.0" PREFERRED_VERSION_libxau ?= "1.0.6" @@ -312,26 +312,26 @@ PREFERRED_VERSION_fontcacheproto ?= "0.1.3" PREFERRED_VERSION_fontcacheproto-native ?= "0.1.3" PREFERRED_VERSION_fontsproto ?= "2.1.0" PREFERRED_VERSION_fontsproto-native ?= "2.1.0" -PREFERRED_VERSION_glproto ?= "1.4.11" +PREFERRED_VERSION_glproto ?= "1.4.12" PREFERRED_VERSION_inputproto ?= "2.0" PREFERRED_VERSION_inputproto-native ?= "2.0" -PREFERRED_VERSION_kbproto ?= "1.0.4" -PREFERRED_VERSION_kbproto-native ?= "1.0.4" +PREFERRED_VERSION_kbproto ?= "1.0.5" +PREFERRED_VERSION_kbproto-native ?= "1.0.5" PREFERRED_VERSION_printproto ?= "1.0.4" PREFERRED_VERSION_randrproto ?= "1.3.1" PREFERRED_VERSION_randrproto-native ?= "1.3.1" PREFERRED_VERSION_recordproto ?= "1.14" -PREFERRED_VERSION_renderproto ?= "0.11" -PREFERRED_VERSION_renderproto-native ?= "0.11" +PREFERRED_VERSION_renderproto ?= "0.11.1" +PREFERRED_VERSION_renderproto-native ?= "0.11.1" PREFERRED_VERSION_resourceproto ?= "1.1.0" PREFERRED_VERSION_scrnsaverproto ?= "1.2.0" PREFERRED_VERSION_trapproto ?= "3.4.3" -PREFERRED_VERSION_videoproto ?= "2.3.0" +PREFERRED_VERSION_videoproto ?= "2.3.1" PREFERRED_VERSION_windowswmproto ?= "1.0.4" PREFERRED_VERSION_xcmiscproto ?= "1.2.0" PREFERRED_VERSION_xcmiscproto-native ?= "1.2.0" -PREFERRED_VERSION_xextproto ?= "7.1.1" -PREFERRED_VERSION_xextproto-native ?= "7.1.1" +PREFERRED_VERSION_xextproto ?= "7.1.2" +PREFERRED_VERSION_xextproto-native ?= "7.1.2" PREFERRED_VERSION_xf86bigfontproto ?= "1.2.0" PREFERRED_VERSION_xf86bigfontproto-native ?= "1.2.0" PREFERRED_VERSION_xf86dgaproto ?= "2.1" @@ -340,8 +340,8 @@ PREFERRED_VERSION_xf86miscproto ?= "0.9.3" PREFERRED_VERSION_xf86rushproto ?= "1.1.2" PREFERRED_VERSION_xf86vidmodeproto ?= "2.3" PREFERRED_VERSION_xineramaproto ?= "1.2" -PREFERRED_VERSION_xproto ?= "7.0.17" -PREFERRED_VERSION_xproto-native ?= "7.0.17" +PREFERRED_VERSION_xproto ?= "7.0.18" +PREFERRED_VERSION_xproto-native ?= "7.0.18" PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3" #util PREFERRED_VERSION_gccmakedep ?= "1.0.2" diff --git a/conf/distro/include/sane-toolchain-eglibc.inc b/conf/distro/include/sane-toolchain-eglibc.inc index 1e370d0b8c..149f61ed3e 100644 --- a/conf/distro/include/sane-toolchain-eglibc.inc +++ b/conf/distro/include/sane-toolchain-eglibc.inc @@ -4,6 +4,8 @@ # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" +# Work-around for alignment traps when eglibc-2.12 is built with gcc-4.5* +FULL_OPTIMIZATION_pn-eglibc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -ggdb3" FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf deleted file mode 100644 index 1fba9e6a74..0000000000 --- a/conf/distro/mokoslug.conf +++ /dev/null @@ -1,27 +0,0 @@ -#@-------------------------------------------------------------------- -#@TYPE: Distribution -#@NAME: MokoSlug <http://www.nslu2-linux.org> -#@DESCRIPTION: The Linux Server companion for Openmoko phones -#@MAINTAINER: Rod Whitby <rod@whitby.id.au> -#@-------------------------------------------------------------------- - -# MokoSlug is based on Angstrom, and would hopefully just be done by features one day ... -require conf/distro/angstrom-2008.1.conf - -DISTRO_NAME = "MokoSlug" -DISTRO_VERSION = "1.0-alpha" -DISTRO_REVISION = "1" -DISTRO_TYPE = "debug" - -MACHINE_TASK_PROVIDER = "task-boot dropbear" -MACHINE_TASK_PROVIDER_append_nslu2 = " sysconf" - -# Even though the NSLU2 does not have built-in bluetooth, -# we assume that a MokoSlug gateway has a bluetooth dongle. -MACHINE_FEATURES_append_nslu2 = " bluetooth" - -# No room for debug apps on an NSLU2. -DEBUG_APPS_nslu2 = "" - -# No room for a kernel image on an NSLU2. -IMAGE_PREPROCESS_COMMAND_append_nslu2 = "rm ${IMAGE_ROOTFS}/boot/zImage*;" diff --git a/recipes/abiword/abiword-embedded_2.5.2.bb b/recipes/abiword/abiword-embedded_2.5.2.bb deleted file mode 100644 index 459cc277ed..0000000000 --- a/recipes/abiword/abiword-embedded_2.5.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -require abiword-2.5.inc - -EXTRA_OECONF += "--enable-embedded" - -S = "${WORKDIR}/abiword-${PV}" - -RCONFLICTS_${PN} = "abiword" -RPROVIDES_${PN} += "abiword" - - - -SRC_URI[md5sum] = "bbc9c124f8072875129bd67092f0fa0b" -SRC_URI[sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f" diff --git a/recipes/abiword/abiword-plugins_2.5.2.bb b/recipes/abiword/abiword-plugins_2.5.2.bb deleted file mode 100644 index ec905f9ddc..0000000000 --- a/recipes/abiword/abiword-plugins_2.5.2.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word" -HOMEPAGE = "http://www.abiword.org" -SECTION = "x11/office" -LICENSE = "GPLv2" -DEPENDS = "boost loudmouth libwpd librsvg goffice poppler libglade" -RDEPENDS_${PN} = "abiword" - -PR = "r2" - -DEFAULT_PREFERENCE = "1" - -SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz;name=plugins \ - http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=archive \ - " - -inherit autotools - -PARALLEL_MAKE="" - -EXTRA_OECONF = " --without-libwmf \ - --without-inter7eps \ - --with-abiword=${WORKDIR}/abiword-${PV} \ - --with-boost=${STAGING_INCDIR}/../ \ - " - -PACKAGES_DYNAMIC = "abiword-plugin-*" - -python populate_packages_prepend () { - abiword_libdir = bb.data.expand('${libdir}/abiword-2.5/plugins', d) - do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='') - do_split_packages(d, abiword_libdir, '^libAbi(.*)\.la$', 'abiword-plugin-%s-dev', 'Abiword plugin for %s', extra_depends='') -} - - -PACKAGES =+ "abiword-plugin-collab-glade" - -FILES_abiword-plugin-collab-glade += "${datadir}" -RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab" - -FILES_${PN}-dbg += "${libdir}/abiword-2.5/plugins/.debug" - - -SRC_URI[plugins.md5sum] = "0ad700d0cb6d176b39a191b16e3886c0" -SRC_URI[plugins.sha256sum] = "5714753ce1e89e72c2ba7e7d7d95546d9965a4e86bf76c060a8779b08fc2ae85" -SRC_URI[archive.md5sum] = "bbc9c124f8072875129bd67092f0fa0b" -SRC_URI[archive.sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f" diff --git a/recipes/abiword/abiword_2.5.2.bb b/recipes/abiword/abiword_2.5.2.bb deleted file mode 100644 index f4202aa4ad..0000000000 --- a/recipes/abiword/abiword_2.5.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -require abiword-2.5.inc - -DEFAULT_PREFERENCE = "-1" - -PR = "r2" - -RCONFLICTS_${PN} = "abiword-embedded" - -SRC_URI[md5sum] = "bbc9c124f8072875129bd67092f0fa0b" -SRC_URI[sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f" diff --git a/recipes/alsa/alsa-lib_1.0.15.bb b/recipes/alsa/alsa-lib_1.0.15.bb deleted file mode 100644 index 4dcdda45cf..0000000000 --- a/recipes/alsa/alsa-lib_1.0.15.bb +++ /dev/null @@ -1,57 +0,0 @@ -DESCRIPTION = "Alsa sound library" -HOMEPAGE = "http://www.alsa-project.org" -SECTION = "libs/multimedia" -LICENSE = "LGPLv2.1" -PR = "r1" - -# configure.in sets -D__arm__ on the command line for any arm system -# (not just those with the ARM instruction set), this should be removed, -# (or replaced by a permitted #define). -#FIXME: remove the following -ARM_INSTRUCTION_SET = "arm" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ - file://fix-tstamp-declaration.patch \ - file://fix_libmath.patch \ - " - -inherit autotools pkgconfig - - -EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python" - - -require alsa-fpu.inc -EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " - - -require alsa-versym.inc -EXTRA_OECONF += "${@get_alsa_versym_setting(bb, d)} " - - -do_stage () { - oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/alsa/sound - install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/ - install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/ - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/ -} - -PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev" -FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*" -FILES_libasound = "${libdir}/libasound.so.*" -FILES_alsa-server = "${bindir}/*" -FILES_alsa-conf = "${datadir}/alsa/" -FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" -FILES_alsa-conf-base = "\ -${datadir}/alsa/alsa.conf \ -${datadir}/alsa/cards/aliases.conf \ -${datadir}/alsa/pcm/default.conf \ -${datadir}/alsa/pcm/dmix.conf \ -${datadir}/alsa/pcm/dsnoop.conf" - -RDEPENDS_libasound = "alsa-conf-base" - -SRC_URI[md5sum] = "94254ea0d2c966a58184b134e9da29ff" -SRC_URI[sha256sum] = "f24272f3a32262c5285fc5bae0b9aa65494e8b22ac536313dbb60b8e4231e952" diff --git a/recipes/alsa/alsa-oss_1.0.15.bb b/recipes/alsa/alsa-oss_1.0.15.bb deleted file mode 100644 index d6b09c58f7..0000000000 --- a/recipes/alsa/alsa-oss_1.0.15.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Alsa OSS Compatibility Package" -SECTION = "libs/multimedia" -LICENSE = "GPL" -DEPENDS = "alsa-lib" -PR = "r2" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ - file://libio.patch \ - " - -inherit autotools - -LEAD_SONAME = "libaoss.so.0" - -do_configure_prepend () { - touch NEWS README AUTHORS ChangeLog -} - -do_stage () { - oe_libinstall -C alsa -a -so libaoss ${STAGING_LIBDIR} - oe_libinstall -C alsa -a -so libalsatoss ${STAGING_LIBDIR} -} - -SRC_URI[md5sum] = "49fb5fbae8bf955b248e46ff9c9a2aa1" -SRC_URI[sha256sum] = "85245d7666d82cc44010dfe14f6427a8586da2c8b033fb636f0f041dd7e5168b" diff --git a/recipes/alsa/alsa-plugins_1.0.15.bb b/recipes/alsa/alsa-plugins_1.0.15.bb deleted file mode 100644 index f60ee4f858..0000000000 --- a/recipes/alsa/alsa-plugins_1.0.15.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "ALSA Plugins" -HOMEPAGE = "http://www.alsa-project.org" -SECTION = "multimedia/alsa/plugins" -LICENSE = "GPL" -DEPENDS = "alsa-lib pulseaudio" -PR = "r0" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-${PV}.tar.bz2" - -inherit autotools - -PACKAGES_DYNAMIC = "libasound-module*" - -python populate_packages_prepend() { - plugindir = bb.data.expand('${libdir}/alsa-lib/', d) - do_split_packages(d, plugindir, '^libasound_module_(.*)\.so$', 'libasound-module-%s', 'Alsa plugin for %s', extra_depends='' ) -} - -FILES_${PN}-dev += "${libdir}/alsa-lib/libasound*.a ${libdir}/alsa-lib/libasound*.la" -FILES_${PN}-dbg += "${libdir}/alsa-lib/.debug" - -SRC_URI[md5sum] = "908c2dd7ec33bc8e1fcd5e92c7e5e125" -SRC_URI[sha256sum] = "3fec2349a94254c82dd568a8f4f8b8ef9735aee7dc56a5cf93e80f5938df9e95" diff --git a/recipes/alsa/alsa-utils_1.0.11.bb b/recipes/alsa/alsa-utils_1.0.11.bb deleted file mode 100644 index b016a25369..0000000000 --- a/recipes/alsa/alsa-utils_1.0.11.bb +++ /dev/null @@ -1,58 +0,0 @@ -DESCRIPTION = "ALSA Utilities" -HOMEPAGE = "http://www.alsa-project.org" -SECTION = "console/utils" -LICENSE = "GPLv2" -DEPENDS = "alsa-lib ncurses" -PR = "r1" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2" - -inherit autotools - -# This are all packages that we need to make. Also, the now empty alsa-utils -# ipk depend on them. - -PACKAGES += "alsa-utils-alsamixer" -PACKAGES += "alsa-utils-midi" -PACKAGES += "alsa-utils-aplay" -PACKAGES += "alsa-utils-amixer" -PACKAGES += "alsa-utils-aconnect" -PACKAGES += "alsa-utils-iecset" -PACKAGES += "alsa-utils-speakertest" -PACKAGES += "alsa-utils-aseqnet" -PACKAGES += "alsa-utils-alsactl" - -# We omit alsaconf, because -# a) this is a bash script -# b) it creates config files not suitable for OE-based distros - -FILES_${PN} = "" -FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" -FILES_alsa-utils-amixer = "${bindir}/amixer" -FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" -FILES_alsa-utils-speakertest = "${bindir}/speaker-test" -FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" -FILES_alsa-utils-aconnect = "${bindir}/aconnect" -FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" -FILES_alsa-utils-iecset = "${bindir}/iecset" -FILES_alsa-utils-alsactl = "${sbindir}/alsactl" - -DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA" -DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-speaker-test = "speaker test tone generator for ALSA" -DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" -DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" -DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" -DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state" -DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files" - -RDEPENDS_alsa-utils-aplay += "alsa-conf" -RDEPENDS_alsa-utils-amixer += "alsa-conf" -RDEPENDS_alsa-utils-alsamixer += "alsa-conf" -RDEPENDS_alsa-utils-speaker-test += "alsa-conf" - -ALLOW_EMPTY_alsa-utils = "1" - -SRC_URI[md5sum] = "ba9b8010120701d0f6daf061d392cfa2" -SRC_URI[sha256sum] = "4b33229437ddab4196b8fd0bdfaf074314185a5afd3e24bbe28025022b42d01b" diff --git a/recipes/alsa/alsa-utils_1.0.13.bb b/recipes/alsa/alsa-utils_1.0.13.bb deleted file mode 100644 index 8e542b7ef7..0000000000 --- a/recipes/alsa/alsa-utils_1.0.13.bb +++ /dev/null @@ -1,66 +0,0 @@ -DESCRIPTION = "ALSA Utilities" -HOMEPAGE = "http://www.alsa-project.org" -SECTION = "console/utils" -LICENSE = "GPLv2" -DEPENDS = "alsa-lib ncurses" -PR = "r1" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2" - -# lazy hack. needs proper fixing in gettext.m4, see -# http://bugs.openembedded.net/show_bug.cgi?id=2348 -# please close bug and remove this comment when properly fixed -# -EXTRA_OECONF_linux-uclibc = "--disable-nls" -EXTRA_OECONF_linux-uclibceabi = "--disable-nls" - -inherit autotools - -# This are all packages that we need to make. Also, the now empty alsa-utils -# ipk depend on them. - -PACKAGES += "\ - alsa-utils-alsamixer \ - alsa-utils-midi \ - alsa-utils-aplay \ - alsa-utils-amixer \ - alsa-utils-aconnect \ - alsa-utils-iecset \ - alsa-utils-speakertest \ - alsa-utils-aseqnet \ - alsa-utils-alsactl " - -# We omit alsaconf, because -# a) this is a bash script -# b) it creates config files not suitable for OE-based distros - -FILES_${PN} = "" -FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" -FILES_alsa-utils-amixer = "${bindir}/amixer" -FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" -FILES_alsa-utils-speakertest = "${bindir}/speaker-test" -FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" -FILES_alsa-utils-aconnect = "${bindir}/aconnect" -FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" -FILES_alsa-utils-iecset = "${bindir}/iecset" -FILES_alsa-utils-alsactl = "${sbindir}/alsactl" - -DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA" -DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-speakertest = "speaker test tone generator for ALSA" -DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" -DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" -DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" -DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state" -DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files" - -RDEPENDS_alsa-utils-aplay += "alsa-conf" -RDEPENDS_alsa-utils-amixer += "alsa-conf" -RDEPENDS_alsa-utils-alsamixer += "alsa-conf" -RDEPENDS_alsa-utils-speakertest += "alsa-conf" - -ALLOW_EMPTY_alsa-utils = "1" - -SRC_URI[md5sum] = "dfe4bb5d3217f3ec662b172ce8397cf0" -SRC_URI[sha256sum] = "d7fe8a7995bc74331c89fbc1937a0682d239339d6659a402cd7b8e4b96c050f0" diff --git a/recipes/alsa/alsa-utils_1.0.14.bb b/recipes/alsa/alsa-utils_1.0.14.bb deleted file mode 100644 index 9bef67a3f2..0000000000 --- a/recipes/alsa/alsa-utils_1.0.14.bb +++ /dev/null @@ -1,59 +0,0 @@ -DESCRIPTION = "ALSA Utilities" -HOMEPAGE = "http://www.alsa-project.org" -SECTION = "console/utils" -LICENSE = "GPLv2" -DEPENDS = "alsa-lib ncurses" -PR = "r1" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ - file://alsa-utils-automake.patch \ - " -inherit autotools - -# This are all packages that we need to make. Also, the now empty alsa-utils -# ipk depend on them. - -PACKAGES += "\ - alsa-utils-alsamixer \ - alsa-utils-midi \ - alsa-utils-aplay \ - alsa-utils-amixer \ - alsa-utils-aconnect \ - alsa-utils-iecset \ - alsa-utils-speakertest \ - alsa-utils-aseqnet \ - alsa-utils-aseqdump \ - alsa-utils-alsaconf \ - alsa-utils-alsactl " - -# We omit alsaconf, because -# a) this is a bash script -# b) it creates config files not suitable for OE-based distros - -FILES_${PN} = "" -FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" -FILES_alsa-utils-amixer = "${bindir}/amixer" -FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" -FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/" -FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" -FILES_alsa-utils-aconnect = "${bindir}/aconnect" -FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" -FILES_alsa-utils-iecset = "${bindir}/iecset" -FILES_alsa-utils-alsactl = "${sbindir}/alsactl" -FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" -FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf" - -DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA" -DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-speakertest = "ALSA surround speaker test utility" -DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" -DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" -DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" -DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state" -DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files" - -ALLOW_EMPTY_alsa-utils = "1" - -SRC_URI[md5sum] = "6d3009c157ac6fc803696d6590a48366" -SRC_URI[sha256sum] = "307d630f0ed15e7e92fa35dc0c961737fa9aed22bd7a4a6054a72f85145fa5cb" diff --git a/recipes/alsa/alsa-utils_1.0.15.bb b/recipes/alsa/alsa-utils_1.0.15.bb deleted file mode 100644 index 5fc07b16b7..0000000000 --- a/recipes/alsa/alsa-utils_1.0.15.bb +++ /dev/null @@ -1,60 +0,0 @@ -DESCRIPTION = "ALSA Utilities" -HOMEPAGE = "http://www.alsa-project.org" -SECTION = "console/utils" -LICENSE = "GPLv2" -DEPENDS = "alsa-lib ncurses" -PR = "r1" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ - file://alsa-utils-automake.patch \ - " - -inherit autotools - -# This are all packages that we need to make. Also, the now empty alsa-utils -# ipk depend on them. - -PACKAGES += "\ - alsa-utils-alsamixer \ - alsa-utils-midi \ - alsa-utils-aplay \ - alsa-utils-amixer \ - alsa-utils-aconnect \ - alsa-utils-iecset \ - alsa-utils-speakertest \ - alsa-utils-aseqnet \ - alsa-utils-aseqdump \ - alsa-utils-alsaconf \ - alsa-utils-alsactl " - -# We omit alsaconf, because -# a) this is a bash script -# b) it creates config files not suitable for OE-based distros - -FILES_${PN} = "" -FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" -FILES_alsa-utils-amixer = "${bindir}/amixer" -FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" -FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/" -FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" -FILES_alsa-utils-aconnect = "${bindir}/aconnect" -FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" -FILES_alsa-utils-iecset = "${bindir}/iecset" -FILES_alsa-utils-alsactl = "${sbindir}/alsactl" -FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" -FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf" - -DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA" -DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-speakertest = "ALSA surround speaker test utility" -DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" -DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" -DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" -DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state" -DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files" - -ALLOW_EMPTY_alsa-utils = "1" - -SRC_URI[md5sum] = "287f46f891581c15018de4f8c0731575" -SRC_URI[sha256sum] = "3bb546e873df39159812168180eeff14b13620c653d90739ac0a0912e898aeac" diff --git a/recipes/autoconf/autoconf-2.57/program_prefix.patch b/recipes/autoconf/autoconf-2.57/program_prefix.patch deleted file mode 100644 index e6f4096a97..0000000000 --- a/recipes/autoconf/autoconf-2.57/program_prefix.patch +++ /dev/null @@ -1,19 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- autoconf-2.57/lib/autoconf/general.m4~program_prefix -+++ autoconf-2.57/lib/autoconf/general.m4 -@@ -1676,8 +1676,9 @@ - # The aliases save the names the user supplied, while $host etc. - # will get canonicalized. - test -n "$target_alias" && -- test "$program_prefix$program_suffix$program_transform_name" = \ -- NONENONEs,x,x, && -+ test "$target_alias" != "$host_alias" && -+ test "$program_prefix$program_suffix$program_transform_name" = \ -+ NONENONEs,x,x, && - program_prefix=${target_alias}-[]dnl - ])# AC_CANONICAL_TARGET - diff --git a/recipes/autoconf/autoconf-2.59/autoconf-sh.patch b/recipes/autoconf/autoconf-2.59/autoconf-sh.patch deleted file mode 100644 index 361033ba3d..0000000000 --- a/recipes/autoconf/autoconf-2.59/autoconf-sh.patch +++ /dev/null @@ -1,22 +0,0 @@ -http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/Attic/autoconf-sh.patch?rev=1.1;content-type=text%2Fplain - -Index: tests/wrapper.in -=================================================================== -RCS file: /cvsroot/autoconf/autoconf/tests/wrapper.in,v -retrieving revision 1.4 -diff -u -u -r1.4 wrapper.in ---- autoconf-2.59/tests/wrapper.in 25 Sep 2003 09:30:35 -0000 1.4 -+++ autoconf-2.59/tests/wrapper.in 19 Nov 2003 13:17:11 -0000 -@@ -13,9 +13,10 @@ - elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix - fi -+DUALCASE=1; export DUALCASE # for MKS sh - - # Support unset when possible. --if ((MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset - else - as_unset=false - diff --git a/recipes/autoconf/autoconf-2.59/autoconf-x.patch b/recipes/autoconf/autoconf-2.59/autoconf-x.patch deleted file mode 100644 index 596535b7d6..0000000000 --- a/recipes/autoconf/autoconf-2.59/autoconf-x.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: lib/autoconf/libs.m4 -=================================================================== -RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/libs.m4,v -retrieving revision 1.13 -diff -p -u -r1.13 libs.m4 ---- autoconf-2.59/lib/autoconf/libs.m4 6 Sep 2005 15:34:06 -0000 1.13 -+++ autoconf-2.59/lib/autoconf/libs.m4 18 Sep 2005 17:09:58 -0000 -@@ -265,13 +265,13 @@ ac_x_header_dirs=' - /usr/openwin/share/include' - - if test "$ac_x_includes" = no; then -- # Guess where to find include files, by looking for Intrinsic.h. -+ # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. -- AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])], -+ AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])], - [# We can compile using X headers with no special include directory. - ac_x_includes=], - [for ac_dir in $ac_x_header_dirs; do -- if test -r "$ac_dir/X11/Intrinsic.h"; then -+ if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi -@@ -284,9 +284,9 @@ if test "$ac_x_libraries" = no; then - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS -- LIBS="-lXt $LIBS" -- AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Intrinsic.h>], -- [XtMalloc (0)])], -+ LIBS="-lX11 $LIBS" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>], -+ [XrmInitialize ()])], - [LIBS=$ac_save_LIBS - # We can link X programs with no special library path. - ac_x_libraries=], diff --git a/recipes/autoconf/autoconf-2.59/autoconf259-update-configscripts.patch b/recipes/autoconf/autoconf-2.59/autoconf259-update-configscripts.patch deleted file mode 100644 index 77be3c647c..0000000000 --- a/recipes/autoconf/autoconf-2.59/autoconf259-update-configscripts.patch +++ /dev/null @@ -1,393 +0,0 @@ ---- autoconf-2.59/config/config.guess.old 2003-10-23 10:28:51.000000000 -0400 -+++ autoconf-2.59/config/config.guess 2004-04-24 22:36:28.000000000 -0400 -@@ -3,7 +3,7 @@ - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. - --timestamp='2003-10-03' -+timestamp='2004-03-12' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -197,12 +197,18 @@ - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit 0 ;; -+ amd64:OpenBSD:*:*) -+ echo x86_64-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; -+ cats:OpenBSD:*:*) -+ echo arm-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; -@@ -221,6 +227,9 @@ - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; -+ pegasos:OpenBSD:*:*) -+ echo powerpc-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; -@@ -236,10 +245,24 @@ - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; -+ *:ekkoBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} -+ exit 0 ;; -+ macppc:MirBSD:*:*) -+ echo powerppc-unknown-mirbsd${UNAME_RELEASE} -+ exit 0 ;; -+ *:MirBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -+ exit 0 ;; - alpha:OSF1:*:*) -- if test $UNAME_RELEASE = "V4.0"; then -+ case $UNAME_RELEASE in -+ *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` -- fi -+ ;; -+ *5.*) -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ ;; -+ esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU -@@ -277,11 +300,12 @@ - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac -+ # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. -- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms -@@ -307,6 +331,9 @@ - *:OS/390:*:*) - echo i370-ibm-openedition - exit 0 ;; -+ *:OS400:*:*) -+ echo powerpc-ibm-os400 -+ exit 0 ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; -@@ -399,6 +426,9 @@ - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; -+ m68k:machten:*:*) -+ echo m68k-apple-machten${UNAME_RELEASE} -+ exit 0 ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; -@@ -742,6 +772,11 @@ - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; -+ 5000:UNIX_System_V:4.*:*) -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit 0 ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; -@@ -751,7 +786,7 @@ - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; -- *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) -+ *:FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -763,7 +798,7 @@ - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- # GNU/FreeBSD systems have a "k" prefix to indicate we are using -+ # GNU/KFreeBSD systems have a "k" prefix to indicate we are using - # FreeBSD's kernel, but not the complete OS. - case ${LIBC} in gnu) kernel_only='k' ;; esac - echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} -@@ -799,8 +834,13 @@ - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - *:GNU:*:*) -+ # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; -+ *:GNU/*:*:*) -+ # other systems with GNU libc and userland -+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -+ exit 0 ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; -@@ -813,6 +853,9 @@ - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; -+ m32r*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit 0 ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; -@@ -981,6 +1024,9 @@ - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; -+ i*86:syllable:*:*) -+ echo ${UNAME_MACHINE}-pc-syllable -+ exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; -@@ -1052,7 +1098,7 @@ - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; -- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) -+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` -@@ -1167,7 +1213,7 @@ - *:QNX:*:4*) - echo i386-pc-qnx - exit 0 ;; -- NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*) -+ NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; - *:NonStop-UX:*:*) -@@ -1211,6 +1257,9 @@ - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; -+ *:DragonFly:*:*) -+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -+ exit 0 ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 ---- autoconf-2.59/config/config.sub.old 2003-10-23 10:28:51.000000000 -0400 -+++ autoconf-2.59/config/config.sub 2004-04-24 22:36:28.000000000 -0400 -@@ -3,7 +3,7 @@ - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. - --timestamp='2003-08-18' -+timestamp='2004-03-12' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -118,7 +118,8 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) -+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ -+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -236,7 +237,7 @@ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -- | m32r | m68000 | m68k | m88k | mcore \ -+ | m32r | m32rle | m68000 | m68k | m88k | mcore \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -@@ -261,7 +262,7 @@ - | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ -- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ -+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ -@@ -307,7 +308,7 @@ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -- | m32r-* \ -+ | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ -@@ -335,7 +336,7 @@ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ -- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tron-* \ -@@ -362,6 +363,9 @@ - basic_machine=a29k-amd - os=-udi - ;; -+ abacus) -+ basic_machine=abacus-unknown -+ ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout -@@ -379,6 +383,9 @@ - amd64) - basic_machine=x86_64-pc - ;; -+ amd64-*) -+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - amdahl) - basic_machine=580-amdahl - os=-sysv -@@ -438,12 +445,20 @@ - basic_machine=j90-cray - os=-unicos - ;; -+ cr16c) -+ basic_machine=cr16c-unknown -+ os=-elf -+ ;; - crds | unos) - basic_machine=m68k-crds - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; -+ crx) -+ basic_machine=crx-unknown -+ os=-elf -+ ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; -@@ -743,6 +758,10 @@ - basic_machine=or32-unknown - os=-coff - ;; -+ os400) -+ basic_machine=powerpc-ibm -+ os=-os400 -+ ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose -@@ -963,6 +982,10 @@ - tower | tower-32) - basic_machine=m68k-ncr - ;; -+ tpf) -+ basic_machine=s390x-ibm -+ os=-tpf -+ ;; - udi29k) - basic_machine=a29k-amd - os=-udi -@@ -1058,7 +1081,7 @@ - sh64) - basic_machine=sh64-unknown - ;; -- sparc | sparcv9 | sparcv9b) -+ sparc | sparcv8 | sparcv9 | sparcv9b) - basic_machine=sparc-sun - ;; - cydra) -@@ -1131,19 +1154,20 @@ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ -- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ -+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ -+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ -+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ -- | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) -+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1182,6 +1206,9 @@ - -opened*) - os=-openedition - ;; -+ -os400*) -+ os=-os400 -+ ;; - -wince*) - os=-wince - ;; -@@ -1203,6 +1230,9 @@ - -atheos*) - os=-atheos - ;; -+ -syllable*) -+ os=-syllable -+ ;; - -386bsd) - os=-bsd - ;; -@@ -1225,6 +1255,9 @@ - -sinix*) - os=-sysv4 - ;; -+ -tpf*) -+ os=-tpf -+ ;; - -triton*) - os=-sysv3 - ;; -@@ -1473,9 +1506,15 @@ - -mvs* | -opened*) - vendor=ibm - ;; -+ -os400*) -+ vendor=ibm -+ ;; - -ptx*) - vendor=sequent - ;; -+ -tpf*) -+ vendor=ibm -+ ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; diff --git a/recipes/autoconf/autoconf-2.59/autoheader-nonfatal-warnings.patch b/recipes/autoconf/autoconf-2.59/autoheader-nonfatal-warnings.patch deleted file mode 100644 index 1f18e04bba..0000000000 --- a/recipes/autoconf/autoconf-2.59/autoheader-nonfatal-warnings.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- autoconf-2.59/bin/autoheader.in~ 2003-10-10 14:52:56.000000000 +0100 -+++ autoconf-2.59/bin/autoheader.in 2004-05-03 01:36:45.000000000 +0100 -@@ -272,8 +272,8 @@ - } - - } -- exit 1 -- if keys %symbol; -+# exit 1 -+# if keys %symbol; - } - - update_file ("$tmp/config.hin", "$config_h_in"); diff --git a/recipes/autoconf/autoconf-2.59/autoreconf-exclude.patch b/recipes/autoconf/autoconf-2.59/autoreconf-exclude.patch deleted file mode 100644 index 7644955519..0000000000 --- a/recipes/autoconf/autoconf-2.59/autoreconf-exclude.patch +++ /dev/null @@ -1,125 +0,0 @@ ---- autoconf-2.59/bin/autoreconf.in 2004-05-06 00:27:34.000000000 -0400 -+++ autoconf-2.59.new/bin/autoreconf.in 2004-05-06 00:27:46.000000000 -0400 -@@ -75,6 +75,7 @@ - -f, --force consider all files obsolete - -i, --install copy missing auxiliary files - -s, --symlink with -i, install symbolic links instead of copies -+ -x, --exclude=STEPS steps we should not run - -m, --make when applicable, re-run ./configure && make - -W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax] - -@@ -127,6 +128,13 @@ - # Rerun `./configure && make'? - my $make = 0; - -+# Steps to exclude -+my @exclude; -+my @ex; -+ -+my $uses_gettext; -+my $configure_ac; -+ - ## ---------- ## - ## Routines. ## - ## ---------- ## -@@ -144,6 +152,7 @@ - 'B|prepend-include=s' => \@prepend_include, - 'i|install' => \$install, - 's|symlink' => \$symlink, -+ 'x|exclude=s' => \@exclude, - 'm|make' => \$make); - - # Split the warnings as a list of elements instead of a list of -@@ -152,6 +161,8 @@ - parse_WARNINGS; - parse_warnings '--warnings', @warning; - -+ @exclude = map { split /,/ } @exclude; -+ - # Even if the user specified a configure.ac, trim to get the - # directory, and look for configure.ac again. Because (i) the code - # is simpler, and (ii) we are still able to diagnose simultaneous -@@ -237,6 +249,11 @@ - { - my ($aclocal, $flags) = @_; - -+ @ex = grep (/^aclocal$/, @exclude); -+ if ($#ex != -1) { -+ return; -+ } -+ - # aclocal 1.8+ does all this for free. It can be recognized by its - # --force support. - if ($aclocal_supports_force) -@@ -348,7 +365,10 @@ - } - else - { -- xsystem "$autopoint"; -+ @ex = grep (/^autopoint$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("$autopoint"); -+ } - } - - -@@ -501,7 +521,10 @@ - } - elsif ($install) - { -- xsystem ($libtoolize); -+ @ex = grep (/^libtoolize$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("$libtoolize"); -+ } - $rerun_aclocal = 1; - } - else -@@ -541,7 +564,10 @@ - # latter runs the former, and (ii) autoconf is stricter than - # autoheader. So all in all, autoconf should give better error - # messages. -- xsystem ($autoconf); -+ @ex = grep (/^autoconf$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("$autoconf"); -+ } - - - # -------------------- # -@@ -562,7 +588,10 @@ - } - else - { -- xsystem ($autoheader); -+ @ex = grep (/^autoheader$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("$autoheader"); -+ } - } - - -@@ -580,7 +609,10 @@ - # We should always run automake, and let it decide whether it shall - # update the file or not. In fact, the effect of `$force' is already - # included in `$automake' via `--no-force'. -- xsystem ($automake); -+ @ex = grep (/^automake$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("$automake"); -+ } - } - - -@@ -604,7 +636,10 @@ - } - else - { -- xsystem ("make"); -+ @ex = grep (/^make$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("make"); -+ } - } - } - } diff --git a/recipes/autoconf/autoconf-2.59/autoreconf-foreign.patch b/recipes/autoconf/autoconf-2.59/autoreconf-foreign.patch deleted file mode 100644 index 587a823826..0000000000 --- a/recipes/autoconf/autoconf-2.59/autoreconf-foreign.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- autoconf-2.59/bin/autoreconf.in~autoreconf-foreign 2004-05-09 20:55:06.000000000 -0400 -+++ autoconf-2.59/bin/autoreconf.in 2004-05-09 20:55:55.000000000 -0400 -@@ -184,6 +184,8 @@ - - $aclocal_supports_force = `$aclocal --help` =~ /--force/; - -+ $automake .= ' --foreign'; -+ - # Dispatch autoreconf's option to the tools. - # --include; - $autoconf .= join (' --include=', '', @include); diff --git a/recipes/autoconf/autoconf-2.59/autoreconf-gnuconfigize.patch b/recipes/autoconf/autoconf-2.59/autoreconf-gnuconfigize.patch deleted file mode 100644 index 44709d550a..0000000000 --- a/recipes/autoconf/autoconf-2.59/autoreconf-gnuconfigize.patch +++ /dev/null @@ -1,47 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- autoconf-2.59/bin/autoreconf.in~autoreconf-gnuconfigize 2004-05-14 19:04:35.000000000 -0500 -+++ autoconf-2.59/bin/autoreconf.in 2004-05-14 19:07:34.000000000 -0500 -@@ -58,7 +58,7 @@ - $help = "Usage: $0 [OPTION] ... [CONFIGURE-AC or DIRECTORY] ... - - Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint' --(formerly `gettextize'), and `libtoolize' where appropriate) -+(formerly `gettextize'), `libtoolize', and `gnu-configize' where appropriate) - repeatedly to remake the GNU Build System files in the DIRECTORIES or - the directory trees driven by CONFIGURE-AC (defaulting to `.'). - -@@ -105,12 +105,13 @@ - "; - - # Lib files. --my $autoconf = $ENV{'AUTOCONF'} || '@bindir@/@autoconf-name@'; --my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@'; --my $automake = $ENV{'AUTOMAKE'} || 'automake'; --my $aclocal = $ENV{'ACLOCAL'} || 'aclocal'; --my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; --my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; -+my $autoconf = $ENV{'AUTOCONF'} || '@bindir@/@autoconf-name@'; -+my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@'; -+my $automake = $ENV{'AUTOMAKE'} || 'automake'; -+my $aclocal = $ENV{'ACLOCAL'} || 'aclocal'; -+my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; -+my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; -+my $gnuconfigize = $ENV{'GNUCONFIGIZE'} || 'gnu-configize'; - - # --install -- as --add-missing in other tools. - my $install = 0; -@@ -617,6 +618,10 @@ - } - } - -+ @ex = grep (/^gnu-configize$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("$gnuconfigize"); -+ } - - # -------------- # - # Running make. # diff --git a/recipes/autoconf/autoconf-2.59/autoreconf-include.patch b/recipes/autoconf/autoconf-2.59/autoreconf-include.patch deleted file mode 100644 index 5a7604b0fd..0000000000 --- a/recipes/autoconf/autoconf-2.59/autoreconf-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- autoconf/bin/autoreconf.in~ 2004-04-06 23:36:10.000000000 +0100 -+++ autoconf/bin/autoreconf.in 2004-04-08 20:51:57.000000000 +0100 -@@ -179,6 +179,7 @@ - $autoconf .= join (' --prepend-include=', '', @prepend_include); - $autoheader .= join (' --include=', '', @include); - $autoheader .= join (' --prepend-include=', '', @prepend_include); -+ $aclocal .= join (' -I ', '', @include); - - # --install and --symlink; - if ($install) diff --git a/recipes/autoconf/autoconf-2.59/program_prefix.patch b/recipes/autoconf/autoconf-2.59/program_prefix.patch deleted file mode 100644 index e6f4096a97..0000000000 --- a/recipes/autoconf/autoconf-2.59/program_prefix.patch +++ /dev/null @@ -1,19 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- autoconf-2.57/lib/autoconf/general.m4~program_prefix -+++ autoconf-2.57/lib/autoconf/general.m4 -@@ -1676,8 +1676,9 @@ - # The aliases save the names the user supplied, while $host etc. - # will get canonicalized. - test -n "$target_alias" && -- test "$program_prefix$program_suffix$program_transform_name" = \ -- NONENONEs,x,x, && -+ test "$target_alias" != "$host_alias" && -+ test "$program_prefix$program_suffix$program_transform_name" = \ -+ NONENONEs,x,x, && - program_prefix=${target_alias}-[]dnl - ])# AC_CANONICAL_TARGET - diff --git a/recipes/autoconf/autoconf-2.59/sizeof_types.patch b/recipes/autoconf/autoconf-2.59/sizeof_types.patch deleted file mode 100644 index 30fd5c1926..0000000000 --- a/recipes/autoconf/autoconf-2.59/sizeof_types.patch +++ /dev/null @@ -1,87 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - -Index: autoconf-2.59/lib/autoconf/types.m4 -=================================================================== ---- autoconf-2.59.orig/lib/autoconf/types.m4 2003-05-22 14:05:14.000000000 +0200 -+++ autoconf-2.59/lib/autoconf/types.m4 2006-08-06 02:05:02.000000000 +0200 -@@ -380,26 +380,66 @@ - # Generic checks. # - # ---------------- # - -+# Backport of AC_CHECK_TARGET_TOOL from autoconf 2.60 -+# AC_CHECK_TARGET_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH ) -+# ------------------------------------------------------------------------ -+# (Use different variables $1 and ac_ct_$1 so that cache vars don't conflict.) -+AC_DEFUN([AC_CHECK_TARGET_TOOL], -+[AC_BEFORE([$0], [AC_CANONICAL_TARGET])dnl -+AC_CHECK_PROG([$1], [$target_alias-$2], [$target_alias-$2], , [$4]) -+if test -z "$ac_cv_prog_$1"; then -+ if test "$build" = "$target"; then -+ ac_ct_$1=$$1 -+ AC_CHECK_PROG([ac_ct_$1], [$2], [$2], [$3], [$4]) -+ $1=ac_ct_$1 -+ else -+ $1="$3" -+ fi -+else -+ $1="$ac_cv_prog_$1" -+fi -+])# AC_CHECK_TARGET_TOOL -+ -+ -+AC_DEFUN([AC_PROG_SIZE], -+[ -+ AC_CHECK_TARGET_TOOL([SIZE], [size], [size], [$PATH]) -+]) - - # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES]) - # --------------------------------------------------------------- - AC_DEFUN([AC_CHECK_SIZEOF], --[AS_LITERAL_IF([$1], [], -+[AC_REQUIRE([AC_PROG_SIZE]) -+AC_REQUIRE([AC_PROG_AWK]) -+ AS_LITERAL_IF([$1], [], - [AC_FATAL([$0: requires literal arguments])])dnl - AC_CHECK_TYPE([$1], [], [], [$3]) - AC_CACHE_CHECK([size of $1], AS_TR_SH([ac_cv_sizeof_$1]), --[if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then -- # The cast to unsigned long works around a bug in the HP C Compiler -- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -- # This bug is HP SR number 8606223364. -- _AC_COMPUTE_INT([(long) (sizeof ($1))], -- [AS_TR_SH([ac_cv_sizeof_$1])], -- [AC_INCLUDES_DEFAULT([$3])], -- [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])]) -+[ -+if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then -+ if test "$cross_compiling" = yes; then -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])], -+ [extern void dummy($1); static const $1 x[[256]]; dummy(x);])], -+ [ -+ AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'` -+ ], -+ [ -+ AS_TR_SH([ac_cv_sizeof_$1])=0 -+ ]) -+ else -+ # The cast to unsigned long works around a bug in the HP C Compiler -+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+ # This bug is HP SR number 8606223364. -+ _AC_COMPUTE_INT([(long) (sizeof ($1))], -+ [AS_TR_SH([ac_cv_sizeof_$1])], -+ [AC_INCLUDES_DEFAULT([$3])], -+ [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])]) -+ fi - else - AS_TR_SH([ac_cv_sizeof_$1])=0 --fi])dnl -+fi -+])dnl - AC_DEFINE_UNQUOTED(AS_TR_CPP(sizeof_$1), $AS_TR_SH([ac_cv_sizeof_$1]), - [The size of a `$1', as computed by sizeof.]) - ])# AC_CHECK_SIZEOF diff --git a/recipes/autoconf/autoconf213-native_2.13.bb b/recipes/autoconf/autoconf213-native_2.13.bb deleted file mode 100644 index 97d441397e..0000000000 --- a/recipes/autoconf/autoconf213-native_2.13.bb +++ /dev/null @@ -1,11 +0,0 @@ -require autoconf213_${PV}.bb - -DEPENDS = "m4-native gnu-config-native" -RDEPENDS_${PN} = "m4-native gnu-config-native" - -S = "${WORKDIR}/autoconf-${PV}" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}" - -inherit native -PR = "${INC_PR}.0" - diff --git a/recipes/autoconf/autoconf213_2.13.bb b/recipes/autoconf/autoconf213_2.13.bb deleted file mode 100644 index 98f629fcf1..0000000000 --- a/recipes/autoconf/autoconf213_2.13.bb +++ /dev/null @@ -1,8 +0,0 @@ -require autoconf.inc -SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz" -EXTRA_OECONF = "--program-transform-name=s/\$/2.13/" -EXTRA_OEMAKE = 'acdatadir="${datadir}/autoconf-${PV}" infodir="${datadir}/autoconf-${PV}/info"' -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "9de56d4a161a723228220b0f425dc711" -SRC_URI[sha256sum] = "f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e" diff --git a/recipes/autoconf/autoconf_2.57.bb b/recipes/autoconf/autoconf_2.57.bb deleted file mode 100644 index e3fa6febc9..0000000000 --- a/recipes/autoconf/autoconf_2.57.bb +++ /dev/null @@ -1,5 +0,0 @@ -require autoconf.inc -PR = "${INC_PR}.0" - -SRC_URI[autoconf.md5sum] = "407ea53787ce13f5ca427e9a51e05bc2" -SRC_URI[autoconf.sha256sum] = "e1035aa2c21fae2a934d1ab56c774ce9d22717881dab8a1a5b16d294fb793489" diff --git a/recipes/autoconf/autoconf_2.59.bb b/recipes/autoconf/autoconf_2.59.bb deleted file mode 100644 index 13a2f1deef..0000000000 --- a/recipes/autoconf/autoconf_2.59.bb +++ /dev/null @@ -1,16 +0,0 @@ -require autoconf.inc - -PR = "${INC_PR}.0" - -SRC_URI += "file://autoreconf-include.patch \ - file://autoreconf-exclude.patch \ - file://autoreconf-foreign.patch \ - file://autoreconf-gnuconfigize.patch \ - file://autoconf259-update-configscripts.patch \ - file://autoheader-nonfatal-warnings.patch \ - file://sizeof_types.patch \ - file://autoconf-x.patch \ - file://autoconf-sh.patch" - -SRC_URI[autoconf.md5sum] = "1ee40f7a676b3cfdc0e3f7cd81551b5f" -SRC_URI[autoconf.sha256sum] = "f0cde70a8f135098a6a3e85869f2e1cc3f141beea766fa3d6636e086cd8b90a7" diff --git a/recipes/bash/bash_3.2.bb b/recipes/bash/bash_3.2.bb index 178f195d35..5cf854b4e4 100644 --- a/recipes/bash/bash_3.2.bb +++ b/recipes/bash/bash_3.2.bb @@ -1,6 +1,6 @@ require bash.inc -PR = "r8" +PR = "r9" SRC_URI += "\ file://builtins.patch \ diff --git a/recipes/beagleboard/beagleboard-test-scripts_git.bb b/recipes/beagleboard/beagleboard-test-scripts_git.bb index d3d5fde9a0..be0d059c98 100644 --- a/recipes/beagleboard/beagleboard-test-scripts_git.bb +++ b/recipes/beagleboard/beagleboard-test-scripts_git.bb @@ -1,24 +1,31 @@ +## Reminder: The correct spacing for a variable is FOO = "BAR" in : PR="r1" DESCRIPTION = "BeagleBoard test scripts" HOMEPAGE = "http://beagleboad.org/support" +PR = "r2" SRC_URI = "git://gitorious.org/beagleboard-validation/scripts.git;protocol=git \ " -SRCREV = "4f4578e7423c5fb1f3364e1056d53dd3b792dc2a" +SRCREV = "473dd2ab20d866be6168c9f992c2c9e74e485c9d" S = "${WORKDIR}/git" do_install() { TEST_FILES=" \ - testled \ - testuserbtn \ testaudio \ + testcamera \ + testdsp \ + testedid \ + testled \ + testmem \ + testneon \ testsvideo \ - readgpio \ + testuserbtn \ editbootscr \ + edituserscr \ + readgpio \ " install -d ${D}/${bindir} for i in ${TEST_FILES}; do install -m 0755 ${S}/${i} ${D}/${bindir} done } - diff --git a/recipes/binutils/binutils.inc b/recipes/binutils/binutils.inc index 75ee66a7c2..8589b92c8d 100644 --- a/recipes/binutils/binutils.inc +++ b/recipes/binutils/binutils.inc @@ -67,8 +67,6 @@ export CC_FOR_BUILD = "${BUILD_CC}" export CPP_FOR_BUILD = "${BUILD_CPP}" export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" -export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" - do_configure () { (cd ${S}; gnu-configize) || die "Failed to run gnu-configize" diff --git a/recipes/cdparanoia/cdparanoia_9.8alpha.bb b/recipes/cdparanoia/cdparanoia_9.8alpha.bb deleted file mode 100644 index 44c4c5ee63..0000000000 --- a/recipes/cdparanoia/cdparanoia_9.8alpha.bb +++ /dev/null @@ -1,22 +0,0 @@ -# cdparanoia OE build file -# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) -LICENSE = "GPL" -PR = "r3" - -SRC_URI = "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz \ - file://fixes.patch \ - file://Makefile.patch" -SRC_URI[md5sum] = "7218e778b5970a86c958e597f952f193" -SRC_URI[sha256sum] = "1b79fae1aedc692f87d1344410f5c6b666961afccdc78bc5c4c257c450dfa008" - -S = "${WORKDIR}/cdparanoia-III-alpha9.8" - -inherit autotools - -do_install() { - oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \ - INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install -} - -PARALLEL_MAKE = "" diff --git a/recipes/dpkg/dpkg-1.14.19/ignore_extra_fields.patch b/recipes/dpkg/dpkg-1.14.19/ignore_extra_fields.patch deleted file mode 100644 index d09343c6e5..0000000000 --- a/recipes/dpkg/dpkg-1.14.19/ignore_extra_fields.patch +++ /dev/null @@ -1,26 +0,0 @@ - dpkg-deb/build.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- dpkg-1.14.19.orig/dpkg-deb/build.c -+++ dpkg-1.14.19/dpkg-deb/build.c -@@ -241,18 +241,18 @@ void do_build(const char *const *argv) { - if (checkedinfo->priority == pri_other) { - fprintf(stderr, _("warning, `%s' contains user-defined Priority value `%s'\n"), - controlfile, checkedinfo->otherpriority); - warns++; - } -- for (field= checkedinfo->available.arbs; field; field= field->next) { -+ /*for (field= checkedinfo->available.arbs; field; field= field->next) { - if (known_arbitrary_field(field)) - continue; - - fprintf(stderr, _("warning, `%s' contains user-defined field `%s'\n"), - controlfile, field->name); - warns++; -- } -+ }*/ - checkversion(checkedinfo->available.version.version,"(upstream) version",&errs); - checkversion(checkedinfo->available.version.revision,"Debian revision",&errs); - if (errs) ohshit(_("%d errors in control file"),errs); - - if (subdir) { diff --git a/recipes/dpkg/dpkg-native_1.13.22.bb b/recipes/dpkg/dpkg-native_1.13.22.bb deleted file mode 100644 index c33b38978f..0000000000 --- a/recipes/dpkg/dpkg-native_1.13.22.bb +++ /dev/null @@ -1,6 +0,0 @@ -require dpkg-native.inc - -PR = "r5" - -SRC_URI[md5sum] = "0fc9fffc2c2cfa7107d8f422815078c1" -SRC_URI[sha256sum] = "c33aeb300d93eaeac55927ce81dc6f3a1cf74b3b759b65182c9bfca31b75b98f" diff --git a/recipes/dpkg/dpkg-native_1.13.25.bb b/recipes/dpkg/dpkg-native_1.13.25.bb deleted file mode 100644 index 98369817bd..0000000000 --- a/recipes/dpkg/dpkg-native_1.13.25.bb +++ /dev/null @@ -1,6 +0,0 @@ -require dpkg-native.inc - -PR = "r1" - -SRC_URI[md5sum] = "88effb358aa04d25036b662d588433a6" -SRC_URI[sha256sum] = "a525f321e875a8c16f5b6942bc02ac66b0d284cc6c61704f93e74789ef89d817" diff --git a/recipes/dpkg/dpkg-native_1.14.19.bb b/recipes/dpkg/dpkg-native_1.14.19.bb deleted file mode 100644 index c3fd833cde..0000000000 --- a/recipes/dpkg/dpkg-native_1.14.19.bb +++ /dev/null @@ -1,6 +0,0 @@ -require dpkg-native.inc - -PR = "r1" - -SRC_URI[md5sum] = "dad1a4a08c475b31a6b62e7dc92fe9d2" -SRC_URI[sha256sum] = "5287e943265b9efe5bd59cd1f3145d3fbf9e266df28938ad78e2107fde3c1587" diff --git a/recipes/dpkg/dpkg_1.13.22.bb b/recipes/dpkg/dpkg_1.13.22.bb deleted file mode 100644 index 9d2771de6a..0000000000 --- a/recipes/dpkg/dpkg_1.13.22.bb +++ /dev/null @@ -1,15 +0,0 @@ -require dpkg.inc -PR = "r6" -DEPENDS += "zlib bzip2" -SRC_URI += "file://noman.patch" - -EXTRA_OECONF = "--without-static-progs \ - --without-dselect \ - --with-start-stop-daemon \ - --with-zlib \ - --with-bz2lib \ - --without-sgml-doc \ - PERL=/usr/bin/perl" - -SRC_URI[md5sum] = "0fc9fffc2c2cfa7107d8f422815078c1" -SRC_URI[sha256sum] = "c33aeb300d93eaeac55927ce81dc6f3a1cf74b3b759b65182c9bfca31b75b98f" diff --git a/recipes/dpkg/dpkg_1.13.25.bb b/recipes/dpkg/dpkg_1.13.25.bb deleted file mode 100644 index 0fa48e664d..0000000000 --- a/recipes/dpkg/dpkg_1.13.25.bb +++ /dev/null @@ -1,15 +0,0 @@ -require dpkg.inc -PR = "r2" -DEPENDS += "zlib bzip2" -SRC_URI += "file://noman.patch" - -EXTRA_OECONF = "--without-static-progs \ - --without-dselect \ - --with-start-stop-daemon \ - --with-zlib \ - --with-bz2lib \ - --without-sgml-doc \ - PERL=/usr/bin/perl" - -SRC_URI[md5sum] = "88effb358aa04d25036b662d588433a6" -SRC_URI[sha256sum] = "a525f321e875a8c16f5b6942bc02ac66b0d284cc6c61704f93e74789ef89d817" diff --git a/recipes/dpkg/dpkg_1.14.19.bb b/recipes/dpkg/dpkg_1.14.19.bb deleted file mode 100644 index 556d317a28..0000000000 --- a/recipes/dpkg/dpkg_1.14.19.bb +++ /dev/null @@ -1,15 +0,0 @@ -require dpkg.inc -PR = "r2" -DEPENDS += "zlib bzip2" -#RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" -SRC_URI += "file://noman.patch" - -EXTRA_OECONF = "--without-static-progs \ - --without-dselect \ - --with-start-stop-daemon \ - --with-zlib \ - --with-bz2lib \ - --without-sgml-doc" - -SRC_URI[md5sum] = "dad1a4a08c475b31a6b62e7dc92fe9d2" -SRC_URI[sha256sum] = "5287e943265b9efe5bd59cd1f3145d3fbf9e266df28938ad78e2107fde3c1587" diff --git a/recipes/eglibc/eglibc_2.12.bb b/recipes/eglibc/eglibc_2.12.bb index ea221344a4..f34cbb4559 100644 --- a/recipes/eglibc/eglibc_2.12.bb +++ b/recipes/eglibc/eglibc_2.12.bb @@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1" DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.12" -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" PR_append = "+svnr${SRCPV}" SRCREV="11187" EGLIBC_BRANCH="eglibc-2_12" diff --git a/recipes/gcc/gcc-3.3.4.inc b/recipes/gcc/gcc-3.3.4.inc index 8ec9dc09a6..1185c65a32 100644 --- a/recipes/gcc/gcc-3.3.4.inc +++ b/recipes/gcc/gcc-3.3.4.inc @@ -1,6 +1,6 @@ require gcc-common.inc -INC_PR = "r11" +INC_PR = "r12" SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://arm-gotoff.dpatch;apply=yes;striplevel=0 \ diff --git a/recipes/gcc/gcc-3.4.3.inc b/recipes/gcc/gcc-3.4.3.inc index d3823b3a94..cfee4d11cd 100644 --- a/recipes/gcc/gcc-3.4.3.inc +++ b/recipes/gcc/gcc-3.4.3.inc @@ -1,6 +1,6 @@ require gcc-common.inc -INC_PR = "r19" +INC_PR = "r20" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://gcc34-reverse-compare.patch \ diff --git a/recipes/gcc/gcc-3.4.4.inc b/recipes/gcc/gcc-3.4.4.inc index b63f59e2b0..6d4d266a73 100644 --- a/recipes/gcc/gcc-3.4.4.inc +++ b/recipes/gcc/gcc-3.4.4.inc @@ -1,6 +1,6 @@ require gcc-common.inc -INC_PR = "r15" +INC_PR = "r16" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://gcc34-reverse-compare.patch \ diff --git a/recipes/gcc/gcc-4.1.0.inc b/recipes/gcc/gcc-4.1.0.inc index ef62c8f45a..d3c5079bc4 100644 --- a/recipes/gcc/gcc-4.1.0.inc +++ b/recipes/gcc/gcc-4.1.0.inc @@ -1,6 +1,6 @@ require gcc-common.inc -INC_PR = "r11" +INC_PR = "r12" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gcc/gcc-4.1.1.inc b/recipes/gcc/gcc-4.1.1.inc index 951dd91247..88c9d7e69b 100644 --- a/recipes/gcc/gcc-4.1.1.inc +++ b/recipes/gcc/gcc-4.1.1.inc @@ -3,7 +3,7 @@ require gcc-common.inc DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r2" +INC_PR = "r3" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \ diff --git a/recipes/gcc/gcc-4.1.2.inc b/recipes/gcc/gcc-4.1.2.inc index 000767a417..c102b055f7 100644 --- a/recipes/gcc/gcc-4.1.2.inc +++ b/recipes/gcc/gcc-4.1.2.inc @@ -5,7 +5,7 @@ NATIVEDEPS = "mpfr-native gmp-native" COMPATIBLE_TARGET_SYS = "." -INC_PR = "r23" +INC_PR = "r24" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \ diff --git a/recipes/gcc/gcc-4.2.2.inc b/recipes/gcc/gcc-4.2.2.inc index 2a5334a30a..39583c484d 100644 --- a/recipes/gcc/gcc-4.2.2.inc +++ b/recipes/gcc/gcc-4.2.2.inc @@ -4,7 +4,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r16" +INC_PR = "r17" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \ diff --git a/recipes/gcc/gcc-4.2.3.inc b/recipes/gcc/gcc-4.2.3.inc index e947cba3b7..a21d1944e7 100644 --- a/recipes/gcc/gcc-4.2.3.inc +++ b/recipes/gcc/gcc-4.2.3.inc @@ -4,7 +4,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r17" +INC_PR = "r18" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \ diff --git a/recipes/gcc/gcc-4.2.4.inc b/recipes/gcc/gcc-4.2.4.inc index e072731f7e..d586e75065 100644 --- a/recipes/gcc/gcc-4.2.4.inc +++ b/recipes/gcc/gcc-4.2.4.inc @@ -4,7 +4,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r11" +INC_PR = "r12" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \ diff --git a/recipes/gcc/gcc-4.3.1.inc b/recipes/gcc/gcc-4.3.1.inc index 0f93d37ff4..c7feee00d0 100644 --- a/recipes/gcc/gcc-4.3.1.inc +++ b/recipes/gcc/gcc-4.3.1.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r21" +INC_PR = "r22" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \ diff --git a/recipes/gcc/gcc-4.3.2.inc b/recipes/gcc/gcc-4.3.2.inc index 5eebf0beb7..04e3dd7367 100644 --- a/recipes/gcc/gcc-4.3.2.inc +++ b/recipes/gcc/gcc-4.3.2.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r11" +INC_PR = "r12" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \ diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc index aa16643313..c1355e14a1 100644 --- a/recipes/gcc/gcc-4.3.3.inc +++ b/recipes/gcc/gcc-4.3.3.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r14" +INC_PR = "r15" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \ diff --git a/recipes/gcc/gcc-4.3.4.inc b/recipes/gcc/gcc-4.3.4.inc index 8fd607afab..b0954c420d 100644 --- a/recipes/gcc/gcc-4.3.4.inc +++ b/recipes/gcc/gcc-4.3.4.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r9" +INC_PR = "r10" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \ diff --git a/recipes/gcc/gcc-4.4.1.inc b/recipes/gcc/gcc-4.4.1.inc index c4138b84b5..3b429afa42 100644 --- a/recipes/gcc/gcc-4.4.1.inc +++ b/recipes/gcc/gcc-4.4.1.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r8" +INC_PR = "r9" FILESPATHPKG .= ":gcc-$PV" diff --git a/recipes/gcc/gcc-4.4.2.inc b/recipes/gcc/gcc-4.4.2.inc index 0ad3fe51c9..360ea0134c 100644 --- a/recipes/gcc/gcc-4.4.2.inc +++ b/recipes/gcc/gcc-4.4.2.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r2" +INC_PR = "r3" FILESPATHPKG .= ":gcc-$PV" diff --git a/recipes/gcc/gcc-4.4.4.inc b/recipes/gcc/gcc-4.4.4.inc index 37c8cd0001..fb4727795b 100644 --- a/recipes/gcc/gcc-4.4.4.inc +++ b/recipes/gcc/gcc-4.4.4.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r2" +INC_PR = "r3" FILESPATHPKG .= ":gcc-$PV" diff --git a/recipes/gcc/gcc-4.5.inc b/recipes/gcc/gcc-4.5.inc index 8bc99a4832..3e3b3437cf 100644 --- a/recipes/gcc/gcc-4.5.inc +++ b/recipes/gcc/gcc-4.5.inc @@ -8,7 +8,7 @@ DEPENDS = "mpfr gmp libmpc libelf" NATIVEDEPS = "mpfr-native gmp-native libmpc-native" -INC_PR = "r6" +INC_PR = "r7" SRCREV = "162808" PV = "4.5" diff --git a/recipes/gcc/gcc-configure-cross.inc b/recipes/gcc/gcc-configure-cross.inc index b6b2f3185c..c3c2b665e4 100644 --- a/recipes/gcc/gcc-configure-cross.inc +++ b/recipes/gcc/gcc-configure-cross.inc @@ -2,9 +2,7 @@ require gcc-configure-common.inc USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' -EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ - --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++ \ - --with-sysroot=${STAGING_DIR_TARGET} \ +EXTRA_OECONF_PATHS = "--with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET} \ --with-build-time-tools=${STAGING_BINDIR_CROSS}" diff --git a/recipes/gnome/gnome-panel_2.30.0.bb b/recipes/gnome/gnome-panel_2.30.0.bb index cfe2cfeaec..dd9ba5a9dd 100644 --- a/recipes/gnome/gnome-panel_2.30.0.bb +++ b/recipes/gnome/gnome-panel_2.30.0.bb @@ -3,6 +3,8 @@ LICENSE = "GPL" SECTION = "x11/gnome" DEPENDS = "libcanberra gconf librsvg libgweather startup-notification libwnck orbit2 gtk+ libbonoboui libglade libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native" +PR = "r1" + inherit gnome pkgconfig SRC_URI += "file://idl-sysroot.patch" diff --git a/recipes/gnome/metacity_2.30.0.bb b/recipes/gnome/metacity_2.30.0.bb index d6028799aa..d208839b18 100644 --- a/recipes/gnome/metacity_2.30.0.bb +++ b/recipes/gnome/metacity_2.30.0.bb @@ -3,6 +3,8 @@ DESCRIPTION = "Metacity is the boring window manager for the adult in you." LICENSE = "GPL" DEPENDS = "libcanberra libwnck startup-notification gtk+ gconf gdk-pixbuf-csource-native" +PR = "r1" + inherit gnome update-alternatives SRC_URI += "file://crosscompile.patch " diff --git a/recipes/htop/htop_0.7.bb b/recipes/htop/htop_0.7.bb index 4474bea9ab..b42489f6f3 100644 --- a/recipes/htop/htop_0.7.bb +++ b/recipes/htop/htop_0.7.bb @@ -5,7 +5,10 @@ PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS = "ncurses" +# actually RDEPENDS, but ncurses-terminfo is only in ncurses-5.7, so RRECOMMENDS for now +RRECOMMENDS_${PN} = "ncurses-terminfo" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/htop/htop-${PV}.tar.gz \ file://remove-proc-test.patch" diff --git a/recipes/initscripts/files/functions b/recipes/initscripts/files/functions index 51c1f13261..b9dca1f96b 100644 --- a/recipes/initscripts/files/functions +++ b/recipes/initscripts/files/functions @@ -6,7 +6,7 @@ machine_id() { # return the machine ID id=`awk 'BEGIN { FS=": " } /Hardware/ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo` - if [ -n "$id" ]; then + if [ -z "$id" ]; then id=`awk 'BEGIN { FS=": " } /platform/ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo` fi echo -n "$id" diff --git a/recipes/initscripts/initscripts-slugos_1.0.bb b/recipes/initscripts/initscripts-slugos_1.0.bb index f4bf263ef3..74a7c792ed 100644 --- a/recipes/initscripts/initscripts-slugos_1.0.bb +++ b/recipes/initscripts/initscripts-slugos_1.0.bb @@ -24,7 +24,7 @@ PR := "${PR}.24" CONFFILES_${PN} = "" # We wish to search the same file paths as does the initscripts recipe. -FILESPATHPKG = "initscripts-${PV}:initscripts:files" +FILESPATHPKG =. "initscripts-${PV}:" PACKAGES = "${PN}-dbg ${PN}" diff --git a/recipes/initscripts/initscripts_1.0.bb b/recipes/initscripts/initscripts_1.0.bb index 38fe85e650..8c38d7fc9b 100644 --- a/recipes/initscripts/initscripts_1.0.bb +++ b/recipes/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS_${PN} = "makedevs" LICENSE = "GPL" -PR = "r122" +PR = "r123" SRC_URI = "file://functions \ file://halt \ @@ -35,7 +35,7 @@ SRC_URI = "file://functions \ SRC_URI_append_arm = " file://alignment.sh" -CONFFILES_${PN} += "${sysconfdir}/device_table" +CONFFILES_${PN} += "${sysconfdir}/device_table" KERNEL_VERSION = "" diff --git a/recipes/joe/joe_3.1.bb b/recipes/joe/joe_3.1.bb index 36725d99c9..003721b4df 100644 --- a/recipes/joe/joe_3.1.bb +++ b/recipes/joe/joe_3.1.bb @@ -2,8 +2,11 @@ SECTION = "console/utils" DESCRIPTION = "Console text editor with good functionality, good choice for vi-haters." HOMEPAGE = "http://joe-editor.sourceforge.net/" LICENSE ="GPL" +# actually RDEPENDS, but ncurses-terminfo is only in ncurses-5.7, so RRECOMMENDS for now +RRECOMMENDS_${PN} = "ncurses-terminfo" + SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz" -PR = "r1" +PR = "r2" inherit autotools diff --git a/recipes/kexecboot/linux-kexecboot_2.6.35.bb b/recipes/kexecboot/linux-kexecboot_2.6.35.bb index c5be10e8d5..3b36cf817b 100644 --- a/recipes/kexecboot/linux-kexecboot_2.6.35.bb +++ b/recipes/kexecboot/linux-kexecboot_2.6.35.bb @@ -1,6 +1,6 @@ require linux-kexecboot.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" S = "${WORKDIR}/linux-${PV}" @@ -8,8 +8,11 @@ S = "${WORKDIR}/linux-${PV}" DEFAULT_PREFERENCE = "-1" SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ - file://fix.module.loading.16310.patch \ - file://defconfig" + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.1.bz2;apply=yes;name=stablepatch \ + file://fix.module.loading.16310.patch \ + file://defconfig" SRC_URI[kernel.md5sum] = "091abeb4684ce03d1d936851618687b6" SRC_URI[kernel.sha256sum] = "18b2e2c336032e366c942622b77302cb05fc034fb19018f086a4ebc9ed41bfcf" +SRC_URI[stablepatch.md5sum] = "3b9d79bebb2e022c0906ca1cd54bd970" +SRC_URI[stablepatch.sha256sum] = "921ddd008bfa81830e54c9a6d142848b91dbfff9b98ad5ce78282f78b76c9671" diff --git a/recipes/klibc/klibc-1.5.18.inc b/recipes/klibc/klibc-1.5.18.inc deleted file mode 100644 index 9c0ff760d1..0000000000 --- a/recipes/klibc/klibc-1.5.18.inc +++ /dev/null @@ -1,35 +0,0 @@ -require klibc-common.inc - -SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \ - file://modprobe.patch \ - file://dash_readopt.patch \ - file://wc.patch \ - file://staging.patch \ - file://klibc_kexecsyscall.patch \ - file://mntproc-definitions.patch \ - file://arm-signal-cleanup.patch \ - file://socket.h.patch \ - file://isystem.patch \ - file://klibc-x86-KLIBCARCHINCFLAGS.patch \ - " - -KLIBC_FETCHDIR = "1.5" - -EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ - 'CROSS_COMPILE=${TARGET_PREFIX}' \ - 'KLIBCKERNELSRC=${STAGING_KERNEL_DIR}' \ - " - -do_configure () { - ln -sf ${STAGING_KERNEL_DIR} linux -} - -SRC_URI[md5sum] = "5c8b6577b9acb3809cace6e118cdd55b" -SRC_URI[sha256sum] = "e4104f8b34a5f354222bd4622f50b58c6218bf70614450d68539cbef666b6446" - -do_install_append() { - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dmesg ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir} - install -m 755 klcc/klcc ${D}${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}klcc -} diff --git a/recipes/klibc/files/isystem.patch b/recipes/klibc/klibc-1.5.18/isystem.patch index ccdf9ed92d..ccdf9ed92d 100644 --- a/recipes/klibc/files/isystem.patch +++ b/recipes/klibc/klibc-1.5.18/isystem.patch diff --git a/recipes/klibc/files/klibc-config-eabi.patch b/recipes/klibc/klibc-1.5.18/klibc-config-eabi.patch index 86517f0594..86517f0594 100644 --- a/recipes/klibc/files/klibc-config-eabi.patch +++ b/recipes/klibc/klibc-1.5.18/klibc-config-eabi.patch diff --git a/recipes/klibc/files/klibc_kexecsyscall.patch b/recipes/klibc/klibc-1.5.18/klibc_kexecsyscall.patch index 9b2dca4738..9b2dca4738 100644 --- a/recipes/klibc/files/klibc_kexecsyscall.patch +++ b/recipes/klibc/klibc-1.5.18/klibc_kexecsyscall.patch diff --git a/recipes/klibc/files/losetup.patch b/recipes/klibc/klibc-1.5.18/losetup.patch index 77049bd05f..77049bd05f 100644 --- a/recipes/klibc/files/losetup.patch +++ b/recipes/klibc/klibc-1.5.18/losetup.patch diff --git a/recipes/klibc/klibc-1.5.inc b/recipes/klibc/klibc-1.5.inc deleted file mode 100644 index b00f02cc56..0000000000 --- a/recipes/klibc/klibc-1.5.inc +++ /dev/null @@ -1,19 +0,0 @@ -require klibc-common.inc - -SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \ - file://modprobe.patch \ - file://losetup.patch \ - file://dash_readopt.patch \ - file://wc.patch \ - file://staging.patch \ - file://klibc_kexecsyscall.patch \ - " - -KLIBC_FETCHDIR = "1.5" - -SRC_URI[md5sum] = "481dfdef7273f2cc776c2637f481f017" -SRC_URI[sha256sum] = "27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba62772f0c7" - -do_install_append() { - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/insmod ${D}${base_bindir} -} diff --git a/recipes/klibc/klibc-1.5/dash_readopt.patch b/recipes/klibc/klibc-1.5/dash_readopt.patch deleted file mode 100644 index 49bc087edd..0000000000 --- a/recipes/klibc/klibc-1.5/dash_readopt.patch +++ /dev/null @@ -1,105 +0,0 @@ -Index: klibc-1.5/usr/dash/miscbltin.c -=================================================================== ---- klibc-1.5.orig/usr/dash/miscbltin.c 2008-03-27 20:38:09.354564817 +0100 -+++ klibc-1.5/usr/dash/miscbltin.c 2008-04-04 18:05:32.063364195 +0200 -@@ -46,6 +46,7 @@ - #include <ctype.h> - #include <stdint.h> - #include <time.h> /* strtotimeval() */ -+#include <termios.h> - - #include "shell.h" - #include "options.h" -@@ -83,6 +84,11 @@ - int timeout; - int i; - fd_set set; -+ int n_flag = 0; -+ unsigned int nchars = 0; -+ int silent = 0; -+ struct termios tty, old_tty; -+ - struct timeval ts, t0, t1, to; - - ts.tv_sec = ts.tv_usec = 0; -@@ -90,11 +96,18 @@ - rflag = 0; - timeout = 0; - prompt = NULL; -- while ((i = nextopt("p:rt:")) != '\0') { -+ while ((i = nextopt("p:rt:n:s")) != '\0') { - switch(i) { - case 'p': - prompt = optionarg; - break; -+ case 'n': -+ nchars = strtoul(optionarg, NULL, 10); -+ n_flag = nchars; /* just a flag "nchars is nonzero" */ -+ break; -+ case 's': -+ silent = 1; -+ break; - case 't': - p = strtotimeval(optionarg, &ts); - if (*p || (!ts.tv_sec && !ts.tv_usec)) -@@ -118,6 +131,23 @@ - sh_error("arg count"); - if ((ifs = bltinlookup("IFS")) == NULL) - ifs = defifs; -+ if (n_flag || silent) { -+ if (tcgetattr(0, &tty) != 0) { -+ /* Not a tty */ -+ n_flag = 0; -+ silent = 0; -+ } else { -+ old_tty = tty; -+ if (n_flag) { -+ tty.c_lflag &= ~ICANON; -+ tty.c_cc[VMIN] = nchars < 256 ? nchars : 255; -+ } -+ if (silent) { -+ tty.c_lflag &= ~(ECHO | ECHOK | ECHONL); -+ } -+ tcsetattr(0, TCSANOW, &tty); -+ } -+ } - status = 0; - startword = 1; - backslash = 0; -@@ -133,13 +163,15 @@ - ts.tv_sec += t0.tv_sec; - } - STARTSTACKSTR(p); -- for (;;) { -+ do { - if (timeout) { - gettimeofday(&t1, NULL); - if (t1.tv_sec > ts.tv_sec || - (t1.tv_sec == ts.tv_sec && - t1.tv_usec >= ts.tv_usec)) { - status = 1; -+ if (n_flag) -+ tcsetattr(0, TCSANOW, &old_tty); - break; /* Timeout! */ - } - -@@ -156,6 +188,8 @@ - FD_SET(0, &set); - if (select(1, &set, NULL, NULL, &to) != 1) { - status = 1; -+ if (n_flag) -+ tcsetattr(0, TCSANOW, &old_tty); - break; /* Timeout! */ - } - } -@@ -191,7 +225,9 @@ - put: - STPUTC(c, p); - } -- } -+ } while (!n_flag || --nchars); -+ if (n_flag || silent) -+ tcsetattr(0, TCSANOW, &old_tty); - STACKSTRNUL(p); - /* Remove trailing blanks */ - while ((char *)stackblock() <= --p && strchr(ifs, *p) != NULL) diff --git a/recipes/klibc/klibc-1.5/fstype-sane-vfat-and-jffs2-for-1.5.patch b/recipes/klibc/klibc-1.5/fstype-sane-vfat-and-jffs2-for-1.5.patch deleted file mode 100644 index 2ba6d98172..0000000000 --- a/recipes/klibc/klibc-1.5/fstype-sane-vfat-and-jffs2-for-1.5.patch +++ /dev/null @@ -1,63 +0,0 @@ -Index: klibc-1.5/usr/kinit/fstype/fstype.c -=================================================================== ---- klibc-1.5.orig/usr/kinit/fstype/fstype.c 2008-02-28 00:48:35.319254938 +0100 -+++ klibc-1.5/usr/kinit/fstype/fstype.c 2008-02-28 00:52:20.583257793 +0100 -@@ -20,7 +20,7 @@ - #include <endian.h> - #include <netinet/in.h> - #include <sys/vfs.h> -- -+#include <linux/types.h> - #define cpu_to_be32(x) __cpu_to_be32(x) /* Needed by romfs_fs.h */ - - #include "romfs_fs.h" -@@ -33,6 +33,12 @@ - #include "lvm2_sb.h" - #include "iso9660_sb.h" - -+#if __BYTE_ORDER == __BIG_ENDIAN -+#include <linux/byteorder/big_endian.h> -+#else -+#include <linux/byteorder/little_endian.h> -+#endif -+ - /* - * Slightly cleaned up version of jfs_superblock to - * avoid pulling in other kernel header files. -@@ -54,6 +60,27 @@ - /* Swap needs the definition of block size */ - #include "swap_fs.h" - -+static int jffs2_image(const unsigned char *buf, unsigned long *blocks) -+{ -+ // Very sloppy! ;-E -+ if (*buf == 0x85 && buf[1] == 0x19) -+ return 1; -+ -+ return 0; -+} -+ -+static int vfat_image(const unsigned char *buf, unsigned long *blocks) -+{ -+ const struct romfs_super_block *sb = -+ (const struct romfs_super_block *)buf; -+ if (!strncmp(buf + 54, "FAT12 ", 8) -+ || !strncmp(buf + 54, "FAT16 ", 8) -+ || !strncmp(buf + 82, "FAT32 ", 8)) -+ return 1; -+ -+ return 0; -+} -+ - static int gzip_image(const void *buf, unsigned long long *bytes) - { - const unsigned char *p = buf; -@@ -277,6 +304,8 @@ - {1, "ext3", ext3_image}, - {1, "ext2", ext2_image}, - {1, "minix", minix_image}, -+ {0, "jffs2", jffs2_image}, -+ {0, "vfat", vfat_image}, - {8, "reiserfs", reiserfs_image}, - {64, "reiserfs", reiserfs_image}, - {32, "jfs", jfs_image}, diff --git a/recipes/klibc/klibc-1.5/modprobe.patch b/recipes/klibc/klibc-1.5/modprobe.patch deleted file mode 100644 index dceaf6103f..0000000000 --- a/recipes/klibc/klibc-1.5/modprobe.patch +++ /dev/null @@ -1,1985 +0,0 @@ -Index: klibc-1.5/usr/utils/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/utils/Kbuild 2008-03-07 22:01:45.223695348 +0100 -+++ klibc-1.5/usr/utils/Kbuild 2008-03-07 22:48:44.660783243 +0100 -@@ -3,8 +3,8 @@ - # - - progs := chroot dd mkdir mkfifo mknod mount pivot_root umount --progs += true false sleep ln nuke minips cat --progs += insmod uname halt kill readlink cpio -+progs += true false sleep ln nuke minips cat losetup -+progs += insmod uname halt kill readlink cpio modprobe - - static-y := $(addprefix static/, $(progs)) - shared-y := $(addprefix shared/, $(progs)) -@@ -52,7 +52,10 @@ - shared/readlink-y := readlink.o - static/cpio-y := cpio.o - shared/cpio-y := cpio.o -- -+static/modprobe-y := modprobe.o -+shared/modprobe-y := modprobe.o -+static/losetup-y := losetup.o -+shared/losetup-y := losetup.o - # Additionally linked targets - always := static/reboot static/poweroff shared/reboot shared/poweroff - -Index: klibc-1.5/usr/utils/list.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ klibc-1.5/usr/utils/list.h 2008-03-07 22:33:22.287688586 +0100 -@@ -0,0 +1,238 @@ -+/* Stolen from Linux Kernel Source's list.h -- GPL. */ -+#ifndef _MODINITTOOLS_LIST_H -+#define _MODINITTOOLS_LIST_H -+ -+#undef offsetof -+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) -+ -+/** -+ * container_of - cast a member of a structure out to the containing structure -+ * -+ * @ptr: the pointer to the member. -+ * @type: the type of the container struct this is embedded in. -+ * @member: the name of the member within the struct. -+ * -+ */ -+#define container_of(ptr, type, member) ({ \ -+ const typeof( ((type *)0)->member ) *__mptr = (ptr); \ -+ (type *)( (char *)__mptr - offsetof(type,member) );}) -+ -+/* -+ * Simple doubly linked list implementation. -+ * -+ * Some of the internal functions ("__xxx") are useful when -+ * manipulating whole lists rather than single entries, as -+ * sometimes we already know the next/prev entries and we can -+ * generate better code by using them directly rather than -+ * using the generic single-entry routines. -+ */ -+ -+struct list_head { -+ struct list_head *next, *prev; -+}; -+ -+#define LIST_HEAD_INIT(name) { &(name), &(name) } -+ -+#define LIST_HEAD(name) \ -+ struct list_head name = LIST_HEAD_INIT(name) -+ -+#define INIT_LIST_HEAD(ptr) do { \ -+ (ptr)->next = (ptr); (ptr)->prev = (ptr); \ -+} while (0) -+ -+/* -+ * Insert a new entry between two known consecutive entries. -+ * -+ * This is only for internal list manipulation where we know -+ * the prev/next entries already! -+ */ -+static inline void __list_add(struct list_head *new, -+ struct list_head *prev, -+ struct list_head *next) -+{ -+ next->prev = new; -+ new->next = next; -+ new->prev = prev; -+ prev->next = new; -+} -+ -+/** -+ * list_add - add a new entry -+ * @new: new entry to be added -+ * @head: list head to add it after -+ * -+ * Insert a new entry after the specified head. -+ * This is good for implementing stacks. -+ */ -+static inline void list_add(struct list_head *new, struct list_head *head) -+{ -+ __list_add(new, head, head->next); -+} -+ -+/** -+ * list_add_tail - add a new entry -+ * @new: new entry to be added -+ * @head: list head to add it before -+ * -+ * Insert a new entry before the specified head. -+ * This is useful for implementing queues. -+ */ -+static inline void list_add_tail(struct list_head *new, struct list_head *head) -+{ -+ __list_add(new, head->prev, head); -+} -+ -+/* -+ * Delete a list entry by making the prev/next entries -+ * point to each other. -+ * -+ * This is only for internal list manipulation where we know -+ * the prev/next entries already! -+ */ -+static inline void __list_del(struct list_head * prev, struct list_head * next) -+{ -+ next->prev = prev; -+ prev->next = next; -+} -+ -+/** -+ * list_del - deletes entry from list. -+ * @entry: the element to delete from the list. -+ * Note: list_empty on entry does not return true after this, the entry is -+ * in an undefined state. -+ */ -+static inline void list_del(struct list_head *entry) -+{ -+ __list_del(entry->prev, entry->next); -+} -+ -+/** -+ * list_del_init - deletes entry from list and reinitialize it. -+ * @entry: the element to delete from the list. -+ */ -+static inline void list_del_init(struct list_head *entry) -+{ -+ __list_del(entry->prev, entry->next); -+ INIT_LIST_HEAD(entry); -+} -+ -+/** -+ * list_move - delete from one list and add as another's head -+ * @list: the entry to move -+ * @head: the head that will precede our entry -+ */ -+static inline void list_move(struct list_head *list, struct list_head *head) -+{ -+ __list_del(list->prev, list->next); -+ list_add(list, head); -+} -+ -+/** -+ * list_move_tail - delete from one list and add as another's tail -+ * @list: the entry to move -+ * @head: the head that will follow our entry -+ */ -+static inline void list_move_tail(struct list_head *list, -+ struct list_head *head) -+{ -+ __list_del(list->prev, list->next); -+ list_add_tail(list, head); -+} -+ -+/** -+ * list_empty - tests whether a list is empty -+ * @head: the list to test. -+ */ -+static inline int list_empty(struct list_head *head) -+{ -+ return head->next == head; -+} -+ -+static inline void __list_splice(struct list_head *list, -+ struct list_head *head) -+{ -+ struct list_head *first = list->next; -+ struct list_head *last = list->prev; -+ struct list_head *at = head->next; -+ -+ first->prev = head; -+ head->next = first; -+ -+ last->next = at; -+ at->prev = last; -+} -+ -+/** -+ * list_splice - join two lists -+ * @list: the new list to add. -+ * @head: the place to add it in the first list. -+ */ -+static inline void list_splice(struct list_head *list, struct list_head *head) -+{ -+ if (!list_empty(list)) -+ __list_splice(list, head); -+} -+ -+/** -+ * list_splice_init - join two lists and reinitialise the emptied list. -+ * @list: the new list to add. -+ * @head: the place to add it in the first list. -+ * -+ * The list at @list is reinitialised -+ */ -+static inline void list_splice_init(struct list_head *list, -+ struct list_head *head) -+{ -+ if (!list_empty(list)) { -+ __list_splice(list, head); -+ INIT_LIST_HEAD(list); -+ } -+} -+ -+/** -+ * list_entry - get the struct for this entry -+ * @ptr: the &struct list_head pointer. -+ * @type: the type of the struct this is embedded in. -+ * @member: the name of the list_struct within the struct. -+ */ -+#define list_entry(ptr, type, member) \ -+ container_of(ptr, type, member) -+ -+/** -+ * list_for_each - iterate over a list -+ * @pos: the &struct list_head to use as a loop counter. -+ * @head: the head for your list. -+ */ -+#define list_for_each(pos, head) \ -+ for (pos = (head)->next; pos != (head); pos = pos->next) -+ -+/** -+ * list_for_each_prev - iterate over a list backwards -+ * @pos: the &struct list_head to use as a loop counter. -+ * @head: the head for your list. -+ */ -+#define list_for_each_prev(pos, head) \ -+ for (pos = (head)->prev; pos != (head); pos = pos->prev) -+ -+/** -+ * list_for_each_safe - iterate over a list safe against removal of list entry -+ * @pos: the &struct list_head to use as a loop counter. -+ * @n: another &struct list_head to use as temporary storage -+ * @head: the head for your list. -+ */ -+#define list_for_each_safe(pos, n, head) \ -+ for (pos = (head)->next, n = pos->next; pos != (head); \ -+ pos = n, n = pos->next) -+ -+/** -+ * list_for_each_entry - iterate over list of given type -+ * @pos: the type * to use as a loop counter. -+ * @head: the head for your list. -+ * @member: the name of the list_struct within the struct. -+ */ -+#define list_for_each_entry(pos, head, member) \ -+ for (pos = list_entry((head)->next, typeof(*pos), member); \ -+ &pos->member != (head); \ -+ pos = list_entry(pos->member.next, typeof(*pos), member)) -+ -+#endif -Index: klibc-1.5/usr/utils/modprobe.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ klibc-1.5/usr/utils/modprobe.c 2008-03-08 03:05:51.847688952 +0100 -@@ -0,0 +1,1710 @@ -+/* modprobe.c: insert a module into the kernel, intelligently. -+ Copyright (C) 2001 Rusty Russell. -+ Copyright (C) 2002, 2003 Rusty Russell, IBM Corporation. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+*/ -+#define _GNU_SOURCE /* asprintf */ -+ -+#include <sys/utsname.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <sys/mman.h> -+#include <fcntl.h> -+#include <stdarg.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <ctype.h> -+#include <string.h> -+#include <errno.h> -+#include <unistd.h> -+#include <dirent.h> -+#include <limits.h> -+#include <elf.h> -+#include <getopt.h> -+#include <fnmatch.h> -+#include <asm/unistd.h> -+#include <sys/wait.h> -+#include <syslog.h> -+#include <zlib.h> -+ -+#define streq(a,b) (strcmp((a),(b)) == 0) -+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) -+ -+#include "list.h" -+static inline void try_old_version(const char *progname, char *argv[]) -+{ -+} -+extern long init_module(void *, unsigned long, const char *); -+extern long delete_module(const char *, unsigned int); -+ -+struct module { -+ struct list_head list; -+ char *modname; -+ char filename[0]; -+}; -+ -+#ifndef MODULE_DIR -+#define MODULE_DIR "/lib/modules" -+#endif -+ -+typedef void (*errfn_t)(const char *fmt, ...); -+ -+/* Do we use syslog or stderr for messages? */ -+static int log; -+ -+static void message(const char *prefix, const char *fmt, va_list *arglist) -+{ -+ char *buf, *buf2; -+ -+ vasprintf(&buf, fmt, *arglist); -+ asprintf(&buf2, "%s%s", prefix, buf); -+ -+ if (log) -+ syslog(LOG_NOTICE, "%s", buf2); -+ else -+ fprintf(stderr, "%s", buf2); -+ free(buf2); -+ free(buf); -+} -+void *grab_contents(gzFile *gzfd, unsigned long *size) -+{ -+ unsigned int max = 16384; -+ void *buffer = malloc(max); -+ int ret; -+ -+ if (!buffer) -+ return NULL; -+ -+ *size = 0; -+ while ((ret = gzread(gzfd, buffer + *size, max - *size)) > 0) { -+ *size += ret; -+ if (*size == max) { -+ buffer = realloc(buffer, max *= 2); -+ if (!buffer) -+ return NULL; -+ } -+ } -+ if (ret < 0) { -+ free(buffer); -+ buffer = NULL; -+ } -+ return buffer; -+} -+ -+void *grab_fd(int fd, unsigned long *size) -+{ -+ gzFile gzfd; -+ -+ gzfd = gzdopen(fd, "rb"); -+ if (!gzfd) -+ return NULL; -+ -+ /* gzclose(gzfd) would close fd, which would drop locks. -+ Don't blame zlib: POSIX locking semantics are so horribly -+ broken that they should be ripped out. */ -+ return grab_contents(gzfd, size); -+} -+void release_file(void *data, unsigned long size) -+{ -+ free(data); -+} -+ -+ -+static int warned = 0; -+static void warn(const char *fmt, ...) -+{ -+ va_list arglist; -+ warned++; -+ va_start(arglist, fmt); -+ message("WARNING: ", fmt, &arglist); -+ va_end(arglist); -+} -+ -+static void fatal(const char *fmt, ...) -+{ -+ va_list arglist; -+ va_start(arglist, fmt); -+ message("FATAL: ", fmt, &arglist); -+ va_end(arglist); -+ exit(1); -+} -+ -+ -+static void grammar(const char *cmd, const char *filename, unsigned int line) -+{ -+ warn("%s line %u: ignoring bad line starting with '%s'\n", -+ filename, line, cmd); -+} -+ -+static void *do_nofail(void *ptr, const char *file, int line, const char *expr) -+{ -+ if (!ptr) { -+ fatal("Memory allocation failure %s line %d: %s.\n", -+ file, line, expr); -+ } -+ return ptr; -+} -+ -+#define NOFAIL(ptr) do_nofail((ptr), __FILE__, __LINE__, #ptr) -+ -+static void print_usage(const char *progname) -+{ -+ fprintf(stderr, -+ "Usage: %s [-v] [-V] [-C config-file] [-n] [-i] [-q] [-b] [-o <modname>] <modname> [parameters...]\n" -+ "%s -r [-n] [-i] [-v] <modulename> ...\n" -+ "%s -l -t <dirname> [ -a <modulename> ...]\n", -+ progname, progname, progname); -+ exit(1); -+} -+ -+static int fgetc_wrapped(FILE *file, unsigned int *linenum) -+{ -+ for (;;) { -+ int ch = fgetc(file); -+ if (ch != '\\') -+ return ch; -+ ch = fgetc(file); -+ if (ch != '\n') -+ return ch; -+ if (linenum) -+ (*linenum)++; -+ } -+} -+ -+static char *getline_wrapped(FILE *file, unsigned int *linenum) -+{ -+ int size = 1024; -+ int i = 0; -+ char *buf = NOFAIL(malloc(size)); -+ for(;;) { -+ int ch = fgetc_wrapped(file, linenum); -+ if (i == size) { -+ size *= 2; -+ buf = NOFAIL(realloc(buf, size)); -+ } -+ if (ch < 0 && i == 0) { -+ free(buf); -+ return NULL; -+ } -+ if (ch < 0 || ch == '\n') { -+ if (linenum) -+ (*linenum)++; -+ buf[i] = '\0'; -+ return NOFAIL(realloc(buf, i+1)); -+ } -+ buf[i++] = ch; -+ } -+} -+ -+static struct module *find_module(const char *filename, struct list_head *list) -+{ -+ struct module *i; -+ -+ list_for_each_entry(i, list, list) { -+ if (strcmp(i->filename, filename) == 0) -+ return i; -+ } -+ return NULL; -+} -+ -+/* Convert filename to the module name. Works if filename == modname, too. */ -+static void filename2modname(char *modname, const char *filename) -+{ -+ const char *afterslash; -+ unsigned int i; -+ -+ afterslash = strrchr(filename, '/'); -+ if (!afterslash) -+ afterslash = filename; -+ else -+ afterslash++; -+ -+ /* Convert to underscores, stop at first . */ -+ for (i = 0; afterslash[i] && afterslash[i] != '.'; i++) { -+ if (afterslash[i] == '-') -+ modname[i] = '_'; -+ else -+ modname[i] = afterslash[i]; -+ } -+ modname[i] = '\0'; -+} -+ -+static int lock_file(const char *filename) -+{ -+ int fd = open(filename, O_RDWR, 0); -+ -+ if (fd >= 0) { -+ struct flock lock; -+ lock.l_type = F_WRLCK; -+ lock.l_whence = SEEK_SET; -+ lock.l_start = 0; -+ lock.l_len = 1; -+ fcntl(fd, F_SETLKW, &lock); -+ } else -+ /* Read-only filesystem? There goes locking... */ -+ fd = open(filename, O_RDONLY, 0); -+ return fd; -+} -+ -+static void unlock_file(int fd) -+{ -+ /* Valgrind is picky... */ -+ close(fd); -+} -+ -+static void add_module(char *filename, int namelen, struct list_head *list) -+{ -+ struct module *mod; -+ -+ /* If it's a duplicate: move it to the end, so it gets -+ inserted where it is *first* required. */ -+ mod = find_module(filename, list); -+ if (mod) -+ list_del(&mod->list); -+ else { -+ /* No match. Create a new module. */ -+ mod = NOFAIL(malloc(sizeof(struct module) + namelen + 1)); -+ memcpy(mod->filename, filename, namelen); -+ mod->filename[namelen] = '\0'; -+ mod->modname = NOFAIL(malloc(namelen + 1)); -+ filename2modname(mod->modname, mod->filename); -+ } -+ -+ list_add_tail(&mod->list, list); -+} -+ -+/* Compare len chars of a to b, with _ and - equivalent. */ -+static int modname_equal(const char *a, const char *b, unsigned int len) -+{ -+ unsigned int i; -+ -+ if (strlen(b) != len) -+ return 0; -+ -+ for (i = 0; i < len; i++) { -+ if ((a[i] == '_' || a[i] == '-') -+ && (b[i] == '_' || b[i] == '-')) -+ continue; -+ if (a[i] != b[i]) -+ return 0; -+ } -+ return 1; -+} -+ -+/* Fills in list of modules if this is the line we want. */ -+static int add_modules_dep_line(char *line, -+ const char *name, -+ struct list_head *list) -+{ -+ char *ptr; -+ int len; -+ char *modname; -+ -+ /* Ignore lines without : or which start with a # */ -+ ptr = strchr(line, ':'); -+ if (ptr == NULL || line[strspn(line, "\t ")] == '#') -+ return 0; -+ -+ /* Is this the module we are looking for? */ -+ *ptr = '\0'; -+ if (strrchr(line, '/')) -+ modname = strrchr(line, '/') + 1; -+ else -+ modname = line; -+ -+ len = strlen(modname); -+ if (strchr(modname, '.')) -+ len = strchr(modname, '.') - modname; -+ if (!modname_equal(modname, name, len)) -+ return 0; -+ -+ /* Create the list. */ -+ add_module(line, ptr - line, list); -+ -+ ptr++; -+ for(;;) { -+ char *dep_start; -+ ptr += strspn(ptr, " \t"); -+ if (*ptr == '\0') -+ break; -+ dep_start = ptr; -+ ptr += strcspn(ptr, " \t"); -+ add_module(dep_start, ptr - dep_start, list); -+ } -+ return 1; -+} -+ -+static void read_depends(const char *dirname, -+ const char *start_name, -+ struct list_head *list) -+{ -+ char *modules_dep_name; -+ char *line; -+ FILE *modules_dep; -+ int done = 0; -+ -+ asprintf(&modules_dep_name, "%s/%s", dirname, "modules.dep"); -+ modules_dep = fopen(modules_dep_name, "r"); -+ if (!modules_dep) -+ fatal("Could not load %s: %s\n", -+ modules_dep_name, strerror(errno)); -+ -+ /* Stop at first line, as we can have duplicates (eg. symlinks -+ from boot/ */ -+ while (!done && (line = getline_wrapped(modules_dep, NULL)) != NULL) { -+ done = add_modules_dep_line(line, start_name, list); -+ free(line); -+ } -+ fclose(modules_dep); -+ free(modules_dep_name); -+} -+ -+/* We use error numbers in a loose translation... */ -+static const char *insert_moderror(int err) -+{ -+ switch (err) { -+ case ENOEXEC: -+ return "Invalid module format"; -+ case ENOENT: -+ return "Unknown symbol in module, or unknown parameter (see dmesg)"; -+ case ENOSYS: -+ return "Kernel does not have module support"; -+ default: -+ return strerror(err); -+ } -+} -+ -+static const char *remove_moderror(int err) -+{ -+ switch (err) { -+ case ENOENT: -+ return "No such module"; -+ case ENOSYS: -+ return "Kernel does not have module unloading support"; -+ default: -+ return strerror(err); -+ } -+} -+ -+/* Is module in /proc/modules? If so, fill in usecount if not NULL. -+ 0 means no, 1 means yes, -1 means unknown. -+ */ -+static int module_in_kernel(const char *modname, unsigned int *usecount) -+{ -+ FILE *proc_modules; -+ char *line; -+ -+again: -+ /* Might not be mounted yet. Don't fail. */ -+ proc_modules = fopen("/proc/modules", "r"); -+ if (!proc_modules) -+ return -1; -+ -+ while ((line = getline_wrapped(proc_modules, NULL)) != NULL) { -+ char *entry = strtok(line, " \n"); -+ -+ if (entry && streq(entry, modname)) { -+ /* If it exists, usecount is the third entry. */ -+ if (!strtok(NULL, " \n")) -+ goto out; -+ -+ if (!(entry = strtok(NULL, " \n"))) /* usecount */ -+ goto out; -+ else -+ if (usecount) -+ *usecount = atoi(entry); -+ -+ /* Followed by - then status. */ -+ if (strtok(NULL, " \n") -+ && (entry = strtok(NULL, " \n")) != NULL) { -+ /* Locking will fail on ro fs, we might hit -+ * cases where module is in flux. Spin. */ -+ if (streq(entry, "Loading") -+ || streq(entry, "Unloading")) { -+ usleep(100000); -+ free(line); -+ fclose(proc_modules); -+ goto again; -+ } -+ } -+ -+ out: -+ free(line); -+ fclose(proc_modules); -+ return 1; -+ } -+ free(line); -+ } -+ fclose(proc_modules); -+ return 0; -+} -+ -+static void replace_modname(struct module *module, -+ void *mem, unsigned long len, -+ const char *oldname, const char *newname) -+{ -+ char *p; -+ -+ /* 64 - sizeof(unsigned long) - 1 */ -+ if (strlen(newname) > 55) -+ fatal("New name %s is too long\n", newname); -+ -+ /* Find where it is in the module structure. Don't assume layout! */ -+ for (p = mem; p < (char *)mem + len - strlen(oldname); p++) { -+ if (memcmp(p, oldname, strlen(oldname)) == 0) { -+ strcpy(p, newname); -+ return; -+ } -+ } -+ -+ warn("Could not find old name in %s to replace!\n", module->filename); -+} -+ -+static void *get_section32(void *file, -+ unsigned long size, -+ const char *name, -+ unsigned long *secsize) -+{ -+ Elf32_Ehdr *hdr = file; -+ Elf32_Shdr *sechdrs = file + hdr->e_shoff; -+ const char *secnames; -+ unsigned int i; -+ -+ /* Too short? */ -+ if (size < sizeof(*hdr)) -+ return NULL; -+ if (size < hdr->e_shoff + hdr->e_shnum * sizeof(sechdrs[0])) -+ return NULL; -+ if (size < sechdrs[hdr->e_shstrndx].sh_offset) -+ return NULL; -+ -+ secnames = file + sechdrs[hdr->e_shstrndx].sh_offset; -+ for (i = 1; i < hdr->e_shnum; i++) -+ if (strcmp(secnames + sechdrs[i].sh_name, name) == 0) { -+ *secsize = sechdrs[i].sh_size; -+ return file + sechdrs[i].sh_offset; -+ } -+ return NULL; -+} -+ -+static void *get_section64(void *file, -+ unsigned long size, -+ const char *name, -+ unsigned long *secsize) -+{ -+ Elf64_Ehdr *hdr = file; -+ Elf64_Shdr *sechdrs = file + hdr->e_shoff; -+ const char *secnames; -+ unsigned int i; -+ -+ /* Too short? */ -+ if (size < sizeof(*hdr)) -+ return NULL; -+ if (size < hdr->e_shoff + hdr->e_shnum * sizeof(sechdrs[0])) -+ return NULL; -+ if (size < sechdrs[hdr->e_shstrndx].sh_offset) -+ return NULL; -+ -+ secnames = file + sechdrs[hdr->e_shstrndx].sh_offset; -+ for (i = 1; i < hdr->e_shnum; i++) -+ if (strcmp(secnames + sechdrs[i].sh_name, name) == 0) { -+ *secsize = sechdrs[i].sh_size; -+ return file + sechdrs[i].sh_offset; -+ } -+ return NULL; -+} -+ -+static int elf_ident(void *mod, unsigned long size) -+{ -+ /* "\177ELF" <byte> where byte = 001 for 32-bit, 002 for 64 */ -+ char *ident = mod; -+ -+ if (size < EI_CLASS || memcmp(mod, ELFMAG, SELFMAG) != 0) -+ return ELFCLASSNONE; -+ return ident[EI_CLASS]; -+} -+ -+static void *get_section(void *file, -+ unsigned long size, -+ const char *name, -+ unsigned long *secsize) -+{ -+ switch (elf_ident(file, size)) { -+ case ELFCLASS32: -+ return get_section32(file, size, name, secsize); -+ case ELFCLASS64: -+ return get_section64(file, size, name, secsize); -+ default: -+ return NULL; -+ } -+} -+ -+static void rename_module(struct module *module, -+ void *mod, -+ unsigned long len, -+ const char *newname) -+{ -+ void *modstruct; -+ unsigned long modstruct_len; -+ -+ /* Old-style */ -+ modstruct = get_section(mod, len, ".gnu.linkonce.this_module", -+ &modstruct_len); -+ /* New-style */ -+ if (!modstruct) -+ modstruct = get_section(mod, len, "__module", &modstruct_len); -+ if (!modstruct) -+ warn("Could not find module name to change in %s\n", -+ module->filename); -+ else -+ replace_modname(module, modstruct, modstruct_len, -+ module->modname, newname); -+} -+ -+/* Kernel told to ignore these sections if SHF_ALLOC not set. */ -+static void invalidate_section32(void *mod, const char *secname) -+{ -+ Elf32_Ehdr *hdr = mod; -+ Elf32_Shdr *sechdrs = mod + hdr->e_shoff; -+ const char *secnames = mod + sechdrs[hdr->e_shstrndx].sh_offset; -+ unsigned int i; -+ -+ for (i = 1; i < hdr->e_shnum; i++) -+ if (strcmp(secnames+sechdrs[i].sh_name, secname) == 0) -+ sechdrs[i].sh_flags &= ~SHF_ALLOC; -+} -+ -+static void invalidate_section64(void *mod, const char *secname) -+{ -+ Elf64_Ehdr *hdr = mod; -+ Elf64_Shdr *sechdrs = mod + hdr->e_shoff; -+ const char *secnames = mod + sechdrs[hdr->e_shstrndx].sh_offset; -+ unsigned int i; -+ -+ for (i = 1; i < hdr->e_shnum; i++) -+ if (strcmp(secnames+sechdrs[i].sh_name, secname) == 0) -+ sechdrs[i].sh_flags &= ~(unsigned long long)SHF_ALLOC; -+} -+ -+static void strip_section(struct module *module, -+ void *mod, -+ unsigned long len, -+ const char *secname) -+{ -+ switch (elf_ident(mod, len)) { -+ case ELFCLASS32: -+ invalidate_section32(mod, secname); -+ break; -+ case ELFCLASS64: -+ invalidate_section64(mod, secname); -+ break; -+ default: -+ warn("Unknown module format in %s: not forcing version\n", -+ module->filename); -+ } -+} -+ -+static const char *next_string(const char *string, unsigned long *secsize) -+{ -+ /* Skip non-zero chars */ -+ while (string[0]) { -+ string++; -+ if ((*secsize)-- <= 1) -+ return NULL; -+ } -+ -+ /* Skip any zero padding. */ -+ while (!string[0]) { -+ string++; -+ if ((*secsize)-- <= 1) -+ return NULL; -+ } -+ return string; -+} -+ -+static void clear_magic(struct module *module, void *mod, unsigned long len) -+{ -+ const char *p; -+ unsigned long modlen; -+ -+ /* Old-style: __vermagic section */ -+ strip_section(module, mod, len, "__vermagic"); -+ -+ /* New-style: in .modinfo section */ -+ for (p = get_section(mod, len, ".modinfo", &modlen); -+ p; -+ p = next_string(p, &modlen)) { -+ if (strncmp(p, "vermagic=", strlen("vermagic=")) == 0) { -+ memset((char *)p, 0, strlen(p)); -+ return; -+ } -+ } -+} -+ -+struct module_options -+{ -+ struct module_options *next; -+ char *modulename; -+ char *options; -+}; -+ -+struct module_command -+{ -+ struct module_command *next; -+ char *modulename; -+ char *command; -+}; -+ -+struct module_alias -+{ -+ struct module_alias *next; -+ char *module; -+}; -+ -+struct module_blacklist -+{ -+ struct module_blacklist *next; -+ char *modulename; -+}; -+ -+/* Link in a new option line from the config file. */ -+static struct module_options * -+add_options(const char *modname, -+ const char *option, -+ struct module_options *options) -+{ -+ struct module_options *new; -+ char *tab; -+ -+ new = NOFAIL(malloc(sizeof(*new))); -+ new->modulename = NOFAIL(strdup(modname)); -+ new->options = NOFAIL(strdup(option)); -+ /* We can handle tabs, kernel can't. */ -+ for (tab = strchr(new->options, '\t'); tab; tab = strchr(tab, '\t')) -+ *tab = ' '; -+ new->next = options; -+ return new; -+} -+ -+/* Link in a new install line from the config file. */ -+static struct module_command * -+add_command(const char *modname, -+ const char *command, -+ struct module_command *commands) -+{ -+ struct module_command *new; -+ -+ new = NOFAIL(malloc(sizeof(*new))); -+ new->modulename = NOFAIL(strdup(modname)); -+ new->command = NOFAIL(strdup(command)); -+ new->next = commands; -+ return new; -+} -+ -+/* Link in a new alias line from the config file. */ -+static struct module_alias * -+add_alias(const char *modname, struct module_alias *aliases) -+{ -+ struct module_alias *new; -+ -+ new = NOFAIL(malloc(sizeof(*new))); -+ new->module = NOFAIL(strdup(modname)); -+ new->next = aliases; -+ return new; -+} -+ -+/* Link in a new blacklist line from the config file. */ -+static struct module_blacklist * -+add_blacklist(const char *modname, struct module_blacklist *blacklist) -+{ -+ struct module_blacklist *new; -+ -+ new = NOFAIL(malloc(sizeof(*new))); -+ new->modulename = NOFAIL(strdup(modname)); -+ new->next = blacklist; -+ return new; -+} -+ -+/* Find blacklist commands if any. */ -+static int -+find_blacklist(const char *modname, const struct module_blacklist *blacklist) -+{ -+ while (blacklist) { -+ if (strcmp(blacklist->modulename, modname) == 0) -+ return 1; -+ blacklist = blacklist->next; -+ } -+ return 0; -+} -+ -+/* return a new alias list, with backlisted elems filtered out */ -+static struct module_alias * -+apply_blacklist(const struct module_alias *aliases, -+ const struct module_blacklist *blacklist) -+{ -+ struct module_alias *result = NULL; -+ while (aliases) { -+ char *modname = aliases->module; -+ if (!find_blacklist(modname, blacklist)) -+ result = add_alias(modname, result); -+ aliases = aliases->next; -+ } -+ return result; -+} -+ -+/* Find install commands if any. */ -+static const char *find_command(const char *modname, -+ const struct module_command *commands) -+{ -+ while (commands) { -+ if (fnmatch(commands->modulename, modname, 0) == 0) -+ return commands->command; -+ commands = commands->next; -+ } -+ return NULL; -+} -+ -+static char *append_option(char *options, const char *newoption) -+{ -+ options = NOFAIL(realloc(options, strlen(options) + 1 -+ + strlen(newoption) + 1)); -+ if (strlen(options)) strcat(options, " "); -+ strcat(options, newoption); -+ return options; -+} -+ -+/* Add to options */ -+static char *add_extra_options(const char *modname, -+ char *optstring, -+ const struct module_options *options) -+{ -+ while (options) { -+ if (strcmp(options->modulename, modname) == 0) -+ optstring = append_option(optstring, options->options); -+ options = options->next; -+ } -+ return optstring; -+} -+ -+/* If we don't flush, then child processes print before we do */ -+static void verbose_printf(int verbose, const char *fmt, ...) -+{ -+ va_list arglist; -+ -+ if (verbose) { -+ va_start(arglist, fmt); -+ vprintf(fmt, arglist); -+ fflush(stdout); -+ va_end(arglist); -+ } -+} -+ -+/* Do an install/remove command: replace $CMDLINE_OPTS if it's specified. */ -+static void do_command(const char *modname, -+ const char *command, -+ int verbose, int dry_run, -+ errfn_t error, -+ const char *type, -+ const char *cmdline_opts) -+{ -+ int ret; -+ char *p, *replaced_cmd = NOFAIL(strdup(command)); -+ -+ while ((p = strstr(replaced_cmd, "$CMDLINE_OPTS")) != NULL) { -+ char *new; -+ asprintf(&new, "%.*s%s%s", -+ p - replaced_cmd, replaced_cmd, cmdline_opts, -+ p + strlen("$CMDLINE_OPTS")); -+ NOFAIL(new); -+ free(replaced_cmd); -+ replaced_cmd = new; -+ } -+ -+ verbose_printf(verbose, "%s %s\n", type, replaced_cmd); -+ if (dry_run) -+ return; -+ -+ setenv("MODPROBE_MODULE", modname, 1); -+ ret = system(replaced_cmd); -+ if (ret == -1 || WEXITSTATUS(ret)) -+ error("Error running %s command for %s\n", type, modname); -+ free(replaced_cmd); -+} -+ -+/* Actually do the insert. Frees second arg. */ -+static void insmod(struct list_head *list, -+ char *optstring, -+ const char *newname, -+ int first_time, -+ errfn_t error, -+ int dry_run, -+ int verbose, -+ const struct module_options *options, -+ const struct module_command *commands, -+ int ignore_commands, -+ int ignore_proc, -+ int strip_vermagic, -+ int strip_modversion, -+ const char *cmdline_opts) -+{ -+ int ret, fd; -+ unsigned long len; -+ void *map; -+ const char *command; -+ struct module *mod = list_entry(list->next, struct module, list); -+ -+ /* Take us off the list. */ -+ list_del(&mod->list); -+ -+ /* Do things we (or parent) depend on first, but don't die if -+ * they fail. */ -+ if (!list_empty(list)) { -+ insmod(list, NOFAIL(strdup("")), NULL, 0, warn, -+ dry_run, verbose, options, commands, 0, ignore_proc, -+ strip_vermagic, strip_modversion, cmdline_opts); -+ } -+ -+ /* Lock before we look, in case it's initializing. */ -+ fd = lock_file(mod->filename); -+ if (fd < 0) { -+ error("Could not open '%s': %s\n", -+ mod->filename, strerror(errno)); -+ goto out_optstring; -+ } -+ -+ /* Don't do ANYTHING if already in kernel. */ -+ if (!ignore_proc -+ && module_in_kernel(newname ?: mod->modname, NULL) == 1) { -+ if (first_time) -+ error("Module %s already in kernel.\n", -+ newname ?: mod->modname); -+ goto out_unlock; -+ } -+ -+ command = find_command(mod->modname, commands); -+ if (command && !ignore_commands) { -+ /* It might recurse: unlock. */ -+ unlock_file(fd); -+ do_command(mod->modname, command, verbose, dry_run, error, -+ "install", cmdline_opts); -+ goto out_optstring; -+ } -+ -+ map = grab_fd(fd, &len); -+ if (!map) { -+ error("Could not read '%s': %s\n", -+ mod->filename, strerror(errno)); -+ goto out_unlock; -+ } -+ -+ /* Rename it? */ -+ if (newname) -+ rename_module(mod, map, len, newname); -+ -+ if (strip_modversion) -+ strip_section(mod, map, len, "__versions"); -+ if (strip_vermagic) -+ clear_magic(mod, map, len); -+ -+ /* Config file might have given more options */ -+ optstring = add_extra_options(mod->modname, optstring, options); -+ -+ verbose_printf(verbose, "insmod %s %s\n", mod->filename, optstring); -+ -+ if (dry_run) -+ goto out; -+ -+ ret = init_module(map, len, optstring); -+ if (ret != 0) { -+ if (errno == EEXIST) { -+ if (first_time) -+ error("Module %s already in kernel.\n", -+ newname ?: mod->modname); -+ goto out_unlock; -+ } -+ error("Error inserting %s (%s): %s\n", -+ mod->modname, mod->filename, insert_moderror(errno)); -+ } -+ out: -+ release_file(map, len); -+ out_unlock: -+ unlock_file(fd); -+ out_optstring: -+ free(optstring); -+ return; -+} -+ -+/* Do recursive removal. */ -+static void rmmod(struct list_head *list, -+ const char *name, -+ int first_time, -+ errfn_t error, -+ int dry_run, -+ int verbose, -+ struct module_command *commands, -+ int ignore_commands, -+ int ignore_inuse, -+ const char *cmdline_opts) -+{ -+ const char *command; -+ unsigned int usecount = 0; -+ int lock; -+ struct module *mod = list_entry(list->next, struct module, list); -+ -+ /* Take first one off the list. */ -+ list_del(&mod->list); -+ -+ /* Ignore failure; it's best effort here. */ -+ lock = lock_file(mod->filename); -+ -+ if (!name) -+ name = mod->modname; -+ -+ /* Even if renamed, find commands to orig. name. */ -+ command = find_command(mod->modname, commands); -+ if (command && !ignore_commands) { -+ /* It might recurse: unlock. */ -+ unlock_file(lock); -+ do_command(mod->modname, command, verbose, dry_run, error, -+ "remove", cmdline_opts); -+ goto remove_rest_no_unlock; -+ } -+ -+ if (module_in_kernel(name, &usecount) == 0) -+ goto nonexistent_module; -+ -+ if (usecount != 0) { -+ if (!ignore_inuse) -+ error("Module %s is in use.\n", name); -+ goto remove_rest; -+ } -+ -+ verbose_printf(verbose, "rmmod %s\n", mod->filename); -+ -+ if (dry_run) -+ goto remove_rest; -+ -+ if (delete_module(name, O_EXCL) != 0) { -+ if (errno == ENOENT) -+ goto nonexistent_module; -+ error("Error removing %s (%s): %s\n", -+ name, mod->filename, -+ remove_moderror(errno)); -+ } -+ -+ remove_rest: -+ unlock_file(lock); -+ remove_rest_no_unlock: -+ /* Now do things we depend. */ -+ if (!list_empty(list)) -+ rmmod(list, NULL, 0, warn, dry_run, verbose, commands, -+ 0, 1, cmdline_opts); -+ return; -+ -+nonexistent_module: -+ if (first_time) -+ fatal("Module %s is not in kernel.\n", mod->modname); -+ goto remove_rest; -+} -+ -+/* Does path contain directory(s) subpath? */ -+static int type_matches(const char *path, const char *subpath) -+{ -+ char *subpath_with_slashes; -+ int ret; -+ -+ asprintf(&subpath_with_slashes, "/%s/", subpath); -+ NOFAIL(subpath_with_slashes); -+ -+ ret = (strstr(path, subpath_with_slashes) != NULL); -+ free(subpath_with_slashes); -+ return ret; -+} -+ -+static char *underscores(char *string) -+{ -+ if (string) { -+ unsigned int i; -+ for (i = 0; string[i]; i++) -+ if (string[i] == '-') -+ string[i] = '_'; -+ } -+ return string; -+} -+ -+static int do_wildcard(const char *dirname, -+ const char *type, -+ const char *wildcard) -+{ -+ char modules_dep_name[strlen(dirname) + sizeof("modules.dep") + 1]; -+ char *line, *wcard; -+ FILE *modules_dep; -+ -+ /* Canonicalize wildcard */ -+ wcard = strdup(wildcard); -+ underscores(wcard); -+ -+ sprintf(modules_dep_name, "%s/%s", dirname, "modules.dep"); -+ modules_dep = fopen(modules_dep_name, "r"); -+ if (!modules_dep) -+ fatal("Could not load %s: %s\n", -+ modules_dep_name, strerror(errno)); -+ -+ while ((line = getline_wrapped(modules_dep, NULL)) != NULL) { -+ char *ptr; -+ -+ /* Ignore lines without : or which start with a # */ -+ ptr = strchr(line, ':'); -+ if (ptr == NULL || line[strspn(line, "\t ")] == '#') -+ goto next; -+ *ptr = '\0'; -+ -+ /* "type" must match complete directory component(s). */ -+ if (!type || type_matches(line, type)) { -+ char modname[strlen(line)+1]; -+ -+ filename2modname(modname, line); -+ if (fnmatch(wcard, modname, 0) == 0) -+ printf("%s\n", line); -+ } -+ next: -+ free(line); -+ } -+ -+ free(wcard); -+ return 0; -+} -+ -+static char *strsep_skipspace(char **string, char *delim) -+{ -+ if (!*string) -+ return NULL; -+ *string += strspn(*string, delim); -+ return strsep(string, delim); -+} -+ -+/* Recursion */ -+static int read_config(const char *filename, -+ const char *name, -+ int dump_only, -+ int removing, -+ struct module_options **options, -+ struct module_command **commands, -+ struct module_alias **alias, -+ struct module_blacklist **blacklist); -+ -+/* FIXME: Maybe should be extended to "alias a b [and|or c]...". --RR */ -+static int read_config_file(const char *filename, -+ const char *name, -+ int dump_only, -+ int removing, -+ struct module_options **options, -+ struct module_command **commands, -+ struct module_alias **aliases, -+ struct module_blacklist **blacklist) -+{ -+ char *line; -+ unsigned int linenum = 0; -+ FILE *cfile; -+ -+ cfile = fopen(filename, "r"); -+ if (!cfile) -+ return 0; -+ -+ while ((line = getline_wrapped(cfile, &linenum)) != NULL) { -+ char *ptr = line; -+ char *cmd, *modname; -+ -+ if (dump_only) -+ printf("%s\n", line); -+ -+ cmd = strsep_skipspace(&ptr, "\t "); -+ if (cmd == NULL || cmd[0] == '#' || cmd[0] == '\0') -+ continue; -+ -+ if (strcmp(cmd, "alias") == 0) { -+ char *wildcard -+ = underscores(strsep_skipspace(&ptr, "\t ")); -+ char *realname -+ = underscores(strsep_skipspace(&ptr, "\t ")); -+ -+ if (!wildcard || !realname) -+ grammar(cmd, filename, linenum); -+ else if (fnmatch(wildcard,name,0) == 0) -+ *aliases = add_alias(realname, *aliases); -+ } else if (strcmp(cmd, "include") == 0) { -+ struct module_alias *newalias = NULL; -+ char *newfilename; -+ -+ newfilename = strsep_skipspace(&ptr, "\t "); -+ if (!newfilename) -+ grammar(cmd, filename, linenum); -+ else { -+ if (!read_config(newfilename, name, -+ dump_only, removing, -+ options, commands, &newalias, -+ blacklist)) -+ warn("Failed to open included" -+ " config file %s: %s\n", -+ newfilename, strerror(errno)); -+ -+ /* Files included override aliases, -+ etc that was already set ... */ -+ if (newalias) -+ *aliases = newalias; -+ } -+ } else if (strcmp(cmd, "options") == 0) { -+ modname = strsep_skipspace(&ptr, "\t "); -+ if (!modname || !ptr) -+ grammar(cmd, filename, linenum); -+ else { -+ ptr += strspn(ptr, "\t "); -+ *options = add_options(underscores(modname), -+ ptr, *options); -+ } -+ } else if (strcmp(cmd, "install") == 0) { -+ modname = strsep_skipspace(&ptr, "\t "); -+ if (!modname || !ptr) -+ grammar(cmd, filename, linenum); -+ else if (!removing) { -+ ptr += strspn(ptr, "\t "); -+ *commands = add_command(underscores(modname), -+ ptr, *commands); -+ } -+ } else if (strcmp(cmd, "blacklist") == 0) { -+ modname = strsep_skipspace(&ptr, "\t "); -+ if (!modname) -+ grammar(cmd, filename, linenum); -+ else if (!removing) { -+ *blacklist = add_blacklist(underscores(modname), -+ *blacklist); -+ } -+ } else if (strcmp(cmd, "remove") == 0) { -+ modname = strsep_skipspace(&ptr, "\t "); -+ if (!modname || !ptr) -+ grammar(cmd, filename, linenum); -+ else if (removing) { -+ ptr += strspn(ptr, "\t "); -+ *commands = add_command(underscores(modname), -+ ptr, *commands); -+ } -+ } else -+ grammar(cmd, filename, linenum); -+ -+ free(line); -+ } -+ fclose(cfile); -+ return 1; -+} -+ -+/* Simple format, ignore lines starting with #, one command per line. -+ Returns true or false. */ -+static int read_config(const char *filename, -+ const char *name, -+ int dump_only, -+ int removing, -+ struct module_options **options, -+ struct module_command **commands, -+ struct module_alias **aliases, -+ struct module_blacklist **blacklist) -+{ -+ DIR *dir; -+ int ret = 0; -+ -+ /* ignore everything in this directory */ -+ if (streq(filename, "/etc/modprobe.d/arch")) -+ return 1; -+ -+ /* Reiser4 has file/directory duality: treat it as both. */ -+ dir = opendir(filename); -+ if (dir) { -+ struct dirent *i; -+ while ((i = readdir(dir)) != NULL) { -+ if (!streq(i->d_name,".") && !streq(i->d_name,"..")) { -+ char sub[strlen(filename) + 1 -+ + strlen(i->d_name) + 1]; -+ -+ sprintf(sub, "%s/%s", filename, i->d_name); -+ if (!read_config(sub, name, -+ dump_only, removing, options, -+ commands, aliases, blacklist)) -+ warn("Failed to open" -+ " config file %s: %s\n", -+ sub, strerror(errno)); -+ } -+ } -+ closedir(dir); -+ ret = 1; -+ } -+ -+ if (read_config_file(filename, name, dump_only, removing, -+ options, commands, aliases, blacklist)) -+ ret = 1; -+ -+ return ret; -+} -+ -+static const char *default_configs[] = -+{ -+ "/etc/modprobe.conf", -+ "/etc/modprobe.d", -+}; -+ -+static void read_toplevel_config(const char *filename, -+ const char *name, -+ int dump_only, -+ int removing, -+ struct module_options **options, -+ struct module_command **commands, -+ struct module_alias **aliases, -+ struct module_blacklist **blacklist) -+{ -+ unsigned int i; -+ -+ if (filename) { -+ if (!read_config(filename, name, dump_only, removing, -+ options, commands, aliases, blacklist)) -+ fatal("Failed to open config file %s: %s\n", -+ filename, strerror(errno)); -+ return; -+ } -+ -+ /* Try defaults. */ -+ for (i = 0; i < ARRAY_SIZE(default_configs); i++) { -+ if (read_config(default_configs[i], name, dump_only, removing, -+ options, commands, aliases, blacklist)) -+ return; -+ } -+} -+ -+static void add_to_env_var(const char *option) -+{ -+ const char *oldenv; -+ -+ if ((oldenv = getenv("MODPROBE_OPTIONS")) != NULL) { -+ char *newenv; -+ asprintf(&newenv, "%s %s", oldenv, option); -+ setenv("MODPROBE_OPTIONS", newenv, 1); -+ } else -+ setenv("MODPROBE_OPTIONS", option, 1); -+} -+ -+/* Prepend options from environment. */ -+static char **merge_args(char *args, char *argv[], int *argc) -+{ -+ char *arg, *argstring; -+ char **newargs = NULL; -+ unsigned int i, num_env = 0; -+ -+ if (!args) -+ return argv; -+ -+ argstring = NOFAIL(strdup(args)); -+ for (arg = strtok(argstring, " "); arg; arg = strtok(NULL, " ")) { -+ num_env++; -+ newargs = NOFAIL(realloc(newargs, -+ sizeof(newargs[0]) -+ * (num_env + *argc + 1))); -+ newargs[num_env] = arg; -+ } -+ -+ /* Append commandline args */ -+ newargs[0] = argv[0]; -+ for (i = 1; i <= *argc; i++) -+ newargs[num_env+i] = argv[i]; -+ -+ *argc += num_env; -+ return newargs; -+} -+ -+static char *gather_options(char *argv[]) -+{ -+ char *optstring = NOFAIL(strdup("")); -+ -+ /* Rest is module options */ -+ while (*argv) { -+ /* Quote value if it contains spaces. */ -+ unsigned int eq = strcspn(*argv, "="); -+ -+ if (strchr(*argv+eq, ' ') && !strchr(*argv, '"')) { -+ char quoted[strlen(*argv) + 3]; -+ (*argv)[eq] = '\0'; -+ sprintf(quoted, "%s=\"%s\"", *argv, *argv+eq+1); -+ optstring = append_option(optstring, quoted); -+ } else -+ optstring = append_option(optstring, *argv); -+ argv++; -+ } -+ return optstring; -+} -+ -+static void handle_module(const char *modname, -+ struct list_head *todo_list, -+ const char *newname, -+ int remove, -+ char *options, -+ int first_time, -+ errfn_t error, -+ int dry_run, -+ int verbose, -+ struct module_options *modoptions, -+ struct module_command *commands, -+ int ignore_commands, -+ int ignore_proc, -+ int strip_vermagic, -+ int strip_modversion, -+ int unknown_silent, -+ const char *cmdline_opts) -+{ -+ if (list_empty(todo_list)) { -+ const char *command; -+ -+ /* The dependencies have to be real modules, but -+ handle case where the first is completely bogus. */ -+ command = find_command(modname, commands); -+ if (command && !ignore_commands) { -+ do_command(modname, command, verbose, dry_run, error, -+ remove ? "remove":"install", cmdline_opts); -+ return; -+ } -+ -+ if (unknown_silent) -+ exit(1); -+ error("Module %s not found.\n", modname); -+ return; -+ } -+ -+ if (remove) -+ rmmod(todo_list, newname, first_time, error, dry_run, verbose, -+ commands, ignore_commands, 0, cmdline_opts); -+ else -+ insmod(todo_list, NOFAIL(strdup(options)), newname, -+ first_time, error, dry_run, verbose, modoptions, -+ commands, ignore_commands, ignore_proc, strip_vermagic, -+ strip_modversion, cmdline_opts); -+} -+ -+static struct option options[] = { { "verbose", 0, NULL, 'v' }, -+ { "version", 0, NULL, 'V' }, -+ { "config", 1, NULL, 'C' }, -+ { "name", 1, NULL, 'o' }, -+ { "remove", 0, NULL, 'r' }, -+ { "showconfig", 0, NULL, 'c' }, -+ { "autoclean", 0, NULL, 'k' }, -+ { "quiet", 0, NULL, 'q' }, -+ { "show", 0, NULL, 'n' }, -+ { "dry-run", 0, NULL, 'n' }, -+ { "syslog", 0, NULL, 's' }, -+ { "type", 1, NULL, 't' }, -+ { "list", 0, NULL, 'l' }, -+ { "all", 0, NULL, 'a' }, -+ { "ignore-install", 0, NULL, 'i' }, -+ { "ignore-remove", 0, NULL, 'i' }, -+ { "force", 0, NULL, 'f' }, -+ { "force-vermagic", 0, NULL, 1 }, -+ { "force-modversion", 0, NULL, 2 }, -+ { "set-version", 1, NULL, 'S' }, -+ { "show-depends", 0, NULL, 'D' }, -+ { "first-time", 0, NULL, 3 }, -+ { "use-blacklist", 0, NULL, 'b' }, -+ { NULL, 0, NULL, 0 } }; -+ -+#define MODPROBE_DEVFSD_CONF "/etc/modprobe.devfs" -+ -+/* This is a horrible hack to allow devfsd, which calls modprobe with -+ -C /etc/modules.conf or /etc/modules.devfs, to work. FIXME. */ -+/* Modern devfsd or variants should use -q explicitly in 2.6. */ -+static int is_devfs_call(char *argv[]) -+{ -+ unsigned int i; -+ -+ /* Look for "/dev" arg */ -+ for (i = 1; argv[i]; i++) { -+ if (strncmp(argv[i], "/dev/", 5) == 0) -+ return 1; -+ } -+ return 0; -+} -+ -+int main(int argc, char *argv[]) -+{ -+ struct utsname buf; -+ struct stat statbuf; -+ int opt; -+ int dump_only = 0; -+ int dry_run = 0; -+ int remove = 0; -+ int verbose = 0; -+ int unknown_silent = 0; -+ int list_only = 0; -+ int all = 0; -+ int ignore_commands = 0; -+ int strip_vermagic = 0; -+ int strip_modversion = 0; -+ int ignore_proc = 0; -+ int first_time = 0; -+ int use_blacklist = 0; -+ unsigned int i, num_modules; -+ char *type = NULL; -+ const char *config = NULL; -+ char *dirname, *optstring; -+ char *newname = NULL; -+ char *aliasfilename, *symfilename; -+ errfn_t error = fatal; -+ -+ /* Prepend options from environment. */ -+ argv = merge_args(getenv("MODPROBE_OPTIONS"), argv, &argc); -+ -+ /* --set-version overrides version, and disables backwards compat. */ -+ for (opt = 1; opt < argc; opt++) -+ if (strncmp(argv[opt],"--set-version",strlen("--set-version")) -+ == 0) -+ break; -+ -+ if (opt == argc) -+ try_old_version("modprobe", argv); -+ -+ uname(&buf); -+ while ((opt = getopt_long(argc, argv, "vVC:o:rknqQsclt:aifb", options, NULL)) != -1){ -+ switch (opt) { -+ case 'v': -+ add_to_env_var("-v"); -+ verbose = 1; -+ break; -+ case 'V': -+ puts("module-init-tools version 3.2.2"); -+ exit(0); -+ case 'S': -+ strncpy(buf.release, optarg, sizeof(buf.release)); -+ buf.release[sizeof(buf.release)-1] = '\0'; -+ break; -+ case 'C': -+ if (is_devfs_call(argv)) { -+ if (streq("/etc/modules.devfs", optarg)) { -+ config = MODPROBE_DEVFSD_CONF; -+ add_to_env_var("-C"); -+ add_to_env_var(config); -+ /* Fall thru to -q */ -+ } else if (streq("/etc/modules.conf", optarg)) -+ /* Ignore config, fall thru to -q */ -+ ; -+ else { -+ /* False alarm. Treat as normal. */ -+ config = optarg; -+ add_to_env_var("-C"); -+ add_to_env_var(config); -+ break; -+ } -+ } else { -+ config = optarg; -+ add_to_env_var("-C"); -+ add_to_env_var(config); -+ break; -+ } -+ case 'q': -+ unknown_silent = 1; -+ add_to_env_var("-q"); -+ break; -+ case 'D': -+ dry_run = 1; -+ ignore_proc = 1; -+ verbose = 1; -+ add_to_env_var("-D"); -+ break; -+ case 'o': -+ newname = optarg; -+ break; -+ case 'r': -+ remove = 1; -+ break; -+ case 'c': -+ dump_only = 1; -+ break; -+ case 't': -+ type = optarg; -+ break; -+ case 'l': -+ list_only = 1; -+ break; -+ case 'a': -+ all = 1; -+ error = warn; -+ break; -+ case 'k': -+ /* FIXME: This should actually do something */ -+ break; -+ case 'n': -+ dry_run = 1; -+ break; -+ case 's': -+ add_to_env_var("-s"); -+ log = 1; -+ break; -+ case 'i': -+ ignore_commands = 1; -+ break; -+ case 'f': -+ strip_vermagic = 1; -+ strip_modversion = 1; -+ break; -+ case 'b': -+ use_blacklist = 1; -+ break; -+ case 1: -+ strip_vermagic = 1; -+ break; -+ case 2: -+ strip_modversion = 1; -+ break; -+ case 3: -+ first_time = 1; -+ break; -+ default: -+ print_usage(argv[0]); -+ } -+ } -+ -+ /* If stderr not open, go to syslog */ -+ if (log || fstat(STDERR_FILENO, &statbuf) != 0) { -+ openlog("modprobe", LOG_CONS, LOG_DAEMON); -+ log = 1; -+ } -+ -+ if (argc < optind + 1 && !dump_only && !list_only && !remove) -+ print_usage(argv[0]); -+ -+ dirname = NOFAIL(malloc(strlen(buf.release) + sizeof(MODULE_DIR) + 1)); -+ sprintf(dirname, "%s/%s", MODULE_DIR, buf.release); -+ aliasfilename = NOFAIL(malloc(strlen(dirname) -+ + sizeof("/modules.alias"))); -+ sprintf(aliasfilename, "%s/modules.alias", dirname); -+ symfilename = NOFAIL(malloc(strlen(dirname) -+ + sizeof("/modules.symbols"))); -+ sprintf(symfilename, "%s/modules.symbols", dirname); -+ -+ /* Old-style -t xxx wildcard? Only with -l. */ -+ if (list_only) { -+ if (optind+1 < argc) -+ fatal("Can't have multiple wildcards\n"); -+ /* fprintf(stderr, "man find\n"); return 1; */ -+ return do_wildcard(dirname, type, argv[optind]?:"*"); -+ } -+ if (type) -+ fatal("-t only supported with -l"); -+ -+ if (dump_only) { -+ struct module_command *commands = NULL; -+ struct module_options *modoptions = NULL; -+ struct module_alias *aliases = NULL; -+ struct module_blacklist *blacklist = NULL; -+ -+ read_toplevel_config(config, "", 1, 0, -+ &modoptions, &commands, &aliases, &blacklist); -+ read_config(aliasfilename, "", 1, 0,&modoptions, &commands, -+ &aliases, &blacklist); -+ read_config(symfilename, "", 1, 0, &modoptions, &commands, -+ &aliases, &blacklist); -+ exit(0); -+ } -+ -+ if (remove || all) { -+ num_modules = argc - optind; -+ optstring = NOFAIL(strdup("")); -+ } else { -+ num_modules = 1; -+ optstring = gather_options(argv+optind+1); -+ } -+ -+ /* num_modules is always 1 except for -r or -a. */ -+ for (i = 0; i < num_modules; i++) { -+ struct module_command *commands = NULL; -+ struct module_options *modoptions = NULL; -+ struct module_alias *aliases = NULL; -+ struct module_blacklist *blacklist = NULL; -+ LIST_HEAD(list); -+ char *modulearg = argv[optind + i]; -+ -+ /* Convert name we are looking for */ -+ underscores(modulearg); -+ -+ /* Returns the resolved alias, options */ -+ read_toplevel_config(config, modulearg, 0, -+ remove, &modoptions, &commands, &aliases, &blacklist); -+ -+ /* No luck? Try symbol names, if starts with symbol:. */ -+ if (!aliases -+ && strncmp(modulearg, "symbol:", strlen("symbol:")) == 0) -+ read_config(symfilename, modulearg, 0, -+ remove, &modoptions, &commands, -+ &aliases, &blacklist); -+ -+ if (!aliases) { -+ /* We only use canned aliases as last resort. */ -+ read_depends(dirname, modulearg, &list); -+ -+ if (list_empty(&list) -+ && !find_command(modulearg, commands)) -+ { -+ read_config(aliasfilename, modulearg, 0, -+ remove, &modoptions, &commands, -+ &aliases, &blacklist); -+ aliases = apply_blacklist(aliases, blacklist); -+ } -+ } -+ -+ if (aliases) { -+ errfn_t err = error; -+ -+ /* More than one alias? Don't bail out on failure. */ -+ if (aliases->next) -+ err = warn; -+ while (aliases) { -+ /* Add the options for this alias. */ -+ char *opts = NOFAIL(strdup(optstring)); -+ opts = add_extra_options(modulearg, -+ opts, modoptions); -+ -+ read_depends(dirname, aliases->module, &list); -+ handle_module(aliases->module, &list, newname, -+ remove, opts, first_time, err, -+ dry_run, verbose, modoptions, -+ commands, ignore_commands, -+ ignore_proc, strip_vermagic, -+ strip_modversion, -+ unknown_silent, -+ optstring); -+ -+ aliases = aliases->next; -+ INIT_LIST_HEAD(&list); -+ } -+ } else { -+ if (use_blacklist -+ && find_blacklist(modulearg, blacklist)) -+ continue; -+ -+ handle_module(modulearg, &list, newname, remove, -+ optstring, first_time, error, dry_run, -+ verbose, modoptions, commands, -+ ignore_commands, ignore_proc, -+ strip_vermagic, strip_modversion, -+ unknown_silent, optstring); -+ } -+ } -+ if (log) -+ closelog(); -+ -+ return 0; -+} diff --git a/recipes/klibc/klibc-1.5/staging.patch b/recipes/klibc/klibc-1.5/staging.patch deleted file mode 100644 index cb426ac267..0000000000 --- a/recipes/klibc/klibc-1.5/staging.patch +++ /dev/null @@ -1,144 +0,0 @@ -Index: klibc-1.5/Makefile -=================================================================== ---- klibc-1.5.orig/Makefile 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/Makefile 2008-02-24 15:25:15.213824149 +0100 -@@ -33,7 +33,7 @@ - export PERL := perl - - # Location for installation --export prefix = /usr -+export prefix = $(INST) - export bindir = $(prefix)/bin - export libdir = $(prefix)/lib - export mandir = $(prefix)/man -Index: klibc-1.5/scripts/Kbuild.install -=================================================================== ---- klibc-1.5.orig/scripts/Kbuild.install 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/scripts/Kbuild.install 2008-02-24 15:24:28.085825030 +0100 -@@ -88,25 +88,21 @@ - header: - $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)" - $(Q)mkdir -p $(INSTALLROOT)$(bindir) -- $(Q)mkdir -p $(INSTALLROOT)$(mandir)/man1 -- $(Q)mkdir -p $(INSTALLROOT)$(SHLIBDIR) - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR) - $(Q)-rm -rf $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib -- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin - $(Q)set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \ - mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)include/$$d ; \ - for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \ - $(KLIBCKERNELOBJ)/include2 ; do \ - [ ! -d $$r/$$d ] || \ -- cp -rfL $$r/$$d/. \ -+ cp -rfd $$r/$$d/. \ - $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/$$d/. ; \ - done ; \ - done - $(Q)cd $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include && ln -sf asm-$(KLIBCARCH) asm - $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. -- $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 - $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir) - - footer: header -Index: klibc-1.5/usr/dash/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/dash/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/dash/Kbuild 2008-02-24 15:13:50.189827040 +0100 -@@ -107,5 +107,3 @@ - $(obj)/arith.c: $(obj)/arith.h - $(Q): - --# Targets to install --install-y := sh.shared -Index: klibc-1.5/usr/gzip/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/gzip/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/gzip/Kbuild 2008-02-24 15:13:50.197824604 +0100 -@@ -21,5 +21,3 @@ - # Cleaning - targets := gzip gzip.g gunzip zcat - --# Targets to install --install-y := gzip gunzip zcat -Index: klibc-1.5/usr/kinit/fstype/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/kinit/fstype/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/kinit/fstype/Kbuild 2008-02-24 15:13:50.201824503 +0100 -@@ -21,5 +21,3 @@ - # Cleaning - clean-dirs := static shared - --# install binary --install-y := $(shared-y) -Index: klibc-1.5/usr/kinit/ipconfig/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/kinit/ipconfig/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/kinit/ipconfig/Kbuild 2008-02-24 15:13:50.205824123 +0100 -@@ -27,5 +27,3 @@ - # Cleaning - clean-dirs := static shared - --# install binary --install-y := $(shared-y) -Index: klibc-1.5/usr/kinit/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/kinit/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/kinit/Kbuild 2008-02-24 15:13:50.209824302 +0100 -@@ -33,5 +33,3 @@ - subdir- := fstype ipconfig nfsmount resume run-init - - --# install binary --install-y := kinit kinit.shared -Index: klibc-1.5/usr/kinit/nfsmount/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/kinit/nfsmount/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/kinit/nfsmount/Kbuild 2008-02-24 15:13:50.213824201 +0100 -@@ -23,5 +23,3 @@ - - clean-dirs := static shared - --# Install binary --install-y := $(shared-y) -Index: klibc-1.5/usr/kinit/resume/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/kinit/resume/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/kinit/resume/Kbuild 2008-02-24 15:13:50.217824380 +0100 -@@ -26,5 +26,3 @@ - # Cleaning - clean-dirs := static shared - --# install binary --install-y := $(shared-y) -Index: klibc-1.5/usr/kinit/run-init/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/kinit/run-init/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/kinit/run-init/Kbuild 2008-02-24 15:13:50.221824559 +0100 -@@ -21,5 +21,3 @@ - # Cleaning - clean-dirs := static shared - --# install binary --install-y := $(shared-y) -Index: klibc-1.5/usr/klibc/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/klibc/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/klibc/Kbuild 2008-02-24 15:13:50.229824358 +0100 -@@ -175,5 +175,3 @@ - $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib)) - $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \ - $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib -- $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \ -- $(INSTALLROOT)$(SHLIBDIR) -Index: klibc-1.5/usr/utils/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/utils/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/utils/Kbuild 2008-02-24 15:13:50.229824358 +0100 -@@ -64,5 +64,3 @@ - # Clean deletes the static and shared dir - clean-dirs := static shared - --# install only install the shared binaries --install-y := $(shared-y) shared/reboot shared/poweroff diff --git a/recipes/klibc/klibc-1.5/wc.patch b/recipes/klibc/klibc-1.5/wc.patch deleted file mode 100644 index 301679799f..0000000000 --- a/recipes/klibc/klibc-1.5/wc.patch +++ /dev/null @@ -1,236 +0,0 @@ -Index: klibc-1.5/usr/utils/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/utils/Kbuild 2008-04-14 23:21:57.702294843 +0200 -+++ klibc-1.5/usr/utils/Kbuild 2008-04-14 23:24:38.817291977 +0200 -@@ -3,7 +3,7 @@ - # - - progs := chroot dd mkdir mkfifo mknod mount pivot_root umount --progs += true false sleep ln nuke minips cat losetup -+progs += true false sleep ln nuke minips cat losetup wc - progs += insmod uname halt kill readlink cpio modprobe - - static-y := $(addprefix static/, $(progs)) -@@ -56,6 +56,9 @@ - shared/modprobe-y := modprobe.o - static/losetup-y := losetup.o - shared/losetup-y := losetup.o -+static/wc-y := wc.o -+shared/wc-y := wc.o -+ - # Additionally linked targets - always := static/reboot static/poweroff shared/reboot shared/poweroff - -Index: klibc-1.5/usr/utils/wc.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ klibc-1.5/usr/utils/wc.c 2008-04-14 23:25:15.449292711 +0200 -@@ -0,0 +1,208 @@ -+/* vi: set sw=4 ts=4: */ -+/* -+ * wc implementation for busybox -+ * -+ * Copyright (C) 2003 Manuel Novoa III <mjn3@codepoet.org> -+ * -+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. -+ */ -+ -+/* BB_AUDIT SUSv3 _NOT_ compliant -- option -m is not currently supported. */ -+/* http://www.opengroup.org/onlinepubs/007904975/utilities/wc.html */ -+ -+/* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) -+ * -+ * Rewritten to fix a number of problems and do some size optimizations. -+ * Problems in the previous busybox implementation (besides bloat) included: -+ * 1) broken 'wc -c' optimization (read note below) -+ * 2) broken handling of '-' args -+ * 3) no checking of ferror on EOF returns -+ * 4) isprint() wasn't considered when word counting. -+ * -+ * TODO: -+ * -+ * When locale support is enabled, count multibyte chars in the '-m' case. -+ * -+ * NOTES: -+ * -+ * The previous busybox wc attempted an optimization using stat for the -+ * case of counting chars only. I omitted that because it was broken. -+ * It didn't take into account the possibility of input coming from a -+ * pipe, or input from a file with file pointer not at the beginning. -+ * -+ * To implement such a speed optimization correctly, not only do you -+ * need the size, but also the file position. Note also that the -+ * file position may be past the end of file. Consider the example -+ * (adapted from example in gnu wc.c) -+ * -+ * echo hello > /tmp/testfile && -+ * (dd ibs=1k skip=1 count=0 &> /dev/null; wc -c) < /tmp/testfile -+ * -+ * for which 'wc -c' should output '0'. -+ */ -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <unistd.h> -+#undef isspace -+#undef isprint -+#define isspace(c) ((((c) == ' ') || (((unsigned int)((c) - 9)) <= (13 - 9)))) -+#define isprint(c) (((unsigned int)((c) - 0x20)) <= (0x7e - 0x20)) -+#define isspace_given_isprint(c) ((c) == ' ') -+ -+#define COUNT_T unsigned long -+#define COUNT_FMT "u" -+#define optind 1 -+FILE *fopen_or_warn_stdin(const char *filename) -+{ -+ FILE *fp = stdin; -+ -+ if (filename[0]) { -+ fp = fopen(filename, "r"); -+ } -+ -+ return fp; -+} -+ -+enum { -+ WC_LINES = 0, -+ WC_WORDS = 1, -+ WC_CHARS = 2, -+ WC_LENGTH = 3 -+}; -+ -+int main(int argc, char **argv) -+{ -+ FILE *fp; -+ const char *s, *arg; -+ const char *start_fmt = "%9"COUNT_FMT; -+ const char *fname_fmt = " %s\n"; -+ COUNT_T *pcounts; -+ COUNT_T counts[4]; -+ COUNT_T totals[4]; -+ unsigned linepos; -+ unsigned u; -+ int num_files = 0; -+ int c; -+ signed char status = EXIT_SUCCESS; -+ signed char in_word; -+ unsigned print_type; -+ -+ print_type = getopt(argc, argv, "lwcL"); -+ -+ if (print_type == 0) { -+ print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_CHARS); -+ } -+ -+ argv += optind; -+ if (!argv[0]) { -+ *--argv = (char *) "wc"; -+ fname_fmt = "\n"; -+ if (!((print_type-1) & print_type)) /* exactly one option? */ -+ start_fmt = "%"COUNT_FMT; -+ } -+ -+ memset(totals, 0, sizeof(totals)); -+ -+ pcounts = counts; -+ -+ while ((arg = *argv++) != 0) { -+ ++num_files; -+ fp = fopen_or_warn_stdin(arg); -+ if (!fp) { -+ status = EXIT_FAILURE; -+ continue; -+ } -+ -+ memset(counts, 0, sizeof(counts)); -+ linepos = 0; -+ in_word = 0; -+ -+ do { -+ /* Our -w doesn't match GNU wc exactly... oh well */ -+ -+ ++counts[WC_CHARS]; -+ c = getc(fp); -+ if (isprint(c)) { -+ ++linepos; -+ if (!isspace_given_isprint(c)) { -+ in_word = 1; -+ continue; -+ } -+ } else if (((unsigned int)(c - 9)) <= 4) { -+ /* \t 9 -+ * \n 10 -+ * \v 11 -+ * \f 12 -+ * \r 13 -+ */ -+ if (c == '\t') { -+ linepos = (linepos | 7) + 1; -+ } else { /* '\n', '\r', '\f', or '\v' */ -+ DO_EOF: -+ if (linepos > counts[WC_LENGTH]) { -+ counts[WC_LENGTH] = linepos; -+ } -+ if (c == '\n') { -+ ++counts[WC_LINES]; -+ } -+ if (c != '\v') { -+ linepos = 0; -+ } -+ } -+ } else if (c == EOF) { -+/* if (ferror(fp)) { -+ status = EXIT_FAILURE; -+ } -+*/ --counts[WC_CHARS]; -+ goto DO_EOF; /* Treat an EOF as '\r'. */ -+ } else { -+ continue; -+ } -+ -+ counts[WC_WORDS] += in_word; -+ in_word = 0; -+ if (c == EOF) { -+ break; -+ } -+ } while (1); -+ -+ if (totals[WC_LENGTH] < counts[WC_LENGTH]) { -+ totals[WC_LENGTH] = counts[WC_LENGTH]; -+ } -+ totals[WC_LENGTH] -= counts[WC_LENGTH]; -+ -+ if(fp != stdin) -+ fclose(fp); -+ -+ OUTPUT: -+ /* coreutils wc tries hard to print pretty columns -+ * (saves results for all files, find max col len etc...) -+ * we won't try that hard, it will bloat us too much */ -+ s = start_fmt; -+ u = 0; -+ do { -+ if (print_type & (1 << u)) { -+ printf(s, pcounts[u]); -+ s = " %9"COUNT_FMT; /* Ok... restore the leading space. */ -+ } -+ totals[u] += pcounts[u]; -+ } while (++u < 4); -+ printf(fname_fmt, arg); -+ } -+ -+ /* If more than one file was processed, we want the totals. To save some -+ * space, we set the pcounts ptr to the totals array. This has the side -+ * effect of trashing the totals array after outputting it, but that's -+ * irrelavent since we no longer need it. */ -+ if (num_files > 1) { -+ num_files = 0; /* Make sure we don't get here again. */ -+ arg = "total"; -+ pcounts = totals; -+ --argv; -+ goto OUTPUT; -+ } -+ -+ fflush(stdout); -+ exit(status); -+} diff --git a/recipes/klibc/klibc-common.inc b/recipes/klibc/klibc-common.inc deleted file mode 100644 index b4c27c9f4a..0000000000 --- a/recipes/klibc/klibc-common.inc +++ /dev/null @@ -1,36 +0,0 @@ -DEPENDS = "virtual/kernel perl-native" -SECTION = "libs" -DESCRIPTION = "klibc is intended to be a minimalistic libc subset for \ -use with initramfs. It is deliberately written for small size, \ -minimal entaglement, and portability, not speed." -LICENSE = "BSD-ADV" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/${KLIBC_FETCHDIR}/klibc-${PV}.tar.bz2" - -S = "${WORKDIR}/klibc-${PV}" -PACKAGE_ARCH = "${MACHINE_ARCH}" -INC_PR = "r17" - -KLIBC_ARCH = '${TARGET_ARCH}' -KLIBC_ARCH_armeb = 'arm' -KLIBC_ARCH_mipsel = 'mips' -KLIBC_ARCH_x86 = 'i386' -KLIBC_ARCH_i486 = 'i386' -KLIBC_ARCH_i586 = 'i386' -KLIBC_ARCH_i686 = 'i386' -KLIBC_ARCH_pentium = 'i386' - -# the klibc code contains ARM instructions (for ARM), this -# could be fixed, but for the moment: -ARM_INSTRUCTION_SET = "arm" - -SRC_URI_append_linux-gnueabi = "file://klibc-config-eabi.patch" -SRC_URI_append_linux-uclibceabi = "file://klibc-config-eabi.patch" - -EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ - 'CROSS_COMPILE=${TARGET_PREFIX}' \ - " - -do_configure () { - ln -sf ${STAGING_KERNEL_DIR} linux -} diff --git a/recipes/klibc/klibc-utils-static.inc b/recipes/klibc/klibc-utils-static.inc deleted file mode 100644 index e7ec1ecc0d..0000000000 --- a/recipes/klibc/klibc-utils-static.inc +++ /dev/null @@ -1,14 +0,0 @@ -FILESPATHPKG =. "klibc-${PV}:" - -do_install() { - install -d ${D}${base_bindir} - install -m 755 usr/dash/sh ${D}${base_bindir} - install -m 755 usr/kinit/kinit ${D}${base_bindir} -} - -#Package only separate utils -PACKAGES = "" - -KLIBC_UTILS_VARIANT = "static" -KLIBC_UTILS_PKGNAME = "klibc-utils-static" -require klibc-utils.inc diff --git a/recipes/klibc/klibc-utils-static_1.5.18.bb b/recipes/klibc/klibc-utils-static_1.5.18.bb index a244b75b91..2b6494d960 100644 --- a/recipes/klibc/klibc-utils-static_1.5.18.bb +++ b/recipes/klibc/klibc-utils-static_1.5.18.bb @@ -1,3 +1,20 @@ -require klibc-utils-static.inc -require klibc-${PV}.inc -PR = "${INC_PR}.1" +FILESPATHPKG =. "klibc-${PV}:" + +do_install() { + install -d ${D}${base_bindir} + install -m 755 usr/dash/sh ${D}${base_bindir} + install -m 755 usr/kinit/kinit ${D}${base_bindir} +} + +# Package only separate utils +PACKAGES = "" + +KLIBC_UTILS_VARIANT = "static" +KLIBC_UTILS_PKGNAME = "klibc-utils-static" + +####################### +require klibc-utils.inc +require klibc.inc + +SRC_URI[md5sum] = "5c8b6577b9acb3809cace6e118cdd55b" +SRC_URI[sha256sum] = "e4104f8b34a5f354222bd4622f50b58c6218bf70614450d68539cbef666b6446" diff --git a/recipes/klibc/klibc-utils-static_1.5.bb b/recipes/klibc/klibc-utils-static_1.5.bb deleted file mode 100644 index 4d1dd4171f..0000000000 --- a/recipes/klibc/klibc-utils-static_1.5.bb +++ /dev/null @@ -1,3 +0,0 @@ -require klibc-utils-static.inc -require klibc-${PV}.inc -PR = "${INC_PR}.0" diff --git a/recipes/klibc/klibc-utils.inc b/recipes/klibc/klibc-utils.inc index e5c4acbeae..993b9d5ea0 100644 --- a/recipes/klibc/klibc-utils.inc +++ b/recipes/klibc/klibc-utils.inc @@ -1,7 +1,8 @@ KLIBC_UTILS_VARIANT ?= "shared" KLIBC_UTILS_PKGNAME ?= "klibc-utils" -# We only want the static utils. klibc build both. So we install only what we want. +# modprobe and losetup go to ${base_sbindir} + do_install_append() { install -d ${D}${base_bindir} install -d ${D}${base_sbindir} @@ -15,14 +16,18 @@ do_install_append() { install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/chroot ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/cpio ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dd ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dmesg ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/false ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/halt ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/kill ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ln ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/losetup ${D}${base_sbindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/minips ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkdir ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkfifo ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mknod ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/modprobe ${D}${base_sbindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mount ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/nuke ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/pivot_root ${D}${base_bindir} @@ -30,27 +35,18 @@ do_install_append() { install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/readlink ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/reboot ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sleep ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/true ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/umount ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/uname ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/modprobe ${D}${base_sbindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/losetup ${D}${base_sbindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/wc ${D}${base_bindir} ln -s gzip ${D}${base_bindir}/gunzip ln -s gzip ${D}${base_bindir}/zcat } -# only in 1.5 -# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/insmod ${D}${base_bindir} - -# only in >= 1.5.18 (can be moved to do_install_append above as soon as klibc_1.5 is dropped from tree) -# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dmesg ${D}${base_bindir} -# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir} -# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir} - PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \ - ${KLIBC_UTILS_PKGNAME}-gzip \ ${KLIBC_UTILS_PKGNAME}-kinit \ + ${KLIBC_UTILS_PKGNAME}-gzip \ ${KLIBC_UTILS_PKGNAME}-fstype \ ${KLIBC_UTILS_PKGNAME}-ipconfig \ ${KLIBC_UTILS_PKGNAME}-nfsmount \ @@ -65,10 +61,13 @@ PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \ ${KLIBC_UTILS_PKGNAME}-halt \ ${KLIBC_UTILS_PKGNAME}-kill \ ${KLIBC_UTILS_PKGNAME}-ln \ + ${KLIBC_UTILS_PKGNAME}-losetup \ + ${KLIBC_UTILS_PKGNAME}-ls \ ${KLIBC_UTILS_PKGNAME}-minips \ ${KLIBC_UTILS_PKGNAME}-mkdir \ ${KLIBC_UTILS_PKGNAME}-mkfifo \ ${KLIBC_UTILS_PKGNAME}-mknod \ + ${KLIBC_UTILS_PKGNAME}-modprobe \ ${KLIBC_UTILS_PKGNAME}-mount \ ${KLIBC_UTILS_PKGNAME}-nuke \ ${KLIBC_UTILS_PKGNAME}-pivot-root \ @@ -80,15 +79,11 @@ PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \ ${KLIBC_UTILS_PKGNAME}-true \ ${KLIBC_UTILS_PKGNAME}-umount \ ${KLIBC_UTILS_PKGNAME}-uname \ - ${KLIBC_UTILS_PKGNAME}-modprobe \ - ${KLIBC_UTILS_PKGNAME}-losetup \ - ${KLIBC_UTILS_PKGNAME}-wc \ - ${KLIBC_UTILS_PKGNAME}-insmod \ - ${KLIBC_UTILS_PKGNAME}-ls" + ${KLIBC_UTILS_PKGNAME}-wc" FILES_${KLIBC_UTILS_PKGNAME}-sh = "${base_bindir}/sh" -FILES_${KLIBC_UTILS_PKGNAME}-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat" FILES_${KLIBC_UTILS_PKGNAME}-kinit = "${base_bindir}/kinit" +FILES_${KLIBC_UTILS_PKGNAME}-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat" FILES_${KLIBC_UTILS_PKGNAME}-fstype = "${base_bindir}/fstype" FILES_${KLIBC_UTILS_PKGNAME}-ipconfig = "${base_bindir}/ipconfig" FILES_${KLIBC_UTILS_PKGNAME}-nfsmount = "${base_bindir}/nfsmount" @@ -103,10 +98,13 @@ FILES_${KLIBC_UTILS_PKGNAME}-false = "${base_bindir}/false" FILES_${KLIBC_UTILS_PKGNAME}-halt = "${base_bindir}/halt" FILES_${KLIBC_UTILS_PKGNAME}-kill = "${base_bindir}/kill" FILES_${KLIBC_UTILS_PKGNAME}-ln = "${base_bindir}/ln" +FILES_${KLIBC_UTILS_PKGNAME}-losetup = "${base_sbindir}/losetup" +FILES_${KLIBC_UTILS_PKGNAME}-ls = "${base_bindir}/ls" FILES_${KLIBC_UTILS_PKGNAME}-minips = "${base_bindir}/minips" FILES_${KLIBC_UTILS_PKGNAME}-mkdir = "${base_bindir}/mkdir" FILES_${KLIBC_UTILS_PKGNAME}-mkfifo = "${base_bindir}/mkfifo" FILES_${KLIBC_UTILS_PKGNAME}-mknod = "${base_bindir}/mknod" +FILES_${KLIBC_UTILS_PKGNAME}-modprobe = "${base_sbindir}/modprobe" FILES_${KLIBC_UTILS_PKGNAME}-mount = "${base_bindir}/mount" FILES_${KLIBC_UTILS_PKGNAME}-nuke = "${base_bindir}/nuke" FILES_${KLIBC_UTILS_PKGNAME}-pivot-root = "${base_bindir}/pivot_root" @@ -118,8 +116,4 @@ FILES_${KLIBC_UTILS_PKGNAME}-sync = "${base_bindir}/sync" FILES_${KLIBC_UTILS_PKGNAME}-true = "${base_bindir}/true" FILES_${KLIBC_UTILS_PKGNAME}-umount = "${base_bindir}/umount" FILES_${KLIBC_UTILS_PKGNAME}-uname = "${base_bindir}/uname" -FILES_${KLIBC_UTILS_PKGNAME}-modprobe = "${base_sbindir}/modprobe" -FILES_${KLIBC_UTILS_PKGNAME}-losetup = "${base_sbindir}/losetup" FILES_${KLIBC_UTILS_PKGNAME}-wc = "${base_bindir}/wc" -FILES_${KLIBC_UTILS_PKGNAME}-insmod = "${base_bindir}/insmod" -FILES_${KLIBC_UTILS_PKGNAME}-ls = "${base_bindir}/ls" diff --git a/recipes/klibc/klibc.inc b/recipes/klibc/klibc.inc index 59f4a5c893..fc8862c3bb 100644 --- a/recipes/klibc/klibc.inc +++ b/recipes/klibc/klibc.inc @@ -1,57 +1,52 @@ -do_install() { - install -d ${D}${base_bindir} - install -m 755 usr/dash/sh.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/sh - install -m 755 usr/kinit/kinit.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/kinit - - install -d ${D}${base_libdir} - install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir} - install -d ${D}${TOOLCHAIN_PATH}/bin/ - install -m 755 klcc/klcc '${D}${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}klcc' - (cd ${D}${base_libdir}; ln -s klibc-*.so klibc.so) -} +DEPENDS = "virtual/kernel perl-native" +SECTION = "libs" +DESCRIPTION = "klibc is intended to be a minimalistic libc subset for \ +use with initramfs. It is deliberately written for small size, \ +minimal entaglement, and portability, not speed." +LICENSE = "BSD-ADV" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +INC_PR = "r18" + +KLIBC_ARCH = '${TARGET_ARCH}' +KLIBC_ARCH_armeb = 'arm' +KLIBC_ARCH_mipsel = 'mips' +KLIBC_ARCH_x86 = 'i386' +KLIBC_ARCH_i486 = 'i386' +KLIBC_ARCH_i586 = 'i386' +KLIBC_ARCH_i686 = 'i386' +KLIBC_ARCH_pentium = 'i386' + +# the klibc code contains ARM instructions (for ARM), this +# could be fixed, but for the moment: +ARM_INSTRUCTION_SET = "arm" + +KLIBC_FETCHDIR = "1.5" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/${KLIBC_FETCHDIR}/klibc-${PV}.tar.bz2" -export INST=${STAGING_DIR_TARGET} - -PACKAGES = "${PN} ${PN}-dev " -FILES_${PN} = "${base_libdir}/klibc-*.so" -FILES_${PN}-dev = "${base_libdir}/klibc.so" - -require klibc-utils.inc - -# Yes we want exactly the klibc that was compiled with the utils -RDEPENDS_${KLIBC_UTILS_PKGNAME}-sh = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-kinit = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-fstype = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-ipconfig = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-nfsmount = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-resume = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-run-init = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-cat = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-chroot = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-cpio = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-dd = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-dmesg = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-false = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-halt = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-insmod = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-kill = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-ln = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-minips = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-mkdir = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-mkfifo = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-mknod = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-mount = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-nuke = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-pivot-root = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-poweroff = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-readlink = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-reboot = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-sleep = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-sync = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-true = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-umount = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-uname = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-modprobe = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-losetup = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-wc = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-ls = "${PN} (=${PV}-${PR})" +SRC_URI_append_linux-gnueabi = "file://klibc-config-eabi.patch" +SRC_URI_append_linux-uclibceabi = "file://klibc-config-eabi.patch" + +SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \ + file://modprobe.patch \ + file://dash_readopt.patch \ + file://wc.patch \ + file://staging.patch \ + file://klibc_kexecsyscall.patch \ + file://mntproc-definitions.patch \ + file://arm-signal-cleanup.patch \ + file://socket.h.patch \ + file://isystem.patch \ + file://klibc-x86-KLIBCARCHINCFLAGS.patch \ + " + +S = "${WORKDIR}/klibc-${PV}" + +EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ + 'CROSS_COMPILE=${TARGET_PREFIX}' \ + 'KLIBCKERNELSRC=${STAGING_KERNEL_DIR}' \ + " + +do_configure () { + ln -sf ${STAGING_KERNEL_DIR} linux +} diff --git a/recipes/klibc/klibc_1.5.18.bb b/recipes/klibc/klibc_1.5.18.bb index cf69b4398c..880ed74763 100644 --- a/recipes/klibc/klibc_1.5.18.bb +++ b/recipes/klibc/klibc_1.5.18.bb @@ -1,3 +1,64 @@ +PR = "${INC_PR}.0" + +do_install() { + oe_runmake install + install -d ${D}${base_bindir} + install -m 755 usr/dash/sh.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/sh + install -m 755 usr/kinit/kinit.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/kinit + + install -d ${D}${base_libdir} + install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir} + (cd ${D}${base_libdir}; ln -s klibc-*.so klibc.so) + install -m 755 klcc/klcc ${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}klcc +} + +export INST=${D} + +PACKAGES = "${PN} ${PN}-dev " +FILES_${PN} = "${base_libdir}/klibc-*.so" +FILES_${PN}-dev = "${base_libdir}/klibc.so" + +# Yes we want exactly the klibc that was compiled with the utils +RDEPENDS_${KLIBC_UTILS_PKGNAME}-sh = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-kinit = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-fstype = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-ipconfig = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-nfsmount = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-resume = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-run-init = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-cat = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-chroot = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-cpio = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-dd = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-dmesg = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-false = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-halt = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-insmod = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-kill = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-ln = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-losetup = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-ls = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-minips = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-mkdir = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-mkfifo = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-mknod = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-modprobe = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-mount = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-nuke = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-pivot-root = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-poweroff = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-readlink = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-reboot = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-sleep = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-sync = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-true = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-umount = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-uname = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-wc = "${PN} (=${PV}-${PR})" + +####################### +require klibc-utils.inc require klibc.inc -require klibc-${PV}.inc -PR = "${INC_PR}.2" + +SRC_URI[md5sum] = "5c8b6577b9acb3809cace6e118cdd55b" +SRC_URI[sha256sum] = "e4104f8b34a5f354222bd4622f50b58c6218bf70614450d68539cbef666b6446" diff --git a/recipes/klibc/klibc_1.5.bb b/recipes/klibc/klibc_1.5.bb deleted file mode 100644 index 71718cfe65..0000000000 --- a/recipes/klibc/klibc_1.5.bb +++ /dev/null @@ -1,3 +0,0 @@ -require klibc.inc -require klibc-${PV}.inc -PR = "${INC_PR}.0" diff --git a/recipes/linux/linux_2.6.35.bb b/recipes/linux/linux_2.6.35.bb index 68c0cbbbef..fa22b5690d 100644 --- a/recipes/linux/linux_2.6.35.bb +++ b/recipes/linux/linux_2.6.35.bb @@ -1,11 +1,16 @@ require linux.inc +PR = "r1" + # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/${P}.tar.bz2;name=kernel \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.1.bz2;apply=yes;name=stablepatch \ file://fix.module.loading.16310.patch \ file://defconfig" SRC_URI[kernel.md5sum] = "091abeb4684ce03d1d936851618687b6" SRC_URI[kernel.sha256sum] = "18b2e2c336032e366c942622b77302cb05fc034fb19018f086a4ebc9ed41bfcf" +SRC_URI[stablepatch.md5sum] = "3b9d79bebb2e022c0906ca1cd54bd970" +SRC_URI[stablepatch.sha256sum] = "921ddd008bfa81830e54c9a6d142848b91dbfff9b98ad5ce78282f78b76c9671" diff --git a/recipes/lmbench/lmbench_2.5.bb b/recipes/lmbench/lmbench_2.5.bb index 80f53a8a3f..de7fc484ad 100644 --- a/recipes/lmbench/lmbench_2.5.bb +++ b/recipes/lmbench/lmbench_2.5.bb @@ -2,7 +2,10 @@ SECTION = "console/utils" DESCRIPTION = "Tools for performance analysis." LICENSE = "GPL" RDEPENDS_${PN} = "debianutils" -PR = "r2" + +PR = "r3" + +inherit autotools SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ file://build.patch \ @@ -14,11 +17,6 @@ EXTRA_OEMAKE = 'CC="${CC}" AR="${AR}" CFLAGS="${CFLAGS}" \ TARGET="${TARGET_OS}" BASE="${prefix}"' -inherit siteinfo - -# Space separated list of shell scripts with variables defined to supply test -# results for autoconf tests we cannot run at build time. -export CONFIG_SITE = "${@siteinfo_get_files(d)}" python do_unpack () { bb.build.exec_func('base_do_unpack', d) bb.build.exec_func('byebk_do_unpack', d) @@ -28,6 +26,10 @@ byebk_do_unpack () { find ${S}/.. -name BitKeeper -o -name SCCS | xargs rm -rf } +do_configure() { + : +} + do_compile () { . ${CONFIG_SITE} if [ X"$ac_cv_uint" == X"yes" ]; then diff --git a/recipes/mythtv/mythplugins_0.23+fixes.bb b/recipes/mythtv/mythplugins_0.23+fixes.bb index 2ddf334470..202ead9016 100644 --- a/recipes/mythtv/mythplugins_0.23+fixes.bb +++ b/recipes/mythtv/mythplugins_0.23+fixes.bb @@ -14,7 +14,7 @@ RDEPENDS_mythweb_lighttpd = "lighttpd lighttpd-module-cgi lighttpd-module-fastcg PR = "svnr${SRCPV}+r0" PV = "0.23" -SRCREV = "25073" +SRCREV = "25609" SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-23-fixes;module=mythplugins;proto=http \ file://sysroot.patch \ file://mythplugins_wo_qtopengl.diff \ diff --git a/recipes/mythtv/myththemes_0.23+fixes.bb b/recipes/mythtv/myththemes_0.23+fixes.bb index e541b06c57..6469b4613a 100644 --- a/recipes/mythtv/myththemes_0.23+fixes.bb +++ b/recipes/mythtv/myththemes_0.23+fixes.bb @@ -4,7 +4,7 @@ inherit qmake2 PR = "svnr${SRCPV}+r0" PV = "0.23" -SRCREV = "25073" +SRCREV = "25609" SRC_URI = \ "svn://svn.mythtv.org/svn/branches/release-0-23-fixes;module=myththemes;proto=http" diff --git a/recipes/mythtv/mythtv_0.23+fixes.bb b/recipes/mythtv/mythtv_0.23+fixes.bb index 972c285a47..d5817cc37d 100644 --- a/recipes/mythtv/mythtv_0.23+fixes.bb +++ b/recipes/mythtv/mythtv_0.23+fixes.bb @@ -16,7 +16,7 @@ PV = "0.23" # but for packaging the real PV is needed REALPV = "0.23" -SRCREV = "25073" +SRCREV = "25609" SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-23-fixes;module=mythtv;proto=http" S = "${WORKDIR}/mythtv" diff --git a/recipes/nano/nano.inc b/recipes/nano/nano.inc index 5b59b68b07..41f21ecc72 100644 --- a/recipes/nano/nano.inc +++ b/recipes/nano/nano.inc @@ -5,8 +5,10 @@ HOMEPAGE = "http://www.nano-editor.org/" LICENSE = "GPLv2" SECTION = "console/utils" DEPENDS = "ncurses" +# actually RDEPENDS, but ncurses-terminfo is only in ncurses-5.7, so RRECOMMENDS for now +RRECOMMENDS_${PN} = "ncurses-terminfo" -INC_PR = "r0" +INC_PR = "r1" PV_MAJOR = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" diff --git a/recipes/navit/files/navit.xml b/recipes/navit/files/navit.xml index 79ee4618d4..58c8c226f2 100644 --- a/recipes/navit/files/navit.xml +++ b/recipes/navit/files/navit.xml @@ -8,6 +8,12 @@ <graphics type="gtk_drawing_area"/> <gui type="gtk" enabled="no" menubar="1" toolbar="1" statusbar="1"/> <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/gui[@type='internal'])"/> + <!-- or comment gtk version above and try: + opkg install navit-graphics-qt + opkg install navit-gui-qml + <graphics type="qt_qpainter"/> + <gui type="qml" enabled="yes" menubar="1" toolbar="1" statusbar="1"/> + --> <xi:include href="/usr/share/navit/osd.xml"/> <log enabled="no" type="textfile_debug" data="debug_%Y%m%d-%i.txt" flush_size="1000" flush_time="30"/> <vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xj"> diff --git a/recipes/navit/navit-icons_svn.bb b/recipes/navit/navit-icons_svn.bb index a24c80590b..34c610982a 100644 --- a/recipes/navit/navit-icons_svn.bb +++ b/recipes/navit/navit-icons_svn.bb @@ -18,7 +18,7 @@ inherit autotools FILES_${PN} = " /usr/share/navit/xpm/" -SRCREV = "3357" +SRCREV = "3409" #use different URL than navit_svn does, to prevent upgrade/downgrade cycle in downloads dir SRC_URI = "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk/navit/navit;module=xpm;proto=https \ diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc index 6f3e63e8c9..1ee130f2b1 100644 --- a/recipes/navit/navit.inc +++ b/recipes/navit/navit.inc @@ -1,10 +1,10 @@ DESCRIPTION = "Navit is a car navigation system with routing engine." LICENSE = "GPL" SECTION = "x11/applications" -DEPENDS = "glib-2.0 gtk+ qt4-x11-free" -DEPENDS_shr += " gd gypsy librsvg-native" +DEPENDS = "glib-2.0 gtk+ qt4-x11-free gd gypsy librsvg-native" RDEPENDS_${PN} = " navit-icons ${PN}-config " -RDEPENDS_append_shr = " fsoraw" +RDEPENDS_${PN}_append_shr = " fsoraw" +RDEPENDS_${PN}-gui-qml = "qt4-plugin-imageformat-svg" RRECOMMENDS_${PN} = "gpsd ${PN}-dbus ${PN}-speech-cmdline ${PN}-gui-internal ${PN}-graphics-gtk" RSUGGESTS_${PN} = "flite espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-qt ${PN}-maptool" diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb index abcbaf7084..6d090356e9 100644 --- a/recipes/navit/navit_svn.bb +++ b/recipes/navit/navit_svn.bb @@ -1,6 +1,6 @@ require navit.inc -SRCREV = "3358" +SRCREV = "3525" PV = "0.1.99+svnr${SRCPV}" PR = "${INC_PR}.9" diff --git a/recipes/ncurses/ncurses_5.7.bb b/recipes/ncurses/ncurses_5.7.bb index 35626854fa..ab029ae309 100644 --- a/recipes/ncurses/ncurses_5.7.bb +++ b/recipes/ncurses/ncurses_5.7.bb @@ -4,15 +4,15 @@ LICENSE = "MIT" SECTION = "libs" PATCHDATE = "20100501" PKGV = "${PV}+${PATCHDATE}" -PR = "r10" +PR = "r11" # recipe is experimental for now... DEFAULT_PREFERENCE = "-99" -DEPENDS = "ncurses-native" -DEPENDS_virtclass-native = "" +DEPENDS = "ncurses-native unifdef-native" +DEPENDS_virtclass-native = "unifdef-native" -inherit autotools binconfig +inherit autotools binconfig test SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz;name=tarball \ ftp://invisible-island.net/ncurses/5.7/ncurses-5.7-20100424-patch.sh.bz2;apply=yes;name=p20100424sh \ @@ -83,6 +83,30 @@ do_compile() { oe_runmake -C widec libs } +# set of expected differences between narrowc and widec header +# +# TODO: the NCURSES_CH_T difference can cause real problems :( +_unifdef_cleanup = " \ + -e '\!/\* \$Id: curses.wide,v!,\!/\* \$Id: curses.tail,v!d' \ + -e '/^#define NCURSES_CH_T /d' \ + -e '/^#include <wchar.h>/d' \ + -e '\!^/\* .* \*/!d' \ +" + +do_test[dirs] = "${S}" +do_test() { + ${ENABLE_WIDEC} || return 0 + + # make sure that the narrow and widec header are compatible + # and differ only in minor details. + unifdef -k narrowc/include/curses.h | \ + sed ${_unifdef_cleanup} > curses-narrowc.h + unifdef -k widec/include/curses.h | \ + sed ${_unifdef_cleanup} > curses-widec.h + + diff curses-narrowc.h curses-widec.h +} + _install_opts = "\ DESTDIR='${D}' \ PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \ @@ -90,12 +114,15 @@ _install_opts = "\ " do_install() { + # Order of installation is important; widec installs a 'curses.h' + # header with more definitions and must be installed last hence. + # Compatibility of these headers will be checked in 'do_test()'. + oe_runmake -C narrowc ${_install_opts} \ + install.data install.progs + ! ${ENABLE_WIDEC} || \ oe_runmake -C widec ${_install_opts} - oe_runmake -C narrowc ${_install_opts} \ - install.data install.progs - cd narrowc diff --git a/recipes/octave/octave_3.2.4.bb b/recipes/octave/octave_3.2.4.bb new file mode 100644 index 0000000000..d2d4d4f7e4 --- /dev/null +++ b/recipes/octave/octave_3.2.4.bb @@ -0,0 +1,28 @@ +DEFAULT_PREFERENCE = "-1" + +require octave.inc + +SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \ +" + +SRC_URI[md5sum] = "90c39fa9e241ad2e978bcee4682a2ba9" +SRC_URI[sha256sum] = "4c0a2cc595dd5218da3144e6599dbaae42a6c2f3188a5e0bc3cc5aaefcfc8fd0" + +PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \ + libcruft-dev liboctave-dev liboctinterp-dev \ + libcruft-dbg liboctave-dbg liboctinterp-dbg" + +FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft.so*" +FILES_libcruft-dbg += "${libdir}/${PN}-${PV}/.debug/libcruft*" + +FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave.so*" +FILES_liboctave-dbg += "${libdir}/${PN}-${PV}/.debug/liboctave*" + +FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp.so*" +FILES_liboctinterp-dbg += "${libdir}/${PN}-${PV}/.debug/liboctinterp*" + +# octave-oct provides subroutines in .oct file format +FILES_${PN}-oct = "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/*.oct" + +FILES_${PN}-dbg += "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug" + diff --git a/recipes/openjdk/openjdk-6-common.inc b/recipes/openjdk/openjdk-6-common.inc index ebabf6885b..4137e30ad0 100644 --- a/recipes/openjdk/openjdk-6-common.inc +++ b/recipes/openjdk/openjdk-6-common.inc @@ -46,9 +46,7 @@ DEPENDS = "giflib libpng jpeg cups \ DEPENDS_append_arm = " qemu-native " -FILESPATHPKG = "openjdk-6-${PV}" - -FILESPATHPKG_append = ":files" +FILESPATHPKG =. "openjdk-6-${PV}:" # No package should directly depend on this (it should require # java2-runtime instead). diff --git a/recipes/openmoko-3rdparty/advancedcaching_git.bb b/recipes/openmoko-3rdparty/advancedcaching_git.bb index fda99b95fe..8301eb73ef 100644 --- a/recipes/openmoko-3rdparty/advancedcaching_git.bb +++ b/recipes/openmoko-3rdparty/advancedcaching_git.bb @@ -2,11 +2,12 @@ DESCRIPTION = "Advanced Geocaching Tool for Linux - Towards paperless geocaching SECTION = "devel/python" PRIORITY = "optional" LICENSE = "GPL" -HOMEPAGE = "http://www.opkg.org/package_268.html" +AUTHOR = "Daniel Fett" +HOMEPAGE = "http://www.danielfett.de/internet-und-opensource,software,agtl" RDEPENDS_${PN} = "python-pygtk python-html python-image python-netclient python-misc python-sqlite3 python-mime python-json" -SRCREV = "9c3661f5573d2dd712437f1590070153d12e4c02" -PV = "0.1.2+gitr${SRCPV}" -PR = "r1" +SRCREV = "45a42994753fb396840890dd756b118790b8989e" +PV = "0.6.1.5+gitr${SRCPV}" +PR = "r2" SRC_URI = "git://github.com/webhamster/advancedcaching.git;protocol=git;branch=master" diff --git a/recipes/pidgin/pidgin_2.7.2.bb b/recipes/pidgin/pidgin_2.7.3.bb index e5229a244a..606e453106 100644 --- a/recipes/pidgin/pidgin_2.7.2.bb +++ b/recipes/pidgin/pidgin_2.7.3.bb @@ -11,8 +11,8 @@ SRC_URI = "\ file://pidgin-cross-python-265.patch \ " -SRC_URI[md5sum] = "c23d85bb6a197dd841d1b5585148327d" -SRC_URI[sha256sum] = "8ab5f126f384197727db8f61306663325c2779c25e54e61ff95366448a0861c0" +SRC_URI[md5sum] = "e4bbadadae85e5e008690b52dd51f102" +SRC_URI[sha256sum] = "8b5788aa7b8c3fa372e6c5f671592731c86e41322bcc09facb6bbe6127e323f2" EXTRA_OECONF += "\ --disable-gtkspell \ diff --git a/recipes/powervr-drivers/omap3-sgx-modules/texture-width.patch b/recipes/powervr-drivers/omap3-sgx-modules/texture-width.patch new file mode 100644 index 0000000000..20a33bc0fc --- /dev/null +++ b/recipes/powervr-drivers/omap3-sgx-modules/texture-width.patch @@ -0,0 +1,11 @@ +--- /tmp/bc_cat.c 2010-08-11 11:36:20.000000000 +0200 ++++ OMAP35x_Graphics_SDK_3_01_00_06/GFX_Linux_KM/services4/3rdparty/bufferclass_ti/bc_cat.c 2010-08-11 11:36:53.000000000 +0200 +@@ -487,7 +487,7 @@ + + /* texture buffer width should be multiple of 8 for OMAP3 ES3.x, + * or 32 for ES2.x */ +- width_align = omap_rev_lt_3_0() ? 32 : 8; ++ width_align = cpu_is_omap3530() && omap_rev_lt_3_0() ? 32 : 8; + + major = register_chrdev(0, DEVNAME, &bc_cat_fops); + diff --git a/recipes/powervr-drivers/omap3-sgx-modules_1.4.14.2616.bb b/recipes/powervr-drivers/omap3-sgx-modules_1.4.14.2616.bb index 202c8e6ef8..0d2818be20 100644 --- a/recipes/powervr-drivers/omap3-sgx-modules_1.4.14.2616.bb +++ b/recipes/powervr-drivers/omap3-sgx-modules_1.4.14.2616.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs" LICENSE = "GPLv2" -PR_append = "b" +PR_append = "c" # download required binary distribution from: # http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/latest/index_FDS.html @@ -15,7 +15,9 @@ IMGPV = "1.4.14.2616" BINFILE := "OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin" SRC_URI = "http://install.source.dir.local/OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin \ + file://texture-width.patch;striplevel=2 \ " + S = "${WORKDIR}/OMAP35x_Graphics_SDK_${SGXPV}/GFX_Linux_KM" inherit module diff --git a/recipes/procps/procps.inc b/recipes/procps/procps.inc index d158f9b8ec..d720310bdb 100644 --- a/recipes/procps/procps.inc +++ b/recipes/procps/procps.inc @@ -7,8 +7,10 @@ SECTION = "base" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "ncurses" +# actually RDEPENDS, but ncurses-terminfo is only in ncurses-5.7, so RRECOMMENDS for now +RRECOMMENDS_${PN} = "ncurses-terminfo" -INC_PR = "r10" +INC_PR = "r11" SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz;name=tarball \ file://sysctl.conf \ diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0009-Disable-demos-affine.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0009-Disable-demos-affine.patch deleted file mode 100644 index c4efddaf7b..0000000000 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0009-Disable-demos-affine.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ab87c21fab1b2bb3e593a27e4a08ba66e689f724 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20G=C3=BCnther?= <matgnt@gmail.com> -Date: Thu, 13 May 2010 20:46:18 +0200 -Subject: [PATCH 9/9] Disable demos/affine - ---- - demos/demos.pro | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/demos/demos.pro b/demos/demos.pro -index a0691bc..082a77d 100644 ---- a/demos/demos.pro -+++ b/demos/demos.pro -@@ -6,7 +6,6 @@ SUBDIRS = \ - demos_deform \ - demos_gradients \ - demos_pathstroke \ -- demos_affine \ - demos_composition \ - demos_books \ - demos_interview \ --- -1.7.0.4 - diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc b/recipes/qt4/qt-4.6.3+4.7.0-beta2.inc index 114f3ae2ea..9c9554c198 100644 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2.inc @@ -69,5 +69,5 @@ do_install_append() { done } -SRC_URI[md5sum] = "1a863712da64dd2c1d08380075b74f39" -SRC_URI[sha256sum] = "32237307496b255bb95abdcd1754885947008a52c76f32c6843744d330f2b7b5" +SRC_URI[md5sum] = "1449443c2d33ab9fefbd37b7104d0cdf" +SRC_URI[sha256sum] = "e0196ee11f683a4ec2e3f85e52ab2f2455886a3bb3b711489176f97ecb9aacbf" diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0001-Added-Openembedded-crossarch-option.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0001-Added-Openembedded-crossarch-option.patch index 71a04a59d2..71a04a59d2 100644 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0001-Added-Openembedded-crossarch-option.patch +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0001-Added-Openembedded-crossarch-option.patch diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0002-Disable-tools-assistant.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0002-Disable-tools-assistant.patch index 1a5da6793b..1a5da6793b 100644 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0002-Disable-tools-assistant.patch +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0002-Disable-tools-assistant.patch diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0003-Disable-examples-designer.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0003-Disable-examples-designer.patch index 51fa4a6d6e..51fa4a6d6e 100644 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0003-Disable-examples-designer.patch +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0003-Disable-examples-designer.patch diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch index cef56ef29b..cef56ef29b 100644 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0005-Disable-examples-help.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0005-Disable-examples-help.patch index 026f2b08e9..026f2b08e9 100644 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0005-Disable-examples-help.patch +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0005-Disable-examples-help.patch diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0006-Disable-demos-browser.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0006-Disable-demos-browser.patch index e863f12749..e863f12749 100644 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0006-Disable-demos-browser.patch +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0006-Disable-demos-browser.patch diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0007-Disable-demos-qtdemos.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0007-Disable-demos-qtdemos.patch index 6bef4c2dba..6bef4c2dba 100644 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0007-Disable-demos-qtdemos.patch +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0007-Disable-demos-qtdemos.patch diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0008-Disable-examples-declarative.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0008-Disable-examples-declarative.patch index 06e15623f7..06e15623f7 100644 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0008-Disable-examples-declarative.patch +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0008-Disable-examples-declarative.patch diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/add.xmlpatterns.lib.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/add.xmlpatterns.lib.patch index 57ba4f169e..1f73f8950f 100644 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/add.xmlpatterns.lib.patch +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/add.xmlpatterns.lib.patch @@ -5,7 +5,7 @@ diff -uNr qt-everywhere-opensource-src-4.7.0-beta1.orig//demos/browser/browser.p TEMPLATE = app TARGET = browser -QT += webkit network mediaservices -+QT += webkit network mediaservices xmlpatterns ++QT += webkit network mediaservices xmlpatterns phonon CONFIG += qt warn_on contains(QT_BUILD_PARTS, tools):!embedded: CONFIG += uitools @@ -16,7 +16,7 @@ diff -uNr qt-everywhere-opensource-src-4.7.0-beta1.orig//examples/xmlpatterns/qo FORMS += forms/mainwindow.ui -QT += xmlpatterns webkit -+QT += xmlpatterns webkit mediaservices ++QT += xmlpatterns webkit mediaservices phonon SOURCES += qobjectxmlmodel.cpp main.cpp mainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp HEADERS += qobjectxmlmodel.h mainwindow.h ../shared/xmlsyntaxhighlighter.h RESOURCES = queries.qrc diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/demos.browser.add.mediaservices.lib.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/demos.browser.add.mediaservices.lib.patch index 27c42dfcec..27c42dfcec 100644 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/demos.browser.add.mediaservices.lib.patch +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/demos.browser.add.mediaservices.lib.patch diff --git a/recipes/qt4/qt4-embedded_4.7.0-beta1.bb b/recipes/qt4/qt4-embedded_4.7.0-beta2.bb index 1dbb4aa4bf..481fabfccb 100644 --- a/recipes/qt4/qt4-embedded_4.7.0-beta1.bb +++ b/recipes/qt4/qt4-embedded_4.7.0-beta2.bb @@ -2,8 +2,8 @@ DEFAULT_PREFERENCE = "-1" require qt4-embedded.inc -SRCVER = "4.7.0-beta1" -PV = "4.6.2+${SRCVER}" +SRCVER = "4.7.0-beta2" +PV = "4.6.3+${SRCVER}" PR = "${INC_PR}.0" QT_CONFIG_FLAGS_append_armv6 = " -no-neon " diff --git a/recipes/qt4/qt4-tools-native-4.6.2+4.7.0-beta1/fix.xlib-test.libs.patch b/recipes/qt4/qt4-tools-native-4.6.3+4.7.0-beta2/fix.xlib-test.libs.patch index d7613033df..d7613033df 100644 --- a/recipes/qt4/qt4-tools-native-4.6.2+4.7.0-beta1/fix.xlib-test.libs.patch +++ b/recipes/qt4/qt4-tools-native-4.6.3+4.7.0-beta2/fix.xlib-test.libs.patch diff --git a/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb b/recipes/qt4/qt4-tools-native_4.7.0-beta2.bb index 62b7863e58..0ebb65f34f 100644 --- a/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb +++ b/recipes/qt4/qt4-tools-native_4.7.0-beta2.bb @@ -3,8 +3,8 @@ DEFAULT_PREFERENCE = "-1" require qt4-tools-native.inc LICENSE = "LGPLv2.1 GPLv3" -SRCVER = "4.7.0-beta1" -PV = "4.6.2+${SRCVER}" +SRCVER = "4.7.0-beta2" +PV = "4.6.3+${SRCVER}" PR = "${INC_PR}.0" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${SRCVER}.tar.gz \ @@ -18,5 +18,5 @@ EXTRA_OECONF += " -no-fast -silent -no-rpath" TOBUILD := "src/tools/bootstrap ${TOBUILD}" -SRC_URI[md5sum] = "1a863712da64dd2c1d08380075b74f39" -SRC_URI[sha256sum] = "32237307496b255bb95abdcd1754885947008a52c76f32c6843744d330f2b7b5" +SRC_URI[md5sum] = "1449443c2d33ab9fefbd37b7104d0cdf" +SRC_URI[sha256sum] = "e0196ee11f683a4ec2e3f85e52ab2f2455886a3bb3b711489176f97ecb9aacbf" diff --git a/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb b/recipes/qt4/qt4-x11-free_4.7.0-beta2.bb index c489a48d59..f38688cccb 100644 --- a/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb +++ b/recipes/qt4/qt4-x11-free_4.7.0-beta2.bb @@ -2,9 +2,9 @@ DEFAULT_PREFERENCE = "-1" require qt4-x11-free.inc -SRCVER = "4.7.0-beta1" -PV = "4.6.2+${SRCVER}" -PR = "${INC_PR}.1" +SRCVER = "4.7.0-beta2" +PV = "4.6.3+${SRCVER}" +PR = "${INC_PR}.0" QT_CONFIG_FLAGS_append_armv6 = " -no-neon " diff --git a/recipes/rygel/rygel_0.6.0.bb b/recipes/rygel/rygel_0.6.0.bb new file mode 100644 index 0000000000..6b322fb370 --- /dev/null +++ b/recipes/rygel/rygel_0.6.0.bb @@ -0,0 +1,20 @@ +inherit gnome vala + +DESCRIPTION = "Collection of DLNA[1] (UPnP[2] AV) devices, implemented through a plug-in mechanism." +SECTION = "network/multimedia" +DEPENDS = "glib-2.0 gupnp gupnp-av gstreamer sqlite3 libsoup-2.4 " +HOMEPAGE = "http://live.gnome.org/Rygel" + +SRC_URI[archive.md5sum] = "037894e84f9b57c32e9bde75ee5b4dbf" +SRC_URI[archive.sha256sum] = "94b0904468c74d0931c95ba0920c5585e96f25cf014dd9756f78d5b6f2e428ca" + +#EXTRA_OECONF = "--enable-vala=no" + +do_configure() { + libtoolize --force + gnu-configize --force + oe_runconf +} + +FILES_${PN} += "${libdir}/rygel-1.0/librygel*.so ${datadir}/dbus-1/" +FILES_${PN}-dbg += "${libdir}/rygel-1.0/.debug/" diff --git a/recipes/shr/elementary-theme-gry_git.bb b/recipes/shr/elementary-theme-gry_git.bb index ff9d0f5b95..fe1e733d7f 100644 --- a/recipes/shr/elementary-theme-gry_git.bb +++ b/recipes/shr/elementary-theme-gry_git.bb @@ -6,7 +6,7 @@ DEPENDS = "edje-native" RRECOMMENDS_${PN} = "e-wm-theme-illume-gry" LICENSE = "unknown" -SRCREV = "722b0dcc2b1bf79515eaaddd9ebc7819c7f923d0" +SRCREV = "7218f7db425111ef32624565c18d6406119e6c6d" PV = "0.8-${EFL_SRCREV}+gitr${SRCPV}" PR = "r2" diff --git a/recipes/squashfs-tools/squashfs-tools-native_3.3.bb b/recipes/squashfs-tools/squashfs-tools-native_3.3.bb deleted file mode 100644 index 1a82323951..0000000000 --- a/recipes/squashfs-tools/squashfs-tools-native_3.3.bb +++ /dev/null @@ -1,10 +0,0 @@ -require squashfs-tools_${PV}.bb -PR = "${INC_PR}.1" - -inherit native - -PACKAGES = "" - -do_stage () { - install -m 0755 mksquashfs ${STAGING_BINDIR}/ -} diff --git a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb deleted file mode 100644 index 17894179f2..0000000000 --- a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -require squashfs-tools_4.0.bb - -inherit native - -DEPENDS = "attr-native zlib-native" - -PACKAGES = "" - -do_stage () { - install -m 0755 mksquashfs ${STAGING_BINDIR}/ -} - diff --git a/recipes/squashfs-tools/squashfs-tools.inc b/recipes/squashfs-tools/squashfs-tools.inc index 44f6a4bc94..ceb02562a3 100644 --- a/recipes/squashfs-tools/squashfs-tools.inc +++ b/recipes/squashfs-tools/squashfs-tools.inc @@ -2,12 +2,15 @@ DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux." SECTION = "base" LICENSE = "GPLv2" DEPENDS = "attr zlib" -INC_PR = "r4" +INC_PR = "r5" S = "${WORKDIR}/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}/squashfs-tools" +BBCLASSEXTEND = "native" +NATIVE_INSTALL_WORKS = "1" + # required to share same place with -lzma specific packages -FILESPATHPKG = "squashfs-tools-${PV}:squashfs-tools:files" +FILESPATHPKG =. "squashfs-tools-${PV}:" SRC_URI ?= "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tar.gz" diff --git a/recipes/squashfs-tools/squashfs-tools_3.3.bb b/recipes/squashfs-tools/squashfs-tools_3.3.bb index 7883ca140d..fd2783f7b4 100644 --- a/recipes/squashfs-tools/squashfs-tools_3.3.bb +++ b/recipes/squashfs-tools/squashfs-tools_3.3.bb @@ -1,4 +1,4 @@ require squashfs-tools.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.0" SRC_URI += " file://Makefile.patch" diff --git a/recipes/squashfs-tools/squashfs-tools_4.0.bb b/recipes/squashfs-tools/squashfs-tools_4.0.bb index cf33c0d163..b476dc43e4 100644 --- a/recipes/squashfs-tools/squashfs-tools_4.0.bb +++ b/recipes/squashfs-tools/squashfs-tools_4.0.bb @@ -6,7 +6,7 @@ SRC_URI = "cvs://anonymous@squashfs.cvs.sourceforge.net/cvsroot/squashfs;module SRC_URI += " file://Makefile.patch" require squashfs-tools.inc -PR = "${INC_PR}.3" +PR = "${INC_PR}.0" S = "${WORKDIR}/squashfs/squashfs-tools" diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index 178bc370db..bdc95c048f 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SHR Feed" -PR = "r64" +PR = "r67" PV = "1.0" LICENSE = "GPL" @@ -297,6 +297,11 @@ RDEPENDS_${PN} += "\ unixbench \ maxima \ xfsprogs \ + xfsdump \ + numberx \ + neomis \ + supertux-qvga \ + wesnoth \ " # this is only usefull on gta02 and on other devices it's trying to pull mesa-dri (not respecting DEFAULT_PROVIDER for virtual/libgl) diff --git a/recipes/tzcode/tzcode-native_2010j.bb b/recipes/tzcode/tzcode-native_2010k.bb index 7e1ae7786c..21796d6f66 100644 --- a/recipes/tzcode/tzcode-native_2010j.bb +++ b/recipes/tzcode/tzcode-native_2010k.bb @@ -6,11 +6,11 @@ require tzcode-native.inc # Also, tzdata (and it is needed to build tzcode) version can differ from # tzcode version, thus this variable -TZDATA_PV = "2010j" +TZDATA_PV = "2010k" -SRC_URI[tzcode-2010j.md5sum] = "5ba8345720296d3a659b349b2052d139" -SRC_URI[tzcode-2010j.sha256sum] = "f32b46405190e3a5f1ee4db9fb50aaf1379e6af4e5493402ebfc8ee757058e97" -SRC_URI[tzdata-2010j.md5sum] = "f668f66b260e14b477eac3f48bcfb5f4" -SRC_URI[tzdata-2010j.sha256sum] = "dcf2101d0c5bb20a7f182866ea3e52b54c8f4d129c025a96c9a31377676f554b" +SRC_URI[tzcode-2010k.md5sum] = "63cd2199679c91bed972a0248d6916af" +SRC_URI[tzcode-2010k.sha256sum] = "96671eac3a98d0c974833c8bfa7ea9b537cc9d32573e902103846b90f6dccdbd" +SRC_URI[tzdata-2010k.md5sum] = "5e2086249d6a6bb116534d358661ad3f" +SRC_URI[tzdata-2010k.sha256sum] = "ef69c99504c0fd9864ba8ef1daae5f2d4df097cf7dc350f09b8f70386272408d" PR = "${INC_PR}.0" diff --git a/recipes/tzdata/tzdata_2010j.bb b/recipes/tzdata/tzdata_2010k.bb index 79b776978b..216ae75d2d 100644 --- a/recipes/tzdata/tzdata_2010j.bb +++ b/recipes/tzdata/tzdata_2010k.bb @@ -6,5 +6,5 @@ require tzdata.inc PR = "${INC_PR}.0" -SRC_URI[tar.md5sum] = "f668f66b260e14b477eac3f48bcfb5f4" -SRC_URI[tar.sha256sum] = "dcf2101d0c5bb20a7f182866ea3e52b54c8f4d129c025a96c9a31377676f554b" +SRC_URI[tar.md5sum] = "5e2086249d6a6bb116534d358661ad3f" +SRC_URI[tar.sha256sum] = "ef69c99504c0fd9864ba8ef1daae5f2d4df097cf7dc350f09b8f70386272408d" diff --git a/recipes/u-boot/u-boot-git/beagleboard/0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch b/recipes/u-boot/u-boot-git/beagleboard/0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch index 03da8ce662..e5dbec62fc 100644 --- a/recipes/u-boot/u-boot-git/beagleboard/0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch +++ b/recipes/u-boot/u-boot-git/beagleboard/0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch @@ -726,9 +726,9 @@ index 73063ec..2045e4e 100644 +per_36x_dpll_param: +/* SYSCLK M N M2 M3 M4 M5 M6 m2DIV */ +.word 12000, 360, 4, 9, 16, 5, 4, 3, 1 -+.word 13000, 1728, 12, 9, 32, 18, 8, 6, 2 ++.word 13000, 864, 12, 9, 16, 9, 4, 3, 1 +.word 19200, 360, 7, 9, 16, 5, 4, 3, 1 -+.word 26000, 1728, 12, 9, 32, 18, 8, 6, 2 ++.word 26000, 432, 12, 9, 16, 9, 4, 3, 1 +.word 38400, 360, 15, 9, 16, 5, 4, 3, 1 + +.globl get_36x_mpu_dpll_param diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index ed2ee9265b..7f26a87114 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -1,5 +1,5 @@ require u-boot.inc -PR ="r62" +PR ="r63" FILESPATHPKG =. "u-boot-git:" diff --git a/recipes/upnp/gupnp-av_0.5.9.bb b/recipes/upnp/gupnp-av_0.5.9.bb new file mode 100644 index 0000000000..14763aed1c --- /dev/null +++ b/recipes/upnp/gupnp-av_0.5.9.bb @@ -0,0 +1,9 @@ +LICENSE = "LGPL" +DEPENDS = "gupnp" + +SRC_URI = "http://gupnp.org/sites/all/files/sources/gupnp-av-${PV}.tar.gz \ +" +SRC_URI[md5sum] = "5940df3c1152894685c3fc38ee95fd78" +SRC_URI[sha256sum] = "a909129997f79dcb6d35221ce205854d64c47a7390843e420cfba753485087bd" + +inherit autotools pkgconfig diff --git a/recipes/upnp/gupnp_0.13.4.bb b/recipes/upnp/gupnp_0.13.4.bb new file mode 100644 index 0000000000..01e9fca6fe --- /dev/null +++ b/recipes/upnp/gupnp_0.13.4.bb @@ -0,0 +1,27 @@ +LICENSE = "LGPL" +DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2 gtk-doc-native libgee" + +SRC_URI = "http://gupnp.org/sites/all/files/sources/gupnp-${PV}.tar.gz \ +" +SRC_URI[md5sum] = "0d562f5f02534c70c3743b2c514db8ba" +SRC_URI[sha256sum] = "7974953f38a41236c875c3df509abc43e8218b5925fdc18212a73b1ae0d0e7e8" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-gtk-doc" + +do_configure() { + libtoolize --force + gnu-configize --force + oe_runconf +} + +FILES_${PN} = "${libdir}/*.so.*" +FILES_${PN}-dev += "${bindir}/gupnp-binding-tool" + +ROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess" + +gupnp_sysroot_preprocess () { + install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/ + install -m 755 ${D}${bindir}/gupnp-binding-tool ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/ +} diff --git a/recipes/urjtag/urjtag_git.bb b/recipes/urjtag/urjtag_git.bb new file mode 100644 index 0000000000..1159c1fc6f --- /dev/null +++ b/recipes/urjtag/urjtag_git.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "UrJTAG is a universal JTAG library, servers and tools" +HOMEPAGE = "http://urjtag.org/" +LICENSE = "GPLv2" +DEPENDS = "libftdi libusb gettext readline" + +SRCREV = "fc8686b8dd545f54d25e77f65e43f4d774bc46" + +PV = "0.10" +PR = "r0" +PR_append = "+gitr${SRCPV}" + +S = "${WORKDIR}/git/urjtag" + +SRC_URI = "git://urjtag.git.sourceforge.net/gitroot/urjtag/urjtag;protocol=git;branch=master \ + " +inherit autotools + +# no idea why -s would make a difference but without it configure fails. +# guess the symlink is created before the actual content is there +EXTRA_AUTORECONF = "-s" + +do_install () { + oe_runmake DESTDIR=${D} MKINSTALLDIRS="${S}/tools/mkinstalldirs" install +} diff --git a/recipes/xfsprogs/xfsdump_3.0.4.bb b/recipes/xfsprogs/xfsdump_3.0.4.bb new file mode 100644 index 0000000000..46a3d74116 --- /dev/null +++ b/recipes/xfsprogs/xfsdump_3.0.4.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "XFS Filesystem Dump Utility" +HOMEPAGE = "http://oss.sgi.com/projects/xfs" +LICENSE = "GPL" +SECTION = "base" +DEPENDS = "xfsprogs" + +SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz" +SRC_URI[md5sum] = "af6932cfcd95ce64dc583128a190ffd7" +SRC_URI[sha256sum] = "d3932f0d482f6f77ec8519ce24c00edbe006262751bfb4ad4b4bc3e219d807d1" + +PARALLEL_MAKE = "" +inherit autotools +EXTRA_OECONF = "--enable-gettext=no" +TARGET_CC_ARCH += "${LDFLAGS}" + + +do_configure () { + export LIBTOOL="${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool" + export DEBUG="-DNDEBUG" + oe_runconf +} + +do_install () { + export DIST_ROOT=${D} + oe_runmake install +} + diff --git a/recipes/xfsprogs/xfsprogs_3.1.2.bb b/recipes/xfsprogs/xfsprogs_3.1.2.bb index 736d458ec5..832d5ab727 100644 --- a/recipes/xfsprogs/xfsprogs_3.1.2.bb +++ b/recipes/xfsprogs/xfsprogs_3.1.2.bb @@ -3,6 +3,7 @@ HOMEPAGE = "http://oss.sgi.com/projects/xfs" LICENSE = "GPL" SECTION = "base" DEPENDS = "util-linux-ng" +PR = "r1" SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz" SRC_URI[md5sum] = "86d10178ee6897cb099c97303e6d9da0" @@ -13,6 +14,8 @@ inherit autotools EXTRA_OECONF = "--enable-gettext=no" TARGET_CC_ARCH += "${LDFLAGS}" +FILES_${PN}-dev += "${base_libdir}/libhandle.la \ + ${base_libdir}/libhandle.so" do_configure () { export LIBTOOL="${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool" @@ -23,5 +26,16 @@ do_configure () { do_install () { export DIST_ROOT=${D} oe_runmake install + # needed for xfsdump + oe_runmake install-dev + # replace extra links to /usr/lib with relative links (otherwise autotools_prepackage_lamangler fails to read nonexistent link) + rm -f ${D}/${base_libdir}/libhandle.la + rm -f ${D}/${base_libdir}/libhandle.a + ln -s ../usr/lib/libhandle.la ${D}/${base_libdir}/libhandle.la + ln -s ../usr/lib/libhandle.a ${D}/${base_libdir}/libhandle.a + + # and link from /usr/lib/libhandle.so to /lib/libhandle.so + rm -f ${D}/${libdir}/libhandle.so + ln -s ../../lib/libhandle.a ${D}/${libdir}/libhandle.so } diff --git a/recipes/xorg-app/xditview_1.0.2.bb b/recipes/xorg-app/xditview_1.0.2.bb new file mode 100644 index 0000000000..9a9f20a36d --- /dev/null +++ b/recipes/xorg-app/xditview_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +DEPENDS += " libxaw libxt" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "dbf480019b75377154b6976726809bba" +SRC_URI[archive.sha256sum] = "e5d02b60a8f383a20c44cc7d718455075344fb37d171b0397b84f1cc8d49e776" diff --git a/recipes/xorg-app/xset_1.2.0.bb b/recipes/xorg-app/xset_1.2.0.bb new file mode 100644 index 0000000000..beae9e51c9 --- /dev/null +++ b/recipes/xorg-app/xset_1.2.0.bb @@ -0,0 +1,14 @@ +require xorg-app-common.inc +DESCRIPTION = "user preference utility for X" +LICENSE = "MIT" +DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI += "file://disable-xkb.patch" +SRC_URI[archive.md5sum] = "88ff2d390695366fa53e5d746fe86ad5" +SRC_URI[archive.sha256sum] = "f038dd98a1508ee9467946fa5d69cc6d758cd709f656a704d7a9c824eecc1bfd" + +EXTRA_OECONF = "--disable-xkb" + +CFLAGS += "-D_GNU_SOURCE" diff --git a/recipes/xorg-driver/xf86-input-aiptek_1.3.1.bb b/recipes/xorg-driver/xf86-input-aiptek_1.3.1.bb new file mode 100644 index 0000000000..adeb859832 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-aiptek_1.3.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-input.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "86dbf173283b53c6402618f42adc4441" +SRC_URI[archive.sha256sum] = "43594db310572cfe81383d53934c373638e8be57dc01b34573b4183d0ef1eb9a" diff --git a/recipes/xorg-driver/xf86-input-synaptics_1.2.99.1.bb b/recipes/xorg-driver/xf86-input-synaptics_1.2.99.1.bb new file mode 100644 index 0000000000..62ee0d29cd --- /dev/null +++ b/recipes/xorg-driver/xf86-input-synaptics_1.2.99.1.bb @@ -0,0 +1,7 @@ +require xorg-driver-input.inc +DESCRIPTION = "X.Org X server -- mouse input driver" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "356b88de59d77fde2936f41239dca89c" +SRC_URI[archive.sha256sum] = "771b82f0d2691e1ae87e712e0532b3667d62663f6f9ed8f56c303a7c64a47492" diff --git a/recipes/xorg-driver/xf86-input-vmmouse_12.6.10.bb b/recipes/xorg-driver/xf86-input-vmmouse_12.6.10.bb new file mode 100644 index 0000000000..edf61b3ebb --- /dev/null +++ b/recipes/xorg-driver/xf86-input-vmmouse_12.6.10.bb @@ -0,0 +1,9 @@ +require xorg-driver-input.inc +DESCRIPTION = "X.Org X server -- VMMouse input driver to use with VMWare" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "49c6e77851e9f7bc5cb7d85f061992f8" +SRC_URI[archive.sha256sum] = "a6369d5a860627f2a38842d5563045b263a459e534f6ae08df48f330f9a40910" + +COMPATIBLE_HOST = "i.86.*-linux" diff --git a/recipes/xorg-driver/xf86-video-ast_0.91.10.bb b/recipes/xorg-driver/xf86-video-ast_0.91.10.bb new file mode 100644 index 0000000000..1f55ce4720 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-ast_0.91.10.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "65da53af3ebd1685149b6145976fdb2d" +SRC_URI[archive.sha256sum] = "7e1b1490f894677f616c0215a7d5fb7d6c5355ce393cf5dc9c9ab4b635b8cc15" diff --git a/recipes/xorg-driver/xf86-video-i128_1.3.4.bb b/recipes/xorg-driver/xf86-video-i128_1.3.4.bb new file mode 100644 index 0000000000..f7bbe1b2e2 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-i128_1.3.4.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +DESCRIPTION = "X.Org X server -- i128 display driver" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "103316abb2dc466219c027afc5a71691" +SRC_URI[archive.sha256sum] = "b69b13a7fd69f5ad35119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf" diff --git a/recipes/xorg-driver/xf86-video-vmware_11.0.2.bb b/recipes/xorg-driver/xf86-video-vmware_11.0.2.bb new file mode 100644 index 0000000000..3b1a18696d --- /dev/null +++ b/recipes/xorg-driver/xf86-video-vmware_11.0.2.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "00c3a70870abcda5f340497b0285dab1" +SRC_URI[archive.sha256sum] = "eab19da564b9488423424722fc84309fba2c10f1b90c092bf993f80c59f475d2" diff --git a/recipes/xorg-driver/xf86-video-xgi_1.6.0.bb b/recipes/xorg-driver/xf86-video-xgi_1.6.0.bb new file mode 100644 index 0000000000..39a4b70733 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-xgi_1.6.0.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "b4ac771ae81b52fca9b6fa68006a258a" +SRC_URI[archive.sha256sum] = "e83406eb5c2b0d5eae208164544883a31af7842710fafb27d765c61b8a4a9417" diff --git a/recipes/xorg-driver/xf86-video-xgixp_1.8.0.bb b/recipes/xorg-driver/xf86-video-xgixp_1.8.0.bb new file mode 100644 index 0000000000..80a3633c58 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-xgixp_1.8.0.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "0ebf98f1beaf911a242c79647cc08fbf" +SRC_URI[archive.sha256sum] = "3aa66d6dcc44302a91c7c829e15cd7b09176164476f5cb65dda190e1862ed71a" diff --git a/recipes/xorg-lib/libx11-1.3.5/dolt-fix.patch b/recipes/xorg-lib/libx11-1.3.5/dolt-fix.patch new file mode 100644 index 0000000000..7e96075aa3 --- /dev/null +++ b/recipes/xorg-lib/libx11-1.3.5/dolt-fix.patch @@ -0,0 +1,22 @@ +Index: libX11-1.3.4/m4/dolt.m4 +=================================================================== +--- libX11-1.3.4/m4/dolt.m4 ++++ libX11-1.3.4/m4/dolt.m4 +@@ -155,7 +155,7 @@ dnl without '=', because automake does n + cat <<__DOLTLIBTOOL__EOF__ > doltlibtool + #!$DOLT_BASH + __DOLTLIBTOOL__EOF__ +- cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool ++ cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool + top_builddir_slash="${0%%doltlibtool}" + : ${top_builddir_slash:=./} + args=() +@@ -171,7 +171,7 @@ done + if $modeok && $tagok ; then + . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}" + else +- exec ${top_builddir_slash}libtool "$[]@" ++ exec ${top_builddir_slash}@host_alias@-libtool "$[]@" + fi + __DOLTLIBTOOL__EOF__ + diff --git a/recipes/xorg-lib/libx11-1.3.5/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.3.5/keysymdef_include.patch new file mode 100644 index 0000000000..0cab165f74 --- /dev/null +++ b/recipes/xorg-lib/libx11-1.3.5/keysymdef_include.patch @@ -0,0 +1,21 @@ +Index: libX11-1.3.4/configure.ac +=================================================================== +--- libX11-1.3.4.orig/configure.ac ++++ libX11-1.3.4/configure.ac +@@ -355,8 +355,14 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, + # Find keysymdef.h + # + AC_MSG_CHECKING([keysymdef.h]) +-dir=`$PKG_CONFIG --variable=includedir xproto` +-KEYSYMDEF="$dir/X11/keysymdef.h" ++AC_ARG_WITH(keysymdef, ++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), ++ KEYSYMDEF=$withval, KEYSYMDEF="") ++ ++if test x$KEYSYMDEF = x; then ++ dir=`${PKG_CONFIG} --variable=includedir xproto` ++ KEYSYMDEF="$dir/X11/keysymdef.h" ++fi + if test -f "$KEYSYMDEF"; then + AC_MSG_RESULT([$KEYSYMDEF]) + else diff --git a/recipes/xorg-lib/libx11-1.3.5/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.3.5/x11_disable_makekeys.patch new file mode 100644 index 0000000000..9763313975 --- /dev/null +++ b/recipes/xorg-lib/libx11-1.3.5/x11_disable_makekeys.patch @@ -0,0 +1,29 @@ +Index: libX11-1.3.4/src/util/Makefile.am +=================================================================== +--- libX11-1.3.4.orig/src/util/Makefile.am ++++ libX11-1.3.4/src/util/Makefile.am +@@ -1,24 +1 @@ +- +-noinst_PROGRAMS=makekeys +- +-makekeys_CFLAGS = \ +- $(X11_CFLAGS) \ +- $(CWARNFLAGS) +- +-CC = @CC_FOR_BUILD@ +-CPPFLAGS = @CPPFLAGS_FOR_BUILD@ +-CFLAGS = @CFLAGS_FOR_BUILD@ +-LDFLAGS = @LDFLAGS_FOR_BUILD@ +- + EXTRA_DIST = mkks.sh +- +-if LINT +-# Check source code with tools like lint & sparse +- +-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) +- +-lint: +- $(LINT) $(ALL_LINT_FLAGS) makekeys.c +- +-endif LINT diff --git a/recipes/xorg-lib/libx11_1.3.2.bb b/recipes/xorg-lib/libx11_1.3.2.bb index 8d8611f255..0446674c99 100644 --- a/recipes/xorg-lib/libx11_1.3.2.bb +++ b/recipes/xorg-lib/libx11_1.3.2.bb @@ -1,6 +1,10 @@ require libx11.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" +# gcc 4.5 ends up ICEing with thumb and -O1 with -fno-omit-framepointer +# therefore if we are in thumb mode then we use -Os instead of -O1 for +# DEBUG_OPTIMIZATION +DEBUG_OPTIMIZATION_thumb_append = " -Os" SRC_URI += " file://dolt-fix.patch" SRC_URI[archive.md5sum] = "001d780829f936e34851ef7cd37b4dfd" SRC_URI[archive.sha256sum] = "4def4d5c9fce85d690f1f29d675154594acdea3d3fe792d0cb513732c7b4bcb2" diff --git a/recipes/xorg-lib/libx11_1.3.5.bb b/recipes/xorg-lib/libx11_1.3.5.bb new file mode 100644 index 0000000000..8c61aa756d --- /dev/null +++ b/recipes/xorg-lib/libx11_1.3.5.bb @@ -0,0 +1,6 @@ +require libx11.inc +PR = "${INC_PR}.0" + +SRC_URI += " file://dolt-fix.patch" +SRC_URI[archive.md5sum] = "a1175b6667fcb249c6f1d725965944e3" +SRC_URI[archive.sha256sum] = "c95a3e3b5c7d45f933f922bdf6c757640f1c370369e85130bb75a9810dc6ede6" diff --git a/recipes/xorg-proto/glproto_1.4.12.bb b/recipes/xorg-proto/glproto_1.4.12.bb new file mode 100644 index 0000000000..40b0f38dc8 --- /dev/null +++ b/recipes/xorg-proto/glproto_1.4.12.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "55edc5ff2efb734215c868f72f7cf27e" +SRC_URI[archive.sha256sum] = "48be7a9d190b600210e5ad08b4e8862a6b08e72dc52dbdf324716a888eb457de" diff --git a/recipes/xorg-proto/kbproto_1.0.5.bb b/recipes/xorg-proto/kbproto_1.0.5.bb new file mode 100644 index 0000000000..1d62aaf36f --- /dev/null +++ b/recipes/xorg-proto/kbproto_1.0.5.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "e7edb59a3f54af15f749e8f3e314ee62" +SRC_URI[archive.sha256sum] = "0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d" + +BBCLASSEXTEND = "native nativesdk sdk" diff --git a/recipes/xorg-proto/renderproto_0.11.1.bb b/recipes/xorg-proto/renderproto_0.11.1.bb new file mode 100644 index 0000000000..466333cb99 --- /dev/null +++ b/recipes/xorg-proto/renderproto_0.11.1.bb @@ -0,0 +1,10 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "a914ccc1de66ddeb4b611c6b0686e274" +SRC_URI[archive.sha256sum] = "06735a5b92b20759204e4751ecd6064a2ad8a6246bb65b3078b862a00def2537" + +BBCLASSEXTEND = "native nativesdk sdk" + +CONFLICTS = "renderext" diff --git a/recipes/xorg-proto/videoproto_2.3.1.bb b/recipes/xorg-proto/videoproto_2.3.1.bb new file mode 100644 index 0000000000..5175e619e5 --- /dev/null +++ b/recipes/xorg-proto/videoproto_2.3.1.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "c3b348c6e2031b72b11ae63fc7f805c2" +SRC_URI[archive.sha256sum] = "3ec76d24931d1e08c6c8d0b89a25e32dc44bc8f87d1dcb3fe201e3c99f89635a" diff --git a/recipes/xorg-proto/xextproto_7.1.2.bb b/recipes/xorg-proto/xextproto_7.1.2.bb new file mode 100644 index 0000000000..4e5cccd71d --- /dev/null +++ b/recipes/xorg-proto/xextproto_7.1.2.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "263ae968b223c23b2986603d84e5c30e" +SRC_URI[archive.sha256sum] = "f6f829e112c8eca7c2f10b2193e8d927b9b7722283d647cfd2aea09758159199" + +BBCLASSEXTEND = "native nativesdk sdk" diff --git a/recipes/xorg-proto/xproto_7.0.18.bb b/recipes/xorg-proto/xproto_7.0.18.bb new file mode 100644 index 0000000000..ebded45646 --- /dev/null +++ b/recipes/xorg-proto/xproto_7.0.18.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "6b8a34b274c6fceaffe57c579db826b9" +SRC_URI[archive.sha256sum] = "b8efe0e75ca4ce3a56c9143e360c4f5b20750f4275e8fffbc015ed5e3a17c96a" + +BBCLASSEXTEND = "native nativesdk sdk" diff --git a/recipes/xorg-xserver/xserver-xorg_git.bb b/recipes/xorg-xserver/xserver-xorg_git.bb index 9dd71eda89..46b0e0818a 100644 --- a/recipes/xorg-xserver/xserver-xorg_git.bb +++ b/recipes/xorg-xserver/xserver-xorg_git.bb @@ -10,7 +10,7 @@ PE = "2" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_shr = "1" -SRCREV = "7e0575baf14ec4a89492fd2780f9ab5b9244afbd" +SRCREV = "6dae7f3792611aace1df0cca63bf50c50d93de43" SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=master \ file://dolt-fix-1.7.0.patch \ file://randr-support-1.7.0.patch \ diff --git a/recipes/zeroconf/zeroconf-0.6.1/busybox.patch b/recipes/zeroconf/zeroconf-0.6.1/busybox.patch deleted file mode 100644 index 1c695612ad..0000000000 --- a/recipes/zeroconf/zeroconf-0.6.1/busybox.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- zeroconf-0.6.1/zeroconf.sh.orig 2005-08-27 21:25:07 +0200 -+++ zeroconf-0.6.1/zeroconf.sh 2005-08-27 21:26:21 +0200 -@@ -30,7 +30,9 @@ - - remove_linklocal_addrs() - { -- ip addr show $IFACE | grep "inet.*169.254" | cut -d" " -f6 | xargs --replace -n 1 ip addr del {} dev $IFACE -+ for IP in `ip addr show $IFACE | grep "inet.*169.254" | cut -d" " -f6`; do -+ ip addr delete $IP dev $IFACE -+ done - } - - case $PHASE in diff --git a/recipes/zeroconf/zeroconf-0.6.1/debian-zeroconf.patch b/recipes/zeroconf/zeroconf-0.6.1/debian-zeroconf.patch deleted file mode 100644 index 6c4008bc56..0000000000 --- a/recipes/zeroconf/zeroconf-0.6.1/debian-zeroconf.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- zeroconf-0.6.1.orig/debian-zeroconf -+++ zeroconf-0.6.1/debian-zeroconf -@@ -19,6 +19,8 @@ - [ -f /etc/default/zeroconf ] && - . /etc/default/zeroconf - -+[ -n "$DISABLE" ] && exit 0 -+ - for BLACK in $IFBLACKLIST; do - case $IFACE in - $BLACK) -@@ -31,7 +33,6 @@ - if [ -n "$FALLBACK" ]; then - /bin/ip addr show $IFACE scope global | grep -q "inet" - IP=$? -- [ $IP -eq 0 ] && exit 0 - if [ $IP -eq 0 ]; then - /bin/ip route add 169.254.0.0/16 dev $IFACE - exit 0 -@@ -39,6 +40,6 @@ - fi - - # otherwise, we are good to go --/usr/local/sbin/zeroconf -i $IFACE -+/usr/sbin/zeroconf -i $IFACE - - exit 0 - diff --git a/recipes/zeroconf/files/debian-zeroconf b/recipes/zeroconf/zeroconf-0.9/debian-zeroconf index c3705d2788..c3705d2788 100644 --- a/recipes/zeroconf/files/debian-zeroconf +++ b/recipes/zeroconf/zeroconf-0.9/debian-zeroconf diff --git a/recipes/zeroconf/files/zeroconf-default b/recipes/zeroconf/zeroconf-0.9/zeroconf-default index cc07b275f1..cc07b275f1 100644 --- a/recipes/zeroconf/files/zeroconf-default +++ b/recipes/zeroconf/zeroconf-0.9/zeroconf-default diff --git a/recipes/zeroconf/files/zeroconf-ldflags.patch b/recipes/zeroconf/zeroconf-0.9/zeroconf-ldflags.patch index ba6056953e..ba6056953e 100644 --- a/recipes/zeroconf/files/zeroconf-ldflags.patch +++ b/recipes/zeroconf/zeroconf-0.9/zeroconf-ldflags.patch diff --git a/recipes/zeroconf/files/zeroconf-limits.h.patch b/recipes/zeroconf/zeroconf-0.9/zeroconf-limits.h.patch index 46ba208fa5..46ba208fa5 100644 --- a/recipes/zeroconf/files/zeroconf-limits.h.patch +++ b/recipes/zeroconf/zeroconf-0.9/zeroconf-limits.h.patch diff --git a/recipes/zeroconf/zeroconf_0.6.1.bb b/recipes/zeroconf/zeroconf_0.6.1.bb deleted file mode 100644 index 093cf3067e..0000000000 --- a/recipes/zeroconf/zeroconf_0.6.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "IPv4 link-local address allocator" -HOMEPAGE = "http://www.progsoc.org/~wildfire/zeroconf/" -LICENSE = "GPL" -SECTION = "net" -PRIORITY = "optional" - -PR = "r0" - -SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${PN}-${PV}.tar.gz \ - file://debian-zeroconf.patch \ - file://busybox.patch \ - file://zeroconf-default" - -do_install () { - install -d ${D}${sbindir} - install -d ${D}${sysconfdir}/network/if-up.d - install -d ${D}${sysconfdir}/default - install -c -m 755 ${S}/zeroconf ${D}${sbindir}/zeroconf - install -c -m 755 ${S}/zeroconf.sh ${D}${sysconfdir}/zeroconf - install -c -m 755 ${S}/debian-zeroconf ${D}${sysconfdir}/network/if-up.d/zeroconf - install -c ${WORKDIR}/zeroconf-default ${D}${sysconfdir}/default/zeroconf -} - -SRC_URI[md5sum] = "31ac40fdaf24b3e666ed83c1320dd7a5" -SRC_URI[sha256sum] = "3e93416ad44202c2952a1342dad12f2ad0e61dd3f1c59110d9ad8cb1d4c639e5" diff --git a/recipes/zziplib/zziplib_0.10.82.bb b/recipes/zziplib/zziplib_0.10.82.bb deleted file mode 100644 index 12b6b2f516..0000000000 --- a/recipes/zziplib/zziplib_0.10.82.bb +++ /dev/null @@ -1,8 +0,0 @@ -require zziplib.inc - -SRC_URI += "file://zziplib-0.10-disable-test.patch" - -PR = "r1" - -SRC_URI[md5sum] = "a6538f6c44ceeed0ed7e8e356f444168" -SRC_URI[sha256sum] = "f684397ce39ec400ba3369521892b7c3a8711d3ef1be59115db9f8d57707bbb8" diff --git a/recipes/zziplib/zziplib_0.12.83.bb b/recipes/zziplib/zziplib_0.12.83.bb deleted file mode 100644 index 7cb4c48cc8..0000000000 --- a/recipes/zziplib/zziplib_0.12.83.bb +++ /dev/null @@ -1,7 +0,0 @@ -require zziplib.inc - -SRC_URI += "file://zziplib-buildfix.patch" - - -SRC_URI[md5sum] = "4943ab7aa141af2c339266cd66b05c74" -SRC_URI[sha256sum] = "5cc1a53bb909922596bdd0fa967b654fe1bfbe0dcf1d34608f0b7c90e0c27867" |