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 'Mic |