Updates against mainline openembedded + removal of some unneeded files

git-svn-id: https://svn.o-hand.com/repos/poky@19 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie 2005-09-05 12:16:56 +00:00
parent c49400dab0
commit 3e846ba477
60 changed files with 384 additions and 820 deletions

View File

@ -20,7 +20,7 @@ def get_pkgconfig_mangle(d):
return s
do_stage_append () {
for pc in `find ${S} -name '*.pc'`; do
for pc in `find ${S} -name '*.pc' | grep -v -- '-uninstalled.pc$'`; do
pcname=`basename $pc`
install -d ${PKG_CONFIG_PATH}
cat $pc | sed ${@get_pkgconfig_mangle(d)} > ${PKG_CONFIG_PATH}/$pcname

View File

@ -1,4 +1,4 @@
include conf/distro/familiar.conf
include conf/distro/familiar-distro.conf
DISTRO = "familiar"
DISTRO_NAME = "Familiar Linux"
@ -17,13 +17,18 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
PREFERRED_PROVIDER_virtual/libiconv=glibc
PREFERRED_PROVIDER_virtual/libintl=glibc
PREFERRED_PROVIDER_x11=diet-x11
PREFERRED_VERSION_hostap-modules ?= "0.3.9
# The CSL compiler is unusable because
# 1) certain programs stop to compile
# 2) more programs segfault
PREFERRED_VERSION_gcc = "3.4.4"
PREFERRED_VERSION_gcc-cross = "3.4.4"
PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
PREFERRED_VERSION_gcc ?= "3.4.4"
PREFERRED_VERSION_gcc-cross ?= "3.4.4"
PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
#
# Opie
@ -41,12 +46,17 @@ include conf/distro/preferred-opie-versions.inc
PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
#PREFERRED_PROVIDER_x11 = "diet-x11"
PREFERRED_PROVIDER_x11 = "diet-x11"
include conf/distro/preferred-gpe-versions-2.7.inc
#
# E
#
include conf/distro/preferred-e-versions.inc
#23:57 < mickeyl> it's no longer necessary since our cleanup
#23:57 < mickeyl> it may be again when we add cvs versions, but until now, just don't include it
#include conf/distro/preferred-e-versions.inc

View File

@ -33,22 +33,23 @@ PREFERRED_VERSION_xproto ?= "6.6.2"
PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
PREFERRED_VERSION_rxvt-unicode ?= "5.3"
PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
PREFERRED_VERSION_xst ?= "0.14"
PREFERRED_VERSION_xst ?= "0.15"
#PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}"
PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}"
PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
PREFERRED_VERSION_gpe-login ?= "0.81"
PREFERRED_VERSION_gpe-session-scripts ?= "0.63"
PREFERRED_VERSION_gpe-login ?= "0.82"
PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
PREFERRED_VERSION_gpe-todo ?= "0.54"
PREFERRED_VERSION_gpe-calendar ?= "0.63"
PREFERRED_VERSION_gpe-calendar ?= "0.65"
PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
PREFERRED_VERSION_gpe-contacts ?= "0.41"
PREFERRED_VERSION_gpe-today ?= "0.08"
PREFERRED_VERSION_gpe-contacts ?= "0.42"
PREFERRED_VERSION_gpe-today ?= "0.09"
PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
PREFERRED_VERSION_dbus ?= "0.23.4"
PREFERRED_VERSION_gpe-bluetooth ?= "0.43"
PREFERRED_VERSION_gpe-beam ?= "0.2.8"
PREFERRED_VERSION_gpe-bluetooth ?= "0.44"
PREFERRED_VERSION_gpe-su ?= "0.18"
PREFERRED_VERSION_gpe-conf ?= "0.1.25"
PREFERRED_VERSION_gpe-clock ?= "0.21"
@ -85,4 +86,7 @@ PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
PREFERRED_VERSION_linphone ?= "0.12.2"
PREFERRED_VERSION_firefox ?= "1.0"
PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1"
PREFERRED_VERSION_poppler ?= "0.3.3"
PREFERRED_VERSION_evince ?= "0.3.2"
PREFERRED_VERSION_gpe_mini_browser ?= "0.15"

View File

@ -9,12 +9,14 @@ PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
PREFERRED_VERSION_orinoco-modules = "0.15rc1"
BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params"
BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev modutils-collateral module-init-tools"
BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev module-init-tools"
BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}"
BOOTSTRAP_EXTRA_RDEPENDS_append = " udev modutils-collateral module-init-tools"
BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
PXA270_MODULES = "g_ether pxa27x_udc"
PXA270_MODULES = "g_ether g_file_storage g_serial pxa27x_udc \
snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \
nls_cp437 nls_utf8"
SERIAL_CONSOLE = "115200 ttyS0"
@ -29,5 +31,21 @@ GPE_EXTRA_INSTALL += "gaim sylpheed gpe-filemanager gpe-nmf evince"
include conf/machine/tune-xscale.conf
BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
HX4700_MODULES = "asic3_base asic3_mmc hx4700_bt hx4700_core hx4700_leds hx4700_navpt hx4700_pcmcia \
hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700"
HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700 hx4700_power"
module_autoload_hx4700_power = "hx4700_power"
module_autoload_pcmcia = "pcmcia"
module_autoload_hx4700_pcmcia = "hx4700_pcmcia"
module_autoload_asic3_mmc = "asic3_mmc"
module_autoload_mmc_block = "mmc_block"
module_autoload_hx4700_ts = "hx4700_ts"
module_autoload_hx4700_navpt = "hx4700_navpt"
module_autoload_hx4700_bt = "hx4700_bt"
module_autoload_snd-pxa-i2sound-hx4700 = "snd-pxa-i2sound-hx4700"
module_autoload_snd-pcm-oss = "snd-pcm-oss"
module_autoload_snd-pcm-oss = "snd-mixer-oss"
module_autoload_pxa27x_udc = "pxa27x_udc"
#FIXME: this should be controlled by a userspace utility later.
module_autoload_g_ether = "g_ether"

View File

@ -15,7 +15,7 @@ GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser tscalib"
GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib"
# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
#include conf/machine/tune-arm926ejs.conf
include conf/machine/tune-arm926ejs.conf
#size of the root partition (yes, it is 123 MB)

View File

@ -27,10 +27,10 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-
kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
# Infrared Modules
#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm
# kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
# USB Gadget Modules
#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
# kernel-module-g-serial kernel-module-g-ether"
BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
kernel-module-g-serial kernel-module-g-ether"

View File

@ -1,41 +0,0 @@
# <path> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
# /dev/mem c 640 0 0 1 1 0 0 -
# f A regular file
# d Directory
# c Character special device file
# b Block special device file
# p Fifo (named pipe)
/dev d 755 0 0 - - - - -
/dev/buzzer c 660 0 0 62 0 - - -
/dev/console c 622 0 0 5 1 - - -
/dev/cua c 622 0 0 5 64 0 1 2
/dev/flash d 755 0 0 - - - - -
/dev/flash/config c 644 0 0 90 6 - - -
/dev/ipsec c 644 0 0 36 10 - - -
/dev/kmem c 640 0 0 1 2 - - -
/dev/leds c 660 0 0 126 0 - - -
/dev/mem c 640 0 0 1 1 - - -
/dev/mtd c 664 0 0 90 0 0 2 4
/dev/mtdblock b 644 0 0 31 0 0 1 4
/dev/mtdr c 664 0 0 90 0 1 2 4
/dev/null c 666 0 0 1 3 - - -
/dev/pbuttons c 660 0 0 61 0 - - -
/dev/ppp c 644 0 0 108 0 - - -
/dev/ptyp c 644 0 0 2 0 0 1 10
/dev/ram b 644 0 0 1 0 0 1 4
/dev/random c 644 0 0 1 8 - - -
/dev/rbuttons c 660 0 0 60 0 - - -
/dev/rtc c 644 0 0 10 135 - - -
/dev/sda b 664 0 0 8 0 - - -
/dev/sda b 664 0 0 8 1 1 1 5
/dev/sdb b 664 0 0 8 16 - - -
/dev/sdb b 664 0 0 8 17 1 1 5
/dev/sdc b 664 0 0 8 32 - - -
/dev/sdc b 664 0 0 8 33 1 1 5
/dev/tty c 666 0 0 5 0 - - -
/dev/tty c 644 0 0 4 0 0 1 10
/dev/ttyS c 644 0 0 4 64 0 1 2
/dev/ttyp c 644 0 0 3 0 0 1 10
/dev/urandom c 644 0 0 1 9 - - -
/dev/zero c 666 0 0 1 5 - - -
/bin/tinylogin f 6755 0 0 - - - - -

