diff options
Diffstat (limited to 'packages')
41 files changed, 1120 insertions, 46 deletions
diff --git a/packages/cdstatus/.mtn2git_empty b/packages/cdstatus/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/cdstatus/.mtn2git_empty diff --git a/packages/cdstatus/cdstatus-0.96.05.bb b/packages/cdstatus/cdstatus-0.96.05.bb new file mode 100644 index 0000000000..1ae728f836 --- /dev/null +++ b/packages/cdstatus/cdstatus-0.96.05.bb @@ -0,0 +1,25 @@ +# cdstatus OE build file + +PR="r0" +LICENSE="GPL" +HOMEPAGE = "http://cdstatus.sourceforge.net/" +FILES_${PN} += ${datadir}/cdstatus.cfg + +SRC_URI="${SOURCEFORGE_MIRROR}/cdstatus/cdstatus-0.96.05.tar.gz \ + file://cdstatus.patch;patch=1" + +S="${WORKDIR}/cdstatus-0.96.05" + +inherit autotools + +TARGET_LDFLAGS="" + +do_install() { + install -d 0755 ${D}/${bindir} + install -d 0755 ${D}/${datadir} + install -d 0755 ${D}/${mandir} + install -m 0755 src/cdstatus ${D}/${bindir} + install -m 0644 cdstatus.cfg ${D}/${datadir} + install -m 0644 cdstatus.1 ${D}/${mandir} + +} diff --git a/packages/cdstatus/cdstatus-0.96.05/.mtn2git_empty b/packages/cdstatus/cdstatus-0.96.05/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/cdstatus/cdstatus-0.96.05/.mtn2git_empty diff --git a/packages/cdstatus/cdstatus-0.96.05/cdstatus.patch b/packages/cdstatus/cdstatus-0.96.05/cdstatus.patch new file mode 100644 index 0000000000..913cd721e0 --- /dev/null +++ b/packages/cdstatus/cdstatus-0.96.05/cdstatus.patch @@ -0,0 +1,131 @@ +*** cdstatus-0.96.05/src/cdstatus.c.orig 2005-11-26 16:23:27.000000000 +0100 +--- cdstatus-0.96.05/src/cdstatus.c 2005-11-26 19:06:57.000000000 +0100 +*************** +*** 436,441 **** +--- 436,501 ---- + return 0; + } + ++ /* following code copied from ++ http://www.gamedev.net/reference/articles/article2091.asp ++ it has been slightly modified as we did not have a reason to output ++ big endian or float ++ */ ++ static short ShortSwap( short s ) ++ { ++ unsigned char b1, b2; ++ ++ b1 = s & 255; ++ b2 = (s >> 8) & 255; ++ ++ return (b1 << 8) + b2; ++ } ++ ++ static short ShortNoSwap( short s ) ++ { ++ return s; ++ } ++ ++ static int LongSwap (int i) ++ { ++ unsigned char b1, b2, b3, b4; ++ ++ b1 = i & 255; ++ b2 = ( i >> 8 ) & 255; ++ b3 = ( i>>16 ) & 255; ++ b4 = ( i>>24 ) & 255; ++ ++ return ((int)b1 << 24) + ((int)b2 << 16) + ((int)b3 << 8) + b4; ++ } ++ ++ static int LongNoSwap( int i ) ++ { ++ return i; ++ } ++ ++ static short (*LittleShort) ( short s ); ++ static int (*LittleLong) ( int i ); ++ ++ static void InitEndian( void ) ++ { ++ char SwapTest[2] = { 1, 0 }; ++ ++ if( *(short *) SwapTest == 1 ) ++ { ++ // little endian ++ //set func pointers to correct funcs ++ LittleShort = ShortNoSwap; ++ LittleLong = LongNoSwap; ++ } ++ else ++ { ++ // big endian ++ LittleShort = ShortSwap; ++ LittleLong = LongSwap; ++ } ++ } ++ /* end of copied code */ ++ + static void writeWavHeader(unsigned int readframes, FILE * audio_out) + { + long int chunksize; +*************** +*** 456,478 **** + + wavHeader wHeader; + + /* "RIFF" */ +! wHeader.RIFF_header = 0x46464952; + + chunksize = readframes * CD_FRAMESIZE_RAW; +! wHeader.total_size = (int32_t)(chunksize + sizeof(wavHeader)); + + /* "WAVEfmt " */ +! wHeader.WAVE = 0x45564157; +! wHeader.fmt = 0x20746D66; + +! wHeader.subchunk_size = 16; +! wHeader.audio_format = 1; +! wHeader.number_channels = 2; +! wHeader.sampling_rate = 44100; +! wHeader.byte_rate = 176400; +! wHeader.block_align = 4; +! wHeader.bits_per_sample = 16; + + if(fwrite((const void *) &wHeader, sizeof(wavHeader), (size_t) 1, audio_out)!=1) + { +--- 516,539 ---- + + wavHeader wHeader; + ++ InitEndian(); + /* "RIFF" */ +! wHeader.RIFF_header = LittleLong(0x46464952); + + chunksize = readframes * CD_FRAMESIZE_RAW; +! wHeader.total_size = LittleLong((int32_t)(chunksize + sizeof(wavHeader))); + + /* "WAVEfmt " */ +! wHeader.WAVE = LittleLong(0x45564157); +! wHeader.fmt = LittleLong(0x20746D66); + +! wHeader.subchunk_size = LittleLong(16); +! wHeader.audio_format = LittleShort(1); +! wHeader.number_channels = LittleShort(2); +! wHeader.sampling_rate = LittleLong(44100); +! wHeader.byte_rate = LittleLong(176400); +! wHeader.block_align = LittleShort(4); +! wHeader.bits_per_sample = LittleShort(16); + + if(fwrite((const void *) &wHeader, sizeof(wavHeader), (size_t) 1, audio_out)!=1) + { +*************** +*** 492,497 **** +--- 553,559 ---- + } + exit(EXIT_FAILURE); + } ++ chunksize = LittleLong(chunksize); + if(fwrite((const void *) &chunksize, sizeof(long int), (size_t) 1, audio_out)!=1) + { + perror("Error writing wav file chunksize header"); diff --git a/packages/ez-ipupdate/.mtn2git_empty b/packages/ez-ipupdate/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ez-ipupdate/.mtn2git_empty diff --git a/packages/ez-ipupdate/ez-ipupdate_3.0.10.bb b/packages/ez-ipupdate/ez-ipupdate_3.0.10.bb new file mode 100644 index 0000000000..62cd506d9f --- /dev/null +++ b/packages/ez-ipupdate/ez-ipupdate_3.0.10.bb @@ -0,0 +1,32 @@ +# Angus Mackay's ez-ipupdate from www.ez-ipupdate.com +DESCRIPTION = "A client for automatically updating your EZ-IP.net, justlinux.com, dhs.org, dyndns.org, ods.org, gnudip.cheapnet.net, tzo.com, easydns.com dynamic hostname parameters. Includes daemon support that only sends updates if your IP address changes." +HOMEPAGE = "http://www.ez-ipupdate.com/" +MAINTAINER = "John Bowler <jbowler@acm.org>" +SECTION = "console/network" +PRIORITY = "optional" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.ez-ipupdate.com/dist/ez-ipupdate-${PV}.tar.gz" +SRC_URI += "file://configure.patch;patch=1" +SRC_URI += "file://conffile.patch;patch=1" +SRC_URI += "file://zoneedit.patch;patch=1" +SRC_URI += "file://init" +SRC_URI += "file://ipupdate.conf" + +INITSCRIPT_NAME = "ipupdate" +# No dependencies, so just go in at the standard level (20) +INITSCRIPT_PARAMS = "defaults" + +# The configuration file must be editted... +CONFFILES_${PN} = "${sysconfdir}/ipupdate.conf" + +inherit autotools update-rc.d + +PACKAGES = "ez-ipupdate" + +do_install_append() { + install -d "${D}${sysconfdir}/init.d" + install -c -m 755 ${WORKDIR}/init "${D}${sysconfdir}/init.d/ipupdate" + install -c -m 644 ${WORKDIR}/ipupdate.conf "${D}${sysconfdir}/ipupdate.conf" +} diff --git a/packages/ez-ipupdate/files/.mtn2git_empty b/packages/ez-ipupdate/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ez-ipupdate/files/.mtn2git_empty diff --git a/packages/ez-ipupdate/files/conffile.patch b/packages/ez-ipupdate/files/conffile.patch new file mode 100644 index 0000000000..41f8a0e73b --- /dev/null +++ b/packages/ez-ipupdate/files/conffile.patch @@ -0,0 +1,10 @@ +--- ez-ipupdate-3.0.10/conf_file.c.orig 2005-11-27 20:03:46.557322517 -0800 ++++ ez-ipupdate-3.0.10/conf_file.c 2005-11-27 20:03:15.519369422 -0800 +@@ -34,6 +34,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <errno.h> + + #include <conf_file.h> + diff --git a/packages/ez-ipupdate/files/configure.patch b/packages/ez-ipupdate/files/configure.patch new file mode 100644 index 0000000000..e6a945e4b2 --- /dev/null +++ b/packages/ez-ipupdate/files/configure.patch @@ -0,0 +1,11 @@ +--- ez-ipupdate-3.0.10/Makefile.am.orig 2005-11-27 15:24:05.857379643 -0800 ++++ ez-ipupdate-3.0.10/Makefile.am 2005-11-27 19:35:58.832379202 -0800 +@@ -1,7 +1,6 @@ + + bin_PROGRAMS = ez-ipupdate +-ez_ipupdate_SOURCES = ez-ipupdate.c conf_file.c conf_file.h md5.c md5.h cache_file.c cache_file.h error.h pid_file.c pid_file.h dprintf.h @EXTRASRC@ +-ez_ipupdate_LDADD = @EXTRAOBJ@ ++ez_ipupdate_SOURCES = ez-ipupdate.c conf_file.c conf_file.h md5.c md5.h cache_file.c cache_file.h error.h pid_file.c pid_file.h dprintf.h + + EXTRA_DIST = getpass.c ez-ipupdate.lsm example.conf example-pgpow.conf example-dhs.conf example-dyndns.conf example-ods.conf example-tzo.conf example-gnudip.conf example-easydns.conf example-justlinux.conf example-dyns.conf CHANGELOG mkbinary + diff --git a/packages/ez-ipupdate/files/init b/packages/ez-ipupdate/files/init new file mode 100644 index 0000000000..031c33c79b --- /dev/null +++ b/packages/ez-ipupdate/files/init @@ -0,0 +1,44 @@ +#!/bin/sh +# +# ipupdate init.d script for ez-ipupdate +# +# You *must* create or update the /etc/ipupdate.conf file for +# this to work +CONF=/etc/ipupdate.conf +PIDFILE=/var/run/ipupdate.pid +test -x /usr/bin/ez-ipupdate -a -r "${CONF}" || exit 0 +if egrep '^service-type=<type of service>$' "${CONF}" >/dev/null +then + # conf file not editted + exit 0 +fi + +case "$1" in + start) + echo -n "Starting ez-ipupdate: " + start-stop-daemon --start -x /usr/bin/ez-ipupdate -- -c "${CONF}" -d -F "${PIDFILE}" "$@" + echo "done" + ;; + stop) + echo -n "Stopping ez-ipupdate: " + start-stop-daemon --stop -s 3 -p "${PIDFILE}" + echo "done" + ;; + restart) + echo -n "Restarting ez-ipupdate: " + start-stop-daemon --stop -s 3 -p "${PIDFILE}" + start-stop-daemon --start -x /usr/bin/ez-ipupdate -- -c "${CONF}" -d -F "${PIDFILE}" "$@" + echo "done" + ;; + force-reload|reload) + # HUP causes a reload, a simple TERM causes the daemon + # to wake up and re-update the IP address + start-stop-daemon --stop -s 1 -p "${PIDFILE}" + ;; + *) + echo "Usage: ipupdate { start | stop | restart | reload }" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/packages/ez-ipupdate/files/ipupdate.conf b/packages/ez-ipupdate/files/ipupdate.conf new file mode 100644 index 0000000000..cbba491ef6 --- /dev/null +++ b/packages/ez-ipupdate/files/ipupdate.conf @@ -0,0 +1,36 @@ +#!/usr/bin/ez-ipupdate -c +# +# example config file for ez-ipupdate +# +# this file is actually executable! +# +#CHANGE this to the service name (ez-ipupdate --help for the list) +service-type=<type of service> +#CHANGE this to the user name and password on the service +user=myuserid:mypassword +#CHANGE this to the domain name to update +host=mydomain.whatever.com +# +interface=eth0 +quiet +# +# other options: +#address=<ip address> +#cache-file=/etc/ez-ipupdate.cache.eth1 +#daemon +#debug +#foreground +#host=<host> +#interface=<interface> +#mx=<mail exchanger> +#retrys=<number of trys> +#run-as-user=<user> +#server=<server name> +#timeout=<sec.millisec> +#max-interval=<time in seconds> +#notify-email=<email address> +#period=<time between update attempts> +#url=<url> +#user=<user name>[:password] +#wildcard +#quiet diff --git a/packages/ez-ipupdate/files/zoneedit.patch b/packages/ez-ipupdate/files/zoneedit.patch new file mode 100644 index 0000000000..c9d4e4a2c1 --- /dev/null +++ b/packages/ez-ipupdate/files/zoneedit.patch @@ -0,0 +1,11 @@ +--- ez-ipupdate-3.0.10/ez-ipupdate.c.orig 2005-11-27 22:59:39.149355269 -0800 ++++ ez-ipupdate-3.0.10/ez-ipupdate.c 2005-11-27 22:59:46.705830768 -0800 +@@ -3806,7 +3806,7 @@ int ZONEEDIT_update_entry(void) + break; + + case 200: +- if(strstr(buf, "<SUCCESS\n") != NULL) ++ if(strstr(buf, "<SUCCESS ") != NULL) + { + if(!(options & OPT_QUIET)) + { diff --git a/packages/ghettotooth/ghettotooth.bb b/packages/ghettotooth/ghettotooth.bb index f20f4580c7..02bf533e4f 100644 --- a/packages/ghettotooth/ghettotooth.bb +++ b/packages/ghettotooth/ghettotooth.bb @@ -1,6 +1,8 @@ SECTION = "net/misc" DESCRIPTION = "Bluetooth scanner" -MAINTAINER = "Bob Davies (tyggerbob@gmail.com)" +MAINTAINER = "Bob Davies <tyggerbob@gmail.com>" +LICENSE = "GPL" +RDEPENDS = "perl" SRC_URI = "http://www.wardriving.ch/hpneu/blue/perl/ghettotooth.pl" @@ -8,7 +10,6 @@ DEFAULT_PREFERENCE="-1" S = "${WORKDIR}" -LICENSE = "GPL" do_install() { install -d ${D}${bindir} install -m 0755 ghettotooth.pl ${D}${bindir}/ diff --git a/packages/ixp425-eth/ixp400-eth-1.5/mac-address.patch b/packages/ixp425-eth/ixp400-eth-1.5/mac-address.patch new file mode 100644 index 0000000000..bd16124e94 --- /dev/null +++ b/packages/ixp425-eth/ixp400-eth-1.5/mac-address.patch @@ -0,0 +1,120 @@ +--- ./ixp400_eth.c.base 2005-11-28 23:59:34.476404165 -0800 ++++ ./ixp400_eth.c 2005-11-29 00:42:44.587389574 -0800 +@@ -23,10 +23,10 @@ + * This driver is written and optimized for Intel Xscale technology. + * + * SETUP NOTES: +- * By default, this driver uses predefined MAC addresses. +- * These are set in global var 'default_mac_addr' in this file. +- * If required, these can be changed at run-time using +- * the 'ifconfig' tool. ++ * By default, this driver uses MAC addresses from maclist, if ++ * these are not available the kernel api to randomly generate ++ * a locally assigned MAC address is used. The MAC can be ++ * overridden with ifconfig if absolutely necessary. + * + * Example - to set ixp0 MAC address to 00:02:B3:66:88:AA, + * run ifconfig with the following arguments: +@@ -64,6 +64,7 @@ + #include <linux/sysctl.h> + #include <linux/unistd.h> + #include <linux/version.h> ++#include <net/maclist.h> + + #if KERNEL_VERSION(2,6,0) <= LINUX_VERSION_CODE + #include <linux/workqueue.h> +@@ -130,6 +131,8 @@ static int dev_max_count = 1; /* only NP + static int dev_max_count = 2; /* only NPEB and NPEC */ + #elif defined (CONFIG_ARCH_IXDP465) || defined(CONFIG_MACH_IXDP465) + static int dev_max_count = 3; /* all NPEs are used */ ++#else ++static int dev_max_count = -1;/* use maclist_count */ + #endif + + #ifndef CONFIG_IXP400_NAPI +@@ -621,21 +624,6 @@ static phy_cfg_t default_phy_cfg[] = + #endif + }; + +-/* Default MAC addresses for EthAcc Ports 1 and 2 (using Intel MAC prefix) +- * Default is +- * IX_ETH_PORT_1 -> MAC 00:02:b3:01:01:01 +- * IX_ETH_PORT_2 -> MAC 00:02:b3:02:02:02 +- * IX_ETH_PORT_3 -> MAC 00:02:b3:03:03:03 +-*/ +-static IxEthAccMacAddr default_mac_addr[] = +-{ +- {{0x00, 0x02, 0xB3, 0x01, 0x01, 0x01}} /* EthAcc Port 0 */ +- ,{{0x00, 0x02, 0xB3, 0x02, 0x02, 0x02}} /* EthAcc Port 1 */ +-#if defined (CONFIG_ARCH_IXDP465) || defined(CONFIG_MACH_IXDP465) +- ,{{0x00, 0x02, 0xB3, 0x03, 0x03, 0x03}} /* EthAcc Port 2 */ +-#endif +-}; +- + /* Default mapping of NpeImageIds for EthAcc Ports + * Default is + * IX_ETH_PORT_1 -> IX_ETH_NPE_B +@@ -3337,28 +3325,13 @@ static int __devinit dev_eth_probe(struc + + /* Defines the unicast MAC address + * +- * Here is a good place to read a board-specific MAC address +- * from a non-volatile memory, e.g. an external eeprom. +- * +- * This memcpy uses a default MAC address from this +- * source code. +- * +- * This can be overriden later by the (optional) command +- * +- * ifconfig ixp0 ether 0002b3010101 +- * ++ * The code reads from the maclist API. + */ ++ if (maclist_read((u8(*)[6])&ndev->dev_addr, priv->port_id) || ++ !is_valid_ether_addr(ndev->dev_addr)) ++ random_ether_addr(ndev->dev_addr); + +- memcpy(ndev->dev_addr, +- &default_mac_addr[priv->port_id].macAddress, +- IX_IEEE803_MAC_ADDRESS_SIZE); +- +- /* possibly remove this test and the message when a valid MAC address +- * is not hardcoded in the driver source code. +- */ +- if (is_valid_ether_addr(ndev->dev_addr)) +- { +- P_WARN("Use default MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x for port %d\n", ++ P_INFO("Use MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x for port %d\n", + (unsigned)ndev->dev_addr[0], + (unsigned)ndev->dev_addr[1], + (unsigned)ndev->dev_addr[2], +@@ -3366,7 +3339,6 @@ static int __devinit dev_eth_probe(struc + (unsigned)ndev->dev_addr[4], + (unsigned)ndev->dev_addr[5], + priv->port_id); +- } + + /* Set/update the internal packet size + * This can be overriden later by the command +@@ -3584,12 +3556,15 @@ static int __init ixp400_eth_init(void) + + TRACE; + +- /* check module parameter range */ +- if (dev_max_count == 0 || dev_max_count > IX_ETH_ACC_NUMBER_OF_PORTS) +- { +- P_ERROR("Number of ports supported is dev_max_count <= %d\n", IX_ETH_ACC_NUMBER_OF_PORTS); +- return -1; +- } ++ /* fix dev_max_count to maclist_count - the actual number of ++ * available MACs ++ */ ++ if (dev_max_count <= 0) ++ dev_max_count = maclist_count(); ++ if (dev_max_count <= 0) ++ dev_max_count = 1; ++ else if (dev_max_count > IX_ETH_ACC_NUMBER_OF_PORTS) ++ dev_max_count = IX_ETH_ACC_NUMBER_OF_PORTS; + + TRACE; + diff --git a/packages/ixp425-eth/ixp400-eth_1.5.bb b/packages/ixp425-eth/ixp400-eth_1.5.bb index 86fef76c1d..24eb358902 100644 --- a/packages/ixp425-eth/ixp400-eth_1.5.bb +++ b/packages/ixp425-eth/ixp400-eth_1.5.bb @@ -12,9 +12,10 @@ SRC_URI += "file://2.6.15.patch;patch=1" SRC_URI += "file://device-name.patch;patch=1" SRC_URI += "file://poll-controller.patch;patch=1" SRC_URI += "file://le.patch;patch=1" +SRC_URI += "file://mac-address.patch;patch=1" SRC_URI += "file://debug.patch;patch=1" -PR = "r0" +PR = "r1" DEPENDS = "ixp4xx-csr" RDEPENDS = "ixp4xx-csr" @@ -51,7 +52,7 @@ EXTRA_OEMAKE = "'PWD=${S}' \ 'IXP4XX_CSR_DIR=${STAGING_INCDIR}/linux/ixp4xx-csr' \ 'IXP4XX_CSR_SYMVERS=${IXP4XX_CSR_SYMVERS}' \ 'OSAL_DIR=${OSAL_DIR}' \ - 'IX_CFLAGS=-DIX_UTOPIAMODE=0 -DIX_MPHYSINGLEPORT=1 -DCONFIG_IXP400_ETH_NPEB_ONLY=1 ${IX_ENSURE} ${DEVICE_NAME} -DIX_COMPONENT_NAME=-1' \ + 'IX_CFLAGS=-DIX_UTOPIAMODE=0 -DIX_MPHYSINGLEPORT=1 ${IX_ENSURE} ${DEVICE_NAME} -DIX_COMPONENT_NAME=-1' \ 'LINUX_SRC=${STAGING_KERNEL_DIR}' \ 'LINUX_CROSS_COMPILE=${HOST_PREFIX}' \ " @@ -67,7 +68,7 @@ do_compile_append () { ${CONFIG_MODVERSIONS:+-m} \ ${CONFIG_MODULE_SRCVERSION_ALL:+-a} \ -i '${STAGING_KERNEL_DIR}/ixp400-csr.symvers' \ - ixp400_eth.o >&2 | egrep . + ixp400_eth.o 2>&1 | egrep . then echo "MODPOST errors - see above" return 1 diff --git a/packages/ixp4xx/ixp4xx-csr-2.1/Makefile.patch b/packages/ixp4xx/ixp4xx-csr-2.1/Makefile.patch index b90a3d7da4..39ec252a2e 100644 --- a/packages/ixp4xx/ixp4xx-csr-2.1/Makefile.patch +++ b/packages/ixp4xx/ixp4xx-csr-2.1/Makefile.patch @@ -24,25 +24,37 @@ ################################################################ # Rules to check that macros are defined. -@@ -1321,10 +1323,18 @@ ixp400.o : $(OBJ_DIR)/ixp400.o +@@ -1321,10 +1323,26 @@ ixp400.o : $(OBJ_DIR)/ixp400.o ifndef IX_INCLUDE_MICROCODE $(OBJ_DIR)/ixp400.o: $(COMPONENTS:%=$(OBJ_DIR)/ixp400_%.o) $(OSAL_MODULE) ++ rm -f $(OBJ_DIR)/ixp400.c + touch $(OBJ_DIR)/ixp400.c + cp Makefile.kmod26 $(OBJ_DIR)/Makefile + make -C $(OBJ_DIR) ++ rm -f $(OBJ_DIR)/ixp400.c ++ cp ixp400.c $(OBJ_DIR)/ixp400.c $(LD) $(LDFLAGS) $^ -o $@ ++ rm -f $(OBJ_DIR)/ixp400.ko $(OBJ_DIR)/ixp400.mod.o + make -C $(OBJ_DIR) else $(OBJ_DIR)/ixp400.o: $(COMPONENTS:%=$(OBJ_DIR)/ixp400_%.o) $(NPE_PRODUCTION_HEADER_OBJ) $(OSAL_MODULE) ++ rm -f $(OBJ_DIR)/ixp400.c + touch $(OBJ_DIR)/ixp400.c + cp Makefile.kmod26 $(OBJ_DIR)/Makefile + make -C $(OBJ_DIR) ++ rm -f $(OBJ_DIR)/ixp400.c ++ cp ixp400.c $(OBJ_DIR)/ixp400.c $(LD) $(LDFLAGS) $^ -o $@ ++ rm -f $(OBJ_DIR)/ixp400.ko $(OBJ_DIR)/ixp400.mod.o + make -C $(OBJ_DIR) endif +--- ixp400_xscale_sw/ixp400.c 1970-01-01 01:00:00.000000000 +0100 ++++ ixp400_xscale_sw/ixp400.c 2005-08-24 22:33:12.000000000 +0200 +@@ -0,0 +1,1 @@ ++#error this file must never be compiled --- ixp400_xscale_sw/Makefile.kmod26 1970-01-01 01:00:00.000000000 +0100 +++ ixp400_xscale_sw/Makefile.kmod26 2005-08-24 22:33:12.000000000 +0200 @@ -0,0 +1,11 @@ diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.bb index 6da973b0d7..a00fbae3df 100644 --- a/packages/ixp4xx/ixp4xx-csr_2.1.bb +++ b/packages/ixp4xx/ixp4xx-csr_2.1.bb @@ -34,7 +34,7 @@ SRC_URI += "file://le.patch;patch=1" DEPENDS = "ixp-osal" S = "${WORKDIR}/ixp400_xscale_sw" -PR = "r0" +PR = "r2" COMPATIBLE_HOST = "^arm.*-linux.*" @@ -69,9 +69,9 @@ EXTRA_OEMAKE = "'AR=${AR}' \ '${IX_TARGET}_COMPONENTS=${COMPONENTS}' \ '${IX_TARGET}_CODELETS_COMPONENTS=${CODELETS_COMPONENTS}' \ 'IX_DEVICE=ixp42X' \ - 'IX_MPHY=1' \ - 'IX_MPHYSINGLEPORT=1' \ 'IX_INCLUDE_MICROCODE=1' \ + 'IX_UTOPIAMODE=0' \ + 'IX_MPHYSINGLEPORT=1' \ ${IX_ENSURE} \ 'LINUX_SRC=${STAGING_KERNEL_DIR}' \ 'LINUX_CROSS_COMPILE=${HOST_PREFIX}' \ diff --git a/packages/lbreakout/lbreakout2_2.6beta.bb b/packages/lbreakout/lbreakout2_2.6beta.bb index 470b57f065..dee655cc91 100644 --- a/packages/lbreakout/lbreakout2_2.6beta.bb +++ b/packages/lbreakout/lbreakout2_2.6beta.bb @@ -4,9 +4,11 @@ SECTION = "games/arcade" LICENSE = "GPL" MAINTAINER = "Michael 'Mickey' Lauer" DEPENDS = "virtual/libsdl libsdl-mixer libsdl-net" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/lgames/lbreakout2-2.6beta.tar.gz" +export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config" + inherit autotools diff --git a/packages/libsdl/libsdl-mixer_1.2.6.bb b/packages/libsdl/libsdl-mixer_1.2.6.bb index 4a273fffed..3aafa18d0c 100644 --- a/packages/libsdl/libsdl-mixer_1.2.6.bb +++ b/packages/libsdl/libsdl-mixer_1.2.6.bb @@ -4,10 +4,13 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "virtual/libsdl" LICENSE = "LGPL" +PR = "r1" SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz" S = "${WORKDIR}/SDL_mixer-${PV}" +export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config" + inherit autotools EXTRA_OECONF = "--disable-music-mp3 --disable-music-libmikmod" diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0 index 20b44b7197..0f42642e7f 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0 @@ -228,7 +228,7 @@ CONFIG_BINFMT_MISC=m # Power management options # CONFIG_PM=y -CONFIG_PM_LEGACY=y +# CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set CONFIG_APM=y @@ -840,6 +840,7 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set CONFIG_KEYBOARD_CORGI=y +# CONFIG_KEYBOARD_TOSA is not set # CONFIG_KEYBOARD_SPITZ is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00 b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00 index b1748c9268..ad44de256e 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00 +++ b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00 @@ -216,7 +216,7 @@ CONFIG_BINFMT_MISC=m # Power management options # CONFIG_PM=y -CONFIG_PM_LEGACY=y +# CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set CONFIG_APM=y @@ -829,6 +829,7 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_CORGI is not set CONFIG_KEYBOARD_SPITZ=y +# CONFIG_KEYBOARD_TOSA is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_TOUCHSCREEN=y diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index c95bc7396e..4bd71d7601 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -3,7 +3,7 @@ SECTION = "kernel" MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, Michael 'Mickey' Lauer <mickey@vanille.de>" LICENSE = "GPL" -DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" +DOSRC = "http://www.do13.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files" BASRC = "http://www.orca.cx/zaurus/patches" diff --git a/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb b/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb index 31797313e5..3f90f81705 100644 --- a/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb +++ b/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc2.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r1" +PR = "r3" #DEFAULT_PREFERENCE = "-1" @@ -17,20 +17,25 @@ PR = "r1" SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2.tar.bz2 \ ${RPSRC}/pxa_ohci_platform-r5.patch;patch=1 \ ${RPSRC}/pxa_ohci_suspend-r5.patch;patch=1 \ + ${RPSRC}/pxa_ohci_fixes-r0.patch;patch=1 \ ${RPSRC}/spitz_ohci-r0.patch;patch=1 \ ${RPSRC}/enable_iwmmxt-r0.patch;patch=1 \ ${RPSRC}/pxa_i2c_fixes-r4.patch;patch=1 \ ${RPSRC}/ide_not_removable-r0.patch;patch=1 \ - ${RPSRC}/led_core-r0.patch;patch=1 \ - ${RPSRC}/led_triggers-r0.patch;patch=1 \ + ${RPSRC}/sharpsl_pm_move-r0.patch;patch=1 \ + ${RPSRC}/led_core-r1.patch;patch=1 \ + ${RPSRC}/led_triggers-r1.patch;patch=1 \ ${RPSRC}/led_trig_timer-r0.patch;patch=1 \ - ${RPSRC}/led_zaurus-r0.patch;patch=1 \ - ${RPSRC}/led_locomo-r0.patch;patch=1 \ - ${RPSRC}/led_ide-r0.patch;patch=1 \ - ${RPSRC}/led_nand-r0.patch;patch=1 \ + ${RPSRC}/led_trig_sharpsl_pm-r0.patch;patch=1 \ + ${RPSRC}/led_zaurus-r2.patch;patch=1 \ + ${RPSRC}/led_locomo-r1.patch;patch=1 \ + ${RPSRC}/led_ide-r1.patch;patch=1 \ + ${RPSRC}/led_nand-r1.patch;patch=1 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/pxa_rtc-r2.patch;patch=1 \ ${RPSRC}/input_power-r4.patch;patch=1 \ + ${RPSRC}/arm_apm_pm_legacy-r1.patch;patch=1 \ + ${RPSRC}/collie_mtd_sharp-r0.patch;patch=1 \ ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_base-r24.patch;patch=1 \ @@ -39,15 +44,23 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2. ${RPSRC}/ipaq/pxa_keys-r5.patch;patch=1 \ ${RPSRC}/ipaq/tsc2101-r12.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_test1-r3.patch;patch=1 \ - ${DOSRC}/tc6393-device-r5.patch;patch=1 \ - ${DOSRC}/tc6393_nand-r6.patch;patch=1 \ - ${DOSRC}/tosa-keyboard-r6.patch;patch=1 \ + ${DOSRC}/tosa-platform-device-r0.patch;patch=1 \ + ${DOSRC}/tc6393-device-r8.patch;patch=1 \ + ${DOSRC}/tc6393_nand-r7.patch;patch=1 \ + ${DOSRC}/tosa-keyboard-r9.patch;patch=1 \ + ${DOSRC}/tosa-pxaac97-r5.patch;patch=1 \ + ${DOSRC}/tosa-tc6393-r1.patch;patch=1 \ + ${DOSRC}/tosa-power-r9.patch;patch=1 \ + ${DOSRC}/tc6393fb-r9.patch;patch=1 \ + ${DOSRC}/tosa-lcd-r6.patch;patch=1 \ + ${DOSRC}/tosa-bl-r9.patch;patch=1 \ + ${DOSRC}/tosa-bluetooth-r2.patch;patch=1 \ ${RPSRC}/pcmcia_dev_ids-r2.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ ${RPSRC}/alsa/alsa-soc-0.7.patch;patch=1 \ - ${RPSRC}/alsa_snd_corgi-r1.patch;patch=1 \ - ${RPSRC}/soc_platform_upd-r0.patch;patch=1 \ + ${RPSRC}/alsa_snd_corgi-r2.patch;patch=1 \ + ${RPSRC}/soc_platform_upd-r1.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \ @@ -76,14 +89,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2. # ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \ SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \ - ${RPSRC}/temp/tc6393fb-r7.patch;patch=1 \ - ${DOSRC}/tosa-power-r6.patch;patch=1 \ - ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ - ${RPSRC}/temp/tosa-bl-r7.patch;patch=1 \ - ${DOSRC}/pxa-ac97-suspend-r0.patch;patch=1 \ ${DOSRC}/ac97codec-rename-revert-r0.patch;patch=1 \ - ${DOSRC}/wm9712-ts-r3.patch;patch=1 \ - ${DOSRC}/tosa-pxaac97-r4.patch;patch=1 \ - ${DOSRC}/tosa-bluetooth-r0.patch;patch=1 " + ${DOSRC}/wm97xx-touch-lg2-r0.patch;patch=1 \ + ${DOSRC}/wm9712-pm-r0.patch;patch=1 " S = "${WORKDIR}/linux-2.6.15-rc2" diff --git a/packages/linux/nslu2-kernel/2.6.14/defconfig b/packages/linux/nslu2-kernel/2.6.14/defconfig index 8d0d751738..83b25213ac 100644 --- a/packages/linux/nslu2-kernel/2.6.14/defconfig +++ b/packages/linux/nslu2-kernel/2.6.14/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.14-rc4 -# Fri Oct 21 16:13:58 2005 +# Linux kernel version: 2.6.14 +# Mon Nov 28 18:53:25 2005 # CONFIG_ARM=y CONFIG_MMU=y @@ -93,12 +93,12 @@ CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y # # IXP4xx Platforms # +CONFIG_MACH_NSLU2=y # CONFIG_ARCH_AVILA is not set # CONFIG_ARCH_ADI_COYOTE is not set # CONFIG_ARCH_IXDP425 is not set # CONFIG_MACH_IXDPG425 is not set # CONFIG_MACH_IXDP465 is not set -CONFIG_MACH_NSLU2=y # CONFIG_ARCH_PRPMC1100 is not set # CONFIG_MACH_GTWX5715 is not set @@ -169,7 +169,6 @@ CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init= # At least one emulation must be selected # CONFIG_FPE_NWFPE=y -# CONFIG_FPE_NWFPE_XP is not set # CONFIG_FPE_FASTFPE is not set # @@ -574,7 +573,13 @@ CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_IPR is not set # CONFIG_SCSI_QLOGIC_FC is not set # CONFIG_SCSI_QLOGIC_1280 is not set -CONFIG_SCSI_QLA2XXX=n +CONFIG_SCSI_QLA2XXX=y +# CONFIG_SCSI_QLA21XX is not set +# CONFIG_SCSI_QLA22XX is not set +# CONFIG_SCSI_QLA2300 is not set +# CONFIG_SCSI_QLA2322 is not set +# CONFIG_SCSI_QLA6312 is not set +# CONFIG_SCSI_QLA24XX is not set # CONFIG_SCSI_LPFC is not set # CONFIG_SCSI_DC395x is not set # CONFIG_SCSI_DC390T is not set @@ -642,6 +647,7 @@ CONFIG_TUN=m # Ethernet (10 or 100Mbit) # CONFIG_NET_ETHERNET=y +CONFIG_MACLIST=y CONFIG_MII=y # CONFIG_HAPPYMEAL is not set # CONFIG_SUNGEM is not set @@ -1120,7 +1126,6 @@ CONFIG_USB=y 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 # @@ -1369,7 +1374,6 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set -# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/packages/linux/nslu2-kernel/2.6.15/defconfig b/packages/linux/nslu2-kernel/2.6.15/defconfig index 9a9bc34c7d..7074421cd7 100644 --- a/packages/linux/nslu2-kernel/2.6.15/defconfig +++ b/packages/linux/nslu2-kernel/2.6.15/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.15 -# Mon Nov 14 10:44:43 2005 +# Mon Nov 28 13:10:38 2005 # CONFIG_ARM=y CONFIG_MMU=y @@ -411,6 +411,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=m # +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# # Memory Technology Devices (MTD) # CONFIG_MTD=y @@ -673,6 +678,7 @@ CONFIG_TUN=m # Ethernet (10 or 100Mbit) # CONFIG_NET_ETHERNET=y +CONFIG_MACLIST=y CONFIG_MII=y # CONFIG_HAPPYMEAL is not set # CONFIG_SUNGEM is not set @@ -1029,6 +1035,8 @@ CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_CX88=m # CONFIG_VIDEO_EM28XX is not set CONFIG_VIDEO_OVCAMCHIP=m +# CONFIG_VIDEO_AUDIO_DECODER is not set +# CONFIG_VIDEO_DECODER is not set # # Radio Adapters @@ -1273,6 +1281,7 @@ CONFIG_USB_NET_ZAURUS=m 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_BELKIN=m CONFIG_USB_SERIAL_WHITEHEAT=m CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m @@ -1292,7 +1301,6 @@ CONFIG_USB_SERIAL_KEYSPAN_PDA=m CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m -# CONFIG_USB_SERIAL_NOKIA_DKU2 is not set CONFIG_USB_SERIAL_PL2303=m # CONFIG_USB_SERIAL_HP4X is not set CONFIG_USB_SERIAL_SAFE=m diff --git a/packages/linux/nslu2-kernel/2.6/91-maclist.patch b/packages/linux/nslu2-kernel/2.6/91-maclist.patch new file mode 100644 index 0000000000..27af1ea639 --- /dev/null +++ b/packages/linux/nslu2-kernel/2.6/91-maclist.patch @@ -0,0 +1,377 @@ +--- linux-2.6.15/include/net/maclist.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.15/include/net/maclist.h 1970-01-01 00:00:00.000000000 +0000 +@@ -0,0 +1,23 @@ ++#ifndef _MACLIST_H ++#define _MACLIST_H 1 ++/* ++ * Interfaces to the MAC repository ++ */ ++/* ++ * Add a single entry, returns 0 on success else an error ++ * code. Must *not* be called from an interrupt handler. ++ */ ++extern int maclist_add(const u8 id_to_add[6]); ++ ++/* ++ * Return the current entry count (valid in any context). ++ */ ++extern int maclist_count(void); ++ ++/* ++ * Return the ID from the n'th entry (valid in any context), ++ * returns 0 on success, -EINVAL if 'n' is out of range. ++ */ ++extern int maclist_read(u8 (*buffer_for_id)[6], int index_of_id_to_return); ++ ++#endif /*_MACLIST_H*/ +--- linux-2.6.15/drivers/net/maclist.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.15/drivers/net/maclist.c 1970-01-01 00:00:00.000000000 +0000 +@@ -0,0 +1,314 @@ ++/* ++ * drivers/net/maclist.c ++ * ++ * a simple driver to remember ethernet MAC values ++ * ++ * Some Ethernet hardware implementations have no built-in ++ * storage for allocated MAC values - an example is the Intel ++ * IXP420 chip which has support for Ethernet but no defined ++ * way of storing allocated MAC values. With such hardware ++ * different board level implementations store the allocated ++ * MAC (or MACs) in different ways. Rather than put board ++ * level code into a specific Ethernet driver this driver ++ * provides a generally accessible repository for the MACs ++ * which can be written by board level code and read by the ++ * driver. ++ * ++ * The implementation also allows user level programs to ++ * access the MAC information in /proc/net/maclist. This is ++ * useful as it allows user space code to use the MAC if it ++ * is not used by a built-in driver. ++ * ++ * Copyright (C) 2005 John Bowler ++ * Author: John Bowler <jbowler@acm.org> ++ * Maintainers: http://www.nslu2-linux.org/ ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * version 2 as published by the Free Software Foundation. ++ * ++ * External interfaces: ++ * Interfaces to linux kernel (and modules) ++ * maclist_add: add a single MAC ++ * maclist_count: total number of MACs stored ++ * maclist_read: read a MAC 0..(maclist_count-1) ++ */ ++#include <linux/module.h> ++#include <linux/moduleparam.h> ++#include <linux/etherdevice.h> ++#include <linux/proc_fs.h> ++#include <linux/errno.h> ++ ++#include <net/maclist.h> ++ ++#define MACLIST_NAME "maclist" ++ ++MODULE_AUTHOR("John Bowler <jbowler@acm.org>"); ++MODULE_DESCRIPTION("MAC list repository"); ++MODULE_LICENSE("GPL"); ++ ++typedef struct maclist_entry { ++ struct maclist_entry *next; /* Linked list, first first */ ++ u8 id[6]; /* 6 byte Ethernet MAC */ ++} maclist_entry_t; ++ ++/* Access to this list is possible at any time - entries in ++ * the list are never destroyed. Modification of the list is ++ * safe only from the init code (i.e. modification must be ++ * single threaded), but read from an interrupt at the same ++ * time is possible and safe. ++ */ ++static maclist_entry_t *maclist_list = 0; ++ ++/* ++ * External interfaces. ++ * ++ * Add a single entry, returns 0 on success else an error ++ * code. Must be single threaded. ++ */ ++int maclist_add(const u8 new_id[6]) { ++ maclist_entry_t *new_entry, **tail; ++ ++ if (new_id == 0 || !is_valid_ether_addr(new_id)) { ++ printk(KERN_ERR MACLIST_NAME ": invalid ethernet address\n"); ++ return -EINVAL; ++ } ++ new_entry = kmalloc(sizeof *new_entry, GFP_KERNEL); ++ if (new_entry == 0) ++ return -ENOMEM; ++ new_entry->next = 0; ++ memcpy(new_entry->id, new_id, sizeof new_entry->id); ++ ++ tail = &maclist_list; ++ while (*tail != 0) ++ tail = &(*tail)->next; ++ *tail = new_entry; ++ return 0; ++} ++EXPORT_SYMBOL(maclist_add); ++ ++/* ++ * Return the current entry count (valid in any context). ++ */ ++int maclist_count(void) { ++ maclist_entry_t *tail = maclist_list; ++ int count = 0; ++ ++ while (tail != 0) { ++ tail = tail->next; ++ ++count; ++ } ++ ++ return count; ++} ++EXPORT_SYMBOL(maclist_count); ++ ++/* ++ * Return the ID from the n'th entry (valid in any context), ++ * returns 0 on success, -EINVAL if 'n' is out of range. ++ */ ++int maclist_read(u8 (*id)[6], int n) { ++ maclist_entry_t *entry = maclist_list; ++ ++ while (n > 0 && entry != 0) { ++ --n; ++ entry = entry->next; ++ } ++ ++ if (n == 0 && entry != 0) { ++ memcpy(id, entry->id, sizeof *id); ++ return 0; ++ } ++ ++ printk(KERN_ERR MACLIST_NAME ": id does not exist\n"); ++ return -EINVAL; ++} ++EXPORT_SYMBOL(maclist_read); ++ ++/* ++ * Parameter parsing. The option string is a list of MAC ++ * addresses, comma separated. (The parsing really should ++ * be somewhere central...) ++ */ ++static int __init maclist_setup(char *param) { ++ int bytes = 0, seen_a_digit = 0; ++ u8 id[6]; ++ ++ memset(id, 0, sizeof id); ++ ++ if (param) do { ++ int digit = -1; ++ switch (*param) { ++ case '0': digit = 0; break; ++ case '1': digit = 1; break; ++ case '2': digit = 2; break; ++ case '3': digit = 3; break; ++ case '4': digit = 4; break; ++ case '5': digit = 5; break; ++ case '6': digit = 6; break; ++ case '7': digit = 7; break; ++ case '8': digit = 8; break; ++ case '9': digit = 9; break; ++ case 'a': case 'A': digit = 10; break; ++ case 'b': case 'B': digit = 11; break; ++ case 'c': case 'C': digit = 12; break; ++ case 'd': case 'D': digit = 13; break; ++ case 'e': case 'E': digit = 14; break; ++ case 'f': case 'F': digit = 15; break; ++ case ':': ++ if (seen_a_digit) ++ bytes = (bytes+1) & ~1; ++ else ++ bytes += 2; /* i.e. ff::ff is ff:00:ff */ ++ seen_a_digit = 0; ++ break; ++ case 0: ++ if (bytes == 0) /* nothing new seen so far */ ++ return 0; ++ /*fall through*/ ++ case ',': case ';': ++ if (bytes > 0) ++ bytes = 12; /* i.e. all trailing bytes 0 */ ++ break; ++ default: ++ printk(KERN_ERR MACLIST_NAME ": invalid character <%c[%d]>\n", ++ *param, *param); ++ return -EINVAL; ++ } ++ ++ if (digit >= 0) { ++ id[bytes>>1] = (id[bytes>>1] << 4) + digit; break; ++ ++bytes; ++ seen_a_digit = 1; ++ } ++ ++ if (bytes >= 12) { ++ int rc = maclist_add(id); ++ if (rc) ++ return rc; ++ bytes = 0; ++ seen_a_digit = 0; ++ memset(id, 0, sizeof id); ++ if (*param == 0) ++ return 0; ++ } ++ ++param; ++ } while (1); ++ ++ return 0; ++} ++ ++/* ++ * procfs support, if compiled in. ++ */ ++#ifdef CONFIG_PROC_FS ++/* ++ * Character device read ++ */ ++static int maclist_getchar(off_t n) { ++ static char xdigit[16] = "0123456789abcdef"; ++ maclist_entry_t *head = maclist_list; ++ int b; ++ ++ do { ++ if (head == 0) ++ return -1; ++ if (n < 18) ++ break; ++ head = head->next; ++ n -= 18; ++ } while (1); ++ ++ if (n == 17) ++ return '\n'; ++ ++ b = n/3; ++ switch (n - b*3) { ++ case 0: return xdigit[head->id[b] >> 4]; ++ case 1: return xdigit[head->id[b] & 0xf]; ++ default: return ':'; ++ } ++} ++ ++/* ++ * The extensively undocumented proc_read_t callback is implemented here. ++ * Go look in fs/proc/generic.c: ++ * ++ * Prototype: ++ * int f(char *buffer, char **start, off_t offset, ++ * int count, int *peof, void *dat) ++ * ++ * Assume that the buffer is "count" bytes in size. ++ * ++ * 2) Set *start = an address within the buffer. ++ * Put the data of the requested offset at *start. ++ * Return the number of bytes of data placed there. ++ * If this number is greater than zero and you ++ * didn't signal eof and the reader is prepared to ++ * take more data you will be called again with the ++ * requested offset advanced by the number of bytes ++ * absorbed. ++ */ ++static int maclist_proc_read(char *buffer, char **start, off_t offset, ++ int count, int *peof, void *dat) { ++ int total; ++ ++ *start = buffer; ++ total = 0; ++ ++ while (total < count) { ++ int ch = maclist_getchar(offset++); ++ if (ch == -1) { ++ *peof = 1; ++ break; ++ } ++ *buffer++ = ch; ++ ++total; ++ } ++ ++ return total; ++} ++#endif ++ ++/* ++ * Finally, the init/exit functions. ++ */ ++static void __exit maclist_exit(void) ++{ ++ maclist_entry_t *list; ++ ++ remove_proc_entry(MACLIST_NAME, proc_net); ++ ++ list = maclist_list; ++ maclist_list = 0; ++ ++ while (list != 0) { ++ maclist_entry_t *head = list; ++ list = head->next; ++ kfree(head); ++ } ++} ++ ++#ifdef MODULE ++static char ids[256]; ++module_param_string(ids, ids, sizeof ids, 0); ++MODULE_PARM_DESC(ids, "comma separated list of MAC ids\n"); ++#else ++__setup("maclist_ids=", maclist_setup); ++#endif ++ ++static int __init maclist_init(void) ++{ ++# ifdef MODULE ++ if (ids[0]) ++ maclist_setup(ids); ++# endif ++ ++ /* Ignore failure, the module will still work. */ ++ (void)create_proc_read_entry(MACLIST_NAME, S_IRUGO, proc_net, maclist_proc_read, NULL); ++ ++ return 0; ++} ++ ++module_init(maclist_init); ++module_exit(maclist_exit); +--- linux-2.6.15/drivers/net/Makefile 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.15/drivers/net/Makefile 1970-01-01 00:00:00.000000000 +0000 +@@ -70,6 +70,7 @@ obj-$(CONFIG_RIONET) += rionet.o + # end link order section + # + ++obj-$(CONFIG_MACLIST) += maclist.o + obj-$(CONFIG_MII) += mii.o + obj-$(CONFIG_PHYLIB) += phy/ + +--- linux-2.6.15/drivers/net/Kconfig 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.15/drivers/net/Kconfig 1970-01-01 00:00:00.000000000 +0000 +@@ -166,6 +166,21 @@ config NET_ETHERNET + kernel: saying N will just cause the configurator to skip all + the questions about Ethernet network cards. If unsure, say N. + ++config MACLIST ++ tristate "Ethernet MAC repository" ++ depends on NET_ETHERNET ++ help ++ Some ethernet controllers have no built-in way of obtaining an ++ appropriate Ethernet MAC address. Such controllers have to be ++ initialised in a board-specific way, depending on how the allocated ++ MAC is stored. The MAC repository provides a set of APIs and a ++ proc entry (/proc/net/maclist) to store MAC values from the board ++ so that such drivers can obtain a MAC address without board-specific ++ code. You do not need to enable this device - it will be selected ++ automatically by any device which requires it. It is only useful ++ to enable it manually when building a device driver independently ++ of the kernel build. ++ + config MII + tristate "Generic Media Independent Interface device support" + depends on NET_ETHERNET diff --git a/packages/linux/nslu2-kernel/2.6/92-nslu2-maclist.patch b/packages/linux/nslu2-kernel/2.6/92-nslu2-maclist.patch new file mode 100644 index 0000000000..c8b8a9bede --- /dev/null +++ b/packages/linux/nslu2-kernel/2.6/92-nslu2-maclist.patch @@ -0,0 +1,80 @@ +--- linux-2.6.15/arch/arm/mach-ixp4xx/Kconfig 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.15/arch/arm/mach-ixp4xx/Kconfig 1970-01-01 00:00:00.000000000 +0000 +@@ -11,8 +11,8 @@ comment "IXP4xx Platforms" + # This entry is placed on top because otherwise it would have + # been shown as a submenu. + config MACH_NSLU2 +- bool +- prompt "NSLU2" if !(MACH_IXDP465 || MACH_IXDPG425 || ARCH_IXDP425 || ARCH_ADI_COYOTE || ARCH_AVILA || ARCH_IXCDP1100 || ARCH_PRPMC1100 || MACH_GTWX5715) ++ bool "NSLU2" ++ select MACLIST + help + Say 'Y' here if you want your kernel to support Linksys's + NSLU2 NAS device. For more information on this platform, +--- linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 00:00:00.000000000 +0000 +@@ -16,11 +16,14 @@ + #include <linux/kernel.h> + #include <linux/serial.h> + #include <linux/serial_8250.h> ++#include <linux/mtd/mtd.h> + + #include <asm/mach-types.h> + #include <asm/mach/arch.h> + #include <asm/mach/flash.h> + ++#include <net/maclist.h> ++ + static struct flash_platform_data nslu2_flash_data = { + .map_name = "cfi_probe", + .width = 2, +@@ -112,6 +115,37 @@ static void nslu2_power_off(void) + gpio_line_set(NSLU2_PO_GPIO, IXP4XX_GPIO_HIGH); + } + ++/* ++ * When the RedBoot partition is added the MAC address is read from ++ * it. ++ */ ++void flash_add(struct mtd_info *mtd) { ++ if (strcmp(mtd->name, "RedBoot") == 0) { ++ size_t retlen; ++ u_char mac[6]; ++ ++ /* The MAC is at a known offset... */ ++ if (mtd->read(mtd, 0x3FFB0, 6, &retlen, mac) == 0 && retlen == 6) { ++ printk(KERN_INFO "NSLU2 MAC: %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", ++ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); ++ maclist_add(mac); ++ } else { ++ printk(KERN_ERR "NSLU2 MAC: read failed\n"); ++ } ++ } ++} ++ ++/* ++ * Nothing to do on remove at present. ++ */ ++void flash_remove(struct mtd_info *mtd) { ++} ++ ++struct mtd_notifier flash_notifier = { ++ .add = flash_add, ++ .remove = flash_remove, ++}; ++ + static void __init nslu2_init(void) + { + /* The NSLU2 has a 33MHz crystal on board - 1.01% different +@@ -119,6 +153,11 @@ static void __init nslu2_init(void) + */ + ixp4xx_set_board_tick_rate(66000000); + ++ /* The flash has an ethernet MAC embedded in it which we need, ++ * that is all this notifier does. ++ */ ++ register_mtd_user(&flash_notifier); ++ + ixp4xx_sys_init(); + + pm_power_off = nslu2_power_off; diff --git a/packages/linux/nslu2-kernel_2.6.14.2.bb b/packages/linux/nslu2-kernel_2.6.14.3.bb index 12b4bc7cb5..3868757ffb 100644 --- a/packages/linux/nslu2-kernel_2.6.14.2.bb +++ b/packages/linux/nslu2-kernel_2.6.14.3.bb @@ -8,7 +8,7 @@ PR_CONFIG = "0" # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r1.${PR_CONFIG}" +PR = "r2.${PR_CONFIG}" include nslu2-kernel.inc @@ -30,6 +30,8 @@ N2K_PATCHES = "\ file://75-nslu2-leds.patch;patch=1 \ file://90-pegasus.patch;patch=1 \ file://20-timer.patch;patch=1 \ + file://91-maclist.patch;patch=1 \ + file://92-nslu2-maclist.patch;patch=1 \ file://anonymiser.patch;patch=1 \ " diff --git a/packages/linux/nslu2-kernel_2.6.15-rc2.bb b/packages/linux/nslu2-kernel_2.6.15-rc2.bb index d2b55c8e7b..9bb7e75346 100644 --- a/packages/linux/nslu2-kernel_2.6.15-rc2.bb +++ b/packages/linux/nslu2-kernel_2.6.15-rc2.bb @@ -8,7 +8,7 @@ PR_CONFIG = "0" # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r0.${PR_CONFIG}" +PR = "r2.${PR_CONFIG}" include nslu2-kernel.inc @@ -25,6 +25,8 @@ N2K_PATCHES = "\ file://81-nslu2-class-device-create.patch;patch=1 \ file://90-ixp4xx-nslu2.patch;patch=1 \ file://20-timer.patch;patch=1 \ + file://91-maclist.patch;patch=1 \ + file://92-nslu2-maclist.patch;patch=1 \ file://anonymiser.patch;patch=1 \ " diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 6e98dc4ffa..7ce33122cb 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -49,6 +49,7 @@ SLUGOS_PACKAGES = "\ dnsmasq \ e2fsprogs \ expat \ + ez-ipupdate \ file \ findutils \ flac \ diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20050921/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20050921/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci-20050921/.mtn2git_empty diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20050921/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20050921/Makefile.patch new file mode 100644 index 0000000000..829c741b69 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci-20050921/Makefile.patch @@ -0,0 +1,15 @@ +--- driver/Makefile- 2005-09-11 13:22:08.000000000 -1000 ++++ driver/Makefile 2005-09-17 01:02:06.341217389 -1000 +@@ -37,10 +37,10 @@ + all: modules + + modules modules_install clean: +- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@ ++ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) $@ + + install: +- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install ++ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install + + else + diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20051016/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20051016/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci-20051016/.mtn2git_empty diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch new file mode 100644 index 0000000000..b79c42e2c5 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci-20051016/Makefile.patch @@ -0,0 +1,15 @@ +--- driver/Makefile- 2005-09-11 13:22:08.000000000 -1000 ++++ driver/Makefile 2005-09-17 01:02:06.341217389 -1000 +@@ -37,10 +37,10 @@ + all: modules + + modules modules_install clean: +- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@ ++ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) $@ + + install: +- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install ++ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install + + else + diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20051113/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20051113/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci-20051113/.mtn2git_empty diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20051113/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20051113/Makefile.patch new file mode 100644 index 0000000000..b79c42e2c5 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci-20051113/Makefile.patch @@ -0,0 +1,15 @@ +--- driver/Makefile- 2005-09-11 13:22:08.000000000 -1000 ++++ driver/Makefile 2005-09-17 01:02:06.341217389 -1000 +@@ -37,10 +37,10 @@ + all: modules + + modules modules_install clean: +- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@ ++ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) $@ + + install: +- $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install ++ $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS) $(TARGET_CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install + + else + diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb b/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb new file mode 100644 index 0000000000..e8395ae52f --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "dyoung <dyoung@thestuffguy.com>" +LICENSE = "GPL" +PR = "r0" +RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 +# It in fact also requires kernel-module-saa7115", but for now is using the local ones. + +SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20050921.tar.bz2 \ + file://Makefile.patch;patch=1" + +S = "${WORKDIR}/pvrusb2-mci-20050921/driver" + +inherit module + +CFLAGS = "'-I${KERNEL_SOURCE}/include' \ + '-D__LINUX_ARM_ARCH__=5'" + +EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ + 'CC=${KERNEL_CC}' \ + 'LD=${KERNEL_LD}' \ + 'KDIR=${STAGING_KERNEL_DIR}'" + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media +} + diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb b/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb new file mode 100644 index 0000000000..bd3362c730 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "dyoung <dyoung@thestuffguy.com>" +LICENSE = "GPL" +PR = "r1" +# It in fact requires these modules, but for now is using the local ones. +# RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" + +SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051016.tar.bz2 \ + file://Makefile.patch;patch=1" + +S = "${WORKDIR}/pvrusb2-mci-20051016/driver" + +inherit module + +CFLAGS = "'-I${KERNEL_SOURCE}/include' \ + '-D__LINUX_ARM_ARCH__=5'" + +EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ + 'CC=${KERNEL_CC}' \ + 'LD=${KERNEL_LD}' \ + 'KDIR=${STAGING_KERNEL_DIR}'" + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media +} + diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb b/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb new file mode 100644 index 0000000000..5ac677e329 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "dyoung <dyoung@thestuffguy.com>" +LICENSE = "GPL" +PR = "r0" +# It in fact requires these modules, but for now is using the local ones. +# RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" + +SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051113.tar.bz2" + +#SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051113.tar.bz2 \ +# file://Makefile.patch;patch=1" + +S = "${WORKDIR}/pvrusb2-mci-20051113" + +inherit module + +CFLAGS = "'-I${KERNEL_SOURCE}/include' \ + '-D__LINUX_ARM_ARCH__=5'" + +EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \ + 'CC=${KERNEL_CC}' \ + 'LD=${KERNEL_LD}' \ + 'KDIR=${STAGING_KERNEL_DIR}'" + +export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ + -rpath-link ${STAGING_DIR}/${TARGET_SYS}/lib" + + +do_compile() { + cd ivtv; oe_runmake + cd ../driver; oe_runmake +} + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media +} + diff --git a/packages/supertux/supertux_0.1.2.bb b/packages/supertux/supertux_0.1.2.bb index 5cbda237be..d319dfb80e 100644 --- a/packages/supertux/supertux_0.1.2.bb +++ b/packages/supertux/supertux_0.1.2.bb @@ -5,10 +5,13 @@ PRIORITY = "optional" DEPENDS = "virtual/libsdl libsdl-mixer libsdl-image" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/super-tux/supertux-${PV}.tar.bz2 \ http://ssel.vub.ac.be/Members/DennisWagelaar/download/zaurus/supertux-0.1.2-fp.patch.gz;patch=1" +export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config" + inherit autotools # FIXME: Add .desktop file for Opie/Qtopia diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb index 1fca483b61..2980e7762f 100644 --- a/packages/xserver/xserver-kdrive_20050207.bb +++ b/packages/xserver/xserver-kdrive_20050207.bb @@ -20,7 +20,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep DESCRIPTION_xserver-kdrive-fake = "Fake X server" DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" -PR = "r9" +PR = "r10" FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" FILES_xserver-kdrive-ati = "${bindir}/Xati" @@ -38,13 +38,18 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver; file://disable-apm.patch;patch=1 \ file://fbdev-not-fix.patch;patch=1 " +SRC_URI_h3600 = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \ + file://kmode.patch;patch=1 \ + file://faster-rotated.patch;patch=1 \ + file://fbdev-not-fix.patch;patch=1 " + + SRC_URI_append_mnci = " file://onlyfb.patch;patch=1 \ file://faster-rotated.patch;patch=1 \ file://devfs.patch;patch=1" SRC_URI_append_collie = " file://faster-rotated.patch;patch=1" SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1 \ file://faster-rotated.patch;patch=1" -SRC_URI_append_h3600 = " file://faster-rotated.patch;patch=1" SRC_URI_append_spitz = " file://faster-rotated.patch;patch=1" SRC_URI_append_akita = " file://faster-rotated.patch;patch=1" SRC_URI_append_borzoi = " file://faster-rotated.patch;patch=1" |