summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/initscripts/initscripts_1.0.bb4
-rw-r--r--packages/libdvb/files/.mtn2git_empty0
-rw-r--r--packages/libdvb/files/topf2ps.patch123
-rw-r--r--packages/libdvb/libdvb_0.5.5.1.bb6
-rw-r--r--packages/libopie/libopie2.inc5
-rw-r--r--packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb48
-rw-r--r--packages/meta/opie-collections.inc19
-rw-r--r--packages/obexpush/obexpush-native_1.0.0.bb4
-rw-r--r--packages/obexpush/obexpush_1.0.0.bb4
-rw-r--r--packages/syslog-ng/files/.mtn2git_empty0
-rw-r--r--packages/syslog-ng/files/initscript45
11 files changed, 223 insertions, 35 deletions
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 60346f70d9..4c92d07130 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
DEPENDS_openzaurus = "makedevs virtual/kernel"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r56"
+PR = "r57"
SRC_URI = "file://halt \
file://ramdisk \
@@ -103,7 +103,7 @@ do_install () {
fi
case ${MACHINE} in
- c7x0 | tosa | spitz | akita )
+ c7x0 | tosa | spitz | akita | borzoi )
install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d
ln -sf ../init.d/keymap ${D}${sysconfdir}/rcS.d/S00keymap
install -m 0644 ${WORKDIR}/keymap-*.map ${D}${sysconfdir}
diff --git a/packages/libdvb/files/.mtn2git_empty b/packages/libdvb/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libdvb/files/.mtn2git_empty
diff --git a/packages/libdvb/files/topf2ps.patch b/packages/libdvb/files/topf2ps.patch
new file mode 100644
index 0000000000..93503ca92d
--- /dev/null
+++ b/packages/libdvb/files/topf2ps.patch
@@ -0,0 +1,123 @@
+diff -ruN libdvb-0.5.5/Makefile libdvb-0.5.5-topfield/Makefile
+--- libdvb-0.5.5/Makefile 2004-09-16 04:56:21.000000000 +1000
++++ libdvb-0.5.5-topfield/Makefile 2004-12-03 15:53:24.677184191 +1100
+@@ -68,7 +68,7 @@
+ make -C libdvbmpeg clean
+ make -C sample_progs clean
+ make -C dvb-mpegtools clean
+- rm include/*~
++ -rm -f include/*~
+
+ dist:
+ mkdir libdvb-$(VERSION)
+diff -ruN libdvb-0.5.5/dvb-mpegtools/Makefile libdvb-0.5.5-topfield/dvb-mpegtools/Makefile
+--- libdvb-0.5.5/dvb-mpegtools/Makefile 2004-09-16 04:56:21.000000000 +1000
++++ libdvb-0.5.5-topfield/dvb-mpegtools/Makefile 2004-12-03 12:38:58.000000000 +1100
+@@ -16,7 +16,7 @@
+ pesplot pes2ts2 pes_repack split_mpg cut_mpg ts2ps ts2es\
+ insert_pat_pmt get_http extract_pes extract_pes_payload\
+ change_aspect_1_1 change_aspect_4_3 change_aspect_16_9 \
+- change_aspect_221_1
++ change_aspect_221_1 topf2ps
+
+ .PHONY: depend clean install uninstall
+
+diff -ruN libdvb-0.5.5/dvb-mpegtools/main.cc libdvb-0.5.5-topfield/dvb-mpegtools/main.cc
+--- libdvb-0.5.5/dvb-mpegtools/main.cc 2004-09-16 04:56:21.000000000 +1000
++++ libdvb-0.5.5-topfield/dvb-mpegtools/main.cc 2004-12-03 12:45:39.000000000 +1100
+@@ -52,7 +52,7 @@
+ write(STDOUT_FILENO, buf, count);
+ }
+
+-#define PROGS 29
++#define PROGS 30
+
+ char *prognames[PROGS+1] = { "streamtype", // 0
+ "ts2pes", // 1
+@@ -83,6 +83,7 @@
+ "change_aspect_4_3",
+ "change_aspect_16_9",
+ "change_aspect_221_1", // 28
++ "topf2ps",
+ " "
+ };
+
+@@ -116,6 +117,7 @@
+ change_aspect_4_3_,
+ change_aspect_16_9_,
+ change_aspect_221_1_, // 28
++ topf2ps_,
+ none_,
+ };
+
+@@ -226,6 +228,11 @@
+ cerr << "or insert_pat_pmt < <filename> (or pipe)" << endl;
+ break;
+
++ case topf2ps_:
++ cerr << "usage: topf2ps <filename>" << endl;
++ cerr << "or topf2ps < <filename> (or pipe)" << endl;
++ break;
++
+ case get_http_:
+ cerr << "usage: get_http <URL>" << endl;
+ break;
+@@ -345,6 +352,10 @@
+ }
+ break;
+
++ case topf2ps_:
++ topf_to_ps(fd, STDOUT_FILENO);
++ break;
++
+ case insert_pat_pmt_:
+ insert_pat_pmt( fd, STDOUT_FILENO);
+ break;
+diff -ruN libdvb-0.5.5/include/transform.h libdvb-0.5.5-topfield/include/transform.h
+--- libdvb-0.5.5/include/transform.h 2004-09-16 04:56:21.000000000 +1000
++++ libdvb-0.5.5-topfield/include/transform.h 2004-12-03 12:49:20.000000000 +1100
+@@ -192,6 +192,7 @@
+ void kpes_to_ts( p2p *p,uint8_t *buf ,int count );
+ void setup_ts2pes( p2p *pa, p2p *pv, uint32_t pida, uint32_t pidv,
+ void (*pes_write)(uint8_t *buf, int count, void *p));
++ void topf_to_ps(int fdin, int fdout);
+ void kts_to_pes( p2p *p, uint8_t *buf);
+ void pes_repack(p2p *p);
+ void extract_from_pes(int fdin, int fdout, uint8_t id, int es);
+diff -ruN libdvb-0.5.5/libdvbmpeg/transform.c libdvb-0.5.5-topfield/libdvbmpeg/transform.c
+--- libdvb-0.5.5/libdvbmpeg/transform.c 2004-09-16 04:56:21.000000000 +1000
++++ libdvb-0.5.5-topfield/libdvbmpeg/transform.c 2004-12-03 12:50:55.000000000 +1100
+@@ -1247,6 +1247,30 @@
+
+ }
+
++void topf_to_ps( int fdin, int fdout)
++{
++
++ uint16_t pida, pidv;
++ uint8_t buf[1880];
++ int count = 1;
++
++ if ((count = save_read(fdin, buf, sizeof(buf))) < 0)
++ perror("reading");
++
++ if ((count != sizeof(buf)) || (buf[0] != 'T') || (buf[1] != 'F') ||
++ (buf[2] != 'r') || (buf[3] != 'c')) {
++
++ fprintf(stderr, "Couldn't read Topfield header\n");
++ return;
++ }
++
++ pida = (buf[24] << 8) + buf[25];
++ pidv = ((buf[26] & 0x7f) << 8) + buf[27];
++
++ fprintf(stderr, "apid %d (0x%02x)\n",pida,pida);
++ fprintf(stderr, "vpid %d (0x%02x)\n",pidv,pidv);
++ ts_to_pes(fdin, pida, pidv, 1);
++}
+
+ #define INN_SIZE 2*IN_SIZE
+ void insert_pat_pmt( int fdin, int fdout)
+
+
+
diff --git a/packages/libdvb/libdvb_0.5.5.1.bb b/packages/libdvb/libdvb_0.5.5.1.bb
index 9de579917c..0e0c2b9caf 100644
--- a/packages/libdvb/libdvb_0.5.5.1.bb
+++ b/packages/libdvb/libdvb_0.5.5.1.bb
@@ -5,9 +5,11 @@ HOMEPAGE = "http://www.metzlerbros.org/dvb/index.html"
MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
SECTION = "libs"
PRIORITY = "optional"
-PR = "r1"
+PR = "r2"
+
+SRC_URI = "http://www.metzlerbros.org/dvb/${PN}-${PV}.tar.gz \
+ file://topf2ps.patch;patch=1"
-SRC_URI = "http://www.metzlerbros.org/dvb/${PN}-${PV}.tar.gz"
S = "${WORKDIR}/${PN}-${PV}"
inherit autotools pkgconfig
diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc
index 703ae6db34..b19a71c1f9 100644
--- a/packages/libopie/libopie2.inc
+++ b/packages/libopie/libopie2.inc
@@ -4,7 +4,7 @@ SECTION = "opie/libs"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "LGPL"
I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
-DEPENDS = "libqpe-opie sqlite3 libpcap"
+DEPENDS = "libqpe-opie libpcap sqlite3"
PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2"
S = "${WORKDIR}/libopie2"
@@ -20,7 +20,8 @@ EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \
DEFINES+=OPIE_NO_ERASE_RECT_HACKFIX \
LIBS+=-L${S} LIBS+="-Wl,-rpath-link,${S}"'
-EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=y'
+#NOTE: We no longer enable the sqlite PIM backend here, since a) using it means no sync and b) it's too large for 16MB images
+EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=n'
MODULES = "opiecore opiedb opiemm opienet opiepim opiesecurity opieui"
LIBS = "core2 db2 mm2 net2 pim2 security2 ui2"
diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
index 2842eea8cb..0bae9c58af 100644
--- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
KV = "${@bb.data.getVar('PV',d,True)}"
-PR = "r12"
+PR = "r14"
DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -38,23 +38,36 @@ BASRC = "http://www.orca.cx/zaurus/patches"
# 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 \
+ ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \
+ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
+ ${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \
+ ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \
+ ${RPSRC}/pxafb_hsync-r2.patch;patch=1 \
+ ${RPSRC}/pxa27x_extraregs-r3.patch;patch=1 \
+ ${RPSRC}/sharp_multi_pcmcia-r3.patch;patch=1 \
+ ${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \
+ ${RPSRC}/sharpsl_lcd-r1.patch;patch=1 \
+ ${RPSRC}/sharpsl_ts-r2.patch;patch=1 \
+ ${RPSRC}/sharpsl_bl-r0.patch;patch=1 \
+ ${RPSRC}/sharpsl_pm-r0.patch;patch=1 \
+ ${RPSRC}/corgi_pm-r0.patch;patch=1 \
+ ${RPSRC}/spitzkbd-r1.patch;patch=1 \
+ ${RPSRC}/spitzcf-r1.patch;patch=1 \
+ ${RPSRC}/spitz_usbhost-r0.patch;patch=1 \
${RPSRC}/pxa_rtc-r1.patch;patch=1 \
${RPSRC}/pxa_irda-r2.patch;patch=1 \
- ${RPSRC}/sharp_multi_pcmcia-r3.patch;patch=1 \
- ${RPSRC}/input_power-r2.patch;patch=1 \
- ${RPSRC}/corgi_irda-r2.patch;patch=1 \
- ${RPSRC}/corgi_base_extras4-r0.patch;patch=1 \
+ ${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}/corgi_power1-r1.patch;patch=1 \
- ${DOSRC}/mmc-bulk-r0.patch;patch=1 \
- ${RPSRC}/mmc_timeout-r0.patch;patch=1 \
${RPSRC}/corgi_snd-r10.patch;patch=1 \
${DOSRC}/rmk-i2c-pxa-r0.patch;patch=1 \
${RPSRC}/spitz_mtd-r0.patch;patch=1 \
@@ -79,21 +92,12 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
${DOSRC}/tosa-lcd-r3.patch;patch=1 \
${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \
${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
- ${RPSRC}/pxafb_hsync-r0.patch;patch=1 \
- ${RPSRC}/pxa27x_extraregs-r3.patch;patch=1 \
- ${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \
- ${RPSRC}/sharpsl_lcd-r0.patch;patch=1 \
- ${RPSRC}/sharpsl_ts-r0.patch;patch=1 \
- ${RPSRC}/sharpsl_bl-r0.patch;patch=1 \
- ${RPSRC}/spitz_base-r7.patch;patch=1 \
- ${RPSRC}/spitzkbd-r1.patch;patch=1 \
- ${RPSRC}/spitzcf-r1.patch;patch=1 \
- ${RPSRC}/spitz_power-r3.patch;patch=1 \
- ${RPSRC}/spitz_usbhost-r0.patch;patch=1 \
- ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \
+ ${RPSRC}/spitz_base-r8.patch;patch=1 \
+ ${RPSRC}/spitz_pm-r0.patch;patch=1 \
${RPSRC}/scoop_susres-r0.patch;patch=1 \
${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
${RPSRC}/pcmcia_dev_ids-r0.patch;patch=1 \
+ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \
${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \
file://add-oz-release-string.patch;patch=1 \
@@ -154,6 +158,10 @@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} debug"
# Enable or disable ELPP via local.conf - default is "no"
#
ENABLE_ELPP = ${@bb.data.getVar("OZ_KERNEL_ENABLE_ELPP",d,1) or "no"}
+###############################################################
+# module configs specific to this kernel
+#
+module_autoload_pxaficp_ir = "pxaficp_ir"
do_configure() {
diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc
index 052ddac474..f45f5916e4 100644
--- a/packages/meta/opie-collections.inc
+++ b/packages/meta/opie-collections.inc
@@ -33,17 +33,22 @@ OPIE_BASE_DECOS = "opie-deco-flat opie-deco-liquid opie-deco-polished"
OPIE_BASE_STYLES = "opie-style-flat opie-style-liquid opie-style-fresh \
opie-style-metal opie-style-web opie-style-phase"
-OPIE_BASE_DEPENDS = "ipkg timezones ntp bluez-utils-nodbus irda-utils \
- openobex-apps libopieobex0 wireless-tools usbutils"
-OPIE_BASE_RDEPENDS = "timezones ntpdate opie-handwriting-classicset \
- bluez-utils-nodbus openobex-apps libopieobex0 wireless-tools "
+OPIE_BLUETOOTH_DEPENDS = "bluez-utils-nodbus openobex obexftp openobex-apps obexpush \
+ libopieobex0 libopietooth1 \
+ opie-bluepin opie-bluetoothapplet opie-bluetoothmanager"
+OPIE_BLUETOOTH_RDEPENDS = "bluez-utils-nodbus obexftp openobex-apps obexpush \
+ opie-bluepin opie-bluetoothapplet opie-bluetoothmanager"
+
+OPIE_BASE_DEPENDS = "ipkg timezones ntp irda-utils wireless-tools usbutils ${OPIE_BLUETOOTH_DEPENDS}"
+OPIE_BASE_RDEPENDS = "timezones ntpdate opie-handwriting-classicset wireless-tools ${OPIE_BLUETOOTH_RDEPENDS}"
#
# Clamshell models can benefit from the autorotate applet
#
-OPIE_BASE_DEPENDS_append_c7x0 = " opie-autorotateapplet"
-OPIE_BASE_DEPENDS_append_spitz = " opie-autorotateapplet"
-OPIE_BASE_DEPENDS_append_akita = " opie-autorotateapplet"
+OPIE_BASE_DEPENDS_append_c7x0 = " opie-autorotateapplet"
+OPIE_BASE_DEPENDS_append_spitz = " opie-autorotateapplet"
+OPIE_BASE_DEPENDS_append_akita = " opie-autorotateapplet"
+OPIE_BASE_DEPENDS_append_borzoi = " opie-autorotateapplet"
# Keyboard models can benefit from the VT and logout applets
OPIE_BASE_APPLETS_append_openzaurus = " opie-vtapplet opie-logoutapplet"
diff --git a/packages/obexpush/obexpush-native_1.0.0.bb b/packages/obexpush/obexpush-native_1.0.0.bb
index 6e63de5c98..64840797cd 100644
--- a/packages/obexpush/obexpush-native_1.0.0.bb
+++ b/packages/obexpush/obexpush-native_1.0.0.bb
@@ -3,6 +3,10 @@ inherit native
FILESPATH = "${FILE_DIRNAME}/obexpush-${PV}:${FILE_DIRNAME}/obexpush:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
+do_stage() {
+ :
+}
+
do_install() {
:
}
diff --git a/packages/obexpush/obexpush_1.0.0.bb b/packages/obexpush/obexpush_1.0.0.bb
index b441e7c3a6..a01b6ddee6 100644
--- a/packages/obexpush/obexpush_1.0.0.bb
+++ b/packages/obexpush/obexpush_1.0.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.caside.lancs.ac.uk/java_bt.php"
SECTION = "console/network"
LICENSE = "GPL"
DEPENDS = "glib-2.0 openobex bluez-libs"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.caside.lancs.ac.uk/bt/obexpush.tar.gz \
file://add-obextool.patch;patch=1 \
@@ -41,6 +41,6 @@ do_install() {
install -m 0755 opd/opd ${D}${sbindir}
install -d ${D}${sysconfdir}/init.d
- install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/opd
+ install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/opd
}
diff --git a/packages/syslog-ng/files/.mtn2git_empty b/packages/syslog-ng/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/syslog-ng/files/.mtn2git_empty
diff --git a/packages/syslog-ng/files/initscript b/packages/syslog-ng/files/initscript
new file mode 100644
index 0000000000..b95e8adc20
--- /dev/null
+++ b/packages/syslog-ng/files/initscript
@@ -0,0 +1,45 @@
+#! /bin/sh
+#
+# This is an init script for openembedded
+# Copy it to /etc/init.d/syslog-ng and type
+# > update-rc.d syslog-ng defaults 5
+#
+
+
+syslog_ng=/usr/sbin/syslog-ng
+test -x "$syslog_ng" || exit 0
+
+case "$1" in
+ start)
+ echo -n "Starting syslog-ng:"
+ start-stop-daemon --start --quiet --exec $syslog_ng
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping syslog-ng:"
+ start-stop-daemon --stop --quiet --pidfile /var/run/syslog-ng.pid
+ echo "."
+ ;;
+ reload|force-reload)
+ start-stop-daemon --stop --quiet --signal 1 --exec $syslog_ng
+ ;;
+ restart)
+ echo "Stopping syslog-ng:"
+ start-stop-daemon --stop --quiet --pidfile /var/run/syslog-ng.pid
+ echo -n "Waiting for syslog-ng to die off"
+ for i in 1 2 3 ;
+ do
+ sleep 1
+ echo -n "."
+ done
+ echo ""
+ echo -n "Starting syslog-ng:"
+ start-stop-daemon --start --quiet --exec $syslog_ng
+ echo "."
+ ;;
+ *)
+ echo "Usage: /etc/init.d/syslog-ng {start|stop|reload|restart|force-reload}"
+ exit 1
+esac
+
+exit 0
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 09:08:25 +0000