View File

@ -1,51 +0,0 @@
# <path> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
# /dev/mem c 640 0 0 1 1 0 0 -
# f A regular file
# d Directory
# c Character special device file
# b Block special device file
# p Fifo (named pipe)
/dev d 755 0 0 - - - - -
/dev/console c 622 0 0 5 1 - - -
/dev/cua c 622 0 0 5 64 0 1 2
/dev/dsp c 644 0 0 14 3 - - -
/dev/flash d 755 0 0 - - - - -
/dev/flash/config c 644 0 0 90 6 - - -
/dev/ipsec c 644 0 0 36 10 - - -
/dev/kmem c 640 0 0 1 2 - - -
/dev/ledman c 644 0 0 126 0 - - -
/dev/md b 644 0 0 9 0 0 1 4
/dev/lp c 664 0 0 180 0 0 1 4
/dev/mem c 640 0 0 1 1 - - -
/dev/mtd c 664 0 0 90 0 0 2 8
/dev/mtdblock b 644 0 0 31 0 0 1 8
/dev/mtdr c 664 0 0 90 0 1 2 8
/dev/null c 666 0 0 1 3 - - -
/dev/pbuttons c 664 0 0 60 0 - - -
/dev/ppp c 644 0 0 108 0 - - -
/dev/ptyp c 644 0 0 2 0 0 1 10
/dev/ram b 644 0 0 1 0 0 1 4
/dev/random c 644 0 0 1 8 - - -
/dev/rbuttons c 644 0 0 61 0 - - -
/dev/rtc c 644 0 0 10 135 - - -
/dev/scd b 664 0 0 11 0 0 1 4
/dev/sda b 664 0 0 8 0 - - -
/dev/sda b 664 0 0 8 1 1 1 16
/dev/sdb b 664 0 0 8 16 - - -
/dev/sdb b 664 0 0 8 17 1 1 16
/dev/sdc b 664 0 0 8 32 - - -
/dev/sdc b 664 0 0 8 33 1 1 16
/dev/sdd b 664 0 0 8 48 - - -
/dev/sdd b 664 0 0 8 49 1 1 16
/dev/sde b 664 0 0 8 64 - - -
/dev/sde b 664 0 0 8 65 1 1 16
/dev/st c 664 0 0 9 0 0 1 4
/dev/tty c 666 0 0 5 0 - - -
/dev/tty c 644 0 0 4 0 0 1 10
/dev/ttyS c 644 0 0 4 64 0 1 2
/dev/ttyp c 644 0 0 3 0 0 1 10
/dev/ttyUSB c 644 0 0 188 0 0 1 4
/dev/urandom c 644 0 0 1 9 - - -
/dev/video c 664 0 0 81 0 0 1 4
/dev/zero c 666 0 0 1 5 - - -
/bin/tinylogin f 6755 0 0 - - - - -

View File

@ -1,7 +1,7 @@
DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
HOMEPAGE = "http://www.freedesktop.org/Software/Avahi"
LICENCE= "GPL"
DEPENDS = "expat libdaemon dbus-0.34"
DEPENDS = "expat libdaemon dbus"
RRECOMMENDS = "libnss-mdns"
SECTION = "net"
PRIORITY = "optional"

View File

@ -1,7 +1,8 @@
# Internal
/dev/mtdblock2 / jffs2 rw,noatime 1 1
/dev/mtdblock3 /home jffs2 defaults,noatime 1 2
proc /proc proc defaults 0 0
/dev/hda1 /media/cf auto defaults,sync,noauto 0 0
/dev/hda1 /media/hdd1 ext3 defaults,noatime,nodiratime 0 0
tmpfs /var tmpfs defaults 0 0
tmpfs /media/ram tmpfs defaults 0 0
@ -14,3 +15,5 @@ tmpfs /media/ram tmpfs defaults 0 0
# USB Storage
/dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0
# CF Storage
/dev/hdb1 /media/cf ext3 defaults,sync,noauto 0 0

View File

@ -2,3 +2,7 @@ rootfs / rootfs defaults,errors=remount-ro,noatime 0 0
/dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0
tmpfs /var tmpfs defaults 0 0
tmpfs /media/ram tmpfs defaults 0 0
rootfs / auto defaults 1 1
proc /proc proc defaults 0 0
devpts /dev/pts devpts mode=0620,gid=5 0 0
usbdevfs /proc/bus/usb usbdevfs noauto 0 0

View File

@ -1,7 +1,7 @@
DESCRIPTION = "Miscellaneous files for the base system."
SECTION = "base"
PRIORITY = "required"
PR = "r39"
PR = "r40"
LICENSE = "GPL"
SRC_URI = " \

View File

@ -1,38 +0,0 @@
Index: ipkg_cmd.c
===================================================================
RCS file: /cvs/familiar/dist/ipkg/C/ipkg_cmd.c,v
retrieving revision 1.96
diff -u -r1.96 ipkg_cmd.c
--- C/ipkg_cmd.c 19 Aug 2004 10:55:47 -0000 1.96
+++ C/ipkg_cmd.c 11 Sep 2004 19:43:14 -0000
@@ -860,6 +860,7 @@
str_list_elt_t *iter;
char *pkg_version;
size_t buff_len = 8192;
+ size_t used_len;
char *buff ;
buff = (char *)malloc(buff_len);
@@ -891,9 +892,20 @@
}
#else
if (buff) {
- snprintf(buff, buff_len, "Package %s (%s) is installed on %s and has the following files:\n",
- pkg->name, pkg_version, pkg->dest->name);
+ try_again:
+ used_len = snprintf(buff, buff_len, "Package %s (%s) is installed on %s and has the following files:\n",
+ pkg->name, pkg_version, pkg->dest->name) + 1;
+ if (used_len > buff_len) {
+ buff_len *= 2;
+ buff = realloc (buff, buff_len);
+ goto try_again;
+ }
for (iter = installed_files->head; iter; iter = iter->next) {
+ used_len += strlen (iter->data) + 1;
+ while (buff_len <= used_len) {
+ buff_len *= 2;
+ buff = realloc (buff, buff_len);
+ }
strncat(buff, iter->data, buff_len);
strncat(buff, "\n", buff_len);
}

View File

@ -1,27 +0,0 @@
#
# Patch managed by http://www.holgerschurig.de/patcher.html
#
--- C/ipkg_cmd.c~terse
+++ C/ipkg_cmd.c
@@ -119,8 +119,6 @@
" writing status file\n");
ipkg_conf_write_status_files(conf);
pkg_write_changed_filelists(conf);
- } else {
- ipkg_message(conf, IPKG_NOTICE, "Nothing to be done\n");
}
}
@@ -148,9 +146,7 @@
int result;
p_userdata = userdata;
result = (cmd->fun)(conf, argc, argv);
- if ( result == 0 ) {
- ipkg_message(conf, IPKG_NOTICE, "Successfully terminated.\n");
- } else {
+ if ( result != 0 ) {
ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result);
}

View File

