[PATCH 0/6] Consolidated Pull Request

[PATCH 0/6] Consolidated Pull Request

[Saul Wold]

From: Saul Wold <sgw@linux.intel.com>

Richard,

Here are a half dozen pull requests for oe-core and poky.

Thanks
	Sau!


Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: distro/oe-core
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=distro/oe-core

Thanks,
    Saul Wold <sgw@linux.intel.com>
---


Dongxiao Xu (1):
  gst-meta-base: Support http/https remote streams

Kang Kai (1):
  xdg-utils: add xdg-utils to pass the lsb test

Mei Lei (1):
  distrodata.bbclass: Merge the get_pkg_info.log into checkpkg.csv

Saul Wold (1):
  desktop-file-utils: Add SRC_URI checksums

Scott Rifenbark (1):
  documentation/adt-manual/adt-eclipse.xml:  Updated repo URL for
    Eclipse Plug-in

Xiaofeng Yan (1):
  LSB_Setup.sh: Add function to install all test packages

 documentation/adt-manual/adt-eclipse.xml           |    2 +-
 meta/classes/distrodata.bbclass                    |   29 +++---------
 .../desktop-file-utils-native_0.15.bb              |    3 +
 meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh    |   50 ++++++++++++--------
 meta/recipes-extended/xdg-utils/xdg-utils_1.0.2.bb |   26 ++++++++++
 .../gstreamer/gst-meta-base_0.10.bb                |    5 +-
 6 files changed, 70 insertions(+), 45 deletions(-)
 create mode 100644 meta/recipes-extended/xdg-utils/xdg-utils_1.0.2.bb

[PATCH 1/6] xdg-utils: add xdg-utils to pass the lsb test

[Saul Wold]

From: Kang Kai <kai.kang@windriver.com>

xdg-utils provides xdg-* scripts to pass the LSB 4.1 command check
Import from OE and add DESCRIPTION, PR and LIC_FILES_CHKSUM.

(From OE rev: 44985d56bc556786812a0a02d6219afd31a7381d)

Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
 meta/recipes-extended/xdg-utils/xdg-utils_1.0.2.bb |   26 ++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-extended/xdg-utils/xdg-utils_1.0.2.bb

diff --git a/meta/recipes-extended/xdg-utils/xdg-utils_1.0.2.bb b/meta/recipes-extended/xdg-utils/xdg-utils_1.0.2.bb
new file mode 100644
index 0000000..695e4f3
--- /dev/null
+++ b/meta/recipes-extended/xdg-utils/xdg-utils_1.0.2.bb
@@ -0,0 +1,26 @@
+SUMMARY = "Basic desktop integration functions"
+
+DESCRIPTION = "The xdg-utils package is a set of simple scripts that provide basic \
+desktop integration functions for any Free Desktop, such as Linux. \
+They are intended to provide a set of defacto standards. \
+The following scripts are provided at this time: \
+xdg-desktop-icon \     
+xdg-desktop-menu \  
+xdg-email \ 
+xdg-icon-resource \
+xdg-mime \       
+xdg-open \     
+xdg-screensaver \ 
+"
+
+PR="r0"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a5367a90934098d6b05af3b746405014"
+
+SRC_URI = "http://portland.freedesktop.org/download/${PN}-${PV}.tgz"
+
+inherit autotools
+
+SRC_URI[md5sum] = "348a5b91dc66426505022c74a64b2940"
+SRC_URI[sha256sum] = "21aeb7d16b2529b8d3975118f59eec09953e09f9a68d718159e98c90474b01ac"
-- 
1.7.1

[PATCH 2/6] gst-meta-base: Support http/https remote streams

[Saul Wold]

From: Dongxiao Xu <dongxiao.xu@intel.com>

Add libgstsouphttpsrc library to support remote stream playing via
http/https protocols.

This solves the mp4 playing issue by regel from mediatomb file server.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 .../gstreamer/gst-meta-base_0.10.bb                |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
index 8d5e590..ada7f69 100644
--- a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 
-PR = "r9"
+PR = "r10"
 
 PACKAGES = "\
     gst-meta-base \
@@ -29,7 +29,8 @@ RDEPENDS_gst-meta-base = "\
     gst-plugins-base-typefindfunctions \
     gst-plugins-base-videoscale \
     gst-plugins-base-ffmpegcolorspace \
-    gst-plugins-good-autodetect"
+    gst-plugins-good-autodetect \
+    gst-plugins-good-souphttpsrc"
 
 
 RDEPENDS_gst-meta-audio = "\
-- 
1.7.1

Re: [PATCH 2/6] gst-meta-base: Support http/https remote streams

