Re: [ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
On Wed, Jan 27, 2010 at 07:01:17PM +0100, Marc Kleine-Budde wrote: yeah, you can delete some rules, but I don't don't which. But Michael knows. For now it's just prepare that can be deleted. And that's only a side effect. I'm working on a patch for that. Something like: PKG_SOURCE not defined - do nothing in pkg.get Unfortunately it's not quite as easy for other stages. I had some problems with packages where make wasn't called. Michael -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
From: Carsten Schlote c.schl...@konzeptpark.de
The ipkg-push script doesn't like '-1' or
similiar postfixes at the end of an ipkg version.
Packets like hackbench, mbw or zlib violate this
rule.
Added $(subst) to ptxd_make_install.sh to convert
a version info containing '-' to a ipkg compatible
format.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
scripts/lib/ptxd_make_install.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/lib/ptxd_make_install.sh b/scripts/lib/ptxd_make_install.sh
index afed5b0..0d60263 100644
--- a/scripts/lib/ptxd_make_install.sh
+++ b/scripts/lib/ptxd_make_install.sh
@@ -158,7 +158,7 @@ EOF
;;
VERSION)
- replace_to=${replace_to}${PTXCONF_PROJECT_BUILD}
+ replace_to=`echo ${replace_to} | sed -e
's/-/./'`${PTXCONF_PROJECT_BUILD}
;;
DEPENDS)
return
--
1.6.5.6.gb3118
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
Carsten Schlote wrote:
From: Carsten Schlote c.schl...@konzeptpark.de
The ipkg-push script doesn't like '-1' or
similiar postfixes at the end of an ipkg version.
Packets like hackbench, mbw or zlib violate this
rule.
Added $(subst) to ptxd_make_install.sh to convert
a version info containing '-' to a ipkg compatible
format.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
scripts/lib/ptxd_make_install.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/lib/ptxd_make_install.sh
b/scripts/lib/ptxd_make_install.sh
index afed5b0..0d60263 100644
--- a/scripts/lib/ptxd_make_install.sh
+++ b/scripts/lib/ptxd_make_install.sh
@@ -158,7 +158,7 @@ EOF
;;
VERSION)
- replace_to=${replace_to}${PTXCONF_PROJECT_BUILD}
+ replace_to=`echo ${replace_to} | sed -e
's/-/./'`${PTXCONF_PROJECT_BUILD}
please use bash magic for this: ${replace_to//-/.}
(this actually is: s/-/./g, what about _ in the version string?
;;
DEPENDS)
return
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions| Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917- |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
;;
VERSION)
- replace_to=${replace_to}${PTXCONF_PROJECT_BUILD}
+ replace_to=`echo ${replace_to} | sed -e 's/-
/./'`${PTXCONF_PROJECT_BUILD}
please use bash magic for this: ${replace_to//-/.}
(this actually is: s/-/./g, what about _ in the version string?
Not yet covered, because this wasn't an issue yet. But of course '_'
will mess
up the ipkg-push script as well.
I will add some handling for it as well.
Is the conversion from '-' to '.' ok? Or should it be some other
character?
Carsten
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
Carsten Schlote wrote:
;;
VERSION)
- replace_to=${replace_to}${PTXCONF_PROJECT_BUILD}
+ replace_to=`echo ${replace_to} | sed -e 's/-
/./'`${PTXCONF_PROJECT_BUILD}
please use bash magic for this: ${replace_to//-/.}
(this actually is: s/-/./g, what about _ in the version string?
Not yet covered, because this wasn't an issue yet. But of course '_'
will mess
up the ipkg-push script as well.
Hmmm...after rereading the text, I realized that you said ipkg-push
has problems. The script was written by pengutronix and probably never
in heavy use.
If ipkg is fine with the versions, IMHO we should fix the script. Or
better said: ipkg should limit us here, not the ipkg-push script.
I will add some handling for it as well.
Is the conversion from '-' to '.' ok? Or should it be some other
character?
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions| Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917- |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
If ipkg is fine with the versions, IMHO we should fix the script. Or better said: ipkg should limit us here, not the ipkg-push script. Sorry, the script is in ipkg-utils and is called from ipkg-push. The python scripts is the problem here, it simply expects all ipkg files to follow a given name convention. This convention disallows '-' or '_' for the VERSION tags provided. So it's the job of ptxdist to ensure that all ipkg files follow the name conventions for the python script. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
Carsten Schlote wrote: If ipkg is fine with the versions, IMHO we should fix the script. Or better said: ipkg should limit us here, not the ipkg-push script. Sorry, the script is in ipkg-utils and is called from ipkg-push. The python scripts is the problem here, it simply expects all ipkg files to follow a given name convention. This convention disallows '-' or '_' for the VERSION tags provided. So it's the job of ptxdist to ensure that all ipkg files follow the name conventions for the python script. Fine, I just wanted to be sure to fix the right thing :) So the bash replacement is the way to go. cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
Marc Kleine-Budde wrote:
Carsten Schlote wrote:
If ipkg is fine with the versions, IMHO we should fix the script. Or
better said: ipkg should limit us here, not the ipkg-push script.
Sorry, the script is in ipkg-utils and is called from ipkg-push.
The python scripts is the problem here, it simply expects all ipkg files
to follow a given name convention.
This convention disallows '-' or '_' for the VERSION tags provided.
So it's the job of ptxdist to ensure that all ipkg files follow the
name conventions for the python script.
Fine, I just wanted to be sure to fix the right thing :)
So the bash replacement is the way to go.
I think this can be used:
[frog...@hardanger:barebox (dev/pxa270)]$ foo=1-2-3_4-5_6
[frog...@hardanger:barebox (dev/pxa270)]$ echo ${foo//[-_]/.}
1.2.3.4.5.6
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions| Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917- |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
From: Carsten Schlote c.schl...@konzeptpark.de
The ipkg-push script doesn't like '-1' or
similiar postfixes at the end of an ipkg version.
Packets like hackbench, mbw or zlib violate this
rule.
Added bash-magic to ptxd_make_install.sh to convert
a version info containing '-' or '_' to a ipkg compatible
format.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
scripts/lib/ptxd_make_install.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/lib/ptxd_make_install.sh b/scripts/lib/ptxd_make_install.sh
index afed5b0..0de166c 100644
--- a/scripts/lib/ptxd_make_install.sh
+++ b/scripts/lib/ptxd_make_install.sh
@@ -158,7 +158,7 @@ EOF
;;
VERSION)
- replace_to=${replace_to}${PTXCONF_PROJECT_BUILD}
+ replace_to=${replace_to//[-_]/.}${PTXCONF_PROJECT_BUILD}
;;
DEPENDS)
return
--
1.6.5.6.gb3118
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
Added bash-magic to ptxd_make_install.sh to convert a version info
containing '-' or '_' to a ipkg compatible format.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
what about project_build? should we fix that up, too? Just in case?
+
replace_to=${replace_to//[-_]/.}${PTXCONF_PROJECT_BUILD//[-_]/.}
Not yet idiot-proof, but filters the most common cases. Can be extended
to
other critical chars later when/if needed.
If you agree to the change, then you can pull the branch
'tmp-ipkg-stuff' at
git://www.vahanus.net/ptxdist-kp.git with all ACK lines added.
The 'for-marc' branch holds the current set of ACKed pending patches
for upstream.
The 'for-upstream-next' holds the rest of the patch-stack.
Carsten
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
The 'for-marc' branch holds the current set of ACKed pending patches for upstream. michael is working on device kit and is using the libuuid/libblkid patches with the virtual packages. at least for now. Yes, the empty .make 'virtual packet' stubs are not more than a hotfix. Ugly but working. It would be better to get rid of the make fragments, or at least get rid of the empty do-nothing rules. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
Carsten Schlote wrote: michael is working on device kit and is using the libuuid/libblkid patches with the virtual packages. at least for now. Yes, the empty .make 'virtual packet' stubs are not more than a hotfix. Ugly but working. It would be better to get rid of the make fragments, or at least get rid of the empty do-nothing rules. yeah, you can delete some rules, but I don't don't which. But Michael knows. I've some customer projects, so this week I think I don't have the time to improve the dependency generator. Cheers, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
