From dea0a8631e64cef54a98708865ca016092479dbf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 9 Sep 2006 08:19:47 +0000 Subject: linux-oz-2.6: poodle compile fixes --- packages/linux/linux-openzaurus_2.6.17.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb index 8a3e49eaee..46657f9837 100644 --- a/packages/linux/linux-openzaurus_2.6.17.bb +++ b/packages/linux/linux-openzaurus_2.6.17.bb @@ -1,6 +1,6 @@ require linux-openzaurus.inc -PR = "r23" +PR = "r24" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -46,10 +46,10 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \ ${DOSRC}/kexec-arm-r3.patch;patch=1 \ ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \ - ${RPSRC}/poodle_pm-r2.patch;patch=1 \ + ${RPSRC}/poodle_pm-r3.patch;patch=1 \ ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \ - ${RPSRC}/poodle_audio-r2.patch;patch=1 \ - ${RPSRC}/pxa27x_overlay-r1.patch;patch=1 \ + ${RPSRC}/poodle_audio-r3.patch;patch=1 \ + ${RPSRC}/pxa27x_overlay-r2.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ file://hrw-pcmcia-ids-r4.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ -- cgit v1.2.3 From 97b35308a73e4fe401592c7029f96eddf02d34d6 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sat, 9 Sep 2006 08:40:36 +0000 Subject: linux-openzaurus 2.6.17: enable Multiple LUNs for tosa and collie --- packages/linux/linux-openzaurus-2.6.17/defconfig-collie | 2 +- packages/linux/linux-openzaurus-2.6.17/defconfig-tosa | 2 +- packages/linux/linux-openzaurus_2.6.17.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-collie b/packages/linux/linux-openzaurus-2.6.17/defconfig-collie index 181eb228ed..7ae7c0ecfb 100644 --- a/packages/linux/linux-openzaurus-2.6.17/defconfig-collie +++ b/packages/linux/linux-openzaurus-2.6.17/defconfig-collie @@ -587,7 +587,7 @@ CONFIG_CHR_DEV_SG=m # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs # -# CONFIG_SCSI_MULTI_LUN is not set +CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.17/defconfig-tosa index 4302f47e15..48501c8a76 100644 --- a/packages/linux/linux-openzaurus-2.6.17/defconfig-tosa +++ b/packages/linux/linux-openzaurus-2.6.17/defconfig-tosa @@ -591,7 +591,7 @@ CONFIG_CHR_DEV_SG=m # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs # -# CONFIG_SCSI_MULTI_LUN is not set +CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb index 46657f9837..bed9923414 100644 --- a/packages/linux/linux-openzaurus_2.6.17.bb +++ b/packages/linux/linux-openzaurus_2.6.17.bb @@ -1,6 +1,6 @@ require linux-openzaurus.inc -PR = "r24" +PR = "r25" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ -- cgit v1.2.3 From 7ac8c483e8b8ae61b971000cf245bde7bf52275b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 9 Sep 2006 09:44:28 +0000 Subject: linux-oz-2.6: poodle locomo oops fix --- packages/linux/linux-openzaurus_2.6.17.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb index bed9923414..d9adf9ede4 100644 --- a/packages/linux/linux-openzaurus_2.6.17.bb +++ b/packages/linux/linux-openzaurus_2.6.17.bb @@ -1,6 +1,6 @@ require linux-openzaurus.inc -PR = "r25" +PR = "r26" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -48,7 +48,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \ ${RPSRC}/poodle_pm-r3.patch;patch=1 \ ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \ - ${RPSRC}/poodle_audio-r3.patch;patch=1 \ + ${RPSRC}/poodle_audio-r4.patch;patch=1 \ ${RPSRC}/pxa27x_overlay-r2.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ file://hrw-pcmcia-ids-r4.patch;patch=1 \ -- cgit v1.2.3 From b7b9e11f6f7dcee422e51654099340c67c002e33 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 9 Sep 2006 11:58:12 +0000 Subject: many recipes: change pcre to libpcre in DEPENDS --- packages/apache/apache_2.0.54.bb | 2 +- packages/balsa/balsa_2.0.17.bb | 2 +- packages/cherokee/cherokee-nossl_0.5.3.bb | 2 +- packages/cherokee/cherokee_0.4.29.bb | 2 +- packages/cherokee/cherokee_0.5.3.bb | 2 +- packages/ctrlproxy/ctrlproxy_2.6.2.bb | 2 +- packages/e17/evidence_20060128.bb | 2 +- packages/gpe-package/gpe-package_0.3.bb | 2 +- packages/gpsdrive/gpsdrive_2.10pre2.bb | 2 +- packages/gpsdrive/gpsdrive_2.10pre3.bb | 2 +- packages/gpsdrive/gpsdrive_cvs.bb | 2 +- packages/konqueror/konqueror-embedded_20030705.bb | 2 +- packages/konqueror/konqueror-embedded_20060404.bb | 2 +- packages/meta/nylon-feed.bb | 2 +- packages/meta/slugos-packages.bb | 2 +- packages/metalog/metalog_0.7.bb | 2 +- packages/ngrep/ngrep_1.42.bb | 2 +- packages/nmap/nmap_3.81.bb | 2 +- packages/pme/pme_1.0.3.bb | 2 +- packages/postfix/postfix-native_2.0.20.bb | 2 +- packages/postfix/postfix_2.0.20.bb | 2 +- packages/zsh/zsh_4.1.1.bb | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/apache/apache_2.0.54.bb b/packages/apache/apache_2.0.54.bb index 3ab58c590f..8afb375912 100644 --- a/packages/apache/apache_2.0.54.bb +++ b/packages/apache/apache_2.0.54.bb @@ -1,6 +1,6 @@ MAINTAINER="David Karlstrom " SECTION = "net" -DEPENDS = "openssl expat pcre" +DEPENDS = "openssl expat libpcre" PR = "r4" diff --git a/packages/balsa/balsa_2.0.17.bb b/packages/balsa/balsa_2.0.17.bb index 3d97a01fe9..7418f648e5 100644 --- a/packages/balsa/balsa_2.0.17.bb +++ b/packages/balsa/balsa_2.0.17.bb @@ -3,7 +3,7 @@ incorporating all the features you would expect in a robust mail client." HOMEPAGE = "http://balsa.gnome.org" SECTION = "x11/network" LICENSE = "GPL" -DEPENDS = "libesmtp glib-2.0 libgnome libgnomeui gtk+ gnome-vfs libbonobo aspell pcre libtool openssl gtkhtml-3.0" +DEPENDS = "libesmtp glib-2.0 libgnome libgnomeui gtk+ gnome-vfs libbonobo aspell libpcre libtool openssl gtkhtml-3.0" RDEPENDS = "gdk-pixbuf-loader-xpm" PR = "r3" diff --git a/packages/cherokee/cherokee-nossl_0.5.3.bb b/packages/cherokee/cherokee-nossl_0.5.3.bb index a7c08ce753..5487afcfde 100644 --- a/packages/cherokee/cherokee-nossl_0.5.3.bb +++ b/packages/cherokee/cherokee-nossl_0.5.3.bb @@ -1,6 +1,6 @@ require cherokee_${PV}.bb -DEPENDS = "pcre" +DEPENDS = "libpcre" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/cherokee-${PV}', '${FILE_DIRNAME}/cherokee', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/cherokee/cherokee_0.4.29.bb b/packages/cherokee/cherokee_0.4.29.bb index 0d2eb3dcfb..09a5934ba3 100644 --- a/packages/cherokee/cherokee_0.4.29.bb +++ b/packages/cherokee/cherokee_0.4.29.bb @@ -1,7 +1,7 @@ # Cherokee web server DESCRIPTION = "Cherokee Web Server fast and secure" LICENSE = "GPL" -DEPENDS = "openssl pcre" +DEPENDS = "openssl libpcre" SRC_URI = "http://www.0x50.org/download/0.4/${PV}/${P}.tar.gz \ file://configure.patch;patch=1 \ file://Makefile.in.patch;patch=1 \ diff --git a/packages/cherokee/cherokee_0.5.3.bb b/packages/cherokee/cherokee_0.5.3.bb index 9326619d2d..bb406792e6 100644 --- a/packages/cherokee/cherokee_0.5.3.bb +++ b/packages/cherokee/cherokee_0.5.3.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Cherokee Web Server fast and secure" DESCRIPTION_cget = "Small downloader based in the Cherokee client library" LICENSE = "GPL" -DEPENDS = "pcre gnutls" +DEPENDS = "libpcre gnutls" HOMEPAGE = "http://www.0x50.org/" PR = "r1" diff --git a/packages/ctrlproxy/ctrlproxy_2.6.2.bb b/packages/ctrlproxy/ctrlproxy_2.6.2.bb index 6fdf0d8c2c..d426a351ca 100644 --- a/packages/ctrlproxy/ctrlproxy_2.6.2.bb +++ b/packages/ctrlproxy/ctrlproxy_2.6.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "ctrlproxy is an IRC server with multiserver support." SECTION = "console/network" PRIORITY = "optional" MAINTAINER = "NSLU2 Linux " -DEPENDS = "glib-2.0 libxml2 popt pcre openssl" +DEPENDS = "glib-2.0 libxml2 popt libpcre openssl" PR = "r1" LICENSE = "GPL" diff --git a/packages/e17/evidence_20060128.bb b/packages/e17/evidence_20060128.bb index 683ac8e536..30bc8792ac 100644 --- a/packages/e17/evidence_20060128.bb +++ b/packages/e17/evidence_20060128.bb @@ -1,7 +1,7 @@ DESCRIPTION = "evidence, an enlightenemt file manager" LICENSE = "GPL" # can support dbus, avifile, libmpeg3 -DEPENDS = "pkgconfig gtk+ glib-2.0 ecore-x11 evas-x11 edb eet edje imlib2-x11 libpng epeg jpeg pcre curl taglib libvorbis libogg libxine-x11 emotion freetype" +DEPENDS = "pkgconfig gtk+ glib-2.0 ecore-x11 evas-x11 edb eet edje imlib2-x11 libpng epeg jpeg libpcre curl taglib libvorbis libogg libxine-x11 emotion freetype" RDEPENDS += "examine" PR = "r0" diff --git a/packages/gpe-package/gpe-package_0.3.bb b/packages/gpe-package/gpe-package_0.3.bb index 4de6e056df..1ee7a9a2ff 100644 --- a/packages/gpe-package/gpe-package_0.3.bb +++ b/packages/gpe-package/gpe-package_0.3.bb @@ -3,7 +3,7 @@ PR = "r3" inherit gpe pkgconfig DESCRIPTION = "A package manager GUI for GPE" -DEPENDS = "ipkg pcre libgpewidget" +DEPENDS = "ipkg libpcre libgpewidget" RDEPENDS = "gpe-icons gpe-su" SECTION = "gpe" PRIORITY = "optional" diff --git a/packages/gpsdrive/gpsdrive_2.10pre2.bb b/packages/gpsdrive/gpsdrive_2.10pre2.bb index 4de819e5f6..98eee0c4fa 100644 --- a/packages/gpsdrive/gpsdrive_2.10pre2.bb +++ b/packages/gpsdrive/gpsdrive_2.10pre2.bb @@ -3,7 +3,7 @@ inherit autotools pkgconfig PR = "r1" PACKAGES += "gpsdrive-add" DESCRIPTION = "GPS navigation/map display software" -DEPENDS = "virtual/libc gtk+ pcre gpsd" +DEPENDS = "virtual/libc gtk+ libpcre gpsd" RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd" MAINTAINER = "Florian Boor " SECTION = "x11" diff --git a/packages/gpsdrive/gpsdrive_2.10pre3.bb b/packages/gpsdrive/gpsdrive_2.10pre3.bb index 7d0e32930c..6915bc0194 100644 --- a/packages/gpsdrive/gpsdrive_2.10pre3.bb +++ b/packages/gpsdrive/gpsdrive_2.10pre3.bb @@ -5,7 +5,7 @@ DEFAULT_PREFERENCE="-1" PACKAGES += "gpsdrive-add" DESCRIPTION = "GPS navigation/map display software" -DEPENDS = "virtual/libc gtk+ pcre gpsd" +DEPENDS = "virtual/libc gtk+ libpcre gpsd" RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd" MAINTAINER = "Florian Boor " SECTION = "x11" diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb index e1ea27cac0..88c1fb411e 100644 --- a/packages/gpsdrive/gpsdrive_cvs.bb +++ b/packages/gpsdrive/gpsdrive_cvs.bb @@ -7,7 +7,7 @@ DEFAULT_PREFERENCE="-1" PACKAGES += "gpsdrive-add" DESCRIPTION = "GPS navigation/map display software" -DEPENDS = "virtual/libc libart-lgpl gtk+ pcre gpsd" +DEPENDS = "virtual/libc libart-lgpl gtk+ libpcre gpsd" RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd" MAINTAINER = "Koen Kooi " SECTION = "x11" diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb index 5bdc4ed765..690df1acfa 100644 --- a/packages/konqueror/konqueror-embedded_20030705.bb +++ b/packages/konqueror/konqueror-embedded_20030705.bb @@ -2,7 +2,7 @@ DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition HOMEPAGE = "http://www.konqueror.org/embedded" SECTION = "opie/applications" PRIORITY = "optional" -DEPENDS = "libqpe-opie openssl pcre" +DEPENDS = "libqpe-opie openssl libpcre" LICENSE = "LGPL/GPL" PR = "r5" diff --git a/packages/konqueror/konqueror-embedded_20060404.bb b/packages/konqueror/konqueror-embedded_20060404.bb index 8ab25baf6e..02321bc1c1 100644 --- a/packages/konqueror/konqueror-embedded_20060404.bb +++ b/packages/konqueror/konqueror-embedded_20060404.bb @@ -2,7 +2,7 @@ DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition SECTION = "opie/applications" PRIORITY = "optional" HOMEPAGE = "http://www.konqueror.org/" -DEPENDS = "openssl pcre virtual/libqte2 dcopidl-native dcopidl2cpp-native" +DEPENDS = "openssl libpcre virtual/libqte2 dcopidl-native dcopidl2cpp-native" LICENSE = "LGPL/GPL" PR = "r3" diff --git a/packages/meta/nylon-feed.bb b/packages/meta/nylon-feed.bb index 40faab8056..21d53b9895 100644 --- a/packages/meta/nylon-feed.bb +++ b/packages/meta/nylon-feed.bb @@ -24,7 +24,7 @@ DEPENDS = "${NYLON_FEED} \ openssl \ openswan \ openvpn \ - pcre \ + libpcre \ ppp-dsl \ rp-pppoe \ simple-firewall \ diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index b35b50c83f..5ba21c80a6 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -138,7 +138,7 @@ SLUGOS_PACKAGES = "\ openvpn \ patch \ pciutils \ - pcre \ + libpcre \ perl \ pkgconfig \ ppp \ diff --git a/packages/metalog/metalog_0.7.bb b/packages/metalog/metalog_0.7.bb index fef8c315f1..ac24694001 100644 --- a/packages/metalog/metalog_0.7.bb +++ b/packages/metalog/metalog_0.7.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Metalog is a replacement for syslogd." -DEPENDS = "pcre" +DEPENDS = "libpcre" LICENSE = "GPL" PR = "r0" diff --git a/packages/ngrep/ngrep_1.42.bb b/packages/ngrep/ngrep_1.42.bb index 64970ab994..7ff9aa1e6b 100644 --- a/packages/ngrep/ngrep_1.42.bb +++ b/packages/ngrep/ngrep_1.42.bb @@ -2,7 +2,7 @@ DESCRIPTION = "ngrep strives to provide most of GNU grep's \ common features, applying them to the network layer." SECTION = "console/network" PRIORITY = "optional" -DEPENDS = "libpcap pcre" +DEPENDS = "libpcap libpcre" LICENSE="ngrep" SRC_URI = "${SOURCEFORGE_MIRROR}/ngrep/ngrep-${PV}.tar.bz2 \ file://use-our-pcre.patch;patch=1" diff --git a/packages/nmap/nmap_3.81.bb b/packages/nmap/nmap_3.81.bb index a028d9d077..8d08fee21c 100644 --- a/packages/nmap/nmap_3.81.bb +++ b/packages/nmap/nmap_3.81.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.insecure.org/nmap/" MAINTAINER = "Chris Larson " SECTION = "console/network" LICENSE = "GPL" -DEPENDS = "libpcap pcre" +DEPENDS = "libpcap libpcre" PR = "r1" inherit autotools diff --git a/packages/pme/pme_1.0.3.bb b/packages/pme/pme_1.0.3.bb index 3992c44b61..9cfad5dfdd 100644 --- a/packages/pme/pme_1.0.3.bb +++ b/packages/pme/pme_1.0.3.bb @@ -1,5 +1,5 @@ SECTION = "unknown" -DEPENDS = "pcre" +DEPENDS = "libpcre" LICENSE = "BSD" DESCRIPTION = "PME is a C++ wrapper around the PCRE library." SRC_URI = "http://xaxxon.slackworks.com/pme/pme-${PV}.tar.gz" diff --git a/packages/postfix/postfix-native_2.0.20.bb b/packages/postfix/postfix-native_2.0.20.bb index dbbad9b450..0ba8c493ff 100644 --- a/packages/postfix/postfix-native_2.0.20.bb +++ b/packages/postfix/postfix-native_2.0.20.bb @@ -2,7 +2,7 @@ SECTION = "console/network" require postfix_${PV}.bb inherit native FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/postfix-${PV}" -DEPENDS = "virtual/db-native pcre-native" +DEPENDS = "virtual/db-native libpcre-native" export DIRS = "src/util src/global src/postconf" do_stage () { diff --git a/packages/postfix/postfix_2.0.20.bb b/packages/postfix/postfix_2.0.20.bb index 4a11a002e3..6ddc24477d 100644 --- a/packages/postfix/postfix_2.0.20.bb +++ b/packages/postfix/postfix_2.0.20.bb @@ -1,5 +1,5 @@ SECTION = "console/network" -DEPENDS = "virtual/db pcre postfix-native" +DEPENDS = "virtual/db libpcre postfix-native" LICENSE = "IPL" PR = "r8" diff --git a/packages/zsh/zsh_4.1.1.bb b/packages/zsh/zsh_4.1.1.bb index bb4cb1e27c..e59a42c174 100644 --- a/packages/zsh/zsh_4.1.1.bb +++ b/packages/zsh/zsh_4.1.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Zsh shell" SECTION = "base/shell" PRIORITY = "optional" MAINTAINER = "Chris Larson " -DEPENDS = "ncurses pcre" +DEPENDS = "ncurses libpcre" PR = "r2" LICENSE = "zsh" -- cgit v1.2.3