* [isar-cip-core][PATCH] shtab: Update shell tab to latest one
@ 2022-10-26 8:56 Srinuvasan A
2022-10-26 10:17 ` Jan Kiszka
0 siblings, 1 reply; 2+ messages in thread
From: Srinuvasan A @ 2022-10-26 8:56 UTC (permalink / raw)
To: cip-dev; +Cc: jan.kiszka, Srinuvasan A
From: Srinuvasan A <srinuvasan_a@mentor.com>
Bump shell tab tag to 1.5.5, created a patch file to build
against debian buster and added required dependency packages.
Signed-off-by: Srinuvasan A <srinuvasan_a@mentor.com>
---
...001-Lower-requirements-on-setuptools.patch | 22 +++++++++----------
...-shtab_1.4.2.bb => python3-shtab_1.5.5.bb} | 10 ++++++---
2 files changed, 18 insertions(+), 14 deletions(-)
rename recipes-python/shtab/{python3-shtab_1.4.2.bb => python3-shtab_1.5.5.bb} (63%)
diff --git a/recipes-python/shtab/files/0001-Lower-requirements-on-setuptools.patch b/recipes-python/shtab/files/0001-Lower-requirements-on-setuptools.patch
index dccc2dd..ba8c1bd 100644
--- a/recipes-python/shtab/files/0001-Lower-requirements-on-setuptools.patch
+++ b/recipes-python/shtab/files/0001-Lower-requirements-on-setuptools.patch
@@ -1,28 +1,28 @@
-From d347695c4b173c94c4d8a678a67947de3ee5f186 Mon Sep 17 00:00:00 2001
-From: Jan Kiszka <jan.kiszka@siemens.com>
-Date: Mon, 14 Mar 2022 08:17:00 +0100
+From faf4d157f563ee44636c1cc4ef1be73bd7264382 Mon Sep 17 00:00:00 2001
+From: Srinuvasan A <srinuvasan_a@mentor.com>
+Date: Wed, 26 Oct 2022 12:32:57 +0530
Subject: [PATCH] Lower requirements on setuptools
Allows to build against Debian buster.
-Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
+Signed-off-by: Srinuvasan A <srinuvasan_a@mentor.com>
---
setup.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.cfg b/setup.cfg
-index 55eecd4..186aad6 100644
+index 6fcff23..5562b88 100644
--- a/setup.cfg
+++ b/setup.cfg
-@@ -66,7 +66,7 @@ classifiers=
+@@ -64,7 +64,7 @@ classifiers=
Topic :: Terminals
Topic :: Utilities
[options]
--setup_requires=setuptools>=42; setuptools_scm[toml]>=3.4
-+setup_requires=setuptools>=40; setuptools_scm>=3.2
+-setup_requires=setuptools>=42; wheel; setuptools_scm[toml]>=3.4
++setup_requires=setuptools>=40; wheel; setuptools_scm>=3.2
install_requires=
- argparse; python_version < "2.7" or ("3.0" <= python_version and python_version < "3.2")
- python_requires= >=2.7, !=3.0.*, !=3.1.*
+ argparse; "3.0" <= python_version and python_version < "3.2"
+ python_requires=>=3.2
--
-2.34.1
+2.25.1
diff --git a/recipes-python/shtab/python3-shtab_1.4.2.bb b/recipes-python/shtab/python3-shtab_1.5.5.bb
similarity index 63%
rename from recipes-python/shtab/python3-shtab_1.4.2.bb
rename to recipes-python/shtab/python3-shtab_1.5.5.bb
index d03e694..625dd6f 100644
--- a/recipes-python/shtab/python3-shtab_1.4.2.bb
+++ b/recipes-python/shtab/python3-shtab_1.5.5.bb
@@ -12,11 +12,13 @@
inherit dpkg
SRC_URI = " \
- https://github.com/iterative/shtab/archive/refs/tags/v1.4.2.tar.gz;downloadfilename=${PN}-${PV}.tar.gz \
- file://0001-Lower-requirements-on-setuptools.patch \
+ https://github.com/iterative/shtab/archive/refs/tags/v1.5.5.tar.gz;downloadfilename=${PN}-${PV}.tar.gz \
file://rules \
"
-SRC_URI[sha256sum] = "5e6ef745c223ef1a01a2db491a8ec5c02c8291067328b17695c9a44f5b7d6fe6"
+# modify for debian buster build
+SRC_URI_append_buster = " file://0001-Lower-requirements-on-setuptools.patch"
+
+SRC_URI[sha256sum] = "b8183c7ee95f28d2f9e17bbe040d5e58070e272f8a0db2f8a601917da8cf8e26"
S = "${WORKDIR}/shtab-${PV}"
@@ -26,6 +28,8 @@ DEBIAN_BUILD_DEPENDS = " \
python3-all-dev:any, \
python3-setuptools, \
python3-setuptools-scm:native, \
+ python3-wheel:native, \
+ python3-toml:native, \
"
DEB_BUILD_PROFILES = "nocheck"
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [isar-cip-core][PATCH] shtab: Update shell tab to latest one
2022-10-26 8:56 [isar-cip-core][PATCH] shtab: Update shell tab to latest one Srinuvasan A
@ 2022-10-26 10:17 ` Jan Kiszka
0 siblings, 0 replies; 2+ messages in thread
From: Jan Kiszka @ 2022-10-26 10:17 UTC (permalink / raw)
To: Srinuvasan A, cip-dev
On 26.10.22 10:56, Srinuvasan A wrote:
> From: Srinuvasan A <srinuvasan_a@mentor.com>
>
> Bump shell tab tag to 1.5.5, created a patch file to build
> against debian buster and added required dependency packages.
>
> Signed-off-by: Srinuvasan A <srinuvasan_a@mentor.com>
> ---
> ...001-Lower-requirements-on-setuptools.patch | 22 +++++++++----------
> ...-shtab_1.4.2.bb => python3-shtab_1.5.5.bb} | 10 ++++++---
> 2 files changed, 18 insertions(+), 14 deletions(-)
> rename recipes-python/shtab/{python3-shtab_1.4.2.bb => python3-shtab_1.5.5.bb} (63%)
>
> diff --git a/recipes-python/shtab/files/0001-Lower-requirements-on-setuptools.patch b/recipes-python/shtab/files/0001-Lower-requirements-on-setuptools.patch
> index dccc2dd..ba8c1bd 100644
> --- a/recipes-python/shtab/files/0001-Lower-requirements-on-setuptools.patch
> +++ b/recipes-python/shtab/files/0001-Lower-requirements-on-setuptools.patch
> @@ -1,28 +1,28 @@
> -From d347695c4b173c94c4d8a678a67947de3ee5f186 Mon Sep 17 00:00:00 2001
> -From: Jan Kiszka <jan.kiszka@siemens.com>
> -Date: Mon, 14 Mar 2022 08:17:00 +0100
> +From faf4d157f563ee44636c1cc4ef1be73bd7264382 Mon Sep 17 00:00:00 2001
> +From: Srinuvasan A <srinuvasan_a@mentor.com>
> +Date: Wed, 26 Oct 2022 12:32:57 +0530
> Subject: [PATCH] Lower requirements on setuptools
>
> Allows to build against Debian buster.
>
> -Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> +Signed-off-by: Srinuvasan A <srinuvasan_a@mentor.com>
> ---
> setup.cfg | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/setup.cfg b/setup.cfg
> -index 55eecd4..186aad6 100644
> +index 6fcff23..5562b88 100644
> --- a/setup.cfg
> +++ b/setup.cfg
> -@@ -66,7 +66,7 @@ classifiers=
> +@@ -64,7 +64,7 @@ classifiers=
> Topic :: Terminals
> Topic :: Utilities
> [options]
> --setup_requires=setuptools>=42; setuptools_scm[toml]>=3.4
> -+setup_requires=setuptools>=40; setuptools_scm>=3.2
> +-setup_requires=setuptools>=42; wheel; setuptools_scm[toml]>=3.4
> ++setup_requires=setuptools>=40; wheel; setuptools_scm>=3.2
> install_requires=
> - argparse; python_version < "2.7" or ("3.0" <= python_version and python_version < "3.2")
> - python_requires= >=2.7, !=3.0.*, !=3.1.*
> + argparse; "3.0" <= python_version and python_version < "3.2"
> + python_requires=>=3.2
> --
> -2.34.1
> +2.25.1
>
> diff --git a/recipes-python/shtab/python3-shtab_1.4.2.bb b/recipes-python/shtab/python3-shtab_1.5.5.bb
> similarity index 63%
> rename from recipes-python/shtab/python3-shtab_1.4.2.bb
> rename to recipes-python/shtab/python3-shtab_1.5.5.bb
> index d03e694..625dd6f 100644
> --- a/recipes-python/shtab/python3-shtab_1.4.2.bb
> +++ b/recipes-python/shtab/python3-shtab_1.5.5.bb
> @@ -12,11 +12,13 @@
> inherit dpkg
>
> SRC_URI = " \
> - https://github.com/iterative/shtab/archive/refs/tags/v1.4.2.tar.gz;downloadfilename=${PN}-${PV}.tar.gz \
> - file://0001-Lower-requirements-on-setuptools.patch \
> + https://github.com/iterative/shtab/archive/refs/tags/v1.5.5.tar.gz;downloadfilename=${PN}-${PV}.tar.gz \
> file://rules \
> "
> -SRC_URI[sha256sum] = "5e6ef745c223ef1a01a2db491a8ec5c02c8291067328b17695c9a44f5b7d6fe6"
> +# modify for debian buster build
> +SRC_URI_append_buster = " file://0001-Lower-requirements-on-setuptools.patch"
> +
> +SRC_URI[sha256sum] = "b8183c7ee95f28d2f9e17bbe040d5e58070e272f8a0db2f8a601917da8cf8e26"
>
> S = "${WORKDIR}/shtab-${PV}"
>
> @@ -26,6 +28,8 @@ DEBIAN_BUILD_DEPENDS = " \
> python3-all-dev:any, \
> python3-setuptools, \
> python3-setuptools-scm:native, \
> + python3-wheel:native, \
> + python3-toml:native, \
> "
>
> DEB_BUILD_PROFILES = "nocheck"
Thanks. But is that now in line with
https://salsa.debian.org/python-team/packages/shtab/? Maybe we should
pull from there now and then patch on top if we need adjustments for
buster or bullseye.
Jan
--
Siemens AG, Technology
Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-26 10:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-26 8:56 [isar-cip-core][PATCH] shtab: Update shell tab to latest one Srinuvasan A
2022-10-26 10:17 ` Jan Kiszka
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.