Update version ppp, orc, mc and linux-vuplus configure fix.

diff --git a/meta-bsp/common/recipes/linux/linux-vuplus_3.13.5.bb b/meta-bsp/common/recipes/linux/linux-vuplus_3.13.5.bb
index 75d37d1..f362701 100644 (file)
--- a/meta-bsp/common/recipes/linux/linux-vuplus_3.13.5.bb
+++ b/meta-bsp/common/recipes/linux/linux-vuplus_3.13.5.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 KV = "3.13.5"
 
 
 KV = "3.13.5"
 

-PR = "r4"
+PR = "r5"

 SRCREV = ""
 
 MODULE = "linux-3.13.5"
 SRCREV = ""
 
 MODULE = "linux-3.13.5"


@@ -16,10 +16,10 @@ SRC_URI += "http://archive.vuplus.com/download/kernel/stblinux-${KV}.tar.bz2 \
         file://${MACHINE}_defconfig \
        "
 
         file://${MACHINE}_defconfig \
        "
 

-S = "${WORKDIR}/linux"
-

 inherit kernel
 
 inherit kernel
 

+S = "${WORKDIR}/linux"
+

 export OS = "Linux"
 KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_OUTPUT = "vmlinux"
 export OS = "Linux"
 KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_OUTPUT = "vmlinux"


