1. Topics
  2. [meta-mingw][PATCH V2] testsdk: enhance extract sdk part

[meta-mingw][PATCH V2] testsdk: enhance extract sdk part

Changqing Li
 

change in V2:
1. move zip part to oe-core, and if usr want to use .zip file
set SDK_ARCHIVE_TYPE to zip in local.conf
2. correct extract sdk function for qa test

Changqing Li (1):
testsdk: enhance extract sdk part

lib/oeqa/sdkmingw/testsdk.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)

--
2.7.4
Changqing Li
 

From: Changqing Li <changqing.li@...>

Current sdk type is tar.xz, but for mingw sdk, since we
have symlink under the sdk folder, 7zip which used to
extract tar.xz cannot handle it, refer 7zip upstream bug:
https://sourceforge.net/p/sevenzip/discussion/45797/thread/c71d6b96/
so oe-core have add support of change SDK type to .zip, so correct
the extract function.

Signed-off-by: Changqing Li <changqing.li@...>
---
lib/oeqa/sdkmingw/testsdk.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/oeqa/sdkmingw/testsdk.py b/lib/oeqa/sdkmingw/testsdk.py
index 85fe3c6..173cfd9 100644
--- a/lib/oeqa/sdkmingw/testsdk.py
+++ b/lib/oeqa/sdkmingw/testsdk.py
@@ -12,7 +12,7 @@ class TestSDKMinGW(TestSDK):
"""
Get the name of the SDK file
"""
- return d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.xz")
+ return d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}")

def extract_sdk(self, tcname, sdk_dir, d):
"""
@@ -23,7 +23,14 @@ class TestSDKMinGW(TestSDK):
try:
# TODO: It would be nice to try and extract the SDK in Wine to make
# sure it is well formed
- subprocess.check_output(['tar', '-xf', tcname, '-C', sdk_dir])
+
+ # TODO: Extract SDK according to SDK_ARCHIVE_TYPE, need to change if
+ # oe-core support other types.
+ if d.getVar("SDK_ARCHIVE_TYPE") == "zip":
+ subprocess.check_output(['unzip', '-d', sdk_dir, tcname])
+ else:
+ subprocess.check_output(['tar', '-xf', tcname, '-C', sdk_dir])
+
except subprocess.CalledProcessError as e:
bb.fatal("Couldn't install the SDK:\n%s" % e.output.decode("utf-8"))

--
2.7.4
Joshua Watt
 

Just FYI, I haven't forgot about this patch. I want to wait until the
dependent OE-core patch is at least in the master-next branch before I
apply this to the MinGW master-next branch. If you want to give me a
ping when the OE-core patch shows up in master-next, it would be very
helpful.

Thanks

On Thu, 2019-01-17 at 17:49 +0800, changqing.li@... wrote:
From: Changqing Li <changqing.li@...>

Current sdk type is tar.xz, but for mingw sdk, since we
have symlink under the sdk folder, 7zip which used to
extract tar.xz cannot handle it, refer 7zip upstream bug:
https://sourceforge.net/p/sevenzip/discussion/45797/thread/c71d6b96/
so oe-core have add support of change SDK type to .zip, so correct
the extract function.

Signed-off-by: Changqing Li <changqing.li@...>
---
lib/oeqa/sdkmingw/testsdk.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/oeqa/sdkmingw/testsdk.py
b/lib/oeqa/sdkmingw/testsdk.py
index 85fe3c6..173cfd9 100644
--- a/lib/oeqa/sdkmingw/testsdk.py
+++ b/lib/oeqa/sdkmingw/testsdk.py
@@ -12,7 +12,7 @@ class TestSDKMinGW(TestSDK):
"""
Get the name of the SDK file
"""
- return
d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.xz")
+ return
d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}")

def extract_sdk(self, tcname, sdk_dir, d):
"""
@@ -23,7 +23,14 @@ class TestSDKMinGW(TestSDK):
try:
# TODO: It would be nice to try and extract the SDK in
Wine to make
# sure it is well formed
- subprocess.check_output(['tar', '-xf', tcname, '-C',
sdk_dir])
+
+ # TODO: Extract SDK according to SDK_ARCHIVE_TYPE, need
to change if
+ # oe-core support other types.
+ if d.getVar("SDK_ARCHIVE_TYPE") == "zip":
+ subprocess.check_output(['unzip', '-d', sdk_dir,
tcname])
+ else:
+ subprocess.check_output(['tar', '-xf', tcname, '-C',
sdk_dir])
+
except subprocess.CalledProcessError as e:
bb.fatal("Couldn't install the SDK:\n%s" %
e.output.decode("utf-8"))

--
2.7.4
--
Joshua Watt <JPEWhacker@...>
Changqing Li
 

