Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus
authorhschang <chang@dev3>
Thu, 31 Jan 2013 11:57:24 +0000 (20:57 +0900)
committerhschang <chang@dev3>
Thu, 31 Jan 2013 11:57:24 +0000 (20:57 +0900)
15 files changed:
meta-openvuplus/recipes-core/initscripts/initscripts-1.0/mountrun.sh [new file with mode: 0755]
meta-openvuplus/recipes-core/initscripts/initscripts-1.0/volatiles [new file with mode: 0644]
meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend
meta-openvuplus/recipes-core/netbase/netbase_4.47.bbappend
meta-openvuplus/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
meta-openvuplus/recipes-devtools/gdb/gdb-cross_7.4.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-devtools/gdb/gdb_7.4.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-devtools/ltrace/ltrace/0001-breakpoints.c-fix-compile-for-mips.patch [new file with mode: 0644]
meta-openvuplus/recipes-devtools/ltrace/ltrace_git.bb [new file with mode: 0644]
meta-openvuplus/recipes-devtools/python/python-native_2.7.2.bbappend
meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink_0.10.bb
meta-openvuplus/recipes-multimedia/libcddb/libcddb_1.3.2.bb
meta-openvuplus/recipes-support/libunwind/libunwind-1.0.1/0001-mips-compile-_UPTi_find_unwind_table.patch [new file with mode: 0644]
meta-openvuplus/recipes-support/libunwind/libunwind.inc [new file with mode: 0644]
meta-openvuplus/recipes-support/libunwind/libunwind_1.0.1.bb [new file with mode: 0644]

diff --git a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/mountrun.sh b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/mountrun.sh
new file mode 100755 (executable)
index 0000000..f5ca2f9
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/sh
+mountpoint -q /var/volatile || mount /var/volatile
+mkdir -m 0755 -p /var/volatile/run
diff --git a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/volatiles b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/volatiles
new file mode 100644 (file)
index 0000000..c70d637
--- /dev/null
@@ -0,0 +1,38 @@
+# This configuration file lists filesystem objects that should get verified
+# during startup and be created if missing.
+#
+# Every line must either be a comment starting with #
+# or a definition of format:
+# <type> <owner> <group> <mode> <path> <linksource>
+# where the items are separated by whitespace !
+#
+# <type> : d|f|l : (d)irectory|(f)ile|(l)ink
+#
+# A linking example:
+# l root root 0777 /var/test /tmp/testfile
+# f root root 0644 /var/test none
+#
+# Understanding links:
+# When populate-volatile is to verify/create a directory or file, it will first
+# check it's existence. If a link is found to exist in the place of the target,
+# the path of the target is replaced with the target the link points to.
+# Thus, if a link is in the place to be verified, the object will be created
+# in the place the link points to instead.
+# This explains the order of "link before object" as in the example above, where
+# a link will be created at /var/test pointing to /tmp/testfile and due to this
+# link the file defined as /var/test will actually be created as /tmp/testfile.
+d root root 0755 /var/volatile/cache none
+d root root 1777 /var/volatile/lock none
+d root root 0755 /var/volatile/log none
+d root root 0755 /var/volatile/run none
+d root root 1777 /var/volatile/tmp none
+l root root 0755 /var/cache /var/volatile/cache
+l root root 1777 /var/lock /var/volatile/lock
+l root root 0755 /var/log /var/volatile/log
+l root root 0755 /var/run /var/volatile/run
+l root root 1777 /var/tmp /var/volatile/tmp
+d root root 0755 /var/lock/subsys none
+f root root 0664 /var/log/wtmp none
+f root root 0664 /var/run/utmp none
+
+
index 46b30e6..a9e4420 100644 (file)
@@ -1,12 +1,15 @@
-PR .= "-vuplus4"
+PR .= "-vuplus5"
 
 BOOTUP = "bootup_3.1" 
 
+FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
+
 SRC_URI_append = " \
        file://turnoff_power \
        file://hotplug_br \
        file://make_mac_sector \
        file://${BOOTUP} \
+       file://mountrun.sh \
 "
 
 do_install_append() {
@@ -19,6 +22,9 @@ do_install_append() {
        install -m 0755 ${WORKDIR}/${BOOTUP}         ${D}${sysconfdir}/init.d/bootup
        ln      -sf     ../init.d/bootup             ${D}${sysconfdir}/rcS.d/S05bootup
 
+       install -m 0755 ${WORKDIR}/mountrun.sh ${D}${sysconfdir}/init.d
+        ln -s ../init.d/mountrun.sh ${D}${sysconfdir}/rcS.d/S02mountrun.sh
+
        # rename umountnfs script because it should run before network is disabled
         mv ${D}${sysconfdir}/rc0.d/S31umountnfs.sh ${D}${sysconfdir}/rc0.d/K31umountnfs.sh || /bin/true
         mv ${D}${sysconfdir}/rc6.d/S31umountnfs.sh ${D}${sysconfdir}/rc6.d/K31umountnfs.sh || /bin/true
index f57cc55..098b654 100644 (file)
@@ -1,7 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PR .= "-vuplus1"
+PR .= "-vuplus2"
 
-do_install_append () {
-       touch ${D}${sysconfdir}/resolv.conf
-}
+#do_install_append () {
+#      touch ${D}${sysconfdir}/resolv.conf
+#}
index 791ef52..ea95d2a 100644 (file)
@@ -1,4 +1,4 @@
-PR .= "-dream3"
+PR .= "-vuplus3"
 
 do_install_append() {
         sed -e 's,^id:5:initdefault:$,id:3:initdefault:,' -i ${D}${sysconfdir}/inittab
diff --git a/meta-openvuplus/recipes-devtools/gdb/gdb-cross_7.4.bbappend b/meta-openvuplus/recipes-devtools/gdb/gdb-cross_7.4.bbappend
new file mode 100644 (file)
index 0000000..8c027e6
--- /dev/null
@@ -0,0 +1,3 @@
+PR .= "-vuplus1"
+
+EXPAT = "--without-expat"
diff --git a/meta-openvuplus/recipes-devtools/gdb/gdb_7.4.bbappend b/meta-openvuplus/recipes-devtools/gdb/gdb_7.4.bbappend
new file mode 100644 (file)
index 0000000..8c027e6
--- /dev/null
@@ -0,0 +1,3 @@
+PR .= "-vuplus1"
+
+EXPAT = "--without-expat"
diff --git a/meta-openvuplus/recipes-devtools/ltrace/ltrace/0001-breakpoints.c-fix-compile-for-mips.patch b/meta-openvuplus/recipes-devtools/ltrace/ltrace/0001-breakpoints.c-fix-compile-for-mips.patch
new file mode 100644 (file)
index 0000000..3abf945
--- /dev/null
@@ -0,0 +1,25 @@
+From 5f2fcb0b81adb0aad534c8cdb1241cfc84b23294 Mon Sep 17 00:00:00 2001
+From: Andreas Oberritter <obi@opendreambox.org>
+Date: Tue, 10 Apr 2012 01:35:24 +0200
+Subject: [PATCH] breakpoints.c: fix compile for mips
+
+---
+ breakpoints.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/breakpoints.c b/breakpoints.c
+index ec84e6e..57fa608 100644
+--- a/breakpoints.c
++++ b/breakpoints.c
+@@ -152,7 +152,7 @@ enable_all_breakpoints(Process *proc) {
+                               memcpy(new_sym,sym,sizeof(*new_sym) + strlen(sym->name) + 1);
+                               new_sym->next=proc->list_of_symbols;
+                               proc->list_of_symbols=new_sym;
+-                              insert_breakpoint(proc, addr, new_sym);
++                              insert_breakpoint(proc, addr, new_sym, 1);
+                               sym=sym->next;
+                       }
+               }
+-- 
+1.7.5.4
+
diff --git a/meta-openvuplus/recipes-devtools/ltrace/ltrace_git.bb b/meta-openvuplus/recipes-devtools/ltrace/ltrace_git.bb
new file mode 100644 (file)
index 0000000..860030f
--- /dev/null
@@ -0,0 +1,16 @@
+SUMMARY = "Tracks runtime library calls in dynamically linked programs"
+HOMEPAGE = "http://www.ltrace.org/"
+SECTION = "devel"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
+DEPENDS = "binutils elfutils libunwind"
+SRCREV = "fed1e8d33ab050df892a88110e1a316d285ee650"
+PV = "0.6.0"
+PR = "r1"
+
+SRC_URI = "git://anonscm.debian.org/collab-maint/ltrace.git \
+           file://0001-breakpoints.c-fix-compile-for-mips.patch"
+
+inherit autotools git-project
+
+EXTRA_OECONF = "--disable-werror"
index c487949..9a5c3d8 100644 (file)
@@ -1,21 +1,15 @@
 SUMMARY = "Plugin for gstreamer: dvbmediasink"
 SECTION = "multimedia"
-MAINTAINER = "Felix Domke <tmbinc@openembedded.org>"
 LICENSE = "MIT | LGPLv2.1"
 LIC_FILES_CHKSUM = "file://src/gstdvbaudiosink.c;md5=ff43a6c1ca9ddb6ccf04c23191984c95 \
                    file://src/gstdvbvideosink.c;md5=47b480d423a11f2cef5ba7cf32ca5a91"
 
 DEPENDS = "gstreamer gst-plugins-base"
-
-#SRCREV="15a323fd769d4546bc454bfd81848aa43d655f3d"
-#SRCREV="1bc9f47255396df4b3119a02790c4e864566560a"
-SRCREV="c870a546eec7b84acb689775b23cf8f5b0489479"
-SRCDATE="20110210"
 BRANCH="master"
-PV = "0.10+git${SRCDATE}"
-PR = "r7"
+SRCREV="c870a546eec7b84acb689775b23cf8f5b0489479"
+PR = "r8"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig git-project
 SRC_URI = "git://schwerkraft.elitedvb.net/dvbmediasink/dvbmediasink.git;protocol=git;branch=${BRANCH};tag=${SRCREV}"
 
 SRC_URI_append_vuplus = " \
@@ -23,8 +17,6 @@ SRC_URI_append_vuplus = " \
                 file://fix_dvbvideosink_dm8000_padtemplate.patch;patch=1;pnum=1 \
                 "
 
-S = "${WORKDIR}/git"
-
 FILES_${PN} = "${libdir}/gstreamer-0.10/*.so"
 FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la"
 FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/*.a"
index c109205..c70a2f1 100644 (file)
@@ -1,18 +1,13 @@
-DESCRIPTION = "A library for accessing a CDDB server"
+SUMMARY = "A library for accessing a CDDB server"
 HOMEPAGE = "http://libcddb.sourceforge.net"
 SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "LGPLv2"
+LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6e29c688d912da12b66b73e32b03d812"
-
-PR = "r1"
-
-DEPENDS = "libcdio virtual/gettext"
+DEPENDS = "libcdio"
+PR = "r2"
 
 SRC_URI = "http://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
-
 SRC_URI[md5sum] = "8bb4a6f542197e8e9648ae597cd6bc8a"
 SRC_URI[sha256sum] = "35ce0ee1741ea38def304ddfe84a958901413aa829698357f0bee5bb8f0a223b"
 
-inherit autotools pkgconfig
-
+inherit autotools gettext pkgconfig
diff --git a/meta-openvuplus/recipes-support/libunwind/libunwind-1.0.1/0001-mips-compile-_UPTi_find_unwind_table.patch b/meta-openvuplus/recipes-support/libunwind/libunwind-1.0.1/0001-mips-compile-_UPTi_find_unwind_table.patch
new file mode 100644 (file)
index 0000000..93416ec
--- /dev/null
@@ -0,0 +1,26 @@
+From 2724f0b9f0c61fd5be8c09f1680863f65898b508 Mon Sep 17 00:00:00 2001
+From: Andreas Oberritter <obi@opendreambox.org>
+Date: Tue, 10 Apr 2012 01:03:41 +0200
+Subject: [PATCH] mips: compile _UPTi_find_unwind_table()
+
+c.f. http://lists.gnu.org/archive/html/libunwind-devel/2010-11/msg00012.html
+---
+ src/ptrace/_UPT_find_proc_info.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/ptrace/_UPT_find_proc_info.c b/src/ptrace/_UPT_find_proc_info.c
+index ee0b698..2123447 100644
+--- a/src/ptrace/_UPT_find_proc_info.c
++++ b/src/ptrace/_UPT_find_proc_info.c
+@@ -147,7 +147,7 @@ _UPTi_find_unwind_table (struct UPT_info *ui, unw_addr_space_t as,
+ }
+ #elif UNW_TARGET_X86 || UNW_TARGET_X86_64 || UNW_TARGET_HPPA \
+-|| UNW_TARGET_PPC32 || UNW_TARGET_PPC64 || UNW_TARGET_ARM
++|| UNW_TARGET_PPC32 || UNW_TARGET_PPC64 || UNW_TARGET_ARM || UNW_TARGET_MIPS
+ #include "dwarf-eh.h"
+ #include "dwarf_i.h"
+-- 
+1.7.5.4
+
diff --git a/meta-openvuplus/recipes-support/libunwind/libunwind.inc b/meta-openvuplus/recipes-support/libunwind/libunwind.inc
new file mode 100644 (file)
index 0000000..def5b98
--- /dev/null
@@ -0,0 +1,15 @@
+SUMMARY = "A library to determine the call-chain of a program"
+HOMEPAGE = "http://www.nongnu.org/libunwind"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d80c8ed4062b8339b715f90fa68cc9f"
+INC_PR = "r3"
+
+SRC_URI += "http://download.savannah.nongnu.org/releases/${BPN}/${BPN}-${PV}.tar.gz;name=archive"
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF_arm = "--enable-debug-frame"
+
+BBCLASSEXTEND = "native"
diff --git a/meta-openvuplus/recipes-support/libunwind/libunwind_1.0.1.bb b/meta-openvuplus/recipes-support/libunwind/libunwind_1.0.1.bb
new file mode 100644 (file)
index 0000000..7d901b0
--- /dev/null
@@ -0,0 +1,7 @@
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://0001-mips-compile-_UPTi_find_unwind_table.patch"
+SRC_URI[archive.md5sum] = "993e47cca7315e22239c3e0d987e94e0"
+SRC_URI[archive.sha256sum] = "aa95fd184c0b90d95891c2f3bac2c7df708ff016d2a6ee8b2eabb769f864101f"
+
+require libunwind.inc