diff options
| author | Frederic Bompart <frederic@unknown.openembedded.org> | 2005-09-20 07:27:59 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-20 07:27:59 +0000 |
| commit | 4d091ab7bcad9180be49ff4768602c05a2c6bfa7 (patch) | |
| tree | daa7a2c9d7df89e803dce51a58ab62b1e8dfca50 | |
| parent | dd088063c0542a8940f201b33ae6ce904198d9ea (diff) | |
| parent | 656946b9536f23b212e6ef8111f0fbdbd2d7b446 (diff) | |
merge of 0f46196206904515c0939c84c80210e251c74960
and 5ec5f2c198db5c371a9cf2cada82144032025895
73 files changed, 411 insertions, 94 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 8a387da5ca..ec1d4af1a4 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -145,7 +145,7 @@ autotools_stage_includes() { rm -rf ${STAGE_TEMP} mkdir -p ${STAGE_TEMP} make DESTDIR="${STAGE_TEMP}" install - cp -a ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} + cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} rm -rf ${STAGE_TEMP} fi } diff --git a/classes/base.bbclass b/classes/base.bbclass index 066f7af9da..18d51a02ed 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -371,7 +371,7 @@ def oe_unpack_file(file, data, url = None): destdir = "." elif not os.access("%s/%s" % (os.getcwd(), destdir), os.F_OK): os.makedirs("%s/%s" % (os.getcwd(), destdir)) - cmd = 'cp -a %s %s/%s/' % (file, os.getcwd(), destdir) + cmd = 'cp -pPR %s %s/%s/' % (file, os.getcwd(), destdir) else: (type, host, path, user, pswd, parm) = bb.decodeurl(url) if not 'patch' in parm: diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index ee022c99d2..3eeff91333 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -43,7 +43,7 @@ sourcepkg_do_create_orig_tgz(){ echo $src_tree oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz" tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz $src_tree --exclude-from temp/exclude-from-file - cp -a $src_tree $src_tree.orig + cp -pPR $src_tree $src_tree.orig } sourcepkg_do_archive_bb() { diff --git a/conf/distro/openzaurus-3.5.4.conf b/conf/distro/openzaurus-3.5.4.conf index 1eb347fe02..f26abfa30c 100644 --- a/conf/distro/openzaurus-3.5.4.conf +++ b/conf/distro/openzaurus-3.5.4.conf @@ -30,6 +30,8 @@ KERNEL_CONSOLE = "ttyS0" PREFERRED_VERSION_gcc-cross ?= "3.4.4" PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" +PREFERRED_VERSION_hostap-modules ?= "0.3.9" + #fix some iconv issues, needs to be adjusted when doing uclibc builds PREFERRED_PROVIDER_virtual/libiconv=glibc PREFERRED_PROVIDER_virtual/libintl=glibc diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf index 5ee4a43ad9..4901b94f44 100644 --- a/conf/distro/ucslugc-packages.conf +++ b/conf/distro/ucslugc-packages.conf @@ -147,6 +147,7 @@ ${PKGDIR}/packages/thttpd/*.bb \ ${PKGDIR}/packages/timezones/*.bb \ ${PKGDIR}/packages/tinylogin/*.bb \ ${PKGDIR}/packages/uclibc/*.bb \ +${PKGDIR}/packages/udev/*.bb \ ${PKGDIR}/packages/unionfs/*.bb \ ${PKGDIR}/packages/update-modules/*.bb \ ${PKGDIR}/packages/update-rc.d/*.bb \ diff --git a/packages/gpe-theme-foxbox/.mtn2git_empty b/packages/abiword/abiword-2.3.99/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gpe-theme-foxbox/.mtn2git_empty +++ b/packages/abiword/abiword-2.3.99/.mtn2git_empty diff --git a/packages/abiword/abiword-2.3.99/cdump-hack.patch b/packages/abiword/abiword-2.3.99/cdump-hack.patch new file mode 100644 index 0000000000..afe75287e5 --- /dev/null +++ b/packages/abiword/abiword-2.3.99/cdump-hack.patch @@ -0,0 +1,11 @@ +--- abi/src/wp/ap/xp/GNUmakefile.am.orig 2005-05-09 21:33:34.915201456 +0000 ++++ abi/src/wp/ap/xp/GNUmakefile.am 2005-05-09 21:33:49.341008400 +0000 +@@ -107,7 +107,7 @@ + ap_wp_sidebar.cpp + + CDUMP=$(top_srcdir)/src/tools/cdump/xp/cdump.c +-CDUMPAPP=$(top_builddir)/src/tools/cdump/xp/cdump ++CDUMPAPP=cdump + + ap_wp_splash.cpp: $(CDUMP) $(srcdir)/splash.png + $(CDUMPAPP) $(srcdir)/splash.png g_pngSplash > ap_wp_splash.cpp diff --git a/packages/abiword/abiword_2.3.99.bb b/packages/abiword/abiword_2.3.99.bb new file mode 100644 index 0000000000..76b569db29 --- /dev/null +++ b/packages/abiword/abiword_2.3.99.bb @@ -0,0 +1,52 @@ +DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" +HOMEPAGE="http://www.abiword.org"" +MAINTAINER="Koen Kooi <koen@handhelds.org>" +LICENSE="GPLv2" + +DEPENDS = "cdump-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2" +RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ + glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" +PR="r4" + +SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ + file://cdump-hack.patch;patch=1" +S = "${WORKDIR}/abiword-${PV}/abi" + +FILES_${PN} += " ${datadir}/icons/* \ +${datadir}/AbiSuite-2.2/AbiWord/glade \ +${datadir}/AbiSuite-2.2/AbiWord/scripts \ +${datadir}/AbiSuite-2.2/AbiWord/system.profile-en \ +${datadir}/AbiSuite-2.2/AbiWord/system.profile-en_GB \ +#${datadir}/AbiSuite-2.2/templates/A4.awt \ +#${datadir}/AbiSuite-2.2/templates/US-Letter.awt \ +${datadir}/AbiSuite-2.2/templates/normal.awt \ +${datadir}/AbiSuite-2.2/templates/normal.awt-en_GB \ +${datadir}/AbiSuite-2.2/templates/Employee-Directory.awt \ +${datadir}/AbiSuite-2.2/templates/Business-Report.awt \ +${datadir}/AbiSuite-2.2/templates/Fax-Coversheet.awt \ +${datadir}/AbiSuite-2.2/templates/Resume.awt \ +${datadir}/AbiSuite-2.2/templates/Two-Columns.awt \ +${datadir}/AbiSuite-2.2/templates/Memo.awt \ +${datadir}/AbiSuite-2.2/templates/Press-Release.awt " + +inherit autotools + +#abiword needs this native tool +export BUILD_CDUMPTOOL="${STAGING_BINDIR}/cdump" + +PARALLEL_MAKE="" + +do_configure () { + cd ${S} + ./autogen.sh + ./configure --prefix=/usr --host=${TARGET_SYS} --disable-pspell --enable-enchant +# --enable-debug + cp -f ${STAGING_BINDIR}/cdump src/tools/cdump/xp/ +} + +do_install_append() { + install -d ${D}${datadir}/pixmaps/ + mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/ +} + + diff --git a/packages/billiardz/billiardz_0.1.4.bb b/packages/billiardz/billiardz_0.1.4.bb index a3593a4c49..e87bab1986 100644 --- a/packages/billiardz/billiardz_0.1.4.bb +++ b/packages/billiardz/billiardz_0.1.4.bb @@ -22,7 +22,7 @@ do_install() { ${D}${palmtopdir}/pics/billiardz install -m 0755 billiardz ${D}${palmtopdir}/bin/billiardz install -m 0644 billiardz.png ${D}${palmtopdir}/pics/billiardz.png - cp -a images/*.png ${D}${palmtopdir}/pics/billiardz + cp -pPR images/*.png ${D}${palmtopdir}/pics/billiardz echo "[Desktop Entry] " >${D}${palmtopdir}/apps/Games/billiardz.desktop echo "Comment=Billiards for Zaurus" >>${D}${palmtopdir}/apps/Games/billiardz.desktop diff --git a/packages/brickout/brickout_2002.06.09.bb b/packages/brickout/brickout_2002.06.09.bb index 1908ff520b..891b615331 100644 --- a/packages/brickout/brickout_2002.06.09.bb +++ b/packages/brickout/brickout_2002.06.09.bb @@ -28,9 +28,9 @@ do_install() { install -D -m 0755 brickout ${D}${palmtopdir}/bin/brickout install -D -m 0644 brickout.png ${D}${palmtopdir}/pics/brickout.png - cp -a sounds/* ${D}${palmtopdir}/share/brickout/sounds/ - cp -a music/* ${D}${palmtopdir}/share/brickout/music/ - cp -a images-sdl/* ${D}${palmtopdir}/share/brickout/images/ + cp -pPR sounds/* ${D}${palmtopdir}/share/brickout/sounds/ + cp -pPR music/* ${D}${palmtopdir}/share/brickout/music/ + cp -pPR images-sdl/* ${D}${palmtopdir}/share/brickout/images/ echo "[Desktop Entry]" >${D}${palmtopdir}/apps/Games/brickout.desktop echo "Comment=Arkanoid game" >>${D}${palmtopdir}/apps/Games/brickout.desktop diff --git a/packages/db/db_4.3.27.bb b/packages/db/db_4.3.27.bb index 216fb5714b..518fddee9f 100644 --- a/packages/db/db_4.3.27.bb +++ b/packages/db/db_4.3.27.bb @@ -69,7 +69,7 @@ do_configure() { do_stage() { # The .h files get installed read-only, the autostage - # function just uses cp -a, so do this by hand + # function just uses cp -pPR, so do this by hand # Install, for the moment, into include/db4 to avoid # interfering with the db3 headers (which have the same # name). -I${STAGING_INCDIR}/db4 to use db4, as opposed @@ -78,7 +78,7 @@ do_stage() { mkdir -p ${STAGE_TEMP} oe_runmake DESTDIR="${STAGE_TEMP}" install_include mkdir -p ${STAGING_INCDIR}/db4 - cp -af ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/db4 + cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/db4 rm -rf ${STAGE_TEMP} oe_libinstall -so -C .libs libdb-4.3 ${STAGING_LIBDIR} } diff --git a/packages/dviviewer/dviviewer_1.0.2.bb b/packages/dviviewer/dviviewer_1.0.2.bb index 75523ca793..531ba73362 100644 --- a/packages/dviviewer/dviviewer_1.0.2.bb +++ b/packages/dviviewer/dviviewer_1.0.2.bb @@ -17,5 +17,5 @@ do_install() { install -D -m 755 dviviewer ${D}${palmtopdir}/bin/dviviewer install -D -m 644 dviviewer.desktop ${D}${palmtopdir}/Applications/dviviewer.desktop install -d ${D}${palmtopdir}/pics - cp -a *.png ${D}${palmtopdir}/pics/ + cp -pPR *.png ${D}${palmtopdir}/pics/ } diff --git a/packages/efl++/efl++.inc b/packages/efl++/efl++.inc index 7b26a45091..60d1ce1bb8 100644 --- a/packages/efl++/efl++.inc +++ b/packages/efl++/efl++.inc @@ -48,7 +48,7 @@ do_install() { install -d ${D}${bindir} install *-* ${D}${bindir} install -d ${D}${datadir}/efl++ - cp -a data/* ${D}${datadir}/efl++ + cp -pPR data/* ${D}${datadir}/efl++ } PACKAGES =+ "efl++-examples" diff --git a/packages/freedroid/freedroid_1.0.2.bb b/packages/freedroid/freedroid_1.0.2.bb index 7718da0696..e51d22ca0b 100644 --- a/packages/freedroid/freedroid_1.0.2.bb +++ b/packages/freedroid/freedroid_1.0.2.bb @@ -26,9 +26,9 @@ do_install() { install -D -m 0755 src/freedroid ${D}${palmtopdir}/bin/freedroid install -D -m 0644 ${WORKDIR}/icon.png ${D}${palmtopdir}/pics/freedroid.png - cp -a graphics/* ${D}${palmtopdir}/share/freedroid/graphics - cp -a map/* ${D}${palmtopdir}/share/freedroid/map - cp -a sound/* ${D}${palmtopdir}/share/freedroid/sound + cp -pPR graphics/* ${D}${palmtopdir}/share/freedroid/graphics + cp -pPR map/* ${D}${palmtopdir}/share/freedroid/map + cp -pPR sound/* ${D}${palmtopdir}/share/freedroid/sound echo "[Desktop Entry]" >${D}${palmtopdir}/apps/Games/freedroid.desktop echo "Comment=A Paradroid Clone" >>${D}${palmtopdir}/apps/Games/freedroid.desktop diff --git a/packages/gemdropx/gemdropx_0.9.bb b/packages/gemdropx/gemdropx_0.9.bb index 5c15b5dcf6..836c44c8b5 100644 --- a/packages/gemdropx/gemdropx_0.9.bb +++ b/packages/gemdropx/gemdropx_0.9.bb @@ -27,7 +27,7 @@ do_install() { ${D}${palmtopdir}/share/gemdropx install -D -m 0755 gemdropx ${D}${palmtopdir}/bin/gemdropx install -D -m 0644 ${WORKDIR}/icon.png ${D}${palmtopdir}/pics/gemdropx.png - cp -a data/* ${D}${palmtopdir}/share/gemdropx + cp -pPR data/* ${D}${palmtopdir}/share/gemdropx echo "[Desktop Entry]" >${D}${palmtopdir}/apps/Games/gemdropx.desktop echo "Comment=Puzzle game" >>${D}${palmtopdir}/apps/Games/gemdropx.desktop diff --git a/packages/gnome/gnome-common_2.4.0.bb b/packages/gnome/gnome-common_2.4.0.bb index ed60b0c236..fc67bf9243 100644 --- a/packages/gnome/gnome-common_2.4.0.bb +++ b/packages/gnome/gnome-common_2.4.0.bb @@ -19,9 +19,9 @@ do_stage () { rm -rf ${STAGE_TEMP} mkdir -p ${STAGE_TEMP} make DESTDIR="${STAGE_TEMP}" install - cp -a ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin + cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin install -d ${STAGING_DIR}/${HOST_SYS}/share/gnome-common - cp -a ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DIR}/${HOST_SYS}/share/gnome-common - cp -a ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DIR}/${HOST_SYS}/share/aclocal + cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DIR}/${HOST_SYS}/share/gnome-common + cp -pPR ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DIR}/${HOST_SYS}/share/aclocal rm -rf ${STAGE_TEMP} } diff --git a/packages/gpe-themes/.mtn2git_empty b/packages/gpe-themes/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-themes/.mtn2git_empty diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb new file mode 100644 index 0000000000..571ad216e2 --- /dev/null +++ b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "GTK+ clearlooks theme adjusted for GPE" +MAINTAINER = "Koen Kooi <koen@handhelds.org>" +PR= "r1" + +#it doesn't really depends on it, but it's nice to make OE build it +DEPENDS = "gtk-engines" +RDEPENDS = "gtk-engine-clearlooks" + +FILES_${PN} = "${datadir}/themes/" +SRC_URI = "http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz" + +do_install() { +install -d ${D}${datadir}/themes/ +cp -dpR ${WORKDIR}/Clearlooks ${D}${datadir}/themes/ +} + + diff --git a/packages/gpe-theme-foxbox/gpe-theme-foxbox_0.1.bb b/packages/gpe-themes/gpe-theme-foxbox_0.1.bb index fedad2189a..fedad2189a 100644 --- a/packages/gpe-theme-foxbox/gpe-theme-foxbox_0.1.bb +++ b/packages/gpe-themes/gpe-theme-foxbox_0.1.bb diff --git a/packages/klimt/klimt_0.6.1.bb b/packages/klimt/klimt_0.6.1.bb index c7c70bf9ae..fbb67de480 100644 --- a/packages/klimt/klimt_0.6.1.bb +++ b/packages/klimt/klimt_0.6.1.bb @@ -14,7 +14,7 @@ inherit opie do_stage() { oe_libinstall -so libKlimt ${STAGING_LIBDIR}/ - cp -a ${S}/../../include/* ${STAGING_INCDIR}/ + cp -pPR ${S}/../../include/* ${STAGING_INCDIR}/ } do_install() { diff --git a/packages/knights/knights_1.14.bb b/packages/knights/knights_1.14.bb index 87c0dc01ef..777ac6bda8 100644 --- a/packages/knights/knights_1.14.bb +++ b/packages/knights/knights_1.14.bb @@ -28,5 +28,5 @@ do_install() { install -D -m 755 knights/knights ${D}${palmtopdir}/bin/knights install -D -m 644 knights.desktop ${D}${palmtopdir}/apps/Games/knights.desktop install -d ${D}${palmtopdir}/pics - cp -a pics/knights ${D}${palmtopdir}/pics/ + cp -pPR pics/knights ${D}${palmtopdir}/pics/ } diff --git a/packages/kstars/kstars-embedded_0.8.5.bb b/packages/kstars/kstars-embedded_0.8.5.bb index a0c43e29d1..58a8522600 100644 --- a/packages/kstars/kstars-embedded_0.8.5.bb +++ b/packages/kstars/kstars-embedded_0.8.5.bb @@ -19,6 +19,6 @@ do_install() { install -d ${D}${palmtopdir}/bin \ ${D}${palmtopdir}/pics/kstars \ ${D}${palmtopdir}/share/apps/kstars - cp -a ${WORKDIR}/pics ${D}${palmtopdir} - cp -a ${WORKDIR}/share/apps/kstars ${D}${palmtopdir}/share/apps/ + cp -pPR ${WORKDIR}/pics ${D}${palmtopdir} + cp -pPR ${WORKDIR}/share/apps/kstars ${D}${palmtopdir}/share/apps/ } diff --git a/packages/libmodplug/libmodplug_0.7.bb b/packages/libmodplug/libmodplug_0.7.bb index 85afa1534d..72bd6adfbd 100644 --- a/packages/libmodplug/libmodplug_0.7.bb +++ b/packages/libmodplug/libmodplug_0.7.bb @@ -8,5 +8,5 @@ inherit autotools pkgconfig do_stage() { install -m 0644 ${S}/src/modplug.h ${STAGING_INCDIR} #FIXME! - cp -a src/.libs/libmodplug.so* ${STAGING_LIBDIR} + cp -pPR src/.libs/libmodplug.so* ${STAGING_LIBDIR} } diff --git a/packages/linux/linux-wrt_2.4.30.bb b/packages/linux/linux-wrt_2.4.30.bb index 444fb5b7ea..1676562a93 100644 --- a/packages/linux/linux-wrt_2.4.30.bb +++ b/packages/linux/linux-wrt_2.4.30.bb @@ -85,12 +85,12 @@ export CFLAGS_KERNEL="-fno-delayed-branch " do_unpack_extra(){ # copy kernel source which is maintained in openwrt via cvs - cp -a ${WORKDIR}/kernel-source/* ${S} + cp -pPR ${WORKDIR}/kernel-source/* ${S} # copy binary wlan driver - cp -a ${WORKDIR}/wl/*.o ${S}/drivers/net/wl + cp -pPR ${WORKDIR}/wl/*.o ${S}/drivers/net/wl # copy proprietary et source - cp -a ${WORKDIR}/et/* ${S}/drivers/net/et - cp -a ${WORKDIR}/et/*.h ${S}/include/ + cp -pPR ${WORKDIR}/et/* ${S}/drivers/net/et + cp -pPR ${WORKDIR}/et/*.h ${S}/include/ } addtask unpack_extra after do_unpack before do_patch diff --git a/packages/linux/nslu2-kernel/2.6.12/disk_led_blinking.patch b/packages/linux/nslu2-kernel/2.6.12/disk_led_blinking.patch new file mode 100644 index 0000000000..7487cf3ee8 --- /dev/null +++ b/packages/linux/nslu2-kernel/2.6.12/disk_led_blinking.patch @@ -0,0 +1,127 @@ +--- linux-2.6.12.2/drivers/usb/core/hub.c.bak 2005-09-19 20:29:14.000000000 +0000 ++++ linux-2.6.12.2/drivers/usb/core/hub.c 2005-09-19 20:30:44.000000000 +0000 +@@ -1026,6 +1026,19 @@ + + dev_info (&udev->dev, "USB disconnect, address %d\n", udev->devnum); + ++ // --- Forward-Ported Linksys Disk 1 & Disk 2 LED Control (Port done 16.Sept.05 by Philipp Kirchhofer) --- ++ // Copy & paste from nslu2-io.c ++ #define DISK1_OFF 0x00000008 //0b0000 0000 0000 1000 ++ #define DISK2_OFF 0x00000004 //0b0000 0000 0000 0100 ++ // Copy & Paste end ++ ++ if (*udev->devpath == 0x31) { ++ *IXP4XX_GPIO_GPOUTR |= DISK1_OFF; ++ } else if (*udev->devpath == 0x32) { ++ *IXP4XX_GPIO_GPOUTR |= DISK2_OFF; ++ } ++ // --- End LED Control --- ++ + /* Free up all the children before we remove this device */ + for (i = 0; i < USB_MAXCHILDREN; i++) { + if (udev->children[i]) +@@ -2175,6 +2188,19 @@ + udev->bus->controller->driver->name, + udev->devnum); + ++ // --- Start LED Control --- ++ // Copy & paste from nslu2-io.c ++ #define DISK1_ON 0xfffffff7 //0b1111 1111 1111 0111 ++ #define DISK2_ON 0xfffffffb //0b1111 1111 1111 1011 ++ // Copy & Paste end ++ ++ if (*udev->devpath == 0x31) { ++ *IXP4XX_GPIO_GPOUTR &= DISK1_ON; ++ } else if (*udev->devpath == 0x32) { ++ *IXP4XX_GPIO_GPOUTR &= DISK2_ON; ++ } ++ // --- End LED Control --- ++ + /* Set up TT records, if needed */ + if (hdev->tt) { + udev->tt = hdev->tt; +--- linux-2.6.12.2/drivers/usb/storage/transport.c.bak 2005-09-19 20:29:25.000000000 +0000 ++++ linux-2.6.12.2/drivers/usb/storage/transport.c 2005-09-19 20:29:55.000000000 +0000 +@@ -60,6 +60,60 @@ + #include "scsiglue.h" + #include "debug.h" + ++// --- Forward-Ported Linksys Disk 1 & Disk 2 LED Activity Blinking Part 1 (Port done 16.Sept.05 by Philipp Kirchhofer) --- ++// Copy & Paste from nslu2-io.c ++#define DISK1_ON 0xfffffff7 //0b1111 1111 1111 0111 ++#define DISK2_ON 0xfffffffb //0b1111 1111 1111 1011 ++ ++#define DISK1_OFF 0x00000008 //0b0000 0000 0000 1000 ++#define DISK2_OFF 0x00000004 //0b0000 0000 0000 0100 ++// Copy & Paste End ++ ++#define JIFFIES_BLINKING_TIME 6 ++#define ON_LED_INTERVAL 3 ++unsigned long turn_on_time; ++ ++static struct timer_list usb1_led_timer; /* ide led switch */ ++static struct timer_list usb2_led_timer; /* ide led switch */ ++ ++// Turns on Disk 1 LED ++static void turn_on_led_usb1(unsigned long ptr) { ++ *IXP4XX_GPIO_GPOUTR &= DISK1_ON; // 0xfff7 ++ return; ++} ++ ++// Turns on Disk 2 LED ++static void turn_on_led_usb2(unsigned long ptr) { ++ *IXP4XX_GPIO_GPOUTR &= DISK2_ON; // 0xfffb ++ return; ++} ++ ++// Turns on Disk 1 LED after ON_LED_INTERVAL jiffies ++static void usb_1_led_timer(void) { ++ usb1_led_timer.expires = jiffies + ON_LED_INTERVAL; ++ add_timer(&usb1_led_timer); ++ return; ++} ++ ++// Turns on Disk 2 LED after ON_LED_INTERVAL jiffies ++static void usb_2_led_timer(void) { ++ usb2_led_timer.expires = jiffies + ON_LED_INTERVAL; ++ add_timer(&usb2_led_timer); ++ return; ++} ++ ++// Initializes Timers ++unsigned long initialized_timers = 0; ++static void initializeTimers() { ++ if (initialized_timers != 1) { ++ init_timer(&usb1_led_timer); ++ usb1_led_timer.function = turn_on_led_usb1; ++ init_timer(&usb2_led_timer); ++ usb2_led_timer.function = turn_on_led_usb2; ++ initialized_timers = 1; ++ } ++} ++// --- End Disk LED Activity Blinking Part 1 --- + + /*********************************************************************** + * Data transfer routines +@@ -499,6 +553,21 @@ + + /* are we scatter-gathering? */ + if (use_sg) { ++ // --- Disk LED Activity Blinking Part 2 --- ++ initializeTimers(); ++ if ((jiffies - turn_on_time) >= JIFFIES_BLINKING_TIME) { ++ if (*us->pusb_dev->devpath == 0x31) { ++ del_timer_sync(&usb1_led_timer); ++ *IXP4XX_GPIO_GPOUTR |= DISK1_OFF; ++ usb_1_led_timer(); ++ } else if (*us->pusb_dev->devpath == 0x32) { ++ del_timer_sync(&usb2_led_timer); ++ *IXP4XX_GPIO_GPOUTR |= DISK2_OFF; ++ usb_2_led_timer(); ++ } ++ turn_on_time = jiffies; ++ } ++ // --- End Disk LED Activity Blinking Part 2 --- + /* use the usb core scatter-gather primitives */ + result = usb_stor_bulk_transfer_sglist(us, pipe, + (struct scatterlist *) buf, use_sg, diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb index 41f35d77ea..6f0f400028 100644 --- a/packages/linux/nslu2-kernel_2.6.12.2.bb +++ b/packages/linux/nslu2-kernel_2.6.12.2.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = "r15" +PR = "r16" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include @@ -24,4 +24,5 @@ N2K_PATCHES = "\ file://missing-exports.patch;patch=1 \ file://timer.patch;patch=1 \ file://nslu2-io_rpbutton.patch;patch=1 \ + file://disk_led_blinking.patch;patch=1 \ " diff --git a/packages/lirc/lirc_0.6.6+cvs20040918.bb b/packages/lirc/lirc_0.6.6+cvs20040918.bb index dd41615f8f..e4e9fad461 100644 --- a/packages/lirc/lirc_0.6.6+cvs20040918.bb +++ b/packages/lirc/lirc_0.6.6+cvs20040918.bb @@ -44,7 +44,7 @@ do_install() { install ${WORKDIR}/lircd.init ${D}${sysconfdir}/init.d/lircd install -d ${D}${datadir}/lirc/ - cp -a remotes ${D}${datadir}/lirc/ + cp -pPR remotes ${D}${datadir}/lirc/ find ${D}${datadir}/lirc -name CVS -o -name '*~*' | xargs rm -rf } diff --git a/packages/lirc/lirc_0.7.0.bb b/packages/lirc/lirc_0.7.0.bb index 3ab40a60d2..b7b832422e 100644 --- a/packages/lirc/lirc_0.7.0.bb +++ b/packages/lirc/lirc_0.7.0.bb @@ -31,6 +31,6 @@ do_install_append() { install ${WORKDIR}/lircd.init ${D}${sysconfdir}/init.d/lircd install -d ${D}${datadir}/lirc/ - cp -a ${S}/remotes ${D}${datadir}/lirc/ + cp -pPR ${S}/remotes ${D}${datadir}/lirc/ } diff --git a/packages/lirc/lirc_0.7.1.bb b/packages/lirc/lirc_0.7.1.bb index a946d3cdb0..c865002116 100644 --- a/packages/lirc/lirc_0.7.1.bb +++ b/packages/lirc/lirc_0.7.1.bb @@ -30,6 +30,6 @@ do_install_append() { install ${WORKDIR}/lircd.init ${D}${sysconfdir}/init.d/lircd install -d ${D}${datadir}/lirc/ - cp -a ${S}/remotes ${D}${datadir}/lirc/ + cp -pPR ${S}/remotes ${D}${datadir}/lirc/ } diff --git a/packages/maemo/sdk-default-icons_0.2-1.bb b/packages/maemo/sdk-default-icons_0.2-1.bb index fad8d479f3..769c71b77c 100644 --- a/packages/maemo/sdk-default-icons_0.2-1.bb +++ b/packages/maemo/sdk-default-icons_0.2-1.bb @@ -14,7 +14,7 @@ FILES_${PN} = "${datadir}" do_install() { install -d ${D}/${datadir} - cp -a ${S}/icons/ ${D}/${datadir}/ + cp -pPR ${S}/icons/ ${D}/${datadir}/ } diff --git a/packages/maemo/sdk-default-theme-config_1.0-1.bb b/packages/maemo/sdk-default-theme-config_1.0-1.bb index 135e722be6..c5b0e240a8 100644 --- a/packages/maemo/sdk-default-theme-config_1.0-1.bb +++ b/packages/maemo/sdk-default-theme-config_1.0-1.bb @@ -15,7 +15,7 @@ FILES_${PN} = "${datadir}" do_install() { install -d ${D}/${datadir} - cp -a ${S}/themes/ ${D}/${datadir}/ + cp -pPR ${S}/themes/ ${D}/${datadir}/ } diff --git a/packages/maemo/sdk-default-theme_0.1-1.bb b/packages/maemo/sdk-default-theme_0.1-1.bb index 5d95118845..11847958d4 100644 --- a/packages/maemo/sdk-default-theme_0.1-1.bb +++ b/packages/maemo/sdk-default-theme_0.1-1.bb @@ -14,7 +14,7 @@ FILES_${PN} = "${datadir}" do_install() { install -d ${D}/${datadir} - cp -a ${S}/themes/ ${D}/${datadir}/ + cp -pPR ${S}/themes/ ${D}/${datadir}/ } diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb index 3fc84ab179..c23031d20f 100644 --- a/packages/meta/meta-gpe.bb +++ b/packages/meta/meta-gpe.bb @@ -1,7 +1,7 @@ PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games DESCRIPTION = "Meta-package for GPE Palmtop Environment" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -PR = "r37" +PR = "r38" ALLOW_EMPTY = "1" @@ -49,7 +49,9 @@ gpe-task-pim = "\ gpe-calendar \ gpe-sketchbook \ gpe-contacts \ - gpe-today" + gpe-today \ + gpesyncd" + RDEPENDS_gpe-task-pim := "${gpe-task-pim}" DEPENDS += " ${gpe-task-pim}" diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb index 0c53f0b619..e383d9eb10 100644 --- a/packages/meta/meta-opie.bb +++ b/packages/meta/meta-opie.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta-package for Opie" SECTION = "opie/base" ALLOW_EMPTY = 1 -PR = "r27" +PR = "r28" PACKAGE_ARCH = "all" LICENSE = "MIT" @@ -27,7 +27,7 @@ DEPENDS = "irda-utils ntp wireless-tools timezones ttf-dejavu \ opie-freetype opie-help-en opie-i18n opie-login \ opie-securityplugin-blueping opie-securityplugin-dummy \ opie-securityplugin-notice opie-securityplugin-pin \ - opie-sh opie-symlinker \ + opie-sh opie-symlinker openobex \ konqueror-embedded qpdf2" # @@ -167,13 +167,12 @@ task-opie-todayplugins = "opie-today-addressbookplugin opie-today-datebookplugin task-opie-pim = "${task-opie-base-pim} opie-mail opie-pimconverter" -task-opie-bluetooth = "bluez-utils-nodbus openobex obexftp obexpush \ - libopieobex0 opie-bluepin opie-bluetoothmanager \ - opie-bluetoothapplet" +task-opie-bluetooth = "bluez-utils-nodbus obexftp obexpush libopieobex0 \ + opie-bluepin opie-bluetoothmanager opie-bluetoothapplet" task-opie-wlan = "wireless-tools opie-wellenreiter" -task-opie-irda = "irda-utils openobex libopieobex0 obexftp" +task-opie-irda = "irda-utils libopieobex0 obexftp obexpush" # # additional things for a >= 24mb distribution @@ -192,8 +191,8 @@ task-opie-extra-games = "opie-parashoot opie-mindbreaker opie-fifteen opie-ticta # DEPENDS += "${task-opie-applets} ${task-opie-apps} \ - opie-qcop opie-qss opie-quicklauncher opie-taskbar opie-pics \ - opie-sounds opie-ttf-support ttf-dejavu \ + opie-qcop opie-qss opie-quicklauncher opie-taskbar opie-pics \ + opie-sounds opie-ttf-support ttf-dejavu \ ${task-opie-bluetooth} ${task-opie-datebookplugins} \ ${task-opie-decorations} ${task-opie-extra-settings} \ ${task-opie-games} ${task-opie-inputmethods} ${task-opie-irda} \ diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb index d28b6cebc8..b71a2d44d8 100644 --- a/packages/meta/meta-sdk.bb +++ b/packages/meta/meta-sdk.bb @@ -148,16 +148,16 @@ EOF ${IPKG_TARGET} install ${TARGET_INSTALL} mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} - cp -a ${SDK_OUTPUT}/${prefix}/usr/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} + cp -pPR ${SDK_OUTPUT}/${prefix}/usr/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} rm -rf ${SDK_OUTPUT}/${prefix}/usr/ - cp -a ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib + cp -pPR ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib rm -rf ${SDK_OUTPUT}/${prefix}/lib/* mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc* ${SDK_OUTPUT}/${prefix}/lib - cp -a ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ - cp -a ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ + cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ + cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ chmod -R a+r ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ find ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ -type d | xargs chmod +x diff --git a/packages/meta/openslug-image.bb b/packages/meta/openslug-image.bb index c8c231d302..4916711564 100644 --- a/packages/meta/openslug-image.bb +++ b/packages/meta/openslug-image.bb @@ -14,7 +14,7 @@ DEPENDS = "virtual/kernel base-files base-passwd \ ixp4xx-csr ixp425-eth openslug-init \ module-init-tools modutils-initscripts \ ipkg-collateral ipkg ipkg-link diffutils \ - cpio findutils mtd-utils \ + cpio findutils mtd-utils udev \ ${OPENSLUG_EXTRA_DEPENDS}" # NOTE: file system kernel modules are defined in openslug.conf diff --git a/packages/minimix/minimix_0.8.bb b/packages/minimix/minimix_0.8.bb new file mode 100644 index 0000000000..484393c322 --- /dev/null +++ b/packages/minimix/minimix_0.8.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "Volume Control Applet for GPE" +LICENSE = "GPL" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "gpe" + +DEPENDS = "libgpewidget" + +GPE_TARBALL_SUFFIX = "bz2" +inherit gpe autotools diff --git a/packages/monotone/monotone.inc b/packages/monotone/monotone.inc index d13108a6e3..96d552e4d0 100644 --- a/packages/monotone/monotone.inc +++ b/packages/monotone/monotone.inc @@ -32,7 +32,7 @@ ALTERNATIVE_PRIORITY = "40" do_install_append() { install -d ${D}${tsd} install -c -m 755 testsuite ${D}${tsd}/testsuite - cp -a tests ${D}${tsd}/tests + cp -pPR tests ${D}${tsd}/tests # mv ${D}${bindir}/monotone ${D}${bindir}/${PN} } diff --git a/packages/netpbm/netpbm_10.28.bb b/packages/netpbm/netpbm_10.28.bb index 5057f13ed0..2d986666f1 100644 --- a/packages/netpbm/netpbm_10.28.bb +++ b/packages/netpbm/netpbm_10.28.bb @@ -65,16 +65,16 @@ do_install() { */VERSION) ;; */pkginfo) ;; */bin) install -d ${D}${bindir} - cp -a "$d"/* ${D}${bindir} + cp -pPR "$d"/* ${D}${bindir} rm ${D}${bindir}/doc.url;; */include) install -d ${D}${includedir} - cp -a "$d"/* ${D}${includedir};; + cp -pPR "$d"/* ${D}${includedir};; */link|*/lib) install -d ${D}${libdir} - cp -a "$d"/* ${D}${libdir};; + cp -pPR "$d"/* ${D}${libdir};; */man) install -d ${D}${mandir} - cp -a "$d"/* ${D}${mandir};; + cp -pPR "$d"/* ${D}${mandir};; */misc) install -d ${D}${datadir}/netpbm - cp -a "$d"/* ${D}${datadir}/netpbm;; + cp -pPR "$d"/* ${D}${datadir}/netpbm;; */config_template) install -d ${D}${bindir} sed "/^@/d diff --git a/packages/nonworking/freenote/freenote_1.6.1.bb b/packages/nonworking/freenote/freenote_1.6.1.bb index d8ada414e9..3e4540a060 100644 --- a/packages/nonworking/freenote/freenote_1.6.1.bb +++ b/packages/nonworking/freenote/freenote_1.6.1.bb @@ -18,5 +18,5 @@ do_install() { install -D -m 755 freenoteeintu ${D}${palmtopdir}/bin/freenoteeintu install -D -m 644 ${FILESDIR}/freenoteeintu.desktop ${D}${palmtopdir}/apps/Applications/freenoteeintu.desktop install -d ${D}/${palmtopdir}/pics - cp -a *.png ${D}${palmtopdir}/pics/ + cp -pPR *.png ${D}${palmtopdir}/pics/ } diff --git a/packages/nonworking/qualendar/qualendar_0.8.0.bb b/packages/nonworking/qualendar/qualendar_0.8.0.bb index 3a4bb15e35..0d6a5cbb99 100644 --- a/packages/nonworking/qualendar/qualendar_0.8.0.bb +++ b/packages/nonworking/qualendar/qualendar_0.8.0.bb @@ -13,5 +13,5 @@ do_install() { install -D -m 755 qualendar ${D}${palmtopdir}/bin/qualendar install -D -m 644 qualendar.desktop ${D}${palmtopdir}/apps/Applications/qualendar.desktop install -d ${D}${palmtopdir}/pics - cp -a *.png ${D}${palmtopdir}/pics/ + cp -pPR *.png ${D}${palmtopdir}/pics/ } diff --git a/packages/opie-pimconverter/opie-pimconverter.inc b/packages/opie-pimconverter/opie-pimconverter.inc index b19f4cc903..2bc2c2249c 100644 --- a/packages/opie-pimconverter/opie-pimconverter.inc +++ b/packages/opie-pimconverter/opie-pimconverter.inc @@ -3,8 +3,8 @@ SECTION = "opie/pim" PRIORITY = "optional" MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" -RDEPENDS = "sqlite3 sqlite" -#RDEPENDS = "sqlite3-bin sqlite-bin" +DEPENDS = "sqlite3 sqlite" +RDEPENDS = "sqlite3 libsqlite-bin" APPNAME = "opimconverter" diff --git a/packages/opie-pimconverter/opie-pimconverter_1.2.1.bb b/packages/opie-pimconverter/opie-pimconverter_1.2.1.bb index e3e979bec2..b1920c1290 100644 --- a/packages/opie-pimconverter/opie-pimconverter_1.2.1.bb +++ b/packages/opie-pimconverter/opie-pimconverter_1.2.1.bb @@ -1,6 +1,6 @@ include ${PN}.inc - - + +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/pimconverter \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-pimconverter/opie-pimconverter_cvs.bb b/packages/opie-pimconverter/opie-pimconverter_cvs.bb index 902303ba45..4b35c87446 100644 --- a/packages/opie-pimconverter/opie-pimconverter_cvs.bb +++ b/packages/opie-pimconverter/opie-pimconverter_cvs.bb @@ -1,6 +1,7 @@ include ${PN}.inc - + PV = "1.2.1+cvs-${CVSDATE}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/pimconverter \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/plone/plone_1.0.5.bb b/packages/plone/plone_1.0.5.bb index f16dd830aa..20b28e348b 100644 --- a/packages/plone/plone_1.0.5.bb +++ b/packages/plone/plone_1.0.5.bb @@ -9,7 +9,7 @@ S = "${WORKDIR}/CMFPlone-${PV}" do_install() { install -d ${D}${libdir}/python/Products/ - cp -a ${S}/* ${D}${libdir}/python/Products/ + cp -pPR ${S}/* ${D}${libdir}/python/Products/ } FILES_${PN} = "${libdir}/python/Products/" diff --git a/packages/plone/plone_2.0.0.bb b/packages/plone/plone_2.0.0.bb index 2d615dbc08..152acdb2b6 100644 --- a/packages/plone/plone_2.0.0.bb +++ b/packages/plone/plone_2.0.0.bb @@ -9,7 +9,7 @@ S = "${WORKDIR}/CMFPlone-2.0-final" do_install() { install -d ${D}${libdir}/python/Products/ - cp -a ${S}/* ${D}${libdir}/python/Products/ + cp -pPR ${S}/* ${D}${libdir}/python/Products/ } FILES_${PN} = "${libdir}/python/Products/" diff --git a/packages/poqetpresenter/poqetpresenter_0.0.6.bb b/packages/poqetpresenter/poqetpresenter_0.0.6.bb index cbdc2dce5c..c4646b9075 100644 --- a/packages/poqetpresenter/poqetpresenter_0.0.6.bb +++ b/packages/poqetpresenter/poqetpresenter_0.0.6.bb @@ -22,5 +22,5 @@ do_install() { install -D -m 0755 poqetp/poqetp ${D}${palmtopdir}/bin/poqetp install -D -m 0644 poqetp.desktop ${D}${palmtopdir}/apps/Applications/poqetp.desktop install -d ${D}${palmtopdir}/pics/poqetp - cp -a pics/* ${D}${palmtopdir}/pics/poqetp/ + cp -pPR pics/* ${D}${palmtopdir}/pics/poqetp/ } diff --git a/packages/puzz-le/puzz-le_2.0.0.bb b/packages/puzz-le/puzz-le_2.0.0.bb index 839f6f0edd..80b2d54da0 100644 --- a/packages/puzz-le/puzz-le_2.0.0.bb +++ b/packages/puzz-le/puzz-le_2.0.0.bb @@ -13,5 +13,5 @@ inherit palmtop do_install() { install -m 0755 puzz-le Qtopia/puzz-le/${palmtopdir}/bin/puzz-le install -d ${D}/ - cp -a Qtopia/puzz-le/* ${D}/ + cp -pPR Qtopia/puzz-le/* ${D}/ } diff --git a/packages/python/python-numeric_23.7.bb b/packages/python/python-numeric_23.7.bb index 2fc0e8873c..e06934ece8 100644 --- a/packages/python/python-numeric_23.7.bb +++ b/packages/python/python-numeric_23.7.bb @@ -12,6 +12,6 @@ S = "${WORKDIR}/Numeric-${PV}" inherit distutils do_stage() { - cp -a Include/Numeric ${STAGING_INCDIR} + cp -pPR Include/Numeric ${STAGING_INCDIR} } diff --git a/packages/qpf-fonts/qpf-qte_2.3.10.bb b/packages/qpf-fonts/qpf-qte_2.3.10.bb index caead15fd3..f759831e3a 100644 --- a/packages/qpf-fonts/qpf-qte_2.3.10.bb +++ b/packages/qpf-fonts/qpf-qte_2.3.10.bb @@ -31,5 +31,5 @@ QPF_DESCRIPTION = "Qt/E font %s" do_install() { install -d ${D}${palmqtdir}/lib/fonts/ - cp -a lib/fonts/* ${D}${palmqtdir}/lib/fonts/ + cp -pPR lib/fonts/* ${D}${palmqtdir}/lib/fonts/ } diff --git a/packages/qt/qt-x11-free_3.3.5.bb b/packages/qt/qt-x11-free_3.3.5.bb index 2bb9453159..afa33f98af 100644 --- a/packages/qt/qt-x11-free_3.3.5.bb +++ b/packages/qt/qt-x11-free_3.3.5.bb @@ -75,7 +75,7 @@ do_install() { install -d ${D}${bindir}/ install -m 0755 bin/designer bin/assistant tools/qvfb/qvfb bin/qtconfig ${D}${bindir} install -d ${D}${prefix}/plugins/ - cp -a plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/ + cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/ } PACKAGES =+ "qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \ diff --git a/packages/qt/qt-x11-free_4.0.1.bb b/packages/qt/qt-x11-free_4.0.1.bb index f3b4dd3aa6..e08fc23ea0 100644 --- a/packages/qt/qt-x11-free_4.0.1.bb +++ b/packages/qt/qt-x11-free_4.0.1.bb @@ -70,7 +70,7 @@ do_stage() { oe_libinstall -so -C lib libQt$part ${STAGING_QT_DIR} done oe_libinstall -a -C lib libQtAssistantClient ${STAGING_QT_DIR} - cp -a include/* ${STAGING_INCDIR}/ + cp -pPR include/* ${STAGING_INCDIR}/ } do_install() { @@ -81,9 +81,9 @@ do_install() { oe_libinstall -so -C lib libQt$part ${D}${libdir} done oe_libinstall -a -C lib libQtAssistantClient ${STAGING_QT_DIR} - cp -a include/* ${D}${incdir} - cp -a plugins ${D}${libdir} - cp -a bin/* ${D}${bindir} + cp -pPR include/* ${D}${incdir} + cp -pPR plugins ${D}${libdir} + cp -pPR bin/* ${D}${bindir} install -d ${D}${bindir}/qt4-examples for binary in `find examples -perm 0755 -type f` diff --git a/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb b/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb index 188b78d835..db4568d48b 100644 --- a/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb +++ b/packages/qte-fonts-common/qte-fonts-common_3.3.5.bb @@ -17,7 +17,7 @@ do_install() { mkdir -p ${D}${sbindir} install -m 755 ${WORKDIR}/update-qtfontdir ${D}${sbindir} mkdir -p ${D}${palmtopdir}/lib/fonts - cp -a lib/fonts/* ${D}${palmtopdir}/lib/fonts + cp -pPR lib/fonts/* ${D}${palmtopdir}/lib/fonts # Delete all other font formats, Qt/E would have a dead slow # application start time if it had to use any other font format # as *.qpf ... diff --git a/packages/qte/qte-2.3.10/fix-native-build.patch b/packages/qte/qte-2.3.10/fix-native-build.patch new file mode 100644 index 0000000000..7670d44f27 --- /dev/null +++ b/packages/qte/qte-2.3.10/fix-native-build.patch @@ -0,0 +1,11 @@ +--- qt-2.3.10/src/kernel/qwindowsystem_qws.h.orig 2005-09-19 17:50:39.000000000 +0200 ++++ qt-2.3.10/src/kernel/qwindowsystem_qws.h 2005-09-19 17:50:45.000000000 +0200 +@@ -53,6 +53,8 @@ + class QWSRegionManager; + class QGfx; + class QWSServerData; ++class QWSInputMethod; ++class QWSGestureMethod; + + class QWSInternalWindowInfo + { diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index b94c030aa2..32a41d207a 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -7,7 +7,7 @@ DEPENDS = "zlib libpng jpeg tslib uicmoc-native" DEPENDS_mnci = "zlib libpng jpeg uicmoc-native" DEPENDS_append_c7x0 = " sharp-aticore-oss" PROVIDES = "virtual/qte virtual/libqte2" -PR = "r26" +PR = "r27" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;md5=1f7ad30113afc500cab7f5b2f4dec0d7 \ file://qpe.patch;patch=1 \ @@ -32,6 +32,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m file://improve-calibration-r0.patch;patch=1 \ file://key.patch;patch=1 \ file://bidimetrics.patch;patch=5 \ + file://fix-native-build.patch;patch=1 \ file://sharp_char.h \ file://switches.h " @@ -73,6 +74,7 @@ QTE_ARCH := "${@qte_arch(d)}" EXTRA_OECONF_CONFIG = "-qconfig qpe" EXTRA_OECONF_CONFIG_c7x0 = "-qconfig qpe -accel-w100" +EXTRA_OECONF_CONFIG_native = "-qconfig qpe -qvfb" EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif \ -xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32" EXTRA_OEMAKE = "-e" @@ -147,7 +149,7 @@ do_stage() { rm -f include/qxt.h install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include - cp -a lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/ + cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/ } do_install() { diff --git a/packages/qte/qte_4.0.0-snapshot.bb b/packages/qte/qte_4.0.0-snapshot.bb index 09ee610484..9b98f7f4b1 100644 --- a/packages/qte/qte_4.0.0-snapshot.bb +++ b/packages/qte/qte_4.0.0-snapshot.bb @@ -105,11 +105,11 @@ do_stage() { for lib in Core Gui Network Sql Xml do - cp -a lib/libQt${lib}* ${STAGING_DIR}/${HOST_SYS}/qt4/lib/ + cp -pPR lib/libQt${lib}* ${STAGING_DIR}/${HOST_SYS}/qt4/lib/ done install -d ${STAGING_DIR}/${HOST_SYS}/qt4/include/ - cp -a include/* ${STAGING_DIR}/${HOST_SYS}/qt4/include + cp -pPR include/* ${STAGING_DIR}/${HOST_SYS}/qt4/include } do_install() { @@ -117,7 +117,7 @@ do_install() { install -d ${D}${sbindir}/ install -m 0755 ${WORKDIR}/update-qtfontdir ${D}${sbindir}/ install -d ${D}${palmtopdir}/lib/fonts/ - cp -a lib/fonts/* ${D}${palmtopdir}/lib/fonts/ + cp -pPR lib/fonts/* ${D}${palmtopdir}/lib/fonts/ for lib in Core Gui Network Sql Xml do diff --git a/packages/qwt/qwt_4.2.0rc1.bb b/packages/qwt/qwt_4.2.0rc1.bb index 883bc5ae27..3b93c4c88c 100644 --- a/packages/qwt/qwt_4.2.0rc1.bb +++ b/packages/qwt/qwt_4.2.0rc1.bb @@ -15,13 +15,13 @@ EXTRA_QMAKEVARS_POST = "CONFIG-=thread" do_stage() { oe_libinstall -so -C lib libqwt ${STAGING_LIBDIR} - cp -a include/* ${STAGING_INCDIR} + cp -pPR include/* ${STAGING_INCDIR} } do_install() { install -d ${D}${libdir} \ ${D}${includedir} oe_libinstall -so -C lib libqwt ${D}${libdir} - cp -a include/* ${D}${includedir} + cp -pPR include/* ${D}${includedir} } diff --git a/packages/resolvconf/resolvconf_1.28.bb b/packages/resolvconf/resolvconf_1.28.bb index 5f340ff0cf..2aa2fccc8b 100644 --- a/packages/resolvconf/resolvconf_1.28.bb +++ b/packages/resolvconf/resolvconf_1.28.bb @@ -20,7 +20,7 @@ do_compile () { do_install () { install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${base_sbindir} ${D}${localstatedir}/run/resolvconf/interface install -d ${D}${mandir}/man8 ${D}${docdir}/${P} - cp -a etc/* ${D}${sysconfdir}/ + cp -pPR etc/* ${D}${sysconfdir}/ install -m 0755 bin/resolvconf ${D}${base_sbindir}/ install -m 0644 README ${D}${docdir}/${P}/ install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/ diff --git a/packages/rxvt-unicode/rxvt-unicode-5.6/.mtn2git_empty b/packages/rxvt-unicode/rxvt-unicode-5.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/rxvt-unicode/rxvt-unicode-5.6/.mtn2git_empty diff --git a/packages/rxvt-unicode/rxvt-unicode-5.6/xwc.patch b/packages/rxvt-unicode/rxvt-unicode-5.6/xwc.patch new file mode 100644 index 0000000000..eb87b84b25 --- /dev/null +++ b/packages/rxvt-unicode/rxvt-unicode-5.6/xwc.patch @@ -0,0 +1,24 @@ +diff -urNd ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C rxvt-unicode-5.3/src/screen.C +--- ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C 2005-02-22 21:39:10 +00:00 ++++ rxvt-unicode-5.3/src/screen.C 2005-04-05 22:12:45 +01:00 +@@ -3064,7 +3064,7 @@ + else + rxvt_warn ("can't get primary selection, ignoring.\n"); + +-#if 0 ++#ifdef HAVE_XWC + XTextProperty ct; + + if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) +@@ -3648,9 +3648,11 @@ + } + else + #endif ++#ifdef HAVE_XWC + if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) + freect = 1; + else ++#endif + { + /* if we failed to convert then send it raw */ + ct.value = (unsigned char *)cl; diff --git a/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/packages/rxvt-unicode/rxvt-unicode_5.6.bb new file mode 100644 index 0000000000..92915bf872 --- /dev/null +++ b/packages/rxvt-unicode/rxvt-unicode_5.6.bb @@ -0,0 +1,55 @@ +SECTION = "x11/utils" +DEPENDS = "x11 xt libxft" +DESCRIPTION = "rxvt-unicode is a clone of the well known \ +terminal emulator rxvt, modified to store text in Unicode \ +(either UCS-2 or UCS-4) and to use locale-correct input and \ +output. It also supports mixing multiple fonts at the \ +same time, including Xft fonts." +LICENSE = "GPL" +SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ + file://xwc.patch;patch=1 \ + file://signedchar.patch;patch=1" +PR = "r2" + +inherit autotools update-alternatives + +PROVIDES = "virtual/x-terminal-emulator" +ALTERNATIVE_NAME = "x-terminal-emulator" +ALTERNATIVE_PATH = "${bindir}/rxvt" + +CFLAGS_append = " -fpermissive" + +EXTRA_OECONF = "--enable-menubar --enable-xim \ + --enable-utmp --enable-wtmp --enable-lastlog \ + --disable-strings --with-term=rxvt --enable-keepscrolling \ + --enable-xft --with-name=rxvt --enable-frills \ + --enable-swapscreen --enable-transparency \ + --with-codesets=eu \ + --enable-cursor-blink --enable-pointer-blank \ + --enable-text-blink --enable-rxvt-scroll \ + --enable-combining --enable-shared \ + --enable-xgetdefault \ + --with-x=${STAGING_LIBDIR}/.." +EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \ + 'XLIB=-L${STAGING_LIBDIR} -lX11'" + +do_configure () { + mv autoconf/configure.in . || true + rm autoconf/libtool.m4 + libtoolize --force + autotools_do_configure + echo '#define RXVT_UTMP_FILE "${localstatedir}/run/utmp"' >> config.h + echo '#define RXVT_WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h + echo '#define RXVT_LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h + echo '#define HAVE_XLOCALE 1' >> config.h +} + +do_compile () { + if test -e ${S}/${HOST_SYS}-libtool; then + LIBTOOL=${S}/${HOST_SYS}-libtool + else + LIBTOOL=${S}/libtool + fi + # docs need "yodl" and I have no idea what that is + oe_runmake -C src "LIBTOOL=$LIBTOOL" +} diff --git a/packages/sidplayer/sidplayer_1.5.0.bb b/packages/sidplayer/sidplayer_1.5.0.bb index 1916176694..1ee1821539 100644 --- a/packages/sidplayer/sidplayer_1.5.0.bb +++ b/packages/sidplayer/sidplayer_1.5.0.bb @@ -21,5 +21,5 @@ do_install() { install -d ${D}${palmtopdir}/bin \ ${D}${palmtopdir}/apps/Applications \ ${D}${palmtopdir}/pics - cp -a ../apps ../bin ../pics ${D}${palmtopdir}/ + cp -pPR ../apps ../bin ../pics ${D}${palmtopdir}/ } diff --git a/packages/tetex/tetex-texmf_3.0.bb b/packages/tetex/tetex-texmf_3.0.bb index 76c0dece2a..7405713d22 100644 --- a/packages/tetex/tetex-texmf_3.0.bb +++ b/packages/tetex/tetex-texmf_3.0.bb @@ -14,7 +14,7 @@ do_install() { install -d ${D}${datadir}/texmf for i in ${STUFF} do - cp -a $i ${D}${datadir}/texmf + cp -pPR $i ${D}${datadir}/texmf done } diff --git a/packages/tximage/tximage_0.2.bb b/packages/tximage/tximage_0.2.bb index c2dc18069f..892ada0c6b 100644 --- a/packages/tximage/tximage_0.2.bb +++ b/packages/tximage/tximage_0.2.bb @@ -17,5 +17,5 @@ do_install() { ${D}${palmtopdir}/bin install -D -m 755 tximage ${D}${palmtopdir}/bin/tximage install -D -m 644 imageviewer.desktop ${D}${palmtopdir}/apps/Applications/tximage.desktop - cp -a tximage.png ${D}${palmtopdir}/pics/ + cp -pPR tximage.png ${D}${palmtopdir}/pics/ } diff --git a/packages/udev/udev-070/udev.rules b/packages/udev/udev-070/udev.rules index f81e250966..9e45ed64c3 100644 --- a/packages/udev/udev-070/udev.rules +++ b/packages/udev/udev-070/udev.rules @@ -91,3 +91,6 @@ KERNEL=="dm-[0-9]*", OPTIONS+="ignore_device" KERNEL=="device-mapper", NAME="mapper/control" KERNEL="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660" + +# Firmware Helper +ACTION=="add", SUBSYSTEM=="firmware", RUN+="/sbin/firmware_helper"
\ No newline at end of file diff --git a/packages/udev/udev_070.bb b/packages/udev/udev_070.bb index 3fd3c3f522..c42cdf5f5b 100644 --- a/packages/udev/udev_070.bb +++ b/packages/udev/udev_070.bb @@ -11,9 +11,9 @@ UDEV_DEVFS_RULES = "0" include udev.inc -PR = "r0" +PR = "r1" -UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/ extras/run_directory/" +UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" do_install_append() { install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/ diff --git a/packages/unixbench/unixbench_4.1.0.bb b/packages/unixbench/unixbench_4.1.0.bb index 4e9d8f4b96..a5cbfe8aa2 100644 --- a/packages/unixbench/unixbench_4.1.0.bb +++ b/packages/unixbench/unixbench_4.1.0.bb @@ -9,5 +9,5 @@ FILES_${PN} = "${prefix}/src/unixbench-${PV}" do_install () { install -d ${D}${prefix}/src - cp -a ${S} ${D}${prefix}/src/ + cp -pPR ${S} ${D}${prefix}/src/ } diff --git a/packages/vectoroids/vectoroids_1.1.0.bb b/packages/vectoroids/vectoroids_1.1.0.bb index 74ded45eea..a283b023ce 100644 --- a/packages/vectoroids/vectoroids_1.1.0.bb +++ b/packages/vectoroids/vectoroids_1.1.0.bb @@ -24,7 +24,7 @@ do_install() { ${D}${palmtopdir}/bin install -m 0755 vectoroids-${PV} ${D}${palmtopdir}/bin/vectoroids install -m 0644 data/images/icon.png ${D}${palmtopdir}/pics/vectoroids.png - cp -a data/* ${D}${palmtopdir}/share/vectoroids + cp -pPR data/* ${D}${palmtopdir}/share/vectoroids echo "[Desktop Entry]" >${D}${palmtopdir}/apps/Games/vectoroids.desktop echo "Comment=Asteroids game" >>${D}${palmtopdir}/apps/Games/vectoroids.desktop diff --git a/packages/xerces-c/xerces-c_2.6.0.bb b/packages/xerces-c/xerces-c_2.6.0.bb index b7207dd29e..4d87b77fad 100644 --- a/packages/xerces-c/xerces-c_2.6.0.bb +++ b/packages/xerces-c/xerces-c_2.6.0.bb @@ -27,7 +27,7 @@ do_stage () { oe_libinstall lib/libxerces-c ${STAGING_LIBDIR} oe_libinstall lib/libxerces-depdom ${STAGING_LIBDIR} - cp -a include/xercesc ${STAGING_INCDIR} + cp -pPR include/xercesc ${STAGING_INCDIR} } do_install () { diff --git a/packages/zauralign/zauralign_1.0.2.bb b/packages/zauralign/zauralign_1.0.2.bb index be05d7a521..41ef0e1f25 100644 --- a/packages/zauralign/zauralign_1.0.2.bb +++ b/packages/zauralign/zauralign_1.0.2.bb @@ -18,5 +18,5 @@ do_install() { install -m 0755 zauralign ${D}${palmtopdir}/bin/ install -m 0644 zauralign.png ${D}${palmtopdir}/pics/ install -m 0644 zauralign.desktop ${D}${palmtopdir}/apps/Games/ - cp -a pics/* ${D}${palmtopdir}/pics/zauralign/ + cp -pPR pics/* ${D}${palmtopdir}/pics/zauralign/ } diff --git a/packages/zipsc/zipsc_0.4.3.bb b/packages/zipsc/zipsc_0.4.3.bb index 228323364f..c253cfb468 100644 --- a/packages/zipsc/zipsc_0.4.3.bb +++ b/packages/zipsc/zipsc_0.4.3.bb @@ -15,5 +15,5 @@ inherit palmtop do_install() { install -m 0755 zipsc Qtopia${palmtopdir}/bin/zipsc install -d ${D}/ - cp -a Qtopia/* ${D}/ + cp -pPR Qtopia/* ${D}/ } diff --git a/packages/zmerlin/zmerlin_0.9.1.bb b/packages/zmerlin/zmerlin_0.9.1.bb index 6eab86dbd8..fc51b48ac9 100644 --- a/packages/zmerlin/zmerlin_0.9.1.bb +++ b/packages/zmerlin/zmerlin_0.9.1.bb @@ -13,6 +13,6 @@ inherit palmtop do_install() { install -m 0755 zmerlin ${S}/ipk${palmtopdir}/bin/zmerlin install -d ${D}${palmtopdir}/ - cp -a ipk/opt/* ${D}/opt + cp -pPR ipk/opt/* ${D}/opt } diff --git a/packages/ztappy/ztappy_0.9.1.bb b/packages/ztappy/ztappy_0.9.1.bb index b204cc1c03..5edeb676d3 100644 --- a/packages/ztappy/ztappy_0.9.1.bb +++ b/packages/ztappy/ztappy_0.9.1.bb @@ -13,6 +13,6 @@ inherit palmtop do_install() { install -m 0755 ${PN} ${S}/ipk${palmtopdir}/bin/${PN} install -d ${D}${palmtopdir}/ - cp -a ipk/opt/* ${D}/opt + cp -pPR ipk/opt/* ${D}/opt } |