* [ptxdist] [PATCHv3] ptxdist getdev: Download dev packages from ${PTXCONF_PROJECT_DEVMIRROR}
@ 2014-01-24 16:53 jon
2014-01-24 16:53 ` [ptxdist] [PATCHv3] pv: version bump 1.1.4 -> 1.4.12 jon
2014-01-24 17:16 ` [ptxdist] [PATCHv3] ptxdist getdev: Download dev packages from ${PTXCONF_PROJECT_DEVMIRROR} Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: jon @ 2014-01-24 16:53 UTC (permalink / raw)
To: ptxdist; +Cc: Jon Ringle
From: Jon Ringle <jringle@gridpoint.com>
This patch allows you to setup a dev package mirror to hold *-dev.tar.gz
packages.
Upload your *-dev.tar.gz packages to your mirror, then you can avoid
rebuilding all your packages by doing:
ptxdist getdev
Signed-off-by: Jon Ringle <jringle@gridpoint.com>
---
bin/ptxdist | 5 +++++
rules/post/ptxd_make_world_get.make | 7 +++++++
rules/project-name.in | 9 +++++++++
scripts/lib/ptxd_lib_dgen.awk | 7 +++++++
scripts/lib/ptxd_make_get.sh | 15 ++++++++-------
5 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/bin/ptxdist b/bin/ptxdist
index f9cbdec..663c41e 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -1789,6 +1789,11 @@ EOF
fi
exit
;;
+ getdev)
+ check_premake &&
+ ptxd_make_log getdev
+ exit
+ ;;
go|images)
do_${cmd}
exit
diff --git a/rules/post/ptxd_make_world_get.make b/rules/post/ptxd_make_world_get.make
index 152674c..edbdde9 100644
--- a/rules/post/ptxd_make_world_get.make
+++ b/rules/post/ptxd_make_world_get.make
@@ -26,6 +26,9 @@ $(SRCDIR)/%:
@$(call targetinfo)
@$(call get, $($@))
+$(call remove_quotes, $(PTXCONF_PROJECT_DEVPKGDIR))/%:
+ @$(call targetinfo)
+ @$(call getdev, $@)
$(STATEDIR)/%.get:
@$(call targetinfo)
@@ -59,4 +62,8 @@ get = \
check_src = \
ptxd_make_check_src "$($(strip $(1))_SOURCE)" "$($(strip $(1))_MD5)"
+getdev = \
+ ptxd_make_get_nofail=y \
+ ptxd_make_get "$(strip $(1))" "$(call remove_quotes, $(PTXCONF_PROJECT_DEVMIRROR))/$(notdir $(1))"
+
# vim: syntax=make
diff --git a/rules/project-name.in b/rules/project-name.in
index f546458..d1cd09a 100644
--- a/rules/project-name.in
+++ b/rules/project-name.in
@@ -180,4 +180,13 @@ config PROJECT_DEVPKGDIR
depends on PROJECT_USE_DEVPKGS
default "/opt/OSELAS.BSP/${PTXCONF_PROJECT_VENDOR}/OSELAS.BSP-${PTXCONF_PROJECT_VENDOR}-${PTXCONF_PROJECT}${PTXCONF_PROJECT_VERSION}"
+config PROJECT_DEVMIRROR
+ string
+ prompt "Mirror for pre-build archives"
+ depends on PROJECT_USE_DEVPKGS
+ help
+ Enter a URL where *-dev.tar.gz packages can be downloaded
+ Use: ptxdist getdev
+
+
endmenu
diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk
index 7f790c9..6cd60e2 100644
--- a/scripts/lib/ptxd_lib_dgen.awk
+++ b/scripts/lib/ptxd_lib_dgen.awk
@@ -241,6 +241,13 @@ function write_deps_pkg_all(this_PKG, this_pkg) {
# .get rule
#
print "$(STATEDIR)/" this_pkg ".get: $(" this_PKG "_SOURCES)" > DGEN_DEPS_POST;
+ print "ifneq ($(call remove_quotes, $(PTXCONF_PROJECT_DEVMIRROR)),)" > DGEN_DEPS_POST;
+ print "ifneq ($($(" this_PKG "_DEVPKG)),NO)" > DGEN_DEPS_POST;
+ print "ifneq ($(" this_PKG "_CFGHASH),)" > DGEN_DEPS_POST;
+ print "getdev: $(call remove_quotes, $(PTXCONF_PROJECT_DEVPKGDIR))/$(" this_PKG "_DEVPKG)" > DGEN_DEPS_POST;
+ print "endif" > DGEN_DEPS_POST;
+ print "endif" > DGEN_DEPS_POST;
+ print "endif" > DGEN_DEPS_POST;
}
function write_deps_pkg_active(this_PKG, this_pkg, prefix) {
diff --git a/scripts/lib/ptxd_make_get.sh b/scripts/lib/ptxd_make_get.sh
index f4d7922..1ce913f 100644
--- a/scripts/lib/ptxd_make_get.sh
+++ b/scripts/lib/ptxd_make_get.sh
@@ -285,7 +285,7 @@ ptxd_make_get() {
argv[${#argv[@]}]="${url}"
mrd=true
;;
- ${PTXCONF_SETUP_PTXMIRROR}/*)
+ ${PTXCONF_SETUP_PTXMIRROR}/*|${PTXCONF_PROJECT_DEVMIRROR}/*)
# if mirror is given us to download, add it, but only once
if ! ${mrd}; then
argv[${#argv[@]}]="${url}"
@@ -397,11 +397,12 @@ ptxd_make_get() {
esac
done
- echo
- echo "Could not download package"
- echo "URL: ${orig_argv[@]}"
- echo
- exit 1
+ if [ "${ptxd_make_get_nofail}" != "y" ]; then
+ echo
+ echo "Could not download package"
+ echo "URL: ${orig_argv[@]}"
+ echo
+ exit 1
+ fi
}
-
export -f ptxd_make_get
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread* [ptxdist] [PATCHv3] pv: version bump 1.1.4 -> 1.4.12
2014-01-24 16:53 [ptxdist] [PATCHv3] ptxdist getdev: Download dev packages from ${PTXCONF_PROJECT_DEVMIRROR} jon
@ 2014-01-24 16:53 ` jon
2014-01-24 17:17 ` Michael Olbrich
2014-01-24 17:16 ` [ptxdist] [PATCHv3] ptxdist getdev: Download dev packages from ${PTXCONF_PROJECT_DEVMIRROR} Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: jon @ 2014-01-24 16:53 UTC (permalink / raw)
To: ptxdist; +Cc: Jon Ringle
From: Jon Ringle <jringle@gridpoint.com>
also fixed URL
Signed-off-by: Jon Ringle <jringle@gridpoint.com>
---
rules/pv.make | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/rules/pv.make b/rules/pv.make
index 2ce0755..7cab824 100644
--- a/rules/pv.make
+++ b/rules/pv.make
@@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_PV) += pv
#
# Paths and names
#
-PV_VERSION := 1.1.4
-PV_MD5 := 63033e090d61a040407bfd043aeb6d27
+PV_VERSION := 1.4.12
+PV_MD5 := 605adc0f369496bca92b0656cf86b25e
PV := pv-$(PV_VERSION)
PV_SUFFIX := tar.bz2
-PV_URL := http://pipeviewer.googlecode.com/files/$(PV).$(PV_SUFFIX)
+PV_URL := http://www.ivarch.com/programs/sources/$(PV).$(PV_SUFFIX)
PV_SOURCE := $(SRCDIR)/$(PV).$(PV_SUFFIX)
PV_DIR := $(BUILDDIR)/$(PV)
@@ -38,6 +38,9 @@ PV_MAKEVARS := $(CROSS_ENV_LD)
PV_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
--disable-nls \
+ --disable-splice \
+ --disable-ipc \
+ --$(call ptx/endis, PTXCONF_GLOBAL_LARGE_FILE)-lfs \
--enable-debugging
# ----------------------------------------------------------------------------
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [ptxdist] [PATCHv3] pv: version bump 1.1.4 -> 1.4.12
2014-01-24 16:53 ` [ptxdist] [PATCHv3] pv: version bump 1.1.4 -> 1.4.12 jon
@ 2014-01-24 17:17 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2014-01-24 17:17 UTC (permalink / raw)
To: ptxdist
On Fri, Jan 24, 2014 at 11:53:04AM -0500, jon@ringle.org wrote:
> From: Jon Ringle <jringle@gridpoint.com>
>
> also fixed URL
>
Thanks, applied this one.
Michael
> Signed-off-by: Jon Ringle <jringle@gridpoint.com>
> ---
> rules/pv.make | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/rules/pv.make b/rules/pv.make
> index 2ce0755..7cab824 100644
> --- a/rules/pv.make
> +++ b/rules/pv.make
> @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_PV) += pv
> #
> # Paths and names
> #
> -PV_VERSION := 1.1.4
> -PV_MD5 := 63033e090d61a040407bfd043aeb6d27
> +PV_VERSION := 1.4.12
> +PV_MD5 := 605adc0f369496bca92b0656cf86b25e
> PV := pv-$(PV_VERSION)
> PV_SUFFIX := tar.bz2
> -PV_URL := http://pipeviewer.googlecode.com/files/$(PV).$(PV_SUFFIX)
> +PV_URL := http://www.ivarch.com/programs/sources/$(PV).$(PV_SUFFIX)
> PV_SOURCE := $(SRCDIR)/$(PV).$(PV_SUFFIX)
> PV_DIR := $(BUILDDIR)/$(PV)
>
> @@ -38,6 +38,9 @@ PV_MAKEVARS := $(CROSS_ENV_LD)
> PV_AUTOCONF := \
> $(CROSS_AUTOCONF_USR) \
> --disable-nls \
> + --disable-splice \
> + --disable-ipc \
> + --$(call ptx/endis, PTXCONF_GLOBAL_LARGE_FILE)-lfs \
> --enable-debugging
>
> # ----------------------------------------------------------------------------
> --
> 1.7.10.4
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [PATCHv3] ptxdist getdev: Download dev packages from ${PTXCONF_PROJECT_DEVMIRROR}
2014-01-24 16:53 [ptxdist] [PATCHv3] ptxdist getdev: Download dev packages from ${PTXCONF_PROJECT_DEVMIRROR} jon
2014-01-24 16:53 ` [ptxdist] [PATCHv3] pv: version bump 1.1.4 -> 1.4.12 jon
@ 2014-01-24 17:16 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2014-01-24 17:16 UTC (permalink / raw)
To: ptxdist
On Fri, Jan 24, 2014 at 11:53:03AM -0500, jon@ringle.org wrote:
> From: Jon Ringle <jringle@gridpoint.com>
>
> This patch allows you to setup a dev package mirror to hold *-dev.tar.gz
> packages.
>
> Upload your *-dev.tar.gz packages to your mirror, then you can avoid
> rebuilding all your packages by doing:
>
> ptxdist getdev
>
> Signed-off-by: Jon Ringle <jringle@gridpoint.com>
> ---
> bin/ptxdist | 5 +++++
> rules/post/ptxd_make_world_get.make | 7 +++++++
> rules/project-name.in | 9 +++++++++
> scripts/lib/ptxd_lib_dgen.awk | 7 +++++++
> scripts/lib/ptxd_make_get.sh | 15 ++++++++-------
> 5 files changed, 36 insertions(+), 7 deletions(-)
>
> diff --git a/bin/ptxdist b/bin/ptxdist
> index f9cbdec..663c41e 100755
> --- a/bin/ptxdist
> +++ b/bin/ptxdist
> @@ -1789,6 +1789,11 @@ EOF
> fi
> exit
> ;;
> + getdev)
> + check_premake &&
> + ptxd_make_log getdev
> + exit
> + ;;
> go|images)
> do_${cmd}
> exit
> diff --git a/rules/post/ptxd_make_world_get.make b/rules/post/ptxd_make_world_get.make
> index 152674c..edbdde9 100644
> --- a/rules/post/ptxd_make_world_get.make
> +++ b/rules/post/ptxd_make_world_get.make
> @@ -26,6 +26,9 @@ $(SRCDIR)/%:
> @$(call targetinfo)
> @$(call get, $($@))
>
> +$(call remove_quotes, $(PTXCONF_PROJECT_DEVPKGDIR))/%:
> + @$(call targetinfo)
> + @$(call getdev, $@)
You forgot to change this. Please check my other mails.
Michael
>
> $(STATEDIR)/%.get:
> @$(call targetinfo)
> @@ -59,4 +62,8 @@ get = \
> check_src = \
> ptxd_make_check_src "$($(strip $(1))_SOURCE)" "$($(strip $(1))_MD5)"
>
> +getdev = \
> + ptxd_make_get_nofail=y \
> + ptxd_make_get "$(strip $(1))" "$(call remove_quotes, $(PTXCONF_PROJECT_DEVMIRROR))/$(notdir $(1))"
> +
> # vim: syntax=make
> diff --git a/rules/project-name.in b/rules/project-name.in
> index f546458..d1cd09a 100644
> --- a/rules/project-name.in
> +++ b/rules/project-name.in
> @@ -180,4 +180,13 @@ config PROJECT_DEVPKGDIR
> depends on PROJECT_USE_DEVPKGS
> default "/opt/OSELAS.BSP/${PTXCONF_PROJECT_VENDOR}/OSELAS.BSP-${PTXCONF_PROJECT_VENDOR}-${PTXCONF_PROJECT}${PTXCONF_PROJECT_VERSION}"
>
> +config PROJECT_DEVMIRROR
> + string
> + prompt "Mirror for pre-build archives"
> + depends on PROJECT_USE_DEVPKGS
> + help
> + Enter a URL where *-dev.tar.gz packages can be downloaded
> + Use: ptxdist getdev
> +
> +
> endmenu
> diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk
> index 7f790c9..6cd60e2 100644
> --- a/scripts/lib/ptxd_lib_dgen.awk
> +++ b/scripts/lib/ptxd_lib_dgen.awk
> @@ -241,6 +241,13 @@ function write_deps_pkg_all(this_PKG, this_pkg) {
> # .get rule
> #
> print "$(STATEDIR)/" this_pkg ".get: $(" this_PKG "_SOURCES)" > DGEN_DEPS_POST;
> + print "ifneq ($(call remove_quotes, $(PTXCONF_PROJECT_DEVMIRROR)),)" > DGEN_DEPS_POST;
> + print "ifneq ($($(" this_PKG "_DEVPKG)),NO)" > DGEN_DEPS_POST;
> + print "ifneq ($(" this_PKG "_CFGHASH),)" > DGEN_DEPS_POST;
> + print "getdev: $(call remove_quotes, $(PTXCONF_PROJECT_DEVPKGDIR))/$(" this_PKG "_DEVPKG)" > DGEN_DEPS_POST;
> + print "endif" > DGEN_DEPS_POST;
> + print "endif" > DGEN_DEPS_POST;
> + print "endif" > DGEN_DEPS_POST;
> }
>
> function write_deps_pkg_active(this_PKG, this_pkg, prefix) {
> diff --git a/scripts/lib/ptxd_make_get.sh b/scripts/lib/ptxd_make_get.sh
> index f4d7922..1ce913f 100644
> --- a/scripts/lib/ptxd_make_get.sh
> +++ b/scripts/lib/ptxd_make_get.sh
> @@ -285,7 +285,7 @@ ptxd_make_get() {
> argv[${#argv[@]}]="${url}"
> mrd=true
> ;;
> - ${PTXCONF_SETUP_PTXMIRROR}/*)
> + ${PTXCONF_SETUP_PTXMIRROR}/*|${PTXCONF_PROJECT_DEVMIRROR}/*)
> # if mirror is given us to download, add it, but only once
> if ! ${mrd}; then
> argv[${#argv[@]}]="${url}"
> @@ -397,11 +397,12 @@ ptxd_make_get() {
> esac
> done
>
> - echo
> - echo "Could not download package"
> - echo "URL: ${orig_argv[@]}"
> - echo
> - exit 1
> + if [ "${ptxd_make_get_nofail}" != "y" ]; then
> + echo
> + echo "Could not download package"
> + echo "URL: ${orig_argv[@]}"
> + echo
> + exit 1
> + fi
> }
> -
> export -f ptxd_make_get
> --
> 1.7.10.4
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-01-24 17:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-24 16:53 [ptxdist] [PATCHv3] ptxdist getdev: Download dev packages from ${PTXCONF_PROJECT_DEVMIRROR} jon
2014-01-24 16:53 ` [ptxdist] [PATCHv3] pv: version bump 1.1.4 -> 1.4.12 jon
2014-01-24 17:17 ` Michael Olbrich
2014-01-24 17:16 ` [ptxdist] [PATCHv3] ptxdist getdev: Download dev packages from ${PTXCONF_PROJECT_DEVMIRROR} Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox