[oe-commits] org.oe.dev another set of parse errors fixing
hrw commit
openembedded-commits at lists.openembedded.org
Mon Nov 20 15:45:27 UTC 2006
another set of parse errors fixing
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 7fcf5ee380f4ffcee3c0630d960fb07c7bad954c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7fcf5ee380f4ffcee3c0630d960fb07c7bad954c
Files:
1
packages/perl/perl_5.8.7.bb
packages/portabase/portabase_1.9.bb
packages/powermanga/powermanga_0.79.bb
packages/ppp/ppp_2.4.1.bb
packages/prboom/prboom_2.3.1.bb
packages/pvrusb2-mci/pvrusb2-mci_20050921.bb
packages/pvrusb2-mci/pvrusb2-mci_20060903.bb
packages/pwlib/pwlib_1.5.2.bb
packages/pwlib/pwlib_1.6.6.4.bb
packages/python/python-native_2.4.0.bb
packages/python/python-numarray_1.1.1.bb
packages/qpf-fonts/terminus.bb
packages/qplot/qplot_2.0.1+cvs20020420.bb
packages/redfang/redfang.bb
packages/rxvt/rxvt_2.7.9.bb
packages/rxvt/rxvt_2.8.0.bb
packages/samba/samba-essential_3.0.20.bb
packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
packages/socat/socat_1.3.2.1.bb
packages/subversion/subversion_1.3.1.bb
packages/subversion/subversion_1.4.0.bb
Diffs:
#
# mt diff -rb0bcbd55beec5b631675f4b12b59fcb5aa69b06f -r7fcf5ee380f4ffcee3c0630d960fb07c7bad954c
#
#
#
# patch "packages/perl/perl_5.8.7.bb"
# from [519ea1d4f627f24d50f6e3bcfcedcdacfc8eb05a]
# to [d845d7042f1e44b7eab4e2d474cdc9fb3bced495]
#
# patch "packages/portabase/portabase_1.9.bb"
# from [f73e580a2525ba1258cde82b2e8d7a7da4a2b7ef]
# to [b68dd2232c73479d6b798ddc6f4dada2f82c89c1]
#
# patch "packages/powermanga/powermanga_0.79.bb"
# from [692024d8121d26664985a18650d4d37fffc7bc78]
# to [bdc4e3bce9c318daf59fda673406a938e4b76f0f]
#
# patch "packages/ppp/ppp_2.4.1.bb"
# from [b594d35a559e4695363f9fac922fab97a708d9f0]
# to [4a347813dfcdf93c5a1e5470e3be19c536e116d3]
#
# patch "packages/prboom/prboom_2.3.1.bb"
# from [72dd61b2a678932cfd3bae81d1568c3ec6b396a5]
# to [8e3a543470b6064b18009dd4b0769d597e70080d]
#
# patch "packages/pvrusb2-mci/pvrusb2-mci_20050921.bb"
# from [48841423304da4cca45df504c82ee65caf4da4c7]
# to [469161b532b5feaf267518f4f57a6b0a0bcc0b65]
#
# patch "packages/pvrusb2-mci/pvrusb2-mci_20060903.bb"
# from [bd173f53258a8efda5debb31d536cf0b9a007d70]
# to [3489b1b0fc4e70ab1cf97b32a147332e77940624]
#
# patch "packages/pwlib/pwlib_1.5.2.bb"
# from [442ba39357428193367187df8c6f60f7c860fe49]
# to [2d68adf9b2ae46801b7ca07f9597496cbb143968]
#
# patch "packages/pwlib/pwlib_1.6.6.4.bb"
# from [7279bb8ebdc6e7a8353ff206abebd42298c5e045]
# to [6c2a08c4fb78becd36d975bc477382ca213c73e5]
#
# patch "packages/python/python-native_2.4.0.bb"
# from [e73984a22ed2110628077412c7d71bc4c062c275]
# to [dd5a5720b07856c36eba7824a1373b55dee555e0]
#
# patch "packages/python/python-numarray_1.1.1.bb"
# from [0939cf69f80c839af3afd4f84b444c1bd541e822]
# to [4bdc18137d7c76a2485fcef895b4a3cd2d286a40]
#
# patch "packages/qpf-fonts/terminus.bb"
# from [da032300da5e7b736f69244760f31409048d692d]
# to [5bc7cab34c3c643a9791d7932cd41f7337ad25f3]
#
# patch "packages/qplot/qplot_2.0.1+cvs20020420.bb"
# from [66cdcb5db4226b71b8b0d48831765d4f3f2d4dd3]
# to [abdbaaca578efbc10dc311e0f3961d81d10eb86d]
#
# patch "packages/redfang/redfang.bb"
# from [adbb215030bd8b3d4413cc8c5a2b486a4d0aa24b]
# to [0aff242a92c6caf65d91764febc36c94f9b1f077]
#
# patch "packages/rxvt/rxvt_2.7.9.bb"
# from [e46ffa36e61640b04d40122a05e1f00051a50f0d]
# to [dfaf58028c166e2c6058042950864eabd5b21a27]
#
# patch "packages/rxvt/rxvt_2.8.0.bb"
# from [b3ab7bab52d4297da92b2b272dbde30d1fc6bc1b]
# to [38defa17349cd20935126aea2dc37512488fcbbc]
#
# patch "packages/samba/samba-essential_3.0.20.bb"
# from [d0ee338567de749585f5eb823ce8f7d3da875a22]
# to [07f1eeaeb6d30c15e85f7f9189c0ab49deccb857]
#
# patch "packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb"
# from [f87d5d6892ce0c1acf8844022d153afed058b747]
# to [6926e921975f4064b4bf5b6e4030f8afc98652cb]
#
# patch "packages/socat/socat_1.3.2.1.bb"
# from [69391700d8ed1e13fe8f541f3bd963fdc07bee86]
# to [7f789bf888bdcc500360069e6e7a925909107d7d]
#
# patch "packages/subversion/subversion_1.3.1.bb"
# from [36f0a84e549694fbabc7f6b9427d6eb8a04145b4]
# to [349a7105243a6cbe5eb092088e0e4e7de93014ce]
#
# patch "packages/subversion/subversion_1.4.0.bb"
# from [b6de940e3731490f6e5662b9694cc565c3cfcec6]
# to [3be5e848192c21f7628a7caded8ec2614ed523a9]
#
============================================================
--- packages/perl/perl_5.8.7.bb 519ea1d4f627f24d50f6e3bcfcedcdacfc8eb05a
+++ packages/perl/perl_5.8.7.bb d845d7042f1e44b7eab4e2d474cdc9fb3bced495
@@ -75,7 +75,7 @@ do_install_append() {
# Create a perl-modules package recommending all the other perl
# packages (actually the non modules packages and not created too)
-ALLOW_EMPTY_perl-modules = 1
+ALLOW_EMPTY_perl-modules = "1"
PACKAGES_append = " perl-modules"
RRECOMMENDS_perl-modules = "${PACKAGES}"
RPROVIDES_perl-lib = "perl-lib"
============================================================
--- packages/portabase/portabase_1.9.bb f73e580a2525ba1258cde82b2e8d7a7da4a2b7ef
+++ packages/portabase/portabase_1.9.bb b68dd2232c73479d6b798ddc6f4dada2f82c89c1
@@ -22,7 +22,7 @@ QMAKE_PROFILES = "portabase.pro"
}
QMAKE_PROFILES = "portabase.pro"
-QPEDIR = ${OPIEDIR}
+QPEDIR = "${OPIEDIR}"
EXTRA_QMAKEVARS_POST += "CONFIG-=desktop"
# lrelease portabase.pro
============================================================
--- packages/powermanga/powermanga_0.79.bb 692024d8121d26664985a18650d4d37fffc7bc78
+++ packages/powermanga/powermanga_0.79.bb bdc4e3bce9c318daf59fda673406a938e4b76f0f
@@ -12,7 +12,7 @@ SRC_URI = "http://linux.tlk.fr/games/Pow
file://powermanga.png \
file://powermanga.desktop"
-S = ${WORKDIR}/${PN}-${PV}/
+S = "${WORKDIR}/${PN}-${PV}/"
inherit palmtop
============================================================
--- packages/ppp/ppp_2.4.1.bb b594d35a559e4695363f9fac922fab97a708d9f0
+++ packages/ppp/ppp_2.4.1.bb 4a347813dfcdf93c5a1e5470e3be19c536e116d3
@@ -22,7 +22,7 @@ EXTRA_OEMAKE = "STRIPPROG=${STRIP}"
inherit autotools
EXTRA_OEMAKE = "STRIPPROG=${STRIP}"
-EXTRA_OECONF = --disable-strip
+EXTRA_OECONF = "--disable-strip"
do_install_append () {
install -d ${D}${bindir}/ ${D}${sysconfdir}/init.d
============================================================
--- packages/prboom/prboom_2.3.1.bb 72dd61b2a678932cfd3bae81d1568c3ec6b396a5
+++ packages/prboom/prboom_2.3.1.bb 8e3a543470b6064b18009dd4b0769d597e70080d
@@ -7,7 +7,7 @@ LICENSE = "GPL"
# This version can be started w/ -height 240 but it
# a) doesn't load doom1.wad (crash)
# b) crahes a few seconds after starting w/ doom2.wad
-DEFAULT_PREFERENCE = -1
+DEFAULT_PREFERENCE = "-1"
SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \
file://m4.patch;patch=1 \
============================================================
--- packages/pvrusb2-mci/pvrusb2-mci_20050921.bb 48841423304da4cca45df504c82ee65caf4da4c7
+++ packages/pvrusb2-mci/pvrusb2-mci_20050921.bb 469161b532b5feaf267518f4f57a6b0a0bcc0b65
@@ -1,13 +1,13 @@ PR = "r0"
DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
PRIORITY = "optional"
SECTION = "kernel/modules"
LICENSE = "GPL"
PR = "r0"
-RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400
+RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400"
# It in fact also requires kernel-module-saa7115", but for now is using the local ones.
-
+
SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20050921.tar.bz2 \
- file://Makefile.patch;patch=1"
+ file://Makefile.patch;patch=1"
S = "${WORKDIR}/pvrusb2-mci-20050921/driver"
@@ -19,7 +19,7 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
'CC=${KERNEL_CC}' \
'LD=${KERNEL_LD}' \
- 'KDIR=${STAGING_KERNEL_DIR}'"
+ 'KDIR=${STAGING_KERNEL_DIR}'"
do_install() {
install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
============================================================
--- packages/pvrusb2-mci/pvrusb2-mci_20060903.bb bd173f53258a8efda5debb31d536cf0b9a007d70
+++ packages/pvrusb2-mci/pvrusb2-mci_20060903.bb 3489b1b0fc4e70ab1cf97b32a147332e77940624
@@ -1,5 +1,5 @@ DESCRIPTION = "Driver for the Hauppauge
DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
-AUTHOR = Mike Isely
+AUTHOR = "Mike Isely"
HOMEPAGE = "http://www.isely.net/pvrusb2.html"
SECTION = "kernel/modules"
PRIORITY = "optional"
@@ -18,7 +18,7 @@ SRC_URI = "http://www.isely.net/download
SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
file://hotplug.functions \
file://firmware.hotplug \
- file://Makefile.patch;patch=1"
+ file://Makefile.patch;patch=1"
S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
@@ -34,7 +34,7 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}'
EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
'CC=${KERNEL_CC}' \
'LD=${KERNEL_LD}' \
- 'KDIR=${STAGING_KERNEL_DIR}'"
+ 'KDIR=${STAGING_KERNEL_DIR}'"
export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
============================================================
--- packages/pwlib/pwlib_1.5.2.bb 442ba39357428193367187df8c6f60f7c860fe49
+++ packages/pwlib/pwlib_1.5.2.bb 2d68adf9b2ae46801b7ca07f9597496cbb143968
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}"
# Use openSSL
-export OPENSSLFLAG=1
+export OPENSSLFLAG="1"
export OPENSSLDIR="${STAGING_LIBDIR}"
export OPENSSLLIBS="-lssl -lcrypt"
export MACHTYPE="x86"
============================================================
--- packages/pwlib/pwlib_1.6.6.4.bb 7279bb8ebdc6e7a8353ff206abebd42298c5e045
+++ packages/pwlib/pwlib_1.6.6.4.bb 6c2a08c4fb78becd36d975bc477382ca213c73e5
@@ -21,7 +21,7 @@ S="${WORKDIR}/${PN}"
# Use openSSL
-export OPENSSLFLAG=1
+export OPENSSLFLAG="1"
export OPENSSLDIR="${STAGING_LIBDIR}"
export OPENSSLLIBS="-lssl -lcrypt"
export MACHTYPE="x86"
============================================================
--- packages/python/python-native_2.4.0.bb e73984a22ed2110628077412c7d71bc4c062c275
+++ packages/python/python-native_2.4.0.bb dd5a5720b07856c36eba7824a1373b55dee555e0
@@ -16,8 +16,8 @@ inherit autotools native
inherit autotools native
-prefix = ${STAGING_DIR}/${BUILD_SYS}
-exec_prefix = ${STAGING_DIR}/${BUILD_SYS}
+prefix = "${STAGING_DIR}/${BUILD_SYS}"
+exec_prefix = "${STAGING_DIR}/${BUILD_SYS}"
EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \
--without-cxx --with-signal-module --with-wctype-functions"
============================================================
--- packages/python/python-numarray_1.1.1.bb 0939cf69f80c839af3afd4f84b444c1bd541e822
+++ packages/python/python-numarray_1.1.1.bb 4bdc18137d7c76a2485fcef895b4a3cd2d286a40
@@ -1,10 +1,10 @@ SRCNAME = "numarray"
DESCRIPTION = "Next Generation sophisticated Numeric Processing Package for Python"
SECTION = "devel/python"
PRIORITY = "optional"
LICENSE = "PYRAF"
SRCNAME = "numarray"
-SRC_URI = ${SOURCEFORGE_MIRROR}/numpy/${SRCNAME}-${PV}.tar.gz
+SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/${SRCNAME}-${PV}.tar.gz"
S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit distutils
============================================================
--- packages/qpf-fonts/terminus.bb da032300da5e7b736f69244760f31409048d692d
+++ packages/qpf-fonts/terminus.bb 5bc7cab34c3c643a9791d7932cd41f7337ad25f3
@@ -7,7 +7,7 @@ SRC_URI = "http://www.mn-solutions.de/do
PR = "r2"
SRC_URI = "http://www.mn-solutions.de/downloads/mnci/terminus-fonts.tar.bz2"
-S = ${WORKDIR}/terminus-fonts
+S = "${WORKDIR}/terminus-fonts"
do_install() {
mkdir -p ${D}${palmqtdir}/lib/fonts
============================================================
--- packages/qplot/qplot_2.0.1+cvs20020420.bb 66cdcb5db4226b71b8b0d48831765d4f3f2d4dd3
+++ packages/qplot/qplot_2.0.1+cvs20020420.bb abdbaaca578efbc10dc311e0f3961d81d10eb86d
@@ -1,9 +1,9 @@ HOMEPAGE = "http://qplot.sourceforge.net
DESCRIPTION = "QPlot is an Advanced Matematical Calculator for Qt/Embedded based Palmtop Environments"
SECTION = "opie/applications"
PRIORITY = "optional"
LICENSE = "GPL"
HOMEPAGE = "http://qplot.sourceforge.net/"
-SRCDATE = 20020420
+SRCDATE = "20020420"
#Change to form x.y.z+cvs${SRCDATE} when 2.0.1 changes in PV
PV = "2.0.1-cvs-${SRCDATE}"
PR = "r1"
============================================================
--- packages/redfang/redfang.bb adbb215030bd8b3d4413cc8c5a2b486a4d0aa24b
+++ packages/redfang/redfang.bb 0aff242a92c6caf65d91764febc36c94f9b1f077
@@ -1,5 +1,5 @@ SECTION = "unknown"
SECTION = "unknown"
-SRC_URI = "http://packetstormsecurity.org/wireless/redfang.2.5.tar.gz \
+SRC_URI = "http://packetstormsecurity.org/wireless/redfang.2.5.tar.gz \
file://Makefile.patch;patch=1;pnum=0"
DEFAULT_PREFERENCE="-1"
============================================================
--- packages/rxvt/rxvt_2.7.9.bb e46ffa36e61640b04d40122a05e1f00051a50f0d
+++ packages/rxvt/rxvt_2.7.9.bb dfaf58028c166e2c6058042950864eabd5b21a27
@@ -11,7 +11,7 @@ ALTERNATIVE_PATH = "${bindir}/rxvt-2.7.9
ALTERNATIVE_NAME = "x-terminal-emulator"
ALTERNATIVE_PATH = "${bindir}/rxvt-2.7.9"
-S = ${WORKDIR}/rxvt
+S = "${WORKDIR}/rxvt"
EXTRA_OECONF = "--disable-menubar --disable-xim \
--enable-utmp --enable-wtmp --enable-lastlog \
@@ -23,7 +23,7 @@ EXTRA_OECONF = "--disable-menubar --disa
--enable-text-blink --enable-plain-scroll \
--enable-combining --enable-shared \
--with-x=${STAGING_LIBDIR}/.."
-
+
EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
'XLIB=-L${STAGING_LIBDIR} -lX11 -lXft'"
============================================================
--- packages/rxvt/rxvt_2.8.0.bb b3ab7bab52d4297da92b2b272dbde30d1fc6bc1b
+++ packages/rxvt/rxvt_2.8.0.bb 38defa17349cd20935126aea2dc37512488fcbbc
@@ -11,7 +11,7 @@ ALTERNATIVE_PATH = "${bindir}/rxvt-2.8.0
ALTERNATIVE_NAME = "x-terminal-emulator"
ALTERNATIVE_PATH = "${bindir}/rxvt-2.8.0"
-S = ${WORKDIR}/rxvt
+S = "${WORKDIR}/rxvt"
EXTRA_OECONF = "--disable-menubar --disable-xim \
--enable-utmp --enable-wtmp --enable-lastlog \
@@ -23,7 +23,7 @@ EXTRA_OECONF = "--disable-menubar --disa
--enable-text-blink --enable-plain-scroll \
--enable-combining --enable-shared \
--with-x=${STAGING_LIBDIR}/.."
-
+
EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
'XLIB=-L${STAGING_LIBDIR} -lX11 -lXft'"
============================================================
--- packages/samba/samba-essential_3.0.20.bb d0ee338567de749585f5eb823ce8f7d3da875a22
+++ packages/samba/samba-essential_3.0.20.bb 07f1eeaeb6d30c15e85f7f9189c0ab49deccb857
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
file://configure.patch;patch=1 \
@@ -7,12 +7,12 @@ SRC_URI = "http://us2.samba.org/samba/ft
file://init-essential \
file://quota.patch;patch=1;pnum=0 \
file://smb-essential.conf \
- file://smb-essential-inactive.conf \
+ file://smb-essential-inactive.conf \
file://Managing-Samba.txt"
-
+
S := "${WORKDIR}/samba-${PV}/source"
-RCONFILCTS = samba
+RCONFLICTS = "samba"
require samba-essential.inc
inherit update-rc.d
============================================================
--- packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb f87d5d6892ce0c1acf8844022d153afed058b747
+++ packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb 6926e921975f4064b4bf5b6e4030f8afc98652cb
@@ -1,8 +1,8 @@ PROVIDES_sharprom-compatible = "\
DESCRIPTION = "Precompiled SharpROM toolchain glue package"
LICENSE = "GPL"
SECTION = "base"
PROVIDES_sharprom-compatible = "\
- virtual/arm-linux-gcc-2.95 \
+ virtual/arm-linux-gcc-2.95 \
virtual/arm-linux-libc-for-gcc \
virtual/arm-linux-binutils \
virtual/libc \
============================================================
--- packages/socat/socat_1.3.2.1.bb 69391700d8ed1e13fe8f541f3bd963fdc07bee86
+++ packages/socat/socat_1.3.2.1.bb 7f789bf888bdcc500360069e6e7a925909107d7d
@@ -6,7 +6,7 @@ SRC_URI = "http://www.dest-unreach.org/s
PR = "r1"
SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
- file://xioopen.patch;patch=1 \
+ file://xioopen.patch;patch=1 \
file://ldflags.patch;patch=1 \
file://xioinitialize.patch;patch=1"
============================================================
--- packages/subversion/subversion_1.3.1.bb 36f0a84e549694fbabc7f6b9427d6eb8a04145b4
+++ packages/subversion/subversion_1.3.1.bb 349a7105243a6cbe5eb092088e0e4e7de93014ce
@@ -10,7 +10,7 @@ EXTRA_OECONF = "--with-neon=${STAGING_DI
file://apr-regex.patch;patch=1"
EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \
- --without-berkeley-db --without-apxs --without-apache \
+ --without-berkeley-db --without-apxs --without-apache \
--without-swig --with-apr=${STAGING_BINDIR} \
--with-apr-util=${STAGING_BINDIR}"
============================================================
--- packages/subversion/subversion_1.4.0.bb b6de940e3731490f6e5662b9694cc565c3cfcec6
+++ packages/subversion/subversion_1.4.0.bb 3be5e848192c21f7628a7caded8ec2614ed523a9
@@ -11,7 +11,7 @@ EXTRA_OECONF = "--with-neon=${STAGING_DI
file://disable-revision-install.patch;patch=1"
EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \
%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list