[Koen Kooi]

Op 5 apr 2011, om 23:48 heeft Saul Wold het volgende geschreven:

> From: Dongxiao Xu <dongxiao.xu@intel.com>
> 
> Add libgstsouphttpsrc library to support remote stream playing via
> http/https protocols.
> 
> This solves the mp4 playing issue by regel from mediatomb file server.
> 
> Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
> 
> -    gst-plugins-good-autodetect"
> +    gst-plugins-good-autodetect \
> +    gst-plugins-good-souphttpsrc"

FWIW, souphttpsrc is quite heavy in dependencies, so in the future we should look for something lighter (GIO?).

regards,

Koen

Re: [PATCH 2/6] gst-meta-base: Support http/https remote streams

[Richard Purdie]

On Wed, 2011-04-06 at 09:11 +0200, Koen Kooi wrote:
> Op 5 apr 2011, om 23:48 heeft Saul Wold het volgende geschreven:
> 
> > From: Dongxiao Xu <dongxiao.xu@intel.com>
> > 
> > Add libgstsouphttpsrc library to support remote stream playing via
> > http/https protocols.
> > 
> > This solves the mp4 playing issue by regel from mediatomb file server.
> > 
> > Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
> > 
> > -    gst-plugins-good-autodetect"
> > +    gst-plugins-good-autodetect \
> > +    gst-plugins-good-souphttpsrc"
> 
> FWIW, souphttpsrc is quite heavy in dependencies, so in the future we
> should look for something lighter (GIO?).

Sounds like a good plan. Does something already exist or does code need
writing for that?

Cheers,

Richard

Re: [PATCH 2/6] gst-meta-base: Support http/https remote streams

[Koen Kooi]

Op 6 apr. 2011 om 20:31 heeft Richard Purdie <richard.purdie@linuxfoundation.org> het volgende geschreven:

> On Wed, 2011-04-06 at 09:11 +0200, Koen Kooi wrote:
>> Op 5 apr 2011, om 23:48 heeft Saul Wold het volgende geschreven:
>> 
>>> From: Dongxiao Xu <dongxiao.xu@intel.com>
>>> 
>>> Add libgstsouphttpsrc library to support remote stream playing via
>>> http/https protocols.
>>> 
>>> This solves the mp4 playing issue by regel from mediatomb file server.
>>> 
>>> Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
>>> 
>>> -    gst-plugins-good-autodetect"
>>> +    gst-plugins-good-autodetect \
>>> +    gst-plugins-good-souphttpsrc"
>> 
>> FWIW, souphttpsrc is quite heavy in dependencies, so in the future we
>> should look for something lighter (GIO?).
> 
> Sounds like a good plan. Does something already exist or does code need
> writing for that?

It has been over a year since I looked at it, but back then GIO used libsoup as backend, so doing http with gstreamer bloated up your product.
I'll have a look at the current state when I get some time.

regards,

koen


> 
> Cheers,
> 
> Richard
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[PATCH 3/6] documentation/adt-manual/adt-eclipse.xml: Updated repo URL for Eclipse Plug-in

[Saul Wold]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1216 bytes --]

From: Scott Rifenbark <scott.m.rifenbark@intel.com>

Updated the URL that points to the Yocto Eclipse Plug-in to
http://www.yoctoproject.org/downloads/eclipse-plugin/1.0.

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
 documentation/adt-manual/adt-eclipse.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/documentation/adt-manual/adt-eclipse.xml b/documentation/adt-manual/adt-eclipse.xml
index 7c0ee06..3e1596d 100644
--- a/documentation/adt-manual/adt-eclipse.xml
+++ b/documentation/adt-manual/adt-eclipse.xml
@@ -103,7 +103,7 @@
                 Expand the items under “Linux Tools” and select “Autotools support for 
                 CDT (Incubation)”.</para></listitem>
                 <listitem><para><emphasis>Yocto Plug-in</emphasis> – 
-                <ulink url='http://www.yoctoproject.org/downloads/eclipse-plugin/'></ulink>:
+                <ulink url='http://www.yoctoproject.org/downloads/eclipse-plugin/1.0'></ulink>:
                 Check the box next to “Development tools &amp; SDKs for Yocto Linux” 
                 to select all the items.</para></listitem>
             </orderedlist>
-- 
1.7.1

[PATCH 4/6] LSB_Setup.sh: Add function to install all test packages

[Saul Wold]

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

Add function to  install all of lsb test suite packages instead of installing parts of test packages

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh |   50 ++++++++++++++---------
 1 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh b/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
index 78c33b3..7ce823e 100644
--- a/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
+++ b/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
@@ -17,11 +17,38 @@
 
 ##Prepare Steps
 #Steps 0; Confirm the installed LSB Packages
