From f93dd081ef5ce142b3f7b0d5487140879ff703fd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 17 Oct 2008 12:57:55 +0200 Subject: angstrom feed builder: remove minimo now we have fennec --- contrib/angstrom/build-feeds.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 967fe7ca82..722a5c9dc9 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -154,7 +154,6 @@ do meta-nas-server \ midori \ mileage \ - minimo \ mono \ mpfr \ mplayer \ -- cgit v1.2.3 From ada680d9ac7180986f600f223b6ec01c7796dff8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 17 Oct 2008 15:04:50 +0200 Subject: xorg-xserver: change hal to RRECOMMENDS --- packages/xorg-xserver/xorg-xserver-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 666946b71a..2c16eeacc9 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -13,7 +13,7 @@ resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \ libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa" -RDEPENDS_${PN} = "hal" +RECOMMENDS_${PN} = "hal" XORG_PN = "xorg-server" SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \ -- cgit v1.2.3 From 6a9f1c31286345d8be0b8264d4a7a389f93e3178 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 17 Oct 2008 15:06:47 +0200 Subject: checksums: add another 4.3.2 checksum * why does it include the URL in the checks? --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index e4c41a77f9..a4072a35bd 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -4166,6 +4166,10 @@ sha256=afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a md5=4afa0290cc3a41ac8822666f1110de98 sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5 +[ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2] +md5=5dfac5da961ecd5f227c3175859a486d +sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165 + [ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2] md5=5dfac5da961ecd5f227c3175859a486d sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165 -- cgit v1.2.3 From 16cb512d4dea28b429f9ee2400f6c37c49eea749 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 17 Oct 2008 16:04:18 +0200 Subject: angstrom: enable oabi compat for gta01 to keep gllin working, schwartz doesn't seem to work 100% --- conf/distro/include/angstrom.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index a66b1e4ac7..48cbb49d2c 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -57,6 +57,9 @@ require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc # We don't want to keep OABI compat ARM_KEEP_OABI = "0" +# Do keep OABI compat for om-gta01 to keep the gllin binary working +ARM_KEEP_OABI_pn-linux-openmoko_om-gta01 = "1" + #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable PREFERRED_PROVIDER_qemu-native = "qemu-native" -- cgit v1.2.3 From 6ec5c4c167832805032ffc2e17d76ee6fc1e027f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 17 Oct 2008 16:05:14 +0200 Subject: linux-openmoko: bump PR for OABI change --- packages/linux/linux-openmoko_2.6.24+git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/linux-openmoko_2.6.24+git.bb b/packages/linux/linux-openmoko_2.6.24+git.bb index 7c65d6c112..524b22a311 100644 --- a/packages/linux/linux-openmoko_2.6.24+git.bb +++ b/packages/linux/linux-openmoko_2.6.24+git.bb @@ -7,7 +7,7 @@ KERNEL_RELEASE = "2.6.24" KERNEL_VERSION = "${KERNEL_RELEASE}" PV = "${KERNEL_RELEASE}+${PR}+gitr${SRCREV}" -FILE_PR = "r9" +FILE_PR = "r10" SRC_URI = "\ git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \ -- cgit v1.2.3 From 3e8df80fdfb2da7672e1a771b70ccd30b119b968 Mon Sep 17 00:00:00 2001 From: woglinde Date: Fri, 17 Oct 2008 18:13:39 +0200 Subject: gettext: add patch open() mode from ubuntu * add use_open_properly.patch from ubuntu gettext_0.17-3ubuntu2.diff * bump PR on native and target --- packages/gettext/gettext-0.17/use_open_properly.patch | 15 +++++++++++++++ packages/gettext/gettext-native_0.17.bb | 2 +- packages/gettext/gettext_0.17.bb | 3 ++- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 packages/gettext/gettext-0.17/use_open_properly.patch diff --git a/packages/gettext/gettext-0.17/use_open_properly.patch b/packages/gettext/gettext-0.17/use_open_properly.patch new file mode 100644 index 0000000000..111714b543 --- /dev/null +++ b/packages/gettext/gettext-0.17/use_open_properly.patch @@ -0,0 +1,15 @@ +Index: gettext-0.17/gettext-tools/src/write-catalog.c +=================================================================== +--- gettext-0.17.orig/gettext-tools/src/write-catalog.c 2008-10-16 15:18:16.000000000 +0200 ++++ gettext-0.17/gettext-tools/src/write-catalog.c 2008-10-16 18:17:13.000000000 +0200 +@@ -220,7 +220,9 @@ + /* Open the output file. */ + if (!to_stdout) + { +- fd = open (filename, O_WRONLY | O_CREAT); ++ fd = open (filename, O_WRONLY | O_CREAT, ++ /* 0666 in portable POSIX notation: */ ++ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); + if (fd < 0) + { + const char *errno_description = strerror (errno); diff --git a/packages/gettext/gettext-native_0.17.bb b/packages/gettext/gettext-native_0.17.bb index 9f6cb861bd..c07302bc2b 100644 --- a/packages/gettext/gettext-native_0.17.bb +++ b/packages/gettext/gettext-native_0.17.bb @@ -1,5 +1,5 @@ require gettext_${PV}.bb -FILE_PR = "r2" +FILE_PR = "r3" DEPENDS = "" PROVIDES = "" diff --git a/packages/gettext/gettext_0.17.bb b/packages/gettext/gettext_0.17.bb index 13ac5b9373..fe48080085 100644 --- a/packages/gettext/gettext_0.17.bb +++ b/packages/gettext/gettext_0.17.bb @@ -2,13 +2,14 @@ DESCRIPTION = "The GNU internationalization library." HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" SECTION = "libs" LICENSE = "GPL" -FILE_PR = "r1" +FILE_PR = "r2" DEPENDS = "gettext-native virtual/libiconv ncurses expat" PROVIDES = "virtual/libintl" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://autotools.patch;patch=1 \ file://wchar-uclibc.patch;patch=1 \ + file://use_open_properly.patch;patch=1 \ " SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1" -- cgit v1.2.3 From 28e4d0d45db2e4d4abb97e5b04adca1f94eb1cde Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 17 Oct 2008 18:39:03 +0200 Subject: duke3d: fix DEPENDS --- packages/duke3d/duke3d_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/duke3d/duke3d_svn.bb b/packages/duke3d/duke3d_svn.bb index 11c33b1fad..36e46df513 100644 --- a/packages/duke3d/duke3d_svn.bb +++ b/packages/duke3d/duke3d_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Duke Nukem 3D game engine" LICENSE = "GPLv2" -DEPENDS = "libsdl libsdl-mixer" +DEPENDS = "virtual/libsdl libsdl-mixer" SRCREV = "185" PV = "0.0+svnr${SRCREV}" -- cgit v1.2.3 From ff3ecd7691c5eaca89fe1cea624e317840992e5a Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 12 May 2008 17:59:41 -0300 Subject: xfce-mcs-manager.inc: fix .pc file to not have tmpdir on includedir field The includedir field was left with full path and this made the package to fail in sanity checks. This patch changes it to point to /usr/include as all other package does. --- packages/xfce/xfce-mcs-manager.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/xfce/xfce-mcs-manager.inc b/packages/xfce/xfce-mcs-manager.inc index de12b14b05..8ad747b3bc 100644 --- a/packages/xfce/xfce-mcs-manager.inc +++ b/packages/xfce/xfce-mcs-manager.inc @@ -14,3 +14,7 @@ do_stage() { } +do_stage_append () { + install -d ${PKG_CONFIG_DIR} + sed -e 's:^includedir=.*:includedir="/usr/include":;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_DIR}/xfce-mcs-manager.pc +} -- cgit v1.2.3 From c8f54eb5d185c8d24da981370ca71507dcbd95e4 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:21:44 -0300 Subject: XFCE: allow to set a specific release to be used while grabbing the source This will be used to avoid duplicated code in many XFCE related recipes. Without that, all recipes that uses a different version then the global XFCE release need to specify the SRC_URI making harder to update and change the mirror to be used globaly. --- classes/xfce.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/xfce.bbclass b/classes/xfce.bbclass index c6ccc5fd2c..48e012e67e 100644 --- a/classes/xfce.bbclass +++ b/classes/xfce.bbclass @@ -8,7 +8,8 @@ HOMEPAGE = "http://www.xfce.org" LICENSE = "LGPL-2" DEPENDS += "startup-notification" -SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.bz2" +XFCE_VERSION = ${PV} +SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/${PN}-${PV}.tar.bz2" inherit autotools -- cgit v1.2.3 From 5c4c08ba74b0c157782a82337849ed3dd7e9659e Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:26:57 -0300 Subject: gtk-xfce-engine: specify the required XFCE release --- packages/xfce/gtk-xfce-engine_2.4.1.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/xfce/gtk-xfce-engine_2.4.1.bb b/packages/xfce/gtk-xfce-engine_2.4.1.bb index bcfecaf53b..655c0cbf1b 100644 --- a/packages/xfce/gtk-xfce-engine_2.4.1.bb +++ b/packages/xfce/gtk-xfce-engine_2.4.1.bb @@ -1,8 +1,7 @@ DESCRIPTION = "XFCE theme for GTK" inherit xfce - -SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/gtk-xfce-engine-${PV}.tar.bz2" +XFCE_VERSION = 4.4.1 FILES_${PN} += "${libdir}/gtk-2.0/*/engines/libxfce.so \ ${datadir}/themes/" -- cgit v1.2.3 From eaf2c4d0276bcb0d365470d8569630387ca066e9 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:28:48 -0300 Subject: mousepad: specify the required XFCE release --- packages/xfce/mousepad_0.2.12.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/xfce/mousepad_0.2.12.bb b/packages/xfce/mousepad_0.2.12.bb index 670a28dbd7..0d32ba4ade 100644 --- a/packages/xfce/mousepad_0.2.12.bb +++ b/packages/xfce/mousepad_0.2.12.bb @@ -2,5 +2,4 @@ DESCRIPTION = "Text editor for Xfce based on Leafpad" DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native" inherit xfce - -SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/mousepad-${PV}.tar.bz2" +XFCE_VERSION = 4.4.1 -- cgit v1.2.3 From 2907b817068cc7f7dd478954e408e01a88c8e095 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:38:32 -0300 Subject: exo: specify the required XFCE release --- packages/xfce/exo_0.3.2.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/xfce/exo_0.3.2.bb b/packages/xfce/exo_0.3.2.bb index b48eeba645..b72ff52a91 100644 --- a/packages/xfce/exo_0.3.2.bb +++ b/packages/xfce/exo_0.3.2.bb @@ -1,9 +1,7 @@ - DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native" inherit xfce - -SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/exo-0.3.2.tar.bz2" +XFCE_VERSION = 4.4.1 # Note: Python checking is broken -- cgit v1.2.3 From c11c3affd3b32cab7a19ee852824c98f085beb40 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:50:52 -0300 Subject: xfwm4-themes: use a single recipe since we don't have multiple versions packaged --- packages/xfce/xfwm4-themes.inc | 18 ------------------ packages/xfce/xfwm4-themes_4.4.1.bb | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 packages/xfce/xfwm4-themes.inc diff --git a/packages/xfce/xfwm4-themes.inc b/packages/xfce/xfwm4-themes.inc deleted file mode 100644 index 63c5ab0296..0000000000 --- a/packages/xfce/xfwm4-themes.inc +++ /dev/null @@ -1,18 +0,0 @@ -# xfwm4-themes OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION="XFCE4 Window Manager Themes" -SECTION = "x11/wm" - -inherit xfce - -# No ${PN} for this one -PACKAGES="" - -PACKAGES_DYNAMIC = "xfwm4-theme-*" - -python populate_packages_prepend () { - themedir = bb.data.expand('${datadir}/xfwm4/themes', d) - do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) -} diff --git a/packages/xfce/xfwm4-themes_4.4.1.bb b/packages/xfce/xfwm4-themes_4.4.1.bb index c7f45d2b09..63c5ab0296 100644 --- a/packages/xfce/xfwm4-themes_4.4.1.bb +++ b/packages/xfce/xfwm4-themes_4.4.1.bb @@ -2,4 +2,17 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see COPYING.MIT) -require ${PN}.inc +DESCRIPTION="XFCE4 Window Manager Themes" +SECTION = "x11/wm" + +inherit xfce + +# No ${PN} for this one +PACKAGES="" + +PACKAGES_DYNAMIC = "xfwm4-theme-*" + +python populate_packages_prepend () { + themedir = bb.data.expand('${datadir}/xfwm4/themes', d) + do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) +} -- cgit v1.2.3 From b5ab8f17452e40dd66ea6315290af0387d2f4573 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:50:52 -0300 Subject: xfwm4: use a single recipe since we don't have multiple versions packaged --- packages/xfce/xfwm4.inc | 27 --------------------------- packages/xfce/xfwm4_4.4.1.bb | 25 +++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 29 deletions(-) delete mode 100644 packages/xfce/xfwm4.inc diff --git a/packages/xfce/xfwm4.inc b/packages/xfce/xfwm4.inc deleted file mode 100644 index 211853aa18..0000000000 --- a/packages/xfce/xfwm4.inc +++ /dev/null @@ -1,27 +0,0 @@ -# xfwm4 OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION="XFCE4 Window Manager" -SECTION = "x11/wm" -inherit xfce - -FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*" - -DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager" -RDEPENDS = "xfwm4-theme-default" - - -EXTRA_OECONF += " --enable-startup-notification" - -PACKAGES_DYNAMIC = "xfwm4-theme-*" - -python populate_packages_prepend () { - themedir = bb.data.expand('${datadir}/themes', d) - do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) -} - -PACKAGES += " ${PN}-mcs-plugins" - -FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so" - diff --git a/packages/xfce/xfwm4_4.4.1.bb b/packages/xfce/xfwm4_4.4.1.bb index 1d8a176d8a..211853aa18 100644 --- a/packages/xfce/xfwm4_4.4.1.bb +++ b/packages/xfce/xfwm4_4.4.1.bb @@ -2,5 +2,26 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see COPYING.MIT) -FILE_PR ="r1" -require ${PN}.inc +DESCRIPTION="XFCE4 Window Manager" +SECTION = "x11/wm" +inherit xfce + +FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*" + +DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager" +RDEPENDS = "xfwm4-theme-default" + + +EXTRA_OECONF += " --enable-startup-notification" + +PACKAGES_DYNAMIC = "xfwm4-theme-*" + +python populate_packages_prepend () { + themedir = bb.data.expand('${datadir}/themes', d) + do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) +} + +PACKAGES += " ${PN}-mcs-plugins" + +FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so" + -- cgit v1.2.3 From 4f74fc1bb1ef0ce2e6778aae4c673f842d5fb4c8 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:50:51 -0300 Subject: xfdesktop: use a single recipe since we don't have multiple versions packaged --- packages/xfce/xfdesktop.inc | 17 ----------------- packages/xfce/xfdesktop_4.4.1.bb | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 19 deletions(-) delete mode 100644 packages/xfce/xfdesktop.inc diff --git a/packages/xfce/xfdesktop.inc b/packages/xfce/xfdesktop.inc deleted file mode 100644 index 35c5ff5954..0000000000 --- a/packages/xfce/xfdesktop.inc +++ /dev/null @@ -1,17 +0,0 @@ -# xfdesktop OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION="xfce4 Desktop Background Manager" -SECTION = "x11/base" -DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel" - -inherit xfce -PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins" - -FILES_xfdesktop-backdrops="${datadir}/xfce4/backdrops/*" -FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so" -FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so \ - ${libdir}/xfce4/panel-plugins/xfce4-menu-plugin \ - ${datadir}/xfce4/panel-plugins/*.desktop" -FILES_${PN}-dbg += "/usr/libexec/xfce4/panel-plugins/.debug" diff --git a/packages/xfce/xfdesktop_4.4.1.bb b/packages/xfce/xfdesktop_4.4.1.bb index bc35acad2a..35c5ff5954 100644 --- a/packages/xfce/xfdesktop_4.4.1.bb +++ b/packages/xfce/xfdesktop_4.4.1.bb @@ -2,5 +2,16 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see COPYING.MIT) -FILE_PR = "r2" -require ${PN}.inc +DESCRIPTION="xfce4 Desktop Background Manager" +SECTION = "x11/base" +DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel" + +inherit xfce +PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins" + +FILES_xfdesktop-backdrops="${datadir}/xfce4/backdrops/*" +FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so" +FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so \ + ${libdir}/xfce4/panel-plugins/xfce4-menu-plugin \ + ${datadir}/xfce4/panel-plugins/*.desktop" +FILES_${PN}-dbg += "/usr/libexec/xfce4/panel-plugins/.debug" -- cgit v1.2.3 From ec13acb5e718128bded039f6c70ac5d8950630ab Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:50:51 -0300 Subject: xfce-utils: use a single recipe since we don't have multiple versions packaged --- packages/xfce/xfce-utils.inc | 29 ----------------------------- packages/xfce/xfce-utils_4.4.1.bb | 27 +++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 31 deletions(-) delete mode 100644 packages/xfce/xfce-utils.inc diff --git a/packages/xfce/xfce-utils.inc b/packages/xfce/xfce-utils.inc deleted file mode 100644 index d681fd7adb..0000000000 --- a/packages/xfce/xfce-utils.inc +++ /dev/null @@ -1,29 +0,0 @@ -# xfce-utils OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION="XFCE4 Utilities" -DEPENDS = "virtual/libx11 libxfcegui4 xfce-mcs-manager" -inherit xfce - -FILES_${PN} += " \ - ${bindir}/* \ - ${datadir}/dbus-1/* \ - ${datadir}/xfce4/AUTHORS \ - ${datadir}/xfce4/BSD \ - ${datadir}/xfce4/COPYING \ - ${datadir}/xfce4/GPL \ - ${datadir}/xfce4/INFO \ - ${datadir}/xfce4/LGPL \ - ${datadir}/xfce4/AUTHORS.html \ - ${datadir}/xfce4/BSD.html \ - ${datadir}/xfce4/COPYING.html \ - ${datadir}/xfce4/GPL.html \ - ${datadir}/xfce4/INFO.html \ - ${datadir}/xfce4/LGPL.html" - -PACKAGES =+ "${PN}-mcs-plugins" -FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/" - -# NOTE: This package takes a --with-browser for the default browser -# NOTE: Works with gdm also gtkhtml diff --git a/packages/xfce/xfce-utils_4.4.1.bb b/packages/xfce/xfce-utils_4.4.1.bb index c48026b190..d681fd7adb 100644 --- a/packages/xfce/xfce-utils_4.4.1.bb +++ b/packages/xfce/xfce-utils_4.4.1.bb @@ -2,5 +2,28 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see COPYING.MIT) -FILE_PR = "r1" -require ${PN}.inc +DESCRIPTION="XFCE4 Utilities" +DEPENDS = "virtual/libx11 libxfcegui4 xfce-mcs-manager" +inherit xfce + +FILES_${PN} += " \ + ${bindir}/* \ + ${datadir}/dbus-1/* \ + ${datadir}/xfce4/AUTHORS \ + ${datadir}/xfce4/BSD \ + ${datadir}/xfce4/COPYING \ + ${datadir}/xfce4/GPL \ + ${datadir}/xfce4/INFO \ + ${datadir}/xfce4/LGPL \ + ${datadir}/xfce4/AUTHORS.html \ + ${datadir}/xfce4/BSD.html \ + ${datadir}/xfce4/COPYING.html \ + ${datadir}/xfce4/GPL.html \ + ${datadir}/xfce4/INFO.html \ + ${datadir}/xfce4/LGPL.html" + +PACKAGES =+ "${PN}-mcs-plugins" +FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/" + +# NOTE: This package takes a --with-browser for the default browser +# NOTE: Works with gdm also gtkhtml -- cgit v1.2.3 From 89955003513b97a0cdbd00ccdc1f26502ae1b54c Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:50:51 -0300 Subject: xfce-mcs-plugins: use a single recipe since we don't have multiple versions packaged --- packages/xfce/xfce-mcs-plugins.inc | 12 ------------ packages/xfce/xfce-mcs-plugins_4.4.1.bb | 9 ++++++++- 2 files changed, 8 insertions(+), 13 deletions(-) delete mode 100644 packages/xfce/xfce-mcs-plugins.inc diff --git a/packages/xfce/xfce-mcs-plugins.inc b/packages/xfce/xfce-mcs-plugins.inc deleted file mode 100644 index 80037841fa..0000000000 --- a/packages/xfce/xfce-mcs-plugins.inc +++ /dev/null @@ -1,12 +0,0 @@ -# xfce-mcs-plugins OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION = "Common XFCE4 configuration plugins." -DEPENDS = "libxfcegui4 xfce-mcs-manager gtk+" -SECTION = "x11" - -inherit xfce - -PACKAGES += "${PN}-mcs-plugins" -FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/*.so" diff --git a/packages/xfce/xfce-mcs-plugins_4.4.1.bb b/packages/xfce/xfce-mcs-plugins_4.4.1.bb index bd41458757..80037841fa 100644 --- a/packages/xfce/xfce-mcs-plugins_4.4.1.bb +++ b/packages/xfce/xfce-mcs-plugins_4.4.1.bb @@ -2,4 +2,11 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see COPYING.MIT) -require ${PN}.inc +DESCRIPTION = "Common XFCE4 configuration plugins." +DEPENDS = "libxfcegui4 xfce-mcs-manager gtk+" +SECTION = "x11" + +inherit xfce + +PACKAGES += "${PN}-mcs-plugins" +FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/*.so" -- cgit v1.2.3 From f61b447ce825235a3c0bd83f8321fb6646834d5b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:50:50 -0300 Subject: xfce-mcs-manager: use a single recipe since we don't have multiple versions packaged --- packages/xfce/xfce-mcs-manager_4.4.1.bb | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/packages/xfce/xfce-mcs-manager_4.4.1.bb b/packages/xfce/xfce-mcs-manager_4.4.1.bb index 76e0452ad8..0b9fc43f70 100644 --- a/packages/xfce/xfce-mcs-manager_4.4.1.bb +++ b/packages/xfce/xfce-mcs-manager_4.4.1.bb @@ -2,4 +2,24 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see COPYING.MIT) -require ${PN}.inc +DESCRIPTION="XFCE4 Settings manager." +DEPENDS="libxfcegui4 libxfce4mcs intltool-native" +SECTION = "x11" +PR = "r1" + +inherit xfce + +do_stage() { + install -d ${STAGING_INCDIR}/xfce4 + install -d ${STAGING_INCDIR}/xfce4/xfce-mcs-manager + install -m 644 xfce-mcs-manager/manager-plugin.h ${STAGING_INCDIR}/xfce4/xfce-mcs-manager +} + +# xfce-mcs-manager.pc uses ${libdir} to indicate where the mcs plugins live +# the standard pkgconfig mangling was confusing us. Mangling is not required +# for this particular .pc, so the following will suffice: + +do_stage_append () { + install -d ${PKG_CONFIG_DIR} + sed -e 's:^includedir=.*:includedir="/usr/include":;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_DIR}/xfce-mcs-manager.pc +} -- cgit v1.2.3 From c23266091f149ab3cd38f84d9dff998d985a4b3a Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:50:50 -0300 Subject: xfce4-panel: use a single recipe since we don't have multiple versions packaged --- packages/xfce/xfce4-panel.inc | 26 -------------------------- packages/xfce/xfce4-panel_4.4.1.bb | 24 ++++++++++++++++++++++-- 2 files changed, 22 insertions(+), 28 deletions(-) delete mode 100644 packages/xfce/xfce4-panel.inc diff --git a/packages/xfce/xfce4-panel.inc b/packages/xfce/xfce4-panel.inc deleted file mode 100644 index be7092ab9e..0000000000 --- a/packages/xfce/xfce4-panel.inc +++ /dev/null @@ -1,26 +0,0 @@ -# xfce4-panel OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION = "XFCE4 Panel" -SECTION = "x11" -DEPENDS = "startup-notification virtual/libx11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" - -inherit xfce - -EXTRA_OECONF += " --enable-startup-notification" - - -do_stage() { -autotools_stage_all -} - -do_install() { - oe_runmake DESTDIR=${D} install -} - -PACKAGES += "${PN}-plugins ${PN}-mcs-plugins" -FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so* \ - ${datadir}/xfce4/panel-plugins/*.desktop" -FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/" -FILES_${PN}-dbg += "${libdir}/xfce4/mcs-plugins/.debug" diff --git a/packages/xfce/xfce4-panel_4.4.1.bb b/packages/xfce/xfce4-panel_4.4.1.bb index d855f35f49..dadc413cae 100644 --- a/packages/xfce/xfce4-panel_4.4.1.bb +++ b/packages/xfce/xfce4-panel_4.4.1.bb @@ -2,5 +2,25 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see COPYING.MIT) -FILE_PR ="r2" -require ${PN}.inc +DESCRIPTION = "XFCE4 Panel" +SECTION = "x11" +DEPENDS = "startup-notification virtual/libx11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" + +inherit pkgconfig xfce + +EXTRA_OECONF += " --enable-startup-notification" + + +do_stage() { +autotools_stage_all +} + +do_install() { + oe_runmake DESTDIR=${D} install +} + +PACKAGES += "${PN}-plugins ${PN}-mcs-plugins" +FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so* \ + ${datadir}/xfce4/panel-plugins/*.desktop" +FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/" +FILES_${PN}-dbg += "${libdir}/xfce4/mcs-plugins/.debug" -- cgit v1.2.3 From 70463fe4fb9efa432adf719d57eba2b5ef997ac2 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:50:50 -0300 Subject: xfce4-mixer: use a single recipe since we don't have multiple versions packaged --- packages/xfce/xfce4-mixer.inc | 9 --------- packages/xfce/xfce4-mixer_4.4.1.bb | 6 +++++- 2 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 packages/xfce/xfce4-mixer.inc diff --git a/packages/xfce/xfce4-mixer.inc b/packages/xfce/xfce4-mixer.inc deleted file mode 100644 index 4d3faed14c..0000000000 --- a/packages/xfce/xfce4-mixer.inc +++ /dev/null @@ -1,9 +0,0 @@ -# xfce-mixer-plugin OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION="XFCE panel mixer plugin" -SECTION = "x11" - -DEPENDS="xfce4-panel" -inherit xfce diff --git a/packages/xfce/xfce4-mixer_4.4.1.bb b/packages/xfce/xfce4-mixer_4.4.1.bb index 13ba0f32e3..4d3faed14c 100644 --- a/packages/xfce/xfce4-mixer_4.4.1.bb +++ b/packages/xfce/xfce4-mixer_4.4.1.bb @@ -2,4 +2,8 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see COPYING.MIT) -require ${PN}.inc +DESCRIPTION="XFCE panel mixer plugin" +SECTION = "x11" + +DEPENDS="xfce4-panel" +inherit xfce -- cgit v1.2.3 From 8b559e8d48c4ff47ed5df7d387646c21a021ba37 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:50:49 -0300 Subject: xfce4-appfinder: use a single recipe since we don't have multiple versions packaged --- packages/xfce/xfce4-appfinder.inc | 8 -------- packages/xfce/xfce4-appfinder_4.4.1.bb | 5 ++++- 2 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 packages/xfce/xfce4-appfinder.inc diff --git a/packages/xfce/xfce4-appfinder.inc b/packages/xfce/xfce4-appfinder.inc deleted file mode 100644 index ddfa3e1e4e..0000000000 --- a/packages/xfce/xfce4-appfinder.inc +++ /dev/null @@ -1,8 +0,0 @@ -# xfce4-appfinder build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION="XFCE Application Finder" -SECTION = "x11" -inherit xfce -DEPENDS="libxfcegui4" diff --git a/packages/xfce/xfce4-appfinder_4.4.1.bb b/packages/xfce/xfce4-appfinder_4.4.1.bb index 471122ea02..ddfa3e1e4e 100644 --- a/packages/xfce/xfce4-appfinder_4.4.1.bb +++ b/packages/xfce/xfce4-appfinder_4.4.1.bb @@ -2,4 +2,7 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see COPYING.MIT) -require ${PN}.inc +DESCRIPTION="XFCE Application Finder" +SECTION = "x11" +inherit xfce +DEPENDS="libxfcegui4" -- cgit v1.2.3 From ebd50a0d84db286cfae154f206f07d47a48f319e Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:50:49 -0300 Subject: libxfcegui4: use a single recipe since we don't have multiple versions packaged --- packages/xfce/libxfcegui4.inc | 16 ---------------- packages/xfce/libxfcegui4_4.4.1.bb | 12 +++++++++++- 2 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 packages/xfce/libxfcegui4.inc diff --git a/packages/xfce/libxfcegui4.inc b/packages/xfce/libxfcegui4.inc deleted file mode 100644 index 1b7703abf9..0000000000 --- a/packages/xfce/libxfcegui4.inc +++ /dev/null @@ -1,16 +0,0 @@ -# libxfcegui4 OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION = "XFCE Widget library and X Window System interaction" -DEPENDS = "libxfce4util dbh libxml2 gtk+" -SECTION = "x11/libs" - -inherit xfce - - -do_stage() { -autotools_stage_all -} - -FILES_${PN} += "${libdir}/xfce4/modules ${datadir}/xfce4/mime ${datadir}/icons/hicolor" diff --git a/packages/xfce/libxfcegui4_4.4.1.bb b/packages/xfce/libxfcegui4_4.4.1.bb index a36897f822..d38269d6f8 100644 --- a/packages/xfce/libxfcegui4_4.4.1.bb +++ b/packages/xfce/libxfcegui4_4.4.1.bb @@ -2,4 +2,14 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see COPYING.MIT) -require ${PN}.inc +DESCRIPTION = "XFCE Widget library and X Window System interaction" +DEPENDS = "libxfce4util dbh libxml2 gtk+" +SECTION = "x11/libs" + +inherit xfce + +do_stage() { +autotools_stage_all +} + +FILES_${PN} += "${libdir}/xfce4/modules ${datadir}/xfce4/mime ${datadir}/icons/hicolor" -- cgit v1.2.3 From 169bdf1e270ef880e04612d277887789665901d6 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:50:49 -0300 Subject: libxfce4util: use a single recipe since we don't have multiple versions packaged --- packages/xfce/libxfce4util.inc | 26 -------------------------- packages/xfce/libxfce4util_4.4.1.bb | 23 ++++++++++++++++++++++- 2 files changed, 22 insertions(+), 27 deletions(-) delete mode 100644 packages/xfce/libxfce4util.inc diff --git a/packages/xfce/libxfce4util.inc b/packages/xfce/libxfce4util.inc deleted file mode 100644 index ee7b886f20..0000000000 --- a/packages/xfce/libxfce4util.inc +++ /dev/null @@ -1,26 +0,0 @@ -# libxfce4util OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION = "Basic utility library for Xfce4" -SECTION = "x11/libs" -LICENSE = "GPL" -DEPENDS = "glib-2.0 xfce4-dev-tools" - -inherit xfce - -MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" - -do_stage() { - install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util - # The line below expands to the list of headers that native makefile - # would install. Complain and/or fix if it's not portable enough - for file in $(eval $(make -n -C libxfce4util install|grep "^list='[^.]\\+.h"|cut -d\; -f1); echo $list); do - install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util - done - - oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR} - -} - -FILES_${PN}-dev += " ${datadir}/xfce4/m4" diff --git a/packages/xfce/libxfce4util_4.4.1.bb b/packages/xfce/libxfce4util_4.4.1.bb index a53a83e861..3c33b2f929 100644 --- a/packages/xfce/libxfce4util_4.4.1.bb +++ b/packages/xfce/libxfce4util_4.4.1.bb @@ -2,4 +2,25 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see COPYING.MIT) -require ${PN}.inc +DESCRIPTION = "Basic utility library for Xfce4" +SECTION = "x11/libs" +LICENSE = "GPL" +DEPENDS = "glib-2.0 xfce4-dev-tools" + +inherit xfce + +MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" + +do_stage() { + install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util + # The line below expands to the list of headers that native makefile + # would install. Complain and/or fix if it's not portable enough + for file in $(eval $(make -n -C libxfce4util install|grep "^list='[^.]\\+.h"|cut -d\; -f1); echo $list); do + install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util + done + + oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR} + +} + +FILES_${PN}-dev += " ${datadir}/xfce4/m4" -- cgit v1.2.3 From 31c4bfb15242a81a4c290cb419ee56e0cf13cd27 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:50:48 -0300 Subject: libxfce4mcs: use a single recipe since we don't have multiple versions packaged --- packages/xfce/libxfce4mcs.inc | 19 ------------------- packages/xfce/libxfce4mcs_4.4.1.bb | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 20 deletions(-) delete mode 100644 packages/xfce/libxfce4mcs.inc diff --git a/packages/xfce/libxfce4mcs.inc b/packages/xfce/libxfce4mcs.inc deleted file mode 100644 index 6ecbc8db58..0000000000 --- a/packages/xfce/libxfce4mcs.inc +++ /dev/null @@ -1,19 +0,0 @@ -# libxfce4mcs OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION="Settings management library used by most XFce 4 modules" -DEPENDS="libxfce4util" -SECTION = "x11/libs" - -inherit xfce - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs - - install -m 644 libxfce4mcs/mcs-common.h ${STAGING_INCDIR}/xfce4/libxfce4mcs - install -m 644 libxfce4mcs/mcs-client.h ${STAGING_INCDIR}/xfce4/libxfce4mcs - install -m 644 libxfce4mcs/mcs-manager.h ${STAGING_INCDIR}/xfce4/libxfce4mcs - oe_libinstall -C libxfce4mcs -so libxfce4mcs-manager ${STAGING_LIBDIR} - oe_libinstall -C libxfce4mcs -so libxfce4mcs-client ${STAGING_LIBDIR} -} diff --git a/packages/xfce/libxfce4mcs_4.4.1.bb b/packages/xfce/libxfce4mcs_4.4.1.bb index 8e2d522962..53f2e14fef 100644 --- a/packages/xfce/libxfce4mcs_4.4.1.bb +++ b/packages/xfce/libxfce4mcs_4.4.1.bb @@ -2,4 +2,18 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see COPYING.MIT) -require ${PN}.inc +DESCRIPTION="Settings management library used by most XFce 4 modules" +DEPENDS="libxfce4util" +SECTION = "x11/libs" + +inherit xfce + +do_stage() { + install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs + + install -m 644 libxfce4mcs/mcs-common.h ${STAGING_INCDIR}/xfce4/libxfce4mcs + install -m 644 libxfce4mcs/mcs-client.h ${STAGING_INCDIR}/xfce4/libxfce4mcs + install -m 644 libxfce4mcs/mcs-manager.h ${STAGING_INCDIR}/xfce4/libxfce4mcs + oe_libinstall -C libxfce4mcs -so libxfce4mcs-manager ${STAGING_LIBDIR} + oe_libinstall -C libxfce4mcs -so libxfce4mcs-client ${STAGING_LIBDIR} +} -- cgit v1.2.3 From 53d17d307b8bac06e0b7c027d08f0ead93a7e942 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:36:27 -0300 Subject: xfce4-dev-tools: use a single recipe since we don't have multiple versions packaged --- packages/xfce/xfce4-dev-tools.inc | 12 ------------ packages/xfce/xfce4-dev-tools_4.4.0.bb | 14 +++++++++++++- 2 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 packages/xfce/xfce4-dev-tools.inc diff --git a/packages/xfce/xfce4-dev-tools.inc b/packages/xfce/xfce4-dev-tools.inc deleted file mode 100644 index 2116b1d414..0000000000 --- a/packages/xfce/xfce4-dev-tools.inc +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Xfce4 development tools" -SECTION = "x11/libs" -LICENSE = "GPL" - -inherit xfce - -do_stage() { - install -d ${STAGING_DATADIR}/aclocal - install -m 644 m4macros/*.m4 ${STAGING_DATADIR}/aclocal/ -} - -FILES_${PN}-dev += " ${datadir}/xfce4/dev-tools/m4macros/*.m4" diff --git a/packages/xfce/xfce4-dev-tools_4.4.0.bb b/packages/xfce/xfce4-dev-tools_4.4.0.bb index bd54419686..bac29a7c0b 100644 --- a/packages/xfce/xfce4-dev-tools_4.4.0.bb +++ b/packages/xfce/xfce4-dev-tools_4.4.0.bb @@ -1 +1,13 @@ -require ${PN}.inc +DESCRIPTION = "Xfce4 development tools" +SECTION = "x11/libs" +LICENSE = "GPL" + +inherit xfce +XFCE_VERSION = 4.4.1 + +do_stage() { + install -d ${STAGING_DATADIR}/aclocal + install -m 644 m4macros/*.m4 ${STAGING_DATADIR}/aclocal/ +} + +FILES_${PN}-dev += " ${datadir}/xfce4/dev-tools/m4macros/*.m4" -- cgit v1.2.3 From 9f5ffb5475e3d6468e53fce0928b640ca9c14e00 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 27 Sep 2008 14:15:05 -0300 Subject: libxfce4util: readd pkgconfig class to fix stagging --- packages/xfce/libxfce4util_4.4.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xfce/libxfce4util_4.4.1.bb b/packages/xfce/libxfce4util_4.4.1.bb index 3c33b2f929..3386ad57e3 100644 --- a/packages/xfce/libxfce4util_4.4.1.bb +++ b/packages/xfce/libxfce4util_4.4.1.bb @@ -7,7 +7,7 @@ SECTION = "x11/libs" LICENSE = "GPL" DEPENDS = "glib-2.0 xfce4-dev-tools" -inherit xfce +inherit xfce pkgconfig MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" -- cgit v1.2.3 From e56c30f5625932b57bc2d358f74a4ee793594c4f Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 27 Sep 2008 14:14:47 -0300 Subject: libxfce4mcs: readd pkgconfig class to fix stagging --- packages/xfce/libxfce4mcs_4.4.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xfce/libxfce4mcs_4.4.1.bb b/packages/xfce/libxfce4mcs_4.4.1.bb index 53f2e14fef..20448240e2 100644 --- a/packages/xfce/libxfce4mcs_4.4.1.bb +++ b/packages/xfce/libxfce4mcs_4.4.1.bb @@ -6,7 +6,7 @@ DESCRIPTION="Settings management library used by most XFce 4 modules" DEPENDS="libxfce4util" SECTION = "x11/libs" -inherit xfce +inherit xfce pkgconfig do_stage() { install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs -- cgit v1.2.3 From d7d4b1c80ffeed941356ff81db70182bd79c1356 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 29 Aug 2008 10:59:27 -0300 Subject: xfwm4: add alternative to x-window-manager --- packages/xfce/xfwm4_4.4.1.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/xfce/xfwm4_4.4.1.bb b/packages/xfce/xfwm4_4.4.1.bb index 211853aa18..12f216fbd6 100644 --- a/packages/xfce/xfwm4_4.4.1.bb +++ b/packages/xfce/xfwm4_4.4.1.bb @@ -4,7 +4,7 @@ DESCRIPTION="XFCE4 Window Manager" SECTION = "x11/wm" -inherit xfce +inherit xfce update-alternatives FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*" @@ -25,3 +25,7 @@ PACKAGES += " ${PN}-mcs-plugins" FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so" +ALTERNATIVE_PATH = "${bindir}/xfce4-session" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "10" -- cgit v1.2.3 From 22085ff8aa4e0190637e07e005f365561d5aa5e8 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 29 Aug 2008 10:58:39 -0300 Subject: xfwm4: append dynamic packages --- packages/xfce/xfwm4_4.4.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xfce/xfwm4_4.4.1.bb b/packages/xfce/xfwm4_4.4.1.bb index 12f216fbd6..8d1a1835cf 100644 --- a/packages/xfce/xfwm4_4.4.1.bb +++ b/packages/xfce/xfwm4_4.4.1.bb @@ -14,7 +14,7 @@ RDEPENDS = "xfwm4-theme-default" EXTRA_OECONF += " --enable-startup-notification" -PACKAGES_DYNAMIC = "xfwm4-theme-*" +PACKAGES_DYNAMIC += "xfwm4-theme-*" python populate_packages_prepend () { themedir = bb.data.expand('${datadir}/themes', d) -- cgit v1.2.3 From 90a583487d7783c30baaee0b60f228094df03086 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 20:48:18 -0300 Subject: xfce-terminal: update to 0.2.8 --- packages/xfce/xfce-terminal_0.2.6.bb | 8 -------- packages/xfce/xfce-terminal_0.2.8.bb | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 packages/xfce/xfce-terminal_0.2.6.bb create mode 100644 packages/xfce/xfce-terminal_0.2.8.bb diff --git a/packages/xfce/xfce-terminal_0.2.6.bb b/packages/xfce/xfce-terminal_0.2.6.bb deleted file mode 100644 index 07a8eb6eb5..0000000000 --- a/packages/xfce/xfce-terminal_0.2.6.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "Terminal emulator for the Xfce desktop environment" -DEPENDS = "exo vte dbus-glib gtk+" - -inherit xfce - -SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/Terminal-${PV}.tar.bz2" - -S = "${WORKDIR}/Terminal-${PV}" diff --git a/packages/xfce/xfce-terminal_0.2.8.bb b/packages/xfce/xfce-terminal_0.2.8.bb new file mode 100644 index 0000000000..9a36c69237 --- /dev/null +++ b/packages/xfce/xfce-terminal_0.2.8.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "Terminal emulator for the Xfce desktop environment" +DEPENDS = "exo vte dbus-glib gtk+" + +inherit xfce + +SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.2/src/Terminal-${PV}.tar.bz2" + +S = "${WORKDIR}/Terminal-${PV}" -- cgit v1.2.3 From 63fe642a20b0b4af871444c9df5f24f423aa4c34 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 20:47:25 -0300 Subject: xfce4-dev-tools: update to 4.4.0.1 --- packages/xfce/xfce4-dev-tools_4.4.0.1.bb | 13 +++++++++++++ packages/xfce/xfce4-dev-tools_4.4.0.bb | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 packages/xfce/xfce4-dev-tools_4.4.0.1.bb delete mode 100644 packages/xfce/xfce4-dev-tools_4.4.0.bb diff --git a/packages/xfce/xfce4-dev-tools_4.4.0.1.bb b/packages/xfce/xfce4-dev-tools_4.4.0.1.bb new file mode 100644 index 0000000000..67c2d341de --- /dev/null +++ b/packages/xfce/xfce4-dev-tools_4.4.0.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Xfce4 development tools" +SECTION = "x11/libs" +LICENSE = "GPL" + +inherit xfce +XFCE_VERSION = 4.4.2 + +do_stage() { + install -d ${STAGING_DATADIR}/aclocal + install -m 644 m4macros/*.m4 ${STAGING_DATADIR}/aclocal/ +} + +FILES_${PN}-dev += " ${datadir}/xfce4/dev-tools/m4macros/*.m4" diff --git a/packages/xfce/xfce4-dev-tools_4.4.0.bb b/packages/xfce/xfce4-dev-tools_4.4.0.bb deleted file mode 100644 index bac29a7c0b..0000000000 --- a/packages/xfce/xfce4-dev-tools_4.4.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Xfce4 development tools" -SECTION = "x11/libs" -LICENSE = "GPL" - -inherit xfce -XFCE_VERSION = 4.4.1 - -do_stage() { - install -d ${STAGING_DATADIR}/aclocal - install -m 644 m4macros/*.m4 ${STAGING_DATADIR}/aclocal/ -} - -FILES_${PN}-dev += " ${datadir}/xfce4/dev-tools/m4macros/*.m4" -- cgit v1.2.3 From 053d9135c616991ef0340a17fb42b9e5d3e6e82d Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 20:44:43 -0300 Subject: thunar: update to 0.9.0 Besides the update, we've fixed the debug package and change the place to grab the source from so it's easier to update next time. --- packages/xfce/thunar_0.8.0.bb | 15 --------------- packages/xfce/thunar_0.9.0.bb | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 packages/xfce/thunar_0.8.0.bb create mode 100644 packages/xfce/thunar_0.9.0.bb diff --git a/packages/xfce/thunar_0.8.0.bb b/packages/xfce/thunar_0.8.0.bb deleted file mode 100644 index ea739e4cde..0000000000 --- a/packages/xfce/thunar_0.8.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "File manager for the Xfce Desktop Environment" -DEPENDS = "libxfcegui4 exo dbus-glib libexif xfce4-panel libice libsm" - -inherit xfce - -SRC_URI = "http://thunar.xfce.org/download/sources/Thunar/0.8.0/Thunar-0.8.0.tar.bz2" - -S = "${WORKDIR}/Thunar-${PV}/" - -FILES_${PN} += "${libdir}/thunarx-1/*.so \ - ${datadir}/dbus-1 \ - ${datadir}/thumbnailers \ - ${datadir}/Thunar \ - ${datadir}/xfce4" -FILES_${PN}-dbg += "${libdir}/thunarx-1/.debug/" diff --git a/packages/xfce/thunar_0.9.0.bb b/packages/xfce/thunar_0.9.0.bb new file mode 100644 index 0000000000..4aebde8642 --- /dev/null +++ b/packages/xfce/thunar_0.9.0.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "File manager for the Xfce Desktop Environment" +DEPENDS = "libxfcegui4 exo dbus-glib libexif xfce4-panel libice libsm" + +inherit xfce + +SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.2/src/Thunar-${PV}.tar.bz2" + +S = "${WORKDIR}/Thunar-${PV}/" + +FILES_${PN} += "${libdir}/thunarx-1/*.so \ + ${datadir}/dbus-1 \ + ${datadir}/thumbnailers \ + ${datadir}/Thunar \ + ${datadir}/xfce4" +FILES_${PN}-dbg += "${libdir}/thunarx-1/.debug/ ${libexecdir}/xfce4/panel-plugins/.debug/" -- cgit v1.2.3 From e9e8eefeeeec46c9fb3bfbd012ee3979d3dd7cd9 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 20:37:53 -0300 Subject: mousepad: update to 0.2.13 --- packages/xfce/mousepad_0.2.12.bb | 5 ----- packages/xfce/mousepad_0.2.13.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 packages/xfce/mousepad_0.2.12.bb create mode 100644 packages/xfce/mousepad_0.2.13.bb diff --git a/packages/xfce/mousepad_0.2.12.bb b/packages/xfce/mousepad_0.2.12.bb deleted file mode 100644 index 0d32ba4ade..0000000000 --- a/packages/xfce/mousepad_0.2.12.bb +++ /dev/null @@ -1,5 +0,0 @@ -DESCRIPTION = "Text editor for Xfce based on Leafpad" -DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native" - -inherit xfce -XFCE_VERSION = 4.4.1 diff --git a/packages/xfce/mousepad_0.2.13.bb b/packages/xfce/mousepad_0.2.13.bb new file mode 100644 index 0000000000..c55ce5a047 --- /dev/null +++ b/packages/xfce/mousepad_0.2.13.bb @@ -0,0 +1,5 @@ +DESCRIPTION = "Text editor for Xfce based on Leafpad" +DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native" + +inherit xfce +XFCE_VERSION = 4.4.2 -- cgit v1.2.3 From e99596398f037516b1c92c84aa97fd3c24334101 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 20:34:02 -0300 Subject: gtk-xfce-engine: update to 2.4.2 --- packages/xfce/gtk-xfce-engine_2.4.1.bb | 8 -------- packages/xfce/gtk-xfce-engine_2.4.2.bb | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 packages/xfce/gtk-xfce-engine_2.4.1.bb create mode 100644 packages/xfce/gtk-xfce-engine_2.4.2.bb diff --git a/packages/xfce/gtk-xfce-engine_2.4.1.bb b/packages/xfce/gtk-xfce-engine_2.4.1.bb deleted file mode 100644 index 655c0cbf1b..0000000000 --- a/packages/xfce/gtk-xfce-engine_2.4.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "XFCE theme for GTK" - -inherit xfce -XFCE_VERSION = 4.4.1 - -FILES_${PN} += "${libdir}/gtk-2.0/*/engines/libxfce.so \ - ${datadir}/themes/" -FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug" diff --git a/packages/xfce/gtk-xfce-engine_2.4.2.bb b/packages/xfce/gtk-xfce-engine_2.4.2.bb new file mode 100644 index 0000000000..fda9b9d833 --- /dev/null +++ b/packages/xfce/gtk-xfce-engine_2.4.2.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "XFCE theme for GTK" + +inherit xfce +XFCE_VERSION = 4.4.2 + +FILES_${PN} += "${libdir}/gtk-2.0/*/engines/libxfce.so \ + ${datadir}/themes/" +FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug" -- cgit v1.2.3 From 759bcabde952faa269f4f9f357b8636d5ba04219 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 20:15:04 -0300 Subject: exo: update to 0.3.4 This release needs a configure patch to avoid testing for strftime modifiers that can't be ran while cross compiling. --- packages/xfce/exo/configure.patch | 43 +++++++++++++++++++++++++++++++++++++++ packages/xfce/exo_0.3.2.bb | 15 -------------- packages/xfce/exo_0.3.4.bb | 17 ++++++++++++++++ 3 files changed, 60 insertions(+), 15 deletions(-) create mode 100644 packages/xfce/exo/configure.patch delete mode 100644 packages/xfce/exo_0.3.2.bb create mode 100644 packages/xfce/exo_0.3.4.bb diff --git a/packages/xfce/exo/configure.patch b/packages/xfce/exo/configure.patch new file mode 100644 index 0000000000..2ccfcfc994 --- /dev/null +++ b/packages/xfce/exo/configure.patch @@ -0,0 +1,43 @@ +--- exo-0.3.4/configure.in~ 2007-12-02 10:37:06.000000000 -0200 ++++ exo-0.3.4/configure.in 2008-06-05 17:21:42.000000000 -0300 +@@ -127,22 +127,24 @@ + dnl *************************************** + dnl *** Check for strftime() extensions *** + dnl *************************************** +-AC_TRY_RUN([ +- #include +- #include +- int +- main (int argc, char **argv) +- { +- struct tm tm; +- char buffer[16]; +- tm.tm_year = 81; +- if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0) +- return 0; +- return 1; +- } +-], [ +- AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.]) +-]) ++dnl grrrr... this doesn't work for cross compiling, define it for OE ++AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.]) ++dnl AC_TRY_RUN([ ++dnl #include ++dnl #include ++dnl int ++dnl main (int argc, char **argv) ++dnl { ++dnl struct tm tm; ++dnl char buffer[16]; ++dnl tm.tm_year = 81; ++dnl if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0) ++dnl return 0; ++dnl return 1; ++dnl } ++dnl ], [ ++dnl AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.]) ++dnl ]) + + dnl ****************************** + dnl *** Check for i18n support *** diff --git a/packages/xfce/exo_0.3.2.bb b/packages/xfce/exo_0.3.2.bb deleted file mode 100644 index b72ff52a91..0000000000 --- a/packages/xfce/exo_0.3.2.bb +++ /dev/null @@ -1,15 +0,0 @@ -DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native" - -inherit xfce -XFCE_VERSION = 4.4.1 - -# Note: Python checking is broken - -do_stage() { - autotools_stage_all -} - -FILES_${PN} += "${datadir}/xfce4/ \ - ${libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.so" -FILES_${PN}-dev += "${libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.*" -FILES_${PN}-dbg += "${libdir}/xfce4/mcs-plugins/.debug/exo-preferred-applications-settings.*" diff --git a/packages/xfce/exo_0.3.4.bb b/packages/xfce/exo_0.3.4.bb new file mode 100644 index 0000000000..49ab44582c --- /dev/null +++ b/packages/xfce/exo_0.3.4.bb @@ -0,0 +1,17 @@ +DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native" + +inherit xfce +XFCE_VERSION = 4.4.2 + +SRC_URI += " file://configure.patch;patch=1" + +# Note: Python checking is broken + +do_stage() { + autotools_stage_all +} + +FILES_${PN} += "${datadir}/xfce4/ \ + ${libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.so" +FILES_${PN}-dev += "${libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.*" +FILES_${PN}-dbg += "${libdir}/xfce4/mcs-plugins/.debug/exo-preferred-applications-settings.*" -- cgit v1.2.3 From f7f51b0f4490a746c9fe46806b774c7f5b02ea58 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:54:45 -0300 Subject: xfwm4-themes: update to 4.4.2 --- packages/xfce/xfwm4-themes_4.4.1.bb | 18 ------------------ packages/xfce/xfwm4-themes_4.4.2.bb | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 packages/xfce/xfwm4-themes_4.4.1.bb create mode 100644 packages/xfce/xfwm4-themes_4.4.2.bb diff --git a/packages/xfce/xfwm4-themes_4.4.1.bb b/packages/xfce/xfwm4-themes_4.4.1.bb deleted file mode 100644 index 63c5ab0296..0000000000 --- a/packages/xfce/xfwm4-themes_4.4.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -# xfwm4-themes OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION="XFCE4 Window Manager Themes" -SECTION = "x11/wm" - -inherit xfce - -# No ${PN} for this one -PACKAGES="" - -PACKAGES_DYNAMIC = "xfwm4-theme-*" - -python populate_packages_prepend () { - themedir = bb.data.expand('${datadir}/xfwm4/themes', d) - do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) -} diff --git a/packages/xfce/xfwm4-themes_4.4.2.bb b/packages/xfce/xfwm4-themes_4.4.2.bb new file mode 100644 index 0000000000..63c5ab0296 --- /dev/null +++ b/packages/xfce/xfwm4-themes_4.4.2.bb @@ -0,0 +1,18 @@ +# xfwm4-themes OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see COPYING.MIT) + +DESCRIPTION="XFCE4 Window Manager Themes" +SECTION = "x11/wm" + +inherit xfce + +# No ${PN} for this one +PACKAGES="" + +PACKAGES_DYNAMIC = "xfwm4-theme-*" + +python populate_packages_prepend () { + themedir = bb.data.expand('${datadir}/xfwm4/themes', d) + do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) +} -- cgit v1.2.3 From 373a63e75a897e92aa49c8ef5cbefe8eb661cd7f Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:54:45 -0300 Subject: xfwm4: update to 4.4.2 --- packages/xfce/xfwm4_4.4.1.bb | 31 ------------------------------- packages/xfce/xfwm4_4.4.2.bb | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 packages/xfce/xfwm4_4.4.1.bb create mode 100644 packages/xfce/xfwm4_4.4.2.bb diff --git a/packages/xfce/xfwm4_4.4.1.bb b/packages/xfce/xfwm4_4.4.1.bb deleted file mode 100644 index 8d1a1835cf..0000000000 --- a/packages/xfce/xfwm4_4.4.1.bb +++ /dev/null @@ -1,31 +0,0 @@ -# xfwm4 OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION="XFCE4 Window Manager" -SECTION = "x11/wm" -inherit xfce update-alternatives - -FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*" - -DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager" -RDEPENDS = "xfwm4-theme-default" - - -EXTRA_OECONF += " --enable-startup-notification" - -PACKAGES_DYNAMIC += "xfwm4-theme-*" - -python populate_packages_prepend () { - themedir = bb.data.expand('${datadir}/themes', d) - do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) -} - -PACKAGES += " ${PN}-mcs-plugins" - -FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so" - -ALTERNATIVE_PATH = "${bindir}/xfce4-session" -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PRIORITY = "10" diff --git a/packages/xfce/xfwm4_4.4.2.bb b/packages/xfce/xfwm4_4.4.2.bb new file mode 100644 index 0000000000..8d1a1835cf --- /dev/null +++ b/packages/xfce/xfwm4_4.4.2.bb @@ -0,0 +1,31 @@ +# xfwm4 OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see COPYING.MIT) + +DESCRIPTION="XFCE4 Window Manager" +SECTION = "x11/wm" +inherit xfce update-alternatives + +FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*" + +DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager" +RDEPENDS = "xfwm4-theme-default" + + +EXTRA_OECONF += " --enable-startup-notification" + +PACKAGES_DYNAMIC += "xfwm4-theme-*" + +python populate_packages_prepend () { + themedir = bb.data.expand('${datadir}/themes', d) + do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) +} + +PACKAGES += " ${PN}-mcs-plugins" + +FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so" + +ALTERNATIVE_PATH = "${bindir}/xfce4-session" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "10" -- cgit v1.2.3 From 47009dcdb6674902f6a3f0159017000af01ffddd Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:54:45 -0300 Subject: xfprint: update to 4.4.2 --- packages/xfce/xfprint_4.4.1.bb | 9 --------- packages/xfce/xfprint_4.4.2.bb | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 packages/xfce/xfprint_4.4.1.bb create mode 100644 packages/xfce/xfprint_4.4.2.bb diff --git a/packages/xfce/xfprint_4.4.1.bb b/packages/xfce/xfprint_4.4.1.bb deleted file mode 100644 index 19bfa0dde3..0000000000 --- a/packages/xfce/xfprint_4.4.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -# xfprint OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION="XFCE4 Print Manager" -SECTION = "x11/base" - -DEPENDS="libxfcegui4" -inherit xfce diff --git a/packages/xfce/xfprint_4.4.2.bb b/packages/xfce/xfprint_4.4.2.bb new file mode 100644 index 0000000000..19bfa0dde3 --- /dev/null +++ b/packages/xfce/xfprint_4.4.2.bb @@ -0,0 +1,9 @@ +# xfprint OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see COPYING.MIT) + +DESCRIPTION="XFCE4 Print Manager" +SECTION = "x11/base" + +DEPENDS="libxfcegui4" +inherit xfce -- cgit v1.2.3 From d5da2343345cabd5c75350c38a3ea55f50ba8e59 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:54:44 -0300 Subject: xfdesktop: update to 4.4.2 --- packages/xfce/xfdesktop_4.4.1.bb | 17 ----------------- packages/xfce/xfdesktop_4.4.2.bb | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 packages/xfce/xfdesktop_4.4.1.bb create mode 100644 packages/xfce/xfdesktop_4.4.2.bb diff --git a/packages/xfce/xfdesktop_4.4.1.bb b/packages/xfce/xfdesktop_4.4.1.bb deleted file mode 100644 index 35c5ff5954..0000000000 --- a/packages/xfce/xfdesktop_4.4.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -# xfdesktop OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION="xfce4 Desktop Background Manager" -SECTION = "x11/base" -DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel" - -inherit xfce -PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins" - -FILES_xfdesktop-backdrops="${datadir}/xfce4/backdrops/*" -FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so" -FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so \ - ${libdir}/xfce4/panel-plugins/xfce4-menu-plugin \ - ${datadir}/xfce4/panel-plugins/*.desktop" -FILES_${PN}-dbg += "/usr/libexec/xfce4/panel-plugins/.debug" diff --git a/packages/xfce/xfdesktop_4.4.2.bb b/packages/xfce/xfdesktop_4.4.2.bb new file mode 100644 index 0000000000..35c5ff5954 --- /dev/null +++ b/packages/xfce/xfdesktop_4.4.2.bb @@ -0,0 +1,17 @@ +# xfdesktop OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see COPYING.MIT) + +DESCRIPTION="xfce4 Desktop Background Manager" +SECTION = "x11/base" +DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel" + +inherit xfce +PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins" + +FILES_xfdesktop-backdrops="${datadir}/xfce4/backdrops/*" +FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so" +FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so \ + ${libdir}/xfce4/panel-plugins/xfce4-menu-plugin \ + ${datadir}/xfce4/panel-plugins/*.desktop" +FILES_${PN}-dbg += "/usr/libexec/xfce4/panel-plugins/.debug" -- cgit v1.2.3 From 500886ae9c953ac111f3068d767fedd4d8bbdf78 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:54:44 -0300 Subject: xfce-utils: update to 4.4.2 --- packages/xfce/xfce-utils_4.4.1.bb | 29 ----------------------------- packages/xfce/xfce-utils_4.4.2.bb | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 packages/xfce/xfce-utils_4.4.1.bb create mode 100644 packages/xfce/xfce-utils_4.4.2.bb diff --git a/packages/xfce/xfce-utils_4.4.1.bb b/packages/xfce/xfce-utils_4.4.1.bb deleted file mode 100644 index d681fd7adb..0000000000 --- a/packages/xfce/xfce-utils_4.4.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -# xfce-utils OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION="XFCE4 Utilities" -DEPENDS = "virtual/libx11 libxfcegui4 xfce-mcs-manager" -inherit xfce - -FILES_${PN} += " \ - ${bindir}/* \ - ${datadir}/dbus-1/* \ - ${datadir}/xfce4/AUTHORS \ - ${datadir}/xfce4/BSD \ - ${datadir}/xfce4/COPYING \ - ${datadir}/xfce4/GPL \ - ${datadir}/xfce4/INFO \ - ${datadir}/xfce4/LGPL \ - ${datadir}/xfce4/AUTHORS.html \ - ${datadir}/xfce4/BSD.html \ - ${datadir}/xfce4/COPYING.html \ - ${datadir}/xfce4/GPL.html \ - ${datadir}/xfce4/INFO.html \ - ${datadir}/xfce4/LGPL.html" - -PACKAGES =+ "${PN}-mcs-plugins" -FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/" - -# NOTE: This package takes a --with-browser for the default browser -# NOTE: Works with gdm also gtkhtml diff --git a/packages/xfce/xfce-utils_4.4.2.bb b/packages/xfce/xfce-utils_4.4.2.bb new file mode 100644 index 0000000000..d681fd7adb --- /dev/null +++ b/packages/xfce/xfce-utils_4.4.2.bb @@ -0,0 +1,29 @@ +# xfce-utils OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see COPYING.MIT) + +DESCRIPTION="XFCE4 Utilities" +DEPENDS = "virtual/libx11 libxfcegui4 xfce-mcs-manager" +inherit xfce + +FILES_${PN} += " \ + ${bindir}/* \ + ${datadir}/dbus-1/* \ + ${datadir}/xfce4/AUTHORS \ + ${datadir}/xfce4/BSD \ + ${datadir}/xfce4/COPYING \ + ${datadir}/xfce4/GPL \ + ${datadir}/xfce4/INFO \ + ${datadir}/xfce4/LGPL \ + ${datadir}/xfce4/AUTHORS.html \ + ${datadir}/xfce4/BSD.html \ + ${datadir}/xfce4/COPYING.html \ + ${datadir}/xfce4/GPL.html \ + ${datadir}/xfce4/INFO.html \ + ${datadir}/xfce4/LGPL.html" + +PACKAGES =+ "${PN}-mcs-plugins" +FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/" + +# NOTE: This package takes a --with-browser for the default browser +# NOTE: Works with gdm also gtkhtml -- cgit v1.2.3 From 79f6a1fdd8f16ee286b3f176df8872b940b2a5c5 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:54:44 -0300 Subject: xfce-mcs-plugins: update to 4.4.2 --- packages/xfce/xfce-mcs-plugins_4.4.1.bb | 12 ------------ packages/xfce/xfce-mcs-plugins_4.4.2.bb | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 packages/xfce/xfce-mcs-plugins_4.4.1.bb create mode 100644 packages/xfce/xfce-mcs-plugins_4.4.2.bb diff --git a/packages/xfce/xfce-mcs-plugins_4.4.1.bb b/packages/xfce/xfce-mcs-plugins_4.4.1.bb deleted file mode 100644 index 80037841fa..0000000000 --- a/packages/xfce/xfce-mcs-plugins_4.4.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -# xfce-mcs-plugins OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION = "Common XFCE4 configuration plugins." -DEPENDS = "libxfcegui4 xfce-mcs-manager gtk+" -SECTION = "x11" - -inherit xfce - -PACKAGES += "${PN}-mcs-plugins" -FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/*.so" diff --git a/packages/xfce/xfce-mcs-plugins_4.4.2.bb b/packages/xfce/xfce-mcs-plugins_4.4.2.bb new file mode 100644 index 0000000000..80037841fa --- /dev/null +++ b/packages/xfce/xfce-mcs-plugins_4.4.2.bb @@ -0,0 +1,12 @@ +# xfce-mcs-plugins OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see COPYING.MIT) + +DESCRIPTION = "Common XFCE4 configuration plugins." +DEPENDS = "libxfcegui4 xfce-mcs-manager gtk+" +SECTION = "x11" + +inherit xfce + +PACKAGES += "${PN}-mcs-plugins" +FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/*.so" -- cgit v1.2.3 From 4c28912424815d043eb1a1d69db1cd53114f1faa Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:54:43 -0300 Subject: xfce-mcs-manager: update to 4.4.2 --- packages/xfce/xfce-mcs-manager_4.4.1.bb | 25 ------------------------- packages/xfce/xfce-mcs-manager_4.4.2.bb | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 packages/xfce/xfce-mcs-manager_4.4.1.bb create mode 100644 packages/xfce/xfce-mcs-manager_4.4.2.bb diff --git a/packages/xfce/xfce-mcs-manager_4.4.1.bb b/packages/xfce/xfce-mcs-manager_4.4.1.bb deleted file mode 100644 index 0b9fc43f70..0000000000 --- a/packages/xfce/xfce-mcs-manager_4.4.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -# xfce-mcs-manager OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION="XFCE4 Settings manager." -DEPENDS="libxfcegui4 libxfce4mcs intltool-native" -SECTION = "x11" -PR = "r1" - -inherit xfce - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4 - install -d ${STAGING_INCDIR}/xfce4/xfce-mcs-manager - install -m 644 xfce-mcs-manager/manager-plugin.h ${STAGING_INCDIR}/xfce4/xfce-mcs-manager -} - -# xfce-mcs-manager.pc uses ${libdir} to indicate where the mcs plugins live -# the standard pkgconfig mangling was confusing us. Mangling is not required -# for this particular .pc, so the following will suffice: - -do_stage_append () { - install -d ${PKG_CONFIG_DIR} - sed -e 's:^includedir=.*:includedir="/usr/include":;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_DIR}/xfce-mcs-manager.pc -} diff --git a/packages/xfce/xfce-mcs-manager_4.4.2.bb b/packages/xfce/xfce-mcs-manager_4.4.2.bb new file mode 100644 index 0000000000..0b9fc43f70 --- /dev/null +++ b/packages/xfce/xfce-mcs-manager_4.4.2.bb @@ -0,0 +1,25 @@ +# xfce-mcs-manager OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see COPYING.MIT) + +DESCRIPTION="XFCE4 Settings manager." +DEPENDS="libxfcegui4 libxfce4mcs intltool-native" +SECTION = "x11" +PR = "r1" + +inherit xfce + +do_stage() { + install -d ${STAGING_INCDIR}/xfce4 + install -d ${STAGING_INCDIR}/xfce4/xfce-mcs-manager + install -m 644 xfce-mcs-manager/manager-plugin.h ${STAGING_INCDIR}/xfce4/xfce-mcs-manager +} + +# xfce-mcs-manager.pc uses ${libdir} to indicate where the mcs plugins live +# the standard pkgconfig mangling was confusing us. Mangling is not required +# for this particular .pc, so the following will suffice: + +do_stage_append () { + install -d ${PKG_CONFIG_DIR} + sed -e 's:^includedir=.*:includedir="/usr/include":;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_DIR}/xfce-mcs-manager.pc +} -- cgit v1.2.3 From e2a3183722ab491f97b955240107520b54507d93 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:54:43 -0300 Subject: xfce4-session: update to 4.4.2 --- packages/xfce/xfce4-session_4.4.1.bb | 4 ---- packages/xfce/xfce4-session_4.4.2.bb | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 packages/xfce/xfce4-session_4.4.1.bb create mode 100644 packages/xfce/xfce4-session_4.4.2.bb diff --git a/packages/xfce/xfce4-session_4.4.1.bb b/packages/xfce/xfce4-session_4.4.1.bb deleted file mode 100644 index a572b80f55..0000000000 --- a/packages/xfce/xfce4-session_4.4.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -DESCRIPTION = "Calendar application for the Xfce Desktop Environment" -DEPENDS = "libxfcegui4 libxfce4util xfce-mcs-manager dbus" - -inherit xfce diff --git a/packages/xfce/xfce4-session_4.4.2.bb b/packages/xfce/xfce4-session_4.4.2.bb new file mode 100644 index 0000000000..a572b80f55 --- /dev/null +++ b/packages/xfce/xfce4-session_4.4.2.bb @@ -0,0 +1,4 @@ +DESCRIPTION = "Calendar application for the Xfce Desktop Environment" +DEPENDS = "libxfcegui4 libxfce4util xfce-mcs-manager dbus" + +inherit xfce -- cgit v1.2.3 From 56c7e1bcbed8aeaa4a8ea02ac1e905ab0892a0c2 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:54:43 -0300 Subject: xfce4-panel: update to 4.4.2 --- packages/xfce/xfce4-panel_4.4.1.bb | 26 -------------------------- packages/xfce/xfce4-panel_4.4.2.bb | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 packages/xfce/xfce4-panel_4.4.1.bb create mode 100644 packages/xfce/xfce4-panel_4.4.2.bb diff --git a/packages/xfce/xfce4-panel_4.4.1.bb b/packages/xfce/xfce4-panel_4.4.1.bb deleted file mode 100644 index dadc413cae..0000000000 --- a/packages/xfce/xfce4-panel_4.4.1.bb +++ /dev/null @@ -1,26 +0,0 @@ -# xfce4-panel OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION = "XFCE4 Panel" -SECTION = "x11" -DEPENDS = "startup-notification virtual/libx11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" - -inherit pkgconfig xfce - -EXTRA_OECONF += " --enable-startup-notification" - - -do_stage() { -autotools_stage_all -} - -do_install() { - oe_runmake DESTDIR=${D} install -} - -PACKAGES += "${PN}-plugins ${PN}-mcs-plugins" -FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so* \ - ${datadir}/xfce4/panel-plugins/*.desktop" -FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/" -FILES_${PN}-dbg += "${libdir}/xfce4/mcs-plugins/.debug" diff --git a/packages/xfce/xfce4-panel_4.4.2.bb b/packages/xfce/xfce4-panel_4.4.2.bb new file mode 100644 index 0000000000..dadc413cae --- /dev/null +++ b/packages/xfce/xfce4-panel_4.4.2.bb @@ -0,0 +1,26 @@ +# xfce4-panel OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see COPYING.MIT) + +DESCRIPTION = "XFCE4 Panel" +SECTION = "x11" +DEPENDS = "startup-notification virtual/libx11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" + +inherit pkgconfig xfce + +EXTRA_OECONF += " --enable-startup-notification" + + +do_stage() { +autotools_stage_all +} + +do_install() { + oe_runmake DESTDIR=${D} install +} + +PACKAGES += "${PN}-plugins ${PN}-mcs-plugins" +FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so* \ + ${datadir}/xfce4/panel-plugins/*.desktop" +FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/" +FILES_${PN}-dbg += "${libdir}/xfce4/mcs-plugins/.debug" -- cgit v1.2.3 From 4c4919310b3d0a4d5a7a5cb94b03780e8fb7b706 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:54:42 -0300 Subject: xfce4-mixer: update to 4.4.2 The recipe has been adapted to the new debug and library included on this version. --- packages/xfce/xfce4-mixer_4.4.1.bb | 9 --------- packages/xfce/xfce4-mixer_4.4.2.bb | 12 ++++++++++++ 2 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 packages/xfce/xfce4-mixer_4.4.1.bb create mode 100644 packages/xfce/xfce4-mixer_4.4.2.bb diff --git a/packages/xfce/xfce4-mixer_4.4.1.bb b/packages/xfce/xfce4-mixer_4.4.1.bb deleted file mode 100644 index 4d3faed14c..0000000000 --- a/packages/xfce/xfce4-mixer_4.4.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -# xfce-mixer-plugin OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION="XFCE panel mixer plugin" -SECTION = "x11" - -DEPENDS="xfce4-panel" -inherit xfce diff --git a/packages/xfce/xfce4-mixer_4.4.2.bb b/packages/xfce/xfce4-mixer_4.4.2.bb new file mode 100644 index 0000000000..60bb012810 --- /dev/null +++ b/packages/xfce/xfce4-mixer_4.4.2.bb @@ -0,0 +1,12 @@ +# xfce-mixer-plugin OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see COPYING.MIT) + +DESCRIPTION="XFCE panel mixer plugin" +SECTION = "x11" + +DEPENDS="xfce4-panel" +inherit xfce + +FILES_${PN}-dev += "${libdir}/xfce4/modules/libxfce4mixer.so" +FILES_${PN}-dbg += "${libexecdir}/xfce4/panel-plugins/.debug/" -- cgit v1.2.3 From 3306145273929309f3f0f91b8a55aa3d3d66d250 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:54:42 -0300 Subject: xfce4-icon-theme: update to 4.4.2 --- packages/xfce/xfce4-icon-theme_4.4.1.bb | 6 ------ packages/xfce/xfce4-icon-theme_4.4.2.bb | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 packages/xfce/xfce4-icon-theme_4.4.1.bb create mode 100644 packages/xfce/xfce4-icon-theme_4.4.2.bb diff --git a/packages/xfce/xfce4-icon-theme_4.4.1.bb b/packages/xfce/xfce4-icon-theme_4.4.1.bb deleted file mode 100644 index 69d9dacbac..0000000000 --- a/packages/xfce/xfce4-icon-theme_4.4.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -DESCRIPTION = "Rodent vector icon theme used by XFCE" -PACKAGE_ARCH = "all" - -inherit xfce - -FILES_${PN} += "${datadir}/xfce4" diff --git a/packages/xfce/xfce4-icon-theme_4.4.2.bb b/packages/xfce/xfce4-icon-theme_4.4.2.bb new file mode 100644 index 0000000000..69d9dacbac --- /dev/null +++ b/packages/xfce/xfce4-icon-theme_4.4.2.bb @@ -0,0 +1,6 @@ +DESCRIPTION = "Rodent vector icon theme used by XFCE" +PACKAGE_ARCH = "all" + +inherit xfce + +FILES_${PN} += "${datadir}/xfce4" -- cgit v1.2.3 From e728bcbf4d55b970f43d66d0f3894ec2f6df5e8e Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:54:42 -0300 Subject: xfce4-appfinder: update to 4.4.2 --- packages/xfce/xfce4-appfinder_4.4.1.bb | 8 -------- packages/xfce/xfce4-appfinder_4.4.2.bb | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 packages/xfce/xfce4-appfinder_4.4.1.bb create mode 100644 packages/xfce/xfce4-appfinder_4.4.2.bb diff --git a/packages/xfce/xfce4-appfinder_4.4.1.bb b/packages/xfce/xfce4-appfinder_4.4.1.bb deleted file mode 100644 index ddfa3e1e4e..0000000000 --- a/packages/xfce/xfce4-appfinder_4.4.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -# xfce4-appfinder build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION="XFCE Application Finder" -SECTION = "x11" -inherit xfce -DEPENDS="libxfcegui4" diff --git a/packages/xfce/xfce4-appfinder_4.4.2.bb b/packages/xfce/xfce4-appfinder_4.4.2.bb new file mode 100644 index 0000000000..ddfa3e1e4e --- /dev/null +++ b/packages/xfce/xfce4-appfinder_4.4.2.bb @@ -0,0 +1,8 @@ +# xfce4-appfinder build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see COPYING.MIT) + +DESCRIPTION="XFCE Application Finder" +SECTION = "x11" +inherit xfce +DEPENDS="libxfcegui4" -- cgit v1.2.3 From bb2ceb1797689f0676da89af5e1cb4127c3699b4 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:54:41 -0300 Subject: orage: update to 4.4.2 --- packages/xfce/orage_4.4.1.bb | 5 ----- packages/xfce/orage_4.4.2.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 packages/xfce/orage_4.4.1.bb create mode 100644 packages/xfce/orage_4.4.2.bb diff --git a/packages/xfce/orage_4.4.1.bb b/packages/xfce/orage_4.4.1.bb deleted file mode 100644 index b8f5284454..0000000000 --- a/packages/xfce/orage_4.4.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -DESCRIPTION = "Calendar application for the Xfce Desktop Environment" -DEPENDS = "libxfcegui4 exo libxml-parser-perl-native xfce4-panel xfce-mcs-manager" -RREPLACES = "xfcalendar" - -inherit xfce diff --git a/packages/xfce/orage_4.4.2.bb b/packages/xfce/orage_4.4.2.bb new file mode 100644 index 0000000000..b8f5284454 --- /dev/null +++ b/packages/xfce/orage_4.4.2.bb @@ -0,0 +1,5 @@ +DESCRIPTION = "Calendar application for the Xfce Desktop Environment" +DEPENDS = "libxfcegui4 exo libxml-parser-perl-native xfce4-panel xfce-mcs-manager" +RREPLACES = "xfcalendar" + +inherit xfce -- cgit v1.2.3 From 5e9a1243a8fd4bcbb1228750b6fcaf9d81dfb811 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:54:41 -0300 Subject: libxfcegui4: update to 4.4.2 --- packages/xfce/libxfcegui4_4.4.1.bb | 15 --------------- packages/xfce/libxfcegui4_4.4.2.bb | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 packages/xfce/libxfcegui4_4.4.1.bb create mode 100644 packages/xfce/libxfcegui4_4.4.2.bb diff --git a/packages/xfce/libxfcegui4_4.4.1.bb b/packages/xfce/libxfcegui4_4.4.1.bb deleted file mode 100644 index d38269d6f8..0000000000 --- a/packages/xfce/libxfcegui4_4.4.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -# libxfcegui4 OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION = "XFCE Widget library and X Window System interaction" -DEPENDS = "libxfce4util dbh libxml2 gtk+" -SECTION = "x11/libs" - -inherit xfce - -do_stage() { -autotools_stage_all -} - -FILES_${PN} += "${libdir}/xfce4/modules ${datadir}/xfce4/mime ${datadir}/icons/hicolor" diff --git a/packages/xfce/libxfcegui4_4.4.2.bb b/packages/xfce/libxfcegui4_4.4.2.bb new file mode 100644 index 0000000000..d38269d6f8 --- /dev/null +++ b/packages/xfce/libxfcegui4_4.4.2.bb @@ -0,0 +1,15 @@ +# libxfcegui4 OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see COPYING.MIT) + +DESCRIPTION = "XFCE Widget library and X Window System interaction" +DEPENDS = "libxfce4util dbh libxml2 gtk+" +SECTION = "x11/libs" + +inherit xfce + +do_stage() { +autotools_stage_all +} + +FILES_${PN} += "${libdir}/xfce4/modules ${datadir}/xfce4/mime ${datadir}/icons/hicolor" -- cgit v1.2.3 From b17bf340885ea29c9517d4aa7964fcd5dc7e313f Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:54:41 -0300 Subject: libxfce4util: update to 4.4.2 --- packages/xfce/libxfce4util_4.4.1.bb | 26 -------------------------- packages/xfce/libxfce4util_4.4.2.bb | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 packages/xfce/libxfce4util_4.4.1.bb create mode 100644 packages/xfce/libxfce4util_4.4.2.bb diff --git a/packages/xfce/libxfce4util_4.4.1.bb b/packages/xfce/libxfce4util_4.4.1.bb deleted file mode 100644 index 3386ad57e3..0000000000 --- a/packages/xfce/libxfce4util_4.4.1.bb +++ /dev/null @@ -1,26 +0,0 @@ -# libxfce4util OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION = "Basic utility library for Xfce4" -SECTION = "x11/libs" -LICENSE = "GPL" -DEPENDS = "glib-2.0 xfce4-dev-tools" - -inherit xfce pkgconfig - -MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" - -do_stage() { - install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util - # The line below expands to the list of headers that native makefile - # would install. Complain and/or fix if it's not portable enough - for file in $(eval $(make -n -C libxfce4util install|grep "^list='[^.]\\+.h"|cut -d\; -f1); echo $list); do - install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util - done - - oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR} - -} - -FILES_${PN}-dev += " ${datadir}/xfce4/m4" diff --git a/packages/xfce/libxfce4util_4.4.2.bb b/packages/xfce/libxfce4util_4.4.2.bb new file mode 100644 index 0000000000..3386ad57e3 --- /dev/null +++ b/packages/xfce/libxfce4util_4.4.2.bb @@ -0,0 +1,26 @@ +# libxfce4util OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see COPYING.MIT) + +DESCRIPTION = "Basic utility library for Xfce4" +SECTION = "x11/libs" +LICENSE = "GPL" +DEPENDS = "glib-2.0 xfce4-dev-tools" + +inherit xfce pkgconfig + +MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" + +do_stage() { + install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util + # The line below expands to the list of headers that native makefile + # would install. Complain and/or fix if it's not portable enough + for file in $(eval $(make -n -C libxfce4util install|grep "^list='[^.]\\+.h"|cut -d\; -f1); echo $list); do + install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util + done + + oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR} + +} + +FILES_${PN}-dev += " ${datadir}/xfce4/m4" -- cgit v1.2.3 From 528236fa65537addcb3e62a08ae7cb6db216943e Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 4 Oct 2008 12:07:11 -0300 Subject: xfdesktop: fix a relocation and a memory leak Due the relocation error, the menu was segfaulting and then being unusable. This patch has been taken from Gentoo repository. --- .../xfce/xfdesktop/relocation-and-memleak.patch | 49 ++++++++++++++++++++++ packages/xfce/xfdesktop_4.4.2.bb | 3 ++ 2 files changed, 52 insertions(+) create mode 100644 packages/xfce/xfdesktop/relocation-and-memleak.patch diff --git a/packages/xfce/xfdesktop/relocation-and-memleak.patch b/packages/xfce/xfdesktop/relocation-and-memleak.patch new file mode 100644 index 0000000000..df9011d8da --- /dev/null +++ b/packages/xfce/xfdesktop/relocation-and-memleak.patch @@ -0,0 +1,49 @@ +Patch taken from Gentoo at http://overlays.gentoo.org/svn/proj/alt/trunk/prefix-overlay/xfce-base/xfdesktop/files/ + +Included by: Otavio Salvador + +diff -ur xfdesktop-4.4.2.orig/modules/menu/desktop-menu-dentry.c xfdesktop-4.4.2/modules/menu/desktop-menu-dentry.c +--- xfdesktop-4.4.2.orig/modules/menu/desktop-menu-dentry.c 2007-11-17 21:31:43.000000000 +0200 ++++ xfdesktop-4.4.2/modules/menu/desktop-menu-dentry.c 2008-03-21 11:18:59.000000000 +0200 +@@ -173,7 +173,8 @@ + if(cmpname && g_ascii_strcasecmp(name, cmpname) < 0) + break; + } +- ++ g_list_free(items); ++ + gtk_menu_shell_insert(menu_shell, mi, i); + + return i; +diff -ur xfdesktop-4.4.2.orig/modules/menu/desktop-menuspec.c xfdesktop-4.4.2/modules/menu/desktop-menuspec.c +--- xfdesktop-4.4.2.orig/modules/menu/desktop-menuspec.c 2007-11-17 21:31:43.000000000 +0200 ++++ xfdesktop-4.4.2/modules/menu/desktop-menuspec.c 2008-03-21 11:18:59.000000000 +0200 +@@ -203,7 +203,7 @@ + else + foundcat = NULL; + if(!foundcat) { +- g_ptr_array_free(revpath, FALSE); ++ g_ptr_array_free(revpath, TRUE); + revpath = NULL; + break; + } +@@ -220,7 +220,7 @@ + newpath[totlen] = 0; + + g_ptr_array_add(mtfpi->paths, newpath); +- g_ptr_array_free(revpath, FALSE); ++ g_ptr_array_free(revpath, TRUE); + } + } + } +diff -ur xfdesktop-4.4.2.orig/modules/menu/desktop-menuspec.h xfdesktop-4.4.2/modules/menu/desktop-menuspec.h +--- xfdesktop-4.4.2.orig/modules/menu/desktop-menuspec.h 2007-11-17 21:31:43.000000000 +0200 ++++ xfdesktop-4.4.2/modules/menu/desktop-menuspec.h 2008-03-21 11:18:56.000000000 +0200 +@@ -82,6 +82,6 @@ + * @param paths A GPtrArray obtained from either menuspec_get_path_simple() or + * menuspec_get_path_multilevel(). + */ +-G_INLINE_FUNC void desktop_menuspec_path_free(GPtrArray *paths); ++void desktop_menuspec_path_free(GPtrArray *paths); + + #endif /* ifdef __MENUSPEC_H__ */ diff --git a/packages/xfce/xfdesktop_4.4.2.bb b/packages/xfce/xfdesktop_4.4.2.bb index 35c5ff5954..6c92b0fd1c 100644 --- a/packages/xfce/xfdesktop_4.4.2.bb +++ b/packages/xfce/xfdesktop_4.4.2.bb @@ -7,6 +7,9 @@ SECTION = "x11/base" DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel" inherit xfce + +SRC_URI += " file://relocation-and-memleak.patch;patch=1 " + PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins" FILES_xfdesktop-backdrops="${datadir}/xfce4/backdrops/*" -- cgit v1.2.3 From d636b77f0b00914dd2e84fe196a6e6cd7570c6e0 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 11 Oct 2008 14:09:37 -0300 Subject: xfce4-panel: split plugins in multiple packages --- packages/xfce/xfce4-panel_4.4.2.bb | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/packages/xfce/xfce4-panel_4.4.2.bb b/packages/xfce/xfce4-panel_4.4.2.bb index dadc413cae..2fd087733e 100644 --- a/packages/xfce/xfce4-panel_4.4.2.bb +++ b/packages/xfce/xfce4-panel_4.4.2.bb @@ -19,8 +19,19 @@ do_install() { oe_runmake DESTDIR=${D} install } -PACKAGES += "${PN}-plugins ${PN}-mcs-plugins" -FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so* \ - ${datadir}/xfce4/panel-plugins/*.desktop" +python populate_packages_prepend() { + plugin_dir = bb.data.expand('${libdir}/xfce4/panel-plugins/', d) + plugin_name = bb.data.expand('${PN}-plugin-%s', d) + do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, + '${PN} plugin for %s', extra_depends='', prepend=True, + aux_files_pattern=['${datadir}/xfce4/panel-plugins/%s.desktop', + '${sysconfdir}/xdg/xfce/panel/%s-*', + '${datadir}/icons/hicolor/48x48/apps/*-%s.png', + '${bindir}/*%s*']) +} + +PACKAGES += "${PN}-mcs-plugins" +PACKAGES_DYNAMIC = "${PN}-plugin-*" + FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/" FILES_${PN}-dbg += "${libdir}/xfce4/mcs-plugins/.debug" -- cgit v1.2.3 From 28583f2a7bf58ff0401f4f7f47eb5cb1139f09a9 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Jun 2008 19:54:40 -0300 Subject: libxfce4mcs: update to 4.4.2 --- packages/xfce/libxfce4mcs_4.4.1.bb | 19 ------------------- packages/xfce/libxfce4mcs_4.4.2.bb | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 packages/xfce/libxfce4mcs_4.4.1.bb create mode 100644 packages/xfce/libxfce4mcs_4.4.2.bb diff --git a/packages/xfce/libxfce4mcs_4.4.1.bb b/packages/xfce/libxfce4mcs_4.4.1.bb deleted file mode 100644 index 20448240e2..0000000000 --- a/packages/xfce/libxfce4mcs_4.4.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -# libxfce4mcs OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see COPYING.MIT) - -DESCRIPTION="Settings management library used by most XFce 4 modules" -DEPENDS="libxfce4util" -SECTION = "x11/libs" - -inherit xfce pkgconfig - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs - - install -m 644 libxfce4mcs/mcs-common.h ${STAGING_INCDIR}/xfce4/libxfce4mcs - install -m 644 libxfce4mcs/mcs-client.h ${STAGING_INCDIR}/xfce4/libxfce4mcs - install -m 644 libxfce4mcs/mcs-manager.h ${STAGING_INCDIR}/xfce4/libxfce4mcs - oe_libinstall -C libxfce4mcs -so libxfce4mcs-manager ${STAGING_LIBDIR} - oe_libinstall -C libxfce4mcs -so libxfce4mcs-client ${STAGING_LIBDIR} -} diff --git a/packages/xfce/libxfce4mcs_4.4.2.bb b/packages/xfce/libxfce4mcs_4.4.2.bb new file mode 100644 index 0000000000..20448240e2 --- /dev/null +++ b/packages/xfce/libxfce4mcs_4.4.2.bb @@ -0,0 +1,19 @@ +# libxfce4mcs OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see COPYING.MIT) + +DESCRIPTION="Settings management library used by most XFce 4 modules" +DEPENDS="libxfce4util" +SECTION = "x11/libs" + +inherit xfce pkgconfig + +do_stage() { + install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs + + install -m 644 libxfce4mcs/mcs-common.h ${STAGING_INCDIR}/xfce4/libxfce4mcs + install -m 644 libxfce4mcs/mcs-client.h ${STAGING_INCDIR}/xfce4/libxfce4mcs + install -m 644 libxfce4mcs/mcs-manager.h ${STAGING_INCDIR}/xfce4/libxfce4mcs + oe_libinstall -C libxfce4mcs -so libxfce4mcs-manager ${STAGING_LIBDIR} + oe_libinstall -C libxfce4mcs -so libxfce4mcs-client ${STAGING_LIBDIR} +} -- cgit v1.2.3 From 96b3f1d2e414c93437a25a4b1a4b51e80244b8ab Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 17 Oct 2008 20:10:41 +0200 Subject: angstrom feed builder: add xfce stuff --- contrib/angstrom/build-feeds.sh | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 722a5c9dc9..deea7d3627 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -87,7 +87,8 @@ do epdfview \ epiphany \ evince \ - fakeroot \ + exo \ + fakeroot \ fennec \ ffmpeg \ fftw \ @@ -155,7 +156,8 @@ do midori \ mileage \ mono \ - mpfr \ + mousepad \ + mpfr \ mplayer \ mtd-utils \ mythtv \ @@ -168,7 +170,8 @@ do openredalert \ openvpn \ opie-notes \ - pairs \ + orage \ + pairs \ pciutils \ pdamaze \ perl \ @@ -210,7 +213,8 @@ do task-proper-tools \ texinfo \ thttpd \ - tightvnc \ + thunar \ + tightvnc \ timesleuth \ totem \ tron \ @@ -232,7 +236,22 @@ do xf86-video-ati \ xf86-video-fbdev \ xf86-video-vesa \ - xmms \ + xfce-mcs-manager + xfce-mcs-manager \ + xfce-mcs-plugins \ + xfce-terminal \ + xfce-utils \ + xfce4-appfinder \ + xfce4-dev-tools \ + xfce4-icon-theme \ + xfce4-mixer \ + xfce4-panel \ + xfce4-session \ + xfdesktop \ + xfprint \ + xfwm4 \ + xfwm4-themes \ + xmms \ xserver-kdrive \ xserver-xorg \ zauralign \ -- cgit v1.2.3 From 317c1e6932d9f2743f73ff7b39564310a7ff4b06 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 17 Oct 2008 13:49:29 -0500 Subject: checksums.ini: added apex 1.5.14 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index a4072a35bd..9381bee39a 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -862,6 +862,10 @@ sha256=bce6638d95fa8d32b109176a7cef6aa71e40c130068fac71b0df369d1a36c82c md5=ed2183311aacf5714afbd825f3671417 sha256=a319f936af9df20cd173d2e4c486cb6f1a011287ebcbd429a7f38c3214f555f3 +[ftp://ftp.buici.com/pub/apex/apex-1.5.14.tar.gz] +md5=22fb46e76c8221c7bcc9734602367460 +sha256=472e12897931d9e5dcf2d1e3332acfc467aafd0f62e612896a9c71dd0d16d950 + [ftp://ftp.buici.com/pub/apex/apex-1.5.8.tar.gz] md5=bb96cc8d50b4f00ee653f0800643ea8a sha256=4ad287720b87213154fa272afee5f442b0d8d61c1f56e43d0d056ae25849a926 -- cgit v1.2.3 From db23121a07f8b105a842b5257eae8db00b04b535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Fri, 17 Oct 2008 21:28:19 +0200 Subject: boost-1.36: build missing boost libraries * pass --with-LIBRARY to jam for each boost library * align package names with their Debian counterparts --- packages/boost/boost-36.inc | 83 ++++++++++++++++++------------------------ packages/boost/boost_1.36.0.bb | 2 +- 2 files changed, 37 insertions(+), 48 deletions(-) diff --git a/packages/boost/boost-36.inc b/packages/boost/boost-36.inc index 826ad81299..62dc504b84 100644 --- a/packages/boost/boost-36.inc +++ b/packages/boost/boost-36.inc @@ -15,47 +15,44 @@ BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}" BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" +BOOST_LIBS = "\ + date_time \ + filesystem \ + graph \ + iostreams \ + program_options \ + regex \ + serialization \ + signals \ + system \ + test \ + thread \ + " + S = "${WORKDIR}/${BOOST_P}" # Make a package for each library, plus -dev and -python -PACKAGES = "${PN}-dbg" -BOOSTLIBS = "" - -PACKAGES += "boost-date-time" -FILES_boost-date-time = "${libdir}/libboost_date_time*.so*" - -BOOSTLIBS += "boost-filesystem" -FILES_boost-filesystem = "${libdir}/libboost_filesystem*.so*" - -BOOSTLIBS += "boost-prg-exec-monitor" -FILES_boost-prg-exec-monitor = "${libdir}/libboost_prg_exec_monitor*.so*" - -BOOSTLIBS += "boost-program-options" -FILES_boost-program-options = "${libdir}/libboost_program_options*.so*" - -BOOSTLIBS += "boost-regex" -FILES_boost-regex = "${libdir}/libboost_regex*.so*" - -BOOSTLIBS += "boost-signals" -FILES_boost-signals = "${libdir}/libboost_signals*.so*" - -BOOSTLIBS += "boost-test-exec-monitor" -FILES_boost-test-exec-monitor = "${libdir}/libboost_test_exec_monitor*.so*" - -BOOSTLIBS += "boost-thread-mt" -FILES_boost-thread-mt = "${libdir}/libboost_thread-mt.so*" - -BOOSTLIBS += "boost-unit-test-framework" -FILES_boost-unit-test-framework = "${libdir}/libboost_unit_test_framework*.so*" - -BOOSTLIBS += "boost-iostreams" -FILES_boost-iostreams = "${libdir}/libboost_iostreams*.so*" - -BOOSTLIBS += "boost-serialization" -FILES_boost-serialization = "${libdir}/libboost_serialization*.so*" +PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}" +python __anonymous () { + import bb + + packages = [] + extras = [] + for lib in bb.data.getVar('BOOST_LIBS', d, 1).split( ): + pkg = "boost-%s" % lib.replace("_", "-") + extras.append("--with-%s" % lib) + packages.append(pkg) + if not bb.data.getVar("FILES_%s" % pkg, d, 1): + bb.data.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so*" % lib, d) + bb.data.setVar("BOOST_PACKAGES", " ".join(packages), d) + bb.data.setVar("BJAM_EXTRA", " ".join(extras), d) +} -BOOSTLIBS += "boost-wserialization" -FILES_boost-wserialization = "${libdir}/libboost_wserialization*.so*" +# Override the contents of specific packages +FILES_boost-serialization = "${libdir}/libboost_serialization*.so* \ + ${libdir}/libboost_wserialization*.so*" +FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so \ + ${libdir}/libboost_unit_test_framework*.so*" # Python - remove this and set: #PYTHON_ROOT = "/dev/null" @@ -64,18 +61,16 @@ DEPENDS += "python" PYTHON_ROOT = "${STAGING_DIR_HOST}/${layout_prefix}" PYTHON_VERSION = "2.5" -BOOSTLIBS += "boost-python" +PACKAGES += "boost-python" FILES_boost-python = "${libdir}/libboost_python*.so*" -PACKAGES += "${BOOSTLIBS}" - # -dev last to pick up the remaining stuff PACKAGES += "${PN}-dev" FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a" # "boost" is a metapackage which pulls in all boost librabries PACKAGES += "${PN}" -RRECOMMENDS_${PN} += "${BOOSTLIBS}" +RRECOMMENDS_${PN} += "${BOOST_PACKAGES}" # Oh yippee, a new build system, it's sooo cooool I could eat my own # foot. inlining=on lets the compiler choose, I think. At least this @@ -122,12 +117,6 @@ BJAM_TOOLS = "-sTOOLS=gcc \ '--layout=system' \ " -BJAM_EXTRA = '\ - --with-thread \ - --with-date_time \ - --with-filesystem \ - ' - BJAM_OPTS = '${BJAM_TOOLS} \ --builddir=${S}/${TARGET_SYS} \ --with-python-root=${PYTHON_ROOT} \ diff --git a/packages/boost/boost_1.36.0.bb b/packages/boost/boost_1.36.0.bb index 20a8f0ad47..fdc3136ac4 100644 --- a/packages/boost/boost_1.36.0.bb +++ b/packages/boost/boost_1.36.0.bb @@ -2,7 +2,7 @@ include boost-36.inc DEFAULT_PREFERENCE = "-1" -FILE_PR = "r1" +FILE_PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ file://arm-intrinsics.patch;patch=1 \ -- cgit v1.2.3 From bfd07fa2e86d575189f73bd0c1b015dafff5b60a Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Fri, 17 Oct 2008 20:46:14 +0100 Subject: lirc: move .la files and other development things to -dev package --- packages/lirc/lirc_0.8.1+cvs20070307.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/lirc/lirc_0.8.1+cvs20070307.bb b/packages/lirc/lirc_0.8.1+cvs20070307.bb index dc276b66cb..03397f46bd 100644 --- a/packages/lirc/lirc_0.8.1+cvs20070307.bb +++ b/packages/lirc/lirc_0.8.1+cvs20070307.bb @@ -15,7 +15,7 @@ RDEPENDS_lirc-x = "lirc" RDEPENDS_lirc-exec = "lirc" RDEPENDS_lirc-nslu2example = "lirc lirc-exec" RRECOMMENDS_lirc = "lirc-exec" -FILE_PR = "r1" +FILE_PR = "r2" # enable cvs version since until compilation issues for other packages have been fixed (cf. bug 2284 et al). #DEFAULT_PREFERENCE = "-1" @@ -65,7 +65,7 @@ PACKAGES =+ "lirc-x lirc-exec lirc-remotes" PACKAGES_prepend_nslu2 = "lirc-nslu2example " FILES_${PN}-dbg += "${bindir}/.debug ${sbindir}/.debug" -FILES_${PN} = "${bindir} ${sbindir} ${libdir} ${sysconfdir}/init.d" +FILES_${PN} = "${bindir} ${sbindir} ${libdir}/*.so.* ${sysconfdir}/init.d" FILES_lirc-x = "${bindir}/irxevent ${bindir}/xmode2" FILES_lirc-exec = "${bindir}/irexec ${sysconfdir}/init.d/lircexec" FILES_lirc-remotes = "${datadir}/lirc/remotes" -- cgit v1.2.3 From e0eabc7eb8293f6abe51b50eeae26b542efb147f Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Fri, 17 Oct 2008 20:51:49 +0100 Subject: rootfs_ipk: add support for BAD_RECOMMENDATIONS and ONLINE_PACKAGE_MANAGEMENT configuration settings --- classes/rootfs_ipk.bbclass | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 889ace2e99..d69be35b40 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -10,9 +10,19 @@ do_rootfs[recrdeptask] += "do_package_write_ipk" IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}" -DISTRO_EXTRA_RDEPENDS += " opkg opkg-collateral " PACKAGE_INSTALL_NO_DEPS ?= "0" +# What support to provide for online management of packages at run time? +# full -> traditional system, opkg is installed with all metadata +# add -> opkg is installed with basic conf files but no status database; can add new packages at runtime but not modify existing ones +# none -> opkg not installed at all, no metadata or config files provided +ONLINE_PACKAGE_MANAGEMENT ?= "full" + +# Which packages to not install on the basis of a recommendation +BAD_RECOMMENDATIONS ?= "" + +DISTRO_EXTRA_RDEPENDS += "${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "opkg opkg-collateral", d)}" + fakeroot rootfs_ipk_do_rootfs () { set -x @@ -21,6 +31,16 @@ fakeroot rootfs_ipk_do_rootfs () { mkdir -p ${T} mkdir -p ${IMAGE_ROOTFS}${libdir}/opkg/ + + STATUS=${IMAGE_ROOTFS}${libdir}/opkg/status + # prime the status file with bits that we don't want + for i in ${BAD_RECOMMENDATIONS}; do + echo "Package: $i" >> $STATUS + echo "Architecture: ${TARGET_ARCH}" >> $STATUS + echo "Status: deinstall ok not-installed" >> $STATUS + echo >> $STATUS + done + opkg-cl ${IPKG_ARGS} update # Uclibc builds don't provide this stuff... @@ -42,7 +62,10 @@ fakeroot rootfs_ipk_do_rootfs () { export OPKG_OFFLINE_ROOT=${IPKG_OFFLINE_ROOT} mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/opkg/ - grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}${sysconfdir}/opkg/arch.conf + + if [ "${ONLINE_PACKAGE_MANAGEMENT}" != "none" ]; then + grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}${sysconfdir}/opkg/arch.conf + fi for i in ${IMAGE_ROOTFS}${libdir}/opkg/info/*.preinst; do if [ -f $i ] && ! sh $i; then @@ -58,11 +81,20 @@ fakeroot rootfs_ipk_do_rootfs () { install -d ${IMAGE_ROOTFS}/${sysconfdir} echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version - rm -f ${IMAGE_ROOTFS}${libdir}/opkg/lists/* + if [ "${ONLINE_PACKAGE_MANAGEMENT}" != "none" ]; then + if [ "${ONLINE_PACKAGE_MANAGEMENT}" == "add" ]; then + rm -f ${IMAGE_ROOTFS}${libdir}/opkg/status + rm -f ${IMAGE_ROOTFS}${libdir}/opkg/*/* + else + rm -f ${IMAGE_ROOTFS}${libdir}/opkg/lists/* + fi - # Keep these lines until package manager selection is implemented - ln -s opkg ${IMAGE_ROOTFS}${sysconfdir}/ipkg - ln -s opkg ${IMAGE_ROOTFS}${libdir}/ipkg + # Keep these lines until package manager selection is implemented + ln -s opkg ${IMAGE_ROOTFS}${sysconfdir}/ipkg + ln -s opkg ${IMAGE_ROOTFS}${libdir}/ipkg + else + rm -rf ${IMAGE_ROOTFS}${libdir}/opkg + fi ${ROOTFS_POSTPROCESS_COMMAND} -- cgit v1.2.3 From 5e2aa7cd1fcc01474ff1477835565d0084487a61 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 17:27:06 -0300 Subject: thunar: properly install libraries into the staging area xfdesktop needs thunar-vfs to be able to show the created icons on the Desktop area and for it to work thunar needs to properly install the required headers on staging. --- packages/xfce/thunar_0.9.0.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/xfce/thunar_0.9.0.bb b/packages/xfce/thunar_0.9.0.bb index 4aebde8642..4c5f02565e 100644 --- a/packages/xfce/thunar_0.9.0.bb +++ b/packages/xfce/thunar_0.9.0.bb @@ -1,9 +1,10 @@ DESCRIPTION = "File manager for the Xfce Desktop Environment" DEPENDS = "libxfcegui4 exo dbus-glib libexif xfce4-panel libice libsm" -inherit xfce +inherit xfce pkgconfig SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.2/src/Thunar-${PV}.tar.bz2" +FILE_PR = 'r1' S = "${WORKDIR}/Thunar-${PV}/" @@ -13,3 +14,7 @@ FILES_${PN} += "${libdir}/thunarx-1/*.so \ ${datadir}/Thunar \ ${datadir}/xfce4" FILES_${PN}-dbg += "${libdir}/thunarx-1/.debug/ ${libexecdir}/xfce4/panel-plugins/.debug/" + +do_stage () { + autotools_stage_all +} -- cgit v1.2.3 From c4b6c7940b975f925bf6fa23a3fd1fe5468b1ecd Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 16:07:25 -0300 Subject: checksums.ini: add thunar 0.9.0 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 9381bee39a..3f0bba2f05 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -566,6 +566,10 @@ sha256=b72813be2639d49dda2a3f87928b7ce185633f3afaa25300afbfb844b12deea4 md5=4931662ea353384dec2a54a71b26ee8c sha256=0b654cd39126333a0dab7fdd2fd0c5023f6eb45e72d1d8bf9fb3cab175002bc7 +[http://www.us.xfce.org/archive/xfce-4.4.2/src/Thunar-0.9.0.tar.bz2] +md5=0fc5008858661c0abd0399acbe30ef28 +sha256=26c833b0bdf3281c61e03f1fb985feced88cf4a5cebce7bd055f05e025460037 + [http://tmrc.mit.edu/mirror/twisted/old/Twisted-1.2.0.tar.bz2] md5=d5150e8de83a9d5134d175d068482ab7 sha256=9e488e3ee3fc0f56d8f8898f4729819512dd43afff0fba4e32390d1af4bd53d5 -- cgit v1.2.3 From 6a987cb2fae038890c05c02eb1fa630078b2fb34 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 16:06:40 -0300 Subject: checksums.ini: add xfdesktop 4.4.2 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 3f0bba2f05..91239bec68 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16386,6 +16386,10 @@ sha256=abba9b334012c8d3771939d8644e25d1560f18174e94eda155c65c87924f08d1 md5=d44a81b9da9598425d9dd8dcd1cd5485 sha256=427df09a88f9b4a38fbed68d8154090bf0c11fbdc132c26247dc5568ee5ae910 +[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfdesktop-4.4.2.tar.bz2] +md5=694601234e74903d0fccba064f411e0c +sha256=7e50c13e45b1424924c49dd1e9daa6c16881ee57ac21e4e2c6f20c0eec227cdb + [http://www.us.xfce.org/archive/xfce-4.2.0/src/xffm-4.2.0.tar.gz] md5=476b50335da473d46b12f43a07a28e83 sha256=dcd12681eaaf2b88dd512023949080b6d47426ff855efc03329790ab479280c9 -- cgit v1.2.3 From ad1d9333141d839fe6abe490d23cfaecb227e61d Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 16:06:21 -0300 Subject: checksums.ini: add libpam 1.0.2 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 91239bec68..99c15e2e51 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -234,6 +234,10 @@ sha256=f199f7558e6a071ae1ead06b9207c0819281b6b2094dcef6fc4201a4bdf8854d md5=0b89b73970c7d490ad9a13718b74d27b sha256=5ed480cb76c91c2739ddba87f15437510e58c60dfdd7ead6f469149b2da94bb7 +[http://kernel.org/pub/linux/libs/pam/library/Linux-PAM-1.0.2.tar.bz2] +md5=fc5e35645b75befae28c88b711b28ffb +sha256=42d06febf4717dd43eb557027d1b00a484c22589793438778ed69449a073a3b8 + [http://ltt.polymtl.ca/packages/LinuxTraceToolkitViewer-0.8.41-12052006.tar.gz] md5=de139052f234cf54d714c960524bd5ef sha256=a21431358d7f2a5deb76b1a95ee80dc870b0dc2426d4860c61144343d48eff3e -- cgit v1.2.3 From 4c1483de8f519fe4af8b623ad091a0c447e7bfef Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Sat, 18 Oct 2008 01:21:19 +0200 Subject: ucview 0.9.3: add image capture tool ucview --- packages/unicap/ucview_0.22.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/unicap/ucview_0.22.bb diff --git a/packages/unicap/ucview_0.22.bb b/packages/unicap/ucview_0.22.bb new file mode 100644 index 0000000000..dde8fd1be5 --- /dev/null +++ b/packages/unicap/ucview_0.22.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Simple camera capture GUI based on unicap." +SECTION = "graphics" +LICENSE = "GPL" +DEPENDS = "intltool-native gtk+ libpng unicap gconf libglade gdk-pixbuf-csource-native" +PR = "r0" + +SRC_URI = "http://www.unicap-imaging.org/downloads/${P}.tar.gz" + +inherit autotools pkgconfig + +FILES_${PN} += " ${datadir}/dbus-1 ${datadir}/icons" +FILES_${PN}-dbg += " ${libdir}/ucview/plugins/.debug" -- cgit v1.2.3 From a55c96741eb4530e29c5aa8aed70a80d4ab2084a Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Sat, 18 Oct 2008 01:22:56 +0200 Subject: unicap 0.9.3: video data api framework --- packages/unicap/unicap-0.9.3/pkgconfig.patch | 9 +++++++++ packages/unicap/unicap_0.9.3.bb | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 packages/unicap/unicap-0.9.3/pkgconfig.patch create mode 100644 packages/unicap/unicap_0.9.3.bb diff --git a/packages/unicap/unicap-0.9.3/pkgconfig.patch b/packages/unicap/unicap-0.9.3/pkgconfig.patch new file mode 100644 index 0000000000..ce5ac2085f --- /dev/null +++ b/packages/unicap/unicap-0.9.3/pkgconfig.patch @@ -0,0 +1,9 @@ +--- unicap-0.9.3/libucil/libucil.pc.in~ 2008-10-17 21:40:01.000000000 +0200 ++++ unicap-0.9.3/libucil/libucil.pc.in 2008-10-17 21:40:01.000000000 +0200 +@@ -5,5 +5,5 @@ + Description: Unicap Imaging Library is a set of simple image processing functions + Version: @dist_version@ + Libs: -L@libdir@ -lucil @GLIB_PACKAGE_LIBS@ @PANGO_PACKAGE_LIBS@ @AVCODEC_PACKAGE_LIBS@ @THEORA_PACKAGE_LIBS@ @PNG_PACKAGE_LIBS@ -lm +-Cflags: -I@includedir@/unicap @GLIB_PACKAGE_CFLAGS@ @PANGO_PACKAGE_CFLAGS@ @AVCODEC_PACKAGE_CFLAGS@ @THEORA_PACKAGE_CFLAGS@ @PNG_PACKAGE_CFLAGS@ ++Cflags: -I@includedir@/unicap + Requires: libunicap pangoft2 glib-2.0 diff --git a/packages/unicap/unicap_0.9.3.bb b/packages/unicap/unicap_0.9.3.bb new file mode 100644 index 0000000000..c527c80819 --- /dev/null +++ b/packages/unicap/unicap_0.9.3.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "A uniform interface to video capture devices." +SECTION = "graphics" +LICENSE = "GPL" +DEPENDS = "intltool-native gtk+ libpng libxv" +PR = "r0" + +SRC_URI = "http://www.unicap-imaging.org/downloads/unicap-${PV}.tar.gz \ + file://pkgconfig.patch;patch=1" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} + +PACKAGES += "libucil libunicapgtk" + +FILES_${PN} = "${libdir}/libunicap.*so.* ${libdir}/unicap2/cpi/lib*.*so.*" +FILES_${PN}-dev += " ${libdir}/unicap2/cpi/lib*.*so ${libdir}/unicap2/cpi/lib*.*a" +FILES_${PN}-dbg += " ${libdir}/unicap2/cpi/.debug" +FILES_libucil = "${libdir}/libucil*so.*" +FILES_libunicapgtk = "${libdir}/libunicapgtk*so.*" -- cgit v1.2.3 From 748fa1c06fa6d1402dd6af1f86056b341a4c2cad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Sat, 18 Oct 2008 01:37:17 +0200 Subject: wt: add wt 2.2.0, a C++ Web Toolkit --- conf/checksums.ini | 4 ++++ packages/wt/files/cmakelist.patch | 8 ++++++++ packages/wt/wt_2.2.0.bb | 27 +++++++++++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 packages/wt/files/cmakelist.patch create mode 100644 packages/wt/wt_2.2.0.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 99c15e2e51..186ed0e926 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -15282,6 +15282,10 @@ sha256=f70b18243e049bbda66254388b6e94d404e747d913b8496d6e93a9c56bbf4af2 md5=eb06a9a05d3916addf9451297a558aa2 sha256=0c10e59dd079c4e5d9ec6eebe9a8ac0e1b9e472cccef49c705f87a78391e79fa +[http://downloads.sourceforge.net/witty/wt-2.2.0.tar.gz] +md5=c990186db06cf188cb267d12bc21e2da +sha256=f91445e5e1a02ee16f0bc1eb31a1cdfa53c4bb1e1cb4f76fae33436d472e9345 + [http://downloads.sourceforge.net/wvware/wv-1.2.0.tar.gz] md5=b6319d5e75611fe2210453b5feb82c0c sha256=a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4 diff --git a/packages/wt/files/cmakelist.patch b/packages/wt/files/cmakelist.patch new file mode 100644 index 0000000000..405914a4ed --- /dev/null +++ b/packages/wt/files/cmakelist.patch @@ -0,0 +1,8 @@ +diff -urN wt-2.2.0.orig/src/Wt/Ext/CMakeLists.txt wt-2.2.0/src/Wt/Ext/CMakeLists.txt +--- wt-2.2.0.orig/src/Wt/Ext/CMakeLists.txt 2008-07-15 08:25:54.000000000 +0200 ++++ wt-2.2.0/src/Wt/Ext/CMakeLists.txt 2008-10-17 22:37:38.000000000 +0200 +@@ -1,2 +1,3 @@ +-INSTALL_FILES(/include/Wt/Ext "...+[^Ch~]$") ++# avoid CMake* getting included ++INSTALL_FILES(/include/Wt/Ext "^[A-Z][a-z].*[^Ch~]$") + INSTALL_FILES(/include/Wt/Ext ExtDllDefs.h) diff --git a/packages/wt/wt_2.2.0.bb b/packages/wt/wt_2.2.0.bb new file mode 100644 index 0000000000..4bd1f37eb7 --- /dev/null +++ b/packages/wt/wt_2.2.0.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "A C++ Web Toolkit" +PRIORITY = "optional" +SECTION = "devel" +LICENSE = "GPL" +DEPENDS = "boost" +FILE_PR = "r1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz \ + file://cmakelist.patch;patch=1" + +FILES_${PN} += "${datadir}/Wt" +FILES_${PN}-dev += "${datadir}/cmake-2.*" + +inherit cmake + +STAGE_TEMP = "${WORKDIR}/temp-staging" + +do_stage() { + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake DESTDIR="${STAGE_TEMP}" install + cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} + cp -pPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} + cp -pPR ${STAGE_TEMP}/${datadir}/cmake-2.* ${STAGING_DATADIR} + rm -rf ${STAGE_TEMP} +} + -- cgit v1.2.3 From c437c4dab46da94299cf95e55b8a7ff644daf23f Mon Sep 17 00:00:00 2001 From: Thomas Kunze Date: Sat, 18 Oct 2008 01:40:09 +0200 Subject: base-files: remove custom fstab file for collie --- packages/base-files/base-files/collie/fstab | 13 ------------- packages/base-files/base-files_3.0.14.bb | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 packages/base-files/base-files/collie/fstab diff --git a/packages/base-files/base-files/collie/fstab b/packages/base-files/base-files/collie/fstab deleted file mode 100644 index c2e3f3c189..0000000000 --- a/packages/base-files/base-files/collie/fstab +++ /dev/null @@ -1,13 +0,0 @@ -/dev/mtdblock4 / jffs2 defaults 1 1 -proc /proc proc defaults 0 0 -/dev/hda1 /media/cf auto defaults,sync,noauto,noatime,user,exec,suid,gid=100,umask=0002 0 0 -tmpfs /var/volatile tmpfs mode=0755 0 0 -tmpfs /dev/shm tmpfs mode=0777 0 0 - -# we use a non-volatile ramdisk, see /etc/init.d/ramdisk -#tmpfs /media/ram tmpfs defaults 0 0 - -# SD/MMC in kernel 2.4 -#/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 -# SD/MMC in kernel 2.6 -/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 4a7a41ac57..31164e4bc1 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -FILE_PR = "r81" +FILE_PR = "r82" LICENSE = "GPL" SRC_URI = " \ -- cgit v1.2.3 From 40c92bda9d0c62a764623bfa5c20e02d3a08fa8a Mon Sep 17 00:00:00 2001 From: Thomas Kunze Date: Sat, 18 Oct 2008 02:00:51 +0200 Subject: pointercal: add file for collie --- packages/pointercal/files/collie/pointercal | 1 + packages/pointercal/pointercal_0.0.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100755 packages/pointercal/files/collie/pointercal diff --git a/packages/pointercal/files/collie/pointercal b/packages/pointercal/files/collie/pointercal new file mode 100755 index 0000000000..59a9f67251 --- /dev/null +++ b/packages/pointercal/files/collie/pointercal @@ -0,0 +1 @@ +24730 148 -1698140 -78 -18069 17111372 65536 diff --git a/packages/pointercal/pointercal_0.0.bb b/packages/pointercal/pointercal_0.0.bb index 00cdc12ad6..06a718b6ac 100644 --- a/packages/pointercal/pointercal_0.0.bb +++ b/packages/pointercal/pointercal_0.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Touchscreen calibration data" SECTION = "base" -FILE_PR = "r7" +FILE_PR = "r8" SRC_URI = "file://pointercal" S = "${WORKDIR}" -- cgit v1.2.3 From 869781d0526120e8881d18f812e58327b4568f28 Mon Sep 17 00:00:00 2001 From: Thomas Kunze Date: Sat, 18 Oct 2008 02:01:57 +0200 Subject: linux-rp: update collie patches * touchscreen works now * use old hacked sharp flash driver --- packages/linux/linux-rp-2.6.26/collie-ucbfix.patch | 28 + packages/linux/linux-rp-2.6.26/collie.patch | 883 ++++++++++++++++++--- packages/linux/linux-rp-2.6.26/defconfig-collie | 63 +- packages/linux/linux-rp_2.6.26.bb | 3 +- 4 files changed, 830 insertions(+), 147 deletions(-) create mode 100644 packages/linux/linux-rp-2.6.26/collie-ucbfix.patch diff --git a/packages/linux/linux-rp-2.6.26/collie-ucbfix.patch b/packages/linux/linux-rp-2.6.26/collie-ucbfix.patch new file mode 100644 index 0000000000..ea87e12197 --- /dev/null +++ b/packages/linux/linux-rp-2.6.26/collie-ucbfix.patch @@ -0,0 +1,28 @@ +commit 7f4ecbe6bd6515f65f2720117e5b7d69e1648960 +Author: Thomas Kunze +Date: Sat Oct 18 00:27:36 2008 +0200 + + fix ucb driver + +Index: linux-2.6.26/drivers/mfd/mcp-sa11x0.c +=================================================================== +--- linux-2.6.26.orig/drivers/mfd/mcp-sa11x0.c 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/drivers/mfd/mcp-sa11x0.c 2008-10-18 01:48:40.964009879 +0200 +@@ -27,6 +27,7 @@ + #include + + #include ++#include + + #include "mcp.h" + +@@ -169,6 +170,9 @@ + if (machine_is_assabet()) { + ASSABET_BCR_set(ASSABET_BCR_CODEC_RST); + } ++ if (machine_is_collie()) { ++ GPSR |= COLLIE_GPIO_UCB1x00_RESET; ++ } + + /* + * Setup the PPC unit correctly. diff --git a/packages/linux/linux-rp-2.6.26/collie.patch b/packages/linux/linux-rp-2.6.26/collie.patch index 6dad0027c6..750be8ecf3 100644 --- a/packages/linux/linux-rp-2.6.26/collie.patch +++ b/packages/linux/linux-rp-2.6.26/collie.patch @@ -1,8 +1,8 @@ -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index c7ad324..daa2e0a 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -998,7 +998,7 @@ config CPU_FREQ_SA1100 +Index: linux-2.6.26/arch/arm/Kconfig +=================================================================== +--- linux-2.6.26.orig/arch/arm/Kconfig 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/arch/arm/Kconfig 2008-10-17 18:15:31.391792839 +0200 +@@ -967,7 +967,7 @@ config CPU_FREQ_SA1110 bool @@ -11,11 +11,24 @@ index c7ad324..daa2e0a 100644 default y config CPU_FREQ_INTEGRATOR -diff --git a/arch/arm/mach-sa1100/dma.c b/arch/arm/mach-sa1100/dma.c -index e508028..36f726c 100644 ---- a/arch/arm/mach-sa1100/dma.c -+++ b/arch/arm/mach-sa1100/dma.c -@@ -39,7 +39,7 @@ typedef struct { +Index: linux-2.6.26/arch/arm/mach-sa1100/collie.c +=================================================================== +--- linux-2.6.26.orig/arch/arm/mach-sa1100/collie.c 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/arch/arm/mach-sa1100/collie.c 2008-10-17 18:15:31.391792839 +0200 +@@ -206,7 +206,7 @@ + } + + static struct flash_platform_data collie_flash_data = { +- .map_name = "cfi_probe", ++ .map_name = "sharp", + .set_vpp = collie_set_vpp, + .parts = collie_partitions, + .nr_parts = ARRAY_SIZE(collie_partitions), +Index: linux-2.6.26/arch/arm/mach-sa1100/dma.c +=================================================================== +--- linux-2.6.26.orig/arch/arm/mach-sa1100/dma.c 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/arch/arm/mach-sa1100/dma.c 2008-10-17 18:15:31.399789199 +0200 +@@ -39,7 +39,7 @@ static sa1100_dma_t dma_chan[SA1100_DMA_CHANNELS]; @@ -24,11 +37,11 @@ index e508028..36f726c 100644 static irqreturn_t dma_irq_handler(int irq, void *dev_id) -diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c -index 9caed30..79e19bf 100644 ---- a/drivers/input/keyboard/locomokbd.c -+++ b/drivers/input/keyboard/locomokbd.c -@@ -265,6 +265,7 @@ static int __devinit locomokbd_probe(struct locomo_dev *dev) +Index: linux-2.6.26/drivers/input/keyboard/locomokbd.c +=================================================================== +--- linux-2.6.26.orig/drivers/input/keyboard/locomokbd.c 2008-10-17 18:13:16.000000000 +0200 ++++ linux-2.6.26/drivers/input/keyboard/locomokbd.c 2008-10-17 18:15:31.403791239 +0200 +@@ -272,6 +272,7 @@ for (i = 0; i < LOCOMOKBD_NUMKEYS; i++) set_bit(locomokbd->keycode[i], input_dev->keybit); clear_bit(0, input_dev->keybit); @@ -36,11 +49,11 @@ index 9caed30..79e19bf 100644 /* attempt to get the interrupt */ err = request_irq(dev->irq[0], locomokbd_interrupt, 0, "locomokbd", locomokbd); -diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig -index 9f93c29..33fc5d6 100644 ---- a/drivers/mfd/Kconfig -+++ b/drivers/mfd/Kconfig -@@ -72,4 +72,10 @@ config MCP_UCB1200_TS +Index: linux-2.6.26/drivers/mfd/Kconfig +=================================================================== +--- linux-2.6.26.orig/drivers/mfd/Kconfig 2008-10-17 18:13:21.000000000 +0200 ++++ linux-2.6.26/drivers/mfd/Kconfig 2008-10-17 18:15:31.403791239 +0200 +@@ -77,4 +77,10 @@ tristate "Touchscreen interface support" depends on MCP_UCB1200 && INPUT @@ -51,11 +64,11 @@ index 9f93c29..33fc5d6 100644 + Driver for touchscreen on collie - sharp sl-5500. + endmenu -diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile -index 33daa2f..0885ccd 100644 ---- a/drivers/mfd/Makefile -+++ b/drivers/mfd/Makefile -@@ -16,7 +16,7 @@ obj-$(CONFIG_MCP) += mcp-core.o +Index: linux-2.6.26/drivers/mfd/Makefile +=================================================================== +--- linux-2.6.26.orig/drivers/mfd/Makefile 2008-10-17 18:13:21.000000000 +0200 ++++ linux-2.6.26/drivers/mfd/Makefile 2008-10-17 18:15:31.407791679 +0200 +@@ -14,7 +14,7 @@ obj-$(CONFIG_MCP_SA11X0) += mcp-sa11x0.o obj-$(CONFIG_MCP_UCB1200) += ucb1x00-core.o obj-$(CONFIG_MCP_UCB1200_TS) += ucb1x00-ts.o @@ -64,11 +77,10 @@ index 33daa2f..0885ccd 100644 ifeq ($(CONFIG_SA1100_ASSABET),y) obj-$(CONFIG_MCP_UCB1200) += ucb1x00-assabet.o endif -diff --git a/drivers/mfd/collie-ts.c b/drivers/mfd/collie-ts.c -new file mode 100644 -index 0000000..ddde5fc ---- /dev/null -+++ b/drivers/mfd/collie-ts.c +Index: linux-2.6.26/drivers/mfd/collie-ts.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.26/drivers/mfd/collie-ts.c 2008-10-17 18:15:31.415790559 +0200 @@ -0,0 +1,449 @@ +/* + * Touchscreen driver for UCB1x00-based touchscreens @@ -103,9 +115,9 @@ index 0000000..ddde5fc +#include +#include +#include ++#include + +#include -+#include +#include +#include + @@ -519,10 +531,10 @@ index 0000000..ddde5fc +MODULE_AUTHOR("Russell King "); +MODULE_DESCRIPTION("UCB1x00 touchscreen driver"); +MODULE_LICENSE("GPL"); -diff --git a/drivers/mfd/ucb1x00.h b/drivers/mfd/ucb1x00.h -index a8ad8a0..137b043 100644 ---- a/drivers/mfd/ucb1x00.h -+++ b/drivers/mfd/ucb1x00.h +Index: linux-2.6.26/drivers/mfd/ucb1x00.h +=================================================================== +--- linux-2.6.26.orig/drivers/mfd/ucb1x00.h 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/drivers/mfd/ucb1x00.h 2008-10-17 18:15:31.415790559 +0200 @@ -34,7 +34,10 @@ #define UCB_IE_TCLIP (1 << 14) #define UCB_IE_ACLIP (1 << 15) @@ -534,28 +546,719 @@ index a8ad8a0..137b043 100644 #define UCB_TC_A 0x05 #define UCB_TC_A_LOOP (1 << 7) /* UCB1200 */ -diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c -index c7d5a52..215bec2 100644 ---- a/drivers/mtd/maps/sa1100-flash.c -+++ b/drivers/mtd/maps/sa1100-flash.c -@@ -210,6 +210,12 @@ static int sa1100_probe_subdev(struct sa_subdev_info *subdev, struct resource *r +Index: linux-2.6.26/drivers/mtd/chips/Kconfig +=================================================================== +--- linux-2.6.26.orig/drivers/mtd/chips/Kconfig 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/drivers/mtd/chips/Kconfig 2008-10-17 18:15:31.419791479 +0200 +@@ -239,5 +239,13 @@ + used for XIP purposes. If you're not sure what this is all about + then say N. + ++config MTD_SHARP ++ tristate "pre-CFI Sharp chip support" ++ depends on MTD ++ help ++ This option enables support for flash chips using Sharp-compatible ++ commands, including some which are not CFI-compatible and hence ++ cannot be used with the CONFIG_MTD_CFI_INTELxxx options. ++ + endmenu + +Index: linux-2.6.26/drivers/mtd/chips/Makefile +=================================================================== +--- linux-2.6.26.orig/drivers/mtd/chips/Makefile 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/drivers/mtd/chips/Makefile 2008-10-17 18:15:31.419791479 +0200 +@@ -12,4 +12,5 @@ + obj-$(CONFIG_MTD_JEDECPROBE) += jedec_probe.o + obj-$(CONFIG_MTD_RAM) += map_ram.o + obj-$(CONFIG_MTD_ROM) += map_rom.o ++obj-$(CONFIG_MTD_SHARP) += sharp.o + obj-$(CONFIG_MTD_ABSENT) += map_absent.o +Index: linux-2.6.26/drivers/mtd/chips/sharp.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.26/drivers/mtd/chips/sharp.c 2008-10-17 18:15:31.423790399 +0200 +@@ -0,0 +1,645 @@ ++/* ++ * MTD chip driver for pre-CFI Sharp flash chips ++ * ++ * Copyright 2000,2001 David A. Schleef ++ * 2000,2001 Lineo, Inc. ++ * ++ * $Id: sharp.c,v 1.17 2005/11/29 14:28:28 gleixner Exp $ ++ * ++ * Devices supported: ++ * LH28F016SCT Symmetrical block flash memory, 2Mx8 ++ * LH28F008SCT Symmetrical block flash memory, 1Mx8 ++ * ++ * Documentation: ++ * http://www.sharpmeg.com/datasheets/memic/flashcmp/ ++ * http://www.sharpmeg.com/datasheets/memic/flashcmp/01symf/16m/016sctl9.pdf ++ * 016sctl9.pdf ++ * ++ * Limitations: ++ * This driver only supports 4x1 arrangement of chips. ++ * Not tested on anything but PowerPC. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define CMD_RESET 0xffffffff ++#define CMD_READ_ID 0x90909090 ++#define CMD_READ_STATUS 0x70707070 ++#define CMD_CLEAR_STATUS 0x50505050 ++#define CMD_BLOCK_ERASE_1 0x20202020 ++#define CMD_BLOCK_ERASE_2 0xd0d0d0d0 ++#define CMD_BYTE_WRITE 0x40404040 ++#define CMD_SUSPEND 0xb0b0b0b0 ++#define CMD_RESUME 0xd0d0d0d0 ++#define CMD_SET_BLOCK_LOCK_1 0x60606060 ++#define CMD_SET_BLOCK_LOCK_2 0x01010101 ++#define CMD_SET_MASTER_LOCK_1 0x60606060 ++#define CMD_SET_MASTER_LOCK_2 0xf1f1f1f1 ++#define CMD_CLEAR_BLOCK_LOCKS_1 0x60606060 ++#define CMD_CLEAR_BLOCK_LOCKS_2 0xd0d0d0d0 ++ ++#define SR_READY 0x80808080 // 1 = ready ++#define SR_ERASE_SUSPEND 0x40404040 // 1 = block erase suspended ++#define SR_ERROR_ERASE 0x20202020 // 1 = error in block erase or clear lock bits ++#define SR_ERROR_WRITE 0x10101010 // 1 = error in byte write or set lock bit ++#define SR_VPP 0x08080808 // 1 = Vpp is low ++#define SR_WRITE_SUSPEND 0x04040404 // 1 = byte write suspended ++#define SR_PROTECT 0x02020202 // 1 = lock bit set ++#define SR_RESERVED 0x01010101 ++ ++#define SR_ERRORS (SR_ERROR_ERASE|SR_ERROR_WRITE|SR_VPP|SR_PROTECT) ++ ++#define BLOCK_MASK 0xfffe0000 ++ ++/* Configuration options */ ++ ++#define AUTOUNLOCK /* automatically unlocks blocks before erasing */ ++ ++static struct mtd_info *sharp_probe(struct map_info *); ++ ++static int sharp_probe_map(struct map_info *map, struct mtd_info *mtd); ++ ++static int sharp_read(struct mtd_info *mtd, loff_t from, size_t len, ++ size_t *retlen, u_char *buf); ++static int sharp_write(struct mtd_info *mtd, loff_t from, size_t len, ++ size_t *retlen, const u_char *buf); ++static int sharp_erase(struct mtd_info *mtd, struct erase_info *instr); ++static void sharp_sync(struct mtd_info *mtd); ++static int sharp_suspend(struct mtd_info *mtd); ++static void sharp_resume(struct mtd_info *mtd); ++static void sharp_destroy(struct mtd_info *mtd); ++ ++static int sharp_write_oneword(struct map_info *map, struct flchip *chip, ++ unsigned long adr, __u32 datum); ++static int sharp_erase_oneblock(struct map_info *map, struct flchip *chip, ++ unsigned long adr); ++#ifdef AUTOUNLOCK ++static inline void sharp_unlock_oneblock(struct map_info *map, struct flchip *chip, ++ unsigned long adr); ++#endif ++ ++ ++struct sharp_info{ ++ struct flchip *chip; ++ int bogus; ++ int chipshift; ++ int numchips; ++ struct flchip chips[1]; ++}; ++ ++static void sharp_destroy(struct mtd_info *mtd); ++ ++static struct mtd_chip_driver sharp_chipdrv = { ++ .probe = sharp_probe, ++ .destroy = sharp_destroy, ++ .name = "sharp", ++ .module = THIS_MODULE ++}; ++ ++static void sharp_udelay(unsigned long i) { ++ if (in_interrupt()) { ++ udelay(i); ++ } else { ++ schedule(); ++ } ++} ++ ++static struct mtd_info *sharp_probe(struct map_info *map) ++{ ++ struct mtd_info *mtd = NULL; ++ struct sharp_info *sharp = NULL; ++ int width; ++ ++ mtd = kzalloc(sizeof(*mtd), GFP_KERNEL); ++ if(!mtd) ++ return NULL; ++ ++ sharp = kzalloc(sizeof(*sharp), GFP_KERNEL); ++ if(!sharp) { ++ kfree(mtd); ++ return NULL; ++ } ++ ++ width = sharp_probe_map(map,mtd); ++ if(!width){ ++ kfree(mtd); ++ kfree(sharp); ++ return NULL; ++ } ++ ++ mtd->priv = map; ++ mtd->type = MTD_NORFLASH; ++ mtd->erase = sharp_erase; ++ mtd->read = sharp_read; ++ mtd->write = sharp_write; ++ mtd->sync = sharp_sync; ++ mtd->suspend = sharp_suspend; ++ mtd->resume = sharp_resume; ++ mtd->flags = MTD_CAP_NORFLASH; ++ mtd->writesize = 1; ++ mtd->name = map->name; ++ ++ sharp->chipshift = 24; ++ sharp->numchips = 1; ++ sharp->chips[0].start = 0; ++ sharp->chips[0].state = FL_READY; ++ sharp->chips[0].mutex = &sharp->chips[0]._spinlock; ++ sharp->chips[0].word_write_time = 0; ++ init_waitqueue_head(&sharp->chips[0].wq); ++ spin_lock_init(&sharp->chips[0]._spinlock); ++ ++ map->fldrv = &sharp_chipdrv; ++ map->fldrv_priv = sharp; ++ ++ __module_get(THIS_MODULE); ++ return mtd; ++} ++ ++static inline void sharp_send_cmd(struct map_info *map, unsigned long cmd, unsigned long adr) ++{ ++ map_word map_cmd; ++ map_cmd.x[0] = cmd; ++ map_write(map, map_cmd, adr); ++} ++ ++static int sharp_probe_map(struct map_info *map,struct mtd_info *mtd) ++{ ++ map_word tmp, read0, read4; ++ unsigned long base = 0; ++ int width = 4; ++ ++ tmp = map_read(map, base+0); ++ ++ sharp_send_cmd(map, CMD_READ_ID, base+0); ++ ++ read0 = map_read(map, base+0); ++ read4 = map_read(map, base+4); ++ if (read0.x[0] == 0x00b000b0) { ++ printk("Sharp chip, %lx, %lx, width = %d\n", read0.x[0], read4.x[0], width); ++ /* Prints b000b0, b000b0, width = 4 on collie */ ++ switch(read4.x[0]){ ++ case 0xaaaaaaaa: ++ case 0xa0a0a0a0: ++ /* aa - LH28F016SCT-L95 2Mx8, 32 64k blocks*/ ++ /* a0 - LH28F016SCT-Z4 2Mx8, 32 64k blocks*/ ++ mtd->erasesize = 0x10000 * width; ++ mtd->size = 0x200000 * width; ++ return width; ++ case 0xa6a6a6a6: ++ /* a6 - LH28F008SCT-L12 1Mx8, 16 64k blocks*/ ++ /* a6 - LH28F008SCR-L85 1Mx8, 16 64k blocks*/ ++ mtd->erasesize = 0x10000 * width; ++ mtd->size = 0x100000 * width; ++ return width; ++ case 0x00b000b0: ++ /* a6 - LH28F640BFHE 8 64k * 2 chip blocks*/ ++ mtd->erasesize = 0x10000 * width / 2; ++ mtd->size = 0x800000 * width / 2; ++ return width; ++ default: ++ printk("Sort-of looks like sharp flash, 0x%08lx 0x%08lx\n", ++ read0.x[0], read4.x[0]); ++ } ++ } else if ((map_read(map, base+0).x[0] == CMD_READ_ID)){ ++ /* RAM, probably */ ++ printk("Looks like RAM\n"); ++ map_write(map, tmp, base+0); ++ }else{ ++ printk("Doesn't look like sharp flash, 0x%08lx 0x%08lx\n", ++ read0.x[0], read4.x[0]); ++ } ++ ++ return 0; ++} ++ ++/* This function returns with the chip->mutex lock held. */ ++static int sharp_wait(struct map_info *map, struct flchip *chip) ++{ ++ map_word status; ++ unsigned long timeo = jiffies + HZ; ++ DECLARE_WAITQUEUE(wait, current); ++ int adr = 0; ++ ++retry: ++ spin_lock_bh(chip->mutex); ++ ++ switch (chip->state) { ++ case FL_READY: ++ sharp_send_cmd(map, CMD_READ_STATUS, adr); ++ chip->state = FL_STATUS; ++ case FL_STATUS: ++ status = map_read(map, adr); ++ if ((status.x[0] & SR_READY) == SR_READY) ++ break; ++ spin_unlock_bh(chip->mutex); ++ if (time_after(jiffies, timeo)) { ++ printk("Waiting for chip to be ready timed out in erase\n"); ++ return -EIO; ++ } ++ sharp_udelay(1); ++ goto retry; ++ default: ++ set_current_state(TASK_INTERRUPTIBLE); ++ add_wait_queue(&chip->wq, &wait); ++ ++ spin_unlock_bh(chip->mutex); ++ ++ sharp_udelay(1); ++ ++ set_current_state(TASK_RUNNING); ++ remove_wait_queue(&chip->wq, &wait); ++ ++ if(signal_pending(current)) ++ return -EINTR; ++ ++ timeo = jiffies + HZ; ++ ++ goto retry; ++ } ++ ++ sharp_send_cmd(map, CMD_RESET, adr); ++ ++ chip->state = FL_READY; ++ ++ return 0; ++} ++ ++static void sharp_release(struct flchip *chip) ++{ ++ wake_up(&chip->wq); ++ spin_unlock_bh(chip->mutex); ++} ++ ++static int sharp_read(struct mtd_info *mtd, loff_t from, size_t len, ++ size_t *retlen, u_char *buf) ++{ ++ struct map_info *map = mtd->priv; ++ struct sharp_info *sharp = map->fldrv_priv; ++ int chipnum; ++ int ret = 0; ++ int ofs = 0; ++ ++ chipnum = (from >> sharp->chipshift); ++ ofs = from & ((1 << sharp->chipshift)-1); ++ ++ *retlen = 0; ++ ++ while(len){ ++ unsigned long thislen; ++ ++ if(chipnum>=sharp->numchips) ++ break; ++ ++ thislen = len; ++ if(ofs+thislen >= (1<chipshift)) ++ thislen = (1<chipshift) - ofs; ++ ++ ret = sharp_wait(map,&sharp->chips[chipnum]); ++ if(ret<0) ++ break; ++ ++ map_copy_from(map,buf,ofs,thislen); ++ ++ sharp_release(&sharp->chips[chipnum]); ++ ++ *retlen += thislen; ++ len -= thislen; ++ buf += thislen; ++ ++ ofs = 0; ++ chipnum++; ++ } ++ return ret; ++} ++ ++static int sharp_write(struct mtd_info *mtd, loff_t to, size_t len, ++ size_t *retlen, const u_char *buf) ++{ ++ struct map_info *map = mtd->priv; ++ struct sharp_info *sharp = map->fldrv_priv; ++ int ret = 0; ++ int i,j; ++ int chipnum; ++ unsigned long ofs; ++ union { u32 l; unsigned char uc[4]; } tbuf; ++ ++ *retlen = 0; ++ ++ while(len){ ++ tbuf.l = 0xffffffff; ++ chipnum = to >> sharp->chipshift; ++ ofs = to & ((1<chipshift)-1); ++ ++ j=0; ++ for(i=ofs&3;i<4 && len;i++){ ++ tbuf.uc[i] = *buf; ++ buf++; ++ to++; ++ len--; ++ j++; ++ } ++ sharp_write_oneword(map, &sharp->chips[chipnum], ofs&~3, tbuf.l); ++ if(ret<0) ++ return ret; ++ (*retlen)+=j; ++ } ++ ++ return 0; ++} ++ ++static int sharp_write_oneword(struct map_info *map, struct flchip *chip, ++ unsigned long adr, __u32 datum) ++{ ++ int ret; ++ int try; ++ int i; ++ map_word data, status; ++ ++ status.x[0] = 0; ++ ret = sharp_wait(map,chip); ++ if (ret < 0) ++ return ret; ++ ++ for (try=0; try<10; try++) { ++ long timeo; ++ ++ sharp_send_cmd(map, CMD_BYTE_WRITE, adr); ++ /* cpu_to_le32 -> hack to fix the writel be->le conversion */ ++ data.x[0] = cpu_to_le32(datum); ++ map_write(map, data, adr); ++ ++ chip->state = FL_WRITING; ++ timeo = jiffies + (HZ/2); ++ ++ sharp_send_cmd(map, CMD_READ_STATUS, adr); ++ for(i=0;i<100;i++){ ++ status = map_read(map, adr); ++ if((status.x[0] & SR_READY) == SR_READY) ++ break; ++ } ++#ifdef AUTOUNLOCK ++ if (status.x[0] & SR_PROTECT) { /* lock block */ ++ sharp_send_cmd(map, CMD_CLEAR_STATUS, adr); ++ sharp_unlock_oneblock(map,chip,adr); ++ sharp_send_cmd(map, CMD_CLEAR_STATUS, adr); ++ sharp_send_cmd(map, CMD_RESET, adr); ++ continue; ++ } ++#endif ++ if(i==100){ ++ printk("sharp: timed out writing\n"); ++ } ++ ++ if (!(status.x[0] & SR_ERRORS)) ++ break; ++ ++ printk("sharp: error writing byte at addr=%08lx status=%08lx\n", adr, status.x[0]); ++ ++ sharp_send_cmd(map, CMD_CLEAR_STATUS, adr); ++ } ++ sharp_send_cmd(map, CMD_RESET, adr); ++ chip->state = FL_READY; ++ ++ sharp_release(chip); ++ ++ return 0; ++} ++ ++static int sharp_erase(struct mtd_info *mtd, struct erase_info *instr) ++{ ++ struct map_info *map = mtd->priv; ++ struct sharp_info *sharp = map->fldrv_priv; ++ unsigned long adr,len; ++ int chipnum, ret=0; ++ ++ if(instr->addr & (mtd->erasesize - 1)) ++ return -EINVAL; ++ if(instr->len & (mtd->erasesize - 1)) ++ return -EINVAL; ++ if(instr->len + instr->addr > mtd->size) ++ return -EINVAL; ++ ++ chipnum = instr->addr >> sharp->chipshift; ++ adr = instr->addr & ((1<chipshift)-1); ++ len = instr->len; ++ ++ while(len){ ++ ret = sharp_erase_oneblock(map, &sharp->chips[chipnum], adr); ++ if(ret)return ret; ++ ++ if (adr >= 0xfe0000) { ++ adr += mtd->erasesize / 8; ++ len -= mtd->erasesize / 8; ++ } else { ++ adr += mtd->erasesize; ++ len -= mtd->erasesize; ++ } ++ if(adr >> sharp->chipshift){ ++ adr = 0; ++ chipnum++; ++ if(chipnum>=sharp->numchips) ++ break; ++ } ++ } ++ ++ instr->state = MTD_ERASE_DONE; ++ mtd_erase_callback(instr); ++ ++ return 0; ++} ++ ++static inline int sharp_do_wait_for_ready(struct map_info *map, struct flchip *chip, ++ unsigned long adr) ++{ ++ int ret; ++ unsigned long timeo; ++ map_word status; ++ DECLARE_WAITQUEUE(wait, current); ++ ++ sharp_send_cmd(map, CMD_READ_STATUS, adr); ++ status = map_read(map, adr); ++ ++ timeo = jiffies + HZ * 10; ++ ++ while (time_before(jiffies, timeo)) { ++ sharp_send_cmd(map, CMD_READ_STATUS, adr); ++ status = map_read(map, adr); ++ if ((status.x[0] & SR_READY) == SR_READY) { ++ ret = 0; ++ goto out; ++ } ++ set_current_state(TASK_INTERRUPTIBLE); ++ add_wait_queue(&chip->wq, &wait); ++ ++ spin_unlock_bh(chip->mutex); ++ ++ schedule_timeout(1); ++ schedule(); ++ ++ spin_lock_bh(chip->mutex); ++ ++ remove_wait_queue(&chip->wq, &wait); ++ set_current_state(TASK_RUNNING); ++ } ++ ret = -ETIME; ++out: ++ return ret; ++} ++ ++static int sharp_erase_oneblock(struct map_info *map, struct flchip *chip, ++ unsigned long adr) ++{ ++ int ret; ++ map_word status; ++ ++ ret = sharp_wait(map,chip); ++ if (ret < 0) ++ return ret; ++ ++#ifdef AUTOUNLOCK ++ /* This seems like a good place to do an unlock */ ++ sharp_unlock_oneblock(map,chip,adr); ++#endif ++ ++ sharp_send_cmd(map, CMD_BLOCK_ERASE_1, adr); ++ sharp_send_cmd(map, CMD_BLOCK_ERASE_2, adr); ++ ++ chip->state = FL_ERASING; ++ ++ ret = sharp_do_wait_for_ready(map,chip,adr); ++ if(ret<0) { ++ spin_unlock_bh(chip->mutex); ++ return ret; ++ } ++ ++ sharp_send_cmd(map, CMD_READ_STATUS, adr); ++ status = map_read(map, adr); ++ ++ if (!(status.x[0] & SR_ERRORS)) { ++ sharp_send_cmd(map, CMD_RESET, adr); ++ chip->state = FL_READY; ++ spin_unlock_bh(chip->mutex); ++ return 0; ++ } ++ ++ printk("sharp: error erasing block at addr=%08lx status=%08lx\n", adr, status.x[0]); ++ sharp_send_cmd(map, CMD_CLEAR_STATUS, adr); ++ ++ sharp_release(chip); ++ ++ return -EIO; ++} ++ ++#ifdef AUTOUNLOCK ++static inline void sharp_unlock_oneblock(struct map_info *map, struct flchip *chip, ++ unsigned long adr) ++{ ++ map_word status; ++ ++ sharp_send_cmd(map, CMD_CLEAR_BLOCK_LOCKS_1, adr & BLOCK_MASK); ++ sharp_send_cmd(map, CMD_CLEAR_BLOCK_LOCKS_2, adr & BLOCK_MASK); ++ ++ sharp_do_wait_for_ready(map,chip,adr); ++ ++ status = map_read(map, adr); ++ ++ if (!(status.x[0] & SR_ERRORS)) { ++ sharp_send_cmd(map, CMD_RESET, adr); ++ chip->state = FL_READY; ++ return; ++ } ++ ++ printk("sharp: error unlocking block at addr=%08lx status=%08lx\n", adr, status.x[0]); ++ sharp_send_cmd(map, CMD_CLEAR_STATUS, adr); ++} ++#endif ++ ++static void sharp_sync(struct mtd_info *mtd) ++{ ++} ++ ++static int sharp_suspend(struct mtd_info *mtd) ++{ ++ struct map_info *map = mtd->priv; ++ struct sharp_info *sharp = map->fldrv_priv; ++ int i; ++ struct flchip *chip; ++ int ret = 0; ++ ++ for (i = 0; !ret && i < sharp->numchips; i++) { ++ chip = &sharp->chips[i]; ++ ret = sharp_wait(map,chip); ++ ++ if (ret) { ++ ret = -EAGAIN; ++ } else { ++ chip->state = FL_PM_SUSPENDED; ++ spin_unlock_bh(chip->mutex); ++ } ++ } ++ return ret; ++} ++ ++static void sharp_resume(struct mtd_info *mtd) ++{ ++ struct map_info *map = mtd->priv; ++ struct sharp_info *sharp = map->fldrv_priv; ++ int i; ++ struct flchip *chip; ++ ++ for (i = 0; i < sharp->numchips; i++) { ++ chip = &sharp->chips[i]; ++ ++ spin_lock_bh(chip->mutex); ++ ++ if (chip->state == FL_PM_SUSPENDED) { ++ /* We need to force it back to a known state */ ++ sharp_send_cmd(map, CMD_RESET, chip->start); ++ chip->state = FL_READY; ++ wake_up(&chip->wq); ++ } ++ ++ spin_unlock_bh(chip->mutex); ++ } ++} ++ ++static void sharp_destroy(struct mtd_info *mtd) ++{ ++ struct map_info *map = mtd->priv; ++ struct sharp_info *sharp = map->fldrv_priv; ++ ++ kfree(sharp); ++} ++ ++static int __init sharp_probe_init(void) ++{ ++ printk("MTD Sharp chip driver \n"); ++ ++ register_mtd_chip_driver(&sharp_chipdrv); ++ ++ return 0; ++} ++ ++static void __exit sharp_probe_exit(void) ++{ ++ unregister_mtd_chip_driver(&sharp_chipdrv); ++} ++ ++module_init(sharp_probe_init); ++module_exit(sharp_probe_exit); ++ ++ ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("David Schleef "); ++MODULE_DESCRIPTION("Old MTD chip driver for pre-CFI Sharp flash chips"); +Index: linux-2.6.26/drivers/mtd/maps/Kconfig +=================================================================== +--- linux-2.6.26.orig/drivers/mtd/maps/Kconfig 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/drivers/mtd/maps/Kconfig 2008-10-17 18:15:31.431789839 +0200 +@@ -392,7 +392,7 @@ + + config MTD_SA1100 + tristate "CFI Flash device mapped on StrongARM SA11x0" +- depends on MTD_CFI && ARCH_SA1100 && MTD_PARTITIONS ++ depends on (MTD_CFI || MTD_SHARP) && ARCH_SA1100 && MTD_PARTITIONS + help + This enables access to the flash chips on most platforms based on + the SA1100 and SA1110, including the Assabet and the Compaq iPAQ. +Index: linux-2.6.26/drivers/mtd/maps/sa1100-flash.c +=================================================================== +--- linux-2.6.26.orig/drivers/mtd/maps/sa1100-flash.c 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/drivers/mtd/maps/sa1100-flash.c 2008-10-17 18:15:31.431789839 +0200 +@@ -210,6 +210,12 @@ goto err; } subdev->mtd->owner = THIS_MODULE; + +#ifdef CONFIG_SA1100_COLLIE + /* collie flash starts locked */ -+ if (subdev->mtd->unlock) -+ subdev->mtd->unlock(subdev->mtd, 0xc0000, subdev->mtd->size - 0xc0000); ++// if (subdev->mtd->unlock) ++// subdev->mtd->unlock(subdev->mtd, 0xc0000, subdev->mtd->size - 0xc0000); +#endif printk(KERN_INFO "SA1100 flash: CFI device at 0x%08lx, %dMiB, " "%d-bit\n", phys, subdev->mtd->size >> 20, -diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c -index 3b4e55c..0ae741d 100644 ---- a/drivers/net/wireless/hostap/hostap_cs.c -+++ b/drivers/net/wireless/hostap/hostap_cs.c -@@ -35,7 +35,7 @@ static int ignore_cis_vcc; +Index: linux-2.6.26/drivers/net/wireless/hostap/hostap_cs.c +=================================================================== +--- linux-2.6.26.orig/drivers/net/wireless/hostap/hostap_cs.c 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/drivers/net/wireless/hostap/hostap_cs.c 2008-10-17 18:15:31.435790279 +0200 +@@ -35,7 +35,7 @@ module_param(ignore_cis_vcc, int, 0444); MODULE_PARM_DESC(ignore_cis_vcc, "Ignore broken CIS VCC entry"); @@ -564,7 +1267,7 @@ index 3b4e55c..0ae741d 100644 /* struct local_info::hw_priv */ struct hostap_cs_priv { dev_node_t node; -@@ -499,11 +499,13 @@ static int hostap_cs_probe(struct pcmcia_device *p_dev) +@@ -499,11 +499,13 @@ PDEBUG(DEBUG_HW, "%s: setting Vcc=33 (constant)\n", dev_info); p_dev->conf.IntType = INT_MEMORY_AND_IO; @@ -579,10 +1282,10 @@ index 3b4e55c..0ae741d 100644 return ret; } -diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c -index 13d5882..6f24d66 100644 ---- a/drivers/net/wireless/hostap/hostap_hw.c -+++ b/drivers/net/wireless/hostap/hostap_hw.c +Index: linux-2.6.26/drivers/net/wireless/hostap/hostap_hw.c +=================================================================== +--- linux-2.6.26.orig/drivers/net/wireless/hostap/hostap_hw.c 2008-10-17 18:13:21.000000000 +0200 ++++ linux-2.6.26/drivers/net/wireless/hostap/hostap_hw.c 2008-10-17 18:15:31.443789719 +0200 @@ -54,6 +54,7 @@ #include "hostap.h" #include "hostap_ap.h" @@ -591,7 +1294,7 @@ index 13d5882..6f24d66 100644 /* #define final_version */ -@@ -1497,6 +1498,8 @@ static int prism2_hw_config(struct net_device *dev, int initial) +@@ -1534,6 +1535,8 @@ if (local->hw_downloading) return 1; @@ -600,7 +1303,7 @@ index 13d5882..6f24d66 100644 if (prism2_hw_init(dev, initial)) { return local->no_pri ? 0 : 1; } -@@ -2628,8 +2631,15 @@ static irqreturn_t prism2_interrupt(int irq, void *dev_id) +@@ -2665,8 +2668,15 @@ int events = 0; u16 ev; @@ -616,12 +1319,12 @@ index 13d5882..6f24d66 100644 + iface = netdev_priv(dev); + local = iface->local; - prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INTERRUPT, 0, 0); - -diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c -index 3a874fc..df58aa3 100644 ---- a/drivers/net/wireless/hostap/hostap_pci.c -+++ b/drivers/net/wireless/hostap/hostap_pci.c + if(dev->base_addr == 0) + { +Index: linux-2.6.26/drivers/net/wireless/hostap/hostap_pci.c +=================================================================== +--- linux-2.6.26.orig/drivers/net/wireless/hostap/hostap_pci.c 2008-10-17 18:13:18.000000000 +0200 ++++ linux-2.6.26/drivers/net/wireless/hostap/hostap_pci.c 2008-10-17 18:15:31.447790279 +0200 @@ -19,6 +19,7 @@ #include "hostap_wlan.h" @@ -630,10 +1333,10 @@ index 3a874fc..df58aa3 100644 static char *dev_info = "hostap_pci"; -diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c -index cbf15d7..4475174 100644 ---- a/drivers/net/wireless/hostap/hostap_plx.c -+++ b/drivers/net/wireless/hostap/hostap_plx.c +Index: linux-2.6.26/drivers/net/wireless/hostap/hostap_plx.c +=================================================================== +--- linux-2.6.26.orig/drivers/net/wireless/hostap/hostap_plx.c 2008-10-17 18:13:18.000000000 +0200 ++++ linux-2.6.26/drivers/net/wireless/hostap/hostap_plx.c 2008-10-17 18:15:31.451790719 +0200 @@ -21,7 +21,7 @@ #include @@ -643,11 +1346,11 @@ index cbf15d7..4475174 100644 static char *dev_info = "hostap_plx"; -diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c -index c5b2a44..eecbe8c 100644 ---- a/drivers/pcmcia/sa1100_generic.c -+++ b/drivers/pcmcia/sa1100_generic.c -@@ -81,13 +81,14 @@ static int sa11x0_drv_pcmcia_probe(struct device *dev) +Index: linux-2.6.26/drivers/pcmcia/sa1100_generic.c +=================================================================== +--- linux-2.6.26.orig/drivers/pcmcia/sa1100_generic.c 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/drivers/pcmcia/sa1100_generic.c 2008-10-17 18:15:31.459789719 +0200 +@@ -81,13 +81,14 @@ return ret; } @@ -669,7 +1372,7 @@ index c5b2a44..eecbe8c 100644 }; /* sa11x0_pcmcia_init() -@@ -100,7 +101,7 @@ static struct device_driver sa11x0_pcmcia_driver = { +@@ -100,7 +101,7 @@ */ static int __init sa11x0_pcmcia_init(void) { @@ -678,7 +1381,7 @@ index c5b2a44..eecbe8c 100644 } /* sa11x0_pcmcia_exit() -@@ -110,7 +111,7 @@ static int __init sa11x0_pcmcia_init(void) +@@ -110,7 +111,7 @@ */ static void __exit sa11x0_pcmcia_exit(void) { @@ -687,11 +1390,11 @@ index c5b2a44..eecbe8c 100644 } MODULE_AUTHOR("John Dorsey "); -diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig -index 66ec5d8..aba38d7 100644 ---- a/drivers/spi/Kconfig -+++ b/drivers/spi/Kconfig -@@ -123,6 +123,10 @@ config SPI_MPC52xx_PSC +Index: linux-2.6.26/drivers/spi/Kconfig +=================================================================== +--- linux-2.6.26.orig/drivers/spi/Kconfig 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/drivers/spi/Kconfig 2008-10-17 18:15:31.463790519 +0200 +@@ -123,6 +123,10 @@ This enables using the Freescale MPC52xx Programmable Serial Controller in master SPI mode. @@ -702,11 +1405,11 @@ index 66ec5d8..aba38d7 100644 config SPI_MPC83xx tristate "Freescale MPC83xx/QUICC Engine SPI controller" depends on SPI_MASTER && (PPC_83xx || QUICC_ENGINE) && EXPERIMENTAL -diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile -index 7fca043..b89992b 100644 ---- a/drivers/spi/Makefile -+++ b/drivers/spi/Makefile -@@ -28,6 +28,7 @@ obj-$(CONFIG_SPI_S3C24XX) += spi_s3c24xx.o +Index: linux-2.6.26/drivers/spi/Makefile +=================================================================== +--- linux-2.6.26.orig/drivers/spi/Makefile 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/drivers/spi/Makefile 2008-10-17 18:15:31.463790519 +0200 +@@ -28,6 +28,7 @@ obj-$(CONFIG_SPI_TXX9) += spi_txx9.o obj-$(CONFIG_SPI_XILINX) += xilinx_spi.o obj-$(CONFIG_SPI_SH_SCI) += spi_sh_sci.o @@ -714,11 +1417,10 @@ index 7fca043..b89992b 100644 # ... add above this line ... # SPI protocol drivers (device/link on bus) -diff --git a/drivers/spi/locomo_spi.c b/drivers/spi/locomo_spi.c -new file mode 100644 -index 0000000..d3a4bd9 ---- /dev/null -+++ b/drivers/spi/locomo_spi.c +Index: linux-2.6.26/drivers/spi/locomo_spi.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.26/drivers/spi/locomo_spi.c 2008-10-17 18:15:31.471790439 +0200 @@ -0,0 +1,1097 @@ +#include +#include @@ -1817,11 +2519,10 @@ index 0000000..d3a4bd9 +MODULE_AUTHOR("Thomas Kunze thommy@tabao.de"); +MODULE_DESCRIPTION("Collie mmc driver"); +MODULE_LICENSE("GPL"); -diff --git a/drivers/spi/locomo_spi.h b/drivers/spi/locomo_spi.h -new file mode 100644 -index 0000000..7e1c0ce ---- /dev/null -+++ b/drivers/spi/locomo_spi.h +Index: linux-2.6.26/drivers/spi/locomo_spi.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.26/drivers/spi/locomo_spi.h 2008-10-17 18:15:31.471790439 +0200 @@ -0,0 +1,75 @@ +#include +#ifndef __LOCOMO_SPI_H__ diff --git a/packages/linux/linux-rp-2.6.26/defconfig-collie b/packages/linux/linux-rp-2.6.26/defconfig-collie index c0e3e3b448..e21cc21da2 100644 --- a/packages/linux/linux-rp-2.6.26/defconfig-collie +++ b/packages/linux/linux-rp-2.6.26/defconfig-collie @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26 -# Sat Jul 26 11:34:02 2008 +# Fri Oct 17 18:46:51 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -157,25 +157,6 @@ CONFIG_ARCH_SA1100=y # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set # CONFIG_ARCH_MSM7X00A is not set -# CONFIG_ARCH_GUMSTIX is not set -# CONFIG_ARCH_LUBBOCK is not set -# CONFIG_MACH_LOGICPD_PXA270 is not set -# CONFIG_MACH_MAINSTONE is not set -# CONFIG_ARCH_PXA_IDP is not set -# CONFIG_PXA_SHARPSL is not set -# CONFIG_ARCH_PXA_ESERIES is not set -# CONFIG_MACH_TRIZEPS4 is not set -# CONFIG_MACH_HX2750 is not set -# CONFIG_MACH_EM_X270 is not set -# CONFIG_MACH_COLIBRI is not set -# CONFIG_MACH_ZYLONITE is not set -# CONFIG_MACH_LITTLETON is not set -# CONFIG_MACH_ARMCORE is not set -# CONFIG_MACH_MAGICIAN is not set -# CONFIG_MACH_PCM027 is not set -# CONFIG_MACH_HTCUNIVERSAL is not set -# CONFIG_PXA_SHARPSL_25x is not set -# CONFIG_PXA_SHARPSL_27x is not set # # SA11x0 Implementations @@ -283,7 +264,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw fbcon=rotate:1 dyntick=enable debug" +CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 noinitrd root=/dev/mmcblk0p1 rootfstype=ext2 rootdelay=3 rw mem=64M fbcon=rotate:1 dyntick=enable debug" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y @@ -586,10 +567,8 @@ CONFIG_MTD_BLOCK=y # # RAM/ROM/Flash chip drivers # -CONFIG_MTD_CFI=y +# CONFIG_MTD_CFI is not set # CONFIG_MTD_JEDECPROBE is not set -CONFIG_MTD_GEN_PROBE=y -# CONFIG_MTD_CFI_ADV_OPTIONS is not set CONFIG_MTD_MAP_BANK_WIDTH_1=y CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_MAP_BANK_WIDTH_4=y @@ -600,21 +579,15 @@ CONFIG_MTD_CFI_I1=y CONFIG_MTD_CFI_I2=y # CONFIG_MTD_CFI_I4 is not set # CONFIG_MTD_CFI_I8 is not set -CONFIG_MTD_CFI_INTELEXT=y -# CONFIG_MTD_CFI_AMDSTD is not set -# CONFIG_MTD_CFI_STAA is not set -CONFIG_MTD_CFI_UTIL=y # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set # CONFIG_MTD_ABSENT is not set -# CONFIG_MTD_XIP is not set +CONFIG_MTD_SHARP=y # # Mapping drivers for chip access # CONFIG_MTD_COMPLEX_MAPPINGS=y -# CONFIG_MTD_PHYSMAP is not set -# CONFIG_MTD_ARM_INTEGRATOR is not set CONFIG_MTD_SA1100=y # CONFIG_MTD_PLATRAM is not set @@ -1072,26 +1045,6 @@ CONFIG_FONT_8x8=y # CONFIG_HID_SUPPORT is not set CONFIG_HID=m # CONFIG_USB_SUPPORT is not set -# CONFIG_USB_GADGET_AMD5536UDC is not set -# CONFIG_USB_GADGET_ATMEL_USBA is not set -# CONFIG_USB_GADGET_FSL_USB2 is not set -# CONFIG_USB_GADGET_NET2280 is not set -# CONFIG_USB_GADGET_PXA2XX is not set -# CONFIG_USB_GADGET_M66592 is not set -# CONFIG_USB_GADGET_PXA27X is not set -# CONFIG_USB_GADGET_GOKU is not set -# CONFIG_USB_GADGET_LH7A40X is not set -# CONFIG_USB_GADGET_OMAP is not set -# CONFIG_USB_GADGET_S3C2410 is not set -# CONFIG_USB_GADGET_AT91 is not set -# CONFIG_USB_GADGET_DUMMY_HCD is not set -# 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_MIDI_GADGET is not set -# CONFIG_USB_G_PRINTER is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_UNSAFE_RESUME=y @@ -1489,10 +1442,10 @@ CONFIG_CRC_ITU_T=y CONFIG_CRC32=y CONFIG_CRC7=y CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=m -CONFIG_ZLIB_DEFLATE=m -CONFIG_LZO_COMPRESS=m -CONFIG_LZO_DECOMPRESS=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y diff --git a/packages/linux/linux-rp_2.6.26.bb b/packages/linux/linux-rp_2.6.26.bb index 8ff6fc4c0d..0c76704cc5 100644 --- a/packages/linux/linux-rp_2.6.26.bb +++ b/packages/linux/linux-rp_2.6.26.bb @@ -1,6 +1,6 @@ require linux-rp.inc -FILE_PR = "r2" +FILE_PR = "r4" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_qemuarm = "-1" @@ -81,6 +81,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2 \ SRC_URI_append_collie = "\ file://collie.patch;patch=1 \ file://collie_keymap.patch;patch=1 \ + file://collie-ucbfix.patch;patch=1 \ " SRC_URI_append_poodle = "\ -- cgit v1.2.3 From 958429dd9f7b355a6e8358265ca0f056839b729c Mon Sep 17 00:00:00 2001 From: Thomas Kunze Date: Sat, 18 Oct 2008 02:04:35 +0200 Subject: linux-kexecboot: use hacked sharp-flash driver --- .../kexecboot/linux-kexecboot-2.6.26/collie.patch | 883 ++++++++++++++++++--- .../linux-kexecboot-2.6.26/collie/defconfig | 13 +- packages/kexecboot/linux-kexecboot_2.6.26.bb | 2 +- 3 files changed, 795 insertions(+), 103 deletions(-) diff --git a/packages/kexecboot/linux-kexecboot-2.6.26/collie.patch b/packages/kexecboot/linux-kexecboot-2.6.26/collie.patch index 6dad0027c6..750be8ecf3 100644 --- a/packages/kexecboot/linux-kexecboot-2.6.26/collie.patch +++ b/packages/kexecboot/linux-kexecboot-2.6.26/collie.patch @@ -1,8 +1,8 @@ -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index c7ad324..daa2e0a 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -998,7 +998,7 @@ config CPU_FREQ_SA1100 +Index: linux-2.6.26/arch/arm/Kconfig +=================================================================== +--- linux-2.6.26.orig/arch/arm/Kconfig 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/arch/arm/Kconfig 2008-10-17 18:15:31.391792839 +0200 +@@ -967,7 +967,7 @@ config CPU_FREQ_SA1110 bool @@ -11,11 +11,24 @@ index c7ad324..daa2e0a 100644 default y config CPU_FREQ_INTEGRATOR -diff --git a/arch/arm/mach-sa1100/dma.c b/arch/arm/mach-sa1100/dma.c -index e508028..36f726c 100644 ---- a/arch/arm/mach-sa1100/dma.c -+++ b/arch/arm/mach-sa1100/dma.c -@@ -39,7 +39,7 @@ typedef struct { +Index: linux-2.6.26/arch/arm/mach-sa1100/collie.c +=================================================================== +--- linux-2.6.26.orig/arch/arm/mach-sa1100/collie.c 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/arch/arm/mach-sa1100/collie.c 2008-10-17 18:15:31.391792839 +0200 +@@ -206,7 +206,7 @@ + } + + static struct flash_platform_data collie_flash_data = { +- .map_name = "cfi_probe", ++ .map_name = "sharp", + .set_vpp = collie_set_vpp, + .parts = collie_partitions, + .nr_parts = ARRAY_SIZE(collie_partitions), +Index: linux-2.6.26/arch/arm/mach-sa1100/dma.c +=================================================================== +--- linux-2.6.26.orig/arch/arm/mach-sa1100/dma.c 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/arch/arm/mach-sa1100/dma.c 2008-10-17 18:15:31.399789199 +0200 +@@ -39,7 +39,7 @@ static sa1100_dma_t dma_chan[SA1100_DMA_CHANNELS]; @@ -24,11 +37,11 @@ index e508028..36f726c 100644 static irqreturn_t dma_irq_handler(int irq, void *dev_id) -diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c -index 9caed30..79e19bf 100644 ---- a/drivers/input/keyboard/locomokbd.c -+++ b/drivers/input/keyboard/locomokbd.c -@@ -265,6 +265,7 @@ static int __devinit locomokbd_probe(struct locomo_dev *dev) +Index: linux-2.6.26/drivers/input/keyboard/locomokbd.c +=================================================================== +--- linux-2.6.26.orig/drivers/input/keyboard/locomokbd.c 2008-10-17 18:13:16.000000000 +0200 ++++ linux-2.6.26/drivers/input/keyboard/locomokbd.c 2008-10-17 18:15:31.403791239 +0200 +@@ -272,6 +272,7 @@ for (i = 0; i < LOCOMOKBD_NUMKEYS; i++) set_bit(locomokbd->keycode[i], input_dev->keybit); clear_bit(0, input_dev->keybit); @@ -36,11 +49,11 @@ index 9caed30..79e19bf 100644 /* attempt to get the interrupt */ err = request_irq(dev->irq[0], locomokbd_interrupt, 0, "locomokbd", locomokbd); -diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig -index 9f93c29..33fc5d6 100644 ---- a/drivers/mfd/Kconfig -+++ b/drivers/mfd/Kconfig -@@ -72,4 +72,10 @@ config MCP_UCB1200_TS +Index: linux-2.6.26/drivers/mfd/Kconfig +=================================================================== +--- linux-2.6.26.orig/drivers/mfd/Kconfig 2008-10-17 18:13:21.000000000 +0200 ++++ linux-2.6.26/drivers/mfd/Kconfig 2008-10-17 18:15:31.403791239 +0200 +@@ -77,4 +77,10 @@ tristate "Touchscreen interface support" depends on MCP_UCB1200 && INPUT @@ -51,11 +64,11 @@ index 9f93c29..33fc5d6 100644 + Driver for touchscreen on collie - sharp sl-5500. + endmenu -diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile -index 33daa2f..0885ccd 100644 ---- a/drivers/mfd/Makefile -+++ b/drivers/mfd/Makefile -@@ -16,7 +16,7 @@ obj-$(CONFIG_MCP) += mcp-core.o +Index: linux-2.6.26/drivers/mfd/Makefile +=================================================================== +--- linux-2.6.26.orig/drivers/mfd/Makefile 2008-10-17 18:13:21.000000000 +0200 ++++ linux-2.6.26/drivers/mfd/Makefile 2008-10-17 18:15:31.407791679 +0200 +@@ -14,7 +14,7 @@ obj-$(CONFIG_MCP_SA11X0) += mcp-sa11x0.o obj-$(CONFIG_MCP_UCB1200) += ucb1x00-core.o obj-$(CONFIG_MCP_UCB1200_TS) += ucb1x00-ts.o @@ -64,11 +77,10 @@ index 33daa2f..0885ccd 100644 ifeq ($(CONFIG_SA1100_ASSABET),y) obj-$(CONFIG_MCP_UCB1200) += ucb1x00-assabet.o endif -diff --git a/drivers/mfd/collie-ts.c b/drivers/mfd/collie-ts.c -new file mode 100644 -index 0000000..ddde5fc ---- /dev/null -+++ b/drivers/mfd/collie-ts.c +Index: linux-2.6.26/drivers/mfd/collie-ts.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.26/drivers/mfd/collie-ts.c 2008-10-17 18:15:31.415790559 +0200 @@ -0,0 +1,449 @@ +/* + * Touchscreen driver for UCB1x00-based touchscreens @@ -103,9 +115,9 @@ index 0000000..ddde5fc +#include +#include +#include ++#include + +#include -+#include +#include +#include + @@ -519,10 +531,10 @@ index 0000000..ddde5fc +MODULE_AUTHOR("Russell King "); +MODULE_DESCRIPTION("UCB1x00 touchscreen driver"); +MODULE_LICENSE("GPL"); -diff --git a/drivers/mfd/ucb1x00.h b/drivers/mfd/ucb1x00.h -index a8ad8a0..137b043 100644 ---- a/drivers/mfd/ucb1x00.h -+++ b/drivers/mfd/ucb1x00.h +Index: linux-2.6.26/drivers/mfd/ucb1x00.h +=================================================================== +--- linux-2.6.26.orig/drivers/mfd/ucb1x00.h 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/drivers/mfd/ucb1x00.h 2008-10-17 18:15:31.415790559 +0200 @@ -34,7 +34,10 @@ #define UCB_IE_TCLIP (1 << 14) #define UCB_IE_ACLIP (1 << 15) @@ -534,28 +546,719 @@ index a8ad8a0..137b043 100644 #define UCB_TC_A 0x05 #define UCB_TC_A_LOOP (1 << 7) /* UCB1200 */ -diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c -index c7d5a52..215bec2 100644 ---- a/drivers/mtd/maps/sa1100-flash.c -+++ b/drivers/mtd/maps/sa1100-flash.c -@@ -210,6 +210,12 @@ static int sa1100_probe_subdev(struct sa_subdev_info *subdev, struct resource *r +Index: linux-2.6.26/drivers/mtd/chips/Kconfig +=================================================================== +--- linux-2.6.26.orig/drivers/mtd/chips/Kconfig 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/drivers/mtd/chips/Kconfig 2008-10-17 18:15:31.419791479 +0200 +@@ -239,5 +239,13 @@ + used for XIP purposes. If you're not sure what this is all about + then say N. + ++config MTD_SHARP ++ tristate "pre-CFI Sharp chip support" ++ depends on MTD ++ help ++ This option enables support for flash chips using Sharp-compatible ++ commands, including some which are not CFI-compatible and hence ++ cannot be used with the CONFIG_MTD_CFI_INTELxxx options. ++ + endmenu + +Index: linux-2.6.26/drivers/mtd/chips/Makefile +=================================================================== +--- linux-2.6.26.orig/drivers/mtd/chips/Makefile 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/drivers/mtd/chips/Makefile 2008-10-17 18:15:31.419791479 +0200 +@@ -12,4 +12,5 @@ + obj-$(CONFIG_MTD_JEDECPROBE) += jedec_probe.o + obj-$(CONFIG_MTD_RAM) += map_ram.o + obj-$(CONFIG_MTD_ROM) += map_rom.o ++obj-$(CONFIG_MTD_SHARP) += sharp.o + obj-$(CONFIG_MTD_ABSENT) += map_absent.o +Index: linux-2.6.26/drivers/mtd/chips/sharp.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.26/drivers/mtd/chips/sharp.c 2008-10-17 18:15:31.423790399 +0200 +@@ -0,0 +1,645 @@ ++/* ++ * MTD chip driver for pre-CFI Sharp flash chips ++ * ++ * Copyright 2000,2001 David A. Schleef ++ * 2000,2001 Lineo, Inc. ++ * ++ * $Id: sharp.c,v 1.17 2005/11/29 14:28:28 gleixner Exp $ ++ * ++ * Devices supported: ++ * LH28F016SCT Symmetrical block flash memory, 2Mx8 ++ * LH28F008SCT Symmetrical block flash memory, 1Mx8 ++ * ++ * Documentation: ++ * http://www.sharpmeg.com/datasheets/memic/flashcmp/ ++ * http://www.sharpmeg.com/datasheets/memic/flashcmp/01symf/16m/016sctl9.pdf ++ * 016sctl9.pdf ++ * ++ * Limitations: ++ * This driver only supports 4x1 arrangement of chips. ++ * Not tested on anything but PowerPC. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define CMD_RESET 0xffffffff ++#define CMD_READ_ID 0x90909090 ++#define CMD_READ_STATUS 0x70707070 ++#define CMD_CLEAR_STATUS 0x50505050 ++#define CMD_BLOCK_ERASE_1 0x20202020 ++#define CMD_BLOCK_ERASE_2 0xd0d0d0d0 ++#define CMD_BYTE_WRITE 0x40404040 ++#define CMD_SUSPEND 0xb0b0b0b0 ++#define CMD_RESUME 0xd0d0d0d0 ++#define CMD_SET_BLOCK_LOCK_1 0x60606060 ++#define CMD_SET_BLOCK_LOCK_2 0x01010101 ++#define CMD_SET_MASTER_LOCK_1 0x60606060 ++#define CMD_SET_MASTER_LOCK_2 0xf1f1f1f1 ++#define CMD_CLEAR_BLOCK_LOCKS_1 0x60606060 ++#define CMD_CLEAR_BLOCK_LOCKS_2 0xd0d0d0d0 ++ ++#define SR_READY 0x80808080 // 1 = ready ++#define SR_ERASE_SUSPEND 0x40404040 // 1 = block erase suspended ++#define SR_ERROR_ERASE 0x20202020 // 1 = error in block erase or clear lock bits ++#define SR_ERROR_WRITE 0x10101010 // 1 = error in byte write or set lock bit ++#define SR_VPP 0x08080808 // 1 = Vpp is low ++#define SR_WRITE_SUSPEND 0x04040404 // 1 = byte write suspended ++#define SR_PROTECT 0x02020202 // 1 = lock bit set ++#define SR_RESERVED 0x01010101 ++ ++#define SR_ERRORS (SR_ERROR_ERASE|SR_ERROR_WRITE|SR_VPP|SR_PROTECT) ++ ++#define BLOCK_MASK 0xfffe0000 ++ ++/* Configuration options */ ++ ++#define AUTOUNLOCK /* automatically unlocks blocks before erasing */ ++ ++static struct mtd_info *sharp_probe(struct map_info *); ++ ++static int sharp_probe_map(struct map_info *map, struct mtd_info *mtd); ++ ++static int sharp_read(struct mtd_info *mtd, loff_t from, size_t len, ++ size_t *retlen, u_char *buf); ++static int sharp_write(struct mtd_info *mtd, loff_t from, size_t len, ++ size_t *retlen, const u_char *buf); ++static int sharp_erase(struct mtd_info *mtd, struct erase_info *instr); ++static void sharp_sync(struct mtd_info *mtd); ++static int sharp_suspend(struct mtd_info *mtd); ++static void sharp_resume(struct mtd_info *mtd); ++static void sharp_destroy(struct mtd_info *mtd); ++ ++static int sharp_write_oneword(struct map_info *map, struct flchip *chip, ++ unsigned long adr, __u32 datum); ++static int sharp_erase_oneblock(struct map_info *map, struct flchip *chip, ++ unsigned long adr); ++#ifdef AUTOUNLOCK ++static inline void sharp_unlock_oneblock(struct map_info *map, struct flchip *chip, ++ unsigned long adr); ++#endif ++ ++ ++struct sharp_info{ ++ struct flchip *chip; ++ int bogus; ++ int chipshift; ++ int numchips; ++ struct flchip chips[1]; ++}; ++ ++static void sharp_destroy(struct mtd_info *mtd); ++ ++static struct mtd_chip_driver sharp_chipdrv = { ++ .probe = sharp_probe, ++ .destroy = sharp_destroy, ++ .name = "sharp", ++ .module = THIS_MODULE ++}; ++ ++static void sharp_udelay(unsigned long i) { ++ if (in_interrupt()) { ++ udelay(i); ++ } else { ++ schedule(); ++ } ++} ++ ++static struct mtd_info *sharp_probe(struct map_info *map) ++{ ++ struct mtd_info *mtd = NULL; ++ struct sharp_info *sharp = NULL; ++ int width; ++ ++ mtd = kzalloc(sizeof(*mtd), GFP_KERNEL); ++ if(!mtd) ++ return NULL; ++ ++ sharp = kzalloc(sizeof(*sharp), GFP_KERNEL); ++ if(!sharp) { ++ kfree(mtd); ++ return NULL; ++ } ++ ++ width = sharp_probe_map(map,mtd); ++ if(!width){ ++ kfree(mtd); ++ kfree(sharp); ++ return NULL; ++ } ++ ++ mtd->priv = map; ++ mtd->type = MTD_NORFLASH; ++ mtd->erase = sharp_erase; ++ mtd->read = sharp_read; ++ mtd->write = sharp_write; ++ mtd->sync = sharp_sync; ++ mtd->suspend = sharp_suspend; ++ mtd->resume = sharp_resume; ++ mtd->flags = MTD_CAP_NORFLASH; ++ mtd->writesize = 1; ++ mtd->name = map->name; ++ ++ sharp->chipshift = 24; ++ sharp->numchips = 1; ++ sharp->chips[0].start = 0; ++ sharp->chips[0].state = FL_READY; ++ sharp->chips[0].mutex = &sharp->chips[0]._spinlock; ++ sharp->chips[0].word_write_time = 0; ++ init_waitqueue_head(&sharp->chips[0].wq); ++ spin_lock_init(&sharp->chips[0]._spinlock); ++ ++ map->fldrv = &sharp_chipdrv; ++ map->fldrv_priv = sharp; ++ ++ __module_get(THIS_MODULE); ++ return mtd; ++} ++ ++static inline void sharp_send_cmd(struct map_info *map, unsigned long cmd, unsigned long adr) ++{ ++ map_word map_cmd; ++ map_cmd.x[0] = cmd; ++ map_write(map, map_cmd, adr); ++} ++ ++static int sharp_probe_map(struct map_info *map,struct mtd_info *mtd) ++{ ++ map_word tmp, read0, read4; ++ unsigned long base = 0; ++ int width = 4; ++ ++ tmp = map_read(map, base+0); ++ ++ sharp_send_cmd(map, CMD_READ_ID, base+0); ++ ++ read0 = map_read(map, base+0); ++ read4 = map_read(map, base+4); ++ if (read0.x[0] == 0x00b000b0) { ++ printk("Sharp chip, %lx, %lx, width = %d\n", read0.x[0], read4.x[0], width); ++ /* Prints b000b0, b000b0, width = 4 on collie */ ++ switch(read4.x[0]){ ++ case 0xaaaaaaaa: ++ case 0xa0a0a0a0: ++ /* aa - LH28F016SCT-L95 2Mx8, 32 64k blocks*/ ++ /* a0 - LH28F016SCT-Z4 2Mx8, 32 64k blocks*/ ++ mtd->erasesize = 0x10000 * width; ++ mtd->size = 0x200000 * width; ++ return width; ++ case 0xa6a6a6a6: ++ /* a6 - LH28F008SCT-L12 1Mx8, 16 64k blocks*/ ++ /* a6 - LH28F008SCR-L85 1Mx8, 16 64k blocks*/ ++ mtd->erasesize = 0x10000 * width; ++ mtd->size = 0x100000 * width; ++ return width; ++ case 0x00b000b0: ++ /* a6 - LH28F640BFHE 8 64k * 2 chip blocks*/ ++ mtd->erasesize = 0x10000 * width / 2; ++ mtd->size = 0x800000 * width / 2; ++ return width; ++ default: ++ printk("Sort-of looks like sharp flash, 0x%08lx 0x%08lx\n", ++ read0.x[0], read4.x[0]); ++ } ++ } else if ((map_read(map, base+0).x[0] == CMD_READ_ID)){ ++ /* RAM, probably */ ++ printk("Looks like RAM\n"); ++ map_write(map, tmp, base+0); ++ }else{ ++ printk("Doesn't look like sharp flash, 0x%08lx 0x%08lx\n", ++ read0.x[0], read4.x[0]); ++ } ++ ++ return 0; ++} ++ ++/* This function returns with the chip->mutex lock held. */ ++static int sharp_wait(struct map_info *map, struct flchip *chip) ++{ ++ map_word status; ++ unsigned long timeo = jiffies + HZ; ++ DECLARE_WAITQUEUE(wait, current); ++ int adr = 0; ++ ++retry: ++ spin_lock_bh(chip->mutex); ++ ++ switch (chip->state) { ++ case FL_READY: ++ sharp_send_cmd(map, CMD_READ_STATUS, adr); ++ chip->state = FL_STATUS; ++ case FL_STATUS: ++ status = map_read(map, adr); ++ if ((status.x[0] & SR_READY) == SR_READY) ++ break; ++ spin_unlock_bh(chip->mutex); ++ if (time_after(jiffies, timeo)) { ++ printk("Waiting for chip to be ready timed out in erase\n"); ++ return -EIO; ++ } ++ sharp_udelay(1); ++ goto retry; ++ default: ++ set_current_state(TASK_INTERRUPTIBLE); ++ add_wait_queue(&chip->wq, &wait); ++ ++ spin_unlock_bh(chip->mutex); ++ ++ sharp_udelay(1); ++ ++ set_current_state(TASK_RUNNING); ++ remove_wait_queue(&chip->wq, &wait); ++ ++ if(signal_pending(current)) ++ return -EINTR; ++ ++ timeo = jiffies + HZ; ++ ++ goto retry; ++ } ++ ++ sharp_send_cmd(map, CMD_RESET, adr); ++ ++ chip->state = FL_READY; ++ ++ return 0; ++} ++ ++static void sharp_release(struct flchip *chip) ++{ ++ wake_up(&chip->wq); ++ spin_unlock_bh(chip->mutex); ++} ++ ++static int sharp_read(struct mtd_info *mtd, loff_t from, size_t len, ++ size_t *retlen, u_char *buf) ++{ ++ struct map_info *map = mtd->priv; ++ struct sharp_info *sharp = map->fldrv_priv; ++ int chipnum; ++ int ret = 0; ++ int ofs = 0; ++ ++ chipnum = (from >> sharp->chipshift); ++ ofs = from & ((1 << sharp->chipshift)-1); ++ ++ *retlen = 0; ++ ++ while(len){ ++ unsigned long thislen; ++ ++ if(chipnum>=sharp->numchips) ++ break; ++ ++ thislen = len; ++ if(ofs+thislen >= (1<chipshift)) ++ thislen = (1<chipshift) - ofs; ++ ++ ret = sharp_wait(map,&sharp->chips[chipnum]); ++ if(ret<0) ++ break; ++ ++ map_copy_from(map,buf,ofs,thislen); ++ ++ sharp_release(&sharp->chips[chipnum]); ++ ++ *retlen += thislen; ++ len -= thislen; ++ buf += thislen; ++ ++ ofs = 0; ++ chipnum++; ++ } ++ return ret; ++} ++ ++static int sharp_write(struct mtd_info *mtd, loff_t to, size_t len, ++ size_t *retlen, const u_char *buf) ++{ ++ struct map_info *map = mtd->priv; ++ struct sharp_info *sharp = map->fldrv_priv; ++ int ret = 0; ++ int i,j; ++ int chipnum; ++ unsigned long ofs; ++ union { u32 l; unsigned char uc[4]; } tbuf; ++ ++ *retlen = 0; ++ ++ while(len){ ++ tbuf.l = 0xffffffff; ++ chipnum = to >> sharp->chipshift; ++ ofs = to & ((1<chipshift)-1); ++ ++ j=0; ++ for(i=ofs&3;i<4 && len;i++){ ++ tbuf.uc[i] = *buf; ++ buf++; ++ to++; ++ len--; ++ j++; ++ } ++ sharp_write_oneword(map, &sharp->chips[chipnum], ofs&~3, tbuf.l); ++ if(ret<0) ++ return ret; ++ (*retlen)+=j; ++ } ++ ++ return 0; ++} ++ ++static int sharp_write_oneword(struct map_info *map, struct flchip *chip, ++ unsigned long adr, __u32 datum) ++{ ++ int ret; ++ int try; ++ int i; ++ map_word data, status; ++ ++ status.x[0] = 0; ++ ret = sharp_wait(map,chip); ++ if (ret < 0) ++ return ret; ++ ++ for (try=0; try<10; try++) { ++ long timeo; ++ ++ sharp_send_cmd(map, CMD_BYTE_WRITE, adr); ++ /* cpu_to_le32 -> hack to fix the writel be->le conversion */ ++ data.x[0] = cpu_to_le32(datum); ++ map_write(map, data, adr); ++ ++ chip->state = FL_WRITING; ++ timeo = jiffies + (HZ/2); ++ ++ sharp_send_cmd(map, CMD_READ_STATUS, adr); ++ for(i=0;i<100;i++){ ++ status = map_read(map, adr); ++ if((status.x[0] & SR_READY) == SR_READY) ++ break; ++ } ++#ifdef AUTOUNLOCK ++ if (status.x[0] & SR_PROTECT) { /* lock block */ ++ sharp_send_cmd(map, CMD_CLEAR_STATUS, adr); ++ sharp_unlock_oneblock(map,chip,adr); ++ sharp_send_cmd(map, CMD_CLEAR_STATUS, adr); ++ sharp_send_cmd(map, CMD_RESET, adr); ++ continue; ++ } ++#endif ++ if(i==100){ ++ printk("sharp: timed out writing\n"); ++ } ++ ++ if (!(status.x[0] & SR_ERRORS)) ++ break; ++ ++ printk("sharp: error writing byte at addr=%08lx status=%08lx\n", adr, status.x[0]); ++ ++ sharp_send_cmd(map, CMD_CLEAR_STATUS, adr); ++ } ++ sharp_send_cmd(map, CMD_RESET, adr); ++ chip->state = FL_READY; ++ ++ sharp_release(chip); ++ ++ return 0; ++} ++ ++static int sharp_erase(struct mtd_info *mtd, struct erase_info *instr) ++{ ++ struct map_info *map = mtd->priv; ++ struct sharp_info *sharp = map->fldrv_priv; ++ unsigned long adr,len; ++ int chipnum, ret=0; ++ ++ if(instr->addr & (mtd->erasesize - 1)) ++ return -EINVAL; ++ if(instr->len & (mtd->erasesize - 1)) ++ return -EINVAL; ++ if(instr->len + instr->addr > mtd->size) ++ return -EINVAL; ++ ++ chipnum = instr->addr >> sharp->chipshift; ++ adr = instr->addr & ((1<chipshift)-1); ++ len = instr->len; ++ ++ while(len){ ++ ret = sharp_erase_oneblock(map, &sharp->chips[chipnum], adr); ++ if(ret)return ret; ++ ++ if (adr >= 0xfe0000) { ++ adr += mtd->erasesize / 8; ++ len -= mtd->erasesize / 8; ++ } else { ++ adr += mtd->erasesize; ++ len -= mtd->erasesize; ++ } ++ if(adr >> sharp->chipshift){ ++ adr = 0; ++ chipnum++; ++ if(chipnum>=sharp->numchips) ++ break; ++ } ++ } ++ ++ instr->state = MTD_ERASE_DONE; ++ mtd_erase_callback(instr); ++ ++ return 0; ++} ++ ++static inline int sharp_do_wait_for_ready(struct map_info *map, struct flchip *chip, ++ unsigned long adr) ++{ ++ int ret; ++ unsigned long timeo; ++ map_word status; ++ DECLARE_WAITQUEUE(wait, current); ++ ++ sharp_send_cmd(map, CMD_READ_STATUS, adr); ++ status = map_read(map, adr); ++ ++ timeo = jiffies + HZ * 10; ++ ++ while (time_before(jiffies, timeo)) { ++ sharp_send_cmd(map, CMD_READ_STATUS, adr); ++ status = map_read(map, adr); ++ if ((status.x[0] & SR_READY) == SR_READY) { ++ ret = 0; ++ goto out; ++ } ++ set_current_state(TASK_INTERRUPTIBLE); ++ add_wait_queue(&chip->wq, &wait); ++ ++ spin_unlock_bh(chip->mutex); ++ ++ schedule_timeout(1); ++ schedule(); ++ ++ spin_lock_bh(chip->mutex); ++ ++ remove_wait_queue(&chip->wq, &wait); ++ set_current_state(TASK_RUNNING); ++ } ++ ret = -ETIME; ++out: ++ return ret; ++} ++ ++static int sharp_erase_oneblock(struct map_info *map, struct flchip *chip, ++ unsigned long adr) ++{ ++ int ret; ++ map_word status; ++ ++ ret = sharp_wait(map,chip); ++ if (ret < 0) ++ return ret; ++ ++#ifdef AUTOUNLOCK ++ /* This seems like a good place to do an unlock */ ++ sharp_unlock_oneblock(map,chip,adr); ++#endif ++ ++ sharp_send_cmd(map, CMD_BLOCK_ERASE_1, adr); ++ sharp_send_cmd(map, CMD_BLOCK_ERASE_2, adr); ++ ++ chip->state = FL_ERASING; ++ ++ ret = sharp_do_wait_for_ready(map,chip,adr); ++ if(ret<0) { ++ spin_unlock_bh(chip->mutex); ++ return ret; ++ } ++ ++ sharp_send_cmd(map, CMD_READ_STATUS, adr); ++ status = map_read(map, adr); ++ ++ if (!(status.x[0] & SR_ERRORS)) { ++ sharp_send_cmd(map, CMD_RESET, adr); ++ chip->state = FL_READY; ++ spin_unlock_bh(chip->mutex); ++ return 0; ++ } ++ ++ printk("sharp: error erasing block at addr=%08lx status=%08lx\n", adr, status.x[0]); ++ sharp_send_cmd(map, CMD_CLEAR_STATUS, adr); ++ ++ sharp_release(chip); ++ ++ return -EIO; ++} ++ ++#ifdef AUTOUNLOCK ++static inline void sharp_unlock_oneblock(struct map_info *map, struct flchip *chip, ++ unsigned long adr) ++{ ++ map_word status; ++ ++ sharp_send_cmd(map, CMD_CLEAR_BLOCK_LOCKS_1, adr & BLOCK_MASK); ++ sharp_send_cmd(map, CMD_CLEAR_BLOCK_LOCKS_2, adr & BLOCK_MASK); ++ ++ sharp_do_wait_for_ready(map,chip,adr); ++ ++ status = map_read(map, adr); ++ ++ if (!(status.x[0] & SR_ERRORS)) { ++ sharp_send_cmd(map, CMD_RESET, adr); ++ chip->state = FL_READY; ++ return; ++ } ++ ++ printk("sharp: error unlocking block at addr=%08lx status=%08lx\n", adr, status.x[0]); ++ sharp_send_cmd(map, CMD_CLEAR_STATUS, adr); ++} ++#endif ++ ++static void sharp_sync(struct mtd_info *mtd) ++{ ++} ++ ++static int sharp_suspend(struct mtd_info *mtd) ++{ ++ struct map_info *map = mtd->priv; ++ struct sharp_info *sharp = map->fldrv_priv; ++ int i; ++ struct flchip *chip; ++ int ret = 0; ++ ++ for (i = 0; !ret && i < sharp->numchips; i++) { ++ chip = &sharp->chips[i]; ++ ret = sharp_wait(map,chip); ++ ++ if (ret) { ++ ret = -EAGAIN; ++ } else { ++ chip->state = FL_PM_SUSPENDED; ++ spin_unlock_bh(chip->mutex); ++ } ++ } ++ return ret; ++} ++ ++static void sharp_resume(struct mtd_info *mtd) ++{ ++ struct map_info *map = mtd->priv; ++ struct sharp_info *sharp = map->fldrv_priv; ++ int i; ++ struct flchip *chip; ++ ++ for (i = 0; i < sharp->numchips; i++) { ++ chip = &sharp->chips[i]; ++ ++ spin_lock_bh(chip->mutex); ++ ++ if (chip->state == FL_PM_SUSPENDED) { ++ /* We need to force it back to a known state */ ++ sharp_send_cmd(map, CMD_RESET, chip->start); ++ chip->state = FL_READY; ++ wake_up(&chip->wq); ++ } ++ ++ spin_unlock_bh(chip->mutex); ++ } ++} ++ ++static void sharp_destroy(struct mtd_info *mtd) ++{ ++ struct map_info *map = mtd->priv; ++ struct sharp_info *sharp = map->fldrv_priv; ++ ++ kfree(sharp); ++} ++ ++static int __init sharp_probe_init(void) ++{ ++ printk("MTD Sharp chip driver \n"); ++ ++ register_mtd_chip_driver(&sharp_chipdrv); ++ ++ return 0; ++} ++ ++static void __exit sharp_probe_exit(void) ++{ ++ unregister_mtd_chip_driver(&sharp_chipdrv); ++} ++ ++module_init(sharp_probe_init); ++module_exit(sharp_probe_exit); ++ ++ ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("David Schleef "); ++MODULE_DESCRIPTION("Old MTD chip driver for pre-CFI Sharp flash chips"); +Index: linux-2.6.26/drivers/mtd/maps/Kconfig +=================================================================== +--- linux-2.6.26.orig/drivers/mtd/maps/Kconfig 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/drivers/mtd/maps/Kconfig 2008-10-17 18:15:31.431789839 +0200 +@@ -392,7 +392,7 @@ + + config MTD_SA1100 + tristate "CFI Flash device mapped on StrongARM SA11x0" +- depends on MTD_CFI && ARCH_SA1100 && MTD_PARTITIONS ++ depends on (MTD_CFI || MTD_SHARP) && ARCH_SA1100 && MTD_PARTITIONS + help + This enables access to the flash chips on most platforms based on + the SA1100 and SA1110, including the Assabet and the Compaq iPAQ. +Index: linux-2.6.26/drivers/mtd/maps/sa1100-flash.c +=================================================================== +--- linux-2.6.26.orig/drivers/mtd/maps/sa1100-flash.c 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/drivers/mtd/maps/sa1100-flash.c 2008-10-17 18:15:31.431789839 +0200 +@@ -210,6 +210,12 @@ goto err; } subdev->mtd->owner = THIS_MODULE; + +#ifdef CONFIG_SA1100_COLLIE + /* collie flash starts locked */ -+ if (subdev->mtd->unlock) -+ subdev->mtd->unlock(subdev->mtd, 0xc0000, subdev->mtd->size - 0xc0000); ++// if (subdev->mtd->unlock) ++// subdev->mtd->unlock(subdev->mtd, 0xc0000, subdev->mtd->size - 0xc0000); +#endif printk(KERN_INFO "SA1100 flash: CFI device at 0x%08lx, %dMiB, " "%d-bit\n", phys, subdev->mtd->size >> 20, -diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c -index 3b4e55c..0ae741d 100644 ---- a/drivers/net/wireless/hostap/hostap_cs.c -+++ b/drivers/net/wireless/hostap/hostap_cs.c -@@ -35,7 +35,7 @@ static int ignore_cis_vcc; +Index: linux-2.6.26/drivers/net/wireless/hostap/hostap_cs.c +=================================================================== +--- linux-2.6.26.orig/drivers/net/wireless/hostap/hostap_cs.c 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/drivers/net/wireless/hostap/hostap_cs.c 2008-10-17 18:15:31.435790279 +0200 +@@ -35,7 +35,7 @@ module_param(ignore_cis_vcc, int, 0444); MODULE_PARM_DESC(ignore_cis_vcc, "Ignore broken CIS VCC entry"); @@ -564,7 +1267,7 @@ index 3b4e55c..0ae741d 100644 /* struct local_info::hw_priv */ struct hostap_cs_priv { dev_node_t node; -@@ -499,11 +499,13 @@ static int hostap_cs_probe(struct pcmcia_device *p_dev) +@@ -499,11 +499,13 @@ PDEBUG(DEBUG_HW, "%s: setting Vcc=33 (constant)\n", dev_info); p_dev->conf.IntType = INT_MEMORY_AND_IO; @@ -579,10 +1282,10 @@ index 3b4e55c..0ae741d 100644 return ret; } -diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c -index 13d5882..6f24d66 100644 ---- a/drivers/net/wireless/hostap/hostap_hw.c -+++ b/drivers/net/wireless/hostap/hostap_hw.c +Index: linux-2.6.26/drivers/net/wireless/hostap/hostap_hw.c +=================================================================== +--- linux-2.6.26.orig/drivers/net/wireless/hostap/hostap_hw.c 2008-10-17 18:13:21.000000000 +0200 ++++ linux-2.6.26/drivers/net/wireless/hostap/hostap_hw.c 2008-10-17 18:15:31.443789719 +0200 @@ -54,6 +54,7 @@ #include "hostap.h" #include "hostap_ap.h" @@ -591,7 +1294,7 @@ index 13d5882..6f24d66 100644 /* #define final_version */ -@@ -1497,6 +1498,8 @@ static int prism2_hw_config(struct net_device *dev, int initial) +@@ -1534,6 +1535,8 @@ if (local->hw_downloading) return 1; @@ -600,7 +1303,7 @@ index 13d5882..6f24d66 100644 if (prism2_hw_init(dev, initial)) { return local->no_pri ? 0 : 1; } -@@ -2628,8 +2631,15 @@ static irqreturn_t prism2_interrupt(int irq, void *dev_id) +@@ -2665,8 +2668,15 @@ int events = 0; u16 ev; @@ -616,12 +1319,12 @@ index 13d5882..6f24d66 100644 + iface = netdev_priv(dev); + local = iface->local; - prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INTERRUPT, 0, 0); - -diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c -index 3a874fc..df58aa3 100644 ---- a/drivers/net/wireless/hostap/hostap_pci.c -+++ b/drivers/net/wireless/hostap/hostap_pci.c + if(dev->base_addr == 0) + { +Index: linux-2.6.26/drivers/net/wireless/hostap/hostap_pci.c +=================================================================== +--- linux-2.6.26.orig/drivers/net/wireless/hostap/hostap_pci.c 2008-10-17 18:13:18.000000000 +0200 ++++ linux-2.6.26/drivers/net/wireless/hostap/hostap_pci.c 2008-10-17 18:15:31.447790279 +0200 @@ -19,6 +19,7 @@ #include "hostap_wlan.h" @@ -630,10 +1333,10 @@ index 3a874fc..df58aa3 100644 static char *dev_info = "hostap_pci"; -diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c -index cbf15d7..4475174 100644 ---- a/drivers/net/wireless/hostap/hostap_plx.c -+++ b/drivers/net/wireless/hostap/hostap_plx.c +Index: linux-2.6.26/drivers/net/wireless/hostap/hostap_plx.c +=================================================================== +--- linux-2.6.26.orig/drivers/net/wireless/hostap/hostap_plx.c 2008-10-17 18:13:18.000000000 +0200 ++++ linux-2.6.26/drivers/net/wireless/hostap/hostap_plx.c 2008-10-17 18:15:31.451790719 +0200 @@ -21,7 +21,7 @@ #include @@ -643,11 +1346,11 @@ index cbf15d7..4475174 100644 static char *dev_info = "hostap_plx"; -diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c -index c5b2a44..eecbe8c 100644 ---- a/drivers/pcmcia/sa1100_generic.c -+++ b/drivers/pcmcia/sa1100_generic.c -@@ -81,13 +81,14 @@ static int sa11x0_drv_pcmcia_probe(struct device *dev) +Index: linux-2.6.26/drivers/pcmcia/sa1100_generic.c +=================================================================== +--- linux-2.6.26.orig/drivers/pcmcia/sa1100_generic.c 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/drivers/pcmcia/sa1100_generic.c 2008-10-17 18:15:31.459789719 +0200 +@@ -81,13 +81,14 @@ return ret; } @@ -669,7 +1372,7 @@ index c5b2a44..eecbe8c 100644 }; /* sa11x0_pcmcia_init() -@@ -100,7 +101,7 @@ static struct device_driver sa11x0_pcmcia_driver = { +@@ -100,7 +101,7 @@ */ static int __init sa11x0_pcmcia_init(void) { @@ -678,7 +1381,7 @@ index c5b2a44..eecbe8c 100644 } /* sa11x0_pcmcia_exit() -@@ -110,7 +111,7 @@ static int __init sa11x0_pcmcia_init(void) +@@ -110,7 +111,7 @@ */ static void __exit sa11x0_pcmcia_exit(void) { @@ -687,11 +1390,11 @@ index c5b2a44..eecbe8c 100644 } MODULE_AUTHOR("John Dorsey "); -diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig -index 66ec5d8..aba38d7 100644 ---- a/drivers/spi/Kconfig -+++ b/drivers/spi/Kconfig -@@ -123,6 +123,10 @@ config SPI_MPC52xx_PSC +Index: linux-2.6.26/drivers/spi/Kconfig +=================================================================== +--- linux-2.6.26.orig/drivers/spi/Kconfig 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/drivers/spi/Kconfig 2008-10-17 18:15:31.463790519 +0200 +@@ -123,6 +123,10 @@ This enables using the Freescale MPC52xx Programmable Serial Controller in master SPI mode. @@ -702,11 +1405,11 @@ index 66ec5d8..aba38d7 100644 config SPI_MPC83xx tristate "Freescale MPC83xx/QUICC Engine SPI controller" depends on SPI_MASTER && (PPC_83xx || QUICC_ENGINE) && EXPERIMENTAL -diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile -index 7fca043..b89992b 100644 ---- a/drivers/spi/Makefile -+++ b/drivers/spi/Makefile -@@ -28,6 +28,7 @@ obj-$(CONFIG_SPI_S3C24XX) += spi_s3c24xx.o +Index: linux-2.6.26/drivers/spi/Makefile +=================================================================== +--- linux-2.6.26.orig/drivers/spi/Makefile 2008-07-13 23:51:29.000000000 +0200 ++++ linux-2.6.26/drivers/spi/Makefile 2008-10-17 18:15:31.463790519 +0200 +@@ -28,6 +28,7 @@ obj-$(CONFIG_SPI_TXX9) += spi_txx9.o obj-$(CONFIG_SPI_XILINX) += xilinx_spi.o obj-$(CONFIG_SPI_SH_SCI) += spi_sh_sci.o @@ -714,11 +1417,10 @@ index 7fca043..b89992b 100644 # ... add above this line ... # SPI protocol drivers (device/link on bus) -diff --git a/drivers/spi/locomo_spi.c b/drivers/spi/locomo_spi.c -new file mode 100644 -index 0000000..d3a4bd9 ---- /dev/null -+++ b/drivers/spi/locomo_spi.c +Index: linux-2.6.26/drivers/spi/locomo_spi.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.26/drivers/spi/locomo_spi.c 2008-10-17 18:15:31.471790439 +0200 @@ -0,0 +1,1097 @@ +#include +#include @@ -1817,11 +2519,10 @@ index 0000000..d3a4bd9 +MODULE_AUTHOR("Thomas Kunze thommy@tabao.de"); +MODULE_DESCRIPTION("Collie mmc driver"); +MODULE_LICENSE("GPL"); -diff --git a/drivers/spi/locomo_spi.h b/drivers/spi/locomo_spi.h -new file mode 100644 -index 0000000..7e1c0ce ---- /dev/null -+++ b/drivers/spi/locomo_spi.h +Index: linux-2.6.26/drivers/spi/locomo_spi.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.26/drivers/spi/locomo_spi.h 2008-10-17 18:15:31.471790439 +0200 @@ -0,0 +1,75 @@ +#include +#ifndef __LOCOMO_SPI_H__ diff --git a/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig b/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig index a65552fbbb..4434962a64 100644 --- a/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig +++ b/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig @@ -327,13 +327,8 @@ CONFIG_MTD_BLOCK=y # # RAM/ROM/Flash chip drivers # -CONFIG_MTD_CFI=y +# CONFIG_MTD_CFI is not set # CONFIG_MTD_JEDECPROBE is not set -CONFIG_MTD_GEN_PROBE=y -# CONFIG_MTD_CFI_ADV_OPTIONS is not set -# CONFIG_MTD_CFI_NOSWAP is not set -# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set -# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set CONFIG_MTD_MAP_BANK_WIDTH_1=y CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_MAP_BANK_WIDTH_4=y @@ -344,14 +339,10 @@ CONFIG_MTD_CFI_I1=y CONFIG_MTD_CFI_I2=y # CONFIG_MTD_CFI_I4 is not set # CONFIG_MTD_CFI_I8 is not set -CONFIG_MTD_CFI_INTELEXT=y -# CONFIG_MTD_CFI_AMDSTD is not set -# CONFIG_MTD_CFI_STAA is not set -CONFIG_MTD_CFI_UTIL=y # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set # CONFIG_MTD_ABSENT is not set -# CONFIG_MTD_XIP is not set +CONFING_MTD_SHARP=y # # Mapping drivers for chip access diff --git a/packages/kexecboot/linux-kexecboot_2.6.26.bb b/packages/kexecboot/linux-kexecboot_2.6.26.bb index 6dec914cc6..7d000ff2e1 100644 --- a/packages/kexecboot/linux-kexecboot_2.6.26.bb +++ b/packages/kexecboot/linux-kexecboot_2.6.26.bb @@ -1,6 +1,6 @@ require linux-kexecboot.inc -FILE_PR = "r4" +FILE_PR = "r5" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_qemuarm = "-1" DEFAULT_PREFERENCE_qemux86 = "-1" -- cgit v1.2.3 From 5dad38b25bf837777a1a8076fae7199838a3ff81 Mon Sep 17 00:00:00 2001 From: Thomas Kunze Date: Sat, 18 Oct 2008 02:42:55 +0200 Subject: checksums.ini: add kexecboot --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 186ed0e926..6d2718b9ef 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -7142,6 +7142,10 @@ sha256=a758c8f9b55d8288e2484dd1a2dcbd9c4ca3ca3052864a45cb104f613b7f712d md5=b4f7ffcc294d41a6a4c40d6e44b7734d sha256=280b34fefa12c3d7a3e432c3730fe5d0d56e8d169c28b695cce9ba6d8dbe6e38 +[http://projects.linuxtogo.org/frs/download.php/221/kexecboot-0.3.tar.gz] +md5=3c3b8edb739146183b3ddff3e0af5f1c +sha256=61a918b38a4b0b97e1469cbe3d9c4307af956bd95abec2067aa2fd278739cd96 + [http://gpe.linuxtogo.org/download/source/keylaunch-2.0.10.tar.gz] md5=2d81de20b26eac5ad44b759eb412e8eb sha256=38715fcc508740deb3f169a01092f03ea4ce92c9ec3c2589a9510534aa52a540 -- cgit v1.2.3 From 7788c6a5d42b17f2cd492d8928a1ddb2ad80ee93 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 18:26:35 -0300 Subject: xfdesktop: depends on thunar to enable support for desktop icons --- packages/xfce/xfdesktop_4.4.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/xfce/xfdesktop_4.4.2.bb b/packages/xfce/xfdesktop_4.4.2.bb index 6c92b0fd1c..5b01c16e34 100644 --- a/packages/xfce/xfdesktop_4.4.2.bb +++ b/packages/xfce/xfdesktop_4.4.2.bb @@ -4,7 +4,8 @@ DESCRIPTION="xfce4 Desktop Background Manager" SECTION = "x11/base" -DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel" +DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel thunar" +FILE_PR = "r1" inherit xfce -- cgit v1.2.3 From 1b37391a88c1723e0b8232fa3788436579b1d5c6 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 21:33:42 -0300 Subject: checksums.ini: add exo 0.3.4 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 6d2718b9ef..257cd452b5 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -3314,6 +3314,10 @@ sha256=b72d82e9117308063471993f3832e58064c0599dec3df2bf2a7ce54450984a3e md5=eb8b6d834d2224e17561593dc4158e4d sha256=418c3b9e099b96f7b8e1456c34b585b2f4bd10af88fb976116a154e4cb54fa9b +[http://www.us.xfce.org/archive/xfce-4.4.2/src/exo-0.3.4.tar.bz2] +md5=7a1af943b1df32b6f89ae91823118a22 +sha256=a5373e9bd6055caa7cd5d06128f6236cfd2f4f6657ea4a85d7bd9eafe5bf0538 + [http://downloads.sourceforge.net/expat/expat-1.95.6.tar.gz] md5=ca78d94e83e9f077b5da2bfe28ba986a sha256=b48761f9b67715bb1f85371d0059d744a60ed71e72065da7d5326bbb04e26a92 -- cgit v1.2.3 From 420b6893be631f8ec8d6842ca58532f84344182d Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 21:34:08 -0300 Subject: checksums.ini: add gtk-xfce-engine 2.4.2 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 257cd452b5..a3e902037a 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -6118,6 +6118,10 @@ sha256=5e58ce65e7fe08eb28bd258a5de9c56c75998cdb48c3867b392b5ea74160aa32 md5=7b4aebf85040b357124de926807dc22a sha256=cb2b353839a7f1dcd8f93a6cb32b5c54a6fe560dee432585edb2f5eebe526c50 +[http://www.us.xfce.org/archive/xfce-4.4.2/src/gtk-xfce-engine-2.4.2.tar.bz2] +md5=00eb6a62defe6867d28a18569b96d151 +sha256=6fecdb590fa024db698de9027314c1be044f28feab9850f592aa60c3a79ede78 + [http://src.gentoo.pl/distfiles/gtk2-ssh-askpass-0.3.tar.gz] md5=14ca8c653ad19699b7299198d7a94e0a sha256=5b0a2b2ea2cbe26d7738a360ba5aad57d7d03297a662cf209a032c0b9725d33c -- cgit v1.2.3 From 71f7348dd92b4c477f167ee70bace0055754b949 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 21:34:42 -0300 Subject: checksums.ini: add libxfce4mcs 4.4.2 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index a3e902037a..431ff5db40 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -9442,6 +9442,10 @@ sha256=95b84b2b109f20e0fa6e2489dda55c5931a438ebfa21c8b4238350b0abdd0a6f md5=7ee4eab238e773b9dbf3fa1472643f6e sha256=8f3cd90d4ea258ffa35b8723c1eae7ace31409baa85361889664084c6c5d1b6d +[http://www.us.xfce.org/archive/xfce-4.4.2/src/libxfce4mcs-4.4.2.tar.bz2] +md5=5ffe66a3eeb884839806ce929e5d2776 +sha256=192843e8fdd63e10ba431ca12265c654dbce9677ec9d330038eea462ca0e5c8e + [http://www.us.xfce.org/archive/xfce-4.2.2/src/libxfce4util-4.2.2.tar.gz] md5=5f27635aa0ba5e40ffaf3031b530b36b sha256=8efb3416a37654050089234115fe7db9268c8da0ee0369ff3f5330cef3f15a66 -- cgit v1.2.3 From 4f08b156a7657350490018a94a1a40f08e653edc Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 21:35:10 -0300 Subject: checksums.ini: add libxfce4util 4.4.2 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 431ff5db40..51a67bec80 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -9454,6 +9454,10 @@ sha256=8efb3416a37654050089234115fe7db9268c8da0ee0369ff3f5330cef3f15a66 md5=4b327c64c292b2e672f69a0789deb2b7 sha256=988efce9b4fd7252475234be3ca3fe8b737125ebaadc8c448d1c5d4cbc8bb521 +[http://www.us.xfce.org/archive/xfce-4.4.2/src/libxfce4util-4.4.2.tar.bz2] +md5=261e7a5df039493ad746e0c359211092 +sha256=f717dcdb4d8ee8f967ed0882e82aad06abe66c32481b9954737273312c937a6d + [http://www.us.xfce.org/archive/xfce-4.2.2/src/libxfcegui4-4.2.2.tar.gz] md5=e88d6e8379eae60cee6dd6122bf3ae59 sha256=bdd542e60ffbe4987b5ae765e581fe5bcfdfc4d623341d09aaff7794e90d4454 -- cgit v1.2.3 From 5138a77083b9b5b9c23f8bac8c482113482d02a9 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 21:35:36 -0300 Subject: checksums.ini: add libxfcegui4 4.4.2 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 51a67bec80..faa0129d74 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -9470,6 +9470,10 @@ sha256=655c8c8657c16cf4fb9400722beb1a65841c0851e27a138c08b1908d5e254142 md5=98679c67ac65c376833deacec9fcbecf sha256=a3da5f3b70e65d6679cfb21fd2baf10baedceb8b099347987f9b6c5fa7cd329b +[http://www.us.xfce.org/archive/xfce-4.4.2/src/libxfcegui4-4.4.2.tar.bz2] +md5=799a4869138c605126e8e71d58189bfd +sha256=622c2585f61666d9c46841829ba141e86861c73bd9041a3a73452d1c8df5ee91 + [http://xorg.freedesktop.org/releases/individual/lib/libxkbfile-1.0.4.tar.bz2] md5=12b4ceb5d42b520228b5fb40a96ae6c5 sha256=468ade4eaa3951a7c34b6ae1c290ab1a1d364ee36c5c455ef0df15550825b8ae -- cgit v1.2.3 From 1e5e6c46ead42c73c9908218539c6d51813bb71a Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 21:36:21 -0300 Subject: checksums.ini: add xfce4-dev-tools 4.4.0.1 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index faa0129d74..03f0152235 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16386,6 +16386,10 @@ sha256=4bca692e0af03c0f70c6cf62f2b60274e71899beaa45815c2d0f46f7f19c06d5 md5=a4636f51d79eb68ba65098336d120d56 sha256=1e6c80b800dd02f6b1cbf69df36307cc0b341ab73438c5508ac760fd8be66232 +[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-dev-tools-4.4.0.1.tar.bz2] +md5=7d09d161efc7ef86b3b48791d98c8ae8 +sha256=1e7a506f08c8a4f368dd18648006ba3934a94eb96fd4545f5303d46aeae9cc3e + [http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce4-mixer-4.2.2.tar.gz] md5=fd5eb62c04d10659402a228b304f735b sha256=9d145dd0ad09c1bd1efe357bd0413fabc93945d7986d3f4662ac515625da93bc -- cgit v1.2.3 From 37d4986734dbc1385eb4c2e8e93a0a61e47518fb Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 21:37:55 -0300 Subject: checksums.ini: add xfce4-icon-theme 4.4.2 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 03f0152235..28280a8bdf 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16390,6 +16390,10 @@ sha256=1e6c80b800dd02f6b1cbf69df36307cc0b341ab73438c5508ac760fd8be66232 md5=7d09d161efc7ef86b3b48791d98c8ae8 sha256=1e7a506f08c8a4f368dd18648006ba3934a94eb96fd4545f5303d46aeae9cc3e +[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-icon-theme-4.4.2.tar.bz2] +md5=d3e3e64596a7efa857d2e6bb0cbd09bb +sha256=72178637c479ba848747285e0c7dc53a3abfe26b6517df5e75c7449542017350 + [http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce4-mixer-4.2.2.tar.gz] md5=fd5eb62c04d10659402a228b304f735b sha256=9d145dd0ad09c1bd1efe357bd0413fabc93945d7986d3f4662ac515625da93bc -- cgit v1.2.3 From e505c9b6d610068db67aa0db3e39edca21800f77 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 21:38:36 -0300 Subject: checksums.ini: add mousepad 0.2.13 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 28280a8bdf..8147852751 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -10746,6 +10746,10 @@ sha256=2798b2a5e4d248244d5f40cce32dfb0f027e103dd8469a800b6b934467bf6117 md5=71e6bd13fcca70372e9b7c7806d62b30 sha256=48c456dfcadec2db472320e317fa37dc697f184e12f99006a1ec0b6512d2ebcd +[http://www.us.xfce.org/archive/xfce-4.4.2/src/mousepad-0.2.13.tar.bz2] +md5=326075ac933e5da38cedbc20e80b7026 +sha256=f32cc263fb73b05c5bad17121073a2b37a7d5c8e411f780312c2701902e6637a + [http://www.stack.nl/~brama/mp3blaster/src/mp3blaster-3.1.3.tar.gz] md5=38beb6a5648cbca4ec87ee14b0982283 sha256=c1b110f2aa5ed8744f7f6eeabf24d6cd1cecc50f4b5473ec6ddf622935f360ee -- cgit v1.2.3 From 0908a5429a0702767ede58c55a90adb0085e4bf2 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 21:41:42 -0300 Subject: checksums.ini: add orage 4.4.2 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 8147852751..6e7379cfa4 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -11354,6 +11354,10 @@ sha256=cb1452159036ba7d3003b75dfef38fcbc61503f76adfca2879ebf7766931cade md5=9d1e6a9bd4d6dc9cae3c54c18c303ace sha256=e0e33fae512e54ff27474c926a758cf687e35d2c3007f69d4c647b69d47352ae +[http://www.us.xfce.org/archive/xfce-4.4.2/src/orage-4.4.2.tar.bz2] +md5=0c69e4c20350c3000d49350991d3a520 +sha256=ef08b96e5529f19a2f609525300fbea2019f1afb75fb3c85e474e6041f425abd + [http://ozlabs.org/people/dgibson/dldwd/orinoco-0.13e.tar.gz] md5=4cea186648c335752bc241418fd54038 sha256=07fbed267421ee26ee4b6bc410b68a10a284072d78e1e495c74865db0470306e -- cgit v1.2.3 From bf4c7ff81d7d66687050762d34e2fbc27f661ee8 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 21:58:53 -0300 Subject: checksums.ini: add xfce-mcs-manager 4.4.2 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 6e7379cfa4..3b4724fd58 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16366,6 +16366,10 @@ sha256=9bc1d715ee77a3d910214dd2fe6f537ee39960177f869a781361535a8d9a1828 md5=59d6d8f4f931b562b39ea1decdf9e29e sha256=951cb843f1c98fb68e0ab71f260dda9bc77ffd7b3aa16883d22e395134125c48 +[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-manager-4.4.2.tar.bz2] +md5=876a4b5d582de8fdc01457df2e7e1339 +sha256=65531403c4b24f1be031e57a935b9a464661c47764cb913888aa86ed03ecb268 + [http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce-mcs-plugins-4.2.2.tar.gz] md5=6e23972a2a0b3b3e7852bfc68dc0eeb8 sha256=693166e49eac35a85e66a7ad5dee046657f08937dc0a9144ecd26148ab9917a9 -- cgit v1.2.3 From 42a9d8242aa7271a54013d081a905eb3403371bc Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 21:59:11 -0300 Subject: checksums.ini: add xfce4-appfinder 4.4.2 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 3b4724fd58..63bb704b75 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16398,6 +16398,10 @@ sha256=4bca692e0af03c0f70c6cf62f2b60274e71899beaa45815c2d0f46f7f19c06d5 md5=a4636f51d79eb68ba65098336d120d56 sha256=1e6c80b800dd02f6b1cbf69df36307cc0b341ab73438c5508ac760fd8be66232 +[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-appfinder-4.4.2.tar.bz2] +md5=0bdd0b1e96a1e1cf50ce5d582758b992 +sha256=bdf232505f240d0933ca3cd7d2a5c07c31477a70570d95111f94a1226bf7e59c + [http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-dev-tools-4.4.0.1.tar.bz2] md5=7d09d161efc7ef86b3b48791d98c8ae8 sha256=1e7a506f08c8a4f368dd18648006ba3934a94eb96fd4545f5303d46aeae9cc3e -- cgit v1.2.3 From 5f2e800061cfb157765dedba99cf6d44ba248cd9 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 21:59:40 -0300 Subject: checksums.ini: add xfce4-mixer 4.4.2 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 63bb704b75..01cfb75c5f 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16418,6 +16418,10 @@ sha256=9d145dd0ad09c1bd1efe357bd0413fabc93945d7986d3f4662ac515625da93bc md5=9648fc403f9eb4baede230644bf5638d sha256=6beda572195d6f7ed108e0659592d1ca6ad5088e769e3d219cc4114533f8b169 +[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-mixer-4.4.2.tar.bz2] +md5=c21cb5680f135dc86e5f0a6f9473003a +sha256=b390241dfddbc10ae1b870d1326a7675b9ac99e13c89326ba2accea3bfecc47a + [http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce4-panel-4.2.2.tar.gz] md5=50699e6c8e4a79f0a4f962e12559c9d0 sha256=b29e8524c448b9712f5eff0d7702706289a4a2967125b82a92a50ca142cc2d66 -- cgit v1.2.3 From 8a8b9141555a02beb947e82962b539ab80b1e1f8 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 22:03:13 -0300 Subject: checksums.ini: add xfce4-panel 4.4.2 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 01cfb75c5f..a4907cb062 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16430,6 +16430,10 @@ sha256=b29e8524c448b9712f5eff0d7702706289a4a2967125b82a92a50ca142cc2d66 md5=53f96a9db5628ac1c629c9e5ecd842e4 sha256=1925b19457594b5e2a57f07f649375be428a038eb821c8b445dc1e7d2fe9c769 +[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-panel-4.4.2.tar.bz2] +md5=8f26b32c442bf9926f98f285a3c251dd +sha256=ddabfb0ccf04366820efdeb7c640ee3a648a55e51b5177c9861a5ab896e96ddd + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xfd-X11R7.0-1.0.1.tar.bz2] md5=26c83a6fe245906cc05055abf877d0f2 sha256=a3fe35b19aa957e5261a12ef78de2c62b47796aa612b2334088b3d98dcd77e8f -- cgit v1.2.3 From 3821e1b6d62a8dcf12ab57788597139f5da1f912 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 22:03:33 -0300 Subject: checksums.ini: add xfprint 4.4.2 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index a4907cb062..cd93f5d473 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16482,6 +16482,10 @@ sha256=6d643173a9ae18e1daa3566503bc461e9a056470595ec059b2eea70e4113b77b md5=c2eb9dee0002e875b91e73557f7354a1 sha256=4eee12555dbc296fa26afbfdbfabad3586000239d5666e54b6bfae7f8cd03e89 +[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfprint-4.4.2.tar.bz2] +md5=be4802807e74dea30f4825102ceff5c5 +sha256=b9bb03820a8ba1995ffe3e5b96b6d5ebbbc0347ad1202172f13bba63b2984d54 + [http://xorg.freedesktop.org/releases/individual/app/xfs-1.0.4.tar.bz2] md5=f43cb64d623b748208dfd9012d17b654 sha256=452dde2923c7ae5a2b8cb4b9735507c579c1c55a0e5e45a34210e52574ee641b -- cgit v1.2.3 From 791d2d04912928932156e7996a0b9ec4250fa2f6 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 22:03:55 -0300 Subject: checksums.ini: add xfwm4-themes 4.4.2 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index cd93f5d473..6668417ba5 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16534,6 +16534,10 @@ sha256=b458f3d9dc1f6370ac596862e1ebcbc3e5227e58450ea9c1172d7de6534e34a1 md5=a77e9e700de66d38b6c4850a18283fb1 sha256=10b2f7ffbf309c12ec82b4bc28b35014cb223208d3003bab3765b70dea9d96bd +[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfwm4-themes-4.4.2.tar.bz2] +md5=fbea3ef7eec87fd669958f9cf597bfb8 +sha256=d6f6052ec9bdc2a048dd34a79248ee56abd903055adc0d89d04715eb17ac1dc0 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xfwp-X11R7.0-1.0.1.tar.bz2] md5=e1ef3fef10d1f7fbd936794982a8f0be sha256=d333ce08122e6cde1a9d4fc7cb8e58b13e9335b52fd249046e8380f23d9bf429 -- cgit v1.2.3 From 2c18f41640ddd0943cc91f025d7649cdbde89ea4 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Oct 2008 22:04:24 -0300 Subject: checksums.ini: add xfce4-session 4.4.2 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 6668417ba5..3626c5e511 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16434,6 +16434,10 @@ sha256=1925b19457594b5e2a57f07f649375be428a038eb821c8b445dc1e7d2fe9c769 md5=8f26b32c442bf9926f98f285a3c251dd sha256=ddabfb0ccf04366820efdeb7c640ee3a648a55e51b5177c9861a5ab896e96ddd +[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-session-4.4.2.tar.bz2] +md5=4c3d1acb8ce37ea4dd55d82aeb38e9e7 +sha256=7394906dec7b50789407219f85143ae83b10938949d38adeecdd59eb50c8c1c6 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xfd-X11R7.0-1.0.1.tar.bz2] md5=26c83a6fe245906cc05055abf877d0f2 sha256=a3fe35b19aa957e5261a12ef78de2c62b47796aa612b2334088b3d98dcd77e8f -- cgit v1.2.3 From 3607c5935c4408e281ea4ca7706719ab694d51f1 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 18 Oct 2008 01:48:20 -0500 Subject: checksums.ini: Additions from the SlugOS packages --- conf/checksums.ini | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 3626c5e511..9b2da0c698 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -918,6 +918,10 @@ sha256=9ec43259123b89980ad0b5a36b8d582cf877d918019f993f629a9fa5327a5c58 md5=63fef787c263bd8025c6ab6a6cecdd01 sha256=cd1da2119dd812127ab6e6e8cbb954d9b74fe01ec744364ba79c9845865ffdaa +[http://www.apache.org/dist/apr/apr-1.2.12.tar.bz2] +md5=c5da94517e3918f0f2b2e0a05f56aa21 +sha256=db22b34c0bfcab8546632475c6de2c63990214fb8ae5e2ada565410a85e22134 + [http://www.apache.org/dist/apr/apr-1.2.7.tar.bz2] md5=e77887dbafc515c63feac84686bcb3bc sha256=384437f3c4eb7d53ad27fdadce6cbc295ef16653b7f7739a480d91c784082ec9 @@ -1034,6 +1038,54 @@ sha256=85331e63c90370c305121f134358e76cbb06846a12c04a7825d5869f331ee00d md5=3b416557d2c395a36b97a819812e99b0 sha256=2bcc5d5620f8533eb4300ba1b48c9d2a00092ce04588e32f7074cf2aadc34259 +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.4.8.tar.gz] +md5=e708a5510a61217725b6ad663287dfa0 +sha256=5d5c305079eb9918d271fad28ac73248a7d2962347dbd80d16aac66fe35e2729 + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.4.8.tar.gz] +md5=febffdf865db7a773ce687b295cb19e9 +sha256=6829f56eaf0221125e83f5547c773895d00ddc725a0b3a7015d22bbcaf6675ed + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.4.8.tar.gz] +md5=384e92a24153cf713af2dd7484b5fef3 +sha256=64efa42d1bc77e78c898c2461f45f51fa2b0679e75d36e180bc3969eb0cffd07 + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.4.8.tar.gz] +md5=05c620267e4653d48815b77d58e93247 +sha256=a48faee879bce9ec753b796b9449db0f2eba47f46845f5497ad6a4e3bae666ee + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.4.7.tar.gz] +md5=ecc50bd2b9b29d8237911272248c5d35 +sha256=61ff59c7d1a180fbcbec2cf14965ad405fb10d90fc26310848a580bd99a1cf18 + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.4.7.tar.gz] +md5=0de5e5f75197b4e128815867443de775 +sha256=c2e17052da282533cc10a38fcd6c4d3e5b2de43d7909f7391f9fcf34c335c921 + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-gsm-1.4.7.tar.gz] +md5=c5ac7e08d98762d5cbb59b0838370fc9 +sha256=de15f3dbf5e1688ebb853e84439d2ef48fd7eab66b1e19469485ed6e47e66161 + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.4.7.tar.gz] +md5=b8063676b102076321b6d4640b4e6126 +sha256=94c2ba9290283851ddfba9e7b29c797412538d7a2002599508ce4122ad74c767 + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-alaw.tar.gz] +md5=ef6dca03deeaf1cfd2c97feb5af21538 +sha256=6dec5684b48cb375c226ed94aeee77e35b9db6c7e85abeb9bf5260e8df43cd9c + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-g729.tar.gz] +md5=381497d57c39d786cc79200576c5b2cc +sha256=fdb7b483b55457b488fcb788f0254c26ca87cab49dcfb8391d347454fb3a8b7f + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-gsm.tar.gz] +md5=da0cbefb40b5670648e1d2cc0010ec9f +sha256=e52b849febb308a6c6b6f4b6445d334e57178373ccf94b8660776c1a8fa45ad1 + +[http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-ulaw.tar.gz] +md5=b1115a8c4daa2957a1da98b5eae37104 +sha256=b040f30b07c3277e3c5ef76699761dff2a88f5cfe979de7b46a6ce7676b534e9 + [http://ftp.digium.com/pub/asterisk/releases/asterisk-sounds-1.2.1.tar.gz] md5=bed4259905a7d7bc070c6319142b2075 sha256=bfa7def7d0f1190a111bde232920d2b3481d3932e2d1056573b3a9c4801c602a @@ -1050,6 +1102,10 @@ sha256=0d77c73a3c151a7da647dd924f32151e5ee4574530568fd65067882f79cd5a44 md5=03ccc8d178ee956feb46ab970e982e94 sha256=71e8890e709ee77756368b8508f65c6c9bf8c6ed5e1501726ef30e1dc105d4f5 +[ftp://ftp.debian.org/debian/pool/main/a/atftp/atftp_0.7.dfsg-3.diff.gz] +md5=fa5ea0d162c41c197af48d717df1389f +sha256=2bbf2b8fdf6e12dabb0cc751a973d9040f7ed9123cf87a7f794044f3429b0de0 + [ftp://ftp.debian.org/debian/pool/main/a/atftp/atftp_0.7.orig.tar.gz] md5=3b27365772d918050b2251d98a9c7c82 sha256=9c548c44d3cfdf259118d9fd4e468e1fe4567456dbff8ff59838c5f70ef62ea3 @@ -1454,6 +1510,10 @@ sha256=69d82eff84b1cef08a30e3a79de26df0bce7f531a86d2144ee0d5e43fc21ce86 md5=9ff3204eea27184ea0722f37e43fc95d sha256=9a9411115338d2554f2e99bc676c2e9a381a8d649bf9bd9c0b2ffa2cf74b563c +[ftp://ftp.isc.org/isc/bind9/9.3.5-P1/bind-9.3.5-P1.tar.gz] +md5=1446984f552b18a0ff7db63971a0cb5a +sha256=8bd6b53f5a2c5f0332aaba9a51ef3d7fc55c60f906f0c506e11b6600ed82a90b + [http://fgouget.free.fr/bing/bing_src-1.1.3.tar.gz] md5=0ccd96cc01351c0562f1e4b94aaa2790 sha256=3151893aa5597491b7cb7083b4e786017b522cac55dffacbe475c9abdd7fe61a @@ -2374,6 +2434,10 @@ sha256=99602e966e12347f2728b2153537a14195b06fe130d047e8d91b4f72b24866a0 md5=659d5c53cbace53f44fe7acb666bfe33 sha256=8b718c344cf19417447cbc16867d2e04434654c13b330598b96720ead146b961 +[http://luks.endorphin.org/source/cryptsetup-1.0.5.tar.bz2] +md5=0aa2f94c39123f1a0352983e5366179c +sha256=4bab529afa00cafde3bc5df2769578c88438f80c5152d4257cd0e86986f95bc4 + [http://downloads.sourceforge.net/cscope/cscope-15.5.tar.gz] md5=beb6032a301bb11524aec74bfb5e4840 sha256=be49cda0a9d33add89cabe0dfcef436a2863a7b0b833767875e0b7a6e8b4c4d1 @@ -3502,6 +3566,10 @@ sha256=d0867cf1dbc58031a6b65375cf899f565569a818400f762dcee3b50de9da9f56 md5=9956b30139edaa4f5f77c4d0dbd80225 sha256=c18e6f23315e0a3526229bd0ba5cf8ce0d747cb5e5ba7cb952ad08c85a1cafac +[ftp://ftp.debian.org/debian/pool/main/f/fetchmail/fetchmail_6.3.8.orig.tar.gz] +md5=1b84621072b4f906b5686a4fbae0b1d7 +sha256=d06e7244dcd2b462c0e7bea0d01edadb54905f4533afc45f971ab9f6ee46497c + [http://downloads.sourceforge.net/ffmpeg/ffmpeg-0.4.9-pre1.tar.gz] md5=ea5587e3c66d50b1503b82ac4179c303 sha256=0e9e771114a75c461e813538f129eb05a251b8fc6591a5563420700b8e312da0 @@ -4006,6 +4074,10 @@ sha256=ab91922367ca4c7ae5b176823eca579b2323c463e5d8b71fe5cdfc1061860124 md5=7c3d52f81816e3a8e0cc2b5822a37e86 sha256=a26117fb74b3bf6a3c6867611c46c53b75d6749198933486ec8a778ac315f855 +[http://downloads.sourceforge.net/fuse/fuse-2.7.2.tar.gz] +md5=813782a4f23211386c1ea91dc0ac7ded +sha256=fb390948aa27628e4fb48aa6658a20ad8c1ee304fe76bb60ac29b81c63d3baff + [http://downloads.sourceforge.net/foosh/fush-0-9-0.tar.gz] md5=d7077d40a4bc18f05bc3a4895012646a sha256=ad4a64117094eafde12d7aa8c81f6425113d1ebf5b561c6cc93cfda46a2fef41 @@ -6250,6 +6322,10 @@ sha256=5dc5cf08502510a00cecd6e04ef006a74ba7ed4b31d25187b5efadd70a78733b md5=a6f532770cf9286e1de38d6570cbc6bc sha256=65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d +[http://hal.freedesktop.org/releases/hal-0.5.9.tar.gz] +md5=a6f532770cf9286e1de38d6570cbc6bc +sha256=65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d + [http://people.freedesktop.org/~david/dist/hal-info-20070618.tar.gz] md5=c7005ccb1765d8359fd2348350770495 sha256=bec1b0ad166b6c4d5269e7aa6d7bdbd0eb05c8f2c30042e4dca18993ba5682f0 @@ -6670,6 +6746,10 @@ sha256=5135e8d69d6206d320515df7aeee7027711ab1aef9d8dbf29571a97a9746b041 md5=19f27ddd2dda4b2d26a559a4f0f402a7 sha256=2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079 +[http://ftp.de.debian.org/debian/pool/main/i/id3lib3.8.3/id3lib3.8.3_3.8.3-7.2.diff.gz] +md5=805c0320a2efb21c40ce06fa13cd7c4b +sha256=9f03b59ccc8826a5be55a3dcde2f889067d58bdc72bf846416a198c9b933704c + [http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.20.tar.gz] md5=7d259502c75f5ea9aebcd57c1a3d0739 sha256=1f8967e1a3d3a7f88bdc2aeaf54fdaea86e60ecf7424af912947193a9d2a4092 @@ -6718,6 +6798,10 @@ sha256=53b67c08477623bb03436f79bf2ca859d7cd9684c57775ea539e1db449658236 md5=df0909a586ddac2b7a0d62795eea4206 sha256=9f001daa0f3d571ae35aac88f04d5dd982a14e90257e4dfb535c143fa18d5830 +[ftp://ftp.gnu.org/gnu/inetutils/inetutils-1.5.tar.gz] +md5=aeacd11d19bf25c89d4eff38346bdfb9 +sha256=345c73b4afd7a4ff8d23af820ccc4d01c4c3ccc01ea9c964c85cdafe5cf11511 + [http://iniparse.googlecode.com/files/iniparse-0.2.3.tar.gz] md5=194a04cc93fe123f244ca33e7724bdf6 sha256=f1252122f09cc63a57843ec1b8a51ce30c7bfcbc857f476a996b374006433a48 @@ -9158,6 +9242,10 @@ sha256=d9163d90e259bfde9164c7b218475a7664a7907a1b3197f17bc1035f36112225 md5=9eab84e54790093be3aa93fb4163c4b9 sha256=25d21557dccebbed2c7ff704fded0399194164d0a5e318791b4594a7db1cfa6b +[ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/libsigc++-2.2.2.tar.gz] +md5=e27a20ac9bc9100f48effdfca8e8c595 +sha256=53258864f9fc951c26b491bbc958ebccf4b1cc287cd71209e86e5aff67d0f12e + [http://downloads.sourceforge.net/libsigcx/libsigcx-0.6.4.tar.gz] md5=02e78c3cfbdb4be285d97653e563f65a sha256=bd55717374674ed69de46c13b52aaba0420d5c68582cac34d863e44f6f1d560e @@ -9318,6 +9406,10 @@ sha256=b8839214df514d560a202f54c30d1b2e2f443f0798193c9e926c9f9e11218b9c md5=8ca1ea241cd27ff9832e045fe9afe4fd sha256=eb6b8f8272c5a5cad0c7c6b949aa75632f45c295f09b2e1e90b6bce15b32b796 +[http://libtorrent.rakshasa.no/downloads/libtorrent-0.12.0.tar.gz] +md5=76c818b095248ea9e4b140fff4e2fa2a +sha256=3287c9be61f9ec8ddab99f9b679bbf58610d024bce980307f88151a552ecd1e3 + [http://downloads.sourceforge.net/giflib/libungif-4.1.3.tar.bz2] md5=8c198831cc0495596c78134b8849e9ad sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36 @@ -10262,6 +10354,10 @@ sha256=5431073fb315f9b8dd43f430d7a9082e0a6232e20af559604da573270df8236b md5=7b193c2fcf1d8f625e998df54582fee9 sha256=bc9e3fe06a550d6eb48fd84eaf58415c78fbc29ba042e4a074adb62736f50760 +[http://kernel.org/pub/linux/docs/man-pages/Archive/man-pages-2.79.tar.bz2] +md5=1775f4ab1529db175a95f83bacc562b0 +sha256=e88295f9d6fe792784ea7dd546a12b0e7bb96b023d4248e728a43eb6ad885135 + [http://www.maradns.org/download/1.0/maradns-1.0.39.tar.bz2] md5=5ac39978f55ecaf6e887cd5be027b1c3 sha256=4ac5940d25a9b5a52d0ff1f8223bb85462f9cfcceb4ac547e3ca9b6690aad394 @@ -10466,6 +10562,10 @@ sha256=d54ae28bdafdbd3c71bfafa8f8814583356714b6a1436783161413a1e34a38c9 md5=c02004f4588fdc19e5e861df896f5e2c sha256=38294fb58a3dfcc21d64f263370d039a2411dda0aa472d1e0d94b7864f1f8fc9 +[http://downloads.sourceforge.net/mediatomb/mediatomb-0.11.0.tar.gz] +md5=661f08933830d920de21436fe122fb15 +sha256=25e0b3d761e41fc6793c780eb7f638719867cdc6d3429ec24f72d1e9556ac1d2 + [http://downloads.sourceforge.net/mediatomb/mediatomb-0.9.0-pre.tar.gz] md5=bd6bf1a44393ef96c490319606df70bb sha256=d48eca88957ba7c972a379321fb8165e67dae0e5a0039fe553183da1207b2ad6 @@ -10678,6 +10778,10 @@ sha256=ab4c9191645f9ffb455ae7c014d8c45339c13a1d0f6914817cfbf30a0bc56bf0 md5=4032f2305a3393ab18e02efe6550e1aa sha256=8447eb112e0e42db59e490fa98b0a1c9ed90ff3660b99734fe5119061eddce8e +[http://www.tildeslash.com/monit/dist/monit-4.10.1.tar.gz] +md5=d3143b0bbd79b53f1b019d2fc1dae656 +sha256=f6a29300648381538a403f24506e75b94164e26c69c6861ca112d425edc9d193 + [http://go-mono.com/sources/mono/mono-1.2.2.1.tar.gz] md5=b67ef657b83ca26249d7b9e9c5e7da69 sha256=d68f597c303678c3f325f552a0e2780b613dbf34d093c2269c002127be4953e5 @@ -10886,6 +10990,10 @@ sha256=c1454fdf5d3658f492253106c12bbf89a3bcc5789c36851a5f2f345d61a4ac0c md5=ea7afa7e0bd9cfa0df7c04a9b270df88 sha256=2033168723ffd612336acb8a64b33fcd91f7dedeaf78949d3dfce231cb962ce9 +[ftp://ftp.mutt.org/mutt/devel/mutt-1.5.15.tar.gz] +md5=b2c1eb45fd958f6589ee52a98f2a3ce1 +sha256=03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a + [ftp://ftp.mutt.org/mutt/devel/mutt-1.5.4i.tar.gz] md5=3d4088f25892af6d71148eef26604f33 sha256=f89af1816b839736eaf5fd188c4574fc52bdd37a7dabc465edafe6d8c3914847 @@ -10962,6 +11070,10 @@ sha256=a69d1690ad587d81b85c34d1ef9bf47abf0ba21dc96876d95dd6a9a193a859f1 md5=384b7f01d725c89ccd30692628b3ac1b sha256=2ebc7b51af96cb0fa8b703c7cb995bfb46ccf5312e335270d0420e260544c376 +[ftp://ftp.ncftp.com/ncftp/older_versions/ncftp-3.2.0-src.tar.bz2] +md5=384b7f01d725c89ccd30692628b3ac1b +sha256=2ebc7b51af96cb0fa8b703c7cb995bfb46ccf5312e335270d0420e260544c376 + [http://mercury.chem.pitt.edu/~shank/ncmpc-0.11.1.tar.gz] md5=c90668b12f3676c73913a863482ec405 sha256=aa0a6162e8543e01304f7dc2f6b227babebda9f2430664e6deae0277444cb817 @@ -11150,6 +11262,10 @@ sha256=385a606007eb14f5847f033ac6fa8ea48366597ad1f93aa99864e1f82e23ac88 md5=94e84d5c6023c5e1f3890b28d0a08c92 sha256=3f515a043bcd3b778d33938da224214e727faa528256d4a1a213bc8617ac2d0b +[http://doolittle.icarus.com/ntpclient/ntpclient_2007_365.tar.gz] +md5=cb98711f11769cdd22fc592844cef414 +sha256=295ed5ecfab595901cbe2cd41998d1715913318d30c22349784733e79de0e8f8 + [http://downloads.sourceforge.net/numpy/numarray-1.1.1.tar.gz] md5=40cec6ce8ca2e95a4fbc7a28879bf4a5 sha256=7a6f7f2745cbcb02bf79cc7cd365a3f80679f2558dfaa378010675f40a7aff3b @@ -11570,6 +11686,10 @@ sha256=420e3508c74873f9b4c106d7c4d1b0800c138e8f3c07d1ec57aa5995f126899b md5=4a9862b5151f16dcad8e30dd6ef08549 sha256=a1547a88ba9330956ce9f2f9e2ab74491e7344cc25fee4310b7f72c7e5f38db3 +[http://ftp.gnome.org/pub/GNOME/sources/pango/1.20/pango-1.20.5.tar.bz2] +md5=052b60a12f6b2eb4f251ab961f2b2b84 +sha256=86f5a94bad18a24c32d6c95f4aad0de643189471825d07e1c1bcaf7cc5a8fab2 + [http://ftp.gnome.org/pub/GNOME/sources/pango/1.22/pango-1.22.0.tar.bz2] md5=37a185a3cb5c1a39ade7fdc3e6c75349 sha256=75fa65f965c8b9b80b1a0a270ad5dfbe71eaa980451790a0c86fdd19f55cd150 @@ -11606,6 +11726,18 @@ sha256=6c57feb082c23e52f38366fff4ffa3961e5dc294d4ebb61ffa31462b5ae3681e md5=cce5bce8fa1d430e1ca3de3722807e01 sha256=2f67c40e2589e7804213493f24ebf80cd10847b47c95098854db0250511c3ed1 +[http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.initials.gz] +md5=414606ce18de730d1bb6478899532644 +sha256=9385915adb106abba6f1576be58901f368688b1d55ef454e3993394828ee17e1 + +[http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.nntp.2.gz] +md5=f4724392ca865125bc2be80b643d175c +sha256=ed0dc2337148ab4a884a94fd9472a76a13f74659372facef771f8b0eda5e4846 + +[http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.quote.gz] +md5=93276f86e544e69a0e83808279f3b175 +sha256=4afe6cc178b08ebd735d04053198f6539c87a0cdc1c5a8a51affc3598504e3a5 + [http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.rr.compressed.gz] md5=a7b37150c35ea65049b3cd1edab5079d sha256=a4780e1dcfe717567ef6a676fa4f9b9d9f2d44bb27dbc2374d7e3a01667f53bd @@ -12398,6 +12530,10 @@ sha256=5190166e88f2f5cc1190fe2259b7a8e6796d472ced8436b5f90493075ecc0387 md5=64805cf3efcd43f39e500229ff511b5a sha256=fe73f3e7586cead55920d7fcdaca3924776b55d335d815042d14b16aa68d74fa +[http://www.isely.net/downloads/pvrusb2-mci-20080210.tar.bz2] +md5=52a45595560645fb36979c85f35f8578 +sha256=012882309a06987397beb3484e91467bb1be47e23850750ecaaa415be015cb79 + [http://www.saillard.org/linux/pwc/files/pwc-10.0.12-rc1.tar.bz2] md5=8763f3d6fd0f9738ef9854de205a126d sha256=dad803c34e902e286a3d6fb052f48b826c62a8ad19a54ced2936da7641b62907 @@ -13050,6 +13186,10 @@ sha256=4990e24f9a49588cc2d7c3646fb9b5c3946213db26e1df129d218265a88ada2e md5=b42cf15f6651c3ceff5cb84996c0d539 sha256=c0862c53aecd23724a72d32fb54706d61d9858925c78408a2852d042417e68bf +[ftp://ftp.debian.org/debian/pool/main/r/reiserfsprogs/reiserfsprogs_3.6.19.orig.tar.gz] +md5=b42cf15f6651c3ceff5cb84996c0d539 +sha256=c0862c53aecd23724a72d32fb54706d61d9858925c78408a2852d042417e68bf + [http://xlibs.freedesktop.org/release/renderext-0.8.tar.bz2] md5=b00a97b00bf93ab2ac6442ea13ea9c0b sha256=779317ca2e99f02b394af0c6f77f16def56de3b71a5d9f9ac6e5e9cfb65192e1 @@ -13222,6 +13362,10 @@ sha256=e04718f3989bc567bf185cacfb27e324218cce5f5c87fca65328e49a3b56e603 md5=5b60500bc9605d2409b71124e48aa929 sha256=59cc003bab753335b3ce14a908e663ea782514b3531dc7030379ff753ef1a78c +[http://libtorrent.rakshasa.no/downloads/rtorrent-0.8.0.tar.gz] +md5=6216be7ce5e3ead9dc115eaeea863694 +sha256=597cefac4535d7f3b752253e5997b3c851c261b26b966a39beb032dcf1d5baa7 + [ftp://ftp.ruby-lang.org/pub/ruby/ruby-1.8.5.tar.gz] md5=3fbb02294a8ca33d4684055adba5ed6f sha256=19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58 @@ -13298,6 +13442,10 @@ sha256=63b744141982d15691b23e3bbe2114d3724fe9bc96c4605d97720bbfa560794d md5=3b804f35cdfbc5ad2d201ffe078bbac9 sha256=89106b5bc5a66ca0eaf4553371c89ac8542a757964d7a91c07b8fb77e040eebe +[http://alioth.debian.org/frs/download.php/2318/sane-backends-1.0.19.tar.gz] +md5=8c0936272dcfd4e98c51512699f1c06f +sha256=13271a7eb4dc4aa6072162abbd78848e4faad32c468b9b44e7f95cde96a4e17e + [http://stage.maemo.org/pool/maemo/ossw/source/s/sapwood/sapwood_1.20-1.tar.gz] md5=92dbb7fbcf468030662d4a103ecaca58 sha256=d0baabff2a5dba4ad8dfc79f15f0d3110ab88564a451c835b56618cf808ba870 @@ -13694,6 +13842,10 @@ sha256=2fdde1b4e610cd6e004db8f98ac1100fcbea03b8f11e236de536ce22bc6c620d md5=4ab3668b7d1362ce923f64a211e0e568 sha256=2984645b207c52ea9b8ef3951af8bd0c5aab469607fabf63ade05f8fe87309c1 +[http://downloads.sourceforge.net/smartmontools/smartmontools-5.38.tar.gz] +md5=a282846532ecbd6b4a28072373b3a70b +sha256=b2097320a1fca4851f1377a14f4cc14a46e27d2a44ca017c40a6cb618b2f31e8 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/smproxy-X11R7.0-1.0.1.tar.bz2] md5=60f54881b6fb27a8ba238629e4097c4d sha256=c56617fd511eac4bdcff5b9b171be0aeacb7d8ddfe48615aa61295cf90b62888 @@ -13754,6 +13906,10 @@ sha256=9efdc359ccc15af51edc33ead837f0820d353165c633cbe8c86f65ff0d3be30c md5=0243d62895caee558b5294d5b78cfbcb sha256=c66c52cfa42fe126592563c3d8974007a9858bd35d2c1136389a721eeebb9f8e +[http://www.soft-switch.org/downloads/spandsp/spandsp-0.0.3.tgz] +md5=6ea33941985fbf94b5f79dc3255ad925 +sha256=368467b757736aef99e19f68e4ed50012b555ef18445b4ad7e47da8c1c353118 + [http://www.soft-switch.org/downloads/snapshots/spandsp/spandsp-20070123.tar.gz] md5=28b67b6f56d97051c48f251116e0519f sha256=18b335e1804cc24505ca683343d62cb98e845ff1e2e3c966502e67f1b61f2546 @@ -14802,6 +14958,10 @@ sha256=f53533b44a9c17972aff6ac7047c6ac1e2e5e2930254eccdb1239678a6dd1793 md5=9d23919999d6eac9217d1f41472034a9 sha256=145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9 +[http://downloads.sourceforge.net/nslu/upslug2-11.tar.gz] +md5=e135bc8a390b65573bbc8ff4628e490c +sha256=24859c992fb58f0bf4840e1378da91b942c73263b0213096e6755436af8d16bc + [http://downloads.sourceforge.net/sc2/uqm-0.3-source.tgz] md5=6abcdc3caf7efd3bd978332743ee7568 sha256=e42ac3b45c1c8a3199bbd9b666e9225d76bc18d902339c54cbb4df3a75909e53 @@ -14890,6 +15050,10 @@ sha256=bfa16a53bf481178f0b1bb51fadf539e96312fc3b84f1e54c650d2bae6f1eccb md5=e978c648f808cf1740b1583a78b922ff sha256=b09616934c21e10a9bac2d3941bd8585b075ccc10c2f5218a0f652b0e9386a4c +[http://ushare.geexbox.org/releases/ushare-1.1a.tar.bz2] +md5=5bbcdbf1ff85a9710fa3d4e82ccaa251 +sha256=7b9b85c79968d4f4560f02a99e33c6a33ff58f9d41d8faea79e31cce2ee78665 + [http://mattcamp.paunix.org/usound/usound-0.2.0.tar.gz] md5=f863e1c02a8f7b634fd3102274163f8e sha256=31299e0308d7e1879cba6c54e3c06b1ba8de028d6cf8dc6ff99c0fe9974cefe2 @@ -15054,6 +15218,10 @@ sha256=39f2dfd8aaf41b51aadaa06c862b75d82c8f0ffd268d03d37e5895c038366271 md5=1edd81324b4ffc0702c9ff289a342d91 sha256=5a254457f718df733a03e9e5c39caaba9c0aac864ea69cb5d8907ec6df28e57f +[http://www.candelatech.com/~greear/vlan/vlan.1.9.tar.gz] +md5=5f0c6060b33956fb16e11a15467dd394 +sha256=3b8f0a1bf0d3642764e5f646e1f3bbc8b1eeec474a77392d9aeb4868842b4cca + [http://download.videolan.org/pub/videolan/vlc/0.7.2/vlc-0.7.2.tar.gz] md5=25dfcc804cb92f46c0b64ce1466515cc sha256=1551c792384ae027995f498546d26c1fdd42a896a9cc2d94a8209d06af4b5874 @@ -15174,6 +15342,10 @@ sha256=3df5eb8f877648799ab623cf1718ecc6f86eb0c2f51d344d8e860442dcc5cd6f md5=5a1a4476087973852e30f8cdb5b0ff92 sha256=c762525fdbf5f5dd32c6c950f2a63d8c1b15ec3dc7afca5d2dc3dbd1b129a00d +[http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/watchdog_5.3.1.tar.gz] +md5=ba97ddce396bfccd8d409bc3141d7ef4 +sha256=b7bf9feeedea26d7e06935369a1a556089426e94f9ead946018526c96cd9b12e + [http://downloads.sourceforge.net/wbxmllib/wbxml2-0.9.0-src.tar.gz] md5=3f9b5bf104ec523b8eebe69f93919ded sha256=acd218148d7f92ee7bd0539d6aabd0b42cca8ae4ffe241bfa8760d30605b28c9 -- cgit v1.2.3 From c6aff25fcf987b04ec654b4331dcded4eae27696 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Sat, 18 Oct 2008 09:13:33 +0100 Subject: gcc-4.1.1: fix problem with backslash in sed command --- packages/gcc/gcc-4.1.1.inc | 1 + packages/gcc/gcc-4.1.1/sed-fixinc-backslash.patch | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 packages/gcc/gcc-4.1.1/sed-fixinc-backslash.patch diff --git a/packages/gcc/gcc-4.1.1.inc b/packages/gcc/gcc-4.1.1.inc index 92ee2d7bb8..ac8a4a8a71 100644 --- a/packages/gcc/gcc-4.1.1.inc +++ b/packages/gcc/gcc-4.1.1.inc @@ -29,6 +29,7 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \ file://gcc-ignore-cache.patch;patch=1 \ file://gcc-4.1.1-e300cx.patch;patch=1 \ file://pr34130.patch;patch=1 \ + file://sed-fixinc-backslash.patch;patch=1 \ " SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " diff --git a/packages/gcc/gcc-4.1.1/sed-fixinc-backslash.patch b/packages/gcc/gcc-4.1.1/sed-fixinc-backslash.patch new file mode 100644 index 0000000000..9aff951bdc --- /dev/null +++ b/packages/gcc/gcc-4.1.1/sed-fixinc-backslash.patch @@ -0,0 +1,18 @@ +2006-09-06 Matthias Klose + + * Makefile.in (s-macro_list): Conform to POSIX rules in single quoted + strings. + +--- s/gcc/Makefile.in~ 2008-10-18 08:53:56.000000000 +0100 ++++ s/gcc/Makefile.in 2008-10-18 08:55:16.000000000 +0100 +@@ -3146,8 +3146,8 @@ + macro_list: s-macro_list; @true + s-macro_list : $(GCC_PASSES) + echo | $(GCC_FOR_TARGET) -E -dM - | \ +- sed -n 's/^#define \([^_][a-zA-Z0-9_]*\).*/\1/p ; \ +- s/^#define \(_[^_A-Z][a-zA-Z0-9_]*\).*/\1/p' | \ ++ sed -n -e 's/^#define \([^_][a-zA-Z0-9_]*\).*/\1/p' \ ++ -e 's/^#define \(_[^_A-Z][a-zA-Z0-9_]*\).*/\1/p' | \ + sort -u > tmp-macro_list + $(SHELL) $(srcdir)/../move-if-change tmp-macro_list macro_list + $(STAMP) s-macro_list -- cgit v1.2.3 From 2b4d8829a8df88c2c5d78750536f12dd42ee6f57 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 18 Oct 2008 11:04:49 +0200 Subject: angstrom feed builder: add gnome-icon-theme to cleaning list --- contrib/angstrom/build-feeds.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index deea7d3627..75b630b22d 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -61,7 +61,7 @@ do_build for machine in simpad om-gta01 c7x0 nokia800 beagleboard dht-walnut efika do BUILD_MACHINE=$machine - BUILD_CLEAN="qmake-native qmake2-native qt-x11-free python" + BUILD_CLEAN="qmake-native qmake2-native qt-x11-free python gnome-icon-theme" BUILD_TARGETS=" \ abiword \ aircrack-ng \ -- cgit v1.2.3 From 77129c893941ccffaf671fe14f217966b6802f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Sat, 18 Oct 2008 11:20:52 +0200 Subject: wt: fix cross-compilation --- packages/wt/files/cmakelist.patch | 18 ++++++++++++++++++ packages/wt/wt_2.2.0.bb | 6 +++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/packages/wt/files/cmakelist.patch b/packages/wt/files/cmakelist.patch index 405914a4ed..9e1eab1835 100644 --- a/packages/wt/files/cmakelist.patch +++ b/packages/wt/files/cmakelist.patch @@ -1,3 +1,21 @@ +diff -urN wt-2.2.0.orig/src/CMakeLists.txt wt-2.2.0/src/CMakeLists.txt +--- wt-2.2.0.orig/src/CMakeLists.txt 2008-09-10 15:58:34.000000000 +0200 ++++ wt-2.2.0/src/CMakeLists.txt 2008-10-18 11:12:20.000000000 +0200 +@@ -33,8 +33,12 @@ + + LINK_DIRECTORIES(${BOOST_LIB_DIRS}) + +-ADD_EXECUTABLE(filetostring web/skeleton/FileToString.C) +-GET_TARGET_PROPERTY(FILE_TO_STRING_EXE filetostring LOCATION) ++IF(CMAKE_CROSSCOMPILING) ++ ADD_EXECUTABLE(filetostring web/skeleton/FileToString.C) ++ GET_TARGET_PROPERTY(FILE_TO_STRING_EXE filetostring LOCATION) ++ELSE(CMAKE_CROSSCOMPILING) ++ SET(FILE_TO_STRING_EXE ${CMAKE_CURRENT_SOURCE_DIR}/filetostring) ++ENDIF(CMAKE_CROSSCOMPILING) + + MACRO (FILE_TO_STRING infile outfile var) + ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${outfile} diff -urN wt-2.2.0.orig/src/Wt/Ext/CMakeLists.txt wt-2.2.0/src/Wt/Ext/CMakeLists.txt --- wt-2.2.0.orig/src/Wt/Ext/CMakeLists.txt 2008-07-15 08:25:54.000000000 +0200 +++ wt-2.2.0/src/Wt/Ext/CMakeLists.txt 2008-10-17 22:37:38.000000000 +0200 diff --git a/packages/wt/wt_2.2.0.bb b/packages/wt/wt_2.2.0.bb index 4bd1f37eb7..16d8c55d2e 100644 --- a/packages/wt/wt_2.2.0.bb +++ b/packages/wt/wt_2.2.0.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" SECTION = "devel" LICENSE = "GPL" DEPENDS = "boost" -FILE_PR = "r1" +FILE_PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz \ file://cmakelist.patch;patch=1" @@ -15,6 +15,10 @@ inherit cmake STAGE_TEMP = "${WORKDIR}/temp-staging" +do_configure_append() { + ${BUILD_CXX} ${BUILD_CXXFLAGS} -o src/filetostring src/web/skeleton/FileToString.C +} + do_stage() { rm -rf ${STAGE_TEMP} mkdir -p ${STAGE_TEMP} -- cgit v1.2.3 From fa469a73af202ce5ce3abc18070e82cc63183658 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 18 Oct 2008 12:49:32 +0200 Subject: libtelepathy: add telepathy-glib to DEPENDS --- packages/telepathy/libtelepathy_0.3.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/telepathy/libtelepathy_0.3.3.bb b/packages/telepathy/libtelepathy_0.3.3.bb index fdd310366c..23d7fc9cdf 100644 --- a/packages/telepathy/libtelepathy_0.3.3.bb +++ b/packages/telepathy/libtelepathy_0.3.3.bb @@ -1,5 +1,5 @@ HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" -DEPENDS = "glib-2.0 dbus" +DEPENDS = "telepathy-glib glib-2.0 dbus" LICENSE = "LGPL" FILE_PR = "r0" -- cgit v1.2.3 From 23c6142305c9c2da6de029598706c88e2e320916 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Fri, 17 Oct 2008 15:45:39 +0200 Subject: task-x11[-illume]: switch to FILE_PR --- packages/tasks/task-x11-illume.bb | 2 +- packages/tasks/task-x11.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tasks/task-x11-illume.bb b/packages/tasks/task-x11-illume.bb index a477c6e8c5..b84efec516 100644 --- a/packages/tasks/task-x11-illume.bb +++ b/packages/tasks/task-x11-illume.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Illume Windowing Environment -- install this task to get the SECTION = "x11/wm" LICENSE = "MIT" PV = "1.0" -PR = "r0" +FILE_PR = "r0" # WORK IN PROGRESS diff --git a/packages/tasks/task-x11.bb b/packages/tasks/task-x11.bb index ad5ca3a412..ce1fa79bba 100644 --- a/packages/tasks/task-x11.bb +++ b/packages/tasks/task-x11.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The X Window System -- install this task to get a client/server b SECTION = "x11/server" LICENSE = "MIT" PV = "1.0" -PR = "r0" +FILE_PR = "r0" # WORK IN PROGRESS -- cgit v1.2.3 From 0592d2c50f7b37411869bfad4d67e42f0186c3db Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Fri, 17 Oct 2008 16:57:28 +0200 Subject: taks-fso-compliance: add --- packages/tasks/task-fso-compliance.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 packages/tasks/task-fso-compliance.bb diff --git a/packages/tasks/task-fso-compliance.bb b/packages/tasks/task-fso-compliance.bb new file mode 100644 index 0000000000..c331d7a8d0 --- /dev/null +++ b/packages/tasks/task-fso-compliance.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "The freesmartphone.org framework -- install this task to make your distribution FSO-compliant." +SECTION = "fso/base" +LICENSE = "MIT" +PV = "1.0" +FILE_PR = "r0" + +inherit task + +RDEPENDS_${PN} = "\ + frameworkd \ + fso-gpsd \ +" + +RRECOMMENDS_${PN} = "\ + gsm0710muxd \ +" -- cgit v1.2.3 From 58774ccd9fd50634d01536d81afe24b2571dfa7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Sat, 18 Oct 2008 14:28:23 +0200 Subject: boost-1.36.0: disable boost-serialization, it fails on powerpc --- packages/boost/boost-36.inc | 22 ++++++++++------------ packages/boost/boost_1.36.0.bb | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/packages/boost/boost-36.inc b/packages/boost/boost-36.inc index 62dc504b84..3ccb66f4b6 100644 --- a/packages/boost/boost-36.inc +++ b/packages/boost/boost-36.inc @@ -22,16 +22,24 @@ BOOST_LIBS = "\ iostreams \ program_options \ regex \ - serialization \ signals \ system \ test \ thread \ " +# FIXME: for some reason this fails on powerpc +#BOOST_LIBS += "serialization" + +# To enable python, uncomment the following: +#BOOST_LIBS += "python" +#DEPENDS += "python" +#PYTHON_ROOT = "${STAGING_DIR_HOST}/${layout_prefix}" +#PYTHON_VERSION = "2.5" + S = "${WORKDIR}/${BOOST_P}" -# Make a package for each library, plus -dev and -python +# Make a package for each library, plus -dev PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}" python __anonymous () { import bb @@ -54,16 +62,6 @@ FILES_boost-serialization = "${libdir}/libboost_serialization*.so* \ FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so \ ${libdir}/libboost_unit_test_framework*.so*" -# Python - remove this and set: -#PYTHON_ROOT = "/dev/null" -# to remove the python build -DEPENDS += "python" -PYTHON_ROOT = "${STAGING_DIR_HOST}/${layout_prefix}" -PYTHON_VERSION = "2.5" - -PACKAGES += "boost-python" -FILES_boost-python = "${libdir}/libboost_python*.so*" - # -dev last to pick up the remaining stuff PACKAGES += "${PN}-dev" FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a" diff --git a/packages/boost/boost_1.36.0.bb b/packages/boost/boost_1.36.0.bb index fdc3136ac4..17fddb06b4 100644 --- a/packages/boost/boost_1.36.0.bb +++ b/packages/boost/boost_1.36.0.bb @@ -2,7 +2,7 @@ include boost-36.inc DEFAULT_PREFERENCE = "-1" -FILE_PR = "r2" +FILE_PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ file://arm-intrinsics.patch;patch=1 \ -- cgit v1.2.3 From 4b1aa6a6145ce697754209480d6266369becac6d Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 18 Oct 2008 09:46:02 -0300 Subject: base.bbclass: strip branch name in base_detect_branch --- classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 8ff2346a34..b50bc8667c 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -773,7 +773,7 @@ def base_detect_branch(d): for scm in scms: rev = scm(d) if rev <> "": - return rev + return rev.strip() return "" -- cgit v1.2.3 From d1a7beac4aab0db73c2817402c44945752d3cdfb Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 18 Oct 2008 09:48:04 -0300 Subject: checksums.ini: add xfce-utils 4.4.2 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 9b2da0c698..8bf9d77639 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16562,6 +16562,10 @@ sha256=67091b02a85c9700d574416c4adfca6db042b679ac3234228967f4a6c560ad93 md5=de6502dd93176b2a60e2e66bf052024f sha256=a40832c874dda5a06c0208cd178a8d02cd61cb2379aa46cdffbe3fb592fd551c +[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce-utils-4.4.2.tar.bz2] +md5=119dd3f1daedfa41e3be89bad8997336 +sha256=eba910fb99598e09fa4c41c4ab405216a2b59a837a3ab058656360ec2324314c + [http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce4-appfinder-4.2.2.tar.gz] md5=0ef8c944e8aa2db06719e02b2c40d70c sha256=4bca692e0af03c0f70c6cf62f2b60274e71899beaa45815c2d0f46f7f19c06d5 -- cgit v1.2.3 From 7da643e378c6f29d392f6b3f89d9792f6e56738c Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 18 Oct 2008 09:49:01 -0300 Subject: checksums.ini: add xfwm4 4.4.2 --- conf/checksums.ini | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/conf/checksums.ini b/conf/checksums.ini index 8bf9d77639..ae4f73b1c1 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16542,10 +16542,6 @@ sha256=951cb843f1c98fb68e0ab71f260dda9bc77ffd7b3aa16883d22e395134125c48 md5=876a4b5d582de8fdc01457df2e7e1339 sha256=65531403c4b24f1be031e57a935b9a464661c47764cb913888aa86ed03ecb268 -[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce-mcs-plugins-4.2.2.tar.gz] -md5=6e23972a2a0b3b3e7852bfc68dc0eeb8 -sha256=693166e49eac35a85e66a7ad5dee046657f08937dc0a9144ecd26148ab9917a9 - [http://www.us.xfce.org/archive/xfce-4.2.3/src/xfce-mcs-plugins-4.2.3.tar.gz] md5=cdd1ca3ff7610a45658aa801b91da8dc sha256=57dffc6ac2d44a8feb11e30f4a12810ab3a22b436b38ea873d3706a62caea169 @@ -16554,6 +16550,10 @@ sha256=57dffc6ac2d44a8feb11e30f4a12810ab3a22b436b38ea873d3706a62caea169 md5=6234425227e1145319bd75ef52fa97f5 sha256=f2773a4c007139f0a06c418b3535374ebeed8e10eef41d3ae69f4259f6f632a5 +[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-plugins-4.4.2.tar.bz2] +md5=77fcc929058de530d4f91eb25de851a1 +sha256=e16610264256248bfd8ca227c7861000abf0c323611ad34913b06c41af0c9be5 + [http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce-utils-4.2.2.tar.gz] md5=585e1fd48dee70c50271ac478e8adcd0 sha256=67091b02a85c9700d574416c4adfca6db042b679ac3234228967f4a6c560ad93 @@ -16702,6 +16702,10 @@ sha256=018628d7c5ef10d947cb0228ca4ed7527aebf9ea54eb6db49091a7b8f61c2b86 md5=3186d90ae752cce9687698c8bd6b26c3 sha256=3600267ba477217f065628454bffb30d8819731940c7fdbfd197c731bca9125f +[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfwm4-4.4.2.tar.bz2] +md5=21da77e50b07e72bba784bf3418ca067 +sha256=710120122bc4acaaecdb0646656c5aa92f1d44c4c81d1a6775688abab04cca0a + [http://www.us.xfce.org/archive/xfce-4.2.0/src/xfwm4-themes-4.2.0.tar.gz] md5=a8d0676fbf9cd3b3514d76a39d4ecbe1 sha256=9aebac55dfc92a3533678a873d0f3babee285061b0ad5b26a56b6e72fb306ed4 @@ -17541,4 +17545,3 @@ sha256=12f5b654f6b91953391d2492a09d2c9586d5b7af419f0eeb306e1d30245659d3 [http://downloads.sourceforge.net/zziplib/zziplib-0.10.82.tar.bz2] md5=a6538f6c44ceeed0ed7e8e356f444168 sha256=f684397ce39ec400ba3369521892b7c3a8711d3ef1be59115db9f8d57707bbb8 - -- cgit v1.2.3 From 5886b2b45e2c7b2e26b646fb74d15c661c4664bd Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 18 Oct 2008 09:50:43 -0300 Subject: checksums.ini: add xfce-mcs-plugins 4.4.2 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index ae4f73b1c1..5bbcd46816 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16542,6 +16542,10 @@ sha256=951cb843f1c98fb68e0ab71f260dda9bc77ffd7b3aa16883d22e395134125c48 md5=876a4b5d582de8fdc01457df2e7e1339 sha256=65531403c4b24f1be031e57a935b9a464661c47764cb913888aa86ed03ecb268 +[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce-mcs-plugins-4.2.2.tar.gz] +md5=6e23972a2a0b3b3e7852bfc68dc0eeb8 +sha256=693166e49eac35a85e66a7ad5dee046657f08937dc0a9144ecd26148ab9917a9 + [http://www.us.xfce.org/archive/xfce-4.2.3/src/xfce-mcs-plugins-4.2.3.tar.gz] md5=cdd1ca3ff7610a45658aa801b91da8dc sha256=57dffc6ac2d44a8feb11e30f4a12810ab3a22b436b38ea873d3706a62caea169 -- cgit v1.2.3 From 8b78fa6cc5cfea3cccf237a9b6d558d8cff56321 Mon Sep 17 00:00:00 2001 From: woglinde Date: Fri, 17 Oct 2008 19:32:38 +0200 Subject: uclibc.inc: do not install ldconfig and ldd to staging * do not install this target binaries to install they are not useful and were installed into a false directory * bump PR on all affected recipes --- packages/uclibc/bfin-uclibc_svn.bb | 2 +- packages/uclibc/uclibc.inc | 5 ----- packages/uclibc/uclibc_0.9.26.bb | 2 +- packages/uclibc/uclibc_0.9.27.bb | 2 +- packages/uclibc/uclibc_0.9.28.bb | 2 +- packages/uclibc/uclibc_0.9.29.bb | 2 +- packages/uclibc/uclibc_nptl.bb | 2 +- packages/uclibc/uclibc_svn.bb | 2 +- 8 files changed, 7 insertions(+), 12 deletions(-) diff --git a/packages/uclibc/bfin-uclibc_svn.bb b/packages/uclibc/bfin-uclibc_svn.bb index f05a2deb37..891ff87328 100644 --- a/packages/uclibc/bfin-uclibc_svn.bb +++ b/packages/uclibc/bfin-uclibc_svn.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -FILE_PR = "r3" +FILE_PR = "r4" PV = "${UCLIBC_BASE}+svnr${SRCREV}" require uclibc.inc diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc index f20caa29f1..9b27e1f323 100644 --- a/packages/uclibc/uclibc.inc +++ b/packages/uclibc/uclibc.inc @@ -155,11 +155,6 @@ do_stage() { RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ install_dev install_runtime - # Install into the staging dir - oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - install_utils - # We don't really need this rm -f ${UCLIBC_STAGE_PREFIX}/include/.cvsignore diff --git a/packages/uclibc/uclibc_0.9.26.bb b/packages/uclibc/uclibc_0.9.26.bb index ee741a893c..f4b7aa3c28 100644 --- a/packages/uclibc/uclibc_0.9.26.bb +++ b/packages/uclibc/uclibc_0.9.26.bb @@ -1,4 +1,4 @@ -FILE_PR = "r11" +FILE_PR = "r12" require uclibc.inc diff --git a/packages/uclibc/uclibc_0.9.27.bb b/packages/uclibc/uclibc_0.9.27.bb index 367964a2e1..049017b2fb 100644 --- a/packages/uclibc/uclibc_0.9.27.bb +++ b/packages/uclibc/uclibc_0.9.27.bb @@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1" -FILE_PR = "r11" +FILE_PR = "r12" require uclibc.inc diff --git a/packages/uclibc/uclibc_0.9.28.bb b/packages/uclibc/uclibc_0.9.28.bb index d4c3b174ee..9b6c342080 100644 --- a/packages/uclibc/uclibc_0.9.28.bb +++ b/packages/uclibc/uclibc_0.9.28.bb @@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1" -FILE_PR = "r16" +FILE_PR = "r17" require uclibc.inc diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb index bd350dd144..7d659160f4 100644 --- a/packages/uclibc/uclibc_0.9.29.bb +++ b/packages/uclibc/uclibc_0.9.29.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -FILE_PR = "r28" +FILE_PR = "r29" DEFAULT_PREFERENCE = "1" require uclibc.inc diff --git a/packages/uclibc/uclibc_nptl.bb b/packages/uclibc/uclibc_nptl.bb index c1506bc7b6..b441cb821f 100644 --- a/packages/uclibc/uclibc_nptl.bb +++ b/packages/uclibc/uclibc_nptl.bb @@ -8,7 +8,7 @@ # UCLIBC_BASE ?= "0.9.29" PV = "${UCLIBC_BASE}+svnr${SRCREV}" -FILE_PR = "r2" +FILE_PR = "r3" #DEFAULT_PREFERENCE = "2" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index ee30f20396..d643b43769 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -8,7 +8,7 @@ # UCLIBC_BASE ?= "0.9.29" PV = "${UCLIBC_BASE}+svnr${SRCREV}" -FILE_PR = "r16" +FILE_PR = "r17" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. -- cgit v1.2.3 From 5443f24a5262480572d01425754b65faf36bac10 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 18 Oct 2008 08:30:37 -0500 Subject: SlugOS: slugos-packages - demote gdb due to build failure --- packages/meta/slugos-packages.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index c69e20d679..740677eddb 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -FILE_PR = "r58" +FILE_PR = "r59" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2|ixp4xx" @@ -92,7 +92,6 @@ SLUGOS_PACKAGES = "\ fuse \ gawk \ gcc \ - gdb \ gdbm \ glib-2.0 \ gnu-config \ @@ -255,6 +254,7 @@ SLUGOS_BROKEN_PACKAGES = "\ ctorrent \ dsniff \ eciadsl \ + gdb \ gspcav1 \ linphone \ lirc-modules lirc \ -- cgit v1.2.3 From e769c7fbe16294b2c5306edfafa1ec821b7b138c Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sat, 18 Oct 2008 16:31:30 +0200 Subject: frameworkd git: ship yaml rules in -config package and tag them as CONFFILE --- packages/freesmartphone/frameworkd_git.bb | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb index 3ad398b5e7..2fd8a480fd 100644 --- a/packages/freesmartphone/frameworkd_git.bb +++ b/packages/freesmartphone/frameworkd_git.bb @@ -4,7 +4,7 @@ AUTHOR = "Michael 'Mickey' Lauer et. al." SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" -PV = "0.8.4.0+gitr${SRCREV}" +PV = "0.8.4.2+gitr${SRCREV}" FILE_PR = "r0" inherit distutils update-rc.d @@ -35,6 +35,7 @@ RDEPENDS_${PN} += "\ python-shell \ python-subprocess \ python-syslog \ + python-textutils \ \ ${PN}-config \ " @@ -49,10 +50,21 @@ RRECOMMENDS_${PN}_append_om-gta01 = "gsm0710muxd" RRECOMMENDS_${PN}_append_om-gta02 = "gsm0710muxd" PACKAGES =+ "${PN}-config" - PACKAGE_ARCH_${PN}-config = "${MACHINE_ARCH}" -FILES_${PN}-config = "${sysconfdir}/frameworkd.conf" -CONFFILES_${PN}-config = "${sysconfdir}/frameworkd.conf" + +FILES_${PN}-config = "\ + ${sysconfdir}/frameworkd.conf \ + ${sysconfdir}/freesmartphone \ +" +CONFFILES_${PN}-config = "\ + ${sysconfdir}/frameworkd.conf \ + ${sysconfdir}/freesmartphone/opreferences/conf/phone/silent.yaml \ + ${sysconfdir}/freesmartphone/opreferences/conf/phone/default.yaml \ + ${sysconfdir}/freesmartphone/opreferences/conf/profiles/default.yaml \ + ${sysconfdir}/freesmartphone/opreferences/conf/rules/silent.yaml \ + ${sysconfdir}/freesmartphone/opreferences/conf/rules/default.yaml \ + ${sysconfdir}/freesmartphone/oevents/rules.yaml \ +" PACKAGE_ARCH_${PN} = "${BASE_PACKAGE_ARCH}" FILES_${PN} += "${sysconfdir}/dbus-1 ${sysconfdir}/freesmartphone ${sysconfdir}/init.d ${datadir}" -- cgit v1.2.3 From bf1158d4e18cab57a49efe84fbb92af15858483d Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Sat, 18 Oct 2008 17:27:28 +0100 Subject: gcc-cross-kernel: defeat fixincludes --- packages/gcc/gcc-cross-kernel.inc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/gcc/gcc-cross-kernel.inc b/packages/gcc/gcc-cross-kernel.inc index a567c60119..c0a8de77cc 100644 --- a/packages/gcc/gcc-cross-kernel.inc +++ b/packages/gcc/gcc-cross-kernel.inc @@ -9,6 +9,13 @@ do_install () { : } +do_compile () { + # This compiler is only for the kernel. Don't bother running fixincludes. + mkdir -p gcc + touch gcc/stmp-fixinc + oe_runmake +} + do_stage () { cd gcc oe_runmake installdirs install-common install-headers install-libgcc -- cgit v1.2.3 From 2a6217b27df13e2501459d6cd19436bae82967fd Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Sat, 18 Oct 2008 17:28:20 +0100 Subject: gcc: respect ${layout_includedir} --- packages/gcc/gcc-configure-common.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/gcc/gcc-configure-common.inc b/packages/gcc/gcc-configure-common.inc index 795911db74..e88cee5cb2 100644 --- a/packages/gcc/gcc-configure-common.inc +++ b/packages/gcc/gcc-configure-common.inc @@ -75,6 +75,13 @@ do_configure () { export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}" export ARCH_FLAGS_FOR_TARGET="${ARCH_FLAGS_FOR_TARGET}" (cd ${S} && gnu-configize) || die "failure running gnu-configize" + + # splice our idea of where the headers live into gcc's world + echo "NATIVE_SYSTEM_HEADER_DIR = ${layout_includedir}" > ${T}/t-oe + sed 's%^tmake_file=.*$%& ${T}/t-oe%' < ${S}/gcc/Makefile.in >${S}/gcc/Makefile.in.new + mv ${S}/gcc/Makefile.in.new ${S}/gcc/Makefile.in + + echo "#define STANDARD_INCLUDE_DIR \"${layout_includedir}\"" >> ${S}/gcc/defaults.h + oe_runconf } - -- cgit v1.2.3 From 34f093e3653d06c143d0da22bdde491e792a266b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 18 Oct 2008 16:57:50 -0300 Subject: checksums.ini: add terminal 0.2.8 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 5bbcd46816..2e56e1cf4b 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -546,6 +546,10 @@ sha256=6fd69febfd804437a9d5b610502c6d3c2caabef7a4832a3bcac2357515adaa71 md5=8741490a25b98230973446400971bba9 sha256=c1f29cfd31c335a409bdc530c2e68661d20a1e3c2e5d64454470b6700a40681e +[http://www.us.xfce.org/archive/xfce-4.4.2/src/Terminal-0.2.8.tar.bz2] +md5=cfe660ecf50e9d3b073576bbc4af6ab2 +sha256=20a58b96915f67c5b4f49fb1428e1876195f1f9fd7d37e0081352cadc13463e7 + [http://search.cpan.org/CPAN/authors/id/M/MA/MARKF/Test-Builder-Tester-1.01.tar.gz] md5=4751252f1e33af4f582c8af4c7b7666f sha256=62bc416ccb3f01c3911d9744d6c865d9fa4d008bd47dbecc2adde5c3892ce868 -- cgit v1.2.3 From 3a44c41ea3993ef7899f49228eab5874ae0bfb04 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 18 Oct 2008 17:04:09 -0300 Subject: task-xfce-base: use splited xfce4-plugins --- packages/tasks/task-xfce-base.bb | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/packages/tasks/task-xfce-base.bb b/packages/tasks/task-xfce-base.bb index bf6813a4ef..b734341c54 100644 --- a/packages/tasks/task-xfce-base.bb +++ b/packages/tasks/task-xfce-base.bb @@ -4,12 +4,31 @@ DESCRIPTION = "All packages required for an base XFCE installation" LICENSE = "MIT" -FILE_PR = "r3" +FILE_PR = "r4" inherit task -RDEPENDS_${PN} = "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \ - xfce4-panel xfce4-panel-plugins xfce-mcs-plugins xfwm4-mcs-plugins \ - xfce4-panel-mcs-plugins \ - xfdesktop-mcs-plugins" +RDEPENDS_${PN} = " \ + xfce-mcs-manager \ + xfwm4 \ + xfwm4-theme-default \ + xfce-utils \ + xfdesktop \ + xfce4-panel \ + xfce4-panel-plugin-actions \ + xfce4-panel-plugin-clock \ + xfce4-panel-plugin-iconbox \ + xfce4-panel-plugin-launcher \ + xfce4-panel-plugin-pager \ + xfce4-panel-plugin-separator \ + xfce4-panel-plugin-showdesktop \ + xfce4-panel-plugin-systray \ + xfce4-panel-plugin-tasklist \ + xfce4-panel-plugin-windowlist \ + xfce-mcs-plugins \ + xfwm4-mcs-plugins \ + xfce4-panel-mcs-plugins \ + xfdesktop-mcs-plugins \ +" + RRECOMMENDS_${PN} = "xfce-utils-mcs-plugins" -- cgit v1.2.3 From 8b5e3f5fce5605e2bd0fc8b36b85809c65764acd Mon Sep 17 00:00:00 2001 From: woglinde Date: Sat, 18 Oct 2008 21:59:01 +0200 Subject: libsdl-x11: fix sdl.m4 for sdl-config * there is a stupid PATH setting which is using the host stuff, just removed it and our staging sdl-config is found * bump PR --- packages/libsdl/files/fixmfour.patch | 14 ++++++++++++++ packages/libsdl/libsdl-x11_1.2.11.bb | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 packages/libsdl/files/fixmfour.patch diff --git a/packages/libsdl/files/fixmfour.patch b/packages/libsdl/files/fixmfour.patch new file mode 100644 index 0000000000..0d534bd9a1 --- /dev/null +++ b/packages/libsdl/files/fixmfour.patch @@ -0,0 +1,14 @@ +Index: SDL-1.2.11/sdl.m4 +=================================================================== +--- SDL-1.2.11.orig/sdl.m4 2008-10-18 21:20:13.482478928 +0200 ++++ SDL-1.2.11/sdl.m4 2008-10-18 21:20:28.979441480 +0200 +@@ -32,9 +32,6 @@ + fi + fi + +- if test "x$prefix" != xNONE; then +- PATH="$prefix/bin:$prefix/usr/bin:$PATH" +- fi + AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) + min_sdl_version=ifelse([$1], ,0.11.0,$1) + AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) diff --git a/packages/libsdl/libsdl-x11_1.2.11.bb b/packages/libsdl/libsdl-x11_1.2.11.bb index 809c9852f8..e9628d9e07 100644 --- a/packages/libsdl/libsdl-x11_1.2.11.bb +++ b/packages/libsdl/libsdl-x11_1.2.11.bb @@ -3,7 +3,7 @@ require libsdl.inc # extra-keys.patch is missing DEFAULT_PREFERENCE = "-1" -FILE_PR = "r6" +FILE_PR = "r7" SRC_URI = "\ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ @@ -12,6 +12,7 @@ SRC_URI = "\ file://pagesize.patch;patch=1 \ file://kernel-asm-page.patch;patch=1 \ file://sdl-cdfix.patch;patch=1 \ + file://fixmfour.patch;patch=1 \ " EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \ -- cgit v1.2.3 From f5908addf3671abab19e1e43763b3b0ca60a451b Mon Sep 17 00:00:00 2001 From: woglinde Date: Sat, 18 Oct 2008 22:00:31 +0200 Subject: libsdl-image: remove the integrated stupid sdl.m4 packages * remove the old sdl.m4 likewise the libtool.m4 file * bump PR --- packages/libsdl/libsdl-image_1.2.6.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/libsdl/libsdl-image_1.2.6.bb b/packages/libsdl/libsdl-image_1.2.6.bb index 27b5aa7d1a..b458e19dba 100644 --- a/packages/libsdl/libsdl-image_1.2.6.bb +++ b/packages/libsdl/libsdl-image_1.2.6.bb @@ -1,8 +1,12 @@ require libsdl-image.inc +FILE_PR= "r1" + +DEPENDS += "tiff" do_unpackpost() { # Removing this file fixes a libtool version mismatch. rm acinclude/libtool.m4 + rm acinclude/sdl.m4 } addtask unpackpost after do_unpack before do_patch -- cgit v1.2.3