* [PATCH] nativesdk-qtbase: drop locally applied patch that was upstreamed
@ 2015-11-12 2:04 Denys Dmytriyenko
2015-11-12 2:04 ` [PATCH] arago.conf, arago-prefs: add ARAGO_RT_ENABLE and ARAGO_RT_SUFFIX variables Denys Dmytriyenko
2015-11-12 15:03 ` [PATCH] nativesdk-qtbase: drop locally applied patch that was upstreamed Jacob Stiffler
0 siblings, 2 replies; 7+ messages in thread
From: Denys Dmytriyenko @ 2015-11-12 2:04 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
...xpand-path-increase-change-to-2-more-path.patch | 28 ----------------------
.../recipes-qt/qt5/nativesdk-qtbase_%.bbappend | 5 ----
2 files changed, 33 deletions(-)
delete mode 100644 meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-expand-path-increase-change-to-2-more-path.patch
delete mode 100644 meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
diff --git a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-expand-path-increase-change-to-2-more-path.patch b/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-expand-path-increase-change-to-2-more-path.patch
deleted file mode 100644
index fc54c64..0000000
--- a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-expand-path-increase-change-to-2-more-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From cfa358e04b9e7c66d59db3000b2a2ab2ebf543c8 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <denys@ti.com>
-Date: Tue, 25 Aug 2015 11:26:48 -0400
-Subject: [PATCH] configure: expand path increase change to 2 more paths
-
-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
----
- configure | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index bea14af..fe18487 100755
---- a/configure
-+++ b/configure
-@@ -3853,8 +3853,8 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2
- /* Installation Info */
- static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
- #ifdef QT_BUILD_QMAKE
--static const char qt_configure_ext_prefix_path_str [256 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
--static const char qt_configure_host_prefix_path_str [256 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
-+static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
-+static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
- #endif
-
- static const short qt_configure_str_offsets[] = {
---
-2.2.0
-
diff --git a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend b/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
deleted file mode 100644
index 39f739a..0000000
--- a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://0001-configure-expand-path-increase-change-to-2-more-path.patch"
-
-PR_append = "-arago0"
--
2.2.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] arago.conf, arago-prefs: add ARAGO_RT_ENABLE and ARAGO_RT_SUFFIX variables
2015-11-12 2:04 [PATCH] nativesdk-qtbase: drop locally applied patch that was upstreamed Denys Dmytriyenko
@ 2015-11-12 2:04 ` Denys Dmytriyenko
2015-11-12 15:03 ` [PATCH] nativesdk-qtbase: drop locally applied patch that was upstreamed Jacob Stiffler
1 sibling, 0 replies; 7+ messages in thread
From: Denys Dmytriyenko @ 2015-11-12 2:04 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Allows easy switching between RT and non-RT kernel builds
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/conf/distro/arago.conf | 4 ++++
meta-arago-distro/conf/distro/include/arago-prefs.inc | 3 +--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index 5c33666..b33f311 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -53,6 +53,10 @@ PACKAGECONFIG_pn-curl = "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6",
# Enable UI and scripting for perf
PERF_FEATURES_ENABLE ?= "perf-scripting perf-tui"
+# Set real-time kernel suffix
+ARAGO_RT_ENABLE ?= "0"
+ARAGO_RT_SUFFIX = "${@base_conditional("ARAGO_RT_ENABLE", "1", "-rt", "", d)}"
+
# ARM9 is not supported by the Linaro toolchain so default back to the Arago
# toolchain for ARM9 based SOCs.
TC_SANE_DEFAULT := "${@bb.utils.contains('SOC_FAMILY','omapl138','arago','linaro',d)}"
diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc
index 1cafa96..874bea5 100644
--- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
+++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
@@ -62,8 +62,7 @@ PREFERRED_PROVIDER_virtual/libgl_keystone = "mesa"
PREFERRED_PROVIDER_virtual/mesa_keystone = "mesa"
# Use latest TI staging kernel and u-boot trees
-PREFERRED_PROVIDER_virtual/kernel_am335x-evm = "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/kernel_am437x-evm = "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging${ARAGO_RT_SUFFIX}"
PREFERRED_VERSION_linux-ti-staging = "4.1%"
PREFERRED_PROVIDER_virtual/bootloader_am335x-evm = "u-boot-ti-staging"
--
2.2.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] nativesdk-qtbase: drop locally applied patch that was upstreamed
2015-11-12 2:04 [PATCH] nativesdk-qtbase: drop locally applied patch that was upstreamed Denys Dmytriyenko
2015-11-12 2:04 ` [PATCH] arago.conf, arago-prefs: add ARAGO_RT_ENABLE and ARAGO_RT_SUFFIX variables Denys Dmytriyenko
@ 2015-11-12 15:03 ` Jacob Stiffler
2015-11-12 16:44 ` Denys Dmytriyenko
1 sibling, 1 reply; 7+ messages in thread
From: Jacob Stiffler @ 2015-11-12 15:03 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-arago
In our configs, we have the meta-qt5 layer frozen at
97ce05c0b2a81f05388d7f727741529fb9177775.
How will we get this upstream patch?
Thanks,
Jake
On 11/11/2015 9:04 PM, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ti.com>
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> ...xpand-path-increase-change-to-2-more-path.patch | 28 ----------------------
> .../recipes-qt/qt5/nativesdk-qtbase_%.bbappend | 5 ----
> 2 files changed, 33 deletions(-)
> delete mode 100644 meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-expand-path-increase-change-to-2-more-path.patch
> delete mode 100644 meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
>
> diff --git a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-expand-path-increase-change-to-2-more-path.patch b/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-expand-path-increase-change-to-2-more-path.patch
> deleted file mode 100644
> index fc54c64..0000000
> --- a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-expand-path-increase-change-to-2-more-path.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From cfa358e04b9e7c66d59db3000b2a2ab2ebf543c8 Mon Sep 17 00:00:00 2001
> -From: Denys Dmytriyenko <denys@ti.com>
> -Date: Tue, 25 Aug 2015 11:26:48 -0400
> -Subject: [PATCH] configure: expand path increase change to 2 more paths
> -
> -Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ----
> - configure | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/configure b/configure
> -index bea14af..fe18487 100755
> ---- a/configure
> -+++ b/configure
> -@@ -3853,8 +3853,8 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2
> - /* Installation Info */
> - static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
> - #ifdef QT_BUILD_QMAKE
> --static const char qt_configure_ext_prefix_path_str [256 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
> --static const char qt_configure_host_prefix_path_str [256 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
> -+static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
> -+static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
> - #endif
> -
> - static const short qt_configure_str_offsets[] = {
> ---
> -2.2.0
> -
> diff --git a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend b/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
> deleted file mode 100644
> index 39f739a..0000000
> --- a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> -
> -SRC_URI += "file://0001-configure-expand-path-increase-change-to-2-more-path.patch"
> -
> -PR_append = "-arago0"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] nativesdk-qtbase: drop locally applied patch that was upstreamed
2015-11-12 15:03 ` [PATCH] nativesdk-qtbase: drop locally applied patch that was upstreamed Jacob Stiffler
@ 2015-11-12 16:44 ` Denys Dmytriyenko
2015-11-12 16:55 ` Jacob Stiffler
0 siblings, 1 reply; 7+ messages in thread
From: Denys Dmytriyenko @ 2015-11-12 16:44 UTC (permalink / raw)
To: Jacob Stiffler; +Cc: meta-arago
Yeah, I meant to un-pin meta-qt5 some time ago right after 2015.01. Any
particular reason you want it pinned now?
On Thu, Nov 12, 2015 at 10:03:28AM -0500, Jacob Stiffler wrote:
> In our configs, we have the meta-qt5 layer frozen at
> 97ce05c0b2a81f05388d7f727741529fb9177775.
>
> How will we get this upstream patch?
>
> Thanks,
> Jake
>
> On 11/11/2015 9:04 PM, Denys Dmytriyenko wrote:
> >From: Denys Dmytriyenko <denys@ti.com>
> >
> >Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >---
> > ...xpand-path-increase-change-to-2-more-path.patch | 28 ----------------------
> > .../recipes-qt/qt5/nativesdk-qtbase_%.bbappend | 5 ----
> > 2 files changed, 33 deletions(-)
> > delete mode 100644 meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-expand-path-increase-change-to-2-more-path.patch
> > delete mode 100644 meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
> >
> >diff --git a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-expand-path-increase-change-to-2-more-path.patch b/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-expand-path-increase-change-to-2-more-path.patch
> >deleted file mode 100644
> >index fc54c64..0000000
> >--- a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-expand-path-increase-change-to-2-more-path.patch
> >+++ /dev/null
> >@@ -1,28 +0,0 @@
> >-From cfa358e04b9e7c66d59db3000b2a2ab2ebf543c8 Mon Sep 17 00:00:00 2001
> >-From: Denys Dmytriyenko <denys@ti.com>
> >-Date: Tue, 25 Aug 2015 11:26:48 -0400
> >-Subject: [PATCH] configure: expand path increase change to 2 more paths
> >-
> >-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >----
> >- configure | 4 ++--
> >- 1 file changed, 2 insertions(+), 2 deletions(-)
> >-
> >-diff --git a/configure b/configure
> >-index bea14af..fe18487 100755
> >---- a/configure
> >-+++ b/configure
> >-@@ -3853,8 +3853,8 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2
> >- /* Installation Info */
> >- static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
> >- #ifdef QT_BUILD_QMAKE
> >--static const char qt_configure_ext_prefix_path_str [256 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
> >--static const char qt_configure_host_prefix_path_str [256 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
> >-+static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
> >-+static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
> >- #endif
> >-
> >- static const short qt_configure_str_offsets[] = {
> >---
> >-2.2.0
> >-
> >diff --git a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend b/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
> >deleted file mode 100644
> >index 39f739a..0000000
> >--- a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
> >+++ /dev/null
> >@@ -1,5 +0,0 @@
> >-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> >-
> >-SRC_URI += "file://0001-configure-expand-path-increase-change-to-2-more-path.patch"
> >-
> >-PR_append = "-arago0"
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] nativesdk-qtbase: drop locally applied patch that was upstreamed
2015-11-12 16:44 ` Denys Dmytriyenko
@ 2015-11-12 16:55 ` Jacob Stiffler
2015-11-12 17:11 ` Chengalvala, Vivek
0 siblings, 1 reply; 7+ messages in thread
From: Jacob Stiffler @ 2015-11-12 16:55 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago
No reason other than following coresdk.
Do you plan on updating the arago-fido-config.txt to use the tip of the
master branch on meta-qt5?
On 11/12/2015 11:44 AM, Denys Dmytriyenko wrote:
> Yeah, I meant to un-pin meta-qt5 some time ago right after 2015.01. Any
> particular reason you want it pinned now?
>
>
> On Thu, Nov 12, 2015 at 10:03:28AM -0500, Jacob Stiffler wrote:
>> In our configs, we have the meta-qt5 layer frozen at
>> 97ce05c0b2a81f05388d7f727741529fb9177775.
>>
>> How will we get this upstream patch?
>>
>> Thanks,
>> Jake
>>
>> On 11/11/2015 9:04 PM, Denys Dmytriyenko wrote:
>>> From: Denys Dmytriyenko <denys@ti.com>
>>>
>>> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>>> ---
>>> ...xpand-path-increase-change-to-2-more-path.patch | 28 ----------------------
>>> .../recipes-qt/qt5/nativesdk-qtbase_%.bbappend | 5 ----
>>> 2 files changed, 33 deletions(-)
>>> delete mode 100644 meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-expand-path-increase-change-to-2-more-path.patch
>>> delete mode 100644 meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
>>>
>>> diff --git a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-expand-path-increase-change-to-2-more-path.patch b/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-expand-path-increase-change-to-2-more-path.patch
>>> deleted file mode 100644
>>> index fc54c64..0000000
>>> --- a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-expand-path-increase-change-to-2-more-path.patch
>>> +++ /dev/null
>>> @@ -1,28 +0,0 @@
>>> -From cfa358e04b9e7c66d59db3000b2a2ab2ebf543c8 Mon Sep 17 00:00:00 2001
>>> -From: Denys Dmytriyenko <denys@ti.com>
>>> -Date: Tue, 25 Aug 2015 11:26:48 -0400
>>> -Subject: [PATCH] configure: expand path increase change to 2 more paths
>>> -
>>> -Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>>> ----
>>> - configure | 4 ++--
>>> - 1 file changed, 2 insertions(+), 2 deletions(-)
>>> -
>>> -diff --git a/configure b/configure
>>> -index bea14af..fe18487 100755
>>> ---- a/configure
>>> -+++ b/configure
>>> -@@ -3853,8 +3853,8 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2
>>> - /* Installation Info */
>>> - static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
>>> - #ifdef QT_BUILD_QMAKE
>>> --static const char qt_configure_ext_prefix_path_str [256 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
>>> --static const char qt_configure_host_prefix_path_str [256 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
>>> -+static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
>>> -+static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
>>> - #endif
>>> -
>>> - static const short qt_configure_str_offsets[] = {
>>> ---
>>> -2.2.0
>>> -
>>> diff --git a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend b/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
>>> deleted file mode 100644
>>> index 39f739a..0000000
>>> --- a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
>>> +++ /dev/null
>>> @@ -1,5 +0,0 @@
>>> -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>>> -
>>> -SRC_URI += "file://0001-configure-expand-path-increase-change-to-2-more-path.patch"
>>> -
>>> -PR_append = "-arago0"
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] nativesdk-qtbase: drop locally applied patch that was upstreamed
2015-11-12 16:55 ` Jacob Stiffler
@ 2015-11-12 17:11 ` Chengalvala, Vivek
2015-11-12 17:24 ` Denys Dmytriyenko
0 siblings, 1 reply; 7+ messages in thread
From: Chengalvala, Vivek @ 2015-11-12 17:11 UTC (permalink / raw)
To: Stiffler, Jacob, Dmytriyenko, Denys; +Cc: meta-arago
The commit message from when the qt5 version was pinned says " arago-fido-config: temporarily pin meta-qt5 to avoid breaking qtwebkit". Is that resolved?
-----Original Message-----
From: meta-arago-bounces@arago-project.org [mailto:meta-arago-bounces@arago-project.org] On Behalf Of Stiffler, Jacob
Sent: Thursday, November 12, 2015 11:56 AM
To: Dmytriyenko, Denys
Cc: meta-arago@arago-project.org
Subject: Re: [meta-arago] [PATCH] nativesdk-qtbase: drop locally applied patch that was upstreamed
No reason other than following coresdk.
Do you plan on updating the arago-fido-config.txt to use the tip of the master branch on meta-qt5?
On 11/12/2015 11:44 AM, Denys Dmytriyenko wrote:
> Yeah, I meant to un-pin meta-qt5 some time ago right after 2015.01.
> Any particular reason you want it pinned now?
>
>
> On Thu, Nov 12, 2015 at 10:03:28AM -0500, Jacob Stiffler wrote:
>> In our configs, we have the meta-qt5 layer frozen at
>> 97ce05c0b2a81f05388d7f727741529fb9177775.
>>
>> How will we get this upstream patch?
>>
>> Thanks,
>> Jake
>>
>> On 11/11/2015 9:04 PM, Denys Dmytriyenko wrote:
>>> From: Denys Dmytriyenko <denys@ti.com>
>>>
>>> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>>> ---
>>> ...xpand-path-increase-change-to-2-more-path.patch | 28 ----------------------
>>> .../recipes-qt/qt5/nativesdk-qtbase_%.bbappend | 5 ----
>>> 2 files changed, 33 deletions(-)
>>> delete mode 100644 meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-expand-path-increase-change-to-2-more-path.patch
>>> delete mode 100644
>>> meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
>>>
>>> diff --git
>>> a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-e
>>> xpand-path-increase-change-to-2-more-path.patch
>>> b/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-e
>>> xpand-path-increase-change-to-2-more-path.patch
>>> deleted file mode 100644
>>> index fc54c64..0000000
>>> ---
>>> a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-e
>>> xpand-path-increase-change-to-2-more-path.patch
>>> +++ /dev/null
>>> @@ -1,28 +0,0 @@
>>> -From cfa358e04b9e7c66d59db3000b2a2ab2ebf543c8 Mon Sep 17 00:00:00
>>> 2001
>>> -From: Denys Dmytriyenko <denys@ti.com>
>>> -Date: Tue, 25 Aug 2015 11:26:48 -0400
>>> -Subject: [PATCH] configure: expand path increase change to 2 more
>>> paths
>>> -
>>> -Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>>> ----
>>> - configure | 4 ++--
>>> - 1 file changed, 2 insertions(+), 2 deletions(-)
>>> -
>>> -diff --git a/configure b/configure
>>> -index bea14af..fe18487 100755
>>> ---- a/configure
>>> -+++ b/configure
>>> -@@ -3853,8 +3853,8 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2
>>> - /* Installation Info */
>>> - static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
>>> - #ifdef QT_BUILD_QMAKE
>>> --static const char qt_configure_ext_prefix_path_str [256 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
>>> --static const char qt_configure_host_prefix_path_str [256 + 12] =
>>> "qt_hpfxpath=$QT_HOST_PREFIX";
>>> -+static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
>>> -+static const char qt_configure_host_prefix_path_str [512 + 12] =
>>> -+"qt_hpfxpath=$QT_HOST_PREFIX";
>>> - #endif
>>> -
>>> - static const short qt_configure_str_offsets[] = {
>>> ---
>>> -2.2.0
>>> -
>>> diff --git
>>> a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
>>> b/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
>>> deleted file mode 100644
>>> index 39f739a..0000000
>>> --- a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
>>> +++ /dev/null
>>> @@ -1,5 +0,0 @@
>>> -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>>> -
>>> -SRC_URI += "file://0001-configure-expand-path-increase-change-to-2-more-path.patch"
>>> -
>>> -PR_append = "-arago0"
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
_______________________________________________
meta-arago mailing list
meta-arago@arago-project.org
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] nativesdk-qtbase: drop locally applied patch that was upstreamed
2015-11-12 17:11 ` Chengalvala, Vivek
@ 2015-11-12 17:24 ` Denys Dmytriyenko
0 siblings, 0 replies; 7+ messages in thread
From: Denys Dmytriyenko @ 2015-11-12 17:24 UTC (permalink / raw)
To: Chengalvala, Vivek; +Cc: meta-arago
Since September
On Thu, Nov 12, 2015 at 12:11:53PM -0500, Chengalvala, Vivek wrote:
> The commit message from when the qt5 version was pinned says "
> arago-fido-config: temporarily pin meta-qt5 to avoid breaking qtwebkit". Is
> that resolved?
>
>
> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-bounces@arago-project.org] On Behalf Of Stiffler, Jacob
> Sent: Thursday, November 12, 2015 11:56 AM
> To: Dmytriyenko, Denys
> Cc: meta-arago@arago-project.org
> Subject: Re: [meta-arago] [PATCH] nativesdk-qtbase: drop locally applied patch that was upstreamed
>
> No reason other than following coresdk.
>
> Do you plan on updating the arago-fido-config.txt to use the tip of the master branch on meta-qt5?
>
> On 11/12/2015 11:44 AM, Denys Dmytriyenko wrote:
> > Yeah, I meant to un-pin meta-qt5 some time ago right after 2015.01.
> > Any particular reason you want it pinned now?
> >
> >
> > On Thu, Nov 12, 2015 at 10:03:28AM -0500, Jacob Stiffler wrote:
> >> In our configs, we have the meta-qt5 layer frozen at
> >> 97ce05c0b2a81f05388d7f727741529fb9177775.
> >>
> >> How will we get this upstream patch?
> >>
> >> Thanks,
> >> Jake
> >>
> >> On 11/11/2015 9:04 PM, Denys Dmytriyenko wrote:
> >>> From: Denys Dmytriyenko <denys@ti.com>
> >>>
> >>> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >>> ---
> >>> ...xpand-path-increase-change-to-2-more-path.patch | 28 ----------------------
> >>> .../recipes-qt/qt5/nativesdk-qtbase_%.bbappend | 5 ----
> >>> 2 files changed, 33 deletions(-)
> >>> delete mode 100644 meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-expand-path-increase-change-to-2-more-path.patch
> >>> delete mode 100644
> >>> meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
> >>>
> >>> diff --git
> >>> a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-e
> >>> xpand-path-increase-change-to-2-more-path.patch
> >>> b/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-e
> >>> xpand-path-increase-change-to-2-more-path.patch
> >>> deleted file mode 100644
> >>> index fc54c64..0000000
> >>> ---
> >>> a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase/0001-configure-e
> >>> xpand-path-increase-change-to-2-more-path.patch
> >>> +++ /dev/null
> >>> @@ -1,28 +0,0 @@
> >>> -From cfa358e04b9e7c66d59db3000b2a2ab2ebf543c8 Mon Sep 17 00:00:00
> >>> 2001
> >>> -From: Denys Dmytriyenko <denys@ti.com>
> >>> -Date: Tue, 25 Aug 2015 11:26:48 -0400
> >>> -Subject: [PATCH] configure: expand path increase change to 2 more
> >>> paths
> >>> -
> >>> -Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >>> ----
> >>> - configure | 4 ++--
> >>> - 1 file changed, 2 insertions(+), 2 deletions(-)
> >>> -
> >>> -diff --git a/configure b/configure
> >>> -index bea14af..fe18487 100755
> >>> ---- a/configure
> >>> -+++ b/configure
> >>> -@@ -3853,8 +3853,8 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2
> >>> - /* Installation Info */
> >>> - static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
> >>> - #ifdef QT_BUILD_QMAKE
> >>> --static const char qt_configure_ext_prefix_path_str [256 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
> >>> --static const char qt_configure_host_prefix_path_str [256 + 12] =
> >>> "qt_hpfxpath=$QT_HOST_PREFIX";
> >>> -+static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
> >>> -+static const char qt_configure_host_prefix_path_str [512 + 12] =
> >>> -+"qt_hpfxpath=$QT_HOST_PREFIX";
> >>> - #endif
> >>> -
> >>> - static const short qt_configure_str_offsets[] = {
> >>> ---
> >>> -2.2.0
> >>> -
> >>> diff --git
> >>> a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
> >>> b/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
> >>> deleted file mode 100644
> >>> index 39f739a..0000000
> >>> --- a/meta-arago-distro/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
> >>> +++ /dev/null
> >>> @@ -1,5 +0,0 @@
> >>> -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> >>> -
> >>> -SRC_URI += "file://0001-configure-expand-path-increase-change-to-2-more-path.patch"
> >>> -
> >>> -PR_append = "-arago0"
> >> _______________________________________________
> >> meta-arago mailing list
> >> meta-arago@arago-project.org
> >> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-11-12 17:24 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-12 2:04 [PATCH] nativesdk-qtbase: drop locally applied patch that was upstreamed Denys Dmytriyenko
2015-11-12 2:04 ` [PATCH] arago.conf, arago-prefs: add ARAGO_RT_ENABLE and ARAGO_RT_SUFFIX variables Denys Dmytriyenko
2015-11-12 15:03 ` [PATCH] nativesdk-qtbase: drop locally applied patch that was upstreamed Jacob Stiffler
2015-11-12 16:44 ` Denys Dmytriyenko
2015-11-12 16:55 ` Jacob Stiffler
2015-11-12 17:11 ` Chengalvala, Vivek
2015-11-12 17:24 ` Denys Dmytriyenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.