@@ -29,8 +29,7 @@ KERNEL_IMAGEDEST = "tmp"
 FILES_kernel-image = "/${KERNEL_IMAGEDEST}/vmlinux.gz /${KERNEL_IMAGEDEST}/autoexec.bat"
 
 do_configure_prepend() {
 FILES_kernel-image = "/${KERNEL_IMAGEDEST}/vmlinux.gz /${KERNEL_IMAGEDEST}/autoexec.bat"
 
 do_configure_prepend() {

-        oe_machinstall -m 0644 ${WORKDIR}/${MACHINE}_defconfig ${S}/.config
-        oe_runmake oldconfig
+        oe_machinstall -m 0644 ${WORKDIR}/${MACHINE}_defconfig ${WORKDIR}/defconfig

 }
 
 kernel_do_install_append() {
 }
 
 kernel_do_install_append() {

diff --git a/meta-bsp/common/recipes/linux/linux-vuplus_3.9.6.bb b/meta-bsp/common/recipes/linux/linux-vuplus_3.9.6.bb
index 2e52dc5..44144fc 100644 (file)
--- a/meta-bsp/common/recipes/linux/linux-vuplus_3.9.6.bb
+++ b/meta-bsp/common/recipes/linux/linux-vuplus_3.9.6.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 KV = "3.9.6"
 
 
 KV = "3.9.6"
 

-PR = "r3"
+PR = "r4"

 SRCREV = ""
 
 MODULE = "linux-3.9.6"
 SRCREV = ""
 
 MODULE = "linux-3.9.6"


@@ -16,10 +16,10 @@ SRC_URI += "http://archive.vuplus.com/download/kernel/stblinux-${KV}.tar.bz2 \
         file://${MACHINE}_defconfig \
        "
 
         file://${MACHINE}_defconfig \
        "
 

-S = "${WORKDIR}/linux"
-

 inherit kernel
 
 inherit kernel
 

+S = "${WORKDIR}/linux"
+

 export OS = "Linux"
 KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_OUTPUT = "vmlinux"
 export OS = "Linux"
 KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_OUTPUT = "vmlinux"


@@ -29,8 +29,7 @@ KERNEL_IMAGEDEST = "tmp"
 FILES_kernel-image = "/${KERNEL_IMAGEDEST}/vmlinux.gz /${KERNEL_IMAGEDEST}/autoexec.bat"
 
 do_configure_prepend() {
 FILES_kernel-image = "/${KERNEL_IMAGEDEST}/vmlinux.gz /${KERNEL_IMAGEDEST}/autoexec.bat"
 
 do_configure_prepend() {

-        oe_machinstall -m 0644 ${WORKDIR}/${MACHINE}_defconfig ${S}/.config
-        oe_runmake oldconfig
+        oe_machinstall -m 0644 ${WORKDIR}/${MACHINE}_defconfig ${WORKDIR}/defconfig

 }
 
 kernel_do_install_append() {
 }
 
 kernel_do_install_append() {

diff --git a/meta-openvuplus/recipes-connectivity/ppp/ppp_2.4.6.bbappend b/meta-openvuplus/recipes-connectivity/ppp/ppp_2.4.6.bbappend
deleted file mode 100644 (file)
index e6587d2..0000000
--- a/meta-openvuplus/recipes-connectivity/ppp/ppp_2.4.6.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-PR .= "-vuplus0"
-
-do_install_append() {
-       rm ${D}/${sysconfdir}/ppp/options
-       rm ${D}/${sysconfdir}/ppp/pap-secrets
-}
-
-CONFFILES_${PN} = "${sysconfdir}/ppp/chap-secrets"

diff --git a/meta-openvuplus/recipes-connectivity/ppp/ppp_2.4.7.bbappend b/meta-openvuplus/recipes-connectivity/ppp/ppp_2.4.7.bbappend
new file mode 100644 (file)
index 0000000..e6587d2
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/ppp/ppp_2.4.7.bbappend
@@ -0,0 +1,8 @@
+PR .= "-vuplus0"
+
+do_install_append() {
+       rm ${D}/${sysconfdir}/ppp/options
+       rm ${D}/${sysconfdir}/ppp/pap-secrets
+}
+
+CONFFILES_${PN} = "${sysconfdir}/ppp/chap-secrets"

diff --git a/meta-openvuplus/recipes-devtools/orc/orc_0.4.18.bbappend b/meta-openvuplus/recipes-devtools/orc/orc_0.4.18.bbappend
deleted file mode 100644 (file)
index b5e59fd..0000000
--- a/meta-openvuplus/recipes-devtools/orc/orc_0.4.18.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-PR .= "-vuplus0"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://disable-mips.patch"

diff --git a/meta-openvuplus/recipes-devtools/orc/orc_0.4.23.bbappend b/meta-openvuplus/recipes-devtools/orc/orc_0.4.23.bbappend
new file mode 100644 (file)
index 0000000..b5e59fd
--- /dev/null
+++ b/meta-openvuplus/recipes-devtools/orc/orc_0.4.23.bbappend
@@ -0,0 +1,5 @@
+PR .= "-vuplus0"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://disable-mips.patch"

diff --git a/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-extfs-dir.patch b/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-extfs-dir.patch
deleted file mode 100644 (file)
index aebb31e..0000000
--- a/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-extfs-dir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream-Status: Inappropriate [Configuration]
-
-Don't show "Warning: cannot open /usr/libexec/mc/extfs.d directory",
-because it's packaged separately.
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-
---- mc-4.8.1/src/vfs/extfs/extfs.c.orig        2012-05-10 15:50:04.633833530 +0200
-+++ mc-4.8.1/src/vfs/extfs/extfs.c     2012-05-10 15:50:20.349833289 +0200
-@@ -1558,8 +1558,6 @@
-      * appear on screen. */
-     if (dir == NULL)
-     {
--        if (!silent)
--            fprintf (stderr, _("Warning: cannot open %s directory\n"), dirname);
-         g_free (dirname);
-         return FALSE;
-     }

diff --git a/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-hints.patch b/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-hints.patch
deleted file mode 100644 (file)
index a0ccdcd..0000000
--- a/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-hints.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Pending
-
-Fixes a text drawing issue if hints are unavailable.
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-
---- mc-4.8.1/src/filemanager/midnight.c.orig   2012-05-10 15:30:56.645804130 +0200
-+++ mc-4.8.1/src/filemanager/midnight.c        2012-05-10 15:31:27.601804920 +0200
-@@ -1587,7 +1587,7 @@
-     {
-         char text[BUF_SMALL];
- 
--        g_snprintf (text, sizeof (text), _("GNU Midnight Commander %s\n"), VERSION);
-+        g_snprintf (text, sizeof (text), _("GNU Midnight Commander %s"), VERSION);
-         set_hintbar (text);
-     }
- }

diff --git a/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-sfs-ini.patch b/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-sfs-ini.patch
deleted file mode 100644 (file)
index fd5afd3..0000000
--- a/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-sfs-ini.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Inappropriate [Configuration]
-
-Don't show "sfs_init(): Warning: file /etc/mc/sfs.ini not found",
-because it's packaged separately.
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-
---- mc-4.8.1/src/vfs/sfs/sfs.c.orig    2012-05-10 15:48:05.405830465 +0200
-+++ mc-4.8.1/src/vfs/sfs/sfs.c 2012-05-10 15:48:24.389830919 +0200
-@@ -419,7 +419,6 @@
- 
-     if (cfg == NULL)
-     {
--        fprintf (stderr, _("%s: Warning: file %s not found\n"), "sfs_init()", mc_sfsini);
-         g_free (mc_sfsini);
-         return 0;
-     }

diff --git a/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-syntax-file.patch b/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-syntax-file.patch
deleted file mode 100644 (file)
index ee0ee46..0000000
--- a/meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-syntax-file.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream-Status: Inappropriate [Configuration]
-
-Don't show an error message if the syntax file can't
-be opened, because it's packaged separately.
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-
---- mc-4.8.1/src/editor/syntax.c.orig  2011-12-12 10:15:38.000000000 +0100
-+++ mc-4.8.1/src/editor/syntax.c       2012-05-10 15:07:56.517768788 +0200
-@@ -1522,8 +1522,6 @@
-     if (r == -1)
-     {
-         edit_free_syntax_rules (edit);
--        message (D_ERROR, _("Load syntax file"),
--                 _("Cannot open file %s\n%s"), f, unix_error_string (errno));
-     }
-     else if (r != 0)
-     {

diff --git a/meta-openvuplus/recipes-extended/mc/mc-4.8.13/optional-extfs-dir.patch b/meta-openvuplus/recipes-extended/mc/mc-4.8.13/optional-extfs-dir.patch
new file mode 100644 (file)
index 0000000..aebb31e
--- /dev/null
+++ b/meta-openvuplus/recipes-extended/mc/mc-4.8.13/optional-extfs-dir.patch
@@ -0,0 +1,18 @@
+Upstream-Status: Inappropriate [Configuration]
+
+Don't show "Warning: cannot open /usr/libexec/mc/extfs.d directory",
+because it's packaged separately.
+
+Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
+
+--- mc-4.8.1/src/vfs/extfs/extfs.c.orig        2012-05-10 15:50:04.633833530 +0200
++++ mc-4.8.1/src/vfs/extfs/extfs.c     2012-05-10 15:50:20.349833289 +0200
+@@ -1558,8 +1558,6 @@
+      * appear on screen. */
+     if (dir == NULL)
+     {
+-        if (!silent)
+-            fprintf (stderr, _("Warning: cannot open %s directory\n"), dirname);
+         g_free (dirname);
+         return FALSE;
+     }

diff --git a/meta-openvuplus/recipes-extended/mc/mc-4.8.13/optional-hints.patch b/meta-openvuplus/recipes-extended/mc/mc-4.8.13/optional-hints.patch
new file mode 100644 (file)
index 0000000..a0ccdcd
--- /dev/null
+++ b/meta-openvuplus/recipes-extended/mc/mc-4.8.13/optional-hints.patch
@@ -0,0 +1,17 @@
+Upstream-Status: Pending
+
+Fixes a text drawing issue if hints are unavailable.
+
+Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
+
+--- mc-4.8.1/src/filemanager/midnight.c.orig   2012-05-10 15:30:56.645804130 +0200
++++ mc-4.8.1/src/filemanager/midnight.c        2012-05-10 15:31:27.601804920 +0200
+@@ -1587,7 +1587,7 @@
+     {
+         char text[BUF_SMALL];
+ 
+-        g_snprintf (text, sizeof (text), _("GNU Midnight Commander %s\n"), VERSION);
++        g_snprintf (text, sizeof (text), _("GNU Midnight Commander %s"), VERSION);
+         set_hintbar (text);
+     }
+ }

diff --git a/meta-openvuplus/recipes-extended/mc/mc-4.8.13/optional-sfs-ini.patch b/meta-openvuplus/recipes-extended/mc/mc-4.8.13/optional-sfs-ini.patch
new file mode 100644 (file)
index 0000000..fd5afd3
--- /dev/null
+++ b/meta-openvuplus/recipes-extended/mc/mc-4.8.13/optional-sfs-ini.patch
@@ -0,0 +1,17 @@
+Upstream-Status: Inappropriate [Configuration]
+
+Don't show "sfs_init(): Warning: file /etc/mc/sfs.ini not found",
+because it's packaged separately.
+
+Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
+
+--- mc-4.8.1/src/vfs/sfs/sfs.c.orig    2012-05-10 15:48:05.405830465 +0200
++++ mc-4.8.1/src/vfs/sfs/sfs.c 2012-05-10 15:48:24.389830919 +0200
+@@ -419,7 +419,6 @@
+ 
+     if (cfg == NULL)
+     {
+-        fprintf (stderr, _("%s: Warning: file %s not found\n"), "sfs_init()", mc_sfsini);
+         g_free (mc_sfsini);
+         return 0;
+     }

diff --git a/meta-openvuplus/recipes-extended/mc/mc-4.8.13/optional-syntax-file.patch b/meta-openvuplus/recipes-extended/mc/mc-4.8.13/optional-syntax-file.patch
new file mode 100644 (file)
index 0000000..ee0ee46
--- /dev/null
+++ b/meta-openvuplus/recipes-extended/mc/mc-4.8.13/optional-syntax-file.patch
@@ -0,0 +1,18 @@
+Upstream-Status: Inappropriate [Configuration]
+
+Don't show an error message if the syntax file can't
+be opened, because it's packaged separately.
+
+Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
+
+--- mc-4.8.1/src/editor/syntax.c.orig  2011-12-12 10:15:38.000000000 +0100
++++ mc-4.8.1/src/editor/syntax.c       2012-05-10 15:07:56.517768788 +0200
+@@ -1522,8 +1522,6 @@
+     if (r == -1)
+     {
+         edit_free_syntax_rules (edit);
+-        message (D_ERROR, _("Load syntax file"),
+-                 _("Cannot open file %s\n%s"), f, unix_error_string (errno));
+     }
+     else if (r != 0)
+     {

diff --git a/meta-openvuplus/recipes-extended/mc/mc_4.8.12.bbappend b/meta-openvuplus/recipes-extended/mc/mc_4.8.12.bbappend
deleted file mode 100644 (file)
index 73b41c6..0000000
--- a/meta-openvuplus/recipes-extended/mc/mc_4.8.12.bbappend
+++ /dev/null
@@ -1,26 +0,0 @@
-PR .= "-vuplus0"
-
-SRC_URI += "file://optional-extfs-dir.patch \
-            file://optional-hints.patch \
-            file://optional-sfs-ini.patch \
-            file://optional-syntax-file.patch"
-
-PACKAGES += "${PN}-full"
-
-RDEPENDS_${PN} = ""
-RDEPENDS_${PN}-full = "ncurses-terminfo"
-
-RSUGGESTS_${PN} = "${PN}-full"
-
-FILES_${PN} = " \
-        ${bindir}/* \
-        ${sysconfdir}/mc/filehighlight.ini \
-        ${sysconfdir}/mc/*.ext \
-        ${sysconfdir}/mc/*.keymap \
-        ${sysconfdir}/mc/*.menu \
-        ${datadir}/${BPN}/mc.* \
-        ${datadir}/${BPN}/skins/default.ini \
-"
-FILES_${PN}-full = "${libexecdir}/* ${sysconfdir} ${datadir}/${BPN}"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"

diff --git a/meta-openvuplus/recipes-extended/mc/mc_4.8.13.bbappend b/meta-openvuplus/recipes-extended/mc/mc_4.8.13.bbappend
new file mode 100644 (file)
index 0000000..73b41c6
--- /dev/null
+++ b/meta-openvuplus/recipes-extended/mc/mc_4.8.13.bbappend
@@ -0,0 +1,26 @@
+PR .= "-vuplus0"
+
+SRC_URI += "file://optional-extfs-dir.patch \
+            file://optional-hints.patch \
+            file://optional-sfs-ini.patch \
+            file://optional-syntax-file.patch"
+
+PACKAGES += "${PN}-full"
+
+RDEPENDS_${PN} = ""
+RDEPENDS_${PN}-full = "ncurses-terminfo"
+
+RSUGGESTS_${PN} = "${PN}-full"
+
+FILES_${PN} = " \
+        ${bindir}/* \
+        ${sysconfdir}/mc/filehighlight.ini \
+        ${sysconfdir}/mc/*.ext \
+        ${sysconfdir}/mc/*.keymap \
+        ${sysconfdir}/mc/*.menu \
+        ${datadir}/${BPN}/mc.* \
+        ${datadir}/${BPN}/skins/default.ini \
+"
+FILES_${PN}-full = "${libexecdir}/* ${sysconfdir} ${datadir}/${BPN}"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"