From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-la0-x22a.google.com ([2a00:1450:4010:c03::22a]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1W1Ibj-0000Cu-AD for ptxdist@pengutronix.de; Thu, 09 Jan 2014 17:37:24 +0100 Received: by mail-la0-f42.google.com with SMTP id ec20so2358263lab.29 for ; Thu, 09 Jan 2014 08:37:15 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <20140109160612.GA7098@pengutronix.de> References: <201401080859.43988.jbe@pengutronix.de> <20140109090334.GI2156@pengutronix.de> <20140109160612.GA7098@pengutronix.de> Date: Thu, 9 Jan 2014 11:37:15 -0500 Message-ID: From: Jon Ringle Subject: Re: [ptxdist] git ptxdist best practices Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============1324914716==" Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de --===============1324914716== Content-Type: multipart/alternative; boundary=089e01494164e39e4b04ef8c38a9 --089e01494164e39e4b04ef8c38a9 Content-Type: text/plain; charset=ISO-8859-1 On Thu, Jan 9, 2014 at 11:06 AM, Michael Olbrich wrote: > On Thu, Jan 09, 2014 at 10:23:58AM -0500, Jon Ringle wrote:> One issue > that I ran across with this is that I have: > > PTXCONF_SETUP_PTXMIRROR_ONLY=y > > PTXCONF_SETUP_PTXMIRROR="http://opensource/pool/" > > > > Where opensource is an internal server that keeps all tar balls used to > > build. I'm paranoid that someday a upstream tar ball won't be available > and > > would cause a build break if someone tried to build and they didn't have > > that tar ball in ${PTXCONF_SETUP_SRCDIR} > > > > But for my purposes, if I wanted to use the git URL in a rule file I'd > want > > it to use the URL as is. But it rewrites it trying to use > > ${PTXCONF_SETUP_PTXMIRROR} instead in scripts/lib/ptxd_make_get.sh:295 > > > > Is there away to work around this? > > put your git repositories in the mirror: > FOO_URL := http://opensource/pool/foo.git;tag=bar > > Unfortunately, I can't do that. The opensource server is under IT control and they've locked it down so that I can only write to it using scp or sftp and have no ssh shell access to it. The mechanism whitelists any URL starting with ${PTXCONF_SETUP_PTXMIRROR} > Would the following approach work: 1. In ptxdist/rules/post/ptxd_make_world_common.make add to world/env/impl: pkg_url_safe="$(call ptx/escape,$($(1)_URL_SAFE))" 2. In ptxdist/scripts/lib/ptxd_make_get.sh function ptxd_make_get change all occurances of: if [ -z "${PTXCONF_SETUP_PTXMIRROR_ONLY}" ]; then with something like: if [ -z "${PTXCONF_SETUP_PTXMIRROR_ONLY}" -o -n "${pkg_url_safe}" ]; then Then in the rule file you can do: FOO_URL_SAFE := y So that you can whitelist a specific URL if PTXCONF_SETUP_PTXMIRROR_ONLY is set --089e01494164e39e4b04ef8c38a9 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
On T= hu, Jan 9, 2014 at 11:06 AM, Michael Olbrich <m.olbrich@pengutroni= x.de> wrote:
On Thu,= Jan 09, 2014 at 10:23:58AM -0500, Jon Ringle wrote:> One issue that I r= an across with this is that I have:
> PTXCONF_SETUP_PTXMIRROR_ONLY=3Dy
> PTXCONF_SETUP_PTXMIRROR=3D"http://opensource/pool/"
>
> Where opensource is an internal server that keeps all tar balls used t= o
> build. I'm paranoid that someday a upstream tar ball won't be = available and
> would cause a build break if someone tried to build and they didn'= t have
> that tar ball in ${PTXCONF_SETUP_SRCDIR}
>
> But for my purposes, if I wanted to use the git URL in a rule file I&#= 39;d want
> it to use the URL as is. But it rewrites it trying to use
> ${PTXCONF_SETUP_PTXMIRROR} instead in scripts/lib/ptxd_make_get.sh:295=
>
> Is there away to work around this?

put your git repositories in the mirror:
FOO_URL :=3D http://opensource/pool/foo.git;tag=3Dbar

Unfortunately, I can't do that. The opensource se= rver is under IT control and they've locked it down so that I can only = write to it using scp or sftp and have no ssh shell access to it.

The mechanism whitelists any URL starting with ${PTXCONF_SETUP_PTXMIRROR}

Would the following approach work:
1. In ptxdist/rules/post/ptxd_make_world_common.make add to wo= rld/env/impl:
=A0=A0=A0 pkg_url_safe=3D"$(call ptx/escape,$($(1)_URL_SAFE= ))"

2. In ptxdist/scripts/lib/ptxd_make_get.sh funct= ion ptxd_make_get
change all occurances of:
=A0=A0=A0 if [= -z "${PTXCONF_SETUP_PTXMIRROR_ONLY}" ]; then
with something like:
=A0=A0=A0 if [ -z "${PTXCONF_SETUP_= PTXMIRROR_ONLY}" -o -n "${pkg_url_safe}" ]; then

Then in the rule file you can do:
FOO_URL_SAFE :=3D y<= br>
So that you can whitelist a specific URL if PTXCONF_SETUP_PTXMIR= ROR_ONLY is set


--089e01494164e39e4b04ef8c38a9-- --===============1324914716== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline -- ptxdist mailing list ptxdist@pengutronix.de --===============1324914716==--