On 1/21/19 10:47 PM, Joshua Watt wrote:
Just FYI, I haven't forgot about this patch. I want to wait until the
dependent OE-core patch is at least in the master-next branch before I
apply this to the MinGW master-next branch. If you want to give me a
ping when the OE-core patch shows up in master-next, it would be very
helpful.

Thanks
Yes, I will do it.


On Thu, 2019-01-17 at 17:49 +0800, changqing.li@... wrote:
From: Changqing Li <changqing.li@...>

Current sdk type is tar.xz, but for mingw sdk, since we
have symlink under the sdk folder, 7zip which used to
extract tar.xz cannot handle it, refer 7zip upstream bug:
https://sourceforge.net/p/sevenzip/discussion/45797/thread/c71d6b96/
so oe-core have add support of change SDK type to .zip, so correct
the extract function.

Signed-off-by: Changqing Li <changqing.li@...>
---
lib/oeqa/sdkmingw/testsdk.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/oeqa/sdkmingw/testsdk.py
b/lib/oeqa/sdkmingw/testsdk.py
index 85fe3c6..173cfd9 100644
--- a/lib/oeqa/sdkmingw/testsdk.py
+++ b/lib/oeqa/sdkmingw/testsdk.py
@@ -12,7 +12,7 @@ class TestSDKMinGW(TestSDK):
"""
Get the name of the SDK file
"""
- return
d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.xz")
+ return
d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}")
def extract_sdk(self, tcname, sdk_dir, d):
"""
@@ -23,7 +23,14 @@ class TestSDKMinGW(TestSDK):
try:
# TODO: It would be nice to try and extract the SDK in
Wine to make
# sure it is well formed
- subprocess.check_output(['tar', '-xf', tcname, '-C',
sdk_dir])
+
+ # TODO: Extract SDK according to SDK_ARCHIVE_TYPE, need
to change if
+ # oe-core support other types.
+ if d.getVar("SDK_ARCHIVE_TYPE") == "zip":
+ subprocess.check_output(['unzip', '-d', sdk_dir,
tcname])
+ else:
+ subprocess.check_output(['tar', '-xf', tcname, '-C',
sdk_dir])
+
except subprocess.CalledProcessError as e:
bb.fatal("Couldn't install the SDK:\n%s" %
e.output.decode("utf-8"))
--
2.7.4
--
BRs

Sandy(Li Changqing)
Changqing Li
 

Hi, Joshua

OE-core patch have merge to master: https://git.openembedded.org/openembedded-core/commit/?id=57a33048a89a422cfdc986d3489c67b2d297e1e7

please help to merge this patch, thanks.

On 1/21/19 10:47 PM, Joshua Watt wrote:
Just FYI, I haven't forgot about this patch. I want to wait until the
dependent OE-core patch is at least in the master-next branch before I
apply this to the MinGW master-next branch. If you want to give me a
ping when the OE-core patch shows up in master-next, it would be very
helpful.

Thanks

On Thu, 2019-01-17 at 17:49 +0800, changqing.li@... wrote:
From: Changqing Li <changqing.li@...>

Current sdk type is tar.xz, but for mingw sdk, since we
have symlink under the sdk folder, 7zip which used to
extract tar.xz cannot handle it, refer 7zip upstream bug:
https://sourceforge.net/p/sevenzip/discussion/45797/thread/c71d6b96/
so oe-core have add support of change SDK type to .zip, so correct
the extract function.

Signed-off-by: Changqing Li <changqing.li@...>
---
lib/oeqa/sdkmingw/testsdk.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/oeqa/sdkmingw/testsdk.py
b/lib/oeqa/sdkmingw/testsdk.py
index 85fe3c6..173cfd9 100644
--- a/lib/oeqa/sdkmingw/testsdk.py
+++ b/lib/oeqa/sdkmingw/testsdk.py
@@ -12,7 +12,7 @@ class TestSDKMinGW(TestSDK):
"""
Get the name of the SDK file
"""
- return
d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.xz")
+ return
d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}")
def extract_sdk(self, tcname, sdk_dir, d):
"""
@@ -23,7 +23,14 @@ class TestSDKMinGW(TestSDK):
try:
# TODO: It would be nice to try and extract the SDK in
Wine to make
# sure it is well formed
- subprocess.check_output(['tar', '-xf', tcname, '-C',
sdk_dir])
+
+ # TODO: Extract SDK according to SDK_ARCHIVE_TYPE, need
to change if
+ # oe-core support other types.
+ if d.getVar("SDK_ARCHIVE_TYPE") == "zip":
+ subprocess.check_output(['unzip', '-d', sdk_dir,
tcname])
+ else:
+ subprocess.check_output(['tar', '-xf', tcname, '-C',
sdk_dir])
+
except subprocess.CalledProcessError as e:
bb.fatal("Couldn't install the SDK:\n%s" %
e.output.decode("utf-8"))
--
2.7.4
--
BRs

Sandy(Li Changqing)
1 - 5 of 5