-
+ARCH=`uname -m`
+APP_FILE=`ls /lsb-Application/*.rpm`
 if [ ! -f /opt/lsb/test/manager/bin/dist-checker-start.pl ]
 then
         if [ -d /lsb-dist-testkit ];then
-                cd /lsb-dist-testkit && sh install.sh && cd ../lsb-Application && rpm -ivh *.rpm --nodeps --force
+		if [ ${ARCH} == i686 ];then
+                	echo "i486-suse" >> /etc/rpm/platform
+                	echo "i486-noarch" >> /etc/rpm/platform
+                	echo "i486-pc" >> /etc/rpm/platform
+                	echo "noarch-suse" >> /etc/rpm/platform
+		else
+                	echo "${ARCH}-suse" >> /etc/rpm/platform
+                	echo "${ARCH}-noarch" >> /etc/rpm/platform
+                	echo "${ARCH}-pc" >> /etc/rpm/platform
+                	echo "noarch-suse" >> /etc/rpm/platform
+                fi      
+                cd /lsb-dist-testkit && sh install.sh && cd ../lsb-Application
+                for i in ${APP_FILE}
+                do
+                    echo "$i" |grep -q "apache"
+                    if [ $? -eq 0 ]
+                    then
+                        rpm -ivh $i --noscripts --nodeps --force
+                    else
+                        rpm -ivh $i --nodeps --force
+                    fi
+                done
+                mkdir -p /var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb/snapshots/appbat/tests/
+                mkdir -p  /var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb/app-battery/tests/ 
+		cp expect-tests.tar  test1.pdf  test2.pdf /var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb/app-battery/tests/
+                cp raptor-tests.tar  tcl-tests.tar /var/opt/lsb//test/manager/packages/ftp.linuxfoundation.org/pub/lsb/snapshots/appbat/tests/
+		cd ..
         else 
                 echo "Please install the realted LSB Packages"
                 exit 1
@@ -33,10 +60,6 @@ id tester
 if [ $? -eq  0 ]
 then 
         echo "User tester was existed"
-        echo -n "Deleted tester(yes/no):"
-        read INPUT
-case $INPUT in 
-yes|y)
         sleep 1
         userdel -rf tester
         if [ $? -eq 0 ] || [ $? -eq 6 ]
@@ -45,19 +68,6 @@ yes|y)
        else
                 echo "Fail to delete user tester"
         fi
-        ;;
-no|n)
-        sleep 1
-        echo "There must be deleted User test before ran LSB4 on Target"
-        echo ""
-        exit 1
-        ;;
-*)
-        sleep 1
-        echo "Input ERROR, pls reinput that your expected"
-        echo ""
-        exit 1
-esac
 else 
         echo "There was not User tester"
 fi
@@ -177,7 +187,7 @@ ping -c 5 ftp.linux-foundation.org
 check
 
 #Step 7
-insmod /lib/modules/2.6.37.2-yocto-standard\+/kernel/drivers/block/loop.ko
+insmod /lib/modules/2.6.*/kernel/drivers/block/loop.ko
 if [ $? != 0 ];then
 	echo "Please insmod loop.ko  manully"
 fi
-- 
1.7.1

[PATCH 5/6] desktop-file-utils: Add SRC_URI checksums

[Saul Wold]

From: Saul Wold <sgw@linux.intel.com>

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../desktop-file-utils-native_0.15.bb              |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.15.bb b/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.15.bb
index 3ed7475..b971c7e 100644
--- a/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.15.bb
+++ b/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.15.bb
@@ -11,3 +11,6 @@ SRC_URI = "http://freedesktop.org/software/desktop-file-utils/releases/desktop-f
 inherit autotools native
 
 S = "${WORKDIR}/desktop-file-utils-${PV}"
+
+SRC_URI[md5sum] = "2fe8ebe222fc33cd4a959415495b7eed"
+SRC_URI[sha256sum] = "c463d851fb057acd53800cfc4f8ae39dcbcad7f03b4bd547288e95b6de53b022" 
-- 
1.7.1

[PATCH 6/6] distrodata.bbclass: Merge the get_pkg_info.log into checkpkg.csv

[Saul Wold]

From: Mei Lei <lei.mei@intel.com>

For easy view the check package result, merge the two files into checkpkg.csv, after that, the package report system will use checkpkg.csv instead of get_pkg_info.log.