@ -1,107 +0,0 @@
Index: ipkg_cmd.c
===================================================================
RCS file: /cvs/familiar/dist/ipkg/C/ipkg_cmd.c,v
retrieving revision 1.99
diff -u -r1.99 ipkg_cmd.c
--- ipkg/ipkg_cmd.c 6 Jan 2005 00:21:49 -0000 1.99
+++ ipkg/ipkg_cmd.c 8 Jan 2005 13:11:16 -0000
@@ -1150,7 +1150,7 @@
int pkg_mark_provides(pkg_t *pkg)
{
- int provides_count = pkg->provides_count;
+ int provides_count = pkg->provides_count + 1;
abstract_pkg_t **provides = pkg->provides;
int i;
pkg->parent->state_flag |= SF_MARKED;
@@ -1207,7 +1207,7 @@
for (j = 0; j < available_pkgs->len; j++) {
pkg_t *pkg = available_pkgs->pkgs[j];
int k;
- int count = (what_field_type == WHATPROVIDES) ? pkg->provides_count : pkg->replaces_count;
+ int count = (what_field_type == WHATPROVIDES) ? pkg->provides_count + 1 : pkg->replaces_count;
for (k = 0; k < count; k++) {
abstract_pkg_t *apkg =
((what_field_type == WHATPROVIDES)
Index: ipkg_remove.c
===================================================================
RCS file: /cvs/familiar/dist/ipkg/C/ipkg_remove.c,v
retrieving revision 1.40
diff -u -r1.40 ipkg_remove.c
--- ipkg/ipkg_remove.c 10 May 2004 21:37:07 -0000 1.40
+++ ipkg/ipkg_remove.c 8 Jan 2005 13:11:19 -0000
@@ -39,7 +39,7 @@
*/
int pkg_has_installed_dependents(ipkg_conf_t *conf, abstract_pkg_t *parent_apkg, pkg_t *pkg, abstract_pkg_t *** pdependents)
{
- int nprovides = pkg->provides_count;
+ int nprovides = pkg->provides_count + 1;
abstract_pkg_t **provides = pkg->provides;
int n_installed_dependents = 0;
int i;
Index: pkg_depends.c
===================================================================
RCS file: /cvs/familiar/dist/ipkg/C/pkg_depends.c,v
retrieving revision 1.61
diff -u -r1.61 pkg_depends.c
--- ipkg/pkg_depends.c 1 Sep 2004 20:30:39 -0000 1.61
+++ ipkg/pkg_depends.c 8 Jan 2005 13:11:21 -0000
@@ -420,9 +420,9 @@
int pkg_has_common_provides(pkg_t *pkg, pkg_t *replacee)
{
abstract_pkg_t **provides = pkg->provides;
- int provides_count = pkg->provides_count;
+ int provides_count = pkg->provides_count + 1;
abstract_pkg_t **replacee_provides = replacee->provides;
- int replacee_provides_count = replacee->provides_count;
+ int replacee_provides_count = replacee->provides_count + 1;
int i, j;
for (i = 0; i < provides_count; i++) {
abstract_pkg_t *apkg = provides[i];
@@ -443,7 +443,7 @@
int pkg_provides_abstract(pkg_t *pkg, abstract_pkg_t *providee)
{
abstract_pkg_t **provides = pkg->provides;
- int provides_count = pkg->provides_count;
+ int provides_count = pkg->provides_count + 1;
int i;
for (i = 0; i < provides_count; i++) {
if (provides[i] == providee)
@@ -461,7 +461,7 @@
abstract_pkg_t **replaces = pkg->replaces;
int replaces_count = pkg->replaces_count;
abstract_pkg_t **replacee_provides = pkg->provides;
- int replacee_provides_count = pkg->provides_count;
+ int replacee_provides_count = pkg->provides_count + 1;
int i, j;
for (i = 0; i < replaces_count; i++) {
abstract_pkg_t *abstract_replacee = replaces[i];
@@ -504,7 +504,7 @@
compound_depend_t *conflicts = pkg->conflicts;
int conflicts_count = pkg->conflicts_count;
abstract_pkg_t **conflictee_provides = conflictee->provides;
- int conflictee_provides_count = conflictee->provides_count;
+ int conflictee_provides_count = conflictee->provides_count + 1;
int i, j, k;
for (i = 0; i < conflicts_count; i++) {
int possibility_count = conflicts[i].possibility_count;
@@ -605,9 +605,6 @@
/* every pkg provides itself */
abstract_pkg_vec_insert(ab_pkg->provided_by, ab_pkg);
- if (!pkg->provides_count)
- return 0;
-
pkg->provides = (abstract_pkg_t **)malloc(sizeof(abstract_pkg_t *) * (pkg->provides_count + 1));
if (pkg->provides == NULL) {
fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
@@ -615,6 +612,9 @@
}
pkg->provides[0] = ab_pkg;
+ if (pkg->provides_count == 0)
+ return 0;
+
// if (strcmp(ab_pkg->name, pkg->name))
// fprintf(stderr, __FUNCTION__ ": ab_pkg=%s pkg=%s\n", ab_pkg->name, pkg->name);

View File

@ -1,42 +0,0 @@
#
# Patch managed by http://www.holgerschurig.de/patcher.html
#
--- C/ipkg_install.c~remove-c99isms.patch
+++ C/ipkg_install.c
@@ -186,14 +186,16 @@
{
abstract_pkg_vec_t *providers = pkg_hash_fetch_all_installation_candidates (&conf->pkg_hash, pkg_name);
int i;
+ ipkg_error_t err;
+ abstract_pkg_t *ppkg;
if (providers == NULL)
return IPKG_PKG_HAS_NO_CANDIDATE;
for (i = 0; i < providers->len; i++) {
- abstract_pkg_t *ppkg = abstract_pkg_vec_get(providers, i);
- ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_by_name %d \n",__FUNCTION__, i);
- ipkg_error_t err = ipkg_install_by_name(conf, ppkg->name);
+ ppkg = abstract_pkg_vec_get(providers, i);
+ ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_by_name %d \n",__FUNCTION__, i);
+ err = ipkg_install_by_name(conf, ppkg->name);
if (err)
return err;
}
@@ -614,12 +616,13 @@
int pkg_remove_installed_replacees_unwind(ipkg_conf_t *conf, pkg_vec_t *replacees)
{
int i;
+ int err;
int replaces_count = replacees->len;
for (i = 0; i < replaces_count; i++) {
pkg_t *replacee = replacees->pkgs[i];
if (replacee->state_status != SS_INSTALLED) {
ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_pkg \n",__FUNCTION__);
- int err = ipkg_install_pkg(conf, replacee);
+ err = ipkg_install_pkg(conf, replacee);
if (err)
return err;
}

View File

@ -1,124 +0,0 @@
Index: C/pkg_depends.c
===================================================================
--- C.orig/pkg_depends.c 2005-02-08 14:32:46.000000000 +0000
+++ C/pkg_depends.c 2005-02-08 15:50:50.000000000 +0000
@@ -251,15 +251,16 @@
really conflicts
returns 0 if conflicts <> replaces or 1 if conflicts == replaces
*/
-int is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg){
-
-int i ;
-int replaces_count = pkg->replaces_count;
+int is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg)
+{
+ int i ;
+ int replaces_count = pkg->replaces_count;
+ abstract_pkg_t **replaces;
- if (pkg->replaces_count==0) // No replaces, it's surely a conflict
- return 0;
+ if (pkg->replaces_count==0) // No replaces, it's surely a conflict
+ return 0;
- abstract_pkg_t **replaces = pkg->replaces;
+ replaces = pkg->replaces;
for (i = 0; i < replaces_count; i++) {
if (strcmp(pkg_scout->name,pkg->replaces[i]->name)==0) // Found
@@ -280,6 +281,8 @@
register int i, j, k;
int count;
abstract_pkg_t * ab_pkg;
+ pkg_t **pkg_scouts;
+ pkg_t *pkg_scout;
/*
* this is a setup to check for redundant/cyclic dependency checks,
@@ -316,9 +319,9 @@
if (test_vec) {
/* pkg_vec found, it is an actual package conflict
* cruise this possiblity's pkg_vec looking for an installed version */
- pkg_t **pkg_scouts = test_vec->pkgs;
+ pkg_scouts = test_vec->pkgs;
for(k = 0; k < test_vec->len; k++){
- pkg_t *pkg_scout = pkg_scouts[k];
+ pkg_scout = pkg_scouts[k];
if (!pkg_scout) {
fprintf(stderr, "%s: null pkg scout\n", __FUNCTION__);
continue;
@@ -381,13 +384,16 @@
abstract_pkg_vec_t *provider_apkgs = apkg->provided_by;
int n_providers = provider_apkgs->len;
abstract_pkg_t **apkgs = provider_apkgs->pkgs;
+ pkg_vec_t *pkg_vec;
+ int n_pkgs ;
int i;
+ int j;
+
for (i = 0; i < n_providers; i++) {
abstract_pkg_t *papkg = apkgs[i];
- pkg_vec_t *pkg_vec = papkg->pkgs;
+ pkg_vec = papkg->pkgs;
if (pkg_vec) {
- int n_pkgs = pkg_vec->len;
- int j;
+ n_pkgs = pkg_vec->len;
for (j = 0; j < n_pkgs; j++) {
pkg_t *pkg = pkg_vec->pkgs[j];
if (version_constraints_satisfied(depend, pkg)) {
@@ -406,12 +412,14 @@
int n_providers = provider_apkgs->len;
abstract_pkg_t **apkgs = provider_apkgs->pkgs;
int i;
+ int n_pkgs;
+ int j;
+
for (i = 0; i < n_providers; i++) {
abstract_pkg_t *papkg = apkgs[i];
pkg_vec_t *pkg_vec = papkg->pkgs;
if (pkg_vec) {
- int n_pkgs = pkg_vec->len;
- int j;
+ n_pkgs = pkg_vec->len;
for (j = 0; j < n_pkgs; j++) {
pkg_t *pkg = pkg_vec->pkgs[j];
if (version_constraints_satisfied(depend, pkg)) {
@@ -532,11 +540,15 @@
abstract_pkg_t **conflictee_provides = conflictee->provides;
int conflictee_provides_count = conflictee->provides_count;
int i, j, k;
+ int possibility_count;
+ struct depend **possibilities;
+ abstract_pkg_t *possibility ;
+
for (i = 0; i < conflicts_count; i++) {
- int possibility_count = conflicts[i].possibility_count;
- struct depend **possibilities = conflicts[i].possibilities;
+ possibility_count = conflicts[i].possibility_count;
+ possibilities = conflicts[i].possibilities;
for (j = 0; j < possibility_count; j++) {
- abstract_pkg_t *possibility = possibilities[j]->pkg;
+ possibility = possibilities[j]->pkg;
for (k = 0; k < conflictee_provides_count; k++) {
if (possibility == conflictee_provides[k]) {
return 1;
@@ -832,6 +844,8 @@
compound_depend_t * depends;
int count, othercount;
register int i, j;
+ abstract_pkg_t * ab_depend;
+ abstract_pkg_t ** temp;
count = pkg->pre_depends_count + pkg->depends_count;
depends = pkg->depends;
@@ -843,8 +857,7 @@
if (0 && pkg->pre_depends_count)
fprintf(stderr, " i=%d possibility_count=%x depends=%p\n", i, depends->possibility_count, depends);
for (j = 0; j < depends->possibility_count; j++){
- abstract_pkg_t * ab_depend = depends->possibilities[j]->pkg;
- abstract_pkg_t ** temp;
+ ab_depend = depends->possibilities[j]->pkg;
if(!ab_depend->depended_upon_by)
ab_depend->depended_upon_by = (abstract_pkg_t **)calloc(1, sizeof(abstract_pkg_t *));

View File

@ -1,193 +0,0 @@
Index: C/ipkg.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ C/ipkg.h 2005-02-25 15:28:24.000000000 -0600
@@ -0,0 +1,59 @@
+/* ipkg.h - the itsy package management system
+
+ Carl D. Worth
+
+ Copyright (C) 2001 University of Southern California
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2, or (at
+ your option) any later version.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+*/
+
+#ifndef IPKG_H
+#define IPKG_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#if 0
+#define IPKG_DEBUG_NO_TMP_CLEANUP
+#endif
+
+#include "includes.h"
+#include "ipkg_conf.h"
+#include "ipkg_message.h"
+
+#define IPKG_PKG_EXTENSION ".ipk"
+#define DPKG_PKG_EXTENSION ".deb"
+
+#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
+#define IPKG_PKG_VERSION_SEP_CHAR '_'
+
+#define IPKG_STATE_DIR_PREFIX IPKGDIR
+#define IPKG_LISTS_DIR_SUFFIX "lists"
+#define IPKG_INFO_DIR_SUFFIX "info"
+#define IPKG_STATUS_FILE_SUFFIX "status"
+
+#define IPKG_BACKUP_SUFFIX "-ipkg.backup"
+
+#define IPKG_LIST_DESCRIPTION_LENGTH 128
+
+enum ipkg_error {
+ IPKG_SUCCESS = 0,
+ IPKG_PKG_DEPS_UNSATISFIED,
+ IPKG_PKG_IS_ESSENTIAL,
+ IPKG_PKG_HAS_DEPENDENTS,
+ IPKG_PKG_HAS_NO_CANDIDATE
+};
+typedef enum ipkg_error ipkg_error_t;
+
+extern int ipkg_state_changed;
+
+#endif
Index: C/configure.ac
===================================================================
--- C.orig/configure.ac 2005-02-25 15:27:58.000000000 -0600
+++ C/configure.ac 2005-02-25 15:28:00.000000000 -0600
@@ -10,6 +10,14 @@
test -f $top_builddir/configure && break
done
+AC_MSG_CHECKING([ipkg data location])
+AC_ARG_WITH(ipkgdir,
+ AS_HELP_STRING([--with-ipkgdir=ARG],
+ [Where to look for plugins (default=${libdir}/ipkg)]),
+ [ipkgdir=$withval],
+ [ipkgdir='${libdir}/ipkg'])
+AC_MSG_RESULT($ipkgdir)
+AC_SUBST(ipkgdir)
# Checks for programs
AC_PROG_AWK
@@ -50,4 +58,4 @@
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([memmove memset mkdir regcomp strchr strcspn strdup strerror strndup strrchr strstr strtol strtoul sysinfo utime])
-AC_OUTPUT(Makefile etc/Makefile replace/Makefile familiar/Makefile familiar/control familiar/control-unstripped familiar/libipkg-control familiar/libipkg-dev-control libbb/Makefile libipkg.pc ipkg.h)
+AC_OUTPUT(Makefile etc/Makefile replace/Makefile familiar/Makefile familiar/control familiar/control-unstripped familiar/libipkg-control familiar/libipkg-dev-control libbb/Makefile libipkg.pc)
Index: C/Makefile.am
===================================================================
--- C.orig/Makefile.am 2005-02-25 15:27:58.000000000 -0600
+++ C/Makefile.am 2005-02-25 15:28:00.000000000 -0600
@@ -3,7 +3,8 @@
HOST_CPU=@host_cpu@
BUILD_CPU=@build_cpu@
-ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\"
+ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ \
+ -DLIBDIR=\"$(libdir)\" -DIPKGDIR=\"$(ipkgdir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
bin_PROGRAMS = ipkg-cl
Index: C/ipkg_conf.c
===================================================================
--- C.orig/ipkg_conf.c 2005-03-12 21:08:36.000000000 +1030
+++ C/ipkg_conf.c 2005-03-12 21:09:46.000000000 +1030
@@ -103,7+103,7 @@
nv_pair_list_t tmp_dest_nv_pair_list;
char * lists_dir =NULL;
glob_t globbuf;
- char *etc_ipkg_conf_pattern = "/etc/ipkg/*.conf";
+ char *etc_ipkg_conf_pattern = SYSCONFDIR"/ipkg/*.conf";
char *pending_dir =NULL;
memset(conf, 0, sizeof(ipkg_conf_t));
Index: C/args.h
===================================================================
--- C.orig/args.h 2005-03-12 21:49:31.000000000 +1030
+++ C/args.h 2005-03-12 21:49:42.000000000 +1030
@@ -43,7 +43,7 @@
};
typedef struct args args_t;
-#define ARGS_DEFAULT_CONF_FILE_DIR "/etc"
+#define ARGS_DEFAULT_CONF_FILE_DIR SYSCONFDIR
#define ARGS_DEFAULT_CONF_FILE_NAME "ipkg.conf"
#define ARGS_DEFAULT_DEST NULL
#define ARGS_DEFAULT_FORCE_DEFAULTS 0
Index: C/ipkg.h.in
===================================================================
--- C.orig/ipkg.h.in 2005-02-25 15:27:58.000000000 -0600
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,1 @@
-/* ipkg.h - the itsy package management system
-
- Carl D. Worth
-
- Copyright (C) 2001 University of Southern California
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2, or (at
- your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-*/
-
-#ifndef IPKG_H
-#define IPKG_H
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#if 0
-#define IPKG_DEBUG_NO_TMP_CLEANUP
-#endif
-
-#include "includes.h"
-#include "ipkg_conf.h"
-#include "ipkg_message.h"
-
-#define IPKG_PKG_EXTENSION ".ipk"
-#define DPKG_PKG_EXTENSION ".deb"
-
-#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
-#define IPKG_PKG_VERSION_SEP_CHAR '_'
-
-#define IPKG_STATE_DIR_PREFIX LIBDIR"/ipkg"
-#define IPKG_LISTS_DIR_SUFFIX "lists"
-#define IPKG_INFO_DIR_SUFFIX "info"
-#define IPKG_STATUS_FILE_SUFFIX "status"
-
-#define IPKG_BACKUP_SUFFIX "-ipkg.backup"
-
-#define IPKG_LIST_DESCRIPTION_LENGTH 128
-
-enum ipkg_error {
- IPKG_SUCCESS = 0,
- IPKG_PKG_DEPS_UNSATISFIED,
- IPKG_PKG_IS_ESSENTIAL,
- IPKG_PKG_HAS_DEPENDENTS,
- IPKG_PKG_HAS_NO_CANDIDATE
-};
-typedef enum ipkg_error ipkg_error_t;
-
-extern int ipkg_state_changed;
-
-#endif

View File

@ -1,11 +0,0 @@
--- C/ipkg.h.in.old 2005-04-02 17:11:02.762413624 +0100
+++ C/ipkg.h.in 2005-04-02 17:11:06.314873568 +0100
@@ -36,7 +36,7 @@
#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
#define IPKG_PKG_VERSION_SEP_CHAR '_'
-#define IPKG_STATE_DIR_PREFIX LIBDIR"/ipkg"
+#define IPKG_STATE_DIR_PREFIX "/usr/lib/ipkg"
#define IPKG_LISTS_DIR_SUFFIX "lists"
#define IPKG_INFO_DIR_SUFFIX "info"
#define IPKG_STATUS_FILE_SUFFIX "status"

View File

@ -1,11 +0,0 @@
--- C/ipkg.h.in.old 2005-04-02 17:11:02.762413624 +0100
+++ C/ipkg.h.in 2005-04-02 17:11:06.314873568 +0100
@@ -36,7 +36,7 @@
#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
#define IPKG_PKG_VERSION_SEP_CHAR '_'
-#define IPKG_STATE_DIR_PREFIX LIBDIR"/ipkg"
+#define IPKG_STATE_DIR_PREFIX "/usr/lib/ipkg"
#define IPKG_LISTS_DIR_SUFFIX "lists"
#define IPKG_INFO_DIR_SUFFIX "info"
#define IPKG_STATUS_FILE_SUFFIX "status"

View File

@ -1,2 +0,0 @@
include ipkg_${PV}.bb
include ipkg-native.inc

View File

@ -1,2 +0,0 @@
include ipkg_${PV}.bb
include ipkg-native.inc

View File

@ -1,2 +0,0 @@
include ipkg_${PV}.bb
include ipkg-native.inc

View File

@ -1,2 +0,0 @@
include ipkg_${PV}.bb
include ipkg-native.inc

View File

@ -1,2 +0,0 @@
include ipkg_${PV}.bb
include ipkg-native.inc

View File

@ -1,2 +0,0 @@
include ipkg_${PV}.bb
include ipkg-native.inc

View File

@ -1,2 +0,0 @@
include ipkg_${PV}.bb
include ipkg-native.inc

View File

@ -1,2 +0,0 @@
include ipkg_${PV}.bb
include ipkg-native.inc

View File

@ -1,2 +0,0 @@
include ipkg_${PV}.bb
include ipkg-native.inc

View File

@ -1,2 +0,0 @@
include ipkg_${PV}.bb
include ipkg-native.inc

View File

@ -1,7 +0,0 @@
include ipkg.inc
PR = "r5"
SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
file://buffer-overflow.patch;patch=1 \
file://uninclude-replace.patch;patch=1 \
file://uclibc.patch;patch=1"

View File

@ -1,5 +0,0 @@
include ipkg.inc
PR = "r5"
SRC_URI += "file://uninclude-replace.patch;patch=1 \
file://uclibc.patch;patch=1"

View File

@ -1,6 +0,0 @@
include ipkg.inc
PR = "r2"
SRC_URI += "file://depends.patch;patch=1 \
file://uninclude-replace.patch;patch=1 \
file://remove-c99isms.patch;patch=1 \
file://uclibc.patch;patch=1"

View File

@ -1 +0,0 @@
include ipkg.inc

View File

@ -1,4 +0,0 @@
include ipkg.inc
PR = "r2"
SRC_URI += "file://remove-c99isms.patch;patch=1"

View File

@ -1,3 +0,0 @@
include ipkg.inc
PR = "r2"
SRC_URI += "file://paths.patch;patch=1"

View File

@ -1 +0,0 @@
include ipkg.inc

View File

@ -1,2 +0,0 @@
include ipkg.inc
SRC_URI += "file://libdir.patch;patch=1"

View File

@ -1,2 +0,0 @@
include ipkg.inc
SRC_URI += "file://libdir.patch;patch=1"

View File

@ -1 +0,0 @@
include ipkg.inc

View File

@ -0,0 +1,12 @@
Index: linux-2.6.13/drivers/ide/legacy/ide-cs.c
===================================================================
--- linux-2.6.13.orig/drivers/ide/legacy/ide-cs.c 2005-09-01 22:43:46.000000000 +0100
+++ linux-2.6.13/drivers/ide/legacy/ide-cs.c 2005-09-01 22:45:46.000000000 +0100
@@ -488,7 +488,6 @@
PCMCIA_DEVICE_PROD_ID123("KODAK Picture Card ", "KODAK ", "V100K", 0x94a0d8f3, 0xe4fc3ea0, 0xe5e7eed4),
PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
- PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
PCMCIA_DEVICE_NULL,
};
MODULE_DEVICE_TABLE(pcmcia, ide_ids);

View File

@ -602,7 +602,7 @@ CONFIG_CHR_DEV_SG=m
#
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
#
# CONFIG_SCSI_MULTI_LUN is not set
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
@ -723,13 +723,13 @@ CONFIG_PCMCIA_PCNET=m
# Wan interfaces
#
# CONFIG_WAN is not set
CONFIG_PPP=y
CONFIG_PPP=m
# CONFIG_PPP_MULTILINK is not set
# CONFIG_PPP_FILTER is not set
CONFIG_PPP_ASYNC=y
CONFIG_PPP_ASYNC=m
# CONFIG_PPP_SYNC_TTY is not set
# CONFIG_PPP_DEFLATE is not set
CONFIG_PPP_BSDCOMP=y
CONFIG_PPP_BSDCOMP=m
# CONFIG_PPP_MPPE is not set
# CONFIG_PPPOE is not set
# CONFIG_SLIP is not set
@ -1197,7 +1197,7 @@ CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
# CONFIG_USB_SERIAL_AIRPRIME is not set
CONFIG_USB_SERIAL_BELKIN=m
CONFIG_USB_SERIAL_WHITEHEAT=m
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CP2101 is not set
CONFIG_USB_SERIAL_CYPRESS_M8=m
@ -1472,7 +1472,8 @@ CONFIG_NLS_UTF8=y
#
# Profiling support
#
# CONFIG_PROFILING is not set
CONFIG_PROFILING=y
CONFIG_OPROFILE=m
#
# Kernel hacking

View File

@ -402,13 +402,13 @@ CONFIG_PCMCIA_PCNET=y
# Wan interfaces
#
# CONFIG_WAN is not set
CONFIG_PPP=y
CONFIG_PPP=m
# CONFIG_PPP_MULTILINK is not set
# CONFIG_PPP_FILTER is not set
CONFIG_PPP_ASYNC=y
CONFIG_PPP_ASYNC=m
# CONFIG_PPP_SYNC_TTY is not set
# CONFIG_PPP_DEFLATE is not set
CONFIG_PPP_BSDCOMP=y
CONFIG_PPP_BSDCOMP=m
# CONFIG_PPPOE is not set
# CONFIG_SLIP is not set
# CONFIG_SHAPER is not set

View File

@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.13-rc5-mm1
# Sat Aug 27 18:38:49 2005
# Sun Aug 28 18:06:14 2005
#
CONFIG_ARM=y
CONFIG_MMU=y
@ -180,8 +180,8 @@ CONFIG_FPE_NWFPE=y
# Userspace binary formats
#
CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_AOUT is not set
# CONFIG_BINFMT_MISC is not set
CONFIG_BINFMT_AOUT=m
CONFIG_BINFMT_MISC=m
# CONFIG_ARTHUR is not set
#
@ -201,6 +201,8 @@ CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=y
CONFIG_XFRM=y
# CONFIG_XFRM_USER is not set
# CONFIG_NET_KEY is not set
CONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
@ -219,8 +221,109 @@ CONFIG_IP_TCPDIAG=y
# CONFIG_IP_TCPDIAG_IPV6 is not set
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_BIC=y
# CONFIG_IPV6 is not set
# CONFIG_NETFILTER is not set
#
# IP: Virtual Server Configuration
#
# CONFIG_IP_VS is not set
CONFIG_IPV6=m
# CONFIG_IPV6_PRIVACY is not set
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m
CONFIG_INET6_TUNNEL=m
CONFIG_IPV6_TUNNEL=m
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
#
# IP: Netfilter Configuration
#
CONFIG_IP_NF_CONNTRACK=m
# CONFIG_IP_NF_CT_ACCT is not set
# CONFIG_IP_NF_CONNTRACK_MARK is not set
# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
CONFIG_IP_NF_CT_PROTO_SCTP=m
CONFIG_IP_NF_FTP=m
CONFIG_IP_NF_IRC=m
CONFIG_IP_NF_TFTP=m
CONFIG_IP_NF_AMANDA=m
CONFIG_IP_NF_QUEUE=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_LIMIT=m
CONFIG_IP_NF_MATCH_IPRANGE=m
CONFIG_IP_NF_MATCH_MAC=m
CONFIG_IP_NF_MATCH_PKTTYPE=m
CONFIG_IP_NF_MATCH_MARK=m
CONFIG_IP_NF_MATCH_MULTIPORT=m
CONFIG_IP_NF_MATCH_TOS=m
CONFIG_IP_NF_MATCH_RECENT=m
CONFIG_IP_NF_MATCH_ECN=m
CONFIG_IP_NF_MATCH_DSCP=m
CONFIG_IP_NF_MATCH_AH_ESP=m
CONFIG_IP_NF_MATCH_LENGTH=m
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_MATCH_TCPMSS=m
CONFIG_IP_NF_MATCH_HELPER=m
CONFIG_IP_NF_MATCH_STATE=m
CONFIG_IP_NF_MATCH_CONNTRACK=m
CONFIG_IP_NF_MATCH_OWNER=m
CONFIG_IP_NF_MATCH_ADDRTYPE=m
CONFIG_IP_NF_MATCH_REALM=m
CONFIG_IP_NF_MATCH_SCTP=m
CONFIG_IP_NF_MATCH_COMMENT=m
CONFIG_IP_NF_MATCH_HASHLIMIT=m
CONFIG_IP_NF_FILTER=m
# CONFIG_IP_NF_TARGET_REJECT is not set
CONFIG_IP_NF_TARGET_LOG=m
CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_IP_NF_TARGET_TCPMSS=m
CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_NAT_NEEDED=y
# CONFIG_IP_NF_TARGET_MASQUERADE is not set
# CONFIG_IP_NF_TARGET_REDIRECT is not set
# CONFIG_IP_NF_TARGET_NETMAP is not set
# CONFIG_IP_NF_TARGET_SAME is not set
# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
CONFIG_IP_NF_NAT_TFTP=m
CONFIG_IP_NF_NAT_AMANDA=m
CONFIG_IP_NF_MANGLE=m
# CONFIG_IP_NF_TARGET_TOS is not set
# CONFIG_IP_NF_TARGET_ECN is not set
# CONFIG_IP_NF_TARGET_DSCP is not set
# CONFIG_IP_NF_TARGET_MARK is not set
# CONFIG_IP_NF_TARGET_CLASSIFY is not set
CONFIG_IP_NF_RAW=m
# CONFIG_IP_NF_TARGET_NOTRACK is not set
CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m
#
# IPv6: Netfilter Configuration (EXPERIMENTAL)
#
CONFIG_IP6_NF_QUEUE=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_LIMIT=m
CONFIG_IP6_NF_MATCH_MAC=m
CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_MATCH_OPTS=m
CONFIG_IP6_NF_MATCH_FRAG=m
CONFIG_IP6_NF_MATCH_HL=m
CONFIG_IP6_NF_MATCH_MULTIPORT=m
CONFIG_IP6_NF_MATCH_OWNER=m
CONFIG_IP6_NF_MATCH_MARK=m
CONFIG_IP6_NF_MATCH_IPV6HEADER=m
CONFIG_IP6_NF_MATCH_AHESP=m
CONFIG_IP6_NF_MATCH_LENGTH=m
CONFIG_IP6_NF_MATCH_EUI64=m
CONFIG_IP6_NF_FILTER=m
# CONFIG_IP6_NF_TARGET_LOG is not set
CONFIG_IP6_NF_MANGLE=m
# CONFIG_IP6_NF_TARGET_MARK is not set
CONFIG_IP6_NF_RAW=m
#
# DCCP Configuration (EXPERIMENTAL)
@ -244,7 +347,7 @@ CONFIG_TCP_CONG_BIC=y
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
# CONFIG_NET_SCHED is not set
# CONFIG_NET_CLS_ROUTE is not set
CONFIG_NET_CLS_ROUTE=y
#
# Network testing
@ -258,6 +361,7 @@ CONFIG_IRDA=m
# IrDA protocols
#
CONFIG_IRLAN=m
CONFIG_IRNET=m
CONFIG_IRCOMM=m
# CONFIG_IRDA_ULTRA is not set
@ -314,14 +418,15 @@ CONFIG_BT_HIDP=m
#
# Bluetooth device drivers
#
# CONFIG_BT_HCIUSB is not set
CONFIG_BT_HCIUSB=m
# CONFIG_BT_HCIUSB_SCO is not set
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_BCSP_TXCRC=y
# CONFIG_BT_HCIBCM203X is not set
# CONFIG_BT_HCIBPA10X is not set
# CONFIG_BT_HCIBFUSB is not set
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIBT3C=m
CONFIG_BT_HCIBLUECARD=m
@ -483,16 +588,17 @@ CONFIG_SCSI_PROC_FS=y
# SCSI support type (disk, tape, CD-ROM)
#
CONFIG_BLK_DEV_SD=m
# CONFIG_CHR_DEV_ST is not set
# CONFIG_CHR_DEV_OSST is not set
# CONFIG_BLK_DEV_SR is not set
# CONFIG_CHR_DEV_SG is not set
CONFIG_CHR_DEV_ST=m
CONFIG_CHR_DEV_OSST=m
CONFIG_BLK_DEV_SR=m
# CONFIG_BLK_DEV_SR_VENDOR is not set
CONFIG_CHR_DEV_SG=m
# CONFIG_CHR_DEV_SCH is not set
#
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
#
# CONFIG_SCSI_MULTI_LUN is not set
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
@ -548,11 +654,15 @@ CONFIG_NETDEVICES=y
#
# PHY device support
#
# CONFIG_PHYLIB is not set
#
# Ethernet (10 or 100Mbit)
#
# CONFIG_NET_ETHERNET is not set
CONFIG_NET_ETHERNET=y
CONFIG_MII=m
# CONFIG_SMC91X is not set
# CONFIG_DM9000 is not set
#
# Ethernet (1000 Mbit)
@ -614,7 +724,15 @@ CONFIG_PCMCIA_PCNET=m
# Wan interfaces
#
# CONFIG_WAN is not set
# CONFIG_PPP is not set
CONFIG_PPP=m
# CONFIG_PPP_MULTILINK is not set
# CONFIG_PPP_FILTER is not set
CONFIG_PPP_ASYNC=m
# CONFIG_PPP_SYNC_TTY is not set
# CONFIG_PPP_DEFLATE is not set
CONFIG_PPP_BSDCOMP=m
# CONFIG_PPP_MPPE is not set
# CONFIG_PPPOE is not set
# CONFIG_SLIP is not set
# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set
@ -663,7 +781,8 @@ CONFIG_TOUCHSCREEN_CORGI=y
# CONFIG_TOUCHSCREEN_ELO is not set
# CONFIG_TOUCHSCREEN_MTOUCH is not set
# CONFIG_TOUCHSCREEN_MK712 is not set
# CONFIG_INPUT_MISC is not set
CONFIG_INPUT_MISC=y
CONFIG_INPUT_UINPUT=m
#
# Hardware I/O ports
@ -824,7 +943,7 @@ CONFIG_USB=m
#
# Miscellaneous USB options
#
# CONFIG_USB_DEVICEFS is not set
CONFIG_USB_DEVICEFS=y
# CONFIG_USB_BANDWIDTH is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_SUSPEND is not set
@ -837,7 +956,8 @@ CONFIG_USB=m
CONFIG_USB_OHCI_HCD=m
# CONFIG_USB_OHCI_BIG_ENDIAN is not set
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
# CONFIG_USB_SL811_HCD is not set
CONFIG_USB_SL811_HCD=m
CONFIG_USB_SL811_CS=m
#
# USB Device Class drivers
@ -846,8 +966,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
#
# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
#
# CONFIG_USB_ACM is not set
# CONFIG_USB_PRINTER is not set
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
#
# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
@ -866,37 +986,40 @@ CONFIG_USB_STORAGE=m
#
# USB Input Devices
#
# CONFIG_USB_HID is not set
CONFIG_USB_HID=m
CONFIG_USB_HIDINPUT=y
# CONFIG_HID_FF is not set
# CONFIG_USB_HIDDEV is not set
#
# USB HID Boot Protocol drivers
#
# CONFIG_USB_KBD is not set
# CONFIG_USB_MOUSE is not set
# CONFIG_USB_AIPTEK is not set
# CONFIG_USB_WACOM is not set
CONFIG_USB_KBD=m
CONFIG_USB_MOUSE=m
CONFIG_USB_AIPTEK=m
CONFIG_USB_WACOM=m
# CONFIG_USB_ACECAD is not set
# CONFIG_USB_KBTAB is not set
# CONFIG_USB_POWERMATE is not set
# CONFIG_USB_MTOUCH is not set
CONFIG_USB_KBTAB=m
CONFIG_USB_POWERMATE=m
CONFIG_USB_MTOUCH=m
# CONFIG_USB_ITMTOUCH is not set
# CONFIG_USB_EGALAX is not set
CONFIG_USB_EGALAX=m
# CONFIG_USB_YEALINK is not set
# CONFIG_USB_XPAD is not set
# CONFIG_USB_ATI_REMOTE is not set
CONFIG_USB_XPAD=m
CONFIG_USB_ATI_REMOTE=m
# CONFIG_USB_KEYSPAN_REMOTE is not set
# CONFIG_USB_APPLETOUCH is not set
#
# USB Imaging devices
#
# CONFIG_USB_MDC800 is not set
# CONFIG_USB_MICROTEK is not set
CONFIG_USB_MDC800=m
CONFIG_USB_MICROTEK=m
#
# USB Multimedia devices
#
# CONFIG_USB_DABUSB is not set
CONFIG_USB_DABUSB=m
#
# Video4Linux support is needed for USB Multimedia device support
@ -905,11 +1028,35 @@ CONFIG_USB_STORAGE=m
#
# USB Network Adapters
#
# CONFIG_USB_CATC is not set
# CONFIG_USB_KAWETH is not set
# CONFIG_USB_PEGASUS is not set
# CONFIG_USB_RTL8150 is not set
# CONFIG_USB_USBNET is not set
CONFIG_USB_CATC=m
CONFIG_USB_KAWETH=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m
CONFIG_USB_USBNET=m
#
# USB Host-to-Host Cables
#
CONFIG_USB_ALI_M5632=y
CONFIG_USB_AN2720=y
CONFIG_USB_BELKIN=y
CONFIG_USB_GENESYS=y
CONFIG_USB_NET1080=y
CONFIG_USB_PL2301=y
CONFIG_USB_KC2190=y
#
# Intelligent USB Devices/Gadgets
#
CONFIG_USB_ARMLINUX=y
CONFIG_USB_EPSON2888=y
CONFIG_USB_ZAURUS=y
CONFIG_USB_CDCETHER=y
#
# USB Network Adapters
#
CONFIG_USB_AX8817X=y
# CONFIG_USB_ZD1201 is not set
CONFIG_USB_MON=y
@ -920,24 +1067,68 @@ CONFIG_USB_MON=y
#
# USB Serial Converter support
#
# CONFIG_USB_SERIAL is not set
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
# CONFIG_USB_SERIAL_AIRPRIME is not set
CONFIG_USB_SERIAL_BELKIN=m
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CP2101 is not set
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
CONFIG_USB_SERIAL_VISOR=m
CONFIG_USB_SERIAL_IPAQ=m
CONFIG_USB_SERIAL_IR=m
CONFIG_USB_SERIAL_EDGEPORT=m
CONFIG_USB_SERIAL_EDGEPORT_TI=m
CONFIG_USB_SERIAL_GARMIN=m
CONFIG_USB_SERIAL_IPW=m
CONFIG_USB_SERIAL_KEYSPAN_PDA=m
CONFIG_USB_SERIAL_KEYSPAN=m
# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
CONFIG_USB_SERIAL_PL2303=m
# CONFIG_USB_SERIAL_HP4X is not set
CONFIG_USB_SERIAL_SAFE=m
# CONFIG_USB_SERIAL_SAFE_PADDED is not set
CONFIG_USB_SERIAL_TI=m
CONFIG_USB_SERIAL_CYBERJACK=m
CONFIG_USB_SERIAL_XIRCOM=m
# CONFIG_USB_SERIAL_OPTION is not set
CONFIG_USB_SERIAL_OMNINET=m
CONFIG_USB_EZUSB=y
#
# USB Miscellaneous drivers
#
# CONFIG_USB_EMI62 is not set
# CONFIG_USB_EMI26 is not set
# CONFIG_USB_AUERSWALD is not set
# CONFIG_USB_RIO500 is not set
# CONFIG_USB_LEGOTOWER is not set
# CONFIG_USB_LCD is not set
# CONFIG_USB_LED is not set
# CONFIG_USB_CYTHERM is not set
CONFIG_USB_EMI62=m
CONFIG_USB_EMI26=m
CONFIG_USB_AUERSWALD=m
CONFIG_USB_RIO500=m
CONFIG_USB_LEGOTOWER=m
CONFIG_USB_LCD=m
CONFIG_USB_LED=m
CONFIG_USB_CYTHERM=m
# CONFIG_USB_GOTEMP is not set
# CONFIG_USB_PHIDGETKIT is not set
# CONFIG_USB_PHIDGETSERVO is not set
# CONFIG_USB_IDMOUSE is not set
CONFIG_USB_PHIDGETKIT=m
CONFIG_USB_PHIDGETSERVO=m
CONFIG_USB_IDMOUSE=m
# CONFIG_USB_LD is not set
# CONFIG_USB_TEST is not set
#
# USB DSL modem support
@ -957,11 +1148,13 @@ CONFIG_USB_GADGET_SELECTED=y
CONFIG_USB_GADGET_DUMMY_HCD=y
CONFIG_USB_DUMMY_HCD=m
CONFIG_USB_GADGET_DUALSPEED=y
# CONFIG_USB_ZERO is not set
# CONFIG_USB_ETH is not set
# CONFIG_USB_GADGETFS is not set
# CONFIG_USB_FILE_STORAGE is not set
# CONFIG_USB_G_SERIAL is not set
CONFIG_USB_ZERO=m
CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y
CONFIG_USB_GADGETFS=m
CONFIG_USB_FILE_STORAGE=m
# CONFIG_USB_FILE_STORAGE_TEST is not set
CONFIG_USB_G_SERIAL=m
#
# MMC/SD Card support
@ -1154,7 +1347,8 @@ CONFIG_NLS_UTF8=y
#
# Profiling support
#
# CONFIG_PROFILING is not set
CONFIG_PROFILING=y
CONFIG_OPROFILE=m
#
# Kernel hacking

View File

@ -5,7 +5,7 @@ LICENSE = "GPL"
#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
KV = "${@bb.data.getVar('PV',d,True)}"
PR = "r17"
PR = "r3"
DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
RPSRC = "http://www.rpsys.net/openzaurus/patches"
@ -35,35 +35,34 @@ BASRC = "http://www.orca.cx/zaurus/patches"
# ${RPSRC}/mmc_pxa_roswitch-r0.patch;patch=1 \
# ${RPSRC}/mmc_corgi_roswitch-r0.patch;patch=1 \
# ${RPSRC}/corgi_base_extras1-r4.patch;patch=1 \
# ${RPSRC}/reverse_pagefault-r3.patch;patch=1 \
# ${RPSRC}/corgi_tspmufix-r0.patch;patch=1 \
# ${RPSRC}/nwfpe_x80-r0.patch;patch=1 \
# ${DOSRC}/mmc-bulk-r0.patch;patch=1 \
# ${RPSRC}/pxa27x_extraregs-r4.patch;patch=1 \
# Patches submitted upstream are towards top of this list
# Hacks should clearly named and at the bottom
SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc5.bz2;patch=1 \
ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc5/2.6.13-rc5-mm1/2.6.13-rc5-mm1.bz2;patch=1 \
${RPSRC}/reverse_pagefault-r3.patch;patch=1 \
${RPSRC}/corgi_tspmufix-r0.patch;patch=1 \
${RPSRC}/nwfpe_x80-r0.patch;patch=1 \
${DOSRC}/mmc-bulk-r0.patch;patch=1 \
# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc5.bz2;patch=1 \
SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13/2.6.13-mm1/2.6.13-mm1.bz2;patch=1 \
${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \
${RPSRC}/ohci_portcount-r0.patch;patch=1 \
${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \
${RPSRC}/pxa_ohci_platform-r0.patch;patch=1 \
${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \
${RPSRC}/pxa_pcmcia_init-r1.patch;patch=1 \
${RPSRC}/pxa_remove_static-r0.patch;patch=1 \
${RPSRC}/pxafb_hsync-r2.patch;patch=1 \
${RPSRC}/pxa27x_extraregs-r4.patch;patch=1 \
${RPSRC}/borzoi_machtype-r0.patch;patch=1 \
${RPSRC}/sharp_multi_pcmcia-r3.patch;patch=1 \
${RPSRC}/sharpsl_detection-r0.patch;patch=1 \
${RPSRC}/sharpsl_detection-r1.patch;patch=1 \
${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \
${RPSRC}/sharpsl_lcd-r2.patch;patch=1 \
${RPSRC}/sharpsl_ts-r3.patch;patch=1 \
${RPSRC}/sharpsl_bl-r1.patch;patch=1 \
${RPSRC}/sharpsl_pm-r2.patch;patch=1 \
${RPSRC}/corgi_pm-r0.patch;patch=1 \
${RPSRC}/sharpsl_bl-r3.patch;patch=1 \
${RPSRC}/sharpsl_pm-r6.patch;patch=1 \
${RPSRC}/corgi_pm-r1.patch;patch=1 \
${RPSRC}/spitzkbd-r1.patch;patch=1 \
${RPSRC}/spitzcf-r2.patch;patch=1 \
${RPSRC}/pxa_rtc-r1.patch;patch=1 \
@ -71,9 +70,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
${RPSRC}/corgi_irda-r3.patch;patch=1 \
${RPSRC}/input_power-r2.patch;patch=1 \
${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
${RPSRC}/sharpsl_bl_kick-r0.patch;patch=1 \
${RPSRC}/sharpsl_bl_kick-r1.patch;patch=1 \
${RPSRC}/corgi_snd-r10.patch;patch=1 \
${DOSRC}/rmk-i2c-pxa-r0.patch;patch=1 \
${RPSRC}/rmk-i2c-pxa-r2.patch;patch=1 \
${RPSRC}/sharpsl_mtd_extras-r0.patch;patch=1 \
${RPSRC}/ipaq/hx2750_base-r20.patch;patch=1 \
${RPSRC}/ipaq/hx2750_bl-r1.patch;patch=1 \
@ -95,9 +94,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \
${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
${RPSRC}/spitz_base-r11.patch;patch=1 \
${RPSRC}/spitz_pm-r0.patch;patch=1 \
${RPSRC}/spitz_pm-r1.patch;patch=1 \
${RPSRC}/scoop_susres-r0.patch;patch=1 \
${RPSRC}/pcmcia_dev_ids-r0.patch;patch=1 \
${RPSRC}/pcmcia_dev_ids-r1.patch;patch=1 \
${RPSRC}/mmc_timeout-r0.patch;patch=1 \
${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
file://add-oz-release-string.patch;patch=1 \
@ -105,6 +104,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
file://pxa-serial-hack.patch;patch=1 \
${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \
file://dtl1_cs-add-socket-revE.patch;patch=1 \
file://connectplus-remove-ide-HACK.patch;patch=1 \
file://defconfig-c7x0 \
file://defconfig-ipaq-pxa-2.6 \
file://defconfig-collie \
@ -127,7 +127,7 @@ SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \
${DOSRC}/tosa-pxaac97-r1.patch;patch=1 \
${DOSRC}/tosa-bluetooth-r0.patch;patch=1 "
S = "${WORKDIR}/linux-2.6.12"
S = "${WORKDIR}/linux-2.6.13"
inherit kernel

View File

@ -18,7 +18,8 @@ oh-task-base = "\
xcursor-transparent-theme \
xserver-kdrive-common \
gtk+ \
avahi \
avahi-daemon \
avahi-dnsconfd \
rxvt \
xhost \
ttf-bitstream-vera \

View File

@ -13,7 +13,7 @@ export IPKG_INSTALL = "task-bootstrap \
oh-task-base \
${XSERVER} "
ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
inherit image_ipk
LICENSE = MIT

View File

@ -4,8 +4,9 @@ DEPENDS = "zlib"
HOMEPAGE = "http://www.linux-mtd.infradead.org/"
LICENSE = "GPLv2"
PR = "r0"
CVSDATE = "${PV}"
SRC_URI = "ftp://ftp.uk.linux.org/pub/people/dwmw2/mtd/cvs/mtd-snapshot-${PV}.tar.bz2 \
SRC_URI = "cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd \
file://add-exclusion-to-mkfs-jffs2.patch;patch=1 \
file://more-verbosity.patch;patch=1"
S = "${WORKDIR}/mtd/"

View File

@ -0,0 +1,7 @@
#!/bin/sh
TSLIB_TSDEVICE=`detect-stylus --device`
TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h6300
export TSLIB_TSDEVICE TSLIB_CONFFILE

View File

@ -1,5 +1,5 @@
module_raw input
module linear_h2200
module_raw linear_h2200
module pthres pmin=1
module variance delta=30
module dejitter delta=100

View File

@ -0,0 +1,5 @@
module_raw input
module pthres pmin=1
module variance delta=30
module dejitter delta=100
module linear

View File

@ -1,7 +1,7 @@
SECTION = "base"
DESCRIPTION = "tslib is a touchscreen access library."
PV = "0.0cvs${CVSDATE}"
PR = "r29"
PR = "r31"
SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
PACKAGE_ARCH_tslib-conf = "${MACHINE}"
@ -9,7 +9,7 @@ PACKAGE_ARCH_mnci = "${MACHINE}"
SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
file://ts.conf \
file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h2200 \
file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h2200 file://ts.conf-h6300 \
file://ts.conf-corgi file://ts.conf-corgi-2.4 \
file://tslib.sh"
SRC_URI_append_mnci += " file://devfs.patch;patch=1"
@ -23,6 +23,7 @@ inherit autotools
PACKAGES = "tslib-conf libts libts-dev tslib-tests tslib-calibrate"
EXTRA_OECONF = "--enable-shared"
EXTRA_OECONF_mnci = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
EXTRA_OECONF_beagle = "--enable-shared --enable-h3600 --disable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
do_stage () {
oe_libinstall -so -C src libts-0.0 ${STAGING_LIBDIR}
@ -39,9 +40,9 @@ do_install_append() {
install -d ${D}${sysconfdir}/profile.d/
install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
case ${MACHINE} in
h3600 | h3900 | h1940 | ipaq-pxa270)
h3600 | h3900 | h1940 | h6300 | ipaq-pxa270)
install -d ${D}${datadir}/tslib
for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200; do
for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200 ts.conf-h6300; do
install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
done
rm -f ${D}${sysconfdir}/ts.conf