diff options
Diffstat (limited to 'packages')
25 files changed, 546 insertions, 823 deletions
diff --git a/packages/module-init-tools/module-init-tools-3.2.1/.mtn2git_empty b/packages/dbus/dbus-0.60/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/module-init-tools/module-init-tools-3.2.1/.mtn2git_empty +++ b/packages/dbus/dbus-0.60/.mtn2git_empty diff --git a/packages/dbus/dbus-0.60/dbus-1.init b/packages/dbus/dbus-0.60/dbus-1.init new file mode 100644 index 0000000000..60440b7223 --- /dev/null +++ b/packages/dbus/dbus-0.60/dbus-1.init @@ -0,0 +1,86 @@ +#! /bin/sh +# -*- coding: utf-8 -*- +# Debian init.d script for D-BUS +# Copyright © 2003 Colin Walters <walters@debian.org> + +set -e + +DAEMON=/usr/bin/dbus-daemon +NAME=dbus-1 +DAEMONUSER=messagebus +PIDDIR=/var/run/dbus +PIDFILE=$PIDDIR/pid +DESC="system message bus" +EVENTDIR=/etc/dbus-1/event.d + +test -x $DAEMON || exit 0 + +# Source defaults file; edit that file to configure this script. +ENABLED=1 +PARAMS="" +if [ -e /etc/default/dbus-1 ]; then + . /etc/default/dbus-1 +fi + +test "$ENABLED" != "0" || exit 0 + +start_it_up() +{ + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $DAEMONUSER $PIDDIR + chgrp $DAEMONUSER $PIDDIR + fi + if [ -e $PIDFILE ]; then + PIDDIR=/proc/$(cat $PIDFILE) + if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then + echo "$DESC already started; not starting." + else + echo "Removing stale PID file $PIDFILE." + rm -f $PIDFILE + fi + fi + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS + echo "$NAME." + if [ -d $EVENTDIR ]; then + run-parts --arg=start $EVENTDIR + fi +} + +shut_it_down() +{ + if [ -d $EVENTDIR ]; then + run-parts --reverse --arg=stop $EVENTDIR + fi + echo -n "Stopping $DESC: " + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER + # We no longer include these arguments so that start-stop-daemon + # can do its job even given that we may have been upgraded. + # We rely on the pidfile being sanely managed + # --exec $DAEMON -- --system $PARAMS + echo "$NAME." + rm -f $PIDFILE +} + +case "$1" in + start) + start_it_up + ;; + stop) + shut_it_down + ;; + restart|force-reload) + shut_it_down + sleep 1 + start_it_up + ;; + *) + echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/packages/dbus/dbus-0.60/no-bindings.patch b/packages/dbus/dbus-0.60/no-bindings.patch new file mode 100644 index 0000000000..ccfc3f88b2 --- /dev/null +++ b/packages/dbus/dbus-0.60/no-bindings.patch @@ -0,0 +1,12 @@ +--- dbus-0.50/tools/Makefile.am.orig 2005-09-07 10:05:38 +0200 ++++ dbus-0.50/tools/Makefile.am 2005-09-07 10:06:30 +0200 +@@ -6,9 +6,6 @@ + nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h + libdbus_glibdir = $(includedir)/dbus-1.0/dbus + +-dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/glib/dbus-binding-tool$(EXEEXT) +- $(top_builddir)/glib/dbus-binding-tool --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml +- + BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml + + else diff --git a/packages/dbus/dbus-0.60/no-introspect.patch b/packages/dbus/dbus-0.60/no-introspect.patch new file mode 100644 index 0000000000..1e43dd121b --- /dev/null +++ b/packages/dbus/dbus-0.60/no-introspect.patch @@ -0,0 +1,14 @@ +--- dbus-0.50/tools/Makefile.am.orig 2005-09-07 10:03:49 +0200 ++++ dbus-0.50/tools/Makefile.am 2005-09-07 10:04:28 +0200 +@@ -21,11 +21,6 @@ + GTK_TOOLS= + endif + +-if HAVE_GLIB +-dbus-bus-introspect.xml: $(top_builddir)/bus/dbus-daemon$(EXEEXT) dbus-launch$(EXEEXT) dbus-send$(EXEEXT) $(top_builddir)/bus/dbus-daemon$(EXEEXT) Makefile +- DBUS_TOP_BUILDDIR=$(top_builddir) $(srcdir)/run-with-tmp-session-bus.sh ./dbus-send --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml +-endif +- + bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS) + + dbus_send_SOURCES= \ diff --git a/packages/dbus/dbus-native_0.60.bb b/packages/dbus/dbus-native_0.60.bb new file mode 100644 index 0000000000..9e661dbccf --- /dev/null +++ b/packages/dbus/dbus-native_0.60.bb @@ -0,0 +1,19 @@ +include dbus_${PV}.inc + +SRC_URI_EXTRA="" + +inherit native + +S = "${WORKDIR}/dbus-${PV}" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus" +DEPENDS = "glib-2.0-native" + +PR = "r1" + +do_stage() { + oe_runmake install + install -d ${STAGING_DATADIR}/dbus + install -m 0644 tools/dbus-bus-introspect.xml ${STAGING_DATADIR}/dbus + install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus +} + diff --git a/packages/dbus/dbus_0.60.bb b/packages/dbus/dbus_0.60.bb new file mode 100644 index 0000000000..e827457371 --- /dev/null +++ b/packages/dbus/dbus_0.60.bb @@ -0,0 +1,13 @@ +include dbus_${PV}.inc + + +DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" +SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1" + +FILES_${PN} += "${bindir}/dbus-daemon" +FILES_${PN}-dev += "${bindir}/dbus-binding-tool" + +do_configure_prepend() { + install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-bus-introspect.xml ${S}/tools/ + install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-glib-bindings.h ${S}/tools/ +} diff --git a/packages/dbus/dbus_0.60.inc b/packages/dbus/dbus_0.60.inc new file mode 100644 index 0000000000..094a9b68d6 --- /dev/null +++ b/packages/dbus/dbus_0.60.inc @@ -0,0 +1,65 @@ +SECTION = "base" +PR = "r0" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +DESCRIPTION = "message bus system for applications to talk to one another" +LICENSE = "GPL" +DEPENDS = "expat glib-2.0 virtual/libintl" +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ + file://cross.patch;patch=1 \ + file://tmpdir.patch;patch=1 \ + file://dbus-1.init \ + file://no-examples.patch;patch=1 \ + ${SRC_URI_EXTRA}" + +inherit autotools pkgconfig update-rc.d gettext + +INITSCRIPT_NAME = "dbus-1" +INITSCRIPT_PARAMS = "defaults" + +CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" + +FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" + +pkg_postinst_dbus() { +#!/bin/sh + +# can't do adduser stuff offline +if [ "x$D" != "x" ]; then + exit 1 +fi + +MESSAGEUSER=messagebus +MESSAGEHOME=/var/run/dbus + +mkdir -p $MESSAGEHOME || true +chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER" +chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER" +} + +EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \ + --disable-checks --disable-xml-docs --disable-doxygen-docs \ + --with-xml=expat --without-x" + + +do_stage () { + oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR} + oe_libinstall -so -C glib libdbus-glib-1 ${STAGING_LIBDIR} + + autotools_stage_includes + + mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/ + install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/ +} + +do_install_append () { + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 +} + +python populate_packages_prepend () { + if (bb.data.getVar('DEBIAN_NAMES', d, 1)): + bb.data.setVar('PKG_dbus', 'dbus-1', d) +} diff --git a/packages/gcc/gcc_csl-arm.bb b/packages/gcc/gcc_csl-arm.bb index 810ad3e115..7ac11c805d 100644 --- a/packages/gcc/gcc_csl-arm.bb +++ b/packages/gcc/gcc_csl-arm.bb @@ -13,7 +13,7 @@ inherit autotools gettext include gcc-package.inc -SRC_URI = "cvs://anoncvs@savannah.gnu.org/cvsroot/gcc;method=ext;tag=csl-arm-branch;module=gcc;date=${CVSDATE} \ +SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/cvsroot/gcc;method=pserver;tag=csl-arm-branch;module=gcc;date=${CVSDATE} \ file://gcc34-arm-tune.patch;patch=1" include gcc3-build.inc diff --git a/packages/gnu-config/gnu-config_20050701.bb b/packages/gnu-config/gnu-config_20050701.bb index bf2b51f6e2..fd6615edbf 100644 --- a/packages/gnu-config/gnu-config_20050701.bb +++ b/packages/gnu-config/gnu-config_20050701.bb @@ -9,7 +9,7 @@ FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" PV = "0.1cvs${FIXEDCVSDATE}" PR = "r4" -SRC_URI = "cvs://anoncvs:@savannah.gnu.org/cvsroot/config;module=config;method=ext;rsh=ssh;date=${FIXEDCVSDATE} \ +SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDCVSDATE} \ file://config-guess-uclibc.patch;patch=1 \ file://gnu-configize.in" S = "${WORKDIR}/config" diff --git a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig b/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig index 9bd18034ed..e196ff8f76 100644 --- a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig +++ b/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig @@ -1,14 +1,13 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.12-hh1 -# Wed Jul 13 18:54:32 2005 +# Linux kernel version: 2.6.13-hh1 +# Tue Dec 13 14:59:42 2005 # CONFIG_ARM=y CONFIG_MMU=y CONFIG_UID16=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_GENERIC_IOMAP=y # # Code maturity level options @@ -90,18 +89,17 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_VERSATILE is not set # CONFIG_ARCH_IMX is not set # CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_AAEC2000 is not set # # Intel PXA2xx Implementations # -# CONFIG_PXA25x is not set -CONFIG_PXA27x=y # CONFIG_ARCH_LUBBOCK is not set # CONFIG_MACH_MAINSTONE is not set # CONFIG_ARCH_PXA_IDP is not set -CONFIG_PXA_KEYS=y # CONFIG_ARCH_ESERIES is not set # CONFIG_MACH_A620 is not set +# CONFIG_MACH_A716 is not set # CONFIG_ARCH_H1900 is not set # CONFIG_ARCH_H2200 is not set # CONFIG_ARCH_H3900 is not set @@ -123,7 +121,14 @@ CONFIG_HX4700_LEDS=m # CONFIG_MACH_X30 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_PXA_SHARPSL is not set +CONFIG_PXA27x=y +CONFIG_PXA_KEYS=y +# CONFIG_SA1100_H3100 is not set +# CONFIG_SA1100_H3600 is not set +# CONFIG_SA1100_H3800 is not set # # Linux As Bootloader @@ -149,12 +154,7 @@ CONFIG_ARM_THUMB=y CONFIG_XSCALE_PMU=y # -# Bus support -# -CONFIG_ISA_DMA_API=y - -# -# Compaq/iPAQ Options +# Compaq/iPAQ Platforms # CONFIG_PXA_IPAQ=y @@ -162,16 +162,31 @@ CONFIG_PXA_IPAQ=y # XScale-based iPAQ # CONFIG_IPAQ_HANDHELD=y + +# +# Compaq/iPAQ Drivers +# + +# +# Compaq/HP iPAQ Drivers +# # CONFIG_IPAQ_SLEEVE is not set # CONFIG_IPAQ_SAMCOP is not set # CONFIG_IPAQ_HAMCOP is not set # +# Bus support +# +CONFIG_ISA_DMA_API=y + +# # PCCARD (PCMCIA/CardBus) support # CONFIG_PCCARD=m CONFIG_PCMCIA_DEBUG=y CONFIG_PCMCIA=m +# CONFIG_PCMCIA_LOAD_CIS is not set +CONFIG_PCMCIA_IOCTL=y # # PC-card bridges @@ -184,7 +199,14 @@ CONFIG_PCMCIA_PXA2XX=m # # CONFIG_SMP is not set CONFIG_PREEMPT=y -# CONFIG_DISCONTIGMEM is not set +CONFIG_NO_IDLE_HZ=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_ALIGNMENT_TRAP=y # @@ -221,187 +243,7 @@ CONFIG_PM=y CONFIG_APM=m # -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FW_LOADER=m -# CONFIG_DEBUG_DRIVER is not set - -# -# Memory Technology Devices (MTD) -# -CONFIG_MTD=y -# CONFIG_MTD_DEBUG is not set -CONFIG_MTD_CONCAT=y -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=m -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=y -# CONFIG_MTD_JEDECPROBE is not set -CONFIG_MTD_GEN_PROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -CONFIG_MTD_CFI_NOSWAP=y -# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set -# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set -CONFIG_MTD_CFI_GEOMETRY=y -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_OTP is not set -CONFIG_MTD_CFI_INTELEXT=y -# CONFIG_MTD_CFI_AMDSTD is not set -# CONFIG_MTD_CFI_STAA is not set -CONFIG_MTD_CFI_UTIL=y -# 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 -# CONFIG_MTD_XIP is not set - -# -# Mapping drivers for chip access -# -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -# CONFIG_MTD_PHYSMAP is not set -# CONFIG_MTD_MULTI_PHYSMAP is not set -# CONFIG_MTD_ARM_INTEGRATOR is not set -CONFIG_MTD_IPAQ=y -# CONFIG_MTD_EDB7312 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_RAMTD is not set -# CONFIG_MTD_BLKMTD 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 - -# -# 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=m -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_NBD=m -# CONFIG_BLK_DEV_RAM is not set -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_INITRAMFS_SOURCE="" -# CONFIG_CDROM_PKTCDVD is not set - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -# CONFIG_IOSCHED_CFQ is not set -# CONFIG_ATA_OVER_ETH is not set - -# -# ATA/ATAPI/MFM/RLL support -# -CONFIG_IDE=m -CONFIG_BLK_DEV_IDE=m - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_BLK_DEV_IDEDISK=m -# CONFIG_IDEDISK_MULTI_MODE is not set -CONFIG_BLK_DEV_IDECS=m -# 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=m -# 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_SCSI is not set - -# -# Multi-device support (RAID and LVM) -# -# CONFIG_MD is not set - -# -# Fusion MPT device support -# - -# -# IEEE 1394 (FireWire) support -# -# CONFIG_IEEE1394 is not set - -# -# I2O device support -# - -# -# Networking support +# Networking # CONFIG_NET=y @@ -411,10 +253,15 @@ CONFIG_NET=y CONFIG_PACKET=m CONFIG_PACKET_MMAP=y CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=m CONFIG_NET_KEY=m CONFIG_INET=y CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set +# CONFIG_ASK_IP_FIB_HASH is not set +# CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_FIB_HASH=y # CONFIG_IP_PNP is not set CONFIG_NET_IPIP=m CONFIG_NET_IPGRE=m @@ -428,6 +275,8 @@ CONFIG_INET_IPCOMP=m CONFIG_INET_TUNNEL=m CONFIG_IP_TCPDIAG=m CONFIG_IP_TCPDIAG_IPV6=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y # # IP: Virtual Server Configuration @@ -439,10 +288,9 @@ CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m CONFIG_INET6_TUNNEL=m -CONFIG_IPV6_TUNNEL=m +# CONFIG_IPV6_TUNNEL is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set -CONFIG_BRIDGE_NETFILTER=y # # IP: Netfilter Configuration @@ -475,7 +323,6 @@ CONFIG_IP_NF_MATCH_TCPMSS=m CONFIG_IP_NF_MATCH_STATE=m # CONFIG_IP_NF_MATCH_CONNTRACK is not set # CONFIG_IP_NF_MATCH_OWNER is not set -# CONFIG_IP_NF_MATCH_PHYSDEV is not set # CONFIG_IP_NF_MATCH_ADDRTYPE is not set # CONFIG_IP_NF_MATCH_REALM is not set # CONFIG_IP_NF_MATCH_SCTP is not set @@ -522,7 +369,6 @@ CONFIG_IP6_NF_MATCH_MARK=m # CONFIG_IP6_NF_MATCH_AHESP is not set # CONFIG_IP6_NF_MATCH_LENGTH is not set # CONFIG_IP6_NF_MATCH_EUI64 is not set -# CONFIG_IP6_NF_MATCH_PHYSDEV is not set CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_LOG=m CONFIG_IP6_NF_MANGLE=m @@ -530,18 +376,11 @@ CONFIG_IP6_NF_TARGET_MARK=m # CONFIG_IP6_NF_RAW is not set # -# Bridge: Netfilter Configuration -# -# CONFIG_BRIDGE_NF_EBTABLES is not set -CONFIG_XFRM=y -CONFIG_XFRM_USER=m - -# # SCTP Configuration (EXPERIMENTAL) # # CONFIG_IP_SCTP is not set # CONFIG_ATM is not set -CONFIG_BRIDGE=m +# CONFIG_BRIDGE is not set # CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set # CONFIG_LLC2 is not set @@ -552,10 +391,6 @@ CONFIG_BRIDGE=m # 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 # CONFIG_NET_CLS_ROUTE is not set @@ -563,8 +398,6 @@ CONFIG_BRIDGE=m # Network testing # # CONFIG_NET_PKTGEN is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_HAMRADIO is not set CONFIG_IRDA=m @@ -637,6 +470,190 @@ CONFIG_BT_HCIUART_BCSP=y # CONFIG_BT_HCIBLUECARD is not set CONFIG_BT_HCIBTUART=m # CONFIG_BT_HCIVHCI is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=m +# CONFIG_DEBUG_DRIVER is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=y +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=m +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=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +CONFIG_MTD_CFI_GEOMETRY=y +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_OTP is not set +CONFIG_MTD_CFI_INTELEXT=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# 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 +# CONFIG_MTD_XIP is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_MULTI_PHYSMAP is not set +# CONFIG_MTD_ARM_INTEGRATOR is not set +CONFIG_MTD_IPAQ=y +# CONFIG_MTD_EDB7312 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_RAMTD is not set +# CONFIG_MTD_BLKMTD 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 + +# +# 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=m +CONFIG_BLK_DEV_CRYPTOLOOP=m +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_INITRAMFS_SOURCE="" +# CONFIG_CDROM_PKTCDVD is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_CFQ is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=m +CONFIG_BLK_DEV_IDE=m + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=m +# CONFIG_IDEDISK_MULTI_MODE is not set +CONFIG_BLK_DEV_IDECS=m +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=m +# 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_SCSI 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 +# +# CONFIG_IEEE1394 is not set + +# +# I2O device support +# + +# +# Network device support +# CONFIG_NETDEVICES=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set @@ -688,7 +705,6 @@ CONFIG_NET_RADIO=y # # CONFIG_AIRO_CS is not set # CONFIG_PCMCIA_WL3501 is not set -# CONFIG_PCMCIA_ACX100 is not set CONFIG_NET_WIRELESS=y # CONFIG_HOSTAP is not set @@ -720,6 +736,8 @@ CONFIG_PPP_BSDCOMP=m # 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 @@ -735,7 +753,6 @@ CONFIG_INPUT=y # Userland interfaces # # CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set CONFIG_INPUT_EVDEV=m @@ -765,7 +782,7 @@ CONFIG_INPUT_UINPUT=m # CONFIG_SERIO=m CONFIG_SERIO_SERPORT=m -# CONFIG_SERIO_LIBPS2 is not set +CONFIG_SERIO_LIBPS2=m CONFIG_SERIO_RAW=m # CONFIG_GAMEPORT is not set @@ -788,7 +805,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4 # # Non-8250 serial port support # -# CONFIG_SERIAL_DZ is not set CONFIG_SERIAL_PXA=y CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SERIAL_PXA_COUNT=4 @@ -820,48 +836,19 @@ CONFIG_I2C_PXA=m # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_PCA_ISA is not set +# CONFIG_I2C_SENSOR is not set # -# Hardware Sensors Chip support -# -# CONFIG_I2C_SENSOR is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_FSCHER is not set -# CONFIG_SENSORS_FSCPOS is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83627HF is not set - -# -# Other I2C Chip support +# 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_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 @@ -901,7 +888,6 @@ CONFIG_SA1100_RTC=y # # Ftape, the floppy tape device driver # -# CONFIG_DRM is not set # # PCMCIA character devices @@ -914,6 +900,11 @@ CONFIG_SA1100_RTC=y # # +# Hardware Monitoring support +# +# CONFIG_HWMON is not set + +# # SoC drivers # # CONFIG_SOC_MQ11XX is not set @@ -989,11 +980,13 @@ 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 @@ -1038,11 +1031,13 @@ CONFIG_SND_GENERIC_PM=y # # ALSA ARM devices # +# CONFIG_SND_A716 is not set +# CONFIG_SND_H1910 is not set # CONFIG_SND_H2200 is not set CONFIG_SND_HX4700=m # CONFIG_SND_PXA2XX_UDA1380 is not set # CONFIG_SND_H5XXX_AK4535 is not set -# CONFIG_SND_PXA_AC97 is not set +# CONFIG_SND_PXA2XX_AC97 is not set # # PCMCIA devices @@ -1052,7 +1047,6 @@ CONFIG_SND_HX4700=m # Open Sound System # # CONFIG_SOUND_PRIME is not set -# CONFIG_SOUND_UDA1341 is not set # # Dallas's 1-wire bus @@ -1074,6 +1068,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y # 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 @@ -1118,9 +1113,10 @@ CONFIG_EXT2_FS=m CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y # CONFIG_EXT2_FS_SECURITY is not set +# CONFIG_EXT2_FS_XIP is not set # CONFIG_EXT3_FS is not set # CONFIG_JBD is not set -CONFIG_FS_MBCACHE=y +CONFIG_FS_MBCACHE=m # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y @@ -1131,6 +1127,7 @@ CONFIG_FS_POSIX_ACL=y # CONFIG_XFS_FS is not set # CONFIG_MINIX_FS is not set CONFIG_ROMFS_FS=m +CONFIG_INOTIFY=y # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set @@ -1187,8 +1184,6 @@ CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_CMODE_NONE is not set CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_JFFS2_CMODE_SIZE is not set -# CONFIG_JFFS3_FS is not set -# CONFIG_JFFS3_COMPRESSION_OPTIONS is not set CONFIG_CRAMFS=m # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set diff --git a/packages/module-init-tools/files/depmod-byteswap.patch b/packages/module-init-tools/files/depmod-byteswap.patch deleted file mode 100644 index 1b46708b30..0000000000 --- a/packages/module-init-tools/files/depmod-byteswap.patch +++ /dev/null @@ -1,288 +0,0 @@ -diff -u module-init-tools-3.1/orig/depmod.c module-init-tools-3.1/depmod.c ---- module-init-tools-3.1/orig/depmod.c 2005-04-07 18:50:25.829635704 -0700 -+++ module-init-tools-3.1/depmod.c 2005-04-07 19:46:43.842099752 -0700 -@@ -17,6 +17,7 @@ - #include <dirent.h> - #include <sys/utsname.h> - #include <sys/mman.h> -+#include <endian.h> - - #include "zlibsupport.h" - #include "depmod.h" -@@ -303,16 +304,38 @@ - goto fail; - } - -- switch (((char *)new->data)[EI_CLASS]) { -- case ELFCLASS32: -+ switch (((char *)new->data)[EI_CLASS] + (((char *)new->data)[EI_DATA] << 8)) { -+ case ELFCLASS32 + (ELFDATA2LSB << 8): /* 32 bit little endian */ -+#if __BYTE_ORDER == __LITTLE_ENDIAN - new->ops = &mod_ops32; -+#else -+ new->ops = &mod_ops32swap; -+#endif -+ break; -+ case ELFCLASS32 + (ELFDATA2MSB << 8): /* 32 bit big endian */ -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+ new->ops = &mod_ops32swap; -+#else -+ new->ops = &mod_ops32; -+#endif - break; -- case ELFCLASS64: -+ case ELFCLASS64 + (ELFDATA2LSB << 8): /* 64 bit little endian */ -+#if __BYTE_ORDER == __LITTLE_ENDIAN - new->ops = &mod_ops64; -+#else -+ new->ops = &mod_ops64swap; -+#endif -+ break; -+ case ELFCLASS64 + (ELFDATA2MSB << 8): /* 64 bit big endian */ -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+ new->ops = &mod_ops64swap; -+#else -+ new->ops = &mod_ops64; -+#endif - break; - default: -- warn("Module %s has elf unknown identifier %i\n", -- new->pathname, ((char *)new->data)[EI_CLASS]); -+ warn("Module %s has elf unknown identifier %i,%i\n", -+ new->pathname, ((char *)new->data)[EI_CLASS], ((char *)new->data)[EI_DATA]); - goto fail; - } - return new; -diff -u module-init-tools-3.1/orig/moduleops.c module-init-tools-3.1/moduleops.c ---- module-init-tools-3.1/orig/moduleops.c 2005-04-07 18:50:25.829635704 -0700 -+++ module-init-tools-3.1/moduleops.c 2005-04-07 19:52:11.166338904 -0700 -@@ -9,15 +9,64 @@ - #include "moduleops.h" - #include "tables.h" - -+/* This deals with both mis-aligned reads and endianness issues, -+ * it may seem crude however the compiler knows 'size' at compile -+ * time (because it comes from sizeof) therefore generates fairly -+ * optimal code. -+ */ -+static inline void read_native(const void *src, void *dest, unsigned int size) -+{ -+ unsigned int i; -+ for (i = 0; i < size; i++) -+ ((unsigned char*)dest)[i] = ((unsigned char*)src)[i]; -+} -+ -+#define NATIVE(x)\ -+({\ -+ typeof(x) __x;\ -+ read_native(&(x), &__x, sizeof __x);\ -+ __x;\ -+}) -+ -+static inline void read_swapped(const void *src, void *dest, unsigned int size) -+{ -+ unsigned int i; -+ for (i = 0; i < size; i++) -+ ((unsigned char*)dest)[i] = ((unsigned char*)src)[size - i-1]; -+} -+ -+#define SWAPPED(x)\ -+({\ -+ typeof(x) __x;\ -+ read_swapped(&(x), &__x, sizeof __x);\ -+ __x;\ -+}) -+ -+#define PERBITCOUNT(x) x##32 - #define PERBIT(x) x##32 - #define ElfPERBIT(x) Elf32_##x - #define ELFPERBIT(x) ELF32_##x -+#define READ(x) NATIVE(x) -+#include "moduleops_core.c" -+#undef PERBIT -+#undef READ -+#define PERBIT(x) x##32swap -+#define READ(x) SWAPPED(x) - #include "moduleops_core.c" - -+#undef PERBITCOUNT - #undef PERBIT - #undef ElfPERBIT - #undef ELFPERBIT -+#undef READ -+#define PERBITCOUNT(x) x##64 - #define PERBIT(x) x##64 - #define ElfPERBIT(x) Elf64_##x - #define ELFPERBIT(x) ELF64_##x -+#define READ(x) NATIVE(x) -+#include "moduleops_core.c" -+#undef PERBIT -+#undef READ -+#define PERBIT(x) x##64swap -+#define READ(x) SWAPPED(x) - #include "moduleops_core.c" -diff -u module-init-tools-3.1/orig/moduleops.h module-init-tools-3.1/moduleops.h ---- module-init-tools-3.1/orig/moduleops.h 2005-04-07 18:50:25.829635704 -0700 -+++ module-init-tools-3.1/moduleops.h 2005-04-07 19:36:26.184997904 -0700 -@@ -24,5 +24,6 @@ - }; - - extern struct module_ops mod_ops32, mod_ops64; -+extern struct module_ops mod_ops32swap, mod_ops64swap; - - #endif /* MODINITTOOLS_MODULEOPS_H */ -diff -u module-init-tools-3.1/orig/moduleops_core.c module-init-tools-3.1/moduleops_core.c ---- module-init-tools-3.1/orig/moduleops_core.c 2005-04-07 18:50:25.829635704 -0700 -+++ module-init-tools-3.1/moduleops_core.c 2005-04-07 19:56:18.794693672 -0700 -@@ -8,14 +8,14 @@ - char *secnames; - - /* Grab section headers and strings so we can tell who is who */ -- sechdrs = (void *)hdr + hdr->e_shoff; -- secnames = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset; -+ sechdrs = (void *)hdr + READ(hdr->e_shoff); -+ secnames = (void *)hdr + READ(sechdrs[READ(hdr->e_shstrndx)].sh_offset); - - /* Find the section they want */ -- for (i = 1; i < hdr->e_shnum; i++) { -- if (strcmp(secnames+sechdrs[i].sh_name, secname) == 0) { -- *size = sechdrs[i].sh_size; -- return (void *)hdr + sechdrs[i].sh_offset; -+ for (i = 1; i < READ(hdr->e_shnum); i++) { -+ if (strcmp(secnames+READ(sechdrs[i].sh_name), secname) == 0) { -+ *size = READ(sechdrs[i].sh_size); -+ return (void *)hdr + READ(sechdrs[i].sh_offset); - } - } - *size = 0; -@@ -24,7 +24,7 @@ - - static void PERBIT(load_symbols)(struct module *module) - { -- struct PERBIT(kernel_symbol) *ksyms; -+ struct PERBITCOUNT(kernel_symbol) *ksyms; - char *ksymstrings; - unsigned long i, size; - -@@ -58,10 +58,10 @@ - - /* Old-style. */ - ksyms = PERBIT(load_section)(module->data, "__ksymtab", &size); -- for (i = 0; i < size / sizeof(struct PERBIT(kernel_symbol)); i++) -+ for (i = 0; i < size / sizeof(struct PERBITCOUNT(kernel_symbol)); i++) - add_symbol(ksyms[i].name, module); - ksyms = PERBIT(load_section)(module->data, "__gpl_ksymtab", &size); -- for (i = 0; i < size / sizeof(struct PERBIT(kernel_symbol)); i++) -+ for (i = 0; i < size / sizeof(struct PERBITCOUNT(kernel_symbol)); i++) - add_symbol(ksyms[i].name, module); - } - -@@ -100,16 +100,16 @@ - - hdr = module->data; - handle_register_symbols = 0; -- if (hdr->e_machine == EM_SPARC || -- hdr->e_machine == EM_SPARCV9) -+ if (READ(hdr->e_machine) == EM_SPARC || -+ READ(hdr->e_machine) == EM_SPARCV9) - handle_register_symbols = 1; - - module->num_deps = 0; - module->deps = NULL; - for (i = 1; i < size / sizeof(syms[0]); i++) { -- if (syms[i].st_shndx == SHN_UNDEF) { -+ if (READ(syms[i].st_shndx) == SHN_UNDEF) { - /* Look for symbol */ -- const char *name = strings + syms[i].st_name; -+ const char *name = strings + READ(syms[i].st_name); - struct module *owner; - int weak; - -@@ -118,11 +118,11 @@ - variables, to avoid anyone else misusing - them. */ - if (handle_register_symbols -- && (ELFPERBIT(ST_TYPE)(syms[i].st_info) -+ && (ELFPERBIT(ST_TYPE)(READ(syms[i].st_info)) - == STT_REGISTER)) - continue; - -- weak = ELFPERBIT(ST_BIND)(syms[i].st_info) == STB_WEAK; -+ weak = ELFPERBIT(ST_BIND)(READ(syms[i].st_info)) == STB_WEAK; - owner = find_symbol(name, module->pathname, weak); - if (owner) { - if (verbose) -@@ -143,7 +143,7 @@ - ElfPERBIT(Sym) *syms; - ElfPERBIT(Shdr) *sechdrs; - -- sechdrs = (void *)hdr + hdr->e_shoff; -+ sechdrs = (void *)hdr + READ(hdr->e_shoff); - strings = PERBIT(load_section)(hdr, ".strtab", &size); - syms = PERBIT(load_section)(hdr, ".symtab", &size); - -@@ -152,14 +152,14 @@ - return NULL; - - for (i = 0; i < size / sizeof(syms[0]); i++) { -- if (strcmp(strings + syms[i].st_name, name) == 0) { -+ if (strcmp(strings + READ(syms[i].st_name), name) == 0) { - /* In BSS? Happens for empty device tables on - * recent GCC versions. */ -- if (sechdrs[syms[i].st_shndx].sh_type == SHT_NOBITS) -+ if (READ(sechdrs[READ(syms[i].st_shndx)].sh_type) == SHT_NOBITS) - return NULL; - return (void *)hdr -- + sechdrs[syms[i].st_shndx].sh_offset -- + syms[i].st_value; -+ + READ(sechdrs[READ(syms[i].st_shndx)].sh_offset) -+ + READ(syms[i].st_value); - } - } - return NULL; -@@ -168,36 +168,36 @@ - /* FIXME: Check size, unless we end up using aliases anyway --RR */ - static void PERBIT(fetch_tables)(struct module *module) - { -- module->pci_size = PERBIT(PCI_DEVICE_SIZE); -+ module->pci_size = PERBITCOUNT(PCI_DEVICE_SIZE); - module->pci_table = PERBIT(deref_sym)(module->data, - "__mod_pci_device_table"); - -- module->usb_size = PERBIT(USB_DEVICE_SIZE); -+ module->usb_size = PERBITCOUNT(USB_DEVICE_SIZE); - module->usb_table = PERBIT(deref_sym)(module->data, - "__mod_usb_device_table"); - -- module->ccw_size = PERBIT(CCW_DEVICE_SIZE); -+ module->ccw_size = PERBITCOUNT(CCW_DEVICE_SIZE); - module->ccw_table = PERBIT(deref_sym)(module->data, - "__mod_ccw_device_table"); - -- module->ieee1394_size = PERBIT(IEEE1394_DEVICE_SIZE); -+ module->ieee1394_size = PERBITCOUNT(IEEE1394_DEVICE_SIZE); - module->ieee1394_table = PERBIT(deref_sym)(module->data, - "__mod_ieee1394_device_table"); - -- module->pnp_size = PERBIT(PNP_DEVICE_SIZE); -+ module->pnp_size = PERBITCOUNT(PNP_DEVICE_SIZE); - module->pnp_table = PERBIT(deref_sym)(module->data, - "__mod_pnp_device_table"); - -- module->pnp_card_size = PERBIT(PNP_CARD_DEVICE_SIZE); -+ module->pnp_card_size = PERBITCOUNT(PNP_CARD_DEVICE_SIZE); - module->pnp_card_table = PERBIT(deref_sym)(module->data, - "__mod_pnp_card_device_table"); -- module->pnp_card_offset = PERBIT(PNP_CARD_DEVICE_OFFSET); -+ module->pnp_card_offset = PERBITCOUNT(PNP_CARD_DEVICE_OFFSET); - -- module->input_size = PERBIT(INPUT_DEVICE_SIZE); -+ module->input_size = PERBITCOUNT(INPUT_DEVICE_SIZE); - module->input_table = PERBIT(deref_sym)(module->data, - "__mod_input_device_table"); - -- module->soc_size = PERBIT(SOC_DEVICE_SIZE); -+ module->soc_size = PERBITCOUNT(SOC_DEVICE_SIZE); - module->soc_table = PERBIT(deref_sym)(module->data, - "__mod_soc_device_table"); - diff --git a/packages/module-init-tools/files/ignore_arch_directory b/packages/module-init-tools/files/ignore_arch_directory index 2c71043221..185ea7a3a5 100644 --- a/packages/module-init-tools/files/ignore_arch_directory +++ b/packages/module-init-tools/files/ignore_arch_directory @@ -1,25 +1,24 @@ diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8 ---- module-init-tools-3.1-pre6.orig/modprobe.8 2004-10-06 02:44:43.000000000 +0200 -+++ module-init-tools-3.1-pre6/modprobe.8 2004-10-09 01:39:01.000000000 +0200 -@@ -30,6 +30,7 @@ - the modules and other files, except for the optional - \fI/etc/modprobe.conf\fR configuration file +--- module-init-tools-3.2-pre7/modprobe.8.orig 2005-07-05 13:52:32.000000000 +0200 ++++ module-init-tools-3.2-pre7/modprobe.8 2005-07-05 13:52:42.000000000 +0200 +@@ -31,6 +31,7 @@ + \fI/etc/modprobe.conf\fR configuration file and + \fI/etc/modprobe.d\fR directory (see \fBmodprobe.conf\fR(5)). +All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored. .PP Note that this version of \fBmodprobe\fR does not do anything to the module itself: the work of resolving symbols -diff -ruN module-init-tools-3.1-pre6.orig/modprobe.c module-init-tools-3.1-pre6/modprobe.c ---- module-init-tools-3.1-pre6.orig/modprobe.c 2004-10-09 01:40:18.000000000 +0200 -+++ module-init-tools-3.1-pre6/modprobe.c 2004-10-09 01:40:11.000000000 +0200 -@@ -1082,6 +1082,10 @@ - { +--- module-init-tools-3.2-pre7/modprobe.c.orig 2005-07-05 13:50:00.000000000 +0200 ++++ module-init-tools-3.2-pre7/modprobe.c 2005-07-05 13:50:15.000000000 +0200 +@@ -1158,6 +1158,10 @@ DIR *dir; + int ret = 0; + /* ignore everything in this directory */ + if (streq(filename, "/etc/modprobe.d/arch")) + return 1; + - /* If it's a directory, recurse. */ + /* Reiser4 has file/directory duality: treat it as both. */ dir = opendir(filename); if (dir) { diff --git a/packages/module-init-tools/files/manpagesopt b/packages/module-init-tools/files/manpagesopt index 2e9d228d58..5d5cac609e 100644 --- a/packages/module-init-tools/files/manpagesopt +++ b/packages/module-init-tools/files/manpagesopt @@ -1,7 +1,7 @@ -Index: module-init-tools-3.1/configure.in +Index: module-init-tools-3.2-pre9/configure.in =================================================================== ---- module-init-tools-3.1.orig/configure.in 2004-11-12 00:05:25.000000000 -0500 -+++ module-init-tools-3.1/configure.in 2005-01-20 02:23:16.409792288 -0500 +--- module-init-tools-3.2-pre9.orig/configure.in 2005-08-09 04:31:26.000000000 +0000 ++++ module-init-tools-3.2-pre9/configure.in 2005-09-20 22:06:10.000000000 +0000 @@ -41,5 +41,14 @@ fi]) AC_SUBST(MODULE_DIR) @@ -18,22 +18,24 @@ Index: module-init-tools-3.1/configure.in +AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes") +AC_OUTPUT([Makefile]) -Index: module-init-tools-3.1/Makefile.am +Index: module-init-tools-3.2-pre9/Makefile.am =================================================================== ---- module-init-tools-3.1.orig/Makefile.am 2004-07-12 02:11:46.000000000 -0400 -+++ module-init-tools-3.1/Makefile.am 2005-01-20 02:24:32.155277224 -0500 -@@ -21,11 +21,12 @@ +--- module-init-tools-3.2-pre9.orig/Makefile.am 2005-08-09 04:54:28.000000000 +0000 ++++ module-init-tools-3.2-pre9/Makefile.am 2005-09-20 22:09:03.000000000 +0000 +@@ -21,13 +21,14 @@ MAN5 = modprobe.conf.5 modules.dep.5 MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8 SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml)) -man_MANS = $(MAN5) $(MAN8) - mandir = $(shell if [ `echo $(prefix)/ | tr -s /` = / ]; then echo /usr/share/man; else echo $(prefix)/man; fi) + # If they haven't overridden mandir, fix it (never /man!) + mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi) + TESTSUITE := $(shell find tests -type f ! -name '*~') tests/vg-suppressions + +-EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE) +if MANPAGES +man_MANS = $(MAN5) $(MAN8) +endif --EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ stress_modules.sh install-with-care $(SGML) $(man_MANS) - sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static bin_PROGRAMS = lsmod diff --git a/packages/module-init-tools/files/soc.patch b/packages/module-init-tools/files/soc.patch deleted file mode 100644 index ee5f11042f..0000000000 --- a/packages/module-init-tools/files/soc.patch +++ /dev/null @@ -1,97 +0,0 @@ ---- tables.c~ 2003-12-24 05:23:38.000000000 +0000 -+++ tables.c 2005-04-02 13:12:24.370140112 +0100 -@@ -18,6 +18,34 @@ - } - - /* We set driver_data to zero */ -+static void output_soc_entry(struct soc_device_id *soc, char *name, FILE *out) -+{ -+ fprintf(out, -+ "%-20s 0x%08x 0x0\n", -+ name, -+ soc->id); -+} -+ -+void output_soc_table(struct module *modules, FILE *out) -+{ -+ struct module *i; -+ -+ fprintf(out, "# soc module id driver_data\n"); -+ -+ for (i = modules; i; i = i->next) { -+ struct soc_device_id *e; -+ char shortname[strlen(i->pathname) + 1]; -+ -+ if (!i->soc_table) -+ continue; -+ -+ make_shortname(shortname, i->pathname); -+ for (e = i->soc_table; e->id; e = (void *)e + i->soc_size) -+ output_soc_entry(e, shortname, out); -+ } -+} -+ -+/* We set driver_data to zero */ - static void output_pci_entry(struct pci_device_id *pci, char *name, FILE *out) - { - fprintf(out, ---- tables.h~ 2003-12-24 05:18:54.000000000 +0000 -+++ tables.h 2005-04-02 13:05:15.269373344 +0100 -@@ -116,6 +116,15 @@ - #define INPUT_DEVICE_SIZE32 (4 + 4 * 2 + 4 + 16 * 4 + 4 + 2 * 4 + 4 + 4 + 4 + 4 * 4 + 4) - #define INPUT_DEVICE_SIZE64 (8 + 4 * 2 + 8 + 8 * 8 + 8 + 8 + 8 + 8 + 8 + 2 * 8 + 8) - -+#include <stdint.h> -+ -+typedef struct soc_device_id { -+ uint32_t id; -+} soc_device_id; -+ -+#define SOC_DEVICE_SIZE32 (4 + 4) -+#define SOC_DEVICE_SIZE64 (4 + 8) -+ - /* Functions provided by tables.c */ - struct module; - void output_usb_table(struct module *modules, FILE *out); -@@ -124,5 +133,6 @@ - void output_ccw_table(struct module *modules, FILE *out); - void output_isapnp_table(struct module *modules, FILE *out); - void output_input_table(struct module *modules, FILE *out); -+void output_soc_table(struct module *modules, FILE *out); - - #endif /* MODINITTOOLS_TABLES_H */ ---- moduleops_core.c~ 2004-08-12 06:08:35.000000000 +0100 -+++ moduleops_core.c 2005-04-02 13:04:13.367783816 +0100 -@@ -196,6 +196,11 @@ - module->input_size = PERBIT(INPUT_DEVICE_SIZE); - module->input_table = PERBIT(deref_sym)(module->data, - "__mod_input_device_table"); -+ -+ module->soc_size = PERBIT(SOC_DEVICE_SIZE); -+ module->soc_table = PERBIT(deref_sym)(module->data, -+ "__mod_soc_device_table"); -+ - } - - struct module_ops PERBIT(mod_ops) = { ---- depmod.h~ 2003-12-24 02:10:57.000000000 +0000 -+++ depmod.h 2005-04-02 13:03:19.006048056 +0100 -@@ -47,6 +47,8 @@ - void *pnp_card_table; - unsigned int input_size; - void *input_table; -+ unsigned int soc_size; -+ void *soc_table; - - /* File contents and length. */ - void *data; ---- depmod.c~ 2005-02-14 04:50:51.744716656 +0000 -+++ depmod.c 2005-04-02 13:03:37.051304760 +0100 -@@ -683,6 +683,7 @@ - { "modules.ieee1394map", output_ieee1394_table }, - { "modules.isapnpmap", output_isapnp_table }, - { "modules.inputmap", output_input_table }, -+ { "modules.socmap", output_soc_table }, - { "modules.alias", output_aliases }, - { "modules.symbols", output_symbols }, - }; diff --git a/packages/module-init-tools/module-init-tools-3.2.1/ignore_arch_directory b/packages/module-init-tools/module-init-tools-3.2.1/ignore_arch_directory deleted file mode 100644 index 185ea7a3a5..0000000000 --- a/packages/module-init-tools/module-init-tools-3.2.1/ignore_arch_directory +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8 ---- module-init-tools-3.2-pre7/modprobe.8.orig 2005-07-05 13:52:32.000000000 +0200 -+++ module-init-tools-3.2-pre7/modprobe.8 2005-07-05 13:52:42.000000000 +0200 -@@ -31,6 +31,7 @@ - \fI/etc/modprobe.conf\fR configuration file and - \fI/etc/modprobe.d\fR directory - (see \fBmodprobe.conf\fR(5)). -+All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored. - .PP - Note that this version of \fBmodprobe\fR does not - do anything to the module itself: the work of resolving symbols ---- module-init-tools-3.2-pre7/modprobe.c.orig 2005-07-05 13:50:00.000000000 +0200 -+++ module-init-tools-3.2-pre7/modprobe.c 2005-07-05 13:50:15.000000000 +0200 -@@ -1158,6 +1158,10 @@ - DIR *dir; - int ret = 0; - -+ /* ignore everything in this directory */ -+ if (streq(filename, "/etc/modprobe.d/arch")) -+ return 1; -+ - /* Reiser4 has file/directory duality: treat it as both. */ - dir = opendir(filename); - if (dir) { diff --git a/packages/module-init-tools/module-init-tools-3.2.1/manpagesopt b/packages/module-init-tools/module-init-tools-3.2.1/manpagesopt deleted file mode 100644 index 5d5cac609e..0000000000 --- a/packages/module-init-tools/module-init-tools-3.2.1/manpagesopt +++ /dev/null @@ -1,41 +0,0 @@ -Index: module-init-tools-3.2-pre9/configure.in -=================================================================== ---- module-init-tools-3.2-pre9.orig/configure.in 2005-08-09 04:31:26.000000000 +0000 -+++ module-init-tools-3.2-pre9/configure.in 2005-09-20 22:06:10.000000000 +0000 -@@ -41,5 +41,14 @@ - fi]) - AC_SUBST(MODULE_DIR) - --AC_OUTPUT([Makefile]) -+AC_ARG_ENABLE(manpages, -+[ --disable-manpages Disable man page generation.], -+[if test x"$enableval" != x"no"; then -+ enable_manpages=yes -+else -+ enable_manpages=no -+fi], -+[enable_manpages=yes]) -+AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes") - -+AC_OUTPUT([Makefile]) -Index: module-init-tools-3.2-pre9/Makefile.am -=================================================================== ---- module-init-tools-3.2-pre9.orig/Makefile.am 2005-08-09 04:54:28.000000000 +0000 -+++ module-init-tools-3.2-pre9/Makefile.am 2005-09-20 22:09:03.000000000 +0000 -@@ -21,13 +21,14 @@ - MAN5 = modprobe.conf.5 modules.dep.5 - MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8 - SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml)) --man_MANS = $(MAN5) $(MAN8) - # If they haven't overridden mandir, fix it (never /man!) - mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi) - - TESTSUITE := $(shell find tests -type f ! -name '*~') tests/vg-suppressions - --EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE) -+if MANPAGES -+man_MANS = $(MAN5) $(MAN8) -+endif - - sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static - bin_PROGRAMS = lsmod diff --git a/packages/module-init-tools/module-init-tools-cross_3.1.bb b/packages/module-init-tools/module-init-tools-cross_3.1.bb deleted file mode 100644 index 56fec56072..0000000000 --- a/packages/module-init-tools/module-init-tools-cross_3.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -LICENSE = "GPL" -include module-init-tools_${PV}.bb -inherit cross -DEFAULT_PREFERENCE = "0" -PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" - -PR="r3" - -# When cross compiling depmod as shipped cannot handle endian -# differences between host and target, this fixes the problem. -# It also solves any possible issues with alignment (only likely -# if cross compiling for a low alignment target - e.g. x86, on -# a high alignment host - e.g. SPARC). -SRC_URI += " file://depmod-byteswap.patch;patch=1 " - -EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" - -do_stage () { - oe_runmake install -} - -do_install () { - : -} diff --git a/packages/module-init-tools/module-init-tools-cross_3.2.2.bb b/packages/module-init-tools/module-init-tools-cross_3.2.2.bb new file mode 100644 index 0000000000..4bcc311709 --- /dev/null +++ b/packages/module-init-tools/module-init-tools-cross_3.2.2.bb @@ -0,0 +1,15 @@ +LICENSE = "GPL" +include module-init-tools_${PV}.bb +inherit cross +DEFAULT_PREFERENCE = "0" +PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" + +EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" + +do_stage () { + oe_runmake install +} + +do_install () { + : +} diff --git a/packages/module-init-tools/module-init-tools_3.1.bb b/packages/module-init-tools/module-init-tools_3.1.bb deleted file mode 100644 index 62523f513a..0000000000 --- a/packages/module-init-tools/module-init-tools_3.1.bb +++ /dev/null @@ -1,60 +0,0 @@ -LICENSE = "GPL" -SECTION = "base" -DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ -removing kernel modules for Linux (versions 2.5.48 and above). It serves \ -the same function that the modutils package serves for Linux 2.4." -PR = "r2" - -PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" -RDEPENDS_${PN} += "module-init-tools-depmod" - -FILES_module-init-tools-depmod = "${sbindir}/depmod.26" -FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" - -SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ - file://ignore_arch_directory;patch=1 \ - file://modutils_extension;patch=1 \ - file://no_man_rebuild;patch=1 \ - file://manpagesopt;patch=1 \ - file://soc.patch;patch=1;pnum=0" -S = "${WORKDIR}/module-init-tools-${PV}" - -EXTRA_OECONF = "--disable-manpages" - -bindir = "/bin" -sbindir = "/sbin" - -inherit autotools - -do_install() { - autotools_do_install - for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do - mv ${D}/$f ${D}/$f.26 - done -} - -pkg_postinst_module-init-tools() { -#!/bin/sh -for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do -bn=`basename $f` - update-alternatives --install /$f $bn /$f.26 20 -done -} - -pkg_prerm_module-init-tools() { -#!/bin/sh -for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do -bn=`basename $f` - update-alternatives --remove $bn /$f.26 -done -} - -pkg_postinst_module-init-tools-depmod() { -#!/bin/sh -update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 20 -} - -pkg_prerm_module-init-tools() { -#!/bin/sh -update-alternatives --remove depmod /sbin/depmod.26 -} diff --git a/packages/module-init-tools/module-init-tools_3.2-pre4.bb b/packages/module-init-tools/module-init-tools_3.2.2.bb index 58166f85ba..bbd8cca1bf 100644 --- a/packages/module-init-tools/module-init-tools_3.2-pre4.bb +++ b/packages/module-init-tools/module-init-tools_3.2.2.bb @@ -5,8 +5,6 @@ LICENSE = "GPL" SECTION = "base" PR = "r0" -DEFAULT_PREFERENCE="-1" - PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" RDEPENDS_${PN} += "module-init-tools-depmod" @@ -36,23 +34,27 @@ do_install() { pkg_postinst_module-init-tools() { #!/bin/sh -for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do +for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do bn=`basename $f` - update-alternatives --install /$f $bn /$f.26 20 + update-alternatives --install /$f $bn /$f.26 60 done +update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60 +update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60 } pkg_prerm_module-init-tools() { #!/bin/sh -for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do +for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do bn=`basename $f` update-alternatives --remove $bn /$f.26 done +update-alternatives --remove bin-lsmod /bin/lsmod.26 +update-alternatives --remove lsmod /bin/lsmod.26 } pkg_postinst_module-init-tools-depmod() { #!/bin/sh -update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 20 +update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 60 } pkg_prerm_module-init-tools() { diff --git a/packages/orinoco/orinoco-modules_cvs.bb b/packages/orinoco/orinoco-modules_cvs.bb index 9bdd1bf68a..88571b8071 100644 --- a/packages/orinoco/orinoco-modules_cvs.bb +++ b/packages/orinoco/orinoco-modules_cvs.bb @@ -15,7 +15,7 @@ EXTRA_OEMAKE = 'KERNEL_SRC="${KERNEL_STAGING_DIR}"' # seems to cause problems on arm DEFAULT_PREFERENCE_arm = "-1" -SRC_URI = "cvs://anoncvs:@savannah.gnu.org/cvsroot/orinoco;module=orinoco;method=ext;rsh=ssh \ +SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/cvsroot/orinoco;module=orinoco;method=pserver \ file://list-move.patch;patch=1" S = "${WORKDIR}/orinoco" diff --git a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb index e0ebf70d93..4e8a2ac830 100644 --- a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb +++ b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb @@ -3,7 +3,7 @@ SECTION = "base" PRIORITY = "required" LICENSE = "GPL" DEPENDS = "virtual/kernel" -PR = "r23" +PR = "r24" SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \ file://busybox.patch;patch=1 \ diff --git a/packages/qpegps/qpegps_0.9.2.3.2.bb b/packages/qpegps/qpegps_0.9.2.3.2.bb new file mode 100644 index 0000000000..1885f97855 --- /dev/null +++ b/packages/qpegps/qpegps_0.9.2.3.2.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Navigation application for use with GPS adapters" +SECTION = "opie/applications" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +RRECOMMENDS = "gpsd" +LICENSE = "GPL" +HOMEPAGE = "http://qpegps.sourceforge.net/" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/qpegps/qpegps_${PV}_src.zip \ + file://qpegps.desktop \ + file://qpegps.png" +S = "${WORKDIR}/qpegps_my" + +inherit palmtop + +QMAKE_PROFILES = "qpegps.pro" +EXTRA_QMAKEVARS_POST = "LIBS=-lqpe" + +do_install() { + install -d ${D}${palmtopdir}/bin \ + ${D}${palmtopdir}/apps/Applications \ + ${D}${palmtopdir}/pics/qpegps \ + ${D}${palmtopdir}/help/html/qpegps_icons \ + ${D}${palmtopdir}/qpegps/maps \ + ${D}${palmtopdir}/qpegps/icons \ + ${D}${palmtopdir}/qpegps/tracks + install -m 0755 qpegps ${D}${palmtopdir}/bin/ + install -m 0644 ${WORKDIR}/qpegps.desktop ${D}${palmtopdir}/apps/Applications/ + install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/qpegps/ + install -m 0644 doc/qpegps.html ${D}${palmtopdir}/help/html/ + install -m 0644 doc/qpegps_icons/*.png ${D}${palmtopdir}/help/html/qpegps_icons/ + install -m 0644 icons/*.xpm ${D}${palmtopdir}/qpegps/icons/ + install -m 0644 datum/*.dat ${D}${palmtopdir}/qpegps/ +} diff --git a/packages/quilt/quilt-native_0.42.bb b/packages/quilt/quilt-native_0.42.bb index 5dabcffd74..ad3834ea21 100644 --- a/packages/quilt/quilt-native_0.42.bb +++ b/packages/quilt/quilt-native_0.42.bb @@ -2,7 +2,7 @@ include quilt.inc INHIBIT_AUTOTOOLS_DEPS = "1" -SRC_URI = "cvs://anoncvs:@savannah.nongnu.org/cvsroot/quilt;method=ext;rsh=ssh;module=quilt;tag=VER_${@(bb.data.getVar('PV', d, 1) or '').replace('.', '_')} \ +SRC_URI = "cvs://anonymous@cvs.savannah.nongnu.org/cvsroot/quilt;method=pserver;module=quilt;tag=VER_${@(bb.data.getVar('PV', d, 1) or '').replace('.', '_')} \ file://install.patch;patch=1 \ file://nostrip.patch;patch=1 \ file://autoreconf.patch;patch=1" diff --git a/packages/quilt/quilt_0.42.bb b/packages/quilt/quilt_0.42.bb index f04f1809ad..44a0d9529b 100644 --- a/packages/quilt/quilt_0.42.bb +++ b/packages/quilt/quilt_0.42.bb @@ -1,6 +1,6 @@ include quilt.inc -SRC_URI = "cvs://anoncvs:@savannah.nongnu.org/cvsroot/quilt;method=ext;rsh=ssh;module=quilt;tag=VER_${@(bb.data.getVar('PV', d, 1) or '').replace('.', '_')} \ +SRC_URI = "cvs://anonymous@cvs.savannah.nongnu.org/cvsroot/quilt;method=pserver;module=quilt;tag=VER_${@(bb.data.getVar('PV', d, 1) or '').replace('.', '_')} \ file://install.patch;patch=1 \ file://nostrip.patch;patch=1" S = "${WORKDIR}/quilt" |