Signed-off-by: Mei Lei <lei.mei@intel.com>
---
 meta/classes/distrodata.bbclass |   29 +++++++----------------------
 1 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index e2cc8fa..905dad7 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -225,17 +225,9 @@ python checkpkg_eventhandler() {
 
 	lf = bb.utils.lockfile(logfile + ".lock")
 	f = open(logfile, "a")
-	f.write("Package\tOwner\tURI Type\tVersion\tTracking\tUpstream\tTMatch\tRMatch\n")
+	f.write("Package\tVersion\tUpver\tLicense\tSection\tHome\tRelease\tPriority\tDepends\tBugTracker\tPE\tDescription\tStatus\tTracking\tURI\tMAINTAINER\n")
         f.close()
         bb.utils.unlockfile(lf)
-	"""initialize log files for package report system"""
-	logfile2 = os.path.join(logpath, "get_pkg_info.%s.log" % bb.data.getVar('DATETIME', e.data, 1))
-	if not os.path.exists(logfile2):
-		slogfile2 = os.path.join(logpath, "get_pkg_info.log")
-		if os.path.exists(slogfile2):
-			os.remove(slogfile2)
-		os.system("touch %s" % logfile2)
-		os.symlink(logfile2, slogfile2)
     return
 }
 
@@ -459,8 +451,6 @@ python do_checkpkg() {
 	logpath = bb.data.getVar('LOG_DIR', d, 1)
 	bb.utils.mkdirhier(logpath)
 	logfile = os.path.join(logpath, "checkpkg.csv")
-	"""initialize log files for package report system"""
-	logfile2 = os.path.join(logpath, "get_pkg_info.log")
 
 	"""generate package information from .bb file"""
 	pname = bb.data.getVar('PN', d, 1)
@@ -582,7 +572,7 @@ python do_checkpkg() {
 				result = bb.utils.vercmp(("0", puptag, ""), ("0", plocaltag, ""))
 				if result > 0:
 					verflag = 1
-					pstatus = "UPADTE"
+					pstatus = "UPDATE"
 					pupver = puptag
 				elif verflag == 0 :
 					pupver = plocaltag
@@ -646,20 +636,15 @@ python do_checkpkg() {
 			pmstatus = "UPDATE"
 	
 	maintainer = bb.data.getVar('RECIPE_MAINTAINER', d, True)
+	psrcuri = psrcuri.split()[0]
+	pdepends = "".join(pdepends.split("\t"))
+	pdesc = "".join(pdesc.split("\t"))
 	lf = bb.utils.lockfile(logfile + ".lock")
 	f = open(logfile, "a")
-	f.write("%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n" % \
-		  (pname, maintainer, pproto, pcurver, pmver, pupver, pmstatus, pstatus))
+	f.write("%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n" % \
+		  (pname,pversion,pupver,plicense,psection, phome,prelease, ppriority,pdepends,pbugtracker,ppe,pdesc,pstatus,pmver,psrcuri,maintainer))
 	f.close()
 	bb.utils.unlockfile(lf)
-
-	"""write into get_pkg_info log file to supply data for package report system"""
-	lf2 = bb.utils.lockfile(logfile2 + ".lock")
-	f2 = open(logfile2, "a")
-	f2.write("%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n" % \
-		  (pname,pversion,pupver,plicense,psection, phome,prelease, ppriority,pdepends,pbugtracker,ppe,pdesc,pstatus,pmver,psrcuri))
-	f2.close()
-	bb.utils.unlockfile(lf2)
 }
 
 addtask checkpkgall after do_checkpkg
-- 
1.7.1

Re: [PATCH 0/6] Consolidated Pull Request

[Richard Purdie]

On Tue, 2011-04-05 at 14:47 -0700, Saul Wold wrote:
> From: Saul Wold <sgw@linux.intel.com>
> 
> Richard,
> 
> Here are a half dozen pull requests for oe-core and poky.
> 
> Thanks
> 	Sau!
> 
> 
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>   Branch: distro/oe-core
>   Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=distro/oe-core
> 
> Thanks,
>     Saul Wold <sgw@linux.intel.com>
> ---
> 
> 
> Dongxiao Xu (1):
>   gst-meta-base: Support http/https remote streams
> 
> Kang Kai (1):
>   xdg-utils: add xdg-utils to pass the lsb test
> 
> Mei Lei (1):
>   distrodata.bbclass: Merge the get_pkg_info.log into checkpkg.csv
> 
> Saul Wold (1):
>   desktop-file-utils: Add SRC_URI checksums
> 
> Scott Rifenbark (1):
>   documentation/adt-manual/adt-eclipse.xml:  Updated repo URL for
>     Eclipse Plug-in
> 
> Xiaofeng Yan (1):
>   LSB_Setup.sh: Add function to install all test packages

Merged to master, thanks.

Richard