From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from ptx.hi.pengutronix.de ([2001:6f8:1178:2:5054:ff:fec0:8e10] ident=Debian-exim) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1W1e9X-0007qR-Bn for ptxdist@pengutronix.de; Fri, 10 Jan 2014 16:37:43 +0100 Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1W1e9X-0003Df-A9 for ptxdist@pengutronix.de; Fri, 10 Jan 2014 16:37:43 +0100 Date: Fri, 10 Jan 2014 16:37:43 +0100 From: Michael Olbrich Message-ID: <20140110153743.GC20358@pengutronix.de> References: <201401080859.43988.jbe@pengutronix.de> <20140109090334.GI2156@pengutronix.de> <20140109160612.GA7098@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de On Thu, Jan 09, 2014 at 11:37:15AM -0500, Jon Ringle wrote: > 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 Hmmm, this is not so nice. How about making PTXCONF_SETUP_PTXMIRROR a list? Then you can add http://opensource/pool/ and your git server to the 'whitelist'. 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-5555 | -- ptxdist mailing list ptxdist@pengutronix.de