diff options
180 files changed, 4709 insertions, 805 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 33546e0eb6..3c555751da 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -15,6 +15,10 @@ def autotools_dep_prepend(d): if not pn in ['libtool', 'libtool-native', 'libtool-cross']: deps += 'libtool-native ' + if not bb.data.inherits_class('native', d) \ + and not bb.data.inherits_class('cross', d) \ + and not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, 1): + deps += 'libtool-cross ' return deps + 'gnu-config-native ' diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass index 0f68e6812b..855a72a2f7 100644 --- a/classes/gtk-icon-cache.bbclass +++ b/classes/gtk-icon-cache.bbclass @@ -1,4 +1,5 @@ FILES_${PN} += "${datadir}/icons/hicolor" +RDEPENDS += " hicolor-icon-theme " gtk-icon-cache_postinst() { if [ "x$D" != "x" ]; then diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 385db31784..9f243c8c9a 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -273,7 +273,7 @@ def package_qa_check_arch(path,name,d): target_arch = bb.data.getVar('TARGET_ARCH', d, True) # FIXME: Cross package confuse this check, so just skip them - if bb.data.inherits_class('cross', d): + if bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d): return True # avoid following links to /usr/bin (e.g. on udev builds) diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass index bcabbc79bd..834081fccc 100644 --- a/classes/sdk.bbclass +++ b/classes/sdk.bbclass @@ -20,7 +20,11 @@ prefix = "/usr/local/${SDK_NAME}" exec_prefix = "${prefix}" base_prefix = "${exec_prefix}" -FILES_${PN} = "${prefix}" +PACKAGES =+ "${PN}-dbg" +FILES_${PN} = "${prefix}" +FILES_${PN}-dbg += "${prefix}/bin/.debug \ + ${prefix}/sbin/.debug \ + " diff --git a/conf/checksums.ini b/conf/checksums.ini index d376153cc3..b4e526b61b 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -11889,3 +11889,7 @@ sha256=b0e00a7c164711512549d3ad82707c53a20fd978c2448ec22d2ea76df1954eee [ftp://ftp.gnu.org/gnu/gperf/gperf-3.0.3.tar.gz] md5=cc20e58975a38075440423c8fb85fd00 sha256=63287527c8d9e27e801cf0804436f3494bd569db05d49dcdd2a942ae72fa9055 + +[ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz] +md5=6243f7a19e03e05403ce84e597510d4c +sha256=5135e8d69d6206d320515df7aeee7027711ab1aef9d8dbf29571a97a9746b041 diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 9c3274e58f..febfea2e26 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -5,6 +5,7 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" PREFERRED_PROVIDER_virtual/libintl ?= "gettext" USE_NLS ?= "no" +USE_NLS_glib-2.0 = "yes" TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" diff --git a/packages/altboot/altboot_1.0.5.bb b/packages/altboot/altboot_1.0.5.bb index 15850e5bdc..094a6de3ff 100644 --- a/packages/altboot/altboot_1.0.5.bb +++ b/packages/altboot/altboot_1.0.5.bb @@ -12,7 +12,7 @@ LICENSE = "GPL" ###################################################################################### -PR = "r0" +PR = "r1" ###################################################################################### @@ -20,7 +20,7 @@ PACKAGE_ARCH = "${MACHINE}" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}" -SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};proto=svn" +SRC_URI = "svn://hentges.net/public/altboot/tags/;module=${TAG};proto=svn" S = "${WORKDIR}/${TAG}/" @@ -33,7 +33,7 @@ do_install() { install -d ${D}/etc/altboot.rc install -d ${D}/usr/share/doc/altboot - if test -d ${WORKDIR}/altboot/${MACHINE} + if test -d ${S}/${MACHINE} then install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc else diff --git a/packages/altboot/altboot_1.0.8.bb b/packages/altboot/altboot_1.0.8.bb index 9544e6b5ac..16dace6a22 100644 --- a/packages/altboot/altboot_1.0.8.bb +++ b/packages/altboot/altboot_1.0.8.bb @@ -22,7 +22,7 @@ RDEPENDS_${PN}-conf = "${PN}" ###################################################################################### -PR = "r1" +PR = "r2" ###################################################################################### @@ -34,7 +34,7 @@ PACKAGE_ARCH_${PN}-conf = "${MACHINE}" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}" -SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};proto=svn" +SRC_URI = "svn://hentges.net/public/altboot/tags/;module=${TAG};proto=svn" S = "${WORKDIR}/${TAG}/" diff --git a/packages/altboot/altboot_1.1.1+wip-20061123.bb b/packages/altboot/altboot_1.1.1+wip-20061123.bb index bc96c670e9..1745273209 100644 --- a/packages/altboot/altboot_1.1.1+wip-20061123.bb +++ b/packages/altboot/altboot_1.1.1+wip-20061123.bb @@ -26,7 +26,7 @@ RDEPENDS_${PN}-conf = "${PN}" WIP_DATE = "20061123" PV = "1.1.1+wip-${WIP_DATE}" -PR = "r0" +PR = "r1" ###################################################################################### @@ -38,7 +38,7 @@ PACKAGE_ARCH_${PN}-conf = "${MACHINE}" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-').replace('+', '-')}" -SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=2" +SRC_URI = "svn://hentges.net/public/altboot/tags/;module=${TAG};rev=2" S = "${WORKDIR}/${TAG}/" diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR30.bb b/packages/altboot/altboot_1.1.1+wip-SVNR48.bb index b3ccb70497..244b8950aa 100644 --- a/packages/altboot/altboot_1.1.1+wip-SVNR30.bb +++ b/packages/altboot/altboot_1.1.1+wip-SVNR48.bb @@ -15,7 +15,7 @@ LICENSE = "GPL" RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" RRECOMMENDS_${PN}_append_akita = " kexec-tools" -RRECOMMENDS_${PN}_append_spitz = " kexec-tools" +RRECOMMENDS_${PN}_append_spitz = " kexec-tools kernel-module-jffs2" RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" RDEPENDS_${PN} = "${PN}-conf" @@ -23,8 +23,8 @@ RDEPENDS_${PN}-conf = "${PN}" ###################################################################################### -SVN_REV = "30" -PR = "r1" +SVN_REV = "48" +PR = "r0" ###################################################################################### diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb index 1c43be8fd8..6de92bf420 100644 --- a/packages/altboot/altboot_svn.bb +++ b/packages/altboot/altboot_svn.bb @@ -15,7 +15,7 @@ LICENSE = "GPL" RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools" RRECOMMENDS_${PN}_append_akita = " kexec-tools" -RRECOMMENDS_${PN}_append_spitz = " kexec-tools" +RRECOMMENDS_${PN}_append_spitz = " kexec-tools kernel-module-jffs2" RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools" RDEPENDS_${PN} = "${PN}-conf" @@ -24,7 +24,7 @@ RDEPENDS_${PN}-conf = "${PN}" ###################################################################################### PV = "1.1.1+wip-${SRCDATE}" -PR = "r1" +PR = "r2" ###################################################################################### @@ -34,7 +34,7 @@ PACKAGE_ARCH_${PN} = "${MACHINE}" PACKAGE_ARCH_${PN}-doc = "all" PACKAGE_ARCH_${PN}-conf = "${MACHINE}" -SRC_URI = "svn://hentges.net/altboot;module=trunk;proto=svn" +SRC_URI = "svn://hentges.net/public/altboot;module=trunk;proto=svn" S = "${WORKDIR}/trunk/" diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb index 3b20d33a7c..2b285f3b90 100644 --- a/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb +++ b/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb @@ -3,7 +3,7 @@ SECTION = "" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" -# PR = "r0" +PR = "r2" COMPATIBLE_MACHINE = "(ixp4xx|nslu2)" @@ -17,6 +17,13 @@ SRC_URI = "ftp://ftp.buici.com/pub/arm/arm-kernel-shim/arm-kernel-shim-${PV}.tar S = ${WORKDIR}/arm-kernel-shim-${PV}/1.3 +CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" + +CMDLINE_ROOT_DSMG600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw" +CMDLINE_ROOT_NAS100D = "root=/dev/mtdblock2 rootfstype=jffs2 rw" +CMDLINE_ROOT_NSLU2 = "root=/dev/mtdblock4 rootfstype=jffs2 rw" +CMDLINE_ROOT_FSG3 = "root=/dev/mtdblock2 rootfstype=jffs2 rw" + EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" oe_runmake() { @@ -29,6 +36,7 @@ oe_runmake() { sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \ ${WORKDIR}/config-nslu2.h > ${S}/config.h fi + echo "#define COMMANDLINE \"${CMDLINE_CONSOLE} ${CMDLINE_ROOT_NSLU2} ${CMDLINE_DEBUG}\"" >> ${S}/config.h rm -f ${S}/main.o oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 || die "oe_runmake failed" @@ -40,6 +48,7 @@ oe_runmake() { sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \ ${WORKDIR}/config-nas100d.h > ${S}/config.h fi + echo "#define COMMANDLINE \"${CMDLINE_CONSOLE} ${CMDLINE_ROOT_NAS100D} ${CMDLINE_DEBUG}\"" >> ${S}/config.h rm -f ${S}/main.o oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d || die "oe_runmake failed" @@ -51,6 +60,7 @@ oe_runmake() { sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \ ${WORKDIR}/config-dsmg600.h > ${S}/config.h fi + echo "#define COMMANDLINE \"${CMDLINE_CONSOLE} ${CMDLINE_ROOT_DSMG600} ${CMDLINE_DEBUG}\"" >> ${S}/config.h rm -f ${S}/main.o oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 || die "oe_runmake failed" @@ -62,6 +72,7 @@ oe_runmake() { sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \ ${WORKDIR}/config-fsg3.h > ${S}/config.h fi + echo "#define COMMANDLINE \"${CMDLINE_CONSOLE} ${CMDLINE_ROOT_FSG3} ${CMDLINE_DEBUG}\"" >> ${S}/config.h rm -f ${S}/main.o oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 || die "oe_runmake failed" diff --git a/packages/arm-kernel-shim/files/config-dsmg600.h b/packages/arm-kernel-shim/files/config-dsmg600.h index f8caccecd4..c320dc1b3b 100644 --- a/packages/arm-kernel-shim/files/config-dsmg600.h +++ b/packages/arm-kernel-shim/files/config-dsmg600.h @@ -16,25 +16,15 @@ #define PHYS_PARAMS 0x00000100 /* Address for the parameter list */ -//#define RAM_BANK0_START 0x00000000 -//#define RAM_BANK0_LENGTH 0x04000000 - -//#define RAM_BANK1_START 0xd0000000 -//#define RAM_BANK1_LENGTH 0x10000000 - -#define COMMANDLINE \ - "console=ttyS0,115200n8 root=/dev/mtdblock2 rootfstype=jffs2 init=/linuxrc rw noirqdebug" - #define MACH_TYPE 964 /* The DSM-G600 RedBoot sets up the ATAGs correctly */ #define PASSTHROUGH_ATAGS -/* but if the command line passed in is empty, use the default above. */ +/* but if the command line passed in is empty, use the default. */ #define CMDLINE_IF_NONE -/* Uncomment one of these if you need to switch the CPU into a - specific mode. */ +/* Uncomment one of these to switch the CPU into a specific mode. */ //#define FORCE_LITTLEENDIAN //#define FORCE_BIGENDIAN diff --git a/packages/arm-kernel-shim/files/config-fsg3.h b/packages/arm-kernel-shim/files/config-fsg3.h index 08684d708e..fa894e89ac 100644 --- a/packages/arm-kernel-shim/files/config-fsg3.h +++ b/packages/arm-kernel-shim/files/config-fsg3.h @@ -19,16 +19,9 @@ #define RAM_BANK0_START 0x00000000 #define RAM_BANK0_LENGTH 0x04000000 -//#define RAM_BANK1_START 0xd0000000 -//#define RAM_BANK1_LENGTH 0x10000000 - -//#define COMMANDLINE\ -// "console=ttyAMA0 root=/dev/memblk0 rootfstype=jffs" - #define MACH_TYPE 1091 -/* Uncomment one of these if you need to switch the CPU into a - specific mode. */ +/* Uncomment one of these to switch the CPU into a specific mode. */ //#define FORCE_LITTLEENDIAN //#define FORCE_BIGENDIAN diff --git a/packages/arm-kernel-shim/files/config-nas100d.h b/packages/arm-kernel-shim/files/config-nas100d.h index 62c5556999..90f5520e7d 100644 --- a/packages/arm-kernel-shim/files/config-nas100d.h +++ b/packages/arm-kernel-shim/files/config-nas100d.h @@ -19,16 +19,9 @@ #define RAM_BANK0_START 0x00000000 #define RAM_BANK0_LENGTH 0x04000000 -//#define RAM_BANK1_START 0xd0000000 -//#define RAM_BANK1_LENGTH 0x10000000 - -#define COMMANDLINE\ - "console=ttyS0,115200n8 root=/dev/mtdblock2 rootfstype=jffs2 init=/linuxrc rw noirqdebug" - #define MACH_TYPE 865 -/* Uncomment one of these if you need to switch the CPU into a - specific mode. */ +/* Uncomment one of these to switch the CPU into a specific mode. */ //#define FORCE_LITTLEENDIAN //#define FORCE_BIGENDIAN diff --git a/packages/arm-kernel-shim/files/config-nslu2.h b/packages/arm-kernel-shim/files/config-nslu2.h index 2b597c2b7f..73566d061d 100644 --- a/packages/arm-kernel-shim/files/config-nslu2.h +++ b/packages/arm-kernel-shim/files/config-nslu2.h @@ -19,16 +19,9 @@ #define RAM_BANK0_START 0x00000000 #define RAM_BANK0_LENGTH 0x02000000 -//#define RAM_BANK1_START 0xd0000000 -//#define RAM_BANK1_LENGTH 0x10000000 - -#define COMMANDLINE\ - "console=ttyS0,115200n8 root=/dev/mtdblock4 rootfstype=jffs2 init=/linuxrc rw noirqdebug" - #define MACH_TYPE 597 -/* Uncomment one of these if you need to switch the CPU into a - specific mode. */ +/* Uncomment one of these to switch the CPU into a specific mode. */ //#define FORCE_LITTLEENDIAN //#define FORCE_BIGENDIAN diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc index fa2884b98e..f87d4df0d1 100644 --- a/packages/avahi/avahi.inc +++ b/packages/avahi/avahi.inc @@ -4,11 +4,12 @@ HOMEPAGE = "http://avahi.org" SECTION = "network" PRIORITY = "optional" LICENSE = "GPL" -PR="r3" +PR="r4" DEPENDS = "expat libdaemon dbus glib-2.0" RRECOMMENDS = "libnss-mdns" RRECOMMENDS_avahi-daemon = "libnss-mdns" +RDEPENDS_avahi-daemon = "sysvinit-pidof" SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ file://00avahi-autoipd file://99avahi-autoipd" diff --git a/packages/avahi/avahi_0.6.19.bb b/packages/avahi/avahi_0.6.19.bb index 59de20446c..27dcdcffcb 100644 --- a/packages/avahi/avahi_0.6.19.bb +++ b/packages/avahi/avahi_0.6.19.bb @@ -1,3 +1,3 @@ require avahi.inc -PR = "r0" +PR = "r1" diff --git a/packages/base-files/base-files/akita/fstab b/packages/base-files/base-files/akita/fstab index 0b64a3bc80..ba53cd6fd4 100644 --- a/packages/base-files/base-files/akita/fstab +++ b/packages/base-files/base-files/akita/fstab @@ -3,7 +3,7 @@ proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,sync,noauto 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 # SD/MMC in kernel 2.4 diff --git a/packages/base-files/base-files/amsdelta/fstab b/packages/base-files/base-files/amsdelta/fstab index bf87f5f11b..0285a1f7e7 100644 --- a/packages/base-files/base-files/amsdelta/fstab +++ b/packages/base-files/base-files/amsdelta/fstab @@ -1,6 +1,6 @@ /dev/mtdblock4 / jffs2 defaults 1 1 proc /proc proc defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 # we use a non-volatile ramdisk, see /etc/init.d/ramdisk tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/armzone-qt2410/fstab b/packages/base-files/base-files/armzone-qt2410/fstab index d339f800d3..88d057c40d 100644 --- a/packages/base-files/base-files/armzone-qt2410/fstab +++ b/packages/base-files/base-files/armzone-qt2410/fstab @@ -6,7 +6,7 @@ proc /proc proc defaults 0 0 # usb? # Temporary -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 # SD/MMC diff --git a/packages/base-files/base-files/c7x0/fstab b/packages/base-files/base-files/c7x0/fstab index fb37e07aec..03945ca81b 100644 --- a/packages/base-files/base-files/c7x0/fstab +++ b/packages/base-files/base-files/c7x0/fstab @@ -3,7 +3,7 @@ proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,sync,noauto 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 # SD/MMC in kernel 2.4 diff --git a/packages/base-files/base-files/collie/fstab b/packages/base-files/base-files/collie/fstab index ce5bc3bac5..cbb38d1831 100644 --- a/packages/base-files/base-files/collie/fstab +++ b/packages/base-files/base-files/collie/fstab @@ -2,7 +2,7 @@ proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,sync,noauto,noatime,user,exec,suid,gid=100,umask=0002 0 0 /dev/mmcda1 /media/card auto defaults,sync,noauto,noatime,user,exec,suid 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 # we use a non-volatile ramdisk, see /etc/init.d/ramdisk #tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/efika/fstab b/packages/base-files/base-files/efika/fstab index ac92724dbc..8c79a60df9 100644 --- a/packages/base-files/base-files/efika/fstab +++ b/packages/base-files/base-files/efika/fstab @@ -2,4 +2,4 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbfs /proc/bus/usb usbfs auto 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 diff --git a/packages/base-files/base-files/ep93xx/fstab b/packages/base-files/base-files/ep93xx/fstab index ac92724dbc..8c79a60df9 100644 --- a/packages/base-files/base-files/ep93xx/fstab +++ b/packages/base-files/base-files/ep93xx/fstab @@ -2,4 +2,4 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbfs /proc/bus/usb usbfs auto 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 diff --git a/packages/base-files/base-files/epia/fstab b/packages/base-files/base-files/epia/fstab index 70f0b07353..83d673c8b5 100644 --- a/packages/base-files/base-files/epia/fstab +++ b/packages/base-files/base-files/epia/fstab @@ -1,4 +1,4 @@ /dev/ram0 / ext2 rw 1 1 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 proc /proc proc defaults 0 0 tmpfs /tmp tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/fic-gta01/fstab b/packages/base-files/base-files/fic-gta01/fstab index 392422ea6f..2f4a38e703 100644 --- a/packages/base-files/base-files/fic-gta01/fstab +++ b/packages/base-files/base-files/fic-gta01/fstab @@ -7,7 +7,7 @@ proc /proc proc defaults 0 0 # Temporary tmpfs /tmp tmpfs defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 # microSD slot diff --git a/packages/base-files/base-files/fstab b/packages/base-files/base-files/fstab index 00d0072a41..0720daf432 100644 --- a/packages/base-files/base-files/fstab +++ b/packages/base-files/base-files/fstab @@ -4,7 +4,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbfs /proc/bus/usb usbfs defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs defaults 0 0 tmpfs /media/ram tmpfs defaults 0 0 # uncomment this if your device has a SD/MMC/Transflash slot diff --git a/packages/base-files/base-files/h2200/fstab b/packages/base-files/base-files/h2200/fstab index 397da6c123..6b008b3834 100644 --- a/packages/base-files/base-files/h2200/fstab +++ b/packages/base-files/base-files/h2200/fstab @@ -1,6 +1,6 @@ /dev/mtdblock3 / jffs2 defaults 1 1 proc /proc proc defaults 0 0 sys /sys sysfs defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 /dev/hda1 /media/cf auto defaults,sync,noauto,noatime,exec,suid 0 0 /dev/mmcblk0p1 /media/card auto defaults,sync,noauto,noatime,exec,suid 0 0 diff --git a/packages/base-files/base-files/h3600/fstab b/packages/base-files/base-files/h3600/fstab index 4228c15c00..d300b02566 100644 --- a/packages/base-files/base-files/h3600/fstab +++ b/packages/base-files/base-files/h3600/fstab @@ -2,5 +2,5 @@ proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0 /dev/mmc/part1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/h3900/fstab b/packages/base-files/base-files/h3900/fstab index 2a3929fd17..afa028bf90 100644 --- a/packages/base-files/base-files/h3900/fstab +++ b/packages/base-files/base-files/h3900/fstab @@ -4,5 +4,5 @@ proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0 /dev/mmc/part1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/h5000/fstab b/packages/base-files/base-files/h5000/fstab index 63711f989e..4ae3ad1344 100644 --- a/packages/base-files/base-files/h5000/fstab +++ b/packages/base-files/base-files/h5000/fstab @@ -4,5 +4,5 @@ proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0 /dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/h6300/fstab b/packages/base-files/base-files/h6300/fstab index 6884b4cc6d..f2eeb25b36 100644 --- a/packages/base-files/base-files/h6300/fstab +++ b/packages/base-files/base-files/h6300/fstab @@ -1,7 +1,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 sys /sys sysfs defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 #The devpts file system provides an interface to pseudo terminal (pty) devices. devpts /dev/pts devpts mode=0620,gid=5 0 0 #Mount first partition from the mmc card. diff --git a/packages/base-files/base-files/htcuniversal/fstab b/packages/base-files/base-files/htcuniversal/fstab index 21b2bb1360..1ec129e366 100644 --- a/packages/base-files/base-files/htcuniversal/fstab +++ b/packages/base-files/base-files/htcuniversal/fstab @@ -2,7 +2,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbfs /proc/bus/usb usbfs defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 # uncomment this if your device has a SD/MMC/Transflash slot diff --git a/packages/base-files/base-files/hx4700/fstab b/packages/base-files/base-files/hx4700/fstab index 3dfde917e6..1c90d577ac 100644 --- a/packages/base-files/base-files/hx4700/fstab +++ b/packages/base-files/base-files/hx4700/fstab @@ -5,5 +5,5 @@ proc /proc proc defaults 0 0 sys /sys sysfs defaults 0 0 /dev/hda1 /media/cf auto defaults,noauto,noatime,exec,suid 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/jornada56x/fstab b/packages/base-files/base-files/jornada56x/fstab index 07ccff0fe6..65db0c94a3 100644 --- a/packages/base-files/base-files/jornada56x/fstab +++ b/packages/base-files/base-files/jornada56x/fstab @@ -1,6 +1,6 @@ /dev/mtdblock1 / jffs2 rw,noatime 1 1 proc /proc proc defaults 0 0 /dev/hda1 /mnt/cf auto defaults,sync,noauto 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /mnt/ram tmpfs defaults 0 0 devpts /dev/pts devpts defaults 0 0
\ No newline at end of file diff --git a/packages/base-files/base-files/jornada6xx/fstab b/packages/base-files/base-files/jornada6xx/fstab index 504a1a2f4e..22a3d30e71 100644 --- a/packages/base-files/base-files/jornada6xx/fstab +++ b/packages/base-files/base-files/jornada6xx/fstab @@ -2,6 +2,6 @@ proc /proc proc defaults 0 0 /dev/hda2 / ext2 defaults 0 0 /dev/hda1 /mnt/cf auto defaults,sync,noauto 0 0 /dev/hda3 none swap sw 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatiles tmpfs defaults 0 0 tmpfs /mnt/ram tmpfs defaults 0 0 -devpts /dev/pts devpts defaults 0 0
\ No newline at end of file +devpts /dev/pts devpts defaults 0 0 diff --git a/packages/base-files/base-files/jornada7xx/fstab b/packages/base-files/base-files/jornada7xx/fstab index 504a1a2f4e..22a3d30e71 100644 --- a/packages/base-files/base-files/jornada7xx/fstab +++ b/packages/base-files/base-files/jornada7xx/fstab @@ -2,6 +2,6 @@ proc /proc proc defaults 0 0 /dev/hda2 / ext2 defaults 0 0 /dev/hda1 /mnt/cf auto defaults,sync,noauto 0 0 /dev/hda3 none swap sw 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatiles tmpfs defaults 0 0 tmpfs /mnt/ram tmpfs defaults 0 0 -devpts /dev/pts devpts defaults 0 0
\ No newline at end of file +devpts /dev/pts devpts defaults 0 0 diff --git a/packages/base-files/base-files/mtx-1/fstab b/packages/base-files/base-files/mtx-1/fstab index ffab21cf68..06ba41dbb8 100644 --- a/packages/base-files/base-files/mtx-1/fstab +++ b/packages/base-files/base-files/mtx-1/fstab @@ -2,7 +2,7 @@ # # <file system> <mount pt> <type> <options> <dump> <pass> rootfs / auto defaults 1 1 -tmpfs /var tmpfs size=10m 0 0 +tmpfs /var/volatile tmpfs mode=0755,size=10m 0 0 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbdevfs /proc/bus/usb usbdevfs noauto 0 0 diff --git a/packages/base-files/base-files/mtx-2/fstab b/packages/base-files/base-files/mtx-2/fstab index f6f23ac2aa..a8f96f81b0 100644 --- a/packages/base-files/base-files/mtx-2/fstab +++ b/packages/base-files/base-files/mtx-2/fstab @@ -2,7 +2,7 @@ # # <file system> <mount pt> <type> <options> <dump> <pass> rootfs / auto defaults 1 1 -tmpfs /var tmpfs size=10m 0 0 +tmpfs /var/volatile tmpfs mode=0755,size=10m 0 0 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbdevfs /proc/bus/usb usbdevfs noauto 0 0 diff --git a/packages/base-files/base-files/netbook-pro/fstab b/packages/base-files/base-files/netbook-pro/fstab index ac92724dbc..8c79a60df9 100644 --- a/packages/base-files/base-files/netbook-pro/fstab +++ b/packages/base-files/base-files/netbook-pro/fstab @@ -2,4 +2,4 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbfs /proc/bus/usb usbfs auto 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 diff --git a/packages/base-files/base-files/netvista/fstab b/packages/base-files/base-files/netvista/fstab index e235acaa27..f26a57d2cd 100644 --- a/packages/base-files/base-files/netvista/fstab +++ b/packages/base-files/base-files/netvista/fstab @@ -1,5 +1,5 @@ /dev/hdc2 / ext2 rw,noatime 1 1 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 proc /proc proc defaults 0 0 tmpfs /tmp tmpfs defaults 0 0 devfs /dev/devfs devfs defaults 0 0 diff --git a/packages/base-files/base-files/nokia770/fstab b/packages/base-files/base-files/nokia770/fstab index 40823df5fa..c68c4d4b43 100644 --- a/packages/base-files/base-files/nokia770/fstab +++ b/packages/base-files/base-files/nokia770/fstab @@ -1,6 +1,6 @@ rootfs / rootfs defaults,errors=remount-ro,noatime 0 0 /dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,exec,suid 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 proc /proc proc defaults 0 0 usbfs /proc/bus/usb usbfs defaults 0 0 diff --git a/packages/base-files/base-files/omap5912osk/fstab b/packages/base-files/base-files/omap5912osk/fstab index 77331c0dac..988cf717b0 100644 --- a/packages/base-files/base-files/omap5912osk/fstab +++ b/packages/base-files/base-files/omap5912osk/fstab @@ -4,6 +4,6 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 sysfs /sysfs sysfs defaults 0 0 tmpfs /dev tmpfs defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/openmn/fstab b/packages/base-files/base-files/openmn/fstab index a2e78a2011..c3629a4887 100644 --- a/packages/base-files/base-files/openmn/fstab +++ b/packages/base-files/base-files/openmn/fstab @@ -2,5 +2,5 @@ devfs /dev devfs defaults 0 0 proc /proc proc defaults 0 0 none /sys sysfs defaults 0 0 rootfs / rootfs rw 1 1 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /tmp tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/poodle/fstab b/packages/base-files/base-files/poodle/fstab index 06b9672504..81de333ba7 100644 --- a/packages/base-files/base-files/poodle/fstab +++ b/packages/base-files/base-files/poodle/fstab @@ -9,5 +9,5 @@ proc /proc proc defaults 0 0 # SD/MMC in kernel 2.4 /dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files/simpad/fstab b/packages/base-files/base-files/simpad/fstab index 51aaaf9256..c9f82ca2e8 100644 --- a/packages/base-files/base-files/simpad/fstab +++ b/packages/base-files/base-files/simpad/fstab @@ -2,7 +2,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbdevfs /proc/bus/usb usbdevfs noauto 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 /dev/mtdblock/2 /home jffs2 defaults 1 1 /dev/hda1 /media/cf auto noauto,owner 0 0 diff --git a/packages/base-files/base-files/slugos/fstab b/packages/base-files/base-files/slugos/fstab index 0ac6b1460c..3f35e7a3a7 100644 --- a/packages/base-files/base-files/slugos/fstab +++ b/packages/base-files/base-files/slugos/fstab @@ -1,5 +1,5 @@ rootfs / jffs2 defaults 1 1 proc /proc proc defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 usbfs /proc/bus/usb usbfs defaults 0 0 diff --git a/packages/base-files/base-files/spitz/fstab b/packages/base-files/base-files/spitz/fstab index a1fb3d4da1..8e667b63a5 100644 --- a/packages/base-files/base-files/spitz/fstab +++ b/packages/base-files/base-files/spitz/fstab @@ -4,7 +4,7 @@ rootfs / auto defaults 1 1 proc /proc proc defaults 0 0 # we can use a normal var filesystem with a microdrive -# tmpfs /var tmpfs defaults 0 0 +# tmpfs /var/volatiles tmpfs defaults 0 0 tmpfs /media/ram tmpfs defaults 0 0 # Compact Flash memory cards diff --git a/packages/base-files/base-files/tosa/fstab b/packages/base-files/base-files/tosa/fstab index 4a784180ca..b439abeb2c 100644 --- a/packages/base-files/base-files/tosa/fstab +++ b/packages/base-files/base-files/tosa/fstab @@ -3,7 +3,7 @@ proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,sync,noauto 0 0 -tmpfs /var tmpfs defaults 0 0 +tmpfs /var/volatile tmpfs mode=0755 0 0 tmpfs /media/ram tmpfs defaults 0 0 usbfs /proc/bus/usb usbfs auto 0 0 diff --git a/packages/base-files/base-files/wrt54/fstab b/packages/base-files/base-files/wrt54/fstab index c1e52f8927..3dce9b3ed1 100644 --- a/packages/base-files/base-files/wrt54/fstab +++ b/packages/base-files/base-files/wrt54/fstab @@ -2,6 +2,6 @@ # # <file system> <mount pt> <type> <options> <dump> <pass> rootfs / auto defaults 1 1 -tmpfs /var tmpfs size=50% 0 0 +tmpfs /var/volatile tmpfs mode=0755,size=50% 0 0 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 diff --git a/packages/base-files/base-files/xxs1500/fstab b/packages/base-files/base-files/xxs1500/fstab index 7007ab021b..d4e2eff592 100644 --- a/packages/base-files/base-files/xxs1500/fstab +++ b/packages/base-files/base-files/xxs1500/fstab @@ -2,7 +2,7 @@ # # <file system> <mount pt> <type> <options> <dump> <pass> rootfs / auto defaults 1 1 -tmpfs /var tmpfs size=10m 0 0 +tmpfs /var/volatile tmpfs mode=0755,size=10m 0 0 proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbdevfs /proc/bus/usb usbdevfs noauto 0 0 diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 1e80f4c7f3..37068780fd 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r65" +PR = "r66" LICENSE = "GPL" SRC_URI = " \ @@ -25,7 +25,7 @@ SRC_URI = " \ S = "${WORKDIR}" docdir_append = "/${P}" -dirs1777 = "/tmp ${localstatedir}/lock ${localstatedir}/tmp" +dirs1777 = "/tmp ${localstatedir}/volatile/lock ${localstatedir}/volatile/tmp" dirs2775 = "/home ${prefix}/src ${localstatedir}/local" dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \ ${sysconfdir}/skel /lib /mnt /proc /home/root /sbin \ @@ -33,13 +33,16 @@ dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \ ${libdir} ${sbindir} ${datadir} \ ${datadir}/common-licenses ${datadir}/dict ${infodir} \ ${mandir} ${datadir}/misc ${localstatedir} \ - ${localstatedir}/backups ${localstatedir}/cache \ - ${localstatedir}/lib /sys ${localstatedir}/lib/misc \ - ${localstatedir}/lock/subsys ${localstatedir}/log \ - ${localstatedir}/run ${localstatedir}/spool \ + ${localstatedir}/backups ${localstatedir}/lib \ + /sys ${localstatedir}/lib/misc ${localstatedir}/spool \ + ${localstatedir}/volatile ${localstatedir}/volatile/cache \ + ${localstatedir}/volatile/lock/subsys \ + ${localstatedir}/volatile/log \ + ${localstatedir}/volatile/run \ /mnt /media /media/card /media/cf /media/net /media/ram \ /media/union /media/realroot /media/hdd \ /media/mmc1" +volatiles = "cache run log lock tmp" conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \ ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \ @@ -64,6 +67,9 @@ do_install () { for d in ${dirs2775}; do install -m 2755 -d ${D}$d done + for d in ${volatiles}; do + ln -sf volatile/$d ${D}/${localstatedir}/$d + done for d in card cf net ram; do ln -sf /media/$d ${D}/mnt/$d done @@ -111,7 +117,6 @@ do_install () { do_install_append_mnci () { rmdir ${D}/tmp - mkdir -p ${D}${localstatedir}/tmp ln -s var/tmp ${D}/tmp } diff --git a/packages/binutils/binutils-cross-sdk_2.17.50.0.5.bb b/packages/binutils/binutils-cross-sdk_2.17.50.0.5.bb new file mode 100644 index 0000000000..7d3bb6c09c --- /dev/null +++ b/packages/binutils/binutils-cross-sdk_2.17.50.0.5.bb @@ -0,0 +1,20 @@ +SECTION = "devel" +require binutils_${PV}.bb +inherit sdk +DEPENDS += "flex-native bison-native" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}" +EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \ + --program-prefix=${TARGET_PREFIX}" + +do_stage() { + : +} + +do_install () { + autotools_do_install + + # Install the libiberty header + install -d ${D}${includedir} + install -m 644 ${S}/include/ansidecl.h ${D}${includedir} + install -m 644 ${S}/include/libiberty.h ${D}${includedir} +} diff --git a/packages/blueprobe/blueprobe-0.18/uclibc-fix.patch b/packages/blueprobe/blueprobe-0.18/uclibc-fix.patch new file mode 100644 index 0000000000..34a1711e60 --- /dev/null +++ b/packages/blueprobe/blueprobe-0.18/uclibc-fix.patch @@ -0,0 +1,30 @@ +Uclibc doesn't define or support speeds above 115200. So check the existence +of the defines before allowing them to actually be used. + +Index: blueprobe-0.18/blueprobe.c +=================================================================== +--- blueprobe-0.18.orig/blueprobe.c 2006-10-12 20:33:01.000000000 +1000 ++++ blueprobe-0.18/blueprobe.c 2007-05-17 12:29:20.000000000 +1000 +@@ -25,14 +25,22 @@ + return B57600; + case 115200: + return B115200; ++#ifdef B230400 + case 230400: + return B230400; ++#endif ++#ifdef B460800 + case 460800: + return B460800; ++#endif ++#ifdef B921600 + case 921600: + return B921600; ++#endif ++#ifdef B1000000 + case 1000000: + return B1000000; ++#endif + default: + return B57600; + } diff --git a/packages/blueprobe/blueprobe_0.18.bb b/packages/blueprobe/blueprobe_0.18.bb index ca455401e0..5db1bc4337 100644 --- a/packages/blueprobe/blueprobe_0.18.bb +++ b/packages/blueprobe/blueprobe_0.18.bb @@ -1,5 +1,6 @@ require blueprobe.inc -PR = "r1" +PR = "r2" -SRC_URI += "file://h4000.patch;patch=1" +SRC_URI += "file://h4000.patch;patch=1 \ + file://uclibc-fix.patch;patch=1" diff --git a/packages/bluez/bluez-libs_3.10.bb b/packages/bluez/bluez-libs_3.10.bb new file mode 100644 index 0000000000..6ddf62a4fb --- /dev/null +++ b/packages/bluez/bluez-libs_3.10.bb @@ -0,0 +1 @@ +require bluez-libs.inc diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc index 886a5a3d55..b6f9660fa7 100644 --- a/packages/bluez/bluez-utils.inc +++ b/packages/bluez/bluez-utils.inc @@ -48,10 +48,10 @@ do_install_append() { CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ ${sysconfdir}/default/bluetooth" -PACKAGES =+ "${PN}-ciptool bluez-cups-backend" -FILES_${PN}-ciptool = "/bin/ciptool" -RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" -RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus" +PACKAGES =+ " bluez-cups-backend" + +FILES_${PN} += " ${libdir}/alsa-lib/*.so " +FILES_${PN}-dev += " ${libdir}/alsa-lib/*.la " FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" RDEPENDS_bluez-cups-backend = "cups" diff --git a/packages/bluez/bluez-utils/ppoll-uclibc-arm-r0.patch b/packages/bluez/bluez-utils/ppoll-uclibc-arm-r0.patch new file mode 100644 index 0000000000..391a7ae3de --- /dev/null +++ b/packages/bluez/bluez-utils/ppoll-uclibc-arm-r0.patch @@ -0,0 +1,14 @@ +Index: bluez-utils-3.9/common/ppoll.h +=================================================================== +--- bluez-utils-3.9.orig/common/ppoll.h 2007-05-17 17:42:23.000000000 +0200 ++++ bluez-utils-3.9/common/ppoll.h 2007-05-17 17:43:18.000000000 +0200 +@@ -1,4 +1,8 @@ +-static inline int ppoll(struct pollfd *fds, nfds_t nfds, ++#ifdef ppoll ++#undef ppoll ++#endif ++#define ppoll bluez_ppoll ++static inline int bluez_ppoll(struct pollfd *fds, nfds_t nfds, + const struct timespec *timeout, const sigset_t *sigmask) + { + return poll(fds, nfds, timeout ? timeout->tv_sec * 1000 : 500); diff --git a/packages/bluez/bluez-utils/uclibc-fix.patch b/packages/bluez/bluez-utils/uclibc-fix.patch new file mode 100644 index 0000000000..6d4753c2e5 --- /dev/null +++ b/packages/bluez/bluez-utils/uclibc-fix.patch @@ -0,0 +1,46 @@ +Uclibc doesn't define or support speeds above 115200. So check the existence +of the defines before allowing them to actually be used. + +Index: bluez-utils-3.9/tools/hciattach.c +=================================================================== +--- bluez-utils-3.9.orig/tools/hciattach.c 2007-05-17 12:34:28.000000000 +1000 ++++ bluez-utils-3.9/tools/hciattach.c 2007-05-17 12:40:20.000000000 +1000 +@@ -105,22 +105,38 @@ + return B57600; + case 115200: + return B115200; ++#ifdef B230400 + case 230400: + return B230400; ++#endif ++#ifdef B460800 + case 460800: + return B460800; ++#endif ++#ifdef B500000 + case 500000: + return B500000; ++#endif ++#ifdef B576000 + case 576000: + return B576000; ++#endif ++#ifdef B921600 + case 921600: + return B921600; ++#endif ++#ifdef B1000000 + case 1000000: + return B1000000; ++#endif ++#ifdef B1152000 + case 1152000: + return B1152000; ++#endif ++#ifdef B1500000 + case 1500000: + return B1500000; ++#endif + default: + return B57600; + } diff --git a/packages/bluez/bluez-utils_3.10.1.bb b/packages/bluez/bluez-utils_3.10.1.bb new file mode 100644 index 0000000000..44827dc2d0 --- /dev/null +++ b/packages/bluez/bluez-utils_3.10.1.bb @@ -0,0 +1,115 @@ +require bluez-utils.inc + +DEPENDS += "glib-2.0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ + file://hcid.conf \ + file://02dtl1_cs.sh \ + " +PR = "r3" + +EXTRA_OECONF = " \ + --enable-bccmd \ + --disable-hid2hci \ + --disable-alsa \ + --enable-cups \ + --enable-glib \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + +# The config options are explained below: + +# --enable-obex enable OBEX support +# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1 +# --enable-cups install CUPS backend support +# --enable-bccmd install BCCMD interface utility +# --enable-avctrl install Audio/Video control utility +# --enable-hid2hci install HID mode switching utility +# --enable-dfutool install DFU firmware upgrade utility + +# --enable-glib For systems that use and install GLib anyway +# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server + +#Following services can be enabled so far: +# --enable-network +# --enable-serial +# --enable-input +# --enable-audio +# --enable-echo + +#There is no need to modify any init script. They will be started +#automatically or on demand. Only /etc/bluetooth/*.service files should +#be patched to change name or the autostart value. +# --enable-configfile +# --enable-initscripts + +#For even smaller -doc packages +# --disable-manpages +# --disable-pcmciarules + +#I haven't seen any embedded device with HID proxy support. So simply +#disable it: +# --disable-hid2hci + + +PACKAGES =+ "${PN}-compat" + +CONFFILES_${PN} = " \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default/bluetooth \ + " + +CONFFILES_${PN}-compat = " \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +FILES_${PN} = " \ + ${base_sbindir}/hcid \ + ${libdir}/bluetooth \ + ${sysconfdir}/init.d/bluetooth \ + ${sysconfdir}/bluetooth/*.service \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default \ + ${sysconfdir}/dbus-1 \ + ${base_sbindir}/hciattach \ + " + +#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume +FILES_${PN} += "${sysconfdir}/apm/" + +FILES_${PN}-dbg += " \ + ${libdir}/bluetooth/.debug \ + " + +FILES_${PN}-compat = " \ + ${base_bindir}/sdptool \ + ${base_bindir}/dund \ + ${base_bindir}/rctest \ + ${base_bindir}/ciptool \ + ${base_bindir}/l2test \ + ${base_bindir}/rfcomm \ + ${base_bindir}/hcitool \ + ${base_bindir}/pand \ + ${base_bindir}/hidd \ + ${base_bindir}/l2ping \ + ${base_sbindir}/hciconfig \ + ${base_sbindir}/bccmd \ + ${base_sbindir}/hciemu \ + ${base_bindir}/passkey-agent \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" +RDEPENDS_bluez-cups-backend = "cups" + + diff --git a/packages/bluez/bluez-utils_3.9.bb b/packages/bluez/bluez-utils_3.9.bb index e710e8c8f6..29c472fbbd 100644 --- a/packages/bluez/bluez-utils_3.9.bb +++ b/packages/bluez/bluez-utils_3.9.bb @@ -1,3 +1,13 @@ require bluez-utils.inc -PR = "r4" +PACKAGES =+ "${PN}-ciptool" + +SRC_URI += "file://uclibc-fix.patch;patch=1 \ + file://ppoll-uclibc-arm-r0.patch;patch=1 " + +FILES_${PN}-ciptool = "/bin/ciptool" +RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" +RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus" + + +PR = "r5" diff --git a/packages/helloworld/.mtn2git_empty b/packages/clamav/clamav-0.88.7/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/helloworld/.mtn2git_empty +++ b/packages/clamav/clamav-0.88.7/.mtn2git_empty diff --git a/packages/clamav/files/clamd.conf b/packages/clamav/clamav-0.88.7/clamd.conf index 485c80d420..485c80d420 100644 --- a/packages/clamav/files/clamd.conf +++ b/packages/clamav/clamav-0.88.7/clamd.conf diff --git a/packages/clamav/files/cross-compile-fix.patch b/packages/clamav/clamav-0.88.7/cross-compile-fix.patch index 690d680c66..690d680c66 100644 --- a/packages/clamav/files/cross-compile-fix.patch +++ b/packages/clamav/clamav-0.88.7/cross-compile-fix.patch diff --git a/packages/clamav/files/freshclam.conf b/packages/clamav/clamav-0.88.7/freshclam.conf index 770490b3ab..770490b3ab 100644 --- a/packages/clamav/files/freshclam.conf +++ b/packages/clamav/clamav-0.88.7/freshclam.conf diff --git a/packages/clamav/files/libtool-fix.patch b/packages/clamav/clamav-0.88.7/libtool-fix.patch index 05a4876dd0..05a4876dd0 100644 --- a/packages/clamav/files/libtool-fix.patch +++ b/packages/clamav/clamav-0.88.7/libtool-fix.patch diff --git a/packages/clamav/clamav-0.90.2/.mtn2git_empty b/packages/clamav/clamav-0.90.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/clamav/clamav-0.90.2/.mtn2git_empty diff --git a/packages/clamav/clamav-0.90.2/clamd.conf b/packages/clamav/clamav-0.90.2/clamd.conf new file mode 100644 index 0000000000..74ebcf5c3f --- /dev/null +++ b/packages/clamav/clamav-0.90.2/clamd.conf @@ -0,0 +1,27 @@ +## Please read the clamd.conf(5) manual before editing this file. +LogFile /var/log/clamav/clamav.log +LogFileMaxSize 0 +LogTime yes +PidFile /var/run/clamav/clamd.pid +DatabaseDirectory /var/lib/clamav +LocalSocket /var/run/clamav/clamd.ctl +FixStaleSocket yes +MaxConnectionQueueLength 15 +MaxThreads 10 +ReadTimeout 180 +SelfCheck 1800 +User clamav +AllowSupplementaryGroups yes +ScanPE yes +ScanELF yes +DetectBrokenExecutables yes +ScanOLE2 yes +ScanMail yes +PhishingSignatures yes +ScanHTML yes +ScanArchive yes +ArchiveMaxRecursion 8 +ArchiveMaxFiles 1000 +ArchiveMaxFileSize 10M +ArchiveMaxCompressionRatio 250 +ArchiveBlockMax yes diff --git a/packages/clamav/clamav-0.90.2/cross-compile-fix.patch b/packages/clamav/clamav-0.90.2/cross-compile-fix.patch new file mode 100644 index 0000000000..f7ab4aa69f --- /dev/null +++ b/packages/clamav/clamav-0.90.2/cross-compile-fix.patch @@ -0,0 +1,133 @@ +Add some caching of values which can't be determined when +cross-compiling. This lets us define the values via the site files. + +Also check for libintl and add it to ldflags if required. + +Index: clamav-0.90.2/configure.in +=================================================================== +--- clamav-0.90.2.orig/configure.in 2007-04-13 09:10:37.000000000 +1000 ++++ clamav-0.90.2/configure.in 2007-05-16 14:19:01.000000000 +1000 +@@ -60,19 +60,21 @@ + + dnl Check for broken snprintf (code by Phil Oleson <oz*nixil.net>) + if test "x$ac_cv_func_snprintf" = "xyes" ; then +- AC_MSG_CHECKING([whether snprintf correctly terminates long strings]) ++ AC_CACHE_CHECK([whether snprintf correctly terminates long strings], ++ [ac_cv_have_broken_snprintf], [ + AC_TRY_RUN( + [ + #include <stdio.h> + int main(void){char b[5];snprintf(b,5,"123456789");return(b[4]!='\0');} + ], +- [AC_MSG_RESULT(yes)], +- [ +- AC_MSG_RESULT(no) +- AC_DEFINE(BROKEN_SNPRINTF,1,[Define if your snprintf is busted]) +- AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor]) +- ] +- ) ++ [ ac_cv_have_broken_snprintf="no" ], ++ [ ac_cv_have_broken_snprintf="yes" ] ++ ) ++ ]) ++ if test "$ac_cv_have_broken_snprintf" = "yes"; then ++ AC_DEFINE(BROKEN_SNPRINTF,1,[Define if your snprintf is busted]) ++ AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor]) ++ fi + fi + + have_pthreads=no +@@ -370,18 +372,28 @@ + AC_DEFINE_UNQUOTED(CONFDIR,"$cfg_dir",[where to look for the config file]) + + dnl check for in_port_t definition ++AC_CACHE_CHECK([for in_port_t], [clamav_av_have_in_port_t], [ + AC_TRY_RUN([ + #include <sys/types.h> + #include <netinet/in.h> + int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; } +-], AC_DEFINE(HAVE_IN_PORT_T,1,[in_port_t is defined]), AC_MSG_RESULT(in_port_t is not defined)) ++], [ clamav_av_have_in_port_t="yes" ], [ clamav_av_have_in_port_t="no" ]) ++]) ++if test "$clamav_av_have_in_port_t" = "yes"; then ++ AC_DEFINE(HAVE_IN_PORT_T,1,[in_port_t is defined]) ++fi + + dnl check for in_addr_t definition ++AC_CACHE_CHECK([for in_addr_t], [clamav_av_have_in_addr_t], [ + AC_TRY_RUN([ + #include <sys/types.h> + #include <netinet/in.h> + int main(int argc, char **argv) { in_addr_t pt; pt = 0; return pt; } +-], AC_DEFINE(HAVE_IN_ADDR_T,1,[in_addr_t is defined]), AC_MSG_RESULT(in_addr_t is not defined)) ++], [ clamav_av_have_in_addr_t="yes" ], [ clamav_av_have_in_addr_t="no" ]) ++]) ++if test "$clamav_av_have_in_addr_t" = "yes"; then ++ AC_DEFINE(HAVE_IN_ADDR_T,1,[in_addr_t is defined]) ++fi + + case "$target_os" in + linux*) +@@ -1100,6 +1112,10 @@ + AC_MSG_RESULT($DEFAULT_FD_SETSIZE) + AC_DEFINE_UNQUOTED(DEFAULT_FD_SETSIZE, $DEFAULT_FD_SETSIZE, "default FD_SETSIZE value") + ++dnl Do we need to link with -lintl? ++AM_GNU_GETTEXT([external]) ++AM_GNU_GETTEXT_VERSION([0.14.1]) ++ + AC_OUTPUT([ + libclamav/Makefile + clamscan/Makefile +Index: clamav-0.90.2/clamd/Makefile.am +=================================================================== +--- clamav-0.90.2.orig/clamd/Makefile.am 2007-05-16 14:22:46.000000000 +1000 ++++ clamav-0.90.2/clamd/Makefile.am 2007-05-16 14:23:08.000000000 +1000 +@@ -60,5 +60,5 @@ + + endif + +-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@ ++LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@ @LIBINTL@ + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav +Index: clamav-0.90.2/clamdscan/Makefile.am +=================================================================== +--- clamav-0.90.2.orig/clamdscan/Makefile.am 2007-05-16 14:24:02.000000000 +1000 ++++ clamav-0.90.2/clamdscan/Makefile.am 2007-05-16 14:24:18.000000000 +1000 +@@ -40,4 +40,4 @@ + + DEFS = @DEFS@ -DCL_NOTHREADS + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav +-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ ++LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ @LIBINTL@ +Index: clamav-0.90.2/clamscan/Makefile.am +=================================================================== +--- clamav-0.90.2.orig/clamscan/Makefile.am 2007-05-16 14:20:23.000000000 +1000 ++++ clamav-0.90.2/clamscan/Makefile.am 2007-05-16 14:20:39.000000000 +1000 +@@ -41,5 +41,5 @@ + treewalk.h + + DEFS = @DEFS@ -DCL_NOTHREADS +-LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ ++LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @LIBINTL@ + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav +Index: clamav-0.90.2/freshclam/Makefile.am +=================================================================== +--- clamav-0.90.2.orig/freshclam/Makefile.am 2007-05-16 14:25:10.000000000 +1000 ++++ clamav-0.90.2/freshclam/Makefile.am 2007-05-16 14:25:25.000000000 +1000 +@@ -48,4 +48,4 @@ + + DEFS = @DEFS@ -DCL_NOTHREADS + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav +-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ ++LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ @LIBINTL@ +Index: clamav-0.90.2/sigtool/Makefile.am +=================================================================== +--- clamav-0.90.2.orig/sigtool/Makefile.am 2007-05-16 14:26:18.000000000 +1000 ++++ clamav-0.90.2/sigtool/Makefile.am 2007-05-16 14:26:29.000000000 +1000 +@@ -39,4 +39,4 @@ + + DEFS = @DEFS@ -DCL_NOTHREADS + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav +-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ ++LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ @LIBINTL@ diff --git a/packages/clamav/clamav-0.90.2/freshclam.conf b/packages/clamav/clamav-0.90.2/freshclam.conf new file mode 100644 index 0000000000..fd45b0dd85 --- /dev/null +++ b/packages/clamav/clamav-0.90.2/freshclam.conf @@ -0,0 +1,21 @@ +## Please read the freshclam.conf(5) manual before editing this file. + +# Comment or remove the line below. +Example + +# Uncomment the following line and replace XY with your country +# code. See http://www.iana.org/cctld/cctld-whois.htm for the full list. +# Default: There is no default, which results in an error when running freshclam +#DatabaseMirror db.XY.clamav.net + +DatabaseMirror database.clamav.net + +DatabaseDirectory /var/lib/clamav/ +UpdateLogFile /var/log/clamav/freshclam.log +PidFile /var/run/clamav/freshclam.pid +DatabaseOwner clamav +AllowSupplementaryGroups yes +DNSDatabaseInfo current.cvd.clamav.net +MaxAttempts 5 +Checks 24 +NotifyClamd /etc/clamd.conf diff --git a/packages/clamav/clamav.inc b/packages/clamav/clamav.inc index b18cd06c24..c00da1d6d7 100644 --- a/packages/clamav/clamav.inc +++ b/packages/clamav/clamav.inc @@ -12,19 +12,19 @@ SECTION = "network" LICENSE = "GPL" DEPENDS = "zlib bzip2 gmp" RDEPENDS_${PN} = "${PN}-data" -RDEPENDS_${PN}-daemon = "${PN}-data" +RDEPENDS_${PN}-daemon = "${PN}-data ${PN}-conf" +RDEPENDS_${PN}-freshclam = "${PN}-conf" RRECOMMENDS_${PN} = "${PN}-freshclam" RRECOMMENDS_${PN}-daemon = "${PN}-freshclam" +RPROVIDES_${PN}-freshclam = "${PN}-data" SRC_URI = "${SOURCEFORGE_MIRROR}/clamav/clamav-${PV}.tar.gz \ file://cross-compile-fix.patch;patch=1 \ - file://libtool-fix.patch;patch=1 \ file://clamav-daemon.init \ file://clamav-freshclam.init \ - file://clamav-daemon.default \ file://clamd.conf \ file://freshclam.conf \ - file://volatiles.02_clamav-data \ + file://volatiles.03_clamav-data \ file://volatiles.03_clamav-daemon \ file://volatiles.03_clamav-freshclam" @@ -48,20 +48,13 @@ do_install_append() { # Install our config files and init scripts install -m 0755 ${WORKDIR}/freshclam.conf ${D}${sysconfdir}/freshclam.conf - install -m 0755 ${WORKDIR}/clamav-daemon.default ${D}${sysconfdir}/default/clamav-daemon install -m 0755 ${WORKDIR}/clamav-daemon.init ${D}${sysconfdir}/init.d/clamav-daemon install -m 0755 ${WORKDIR}/clamav-freshclam.init ${D}${sysconfdir}/init.d/clamav-freshclam # We need some /var directories - for i in 02_clamav-data 03_clamav-daemon 03_clamav-freshclam; do + for i in 03_clamav-daemon 03_clamav-freshclam 03_clamav-data; do install -m 0644 ${WORKDIR}/volatiles.$i ${D}${sysconfdir}/default/volatiles/$i done - - # Move the clamav data to a non-volatile location, we'll symlink back - # If freshclam is running it'll break the link to this static data - # once it has succesfully downloaded an update - install -m 0755 -d ${D}${libdir} - mv ${D}${localstatedir}/lib/clamav ${D}${libdir} } do_stage () { oe_libinstall -a -so libclamav ${STAGING_LIBDIR} @@ -69,22 +62,23 @@ do_stage () { install -m 0644 libclamav/clamav.h ${STAGING_INCDIR} } -PACKAGES += "${PN}-freshclam ${PN}-daemon ${PN}-data ${PN}-lib" +PACKAGES += "${PN}-freshclam ${PN}-daemon ${PN}-conf ${PN}-data ${PN}-lib" -FILES_${PN} = "${bindir}/clamscan ${bindir}/sigtool ${bindir}/clamdscan" +FILES_${PN} = "${bindir}/clamscan \ + ${bindir}/sigtool \ + ${bindir}/clamdscan" FILES_${PN}-lib = "${libdir}/libclamav.so.*" +FILES_${PN}-conf = "${sysconfdir}/clamd.conf" FILES_${PN}-freshclam = "${bindir}/freshclam \ ${sysconfdir}/freshclam.conf \ ${sysconfdir}/init.d/clamav-freshclam \ ${sysconfdir}/default/volatiles/03_clamav-freshclam" -FILES_${PN}-daemon = "${sysconfdir}/clamd.conf \ - ${sbindir}/clamd \ +FILES_${PN}-daemon = "${sbindir}/clamd \ ${sysconfdir}/init.d/clamav-daemon \ - ${sysconfdir}/default/clamav-daemon \ ${sysconfdir}/default/volatiles/03_clamav-daemon" -FILES_${PN}-data = "${libdir}/clamav/main.cvd \ - ${libdir}/clamav/daily.cvd \ - ${sysconfdir}/default/volatiles/02_clamav-data" +FILES_${PN}-data = "${localstatedir}/lib/clamav/main.cvd \ + ${localstatedir}/lib/clamav/daily.cvd \ + ${sysconfdir}/default/volatiles/03_clamav-data" FILES_${PN}-dev += "${bindir}/clamav-config" # Add clamav's user and groups @@ -111,9 +105,10 @@ pkg_postinst_${PN}-data () { } # Indicate that the default files are configuration files -CONFFILES_${PN}-daemon = "${sysconfdir}/clamd.conf \ - ${sysconfdir}/default/clamav-daemon" +CONFFILES_${PN}-conf = "${sysconfdir}/clamd.conf" CONFFILES_${PN}-freshclam = "${sysconfdir}/freshclam.conf" +CONFFILES_${PN}-data = "${localstatedir}/lib/clamav/main.cvd \ + ${localstatedir}/lib/clamav/daily.cvd" INITSCRIPT_PACKAGES = "${PN}-daemon ${PN}-freshclam" INITSCRIPT_NAME_${PN}-daemon = "clamav-daemon" diff --git a/packages/clamav/clamav_0.88.6.bb b/packages/clamav/clamav_0.88.6.bb deleted file mode 100644 index e721558efe..0000000000 --- a/packages/clamav/clamav_0.88.6.bb +++ /dev/null @@ -1,3 +0,0 @@ -require clamav.inc - -PR = "r1" diff --git a/packages/clamav/clamav_0.88.7.bb b/packages/clamav/clamav_0.88.7.bb index fec4ae59d8..2728c31590 100644 --- a/packages/clamav/clamav_0.88.7.bb +++ b/packages/clamav/clamav_0.88.7.bb @@ -1,3 +1,5 @@ require clamav.inc -PR = "r0" +PR = "r1" + +SRC_URI_append += " file://libtool-fix.patch;patch=1" diff --git a/packages/clamav/clamav_0.90.2.bb b/packages/clamav/clamav_0.90.2.bb new file mode 100644 index 0000000000..fe3061606a --- /dev/null +++ b/packages/clamav/clamav_0.90.2.bb @@ -0,0 +1,17 @@ +require clamav.inc +PR = "r1" + +# 0.9x requires curl for incremental database updates +DEPENDS += "curl" +DEPENDS += "virtual/libintl" + +# Don't check for clamav uid/gid - they don't exist on the host +# Put virus definitions in /var/lib not /usr/lib +EXTRA_OECONF = "--disable-clamav \ + --with-zlib=${STAGING_DIR}/${HOST_SYS} \ + --with-libcurl \ + --with-dbdir=${localstatedir}/lib/clamav" + +# Package up configuration utility - new for 0.9x +PACKAGES += "${PN}-clamconf" +FILES_${PN}-clamconf = "${bindir}/clamconf" diff --git a/packages/clamav/files/clamav-daemon.default b/packages/clamav/files/clamav-daemon.default deleted file mode 100644 index bc19984183..0000000000 --- a/packages/clamav/files/clamav-daemon.default +++ /dev/null @@ -1 +0,0 @@ -# Options for clamav-daemon (clamd process) diff --git a/packages/clamav/files/clamav-daemon.init b/packages/clamav/files/clamav-daemon.init index bab7a184d7..6fd07146ea 100644 --- a/packages/clamav/files/clamav-daemon.init +++ b/packages/clamav/files/clamav-daemon.init @@ -3,18 +3,20 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/clamd NAME="clamd" DESC="ClamAV daemon" -CLAMAVCONF=/etc/clamd.conf +CLAMAV_CONF=/etc/clamd.conf +PID=/var/run/clamav/clamd.pid set -e -test -r /etc/default/clamav-daemon && . /etc/default/clamav-daemon test -x "$DAEMON" || exit 0 -test ! -r "$CLAMAVCONF" && exit 0 -if [ `grep -q "^Example" $CLAMAVCONF` ]; then +if [ ! -r "$CLAMAV_CONF" ]; then + echo "ClamAV configuration file $CLAMAV_CONF not found. Exiting" + exit 0 +fi +if [ `grep -q "^Example" $CLAMAV_CONF` ]; then echo "$DESC is not configured." exit 0 fi -pidfile="`grep ^PidFile $CLAMAVCONF | awk '{print $2}'`" case "$1" in start) @@ -25,7 +27,7 @@ case "$1" in stop) echo -n "Stopping $DESC: " - start-stop-daemon -K -p $pidfile + start-stop-daemon -K -p $PID ;; restart|force-reload) diff --git a/packages/clamav/files/clamav-freshclam.init b/packages/clamav/files/clamav-freshclam.init index 490a41e31f..21f02008f5 100644 --- a/packages/clamav/files/clamav-freshclam.init +++ b/packages/clamav/files/clamav-freshclam.init @@ -3,70 +3,38 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/bin/freshclam NAME=freshclam DESC="ClamAV virus database updater" -CLAMAV_CONF_FILE=/etc/clamd.conf -FRESHCLAM_CONF_FILE=/etc/freshclam.conf -pidfile=/var/run/clamav/freshclam.pid +FRESHCLAM_CONF=/etc/freshclam.conf +CLAMAV_CONF=/etc/clamd.conf +PID=/var/run/clamav/freshclam.pid set -e -test -r /etc/default/clamav-freshclam && . /etc/default/clamav-freshclam test -x "$DAEMON" || exit 0 -test ! -r "$CLAMAV_CONF_FILE" && exit 0 - -slurp_config() -{ - CLAMAVCONF="$1" - - if [ -e "$CLAMAVCONF" ]; then - for variable in `egrep -v '^[[:space:]]*(#|$)' "$CLAMAVCONF" | awk '{print $1}'`; do - if [ "$variable" = 'DatabaseMirror' ]; then - if [ -z "$DatabaseMirror" ]; then - for i in `grep ^$variable $CLAMAVCONF | awk '{print $2}'`; do - value="$i $value" - done - else - continue - fi - elif [ "$variable" = 'VirusEvent' -o "$variable" = 'OnUpdateExecute' -o "$variable" = 'OnErrorExecute' ]; then - value=`grep ^$variable $CLAMAVCONF | head -n1 | sed -e s/$variable\ //` - else - value=`grep ^$variable $CLAMAVCONF | head -n1 | awk '{print $2}'` - fi - if ! [ "$value" = "$variable" -o "$value" = "" ]; then - export "$variable"="$value" - else - export "$variable"="true" - fi - unset value - done - fi -} - -slurp_config "$FRESHCLAM_CONF_FILE" - -[ -z "$UpdateLogFile" ] && UpdateLogFile=/var/log/clamav/freshclam.log - -if [ -z "$DatabaseDirectory" ]; then - [ -r "$CLAMAV_CONF_FILE" ] && DatabaseDirectory=$(grep 'DataDirectory' "$CLAMAV_CONF_FILE" | awk '{print $2}') - [ -z "$DatabaseDirectory" ] && DatabaseDirectory=/var/lib/clamav/ +if [ ! -r "$CLAMAV_CONF" ]; then + echo "ClamAV configuration file $CLAMAV_CONF not found. Exiting" + exit 0 +fi +if [ ! -r "$FRESHCLAM_CONF" ]; then + echo "Freshclam configuration file $FRESHCLAM_CONF not found. Exiting" + exit 0 fi case "$1" in no-daemon) echo "It takes freshclam ~3min to timeout and try the next mirror in the list" - freshclam -l "$UpdateLogFile" --datadir "$DatabaseDirectory" + freshclam ;; start) echo -n "Starting $DESC: " - start-stop-daemon -S -x $DAEMON -- -d --quiet -p $pidfile + start-stop-daemon -S -x $DAEMON -- -d --quiet -p $PID echo "$NAME." ;; stop) echo -n "Stopping $DESC: " - start-stop-daemon -K -p $pidfile + start-stop-daemon -K -p $PID ;; restart|force-reload) diff --git a/packages/clamav/files/volatiles.02_clamav-data b/packages/clamav/files/volatiles.02_clamav-data deleted file mode 100644 index 99dc98b323..0000000000 --- a/packages/clamav/files/volatiles.02_clamav-data +++ /dev/null @@ -1,4 +0,0 @@ -# <type> <owner> <group> <mode> <path> <linksource> -d clamav clamav 0755 /var/lib/clamav none -l clamav clamav 0644 /var/lib/clamav/main.cvd /usr/lib/clamav/main.cvd -l clamav clamav 0644 /var/lib/clamav/daily.cvd /usr/lib/clamav/daily.cvd diff --git a/packages/clamav/files/volatiles.03_clamav-data b/packages/clamav/files/volatiles.03_clamav-data new file mode 100644 index 0000000000..8fdb0a742a --- /dev/null +++ b/packages/clamav/files/volatiles.03_clamav-data @@ -0,0 +1,4 @@ +# <type> <owner> <group> <mode> <path> <linksource> +d clamav clamav 0755 /var/lib/clamav none +f clamav clamav 0644 /var/lib/clamav/main.cvd none +f clamav clamav 0644 /var/lib/clamav/daily.cvd none diff --git a/packages/evince/evince/no-icon-theme.diff b/packages/evince/evince/no-icon-theme.diff new file mode 100644 index 0000000000..7b7771ba06 --- /dev/null +++ b/packages/evince/evince/no-icon-theme.diff @@ -0,0 +1,13 @@ +Index: configure.ac +=================================================================== +--- configure.ac (revision 2436) ++++ configure.ac (working copy) +@@ -57,7 +57,7 @@ + PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED) + PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0) + PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 gnome-vfs-2.0) +-PKG_CHECK_MODULES(SHELL_CORE, libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED) ++PKG_CHECK_MODULES(SHELL_CORE, libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED) + + AC_ARG_WITH(libgnome, + AC_HELP_STRING([--without-libgnome],[disable the use of libgnome]), diff --git a/packages/evince/evince_0.9.0.bb b/packages/evince/evince_0.9.0.bb new file mode 100644 index 0000000000..8689d1d371 --- /dev/null +++ b/packages/evince/evince_0.9.0.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu." +LICENSE = "GPL" +SECTION = "x11/office" +DEPENDS = "tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring " +RDEPENDS = "espgs " +RRECOMMENDS = "gnome-vfs-plugin-file" +PR = "r1" + +inherit gnome pkgconfig gtk-icon-cache + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.9/${PN}-${PV}.tar.bz2 \ + file://no-icon-theme.diff;patch=1;pnum=0" + +EXTRA_OECONF = "--without-libgnome --disable-thumbnailer" + diff --git a/packages/ftpd-topfield/ftpd-topfield_0.7.1.bb b/packages/ftpd-topfield/ftpd-topfield_0.7.3.bb index 5ba92e0930..f86524b8cf 100755 --- a/packages/ftpd-topfield/ftpd-topfield_0.7.1.bb +++ b/packages/ftpd-topfield/ftpd-topfield_0.7.3.bb @@ -1,12 +1,11 @@ # This package builds the ftpd-topfield program -PR = "r0" DESCRIPTION = "ftpd-topfield - FTP access to TopField PVR" HOMEPAGE = "http://sourceforge.net/projects/puppy" SECTION = "net" LICENSE = "MIT" -SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_7_1 \ - cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_1 \ +SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_7_3 \ + cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_3 \ file://init" # The source will end up in the subdirectory 'ftpd-topfield' - no release name diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb index f3968f512d..c95c2e5953 100644 --- a/packages/gcc/gcc-cross-sdk_4.1.2.bb +++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb @@ -27,7 +27,6 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \ file://602-sdk-libstdc++-includes.patch;patch=1 \ file://740-sh-pr24836.patch;patch=1 \ file://800-arm-bigendian.patch;patch=1 \ - file://801-arm-bigendian-eabi.patch;patch=1 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ file://gcc41-configure.in.patch;patch=1 \ diff --git a/packages/gcc/gcc4-build-sdk.inc b/packages/gcc/gcc4-build-sdk.inc index 86aa566e5c..b75e8a57c9 100644 --- a/packages/gcc/gcc4-build-sdk.inc +++ b/packages/gcc/gcc4-build-sdk.inc @@ -1,4 +1,6 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' +USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' + STAGING_TARGET_INCDIR = "${STAGING_DIR}/${TARGET_SYS}/include" STAGING_TARGET_LIBDIR = "${STAGING_DIR}/${TARGET_SYS}/lib" diff --git a/packages/gdb/gdb_6.6.bb b/packages/gdb/gdb_6.6.bb index 1bfe3dfecf..7be444012d 100644 --- a/packages/gdb/gdb_6.6.bb +++ b/packages/gdb/gdb_6.6.bb @@ -4,12 +4,13 @@ LICENSE="GPL" SECTION = "devel" PRIORITY = "optional" DEPENDS = "ncurses readline" -PR = "r0" +PR = "r1" PACKAGES =+ 'gdbserver ' FILES_gdbserver = '${bindir}/gdbserver' -RRECOMMENDS_gdb = "glibc-thread-db" +#only append it for glib, not for uclibcc +RRECOMMENDS_gdb_append_linux = " glibc-thread-db " inherit autotools gettext diff --git a/packages/gettext/gettext-0.14.1/gettext-error_print_progname.patch b/packages/gettext/gettext-0.14.1/gettext-error_print_progname.patch new file mode 100644 index 0000000000..615a53edd5 --- /dev/null +++ b/packages/gettext/gettext-0.14.1/gettext-error_print_progname.patch @@ -0,0 +1,12 @@ +diff -ur gettext-0.14.6/gettext-tools/lib/error.h gettext-0.14.6-patched/gettext-tools/lib/error.h +--- gettext-0.14.6/gettext-tools/lib/error.h 2005-05-20 16:03:42.000000000 -0500 ++++ gettext-0.14.6-patched/gettext-tools/lib/error.h 2007-01-13 20:57:24.422168053 -0600 +@@ -50,7 +50,7 @@ + /* If NULL, error will flush stdout, then print on stderr the program + name, a colon and a space. Otherwise, error will call this + function without parameters instead. */ +-extern DLL_VARIABLE void (*error_print_progname) (void); ++void (*error_print_progname) (void); + + /* This variable is incremented each time `error' is called. */ + extern DLL_VARIABLE unsigned int error_message_count; diff --git a/packages/gettext/gettext_0.14.1.bb b/packages/gettext/gettext_0.14.1.bb index 906aba8d53..1cc272bf14 100644 --- a/packages/gettext/gettext_0.14.1.bb +++ b/packages/gettext/gettext_0.14.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU internationalization library." HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" SECTION = "libs" LICENSE = "GPL" -PR = "r4" +PR = "r5" PROVIDES = "virtual/libintl" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ @@ -10,6 +10,9 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://fixchicken.patch;patch=1;pnum=1 \ file://getline.m4.patch;patch=1" +SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1" +SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1" + PARALLEL_MAKE = "" inherit autotools diff --git a/packages/gimp/babl_svn.bb b/packages/gimp/babl_svn.bb new file mode 100644 index 0000000000..a32d6ce31a --- /dev/null +++ b/packages/gimp/babl_svn.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Babl is a dynamic, any to any, pixel format conversion library." +LICENSE = "LGPL" + +PV = "0.0.14+svn${SRCDATE}" +PR = "r1" + +inherit gnome + +SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk" + +S = "${WORKDIR}/trunk" + +do_stage() { + autotools_stage_all +} + + +FILES_${PN} += "${libdir}/babl-0.0/" +FILES_${PN}-dbg = "${libdir}/babl-0.0/.debug/" + + diff --git a/packages/gimp/gegl_svn.bb b/packages/gimp/gegl_svn.bb new file mode 100644 index 0000000000..91d654d43a --- /dev/null +++ b/packages/gimp/gegl_svn.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "GEGL (Generic Graphics Library) is a graph based image processing framework." +LICENSE = "LGPL" +DEPENDS = "babl glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual/libsdl" + +PV = "0.0.12+svn${SRCDATE}" + +inherit gnome + +SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk" + +S = "${WORKDIR}/trunk" + +do_configure_prepend() { + sed -i -e s:tools\ docs:tools:g Makefile.am +} + +FILES_${PN} += "${libdir}/gegl-1.0" +FILES_${PN}-dbg += "${libdir}/gegl-1.0/.debug" + + +do_stage() { + autotools_stage_all +} + diff --git a/packages/gimp/gimp_2.3.10.bb b/packages/gimp/gimp_2.3.10.bb index a1e875be89..f43140eca4 100644 --- a/packages/gimp/gimp_2.3.10.bb +++ b/packages/gimp/gimp_2.3.10.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GIMP is the GNU Image Manipulation Program." HOMEPAGE = "http://www.gimp.org" SECTION = "x11/graphics" LICENSE = "GPL" -PR = "r1" +PR = "r2" DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff" @@ -25,3 +25,11 @@ do_configure_append() { find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g } + +FILES_${PN} += "${datadir}/icons \ + ${datadir}/mime-info \ + ${datadir}/application-registry " + +FILES_${PN}-dbg += "${libdir}/gimp/2.0/plug-ins/.debug \ + ${libdir}/gimp/2.0/modules/.debug" + diff --git a/packages/gnome/gnome-doc-utils_0.10.3.bb b/packages/gnome/gnome-doc-utils_0.10.3.bb new file mode 100644 index 0000000000..e39aa4018b --- /dev/null +++ b/packages/gnome/gnome-doc-utils_0.10.3.bb @@ -0,0 +1,16 @@ +LICENSE = "GPL/LGPL" +DEPENDS = "libxml2 libxslt" + +PR = "r0" + +inherit gnome + +EXTRA_OECONF = "--disable-scrollkeeper" + +FILES_${PN} += "${datadir}/xml*" + +do_stage() { + mkdir -p ${STAGING_DATADIR}/xml/gnome/xslt/ + cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/ + autotools_stage_all +} diff --git a/packages/gpe-bluetooth/gpe-bluetooth_svn.bb b/packages/gpe-bluetooth/gpe-bluetooth_svn.bb new file mode 100644 index 0000000000..26b0215238 --- /dev/null +++ b/packages/gpe-bluetooth/gpe-bluetooth_svn.bb @@ -0,0 +1,8 @@ +require gpe-bluetooth.inc + +PV = "0.54+svn${SRCDATE}" +PR = "r0" + +SRC_URI = "${GPE_SVN}" + +S = ${WORKDIR}/${PN}
\ No newline at end of file diff --git a/packages/grep/grep-2.5.1/.mtn2git_empty b/packages/grep/grep-2.5.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/grep/grep-2.5.1/.mtn2git_empty diff --git a/packages/grep/grep-2.5.1/uclibc-fix.patch b/packages/grep/grep-2.5.1/uclibc-fix.patch new file mode 100644 index 0000000000..f67177f6ab --- /dev/null +++ b/packages/grep/grep-2.5.1/uclibc-fix.patch @@ -0,0 +1,52 @@ +Fix to use mempcpy instead of __mempcpy. This is needed for uclibc which +doesn't define __mempcpy only mempcpy. Since both uclibc and glibc have +mempcpy we'll just use that instead. + +Index: grep-2.5.1/intl/localealias.c +=================================================================== +--- grep-2.5.1.orig/intl/localealias.c 2002-03-14 00:39:06.000000000 +1100 ++++ grep-2.5.1/intl/localealias.c 2007-05-17 13:53:58.000000000 +1000 +@@ -65,7 +65,7 @@ + # define strcasecmp __strcasecmp + + # ifndef mempcpy +-# define mempcpy __mempcpy ++# error "mempcpy not detected" + # endif + # define HAVE_MEMPCPY 1 + # define HAVE___FSETLOCKING 1 +Index: grep-2.5.1/lib/getopt.c +=================================================================== +--- grep-2.5.1.orig/lib/getopt.c 2001-03-04 16:33:12.000000000 +1100 ++++ grep-2.5.1/lib/getopt.c 2007-05-17 13:51:44.000000000 +1000 +@@ -326,7 +326,7 @@ + nonoption_flags_len = nonoption_flags_max_len = 0; + else + { +- memset (__mempcpy (new_str, __getopt_nonoption_flags, ++ memset (mempcpy (new_str, __getopt_nonoption_flags, + nonoption_flags_max_len), + '\0', top + 1 - nonoption_flags_max_len); + nonoption_flags_max_len = top + 1; +@@ -437,7 +437,7 @@ + if (__getopt_nonoption_flags == NULL) + nonoption_flags_max_len = -1; + else +- memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), ++ memset (mempcpy (__getopt_nonoption_flags, orig_str, len), + '\0', nonoption_flags_max_len - len); + } + } +Index: grep-2.5.1/lib/regex.c +=================================================================== +--- grep-2.5.1.orig/lib/regex.c 2001-04-03 04:04:45.000000000 +1000 ++++ grep-2.5.1/lib/regex.c 2007-05-17 13:51:48.000000000 +1000 +@@ -7842,7 +7842,7 @@ + if (msg_size > errbuf_size) + { + #if defined HAVE_MEMPCPY || defined _LIBC +- *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; ++ *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; + #else + memcpy (errbuf, msg, errbuf_size - 1); + errbuf[errbuf_size - 1] = 0; diff --git a/packages/grep/grep-native_2.5.1.bb b/packages/grep/grep-native_2.5.1.bb index cacd675928..abc2ea46cb 100644 --- a/packages/grep/grep-native_2.5.1.bb +++ b/packages/grep/grep-native_2.5.1.bb @@ -9,3 +9,5 @@ do_stage () { install -m 755 src/egrep ${STAGING_BINDIR} install -m 755 src/fgrep ${STAGING_BINDIR} } + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/grep-${PV}" diff --git a/packages/grep/grep_2.5.1.bb b/packages/grep/grep_2.5.1.bb index 7bcabef167..6d184b8c4c 100644 --- a/packages/grep/grep_2.5.1.bb +++ b/packages/grep/grep_2.5.1.bb @@ -1,9 +1,10 @@ LICENSE = "GPL" SECTION = "console/utils" DESCRIPTION = "grep GNU utility" -PR = "r1" +PR = "r2" -SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2" +SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \ + file://uclibc-fix.patch;patch=1" inherit autotools diff --git a/packages/gtk-webcore/osb-jscore_svn.bb b/packages/gtk-webcore/osb-jscore_svn.bb index 25e42cd85c..51597b0908 100644 --- a/packages/gtk-webcore/osb-jscore_svn.bb +++ b/packages/gtk-webcore/osb-jscore_svn.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" DEFAULT_PREFERENCE = "-1" PV = "0.5.2+svn${SRCDATE}" -PR = "r0" +PR = "r1" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=JavaScriptCore;proto=https \ file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;patch=1" @@ -28,14 +28,14 @@ do_configure () { } do_stage () { - oe_libinstall -so -C kjs libjscore ${STAGING_LIBDIR} + oe_libinstall -so -C kjs libgtk_webcore_jscore ${STAGING_LIBDIR} autotools_stage_includes install -d ${STAGING_INCDIR}/osb/JavaScriptCore for i in ${S}/kjs/*.h ${S}/kjs/new; do install -m 0644 $i ${STAGING_INCDIR}/osb/JavaScriptCore - install -d ${STAGING_INCDIR}/../share/osb-jscore - install -m 0755 ${S}/kjs/create_hash_table ${STAGING_INCDIR}/../share/osb-jscore + install -d ${STAGING_INCDIR}/../share/gtk-webcore-jscore + install -m 0755 ${S}/kjs/create_hash_table ${STAGING_INCDIR}/../share/gtk-webcore-jscore done } diff --git a/packages/gtk-webcore/osb-nrcit_svn.bb b/packages/gtk-webcore/osb-nrcit_svn.bb index e42bcd4445..78f3af7b6f 100644 --- a/packages/gtk-webcore/osb-nrcit_svn.bb +++ b/packages/gtk-webcore/osb-nrcit_svn.bb @@ -29,7 +29,7 @@ do_configure () { } do_stage () { - oe_libinstall -so -C src libnrcit ${STAGING_LIBDIR} + oe_libinstall -so -C src libgtk_webcore_nrcit ${STAGING_LIBDIR} autotools_stage_includes diff --git a/packages/gtk-webcore/osb-nrcore_svn.bb b/packages/gtk-webcore/osb-nrcore_svn.bb index 7959a7e752..a6a70059fa 100644 --- a/packages/gtk-webcore/osb-nrcore_svn.bb +++ b/packages/gtk-webcore/osb-nrcore_svn.bb @@ -11,3 +11,14 @@ SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;modul S = "${WORKDIR}/NRCore" +do_stage () { + oe_libinstall -so libgtk_webcore_nrcore ${STAGING_LIBDIR} + oe_libinstall -so -C kwiq libgtk_webcore_nrcore_kwiq_gtk ${STAGING_LIBDIR} + + autotools_stage_includes + + install -d ${STAGING_INCDIR}/osb/NRCore + for i in ${S}/kwiq/WebCore*.h ${S}/kwiq/KWIQ*.h; do + install -m 0644 $i ${STAGING_INCDIR}/osb/NRCore + done +} diff --git a/packages/havp/havp-0.82/.mtn2git_empty b/packages/havp/havp-0.82/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/havp/havp-0.82/.mtn2git_empty diff --git a/packages/havp/files/sysconfdir-is-etc.patch b/packages/havp/havp-0.82/sysconfdir-is-etc.patch index 518a56f440..518a56f440 100644 --- a/packages/havp/files/sysconfdir-is-etc.patch +++ b/packages/havp/havp-0.82/sysconfdir-is-etc.patch diff --git a/packages/havp/havp-0.86/.mtn2git_empty b/packages/havp/havp-0.86/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/havp/havp-0.86/.mtn2git_empty diff --git a/packages/havp/havp-0.86/reconfigure.patch b/packages/havp/havp-0.86/reconfigure.patch new file mode 100644 index 0000000000..6485efaa42 --- /dev/null +++ b/packages/havp/havp-0.86/reconfigure.patch @@ -0,0 +1,164 @@ +Fix templates for autoreconf. Also copy non autoheader generated settings +from default.h.in to defs.h and include that from the autogenerated +default.h - maybe there's some way to stop autoreconf wiping them all out +but I have no idea what that is. This at least makes it all work as +expected. + +Index: havp-0.86/configure.in +=================================================================== +--- havp-0.86.orig/configure.in 2007-03-17 23:34:01.000000000 +1100 ++++ havp-0.86/configure.in 2007-05-16 11:17:27.000000000 +1000 +@@ -9,6 +9,7 @@ + AC_PREFIX_DEFAULT(/usr/local) + + AC_CONFIG_HEADER(havp/default.h) ++AH_BOTTOM([#include "defs.h"]) + + AC_ARG_ENABLE(locking,[ --disable-locking Disable mandatory locking (not needed on Linux/Solaris system)], enable_locking=$enableval, enable_locking=yes) + AC_ARG_ENABLE(ssl-tunnel,[ --enable-ssl-tunnel Enable SSL proxying (not scanned, only forwarded!)], enable_ssl_tunnel=$enableval, enable_ssl_tunnel=no) +@@ -53,7 +54,7 @@ + then + AC_MSG_RESULT([disabled, no dynamic scanning!]) + +- AC_DEFINE(NOMAND) ++ AC_DEFINE(NOMAND, 1, [Enable mandatory locking]) + else + if test "$mandatory" = "yes" + then +@@ -78,7 +79,7 @@ + + if test "$enable_ssl_tunnel" = "yes" + then +- AC_DEFINE(SSLTUNNEL) ++ AC_DEFINE(SSLTUNNEL, 1, [Enable SSL tunnel]) + fi + + AC_MSG_CHECKING(for ClamAV scanner library) +@@ -118,7 +119,7 @@ + LDFLAGS="$LDFLAGS -lclamav" + + SCANNEROBJECTS="clamlibscanner.o" +- AC_DEFINE(USECLAMLIB) ++ AC_DEFINE(USECLAMLIB, 1, [Enable clamav library]) + + AC_MSG_RESULT([found $clamversion in $clamprefix]) + else +@@ -136,7 +137,7 @@ + SCANNEROBJECTS="$SCANNEROBJECTS trophiescanner.o" + LDFLAGS="-L/etc/iscan -lvsapi $LDFLAGS" + +- AC_DEFINE(USETROPHIE) ++ AC_DEFINE(USETROPHIE, 1, [Use Trend Micro scanner]) + else + AC_MSG_RESULT([/etc/iscan/libvsapi.so not found, disabled]) + fi +@@ -151,14 +152,14 @@ + test "$localstatedir" = '${prefix}/var' && localstatedir=/var || localstatedir=$localstatedir + sysconfdir=`eval echo $sysconfdir | $PERL -pe 's#/havp/?$##'` + localstatedir=`eval echo $localstatedir` +-AC_DEFINE_UNQUOTED(CONFIGFILE, "$sysconfdir/havp/havp.config") +-AC_DEFINE_UNQUOTED(WHITELISTFILE, "$sysconfdir/havp/whitelist") +-AC_DEFINE_UNQUOTED(BLACKLISTFILE, "$sysconfdir/havp/blacklist") +-AC_DEFINE_UNQUOTED(TEMPLATEPATH, "$sysconfdir/havp/templates/en") +-AC_DEFINE_UNQUOTED(ACCESSLOG, "$localstatedir/log/havp/access.log") +-AC_DEFINE_UNQUOTED(ERRORLOG, "$localstatedir/log/havp/error.log") +-AC_DEFINE_UNQUOTED(SCANTEMPFILE, "$localstatedir/tmp/havp/havp-XXXXXX") +-AC_DEFINE_UNQUOTED(PIDFILE, "$localstatedir/run/havp/havp.pid") ++AC_DEFINE_UNQUOTED([CONFIGFILE], "$sysconfdir/havp/havp.config", [Config file]) ++AC_DEFINE_UNQUOTED([WHITELISTFILE], "$sysconfdir/havp/whitelist", [Whitelist file]) ++AC_DEFINE_UNQUOTED([BLACKLISTFILE], "$sysconfdir/havp/blacklist", [Blkaclist file]) ++AC_DEFINE_UNQUOTED([TEMPLATEPATH], "$sysconfdir/havp/templates/en", [Template path]) ++AC_DEFINE_UNQUOTED([ACCESSLOG], "$localstatedir/log/havp/access.log", [Access log file]) ++AC_DEFINE_UNQUOTED([ERRORLOG], "$localstatedir/log/havp/error.log", [Error log file]) ++AC_DEFINE_UNQUOTED([SCANTEMPFILE], "$localstatedir/tmp/havp/havp-XXXXXX", [Scanner temp file]) ++AC_DEFINE_UNQUOTED([PIDFILE], "$localstatedir/run/havp/havp.pid", [PID file]) + + AC_SUBST(SCANNEROBJECTS) + AC_SUBST(CFLAGS) +Index: havp-0.86/havp/defs.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ havp-0.86/havp/defs.h 2007-05-16 11:19:59.000000000 +1000 +@@ -0,0 +1,82 @@ ++#define VERSION "0.86" ++ ++//############################################################## ++//Define if you want to rewrite a URL ++//#define REWRITE URLRewrite["havp"]="www.server-side.de"; URLRewrite["www.havp"]="www.server-side.de"; ++ ++//############################################################## ++//Parameters in Configurationfile ++ ++#define CONFIGPARAMS \ ++ "WHITELISTFIRST","TEMPDIR","RANGE","USER","GROUP", \ ++ "SERVERNUMBER","PORT","BIND_ADDRESS","SOURCE_ADDRESS","KEEPBACKBUFFER", \ ++ "KEEPBACKTIME","TRICKLING","MAXSCANSIZE","WHITELIST","BLACKLIST","PIDFILE", \ ++ "DAEMON","TRANSPARENT","LOG_OKS","ACCESSLOG","ERRORLOG","LOGLEVEL", \ ++ "USESYSLOG","SYSLOGNAME","SYSLOGFACILITY","SYSLOGLEVEL","IGNOREVIRUS", \ ++ "DISPLAYINITIALMESSAGES","DBRELOAD","SCANTEMPFILE","TEMPLATEPATH", \ ++ "PARENTPROXY","PARENTPORT","MAXSERVERS","FORWARDED_IP","X_FORWARDED_FOR","FAILSCANERROR", \ ++ "MAXDOWNLOADSIZE","SCANNERTIMEOUT","STREAMUSERAGENT","STREAMSCANSIZE","SCANIMAGES", \ ++ "ENABLECLAMLIB","CLAMDBDIR","CLAMBLOCKBROKEN","CLAMBLOCKMAX","CLAMBLOCKENCRYPTED", \ ++ "CLAMMAXFILES","CLAMMAXFILESIZE","CLAMMAXRECURSION","CLAMMAXRATIO", \ ++ "ENABLEAVG","AVGSERVER","AVGPORT", \ ++ "ENABLEAVESERVER","AVESOCKET", \ ++ "ENABLEFPROT","FPROTSERVER","FPROTPORT", \ ++ "ENABLETROPHIE","TROPHIEMAXFILES","TROPHIEMAXFILESIZE","TROPHIEMAXRATIO", \ ++ "ENABLENOD32","NOD32SOCKET","NOD32VERSION", \ ++ "ENABLECLAMD","CLAMDSOCKET","CLAMDSERVER","CLAMDPORT", \ ++ "ENABLESOPHIE","SOPHIESOCKET", \ ++ "ENABLEAVAST","AVASTSOCKET","AVASTSERVER","AVASTPORT", \ ++ "ENABLEARCAVIR","ARCAVIRSOCKET" ++//SCANNERS ++ ++ ++//############################################################## ++//Configuration not setable in havp.config ++ ++//Time format ++#define TIMEFORMAT "%d/%m/%Y %H:%M:%S " ++ ++//CONNTIMEOUT in seconds ++#define CONNTIMEOUT 60 ++ ++//RECVTIMEOUT in seconds ++#define RECVTIMEOUT 120 ++ ++//SENDTIMEOUT in seconds ++#define SENDTIMEOUT 120 ++ ++//Maximum client connection waiting for accept ++#define MAXCONNECTIONS 1024 ++ ++//Maximum bytes received in one request ++#define MAXRECV 14600 ++ ++//Maximum logfile line length ++#define STRINGLENGTH 1000 ++ ++//Maximum hardlock size - do not change ++#define MAXFILELOCKSIZE 1000000000 ++ ++//Valid Methods ++#define METHODS \ ++ "GET","POST","HEAD","CONNECT","PUT","TRACE","PURGE","OPTIONS","UNLOCK", \ ++ "SEARCH","PROPFIND","BPROPFIND","PROPPATCH","BPROPPATCH","MKCOL","COPY", \ ++ "BCOPY","MOVE","LOCK","BMOVE","DELETE","BDELETE","SUBSCRIBE","UNSUBSCRIBE", \ ++ "POLL","REPORT","ERROR","NONE" ++ ++//Maximum length of SCANTEMPFILE ++#define MAXSCANTEMPFILELENGTH 200 ++ ++//Maximum length of http headers ++#define MAXHTTPHEADERLENGTH 20480 ++ ++// HTML Error String ++#define ERROR_DNS "dns.html" ++#define VIRUS_FOUND "virus.html" ++#define ERROR_SCANNER "scanner.html" ++#define ERROR_DOWN "down.html" ++#define ERROR_INVALID "invalid.html" ++#define ERROR_REQUEST "request.html" ++#define ERROR_BODY "error.html" ++#define ERROR_BLACKLIST "blacklist.html" ++#define ERROR_MAXSIZE "maxsize.html" diff --git a/packages/havp/havp.inc b/packages/havp/havp.inc new file mode 100644 index 0000000000..e0f4849ecf --- /dev/null +++ b/packages/havp/havp.inc @@ -0,0 +1,87 @@ +DESCRIPTION = "HAVP (HTTP Antivirus Proxy) is a proxy with a ClamAV \ +anti-virus scanner. The main aims are continuous, non-blocking \ +downloads and smooth scanning of dynamic and password protected HTTP \ +traffic. Havp antivirus proxy has a parent and transparent proxy \ +mode. It can be used with squid or standalone." +HOMEPAGE = "http://www.server-side.de" +SECTION = "network" +LICENSE = "GPLv2" +DEPENDS = "clamav" +RDEPENDS_${PN} += "${PN}-templates-css2 ${PN}-templates-en" + +SRC_URI = "http://www.server-side.de/download/havp-${PV}.tar.gz \ + file://havp.init \ + file://doc.configure.txt \ + file://volatiles.05_havp" + +inherit autotools update-rc.d + +EXTRA_OECONF = "--with-scanner=libclamav" + +do_configure_append () { + # Change the paths for /usr/local/etc (patch was applied to change them) + # And enable clamav as the scanner that is to be used. + sed -e 's:ENABLECLAMLIB false:ENABLECLAMLIB true:' \ + -e 's:/usr/local/etc:/etc:' \ + etc/havp/havp.config > etc/havp/havp.config.oe +} +do_install () { + install -m 0755 -d ${D}${sbindir} ${D}${sysconfdir}/havp \ + ${D}${sysconfdir}/init.d ${D}${docdir}/havp \ + ${D}${sysconfdir}/default/volatiles + install -m 755 havp/havp ${D}${sbindir} + install -m 755 ${WORKDIR}/havp.init ${D}${sysconfdir}/init.d/havp + install -m 755 INSTALL ${D}${docdir}/havp + install -m 755 ${WORKDIR}/doc.configure.txt ${D}${docdir}/havp/configure.txt + install -m 644 etc/havp/havp.config.oe ${D}${sysconfdir}/havp/havp.config + install -m 644 etc/havp/havp.config.oe ${D}${docdir}/havp/havp.config.default + + for i in whitelist blacklist; do + install -m 644 etc/havp/$i ${D}${sysconfdir}/havp/$i + done + cp -r etc/havp/templates ${D}${sysconfdir}/havp + chmod -R a+rX ${D}${sysconfdir}/havp/templates + + # We need some /var directories + for i in 05_havp; do + install -m 0644 ${WORKDIR}/volatiles.$i ${D}${sysconfdir}/default/volatiles/$i + done +} + +PACKAGES = "${PN}-dbg ${PN}-doc \ + ${PN}-templates-br ${PN}-templates-css2 ${PN}-templates-de \ + ${PN}-templates-en ${PN}-templates-es ${PN}-templates-fr \ + ${PN}-templates-it ${PN}-templates-nl ${PN}-templates-pf \ + ${PN}-templates-pl ${PN}-templates-ru ${PN}-templates-sv \ + ${PN}" + +FILES_${PN} = "${sysconfdir}/havp/blacklist ${sysconfdir}/havp/whitelist \ + ${sysconfdir}/havp/havp.config* \ + ${sysconfdir}/init.d ${sysconfdir}/default ${sbindir}/*" +FILES_${PN}-templates-br = "${sysconfdir}/havp/templates/br" +FILES_${PN}-templates-css2 = "${sysconfdir}/havp/templates/css2" +FILES_${PN}-templates-de = "${sysconfdir}/havp/templates/de" +FILES_${PN}-templates-en = "${sysconfdir}/havp/templates/en" +FILES_${PN}-templates-es = "${sysconfdir}/havp/templates/es" +FILES_${PN}-templates-fr = "${sysconfdir}/havp/templates/fr" +FILES_${PN}-templates-it = "${sysconfdir}/havp/templates/it" +FILES_${PN}-templates-nl = "${sysconfdir}/havp/templates/nl" +FILES_${PN}-templates-pf = "${sysconfdir}/havp/templates/pf" +FILES_${PN}-templates-pl = "${sysconfdir}/havp/templates/pl" +FILES_${PN}-templates-ru = "${sysconfdir}/havp/templates/ru" +FILES_${PN}-templates-sv = "${sysconfdir}/havp/templates/sv" + +# Add havp's user and groups +pkg_postinst_${PN} () { + grep -q havp: /etc/group || addgroup havp + grep -q havp: /etc/passwd || \ + adduser --disabled-password --home=${localstatedir}/lib/havp/ --system \ + --ingroup havp --no-create-home -g "HAVP" havp + /etc/init.d/populate-volatile.sh update +} + +CONFFILES_${PN} = "${sysconfdir}/havp/havp.config \ + ${sysconfdir}/havp/blacklist ${sysconfdir}/havp/whitelist" + +INITSCRIPT_NAME = "havp" +INITSCRIPT_PARAMS = "defaults 55 45" diff --git a/packages/havp/havp_0.82.bb b/packages/havp/havp_0.82.bb index 9ec5fb5539..447c37b01b 100644 --- a/packages/havp/havp_0.82.bb +++ b/packages/havp/havp_0.82.bb @@ -1,89 +1,5 @@ -DESCRIPTION = "HAVP (HTTP Antivirus Proxy) is a proxy with a ClamAV \ -anti-virus scanner. The main aims are continuous, non-blocking \ -downloads and smooth scanning of dynamic and password protected HTTP \ -traffic. Havp antivirus proxy has a parent and transparent proxy \ -mode. It can be used with squid or standalone." -HOMEPAGE = "http://www.server-side.de" -SECTION = "network" -LICENSE = "GPLv2" -DEPENDS = "clamav" -RDEPENDS_${PN} += "${PN}-templates-css2 ${PN}-templates-en" -PR = "r3" - -SRC_URI = "http://www.server-side.de/download/havp-${PV}.tar.gz \ - file://sysconfdir-is-etc.patch;patch=1 \ - file://havp.init \ - file://doc.configure.txt \ - file://volatiles.05_havp" - -inherit autotools update-rc.d - -EXTRA_OECONF = "--with-scanner=libclamav" - -do_configure_append () { - # Change the paths for /usr/local/etc (patch was applied to change them) - # And enable clamav as the scanner that is to be used. - sed -e 's:ENABLECLAMLIB false:ENABLECLAMLIB true:' \ - -e 's:/usr/local/etc:/etc:' \ - etc/havp/havp.config > etc/havp/havp.config.oe -} -do_install () { - install -m 0755 -d ${D}${sbindir} ${D}${sysconfdir}/havp \ - ${D}${sysconfdir}/init.d ${D}${docdir}/havp \ - ${D}${sysconfdir}/default/volatiles - install -m 755 havp/havp ${D}${sbindir} - install -m 755 ${WORKDIR}/havp.init ${D}${sysconfdir}/init.d/havp - install -m 755 INSTALL ${D}${docdir}/havp - install -m 755 ${WORKDIR}/doc.configure.txt ${D}${docdir}/havp/configure.txt - install -m 644 etc/havp/havp.config.oe ${D}${sysconfdir}/havp/havp.config - install -m 644 etc/havp/havp.config.oe ${D}${docdir}/havp/havp.config.default - - for i in whitelist blacklist; do - install -m 644 etc/havp/$i ${D}${sysconfdir}/havp/$i - done - cp -r etc/havp/templates ${D}${sysconfdir}/havp - chmod -R a+rX ${D}${sysconfdir}/havp/templates +require havp.inc - # We need some /var directories - for i in 05_havp; do - install -m 0644 ${WORKDIR}/volatiles.$i ${D}${sysconfdir}/default/volatiles/$i - done -} - -PACKAGES = "${PN}-dbg ${PN}-doc \ - ${PN}-templates-br ${PN}-templates-css2 ${PN}-templates-de \ - ${PN}-templates-en ${PN}-templates-es ${PN}-templates-fr \ - ${PN}-templates-it ${PN}-templates-nl ${PN}-templates-pf \ - ${PN}-templates-pl ${PN}-templates-ru ${PN}-templates-sv \ - ${PN}" - -FILES_${PN} = "${sysconfdir}/havp/blacklist ${sysconfdir}/havp/whitelist \ - ${sysconfdir}/havp/havp.config* \ - ${sysconfdir}/init.d ${sysconfdir}/default ${sbindir}/*" -FILES_${PN}-templates-br = "${sysconfdir}/havp/templates/br" -FILES_${PN}-templates-css2 = "${sysconfdir}/havp/templates/css2" -FILES_${PN}-templates-de = "${sysconfdir}/havp/templates/de" -FILES_${PN}-templates-en = "${sysconfdir}/havp/templates/en" -FILES_${PN}-templates-es = "${sysconfdir}/havp/templates/es" -FILES_${PN}-templates-fr = "${sysconfdir}/havp/templates/fr" -FILES_${PN}-templates-it = "${sysconfdir}/havp/templates/it" -FILES_${PN}-templates-nl = "${sysconfdir}/havp/templates/nl" -FILES_${PN}-templates-pf = "${sysconfdir}/havp/templates/pf" -FILES_${PN}-templates-pl = "${sysconfdir}/havp/templates/pl" -FILES_${PN}-templates-ru = "${sysconfdir}/havp/templates/ru" -FILES_${PN}-templates-sv = "${sysconfdir}/havp/templates/sv" - -# Add havp's user and groups -pkg_postinst_${PN} () { - grep -q havp: /etc/group || addgroup havp - grep -q havp: /etc/passwd || \ - adduser --disabled-password --home=${localstatedir}/lib/havp/ --system \ - --ingroup havp --no-create-home -g "HAVP" havp - /etc/init.d/populate-volatile.sh update -} - -CONFFILES_${PN} = "${sysconfdir}/havp/havp.config \ - ${sysconfdir}/havp/blacklist ${sysconfdir}/havp/whitelist" +PR = "r3" -INITSCRIPT_NAME = "havp" -INITSCRIPT_PARAMS = "defaults 55 45" +SRC_URI_append += " file://sysconfdir-is-etc.patch;patch=1" diff --git a/packages/havp/havp_0.86.bb b/packages/havp/havp_0.86.bb new file mode 100644 index 0000000000..c5bb0636bb --- /dev/null +++ b/packages/havp/havp_0.86.bb @@ -0,0 +1,5 @@ +require havp.inc + +PR = "r0" + +SRC_URI_append += " file://reconfigure.patch;patch=1" diff --git a/packages/helloworld/helloworld_1.0.0.bb b/packages/helloworld/helloworld_1.0.0.bb deleted file mode 100644 index 9e68b0bd61..0000000000 --- a/packages/helloworld/helloworld_1.0.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Minimal statically compiled Hello world!" -LICENSE = "GPL" -PR = "r0" - -S = "${WORKDIR}/${P}" - -do_fetch () { - mkdir -p ${WORKDIR}/${P} - cd ${WORKDIR}/${P} - echo -e "#include <stdio.h>\nint main(void)\n{\n\tprintf(\"Hello world!\\\n\");\twhile(1);\n\treturn 0;\n}\n" >helloworld.c -} - -do_compile () { - ${CC} -o helloworld helloworld.c -static -} - -do_install () { - install -d ${D}${bindir} - install -m 0755 helloworld ${D}${bindir}/ - # /bin/init is on purpose, it is tried after /sbin/init and /etc/init - # so if a sysvinit is installed, it will be used instead of helloworld - install -d ${D}${base_bindir} - ln -sf ${bindir}/helloworld ${D}${base_bindir}/init -} - diff --git a/packages/hicolor-icon-theme/hicolor-icon-theme_0.9.bb b/packages/hicolor-icon-theme/hicolor-icon-theme_0.9.bb index 2f7e21892a..f50f8f8a32 100644 --- a/packages/hicolor-icon-theme/hicolor-icon-theme_0.9.bb +++ b/packages/hicolor-icon-theme/hicolor-icon-theme_0.9.bb @@ -2,6 +2,10 @@ SECTION = "unknown" LICENSE = "GPL" inherit gnome +PR = "r1" + SRC_URI = "http://icon-theme.freedesktop.org/releases/${P}.tar.gz" +PACKAGE_ARCH = "all" + FILES_${PN} += "${datadir}/icons" diff --git a/packages/images/angstrom-minimal-image.bb b/packages/images/angstrom-minimal-image.bb index 54f7ff2c89..90f46a1e01 100644 --- a/packages/images/angstrom-minimal-image.bb +++ b/packages/images/angstrom-minimal-image.bb @@ -1,10 +1,22 @@ -# Hello world image -# gives you a small image with a statically linked +#Angstrom minimalist image +#gives you a small images with ssh access LICENSE = "MIT" PR = "r0" -export IMAGE_BASENAME = "helloworld-image" +ANGSTROM_EXTRA_INSTALL ?= "" +DISTRO_SSH_DAEMON ?= "dropbear" + +DEPENDS = "task-base \ + ${DISTRO_SSH_DAEMON} \ + " + +RDEPENDS = "task-boot \ + ${DISTRO_SSH_DAEMON} \ + " + +export IMAGE_BASENAME = "minimalist-image" export IMAGE_LINGUAS = "" +export PACKAGE_INSTALL = "${RDEPENDS}" inherit image diff --git a/packages/images/helloworld-image.bb b/packages/images/helloworld-image.bb deleted file mode 100644 index 5154752f75..0000000000 --- a/packages/images/helloworld-image.bb +++ /dev/null @@ -1,14 +0,0 @@ -# Hello world image -# Contains *only* a statically linked hello world init program -LICENSE = "MIT" -PR = "r0" - -RDEPENDS = "helloworld" - -export IMAGE_BASENAME = "helloworld-image" -export IMAGE_LINGUAS = "" - -PACKAGE_INSTALL = ${RDEPENDS} - -inherit image - diff --git a/packages/initscripts/initscripts-1.0/volatiles b/packages/initscripts/initscripts-1.0/volatiles index 4320485663..3c680b2643 100644 --- a/packages/initscripts/initscripts-1.0/volatiles +++ b/packages/initscripts/initscripts-1.0/volatiles @@ -21,18 +21,16 @@ # This explains the order of "link before object" as in the example above, where # a link will be created at /var/test pointing to /tmp/testfile and due to this # link the file defined as /var/test will actually be created as /tmp/testfile. -d root root 0775 /var none -d root root 0755 /var/backups none -d root root 0755 /var/cache none -d root root 0755 /var/lib none -d root root 0755 /var/lib/ipkg none -d root root 0755 /var/lib/misc none -d root root 2775 /var/local none -d root root 1777 /var/lock none +d root root 0755 /var/volatile/cache none +d root root 1777 /var/volatile/lock none +d root root 0755 /var/volatile/log none +d root root 0755 /var/volatile/run none +d root root 1777 /var/volatile/tmp none +l root root 0755 /var/cache /var/volatile/cache +l root root 1777 /var/lock /var/volatile/lock +l root root 0755 /var/log /var/volatile/log +l root root 0755 /var/run /var/volatile/run +l root root 1777 /var/tmp /var/volatile/tmp d root root 0755 /var/lock/subsys none -d root root 0755 /var/log none -d root root 0755 /var/run none -d root root 0755 /var/spool none -d root root 1777 /var/tmp none -f root root 0664 /var/run/utmp none f root root 0664 /var/log/wtmp none +f root root 0664 /var/run/utmp none diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 21e3bb2afe..d814e937db 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r90" +PR = "r91" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/packages/install/install-native_0.1.bb b/packages/install/install-native_0.1.bb index 059342e920..70c027bfe1 100644 --- a/packages/install/install-native_0.1.bb +++ b/packages/install/install-native_0.1.bb @@ -9,6 +9,8 @@ PR = "r1" SRC_URI = "file://install-sh" +inherit native + PACKAGES = "" S = "${WORKDIR}" diff --git a/packages/libidl/libidl_0.8.6.bb b/packages/libidl/libidl_0.8.6.bb index ccc93e291a..33a1154357 100644 --- a/packages/libidl/libidl_0.8.6.bb +++ b/packages/libidl/libidl_0.8.6.bb @@ -2,25 +2,19 @@ DESCRIPTION = "Library for parsing CORBA IDL files" SECTION = "x11/gnome/libs" LICENSE = "LGPL" DEPENDS = "glib-2.0 libidl-native" -PR = "r2" +PR = "r3" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-${PV}.tar.bz2" S = "${WORKDIR}/libIDL-${PV}" -inherit autotools pkgconfig +BINCONFIG_GLOB = "*-config-2" +inherit autotools pkgconfig binconfig # Firefox uses the libIDL-config-2 script instead of pkgconfig (for some # strange reason - so we do some sed fu to fix the path there do_stage() { autotools_stage_all - - cat ${S}/libIDL-config-2 | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2 - - if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then - mv ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR_CROSS}/libIDL-config-2 - fi - } FILES_${PN} = "${libdir}/*.so.*" diff --git a/packages/libtool/libtool-cross_1.5.10.bb b/packages/libtool/libtool-cross_1.5.10.bb index fdc8f6ffaf..575448e447 100644 --- a/packages/libtool/libtool-cross_1.5.10.bb +++ b/packages/libtool/libtool-cross_1.5.10.bb @@ -1,7 +1,7 @@ SECTION = "devel" require libtool_${PV}.bb -PR = "r4" +PR = "r5" PACKAGES = "" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" SRC_URI_append = " file://libdir-la.patch;patch=1 \ @@ -21,6 +21,13 @@ do_compile () { do_stage () { install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool + install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ + install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal + install -c config.guess ${STAGING_DATADIR}/libtool/ + install -c config.sub ${STAGING_DATADIR}/libtool/ + install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/ + install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/ + install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/ } do_install () { diff --git a/packages/libtool/libtool-cross_1.5.22.bb b/packages/libtool/libtool-cross_1.5.22.bb index 2188963495..8edb1f0a44 100644 --- a/packages/libtool/libtool-cross_1.5.22.bb +++ b/packages/libtool/libtool-cross_1.5.22.bb @@ -10,6 +10,7 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \ file://prefix.patch;patch=1 \ file://tag.patch;patch=1 \ file://tag1.patch;patch=1 \ +# file://rpath.patch;patch=1 \ file://install-path-check.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" @@ -23,6 +24,13 @@ do_compile () { do_stage () { install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool + install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ + install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal + install -c config.guess ${STAGING_DATADIR}/libtool/ + install -c config.sub ${STAGING_DATADIR}/libtool/ + install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/ + install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/ + install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/ } do_install () { diff --git a/packages/libtool/libtool-native_1.5.10.bb b/packages/libtool/libtool-native_1.5.10.bb index 78e69e06b4..6d8b1a1d7c 100644 --- a/packages/libtool/libtool-native_1.5.10.bb +++ b/packages/libtool/libtool-native_1.5.10.bb @@ -1,7 +1,7 @@ SECTION = "devel" require libtool_${PV}.bb -PR = "r4" +PR = "r5" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" SRC_URI_append = " file://libdir-la.patch;patch=1 \ file://prefix.patch;patch=1 \ @@ -10,8 +10,6 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \ file://install-path-check.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" -STAGING_DATADIR_safe := "${STAGING_DATADIR}" - inherit native do_stage () { @@ -19,22 +17,12 @@ do_stage () { install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR} install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ - for dir in ${STAGING_DATADIR} ${STAGING_DATADIR_safe}; do - ltdldir="${dir}/libtool/libltdl" - install -d $dir/libtool \ - $ltdldir \ - $dir/aclocal - install -c config.guess $dir/libtool/config.guess - install -c config.sub $dir/libtool/config.sub - install -c -m 0644 ltmain.sh $dir/libtool/ - install -c -m 0644 libtool.m4 $dir/aclocal/ - install -c -m 0644 ltdl.m4 $dir/aclocal/ - - for src in README COPYING.LIB Makefile.am configure.ac \ - config-h.in ltdl.c ltdl.h; do - install -m 0644 libltdl/${src} ${ltdldir} - done - done + install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal + install -c config.guess ${STAGING_DATADIR}/libtool/ + install -c config.sub ${STAGING_DATADIR}/libtool/ + install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/ + install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/ + install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/ } do_install () { diff --git a/packages/libtool/libtool-native_1.5.22.bb b/packages/libtool/libtool-native_1.5.22.bb index 35d7f40b09..dec4bf1e14 100644 --- a/packages/libtool/libtool-native_1.5.22.bb +++ b/packages/libtool/libtool-native_1.5.22.bb @@ -12,8 +12,6 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \ file://install-path-check.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" -STAGING_DATADIR_safe := "${STAGING_DATADIR}" - inherit native do_stage () { @@ -21,22 +19,12 @@ do_stage () { install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR} install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ - for dir in ${STAGING_DATADIR} ${STAGING_DATADIR_safe}; do - ltdldir="${dir}/libtool/libltdl" - install -d $dir/libtool \ - $ltdldir \ - $dir/aclocal - install -c config.guess $dir/libtool/config.guess - install -c config.sub $dir/libtool/config.sub - install -c -m 0644 ltmain.sh $dir/libtool/ - install -c -m 0644 libtool.m4 $dir/aclocal/ - install -c -m 0644 ltdl.m4 $dir/aclocal/ - - for src in README COPYING.LIB Makefile.am configure.ac \ - config-h.in ltdl.c ltdl.h; do - install -m 0644 libltdl/${src} ${ltdldir} - done - done + install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal + install -c config.guess ${STAGING_DATADIR}/libtool/ + install -c config.sub ${STAGING_DATADIR}/libtool/ + install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/ + install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/ + install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/ } do_install () { diff --git a/packages/linux/ixp4xx-kernel/2.6.21/defconfig b/packages/linux/ixp4xx-kernel/2.6.21/defconfig index a0242bf951..1bf8a6317a 100644 --- a/packages/linux/ixp4xx-kernel/2.6.21/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.21/defconfig @@ -243,7 +243,6 @@ CONFIG_FPE_NWFPE=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set -# CONFIG_ARTHUR is not set # # Power management options @@ -1165,6 +1164,7 @@ CONFIG_I2C_IXP4XX=y # CONFIG_I2C_NFORCE2 is not set # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_PASEMI is not set # CONFIG_I2C_PROSAVAGE is not set # CONFIG_I2C_SAVAGE4 is not set # CONFIG_I2C_SIS5595 is not set @@ -1880,13 +1880,14 @@ CONFIG_NFSD_V3=y # CONFIG_NFSD_V3_ACL is not set CONFIG_NFSD_V4=y CONFIG_NFSD_TCP=y +CONFIG_ROOT_NFS=y CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=m CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_RPCSEC_GSS_SPKM3 is not set CONFIG_SMB_FS=m # CONFIG_SMB_NLS_DEFAULT is not set diff --git a/packages/linux/ixp4xx-kernel_2.6.21.bb b/packages/linux/ixp4xx-kernel_2.6.21.bb index b998d5933d..59951942c2 100644 --- a/packages/linux/ixp4xx-kernel_2.6.21.bb +++ b/packages/linux/ixp4xx-kernel_2.6.21.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "824" +IXP4XX_KERNEL_SVN_REV = "839" # # The directory containing the patches to be applied is # specified below diff --git a/packages/linux/linux-colinux_2.4.28.bb b/packages/linux/linux-colinux_2.4.28.bb index b74be3d791..dc052afce1 100644 --- a/packages/linux/linux-colinux_2.4.28.bb +++ b/packages/linux/linux-colinux_2.4.28.bb @@ -3,6 +3,8 @@ DESCRIPTION = "User Mode Linux Kernel" LICENSE = "GPL" COLV = "0.6.1" +COMPATIBLE_MACHINE = "colinux" + #http://internap.dl.sourceforge.net/sourceforge/colinux/coLinux-0.6.1.tar.gz SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \ file://colinux-${COLV}.patch;patch=1 \ diff --git a/packages/linux/linux-colinux_2.6.10.bb b/packages/linux/linux-colinux_2.6.10.bb index 8b77a17109..df06ccdd65 100644 --- a/packages/linux/linux-colinux_2.6.10.bb +++ b/packages/linux/linux-colinux_2.6.10.bb @@ -3,6 +3,8 @@ DESCRIPTION = "User Mode Linux Kernel" LICENSE = "GPL" COLV = "0.6.2" +COMPATIBLE_MACHINE = "colinux" + #http://internap.dl.sourceforge.net/sourceforge/colinux/coLinux-${COLV}.tar.gz SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://colinux-${COLV}.patch;patch=1 \ diff --git a/packages/linux/linux-geodegx_2.4.24.bb b/packages/linux/linux-geodegx_2.4.24.bb index 70cb5f4fd7..968127c5f3 100644 --- a/packages/linux/linux-geodegx_2.4.24.bb +++ b/packages/linux/linux-geodegx_2.4.24.bb @@ -2,6 +2,8 @@ # Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) +COMPATIBLE_MACHINE = "geodegx" + KV = "2.4.24" DESCRIPTION = "Linux kernel for the AMD Geode GX processor" LICENSE = "GPL" diff --git a/packages/linux/linux-geodelx_2.6.11.bb b/packages/linux/linux-geodelx_2.6.11.bb index 890aa9483a..7605f68011 100644 --- a/packages/linux/linux-geodelx_2.6.11.bb +++ b/packages/linux/linux-geodelx_2.6.11.bb @@ -2,6 +2,8 @@ # Copyright (C) 2005-2006, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) +COMPATIBLE_MACHINE = "geodelx" + DESCRIPTION = "Linux kernel for the AMD Geode GX5535/LX5536" HOMEPAGE = "http://www.amd.com/embedded" LICENSE = "GPL" diff --git a/packages/linux/linux-handhelds-2.6/h3900/defconfig b/packages/linux/linux-handhelds-2.6/h3900/defconfig index 0e3ab524b4..297be698cb 100644 --- a/packages/linux/linux-handhelds-2.6/h3900/defconfig +++ b/packages/linux/linux-handhelds-2.6/h3900/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh2 -# Sat May 12 20:38:51 2007 +# Thu May 17 14:41:30 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -669,7 +669,8 @@ CONFIG_TOUCHSCREEN_ASIC2=y # CONFIG_TOUCHSCREEN_ADC is not set # CONFIG_TOUCHSCREEN_ADC_DEBOUNCE is not set # CONFIG_TOUCHSCREEN_UCB1400 is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m # # Hardware I/O ports @@ -1081,7 +1082,18 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_JFFS2_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set diff --git a/packages/linux/linux-handhelds-2.6/h4000/defconfig b/packages/linux/linux-handhelds-2.6/h4000/defconfig index 0d9df7a76b..3662bc062d 100644 --- a/packages/linux/linux-handhelds-2.6/h4000/defconfig +++ b/packages/linux/linux-handhelds-2.6/h4000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh2 -# Sat May 12 20:38:53 2007 +# Thu May 17 14:41:32 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -745,7 +745,8 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_ADC is not set CONFIG_TOUCHSCREEN_ADC_DEBOUNCE=y # CONFIG_TOUCHSCREEN_UCB1400 is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m # # Hardware I/O ports diff --git a/packages/linux/linux-handhelds-2.6/h5000/defconfig b/packages/linux/linux-handhelds-2.6/h5000/defconfig index 6038879254..20685be413 100644 --- a/packages/linux/linux-handhelds-2.6/h5000/defconfig +++ b/packages/linux/linux-handhelds-2.6/h5000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh2 -# Sat May 12 20:38:57 2007 +# Thu May 17 14:41:35 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -683,7 +683,8 @@ CONFIG_TOUCHSCREEN_SAMCOP=y # CONFIG_TOUCHSCREEN_ADC is not set CONFIG_TOUCHSCREEN_ADC_DEBOUNCE=y # CONFIG_TOUCHSCREEN_UCB1400 is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m # # Hardware I/O ports @@ -1073,7 +1074,18 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_JFFS2_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set diff --git a/packages/linux/linux-handhelds-2.6/htcuniversal/.mtn2git_empty b/packages/linux/linux-handhelds-2.6/htcuniversal/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-handhelds-2.6/htcuniversal/.mtn2git_empty diff --git a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig new file mode 100644 index 0000000000..eaffec6517 --- /dev/null +++ b/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig @@ -0,0 +1,1400 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.21-hh2 +# Thu May 17 14:41:38 2007 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_RELAY is not set +# CONFIG_BLK_DEV_INITRD is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +# CONFIG_UID16 is not set +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_PNX4008 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_BOARD_IRQ_MAP_SMALL is not set +CONFIG_BOARD_IRQ_MAP_BIG=y + +# +# Intel PXA2xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_TOSHIBA_TMIO_OHCI is not set +# CONFIG_ARCH_ESERIES is not set +# CONFIG_MACH_A620 is not set +# CONFIG_MACH_A716 is not set +# CONFIG_MACH_A730 is not set +# CONFIG_ARCH_H1900 is not set +# CONFIG_ARCH_H2200 is not set +# CONFIG_MACH_H3900 is not set +# CONFIG_MACH_H4000 is not set +# CONFIG_MACH_H4700 is not set +# CONFIG_MACH_HX2750 is not set +# CONFIG_ARCH_H5400 is not set +# CONFIG_MACH_HIMALAYA is not set +CONFIG_MACH_HTCUNIVERSAL=y +CONFIG_HTCUNIVERSAL_CORE=y +CONFIG_HTCUNIVERSAL_UDC=y +CONFIG_HTCUNIVERSAL_POWER=y +CONFIG_HTCUNIVERSAL_BACKLIGHT=y +CONFIG_HTCUNIVERSAL_LCD=y +CONFIG_HTCUNIVERSAL_TS2=y +CONFIG_HTCUNIVERSAL_BUTTONS=y +CONFIG_HTCUNIVERSAL_BLUETOOTH=m +CONFIG_HTCUNIVERSAL_ASIC3_LEDS=y +CONFIG_HTCUNIVERSAL_PHONE=m +CONFIG_HTCUNIVERSAL_AK4641=m +# CONFIG_MACH_HTCALPINE is not set +# CONFIG_MACH_MAGICIAN is not set +# CONFIG_MACH_HTCAPACHE is not set +# CONFIG_MACH_BLUEANGEL is not set +# CONFIG_MACH_HTCBEETLES is not set +# CONFIG_MACH_HW6900 is not set +# CONFIG_MACH_HTCATHENA is not set +# CONFIG_ARCH_AXIMX3 is not set +# CONFIG_ARCH_AXIMX5 is not set +# CONFIG_MACH_X30 is not set +# CONFIG_MACH_X50 is not set +# CONFIG_ARCH_ROVERP1 is not set +# CONFIG_ARCH_ROVERP5P is not set +# CONFIG_MACH_XSCALE_PALMLD is not set +# CONFIG_MACH_T3XSCALE is not set +# CONFIG_MACH_RECON is not set +# CONFIG_PXA_SHARPSL is not set +# CONFIG_MACH_TRIZEPS4 is not set +CONFIG_PXA27x=y +# CONFIG_PXA27x_VOLTAGE is not set + +# +# Linux As Bootloader +# +# CONFIG_LAB is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_OUTER_CACHE is not set +CONFIG_IWMMXT=y +CONFIG_XSCALE_PMU=y + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_PREEMPT=y +CONFIG_NO_IDLE_HZ=y +CONFIG_HZ=100 +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="keepinitrd" +# CONFIG_XIP_KERNEL is not set +CONFIG_KEXEC=y + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_DEBUG=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_PXA=y +CONFIG_PXA25x_ALTERNATE_FREQS=y + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +CONFIG_PM=y +# CONFIG_PM_LEGACY is not set +# CONFIG_PM_DEBUG is not set +CONFIG_DPM_DEBUG=y +CONFIG_PM_SYSFS_DEPRECATED=y +CONFIG_APM_EMULATION=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +# CONFIG_IP_PNP_DHCP is not set +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set +# CONFIG_NETFILTER_XTABLES is not set + +# +# IP: Netfilter Configuration +# +# CONFIG_IP_NF_QUEUE is not set +# CONFIG_IP_NF_IPTABLES is not set +# CONFIG_IP_NF_ARPTABLES is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_IRDA=y + +# +# IrDA protocols +# +CONFIG_IRLAN=y +# CONFIG_IRNET is not set +CONFIG_IRCOMM=y +# CONFIG_IRDA_ULTRA is not set + +# +# IrDA options +# +# CONFIG_IRDA_CACHE_LAST_LSAP is not set +# CONFIG_IRDA_FAST_RR is not set +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=y + +# +# Dongle support +# +# CONFIG_DONGLE is not set + +# +# Old SIR device drivers +# +# CONFIG_IRPORT_SIR is not set + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +CONFIG_PXA_FICP=y +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +# CONFIG_BT_HCIVHCI is not set +# CONFIG_IEEE80211 is not set +CONFIG_WIRELESS_EXT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +# CONFIG_MTD_CHAR is not set +# CONFIG_MTD_BLKDEVS is not set +# CONFIG_MTD_BLOCK is not set +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_SHARP_SL is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# +# CONFIG_PNPACPI is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_NETLINK is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# PHY device support +# + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y +# CONFIG_NET_WIRELESS_RTNETLINK is not set + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set +# CONFIG_HOSTAP is not set +CONFIG_ACX=m +CONFIG_ACX_MEM=y +CONFIG_ACX_HTCUNIVERSAL=m + +# +# Wan interfaces +# +# CONFIG_WAN is not set +CONFIG_PPP=m +# CONFIG_PPP_MULTILINK is not set +# CONFIG_PPP_FILTER is not set +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +# CONFIG_PPPOE is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=m +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_GPIODEV_KEYS is not set +# CONFIG_GPIODEV_DIAGONAL is not set +CONFIG_KEYBOARD_ASIC3=y +CONFIG_KEYBOARD_PXA27x=y +CONFIG_KEYBOARD_GPIO=y +CONFIG_INPUT_MOUSE=y +# CONFIG_MOUSE_PS2 is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_NAVPOINT is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_WM9705 is not set +# CONFIG_TOUCHSCREEN_WM9712 is not set +# CONFIG_TOUCHSCREEN_WM9713 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_ADC is not set +# CONFIG_TOUCHSCREEN_ADC_DEBOUNCE is not set +# CONFIG_TOUCHSCREEN_UCB1400 is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_PXA_COUNT=4 +CONFIG_SERIAL_PXA_IR=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_RS232_SERIAL is not set +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=32 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_NVRAM is not set +# CONFIG_SA1100_RTC is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_TIHTC is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set + +# +# I2C support +# +CONFIG_I2C=m +# CONFIG_I2C_CHARDEV is not set + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +CONFIG_I2C_PXA=m +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCA9535 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_RTC8564 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +CONFIG_W1=y + +# +# 1-wire Bus Masters +# +# CONFIG_W1_MASTER_DS2482 is not set +CONFIG_W1_MASTER_DS1WM=y + +# +# 1-wire Slaves +# +# CONFIG_W1_SLAVE_THERM is not set +# CONFIG_W1_SLAVE_SMEM is not set +# CONFIG_W1_SLAVE_DS2433 is not set +CONFIG_W1_DS2760=y + +# +# Hardware Monitoring support +# +# CONFIG_HWMON is not set +# CONFIG_HWMON_VID is not set + +# +# Hardware Monitoring - external power and batteries +# +CONFIG_EXTERNAL_POWER=y +CONFIG_BATTERY=y +CONFIG_PDA_POWER=y +CONFIG_DS2760_BATTERY=y +# CONFIG_ADC_BATTERY is not set +CONFIG_APM_POWER=y + +# +# L3 serial bus support +# +# CONFIG_L3 is not set + +# +# SoC drivers +# +# CONFIG_SOC_MQ11XX is not set +# CONFIG_SOC_T7L66XB is not set +# CONFIG_SOC_TC6387XB is not set +# CONFIG_SOC_TC6393XB is not set +# CONFIG_SOC_SAMCOP is not set +# CONFIG_SOC_HAMCOP is not set +# CONFIG_HTC_ASIC2 is not set +CONFIG_HTC_ASIC3=y +CONFIG_HTC_ASIC3_DS1WM=y +# CONFIG_SOC_TSC2101 is not set +# CONFIG_SOC_TSC2200 is not set + +# +# Misc devices +# + +# +# Multimedia Capabilities Port drivers +# +CONFIG_ADC=y +# CONFIG_ADC_ADS7846_SSP is not set +# CONFIG_ADC_TSC2200_SSP is not set +# CONFIG_ADC_AD7877 is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set + +# +# LED devices +# +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_ASIC3=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HWTIMER=y +# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +CONFIG_LEDS_TRIGGER_SHARED=y + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_BACKLIGHT_CORGI=y +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_IMAGEON is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=y +# CONFIG_FB_PXA_PARAMETERS is not set +# CONFIG_FB_MBX is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_VSFB is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set + +# +# Logo configuration +# +# CONFIG_LOGO is not set + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +CONFIG_SND_HTCUNIVERSAL=m +CONFIG_SND_PXA2xx_I2SOUND=m +# CONFIG_SND_PXA2XX_AC97 is not set +# CONFIG_SND_RECON is not set + +# +# SoC audio support +# +# CONFIG_SND_SOC is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set + +# +# HID Devices +# +CONFIG_HID=m +# CONFIG_HID_DEBUG is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_PXA2XX is not set +CONFIG_USB_GADGET_PXA27X=y +CONFIG_USB_PXA27X=y +# CONFIG_USB_PXA27X_DMA is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_MQ11XX is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=y +# CONFIG_USB_ETH_RNDIS is not set +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_CHAR is not set +# CONFIG_USB_PXA2XX_GPIO is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +# CONFIG_MMC_PXA is not set +# CONFIG_MMC_TMIO is not set +# CONFIG_MMC_SAMCOP is not set +CONFIG_MMC_ASIC3=y + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_DEBUG=y + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set + +# +# RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_M48T86 is not set +CONFIG_RTC_DRV_SA1100=y +# CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_FS_XATTR is not set +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS2_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +CONFIG_NLS_CODEPAGE_1250=y +CONFIG_NLS_CODEPAGE_1251=y +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y + +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +CONFIG_PRINTK_TIME=y +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_LOG_BUF_SHIFT=16 +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_SLAB is not set +CONFIG_DEBUG_PREEMPT=y +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_DEBUG_INFO is not set +CONFIG_DEBUG_VM=y +# CONFIG_DEBUG_LIST is not set +CONFIG_FRAME_POINTER=y +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_FAULT_INJECTION is not set +CONFIG_DEBUG_USER=y +CONFIG_DEBUG_ERRORS=y +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=y +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_ECB=m +# CONFIG_CRYPTO_CBC is not set +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_LRW is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +CONFIG_CRYPTO_ARC4=m +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +CONFIG_CRYPTO_DEFLATE=y +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=y +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y diff --git a/packages/linux/linux-handhelds-2.6/hx4700/defconfig b/packages/linux/linux-handhelds-2.6/hx4700/defconfig index 8e9907aae9..f17a7bc626 100644 --- a/packages/linux/linux-handhelds-2.6/hx4700/defconfig +++ b/packages/linux/linux-handhelds-2.6/hx4700/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh2 -# Sat May 12 20:38:55 2007 +# Thu May 17 14:41:33 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -810,7 +810,8 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_ADC is not set CONFIG_TOUCHSCREEN_ADC_DEBOUNCE=y # CONFIG_TOUCHSCREEN_UCB1400 is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m # # Hardware I/O ports @@ -1287,7 +1288,18 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_JFFS2_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig index f28619ae08..3d25d76f83 100644 --- a/packages/linux/linux-handhelds-2.6/magician/defconfig +++ b/packages/linux/linux-handhelds-2.6/magician/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh2 -# Sat May 12 20:38:59 2007 +# Thu May 17 14:41:37 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -674,7 +674,8 @@ CONFIG_INPUT_MOUSE=y # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m # # Hardware I/O ports @@ -772,10 +773,10 @@ CONFIG_W1_DS2760=y # CONFIG_EXTERNAL_POWER=y CONFIG_BATTERY=y -# CONFIG_PDA_POWER is not set +CONFIG_PDA_POWER=y CONFIG_DS2760_BATTERY=y -# CONFIG_ADC_BATTERY is not set -# CONFIG_APM_POWER is not set +CONFIG_ADC_BATTERY=y +CONFIG_APM_POWER=y # # L3 serial bus support @@ -996,7 +997,7 @@ CONFIG_USB_ETH=y CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_BLOCK=y -# CONFIG_MMC_PXA is not set +CONFIG_MMC_PXA=y # CONFIG_MMC_TMIO is not set # CONFIG_MMC_SAMCOP is not set @@ -1090,7 +1091,18 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_JFFS2_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set diff --git a/packages/linux/linux-rp-2.6.20/defconfig-spitz.flash b/packages/linux/linux-rp-2.6.20/defconfig-spitz.flash new file mode 100644 index 0000000000..2cbd1cc704 --- /dev/null +++ b/packages/linux/linux-rp-2.6.20/defconfig-spitz.flash @@ -0,0 +1,1604 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.17 +# Sun Sep 3 23:29:17 2006 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_UID16=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_EMBEDDED=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +# CONFIG_BLK_DEV_IO_TRACE is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=m +CONFIG_IOSCHED_CFQ=m +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# System Type +# +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_AT91RM9200 is not set + +# +# Intel PXA2xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_ARCH_PXA_IDP is not set +CONFIG_PXA_SHARPSL=y +# CONFIG_MACH_HX2750 is not set +# CONFIG_PXA_SHARPSL_25x is not set +CONFIG_PXA_SHARPSL_27x=y +CONFIG_MACH_AKITA=y +CONFIG_MACH_SPITZ=y +CONFIG_MACH_BORZOI=y +CONFIG_PXA27x=y +# CONFIG_PXA_KEYS is not set +CONFIG_IWMMXT=y +CONFIG_PXA_SHARP_Cxx00=y +CONFIG_PXA_SSP=y + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +CONFIG_XSCALE_PMU=y +CONFIG_KEXEC=y +CONFIG_SHARP_PARAM=y +CONFIG_SHARPSL_PM=y +CONFIG_SHARP_SCOOP=y + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=y +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y + +# +# PC-card bridges +# +CONFIG_PCMCIA_PXA2XX=y + +# +# Kernel Features +# +CONFIG_PREEMPT=y +CONFIG_NO_IDLE_HZ=y +CONFIG_HZ=100 +# CONFIG_AEABI is not set +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/hda1 rootfstype=ext3 rw fbcon=rotate:1 dyntick=enable debug" +# CONFIG_XIP_KERNEL is not set + +# +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=m +# CONFIG_ARTHUR is not set + +# +# Power management options +# +CONFIG_PM=y +# CONFIG_PM_LEGACY is not set +# CONFIG_PM_DEBUG is not set +CONFIG_APM=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_IPV6_TUNNEL=m +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NETFILTER_XTABLES is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +# CONFIG_IP_NF_CT_ACCT is not set +# CONFIG_IP_NF_CONNTRACK_MARK is not set +# CONFIG_IP_NF_CONNTRACK_EVENTS is not set +CONFIG_IP_NF_CT_PROTO_SCTP=m +CONFIG_IP_NF_FTP=m +CONFIG_IP_NF_IRC=m +# CONFIG_IP_NF_NETBIOS_NS is not set +CONFIG_IP_NF_TFTP=m +CONFIG_IP_NF_AMANDA=m +# CONFIG_IP_NF_PPTP is not set +# CONFIG_IP_NF_H323 is not set +CONFIG_IP_NF_QUEUE=m + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +# CONFIG_IP6_NF_QUEUE is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +# CONFIG_IRDA_ULTRA is not set + +# +# IrDA options +# +# CONFIG_IRDA_CACHE_LAST_LSAP is not set +# CONFIG_IRDA_FAST_RR is not set +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +# CONFIG_IRTTY_SIR is not set + +# +# Dongle support +# + +# +# Old SIR device drivers +# +# CONFIG_IRPORT_SIR is not set + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +# CONFIG_USB_IRDA is not set +# CONFIG_SIGMATEL_FIR is not set +CONFIG_PXA_FICP=m +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +# CONFIG_BT_HCIUSB_SCO is not set +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m +# CONFIG_IEEE80211_SOFTMAC is not set +CONFIG_WIRELESS_EXT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +CONFIG_MTD_ROM=y +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_SHARP_SL=y +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_VERIFY_WRITE=y +# CONFIG_MTD_NAND_H1900 is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +CONFIG_MTD_NAND_SHARPSL=y +# CONFIG_MTD_NAND_NANDSIM is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_BLK_DEV_INITRD is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=y +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=y +# CONFIG_IDEDISK_MULTI_MODE is not set +CONFIG_BLK_DEV_IDECS=y +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=y +# CONFIG_IDE_ARM is not set +# CONFIG_BLK_DEV_IDEDMA is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=m +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set + +# +# SCSI Transport Attributes +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set + +# +# SCSI low-level drivers +# +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_SATA is not set +# CONFIG_SCSI_DEBUG is not set + +# +# PCMCIA SCSI adapter support +# +# CONFIG_PCMCIA_AHA152X is not set +# CONFIG_PCMCIA_FDOMAIN is not set +# CONFIG_PCMCIA_NINJA_SCSI is not set +# CONFIG_PCMCIA_QLOGIC is not set +# CONFIG_PCMCIA_SYM53C500 is not set + +# +# Multi-device support (RAID and LVM) +# +CONFIG_MD=y +CONFIG_BLK_DEV_DM=m +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_MIRROR=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_EMC=m + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m + +# +# PHY device support +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=m +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y +# CONFIG_NET_WIRELESS_RTNETLINK is not set + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set +# CONFIG_PCMCIA_WAVELAN is not set +# CONFIG_PCMCIA_NETWAVE is not set + +# +# Wireless 802.11 Frequency Hopping cards support +# +# CONFIG_PCMCIA_RAYCS is not set + +# +# Wireless 802.11b ISA/PCI cards support +# +CONFIG_HERMES=m +# CONFIG_ATMEL is not set + +# +# Wireless 802.11b Pcmcia/Cardbus cards support +# +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +# CONFIG_AIRO_CS is not set +# CONFIG_PCMCIA_WL3501 is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +CONFIG_HOSTAP_CS=m +CONFIG_NET_WIRELESS=y + +# +# PCMCIA network device support +# +CONFIG_NET_PCMCIA=y +# CONFIG_PCMCIA_3C589 is not set +# CONFIG_PCMCIA_3C574 is not set +# CONFIG_PCMCIA_FMVJ18X is not set +CONFIG_PCMCIA_PCNET=m +# CONFIG_PCMCIA_NMCLAN is not set +# CONFIG_PCMCIA_SMC91C92 is not set +# CONFIG_PCMCIA_XIRC2PS is not set +# CONFIG_PCMCIA_AXNET is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +CONFIG_PPP=m +# CONFIG_PPP_MULTILINK is not set +# CONFIG_PPP_FILTER is not set +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +# CONFIG_PPP_MPPE is not set +# CONFIG_PPPOE is not set +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=m +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=640 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480 +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set +CONFIG_INPUT_POWER=y + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_CORGI is not set +CONFIG_KEYBOARD_SPITZ=y +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_CORGI=y +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=m +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_NVRAM is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# Ftape, the floppy tape device driver +# + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# I2C support +# +CONFIG_I2C=y +# CONFIG_I2C_CHARDEV is not set + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +CONFIG_I2C_PXA=y +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +# CONFIG_HWMON is not set +# CONFIG_HWMON_VID is not set + +# +# Misc devices +# + +# +# Multi-Function Devices +# + +# +# LED devices +# +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_SPITZ=y +# CONFIG_LEDS_TOSA is not set + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_IDE_DISK=y + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_V4L2=y + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set +CONFIG_USB_DABUSB=m + +# +# Graphics support +# +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_MACMODES is not set +CONFIG_FB_FIRMWARE_EDID=y +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=y +CONFIG_FB_PXA_LCD_QVGA=y +# CONFIG_FB_PXA_LCD_VGA is not set +CONFIG_FB_PXA_OVERLAY=y +# CONFIG_FB_PXA_PARAMETERS is not set +# CONFIG_FB_W100 is not set +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set + +# +# Logo configuration +# +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +# CONFIG_LOGO_LINUX_CLUT224 is not set +# CONFIG_LOGO_OHAND_CLUT224 is not set +# CONFIG_LOGO_OZ240_CLUT224 is not set +# CONFIG_LOGO_OZ480_CLUT224 is not set +CONFIG_LOGO_OZ640_CLUT224=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_LCD_DEVICE=y +CONFIG_BACKLIGHT_CORGI=y + +# +# Sound +# +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_SEQUENCER=m +# CONFIG_SND_SEQ_DUMMY is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_SEQUENCER_OSS is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +CONFIG_SND_VERBOSE_PRINTK=y +CONFIG_SND_DEBUG=y +# CONFIG_SND_DEBUG_DETECT is not set +# CONFIG_SND_PCM_XRUN_DEBUG is not set + +# +# Generic devices +# +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_AC97_BUS=m +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +CONFIG_SND_PXA2XX_PCM=m +CONFIG_SND_PXA2XX_AC97=m + +# +# USB devices +# +CONFIG_SND_USB_AUDIO=m + +# +# PCMCIA devices +# +# CONFIG_SND_VXPOCKET is not set +# CONFIG_SND_PDAUDIOCF is not set + +# +# SoC audio support +# +CONFIG_SND_SOC=m + +# +# Soc Platforms +# + +# +# SoC Audio for the Intel PXA2xx +# +CONFIG_SND_PXA2xx_SOC=m +CONFIG_SND_PXA2xx_SOC_I2S=m +CONFIG_SND_PXA2xx_SOC_SPITZ=m + +# +# SoC Audio for the Atmel AT91 +# + +# +# SoC Audio for the Freescale i.MX +# + +# +# Soc Codecs +# +# CONFIG_SND_SOC_AC97_CODEC is not set +# CONFIG_SND_SOC_WM8731 is not set +CONFIG_SND_SOC_WM8750=m +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8772 is not set +# CONFIG_SND_SOC_WM8971 is not set +# CONFIG_SND_SOC_WM8974 is not set +# CONFIG_SND_SOC_WM9713 is not set +# CONFIG_SND_SOC_WM9712 is not set +# CONFIG_SND_SOC_UDA1380 is not set +# CONFIG_SND_SOC_AK4535 is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_BIG_ENDIAN is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_CS=m + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=m +CONFIG_USB_HIDINPUT=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +# CONFIG_USB_HIDDEV is not set + +# +# USB HID Boot Protocol drivers +# +CONFIG_USB_KBD=m +CONFIG_USB_MOUSE=m +CONFIG_USB_AIPTEK=m +CONFIG_USB_WACOM=m +# CONFIG_USB_ACECAD is not set +CONFIG_USB_KBTAB=m +CONFIG_USB_POWERMATE=m +# CONFIG_USB_TOUCHSCREEN is not set +# CONFIG_USB_YEALINK is not set +CONFIG_USB_XPAD=m +CONFIG_USB_ATI_REMOTE=m +# CONFIG_USB_ATI_REMOTE2 is not set +# CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_APPLETOUCH is not set + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +# CONFIG_USB_NET_GL620A is not set +CONFIG_USB_NET_NET1080=m +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +CONFIG_USB_NET_ZAURUS=m +# CONFIG_USB_ZD1201 is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +# CONFIG_USB_SERIAL_AIRPRIME is not set +# CONFIG_USB_SERIAL_ANYDATA is not set +# CONFIG_USB_SERIAL_ARK3116 is not set +CONFIG_USB_SERIAL_BELKIN=m +# CONFIG_USB_SERIAL_WHITEHEAT is not set +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +# CONFIG_USB_SERIAL_FUNSOFT is not set +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +# CONFIG_USB_SERIAL_NAVMAN is not set +CONFIG_USB_SERIAL_PL2303=m +# CONFIG_USB_SERIAL_HP4X is not set +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +# CONFIG_USB_SERIAL_OPTION is not set +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_EZUSB=y + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_AUERSWALD=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_LED=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_PHIDGETKIT=m +CONFIG_USB_PHIDGETSERVO=m +CONFIG_USB_IDMOUSE=m +# CONFIG_USB_LD is not set +# CONFIG_USB_TEST is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_PXA2XX is not set +CONFIG_USB_GADGET_PXA27X=y +CONFIG_USB_PXA27X=m +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +CONFIG_MMC_PXA=y + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y + +# +# RTC drivers +# +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_M48T86 is not set +CONFIG_RTC_DRV_SA1100=y +# CONFIG_RTC_DRV_TEST is not set + +# +# File systems +# +CONFIG_EXT2_FS=m +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_FS_XATTR is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +# CONFIG_MSDOS_FS is not set +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_RUBIN=y +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +CONFIG_SMB_NLS_DEFAULT=y +CONFIG_SMB_NLS_REMOTE="cp437" +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_EXPERIMENTAL is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="cp437" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=y + +# +# Profiling support +# +CONFIG_PROFILING=y +CONFIG_OPROFILE=m + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_KERNEL=y +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_SCHEDSTATS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_VM is not set +CONFIG_FRAME_POINTER=y +# CONFIG_UNWIND_INFO is not set +# CONFIG_FORCED_INLINING is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_WAITQ is not set +CONFIG_DEBUG_ERRORS=y +# CONFIG_DEBUG_LL is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +# CONFIG_CRYPTO_TGR192 is not set +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_TEST=m + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_CRC_CCITT=y +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=m +CONFIG_ZLIB_DEFLATE=m +CONFIG_SHARPSL_RC=m diff --git a/packages/linux/linux-rp.inc b/packages/linux/linux-rp.inc index 3bbd22e6c2..04b95ec813 100644 --- a/packages/linux/linux-rp.inc +++ b/packages/linux/linux-rp.inc @@ -24,10 +24,15 @@ COMPATIBLE_HOST = "(arm|i.86).*-linux" COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|hx2000|qemuarm|qemux86)' KERNEL_IMAGETYPE_qemux86 = "bzImage" +KERNEL_CUSTOM_NAME = '${@bb.data.getVar("KERNEL_CUSTOM_NAME_OVERRIDE",d,1) or ""}' +KERNEL_DEPLOY_NAME = '${@bb.data.getVar("KERNEL_DEPLOY_NAME_OVERRIDE",d,1) or "${KERNEL_IMAGETYPE}-${PV}-${KERNEL_CUSTOM_NAME}${MACHINE}-${DATETIME}.bin"}' +KERNEL_SYMLINK_NAME = '${@bb.data.getVar("KERNEL_SYMLINK_NAME_OVERRIDE",d,1) or "${KERNEL_IMAGETYPE}-${KERNEL_CUSTOM_NAME}${MACHINE}.bin"}' +KERNEL_DEFCONFIG = '${@bb.data.getVar("KERNEL_DEFCONFIG_OVERRIDE",d,1) or "defconfig-${MACHINE}"}' + CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" CMDLINE_CON_collie = "console=ttySA0,115200n8 console=tty1 noinitrd" -CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2" -CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw" +CMDLINE_ROOT = '${@bb.data.getVar("CMDLINE_ROOT_OVERRIDE",d,1) or "root=/dev/mtdblock2 rootfstype=jffs2"}' +CMDLINE_ROOT_spitz = '${@bb.data.getVar("CMDLINE_ROOT_OVERRIDE",d,1) or "root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw"}' CMDLINE_OTHER = "dyntick=enable" CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}' @@ -72,7 +77,7 @@ do_configure() { fi fi - if [ ! -e ${WORKDIR}/defconfig-${MACHINE} ]; then + if [ ! -e ${WORKDIR}/${KERNEL_DEFCONFIG} ]; then die "No default configuration for ${MACHINE} available." fi @@ -163,7 +168,7 @@ do_configure() { -e '/CONFIG_LOGO_OZ240_CLUT224=/d' \ -e '/CONFIG_LOGO_OZ480_CLUT224=/d' \ -e '/CONFIG_LOGO_OZ640_CLUT224=/d' \ - '${WORKDIR}/defconfig-${MACHINE}' >>'${S}/.config' + '${WORKDIR}/${KERNEL_DEFCONFIG}' >>'${S}/.config' yes '' | oe_runmake oldconfig } @@ -193,10 +198,11 @@ do_compile_append() { } do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin - rm -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin - ln -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_DEPLOY_NAME} + rm -f ${DEPLOY_DIR_IMAGE}/${KERNEL_SYMLINK_NAME} + ln -s ${DEPLOY_DIR_IMAGE}/${KERNEL_DEPLOY_NAME} ${DEPLOY_DIR_IMAGE}/${KERNEL_SYMLINK_NAME} tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${MACHINE}.tgz -C ${D} lib } diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb index 3180352381..8da37cbcd6 100644 --- a/packages/linux/linux-rp_2.6.20.bb +++ b/packages/linux/linux-rp_2.6.20.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r15" +PR = "r16" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 @@ -60,7 +60,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \ file://defconfig-collie \ file://defconfig-poodle \ file://defconfig-akita \ - file://defconfig-spitz \ + file://defconfig-spitz* \ file://defconfig-qemuarm \ file://defconfig-qemux86 \ file://defconfig-tosa " diff --git a/packages/linux/linux-xxs1500_2.4.21.bb b/packages/linux/linux-xxs1500_2.4.21.bb index 4754b17046..2775208680 100644 --- a/packages/linux/linux-xxs1500_2.4.21.bb +++ b/packages/linux/linux-xxs1500_2.4.21.bb @@ -13,6 +13,8 @@ S = "${WORKDIR}/linux" inherit kernel +COMPATIBLE_MACHINE = "xxs1500" + PACKAGE_ARCH = "xxs1500" ARCH = "mips" KERNEL_OUTPUT = "arch/mips/zboot/images/xxs1500.flash.srec" diff --git a/packages/lirc/lirc-config.inc b/packages/lirc/lirc-config.inc index 9106e556cf..03bfc61e39 100644 --- a/packages/lirc/lirc-config.inc +++ b/packages/lirc/lirc-config.inc @@ -1,7 +1,8 @@ EXTRA_OECONF = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=${DRIVER}" DRIVER ?= "serial" -DRIVER_collie = "sa1100" +# fails to build at the moment, re-enable later +#DRIVER_collie = "sa1100" DRIVER_h3600 = "sa1100" DRIVER_simpad = "sa1100" DRIVER_nslu2 = "nslu2" diff --git a/packages/lirc/lirc_0.8.0.bb b/packages/lirc/lirc_0.8.0.bb index 57be891c89..f24d63a21c 100644 --- a/packages/lirc/lirc_0.8.0.bb +++ b/packages/lirc/lirc_0.8.0.bb @@ -15,7 +15,7 @@ RDEPENDS_lirc-x = "lirc" RDEPENDS_lirc-exec = "lirc" RDEPENDS_lirc-nslu2example = "lirc lirc-exec" RRECOMMENDS_lirc = "lirc-exec" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \ file://lircd.init file://lircmd.init file://lircexec.init" @@ -59,6 +59,7 @@ do_install_append_nslu2() { PACKAGES =+ "lirc-x lirc-exec lirc-remotes" PACKAGES_prepend_nslu2 = "lirc-nslu2example " +FILES_${PN}-dbg += "${bindir}/.debug ${sbindir}/.debug" FILES_${PN} = "${bindir} ${sbindir} ${libdir} ${sysconfdir}/init.d" FILES_lirc-x = "${bindir}/irxevent ${bindir}/xmode2" FILES_lirc-exec = "${bindir}/irexec ${sysconfdir}/init.d/lircexec" diff --git a/packages/lirc/lirc_0.8.1+cvs20070307.bb b/packages/lirc/lirc_0.8.1+cvs20070307.bb index 2ba1ad8d73..e32477673e 100644 --- a/packages/lirc/lirc_0.8.1+cvs20070307.bb +++ b/packages/lirc/lirc_0.8.1+cvs20070307.bb @@ -15,7 +15,7 @@ RDEPENDS_lirc-x = "lirc" RDEPENDS_lirc-exec = "lirc" RDEPENDS_lirc-nslu2example = "lirc lirc-exec" RRECOMMENDS_lirc = "lirc-exec" -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "-1" @@ -63,6 +63,7 @@ do_install_append_nslu2() { PACKAGES =+ "lirc-x lirc-exec lirc-remotes" PACKAGES_prepend_nslu2 = "lirc-nslu2example " +FILES_${PN}-dbg += "${bindir}/.debug ${sbindir}/.debug" FILES_${PN} = "${bindir} ${sbindir} ${libdir} ${sysconfdir}/init.d" FILES_lirc-x = "${bindir}/irxevent ${bindir}/xmode2" FILES_lirc-exec = "${bindir}/irexec ${sysconfdir}/init.d/lircexec" diff --git a/packages/pciutils/pciutils-2.2.4/configure-uclibc.patch b/packages/pciutils/pciutils-2.2.4/configure-uclibc.patch index 0e6e774f91..bfde28c455 100644 --- a/packages/pciutils/pciutils-2.2.4/configure-uclibc.patch +++ b/packages/pciutils/pciutils-2.2.4/configure-uclibc.patch @@ -1,6 +1,8 @@ ---- /lib/orig-configure 2007-02-13 16:36:54.000000000 +0200 -+++ /lib/configure 2007-02-13 16:37:33.000000000 +0200 -@@ -39,6 +39,11 @@ +Index: pciutils-2.2.4/lib/configure +=================================================================== +--- pciutils-2.2.4.orig/lib/configure 2007-05-16 23:37:38.000000000 +0200 ++++ pciutils-2.2.4/lib/configure 2007-05-17 16:35:24.000000000 +0200 +@@ -39,6 +39,16 @@ sys=linux fi @@ -9,6 +11,11 @@ + sys=linux +fi + ++if [ "$host" = "linux--uclibcgnueabi" ] ++then ++ sys=linux ++fi ++ c=config.h m=config.mk echo >$c "#define PCI_ARCH_`echo $cpu | tr 'a-z' 'A-Z'`" diff --git a/packages/pimlico/dates_0.4.2.bb b/packages/pimlico/dates_0.4.2.bb index d7f0185b86..51d3acc9ed 100644 --- a/packages/pimlico/dates_0.4.2.bb +++ b/packages/pimlico/dates_0.4.2.bb @@ -1,3 +1,5 @@ require dates.inc +PR = "r1" + SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz" diff --git a/packages/pimlico/tasks_0.4.bb b/packages/pimlico/tasks_0.4.bb index 9601abae47..391828430a 100644 --- a/packages/pimlico/tasks_0.4.bb +++ b/packages/pimlico/tasks_0.4.bb @@ -1,6 +1,6 @@ require tasks.inc -PR = "r1" +PR = "r2" SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \ file://tasks-single.diff;patch=1" diff --git a/packages/powertop/powertop_1.0.bb b/packages/powertop/powertop_1.2.bb index a06397bfc4..2f9c7e44b0 100644 --- a/packages/powertop/powertop_1.0.bb +++ b/packages/powertop/powertop_1.2.bb @@ -1,17 +1,9 @@ DESCRIPTION = "PowerTOP, a tool that helps you find what software is using the most power." +HOMEPAGE = "http://www.linuxpowertop.org/" LICENSE = "GPLv2" SRC_URI = "http://www.linuxpowertop.org/download/powertop-${PV}.tar.gz" -S = "${WORKDIR}/${PN}" - - -do_compile() { - ${CC} -Wall -W -O1 -g powertop.c config.c -o powertop -} - do_install() { - install -d ${D}${bindir} - install -m 755 powertop ${D}${bindir} + oe_runmake install DESTDIR=${D} } - diff --git a/packages/strace/strace/strace-undef-syscall.patch b/packages/strace/strace/strace-undef-syscall.patch new file mode 100644 index 0000000000..95166ea18a --- /dev/null +++ b/packages/strace/strace/strace-undef-syscall.patch @@ -0,0 +1,66 @@ +Origin is http://buildroot.uclibc.org/cgi-bin/viewcvs.cgi/*checkout*/trunk/buildroot/package/strace/strace-undef-syscall.patch?rev=17767 + +This gets applied to fix build errors with uclibc on ARM EABI + +--- strace-4.5.12/linux/syscallent.h.orig 2005-08-09 01:48:54.000000000 -0600 ++++ strace-4.5.12/linux/syscallent.h 2005-08-09 01:50:23.000000000 -0600 +@@ -298,7 +298,11 @@ + { 3, 0, sys_io_cancel, "io_cancel" }, /* 249 */ + { 5, TF, sys_fadvise64, "fadvise64" }, /* 250 */ + { 5, 0, printargs, "SYS_251" }, /* 251 */ +- { 1, TP, sys_exit, "exit_group", __NR_exit_group }, /* 252 */ ++ { 1, TP, sys_exit, "exit_group" ++#ifdef __NR_exit_group ++ , __NR_exit_group ++#endif ++ }, /* 252 */ + { 4, 0, printargs, "lookup_dcookie"}, /* 253 */ + { 1, 0, sys_epoll_create, "epoll_create" }, /* 254 */ + { 4, 0, sys_epoll_ctl, "epoll_ctl" }, /* 255 */ +--- strace-4.5.15.orig/linux/syscallent.h 2007-02-04 19:03:48.000000000 +0100 ++++ strace-4.5.15/linux/syscallent.h 2007-02-04 19:11:04.000000000 +0100 +@@ -130,7 +130,10 @@ + { 2, TF, sys_statfs, "statfs" }, /* 99 */ + { 2, TD, sys_fstatfs, "fstatfs" }, /* 100 */ + { 3, 0, sys_ioperm, "ioperm" }, /* 101 */ +- { 2, TD, sys_socketcall, "socketcall", SYS_socketcall }, /* 102 */ ++ { 2, TD, sys_socketcall, "socketcall", ++#ifdef __NR_socketcall ++ SYS_socketcall }, /* 102 */ ++#endif + { 3, 0, sys_syslog, "syslog" }, /* 103 */ + { 3, 0, sys_setitimer, "setitimer" }, /* 104 */ + { 2, 0, sys_getitimer, "getitimer" }, /* 105 */ +@@ -145,7 +148,10 @@ + { 4, TP, sys_wait4, "wait4", SYS_wait4 }, /* 114 */ + { 1, 0, sys_swapoff, "swapoff" }, /* 115 */ + { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ +- { 6, 0, sys_ipc, "ipc", SYS_ipc }, /* 117 */ ++ { 6, 0, sys_ipc, "ipc", ++#ifdef __NR_ipc ++ SYS_ipc }, /* 117 */ ++#endif + { 1, TD, sys_fsync, "fsync" }, /* 118 */ + { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */ + { 5, TP, sys_clone, "clone", SYS_clone }, /* 120 */ +--- strace-4.5.15.orig/syscall.c 2007-02-04 19:03:48.000000000 +0100 ++++ strace-4.5.15/syscall.c 2007-02-04 19:07:26.000000000 +0100 +@@ -2404,14 +2404,18 @@ + switch (known_scno(tcp)) { + #ifdef LINUX + #if !defined (ALPHA) && !defined(SPARC) && !defined(SPARC64) && !defined(MIPS) && !defined(HPPA) ++#ifdef __NR_socketcall + case SYS_socketcall: + decode_subcall(tcp, SYS_socket_subcall, + SYS_socket_nsubcalls, deref_style); + break; ++#endif ++#ifdef __NR_ipc + case SYS_ipc: + decode_subcall(tcp, SYS_ipc_subcall, + SYS_ipc_nsubcalls, shift_style); + break; ++#endif + #endif /* !ALPHA && !MIPS && !SPARC && !SPARC64 && !HPPA */ + #if defined (SPARC) || defined (SPARC64) + case SYS_socketcall: diff --git a/packages/strace/strace_4.5.14.bb b/packages/strace/strace_4.5.14.bb index b301d0100b..50baef86dc 100644 --- a/packages/strace/strace_4.5.14.bb +++ b/packages/strace/strace_4.5.14.bb @@ -9,7 +9,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \ file://drop-ctl-proc.patch;patch=1 \ file://sh-arch-update.patch;patch=1 \ file://sh-syscall-update.patch;patch=1 \ - file://strace-fix-arm-bad-syscall.patch;patch=1" + file://strace-fix-arm-bad-syscall.patch;patch=1 \ + file://strace-undef-syscall.patch;patch=1 " inherit autotools diff --git a/packages/sudo/files/autofoo.patch b/packages/sudo/files/autofoo.patch index ddfd98b452..4624979bba 100644 --- a/packages/sudo/files/autofoo.patch +++ b/packages/sudo/files/autofoo.patch @@ -1,12 +1,16 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - -Index: sudo-1.6.8p6/configure.in +Index: sudo-1.6.8p12/configure.in =================================================================== ---- sudo-1.6.8p6.orig/configure.in 2004-11-25 12:31:20.000000000 -0500 -+++ sudo-1.6.8p6/configure.in 2005-01-21 19:09:27.248233336 -0500 +--- sudo-1.6.8p12.orig/configure.in 2004-11-26 04:31:20.000000000 +1100 ++++ sudo-1.6.8p12/configure.in 2007-05-16 16:45:20.000000000 +1000 +@@ -1670,7 +1670,7 @@ + SUDO_TYPE_INO_T + SUDO_FULL_VOID + SUDO_UID_T_LEN +-SUDO_LONG_LONG ++SUDO_TYPE_LONG_LONG + SUDO_SOCK_SA_LEN + dnl + dnl only set RETSIGTYPE if it is not set already @@ -1700,12 +1700,14 @@ if test -z "$BROKEN_GETCWD"; then AC_REPLACE_FUNCS(getcwd) @@ -23,15 +27,15 @@ Index: sudo-1.6.8p6/configure.in + +AC_CHECK_FUNCS(lsearch, , [AC_CHECK_LIB(compat, lsearch, [AC_CHECK_HEADER(search.h, [AC_DEFINE(HAVE_LSEARCH) LIBS="$LIBS -lcompat"], [AC_LIBOBJ([lsearch])])], [AC_LIBOBJ([lsearch])])]) + -+AC_CHECK_FUNCS(utime, [SUDO_FUNC_UTIME_POSIX], [AC_LIBOBJ([utime])]) ++AC_CHECK_FUNCS(utimes) +SUDO_FUNC_FNMATCH([AC_DEFINE([HAVE_FNMATCH], [1], [Define if you have the 'fnmatch' function.])], [AC_LIBOBJ([fnmatch])]) SUDO_FUNC_ISBLANK AC_REPLACE_FUNCS(strerror strcasecmp sigaction strlcpy strlcat closefrom) AC_CHECK_FUNCS(snprintf vsnprintf asprintf vasprintf, , [NEED_SNPRINTF=1]) -Index: sudo-1.6.8p6/aclocal.m4 +Index: sudo-1.6.8p12/aclocal.m4 =================================================================== ---- sudo-1.6.8p6.orig/aclocal.m4 2004-09-07 13:14:51.000000000 -0400 -+++ sudo-1.6.8p6/aclocal.m4 2005-01-21 19:17:00.029400136 -0500 +--- sudo-1.6.8p12.orig/aclocal.m4 2004-09-08 03:14:51.000000000 +1000 ++++ sudo-1.6.8p12/aclocal.m4 2007-05-16 16:45:08.000000000 +1000 @@ -9,7 +9,7 @@ dnl dnl check for sendmail @@ -171,24 +175,33 @@ Index: sudo-1.6.8p6/aclocal.m4 [AC_REQUIRE([AC_TYPE_UID_T]) AC_MSG_CHECKING(max length of uid_t) AC_CACHE_VAL(sudo_cv_uid_t_len, -@@ -303,15 +303,21 @@ +@@ -301,17 +301,29 @@ + + dnl dnl check for "long long" - dnl XXX hard to cache since it includes 2 tests +-dnl XXX hard to cache since it includes 2 tests dnl -AC_DEFUN(SUDO_LONG_LONG, [AC_MSG_CHECKING(for long long support) -AC_TRY_LINK(, [long long foo = 1000; foo /= 10;], AC_DEFINE(HAVE_LONG_LONG, 1, [Define if your compiler supports the "long long" type.]) -[AC_TRY_RUN([main() {if (sizeof(long long) == sizeof(long)) exit(0); else exit(1);}], AC_DEFINE(LONG_IS_QUAD, 1, [Define if sizeof(long) == sizeof(long long).]))] -AC_MSG_RESULT(yes), AC_MSG_RESULT(no))]) -+ -+AC_DEFUN([SUDO_LONG_LONG], [AC_MSG_CHECKING(for long long support) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([long long foo = 1000; foo /= 10;]),] -+ [AC_DEFINE(HAVE_LONG_LONG, 1, [Define if your compiler supports the "long long" type.]) -+ AC_CHECK_SIZEOF([long]) -+ AC_CHECK_SIZEOF([long long]) -+ if x"$ac_cv_sizeof_long" = x"$ac_cv_sizeof_long_long"; then -+ AC_DEFINE(LONG_IS_QUAD, 1, [Define if sizeof(long) == sizeof(long long).]) -+ fi] -+, AC_MSG_RESULT(yes), AC_MSG_RESULT(no))]) ++AC_DEFUN([SUDO_TYPE_LONG_LONG], ++[AC_CHECK_TYPES(long long, [AC_DEFINE(HAVE_LONG_LONG, 1, [Define if your ++compiler supports the "long long" type.])] ++[AC_MSG_CHECKING(for long and long long equivalence) ++AC_CACHE_VAL(sudo_cv_type_long_is_quad, ++[AC_TRY_RUN([ ++main() { ++if (sizeof(long long) == sizeof(long)) exit(0); ++else exit(1); ++}], [sudo_cv_type_long_is_quad=yes], ++[sudo_cv_type_long_is_quad=no], [sudo_cv_type_long_is_quad=no]) ++rm -f core core.* *.core])dnl ++AC_MSG_RESULT($sudo_cv_type_long_is_quad) ++if test $sudo_cv_type_long_is_quad = yes; then ++ AC_DEFINE(LONG_IS_QUAD, 1, [Define if sizeof(long) == sizeof(long long).]) ++fi ++])]) dnl dnl append a libpath to an LDFLAGS style variable diff --git a/packages/sudo/site/.mtn2git_empty b/packages/sudo/site/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sudo/site/.mtn2git_empty diff --git a/packages/sudo/site/bit-32 b/packages/sudo/site/bit-32 new file mode 100644 index 0000000000..9b7ca5c81b --- /dev/null +++ b/packages/sudo/site/bit-32 @@ -0,0 +1,2 @@ +# is sizeof(long long) == sizeof(long) +sudo_cv_type_long_is_quad=${sudo_cv_type_long_is_quad=no} diff --git a/packages/sudo/site/bit-64 b/packages/sudo/site/bit-64 new file mode 100644 index 0000000000..05846ff0aa --- /dev/null +++ b/packages/sudo/site/bit-64 @@ -0,0 +1,2 @@ +# is sizeof(long long) == sizeof(long) +sudo_cv_type_long_is_quad=${sudo_cv_type_long_is_quad=yes} diff --git a/packages/sudo/sudo_1.6.8p12.bb b/packages/sudo/sudo_1.6.8p12.bb index fa20fc6feb..a2e8f86314 100644 --- a/packages/sudo/sudo_1.6.8p12.bb +++ b/packages/sudo/sudo_1.6.8p12.bb @@ -1,7 +1,9 @@ +PR = "r2" + SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ - file://nonrootinstall.patch;patch=1 \ + file://nonrootinstall.patch;patch=1 \ file://nostrip.patch;patch=1 \ - file://autofoo.patch;patch=1 \ - file://noexec-link.patch;patch=1" + file://autofoo.patch;patch=1 \ + file://noexec-link.patch;patch=1" require sudo.inc diff --git a/packages/sysconf/files/conffiles b/packages/sysconf/files/conffiles index d99047ce24..6e6842d6cd 100644 --- a/packages/sysconf/files/conffiles +++ b/packages/sysconf/files/conffiles @@ -20,7 +20,6 @@ # preserve Preserve this file unconditionally # diff Compare file with the new version, ask if different # -preserve linuxrc preserve etc/.configured preserve etc/TZ diff etc/default/conffiles diff --git a/packages/sysconf/files/sysconf b/packages/sysconf/files/sysconf index 9499b4daa9..cca4dd1e79 100644 --- a/packages/sysconf/files/sysconf +++ b/packages/sysconf/files/sysconf @@ -640,9 +640,6 @@ umountflash(){ return 1 fi # - # The function is currently always used interactively, so output - echo "$0: umounting any existing mount of $ffsdev" >&2 - # # check each mount point, do this last first because otherwise nested # mounts of ffsdev cannot be umounted. ffs_umount() { diff --git a/packages/sysconf/sysconf_0.1.bb b/packages/sysconf/sysconf_0.1.bb index fd37cd01f7..e6bb3f29bb 100644 --- a/packages/sysconf/sysconf_0.1.bb +++ b/packages/sysconf/sysconf_0.1.bb @@ -3,7 +3,7 @@ SECTION = "base" PRIORITY = "optional" LICENSE = "GPL" RDEPENDS = "devio cpio findutils diffutils" -PR = "r8" +PR = "r9" # Currently, the scripts only support ixp4xx machines. # Feel free to add to the scripts ... diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index b7f4497d92..dfada74a87 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r29" +PR = "r30" PACKAGES = 'task-boot \ task-base \ @@ -139,6 +139,7 @@ RDEPENDS_task-boot = "\ initscripts \ modutils-initscripts \ netbase \ + update-alternatives \ ${DISTRO_DEV_MANAGER} \ ${DISTRO_INIT_MANAGER} \ ${DISTRO_LOGIN_MANAGER} \ @@ -204,7 +205,6 @@ RDEPENDS_task-base-pcmcia = "\ ${@base_contains('DISTRO_FEATURES', 'wifi', 'prism3-support', '',d)} \ ${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)} \ ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-conf', '',d)} \ - ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-conf', '',d)} \ " RRECOMMENDS_task-base-pcmcia = "\ @@ -224,7 +224,6 @@ task-base-pcmcia24 = "\ task-base-pcmcia26 = "\ ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \ - ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \ ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}" RDEPENDS_task-base-bluetooth = "\ diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 51ccf96bb7..d2d501c4f5 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -199,7 +199,7 @@ RDEPENDS_task-openmoko-debug = "\ usbutils \ uucp \ cu \ - sensors-i2cdetect sensors-i2cdump sensors-i2cset \ +# sensors-i2cdetect sensors-i2cdump sensors-i2cset \ xev \ " diff --git a/packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro b/packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro index 039e89649e..335e6c2bf5 100644 --- a/packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro +++ b/packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro @@ -141,3 +141,6 @@ WARNINGS="-Wall" # EXTRA_WARNINGS is not set # DOMULTI is not set # UCLIBC_MJN3_ONLY is not set + +# math stuff for perl +DO_C99_MATH=y diff --git a/packages/uclibc/uclibc-0.9.29/ep93xx/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/ep93xx/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/ep93xx/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.29/ep93xx/uClibc.machine b/packages/uclibc/uclibc-0.9.29/ep93xx/uClibc.machine new file mode 100644 index 0000000000..898b73a33b --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/ep93xx/uClibc.machine @@ -0,0 +1,69 @@ +# +# Automatically generated make config: don't edit +# Mon May 14 10:23:14 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +CONFIG_ARM920T=y +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/packages/uclibc/uclibc-0.9.29/fic-gta01/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/fic-gta01/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/fic-gta01/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.29/fic-gta01/uClibc.machine b/packages/uclibc/uclibc-0.9.29/fic-gta01/uClibc.machine new file mode 100644 index 0000000000..898b73a33b --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/fic-gta01/uClibc.machine @@ -0,0 +1,69 @@ +# +# Automatically generated make config: don't edit +# Mon May 14 10:23:14 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +CONFIG_ARM920T=y +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/packages/uclibc/uclibc-0.9.29/poodle/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/poodle/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/poodle/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.29/poodle/uClibc.machine b/packages/uclibc/uclibc-0.9.29/poodle/uClibc.machine new file mode 100644 index 0000000000..ec0385bc0f --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/poodle/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:16:02 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +CONFIG_ARM_XSCALE=y +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include" +HAVE_DOT_CONFIG=y + diff --git a/packages/uclibc/uclibc-0.9.29/titan/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/titan/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/titan/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.29/titan/uClibc.machine b/packages/uclibc/uclibc-0.9.29/titan/uClibc.machine new file mode 100644 index 0000000000..75c5328056 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/titan/uClibc.machine @@ -0,0 +1,52 @@ +# +# Automatically generated make config: don't edit +# Wed May 16 12:03:09 2007 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +TARGET_sh=y +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="sh" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_SH2A is not set +# CONFIG_SH2 is not set +# CONFIG_SH3 is not set +CONFIG_SH4=y +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y diff --git a/packages/uclibc/uclibc-0.9.29/uClibc.config b/packages/uclibc/uclibc-0.9.29/uClibc.config new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/uClibc.config diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb index b5083ed84d..f84084ef84 100644 --- a/packages/uclibc/uclibc_0.9.29.bb +++ b/packages/uclibc/uclibc_0.9.29.bb @@ -7,8 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PR = "r0" - +PR = "r2" require uclibc.inc @@ -18,7 +17,6 @@ SRC_URI += "file://uClibc.machine file://uClibc.distro" #recent versions uclibc require real kernel headers PACKAGE_ARCH = "${MACHINE_ARCH}" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" #as stated above, uclibc needs real kernel-headers #however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking .... diff --git a/packages/wlan-ng/wlan-ng-utils.inc b/packages/wlan-ng/wlan-ng-utils.inc new file mode 100644 index 0000000000..fe00e161d3 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-utils.inc @@ -0,0 +1,68 @@ +DESCRIPTION = "linux-wlan-ng userland utilities" +HOMEPAGE = "http://www.linux-wlan.org" +SECTION = "kernel/userland" +LICENSE = "GPL" +DEPENDS = "virtual/kernel" +S = "${WORKDIR}/linux-wlan-ng-${PV}" + +SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ + file://only-the-utils.patch;patch=1 \ + file://wlan-ng.modutils \ + file://wlan.agent \ + file://usbctl \ + file://resume \ + file://pre-up \ + file://post-down \ + file://config.in" + +# yeah, it's kind of backwards, but otherwise the config step will fail +inherit module + +do_configure() { + install -m 0655 ${WORKDIR}/config.in ${S}/config.in + oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config + + if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then + echo "PRISM2_PCMCIA=y" >> config.mk + echo "WLAN_KERN_PCMCIA=y" >> config.mk + fi + echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk + echo "FIRMWARE_DIR=/etc/wlan" >> config.mk + echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk + echo "TARGET_INST_EXEDIR=${D}/sbin" >> config.mk + echo "RC_DIR=${sysconfdir}/" >> config.mk + echo "CC=${CC}" >> config.mk + echo "LD=${LD}" >> config.mk + + # Shut up, you broken buildsystem + install -m 0655 config.mk src/prism2/config.mk + install -d src/prism2/driver/include + ln -sf ${S}/src/include/wlan src/prism2/driver/include/wlan + ln -sf ${S}/src/prism2/include/prism2 src/prism2/driver/include/prism2 +} + +do_compile() { + oe_runmake all +} + +do_install() { + oe_runmake install + mkdir -p ${D}${sysconfdir}/modutils/ + mkdir -p ${D}${sysconfdir}/hotplug/ + mkdir -p ${D}${base_sbindir}/ + install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf + install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent + install -d ${D}${sysconfdir}/network/if-pre-up.d + install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng + install -d ${D}${sysconfdir}/network/if-post-down.d + install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng + install -d ${D}${sysconfdir}/apm/resume.d + install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng + install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl + install -d ${D}${mandir}/man1 + install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/ +} + +FILES_${PN}-doc += "/usr/local/man" +FILES_${PN}-dbg += "/sbin/.debug" +FILES_${PN} = "/etc /sbin" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb index 7fd9844e7d..9ac5348a98 100644 --- a/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb +++ b/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb @@ -1,67 +1,3 @@ -DESCRIPTION = "linux-wlan-ng userland utilities" -HOMEPAGE = "http://www.linux-wlan.org" -SECTION = "kernel/userland" -DEPENDS = "virtual/kernel" -LICENSE = "GPL" -PR = "r1" - -SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ - file://only-the-utils.patch;patch=1 \ - file://wlan-ng.modutils \ - file://wlan.agent \ - file://usbctl \ - file://resume \ - file://pre-up \ - file://post-down \ - file://config.in" -S = "${WORKDIR}/linux-wlan-ng-${PV}" - -# yeah, it's kind of backwards, but otherwise the config step will fail -inherit module - -do_configure() { - install -m 0655 ${WORKDIR}/config.in ${S}/config.in - oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config - - if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then - echo "PRISM2_PCMCIA=y" >> config.mk - echo "WLAN_KERN_PCMCIA=y" >> config.mk - fi - echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk - echo "FIRMWARE_DIR=/etc/wlan" >> config.mk - echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk - echo "TARGET_INST_EXEDIR=${D}/sbin" >> config.mk - echo "RC_DIR=${sysconfdir}/" >> config.mk - echo "CC=${CC}" >> config.mk - echo "LD=${LD}" >> config.mk +require wlan-ng-utils.inc - # Shut up, you broken buildsystem - install -m 0655 config.mk src/prism2/config.mk - install -d src/prism2/driver/include - ln -sf ${S}/src/include/wlan src/prism2/driver/include/wlan - ln -sf ${S}/src/prism2/include/prism2 src/prism2/driver/include/prism2 -} - -do_compile() { - oe_runmake all -} - -do_install() { - oe_runmake install - mkdir -p ${D}${sysconfdir}/modutils/ - mkdir -p ${D}${sysconfdir}/hotplug/ - mkdir -p ${D}${base_sbindir}/ - install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf - install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent - install -d ${D}${sysconfdir}/network/if-pre-up.d - install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng - install -d ${D}${sysconfdir}/network/if-post-down.d - install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng - install -d ${D}${sysconfdir}/apm/resume.d - install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng - install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl - install -d ${D}${mandir}/man1 - install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/ -} - -FILES_${PN} = "/etc /sbin" +PR = "r1" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb b/packages/wlan-ng/wlan-ng-utils_0.2.3.bb index 6206bbbbf5..d4e0a39c70 100644 --- a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb +++ b/packages/wlan-ng/wlan-ng-utils_0.2.3.bb @@ -1,70 +1,7 @@ -DESCRIPTION = "linux-wlan-ng userland utilities" -HOMEPAGE = "http://www.linux-wlan.org" -SECTION = "kernel/userland" -DEPENDS = "virtual/kernel" -LICENSE = "GPL" +require wlan-ng-utils.inc + PR = "r2" -SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ - file://only-the-utils.patch;patch=1 \ - file://scripts-makefile-hostcc.patch;patch=1 \ +SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \ file://pcmciasrc.patch;patch=1 \ - file://hostldflags.patch;patch=1 \ - file://wlan-ng.modutils \ - file://wlan.agent \ - file://usbctl \ - file://resume \ - file://pre-up \ - file://post-down \ - file://config.in" -S = "${WORKDIR}/linux-wlan-ng-${PV}" - -# yeah, it's kind of backwards, but otherwise the config step will fail -inherit module - -do_configure() { - install -m 0655 ${WORKDIR}/config.in ${S}/config.in - oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config - - if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then - echo "PRISM2_PCMCIA=y" >> config.mk - echo "WLAN_KERN_PCMCIA=y" >> config.mk - fi - echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk - echo "FIRMWARE_DIR=/etc/wlan" >> config.mk - echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk - echo "TARGET_INST_EXEDIR=${D}/sbin" >> config.mk - echo "RC_DIR=${sysconfdir}/" >> config.mk - echo "CC=${CC}" >> config.mk - echo "LD=${LD}" >> config.mk - - # Shut up, you broken buildsystem - install -m 0655 config.mk src/prism2/config.mk - install -d src/prism2/driver/include - ln -sf ${S}/src/include/wlan src/prism2/driver/include/wlan - ln -sf ${S}/src/prism2/include/prism2 src/prism2/driver/include/prism2 -} - -do_compile() { - oe_runmake all -} - -do_install() { - oe_runmake install - mkdir -p ${D}${sysconfdir}/modutils/ - mkdir -p ${D}${sysconfdir}/hotplug/ - mkdir -p ${D}${base_sbindir}/ - install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf - install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent - install -d ${D}${sysconfdir}/network/if-pre-up.d - install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng - install -d ${D}${sysconfdir}/network/if-post-down.d - install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng - install -d ${D}${sysconfdir}/apm/resume.d - install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng - install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl - install -d ${D}${mandir}/man1 - install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/ -} - -FILES_${PN} = "/etc /sbin" + file://hostldflags.patch;patch=1" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb b/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb index 27cb04e97f..f71a2ee34a 100644 --- a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb +++ b/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb @@ -1,8 +1,4 @@ -DESCRIPTION = "linux-wlan-ng userland utilities" -HOMEPAGE = "http://www.linux-wlan.org" -SECTION = "kernel/userland" -DEPENDS = "virtual/kernel" -LICENSE = "GPL" +require wlan-ng-utils.inc SRCDATE = "20060823" PV = "0.2.4+svn${SRCDATE}" @@ -20,53 +16,3 @@ SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \ file://post-down \ file://config.in" S = "${WORKDIR}/trunk" - -# yeah, it's kind of backwards, but otherwise the config step will fail -inherit module - -do_configure() { - install -m 0655 ${WORKDIR}/config.in ${S}/config.in - oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config - - if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then - echo "PRISM2_PCMCIA=y" >> config.mk - echo "WLAN_KERN_PCMCIA=y" >> config.mk - fi - echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk - echo "FIRMWARE_DIR=/etc/wlan" >> config.mk - echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk - echo "TARGET_INST_EXEDIR=${D}/sbin" >> config.mk - echo "RC_DIR=${sysconfdir}/" >> config.mk - echo "CC=${CC}" >> config.mk - echo "LD=${LD}" >> config.mk - - # Shut up, you broken buildsystem - install -m 0655 config.mk src/prism2/config.mk - install -d src/prism2/driver/include - ln -sf ${S}/src/include/wlan src/prism2/driver/include/wlan - ln -sf ${S}/src/prism2/include/prism2 src/prism2/driver/include/prism2 -} - -do_compile() { - oe_runmake all -} - -do_install() { - oe_runmake install - mkdir -p ${D}${sysconfdir}/modutils/ - mkdir -p ${D}${sysconfdir}/hotplug/ - mkdir -p ${D}${base_sbindir}/ - install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf - install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent - install -d ${D}${sysconfdir}/network/if-pre-up.d - install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng - install -d ${D}${sysconfdir}/network/if-post-down.d - install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng - install -d ${D}${sysconfdir}/apm/resume.d - install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng - install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl - install -d ${D}${mandir}/man1 - install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/ -} - -FILES_${PN} = "/etc /sbin" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb index 929f67fe16..0b6f33e380 100644 --- a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb +++ b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb @@ -1,69 +1,7 @@ -DESCRIPTION = "linux-wlan-ng userland utilities" -HOMEPAGE = "http://www.linux-wlan.org" -SECTION = "kernel/userland" -DEPENDS = "virtual/kernel" -LICENSE = "GPL" +require wlan-ng-utils.inc -SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ - file://only-the-utils.patch;patch=1 \ - file://scripts-makefile-hostcc.patch;patch=1 \ +SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \ file://pcmciasrc.patch;patch=1 \ - file://hostldflags.patch;patch=1 \ - file://wlan-ng.modutils \ - file://wlan.agent \ - file://usbctl \ - file://resume \ - file://pre-up \ - file://post-down \ - file://config.in" -S = "${WORKDIR}/linux-wlan-ng-${PV}" + file://hostldflags.patch;patch=1" -# yeah, it's kind of backwards, but otherwise the config step will fail -inherit module - -do_configure() { - install -m 0655 ${WORKDIR}/config.in ${S}/config.in - oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config - - if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then - echo "PRISM2_PCMCIA=y" >> config.mk - echo "WLAN_KERN_PCMCIA=y" >> config.mk - fi - echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk - echo "FIRMWARE_DIR=/etc/wlan" >> config.mk - echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk - echo "TARGET_INST_EXEDIR=${D}/sbin" >> config.mk - echo "RC_DIR=${sysconfdir}/" >> config.mk - echo "CC=${CC}" >> config.mk - echo "LD=${LD}" >> config.mk - - # Shut up, you broken buildsystem - install -m 0655 config.mk src/prism2/config.mk - install -d src/prism2/driver/include - ln -sf ${S}/src/include/wlan src/prism2/driver/include/wlan - ln -sf ${S}/src/prism2/include/prism2 src/prism2/driver/include/prism2 -} - -do_compile() { - oe_runmake all -} - -do_install() { - oe_runmake install - mkdir -p ${D}${sysconfdir}/modutils/ - mkdir -p ${D}${sysconfdir}/hotplug/ - mkdir -p ${D}${base_sbindir}/ - install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf - install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent - install -d ${D}${sysconfdir}/network/if-pre-up.d - install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng - install -d ${D}${sysconfdir}/network/if-post-down.d - install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng - install -d ${D}${sysconfdir}/apm/resume.d - install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng - install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl - install -d ${D}${mandir}/man1 - install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/ -} - -FILES_${PN} = "/etc /sbin" +PR = "r1" diff --git a/packages/wlan-ng/wlan-ng-utils_svn.bb b/packages/wlan-ng/wlan-ng-utils_svn.bb index c85779abc2..fae48545ff 100644 --- a/packages/wlan-ng/wlan-ng-utils_svn.bb +++ b/packages/wlan-ng/wlan-ng-utils_svn.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "linux-wlan-ng userland utilities" -HOMEPAGE = "http://www.linux-wlan.org" -SECTION = "kernel/userland" -DEPENDS = "virtual/kernel" -LICENSE = "GPL" +require wlan-ng-utils.inc + PR = "r2" PV = "0.2.4+svn${SRCDATE}" @@ -20,54 +17,6 @@ SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \ file://config.in" S = "${WORKDIR}/trunk" -# yeah, it's kind of backwards, but otherwise the config step will fail -inherit module - -do_configure() { - install -m 0655 ${WORKDIR}/config.in ${S}/config.in - oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config - - if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then - echo "PRISM2_PCMCIA=y" >> config.mk - echo "WLAN_KERN_PCMCIA=y" >> config.mk - fi - echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk - echo "FIRMWARE_DIR=/etc/wlan" >> config.mk - echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk - echo "TARGET_INST_EXEDIR=${D}/sbin" >> config.mk - echo "RC_DIR=${sysconfdir}/" >> config.mk - echo "CC=${CC}" >> config.mk - echo "LD=${LD}" >> config.mk - - # Shut up, you broken buildsystem - install -m 0655 config.mk src/prism2/config.mk - install -d src/prism2/driver/include - ln -sf ${S}/src/include/wlan src/prism2/driver/include/wlan - ln -sf ${S}/src/prism2/include/prism2 src/prism2/driver/include/prism2 -} - -do_compile() { - oe_runmake all -} - -do_install() { - oe_runmake install - mkdir -p ${D}${sysconfdir}/modutils/ - mkdir -p ${D}${sysconfdir}/hotplug/ - mkdir -p ${D}${base_sbindir}/ - install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf - install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent - install -d ${D}${sysconfdir}/network/if-pre-up.d - install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng - install -d ${D}${sysconfdir}/network/if-post-down.d - install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng - install -d ${D}${sysconfdir}/apm/resume.d - install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng - install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl - install -d ${D}${mandir}/man1 - install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/ -} - FILES_${PN} = "/etc /sbin" DEFAULT_PREFERENCE = "-1" diff --git a/site/arm-common b/site/arm-common index 6ed62fd459..d3c6f0a862 100644 --- a/site/arm-common +++ b/site/arm-common @@ -18,8 +18,6 @@ bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing} bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} -bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} -bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} bash_cv_dup2_broken=${bash_cv_dup2_broken=no} bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} @@ -31,7 +29,6 @@ bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} bash_cv_job_control_missing=${bash_cv_job_control_missing=present} bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} -ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} # coreutils utils_cv_sys_open_max=${utils_cv_sys_open_max=1019} diff --git a/site/common-glibc b/site/common-glibc index 9358856856..13e82beba3 100644 --- a/site/common-glibc +++ b/site/common-glibc @@ -1,3 +1,10 @@ +# general +ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} + +# bash +bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} +bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} + # clamav clamav_av_func_working_snprintf_long=${clamav_av_func_working_snprintf_long=yes} clamav_av_have_in_port_t=${clamav_av_have_in_port_t=yes} diff --git a/site/common-uclibc b/site/common-uclibc index e69de29bb2..a57abdbef8 100644 --- a/site/common-uclibc +++ b/site/common-uclibc @@ -0,0 +1,6 @@ +# general +ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=no} + +# bash +bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=no} +bash_cv_sys_siglist=${bash_cv_sys_siglist=no} diff --git a/site/ix86-common b/site/ix86-common index 96a36cf9c8..f114710ac9 100644 --- a/site/ix86-common +++ b/site/ix86-common @@ -59,8 +59,6 @@ bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing} bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} -bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} -bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} bash_cv_dup2_broken=${bash_cv_dup2_broken=no} bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} @@ -72,7 +70,6 @@ bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} bash_cv_job_control_missing=${bash_cv_job_control_missing=present} bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} -ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} # clamav clamav_av_func_working_snprintf_long=${clamav_av_func_working_snprintf_long=yes} diff --git a/site/mipsel-linux b/site/mipsel-linux index 3412c112ed..8a6b919b99 100644 --- a/site/mipsel-linux +++ b/site/mipsel-linux @@ -12,8 +12,6 @@ bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present} bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} -bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} -bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} bash_cv_dup2_broken=${bash_cv_dup2_broken=no} bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} @@ -25,7 +23,6 @@ bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} bash_cv_job_control_missing=${bash_cv_job_control_missing=present} bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} -ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} # openssh ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no} diff --git a/site/mipsel-linux-uclibc b/site/mipsel-linux-uclibc index 8ac42316dd..f36a30aa64 100644 --- a/site/mipsel-linux-uclibc +++ b/site/mipsel-linux-uclibc @@ -12,8 +12,6 @@ bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present} bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} -bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} -bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} bash_cv_dup2_broken=${bash_cv_dup2_broken=no} bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} @@ -25,7 +23,6 @@ bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} bash_cv_job_control_missing=${bash_cv_job_control_missing=present} bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} -ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} # openssh ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no} diff --git a/site/powerpc-common b/site/powerpc-common index 9b2d990380..46dd9680fa 100644 --- a/site/powerpc-common +++ b/site/powerpc-common @@ -209,8 +209,6 @@ bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing} bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} -bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} -bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} bash_cv_dup2_broken=${bash_cv_dup2_broken=no} bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} @@ -222,7 +220,6 @@ bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} bash_cv_job_control_missing=${bash_cv_job_control_missing=present} bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} -ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} # openssh ac_cv_have_broken_dirname=${ac_cv_have_broken_dirname='yes'} diff --git a/site/sh-common b/site/sh-common index 76c464da20..e8228fdb31 100644 --- a/site/sh-common +++ b/site/sh-common @@ -228,8 +228,6 @@ bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing} bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} -bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} -bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} bash_cv_dup2_broken=${bash_cv_dup2_broken=no} bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} @@ -241,7 +239,6 @@ bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} bash_cv_job_control_missing=${bash_cv_job_control_missing=present} bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} -ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} # mono cv_mono_sizeof_sunpath=108 |