diff options
| -rw-r--r-- | platforms/hosttools.in | 2 | ||||
| -rw-r--r-- | rules/host-bzip2.in (renamed from rules/host-libbz2.in) | 3 | ||||
| -rw-r--r-- | rules/host-bzip2.make | 22 | ||||
| -rw-r--r-- | rules/host-cdrkit.in | 2 | ||||
| -rw-r--r-- | rules/host-libbz2.make | 34 | ||||
| -rwxr-xr-x | scripts/migrate/migrate_ptx | 8 |
6 files changed, 33 insertions, 38 deletions
diff --git a/platforms/hosttools.in b/platforms/hosttools.in index b2ac00e9d..ac508c8a9 100644 --- a/platforms/hosttools.in +++ b/platforms/hosttools.in @@ -1,4 +1,5 @@ source "rules/cross-nasm.in" +source "rules/host-bzip2.in" source "rules/host-cdrkit.in" source "rules/host-cmake.in" source "rules/host-cramfs.in" @@ -9,7 +10,6 @@ source "rules/host-genimage.in" source "rules/host-genpart.in" source "rules/host-gettext.in" source "rules/host-libblkid.in" -source "rules/host-libbz2.in" source "rules/host-libcap.in" source "rules/host-libconfuse.in" source "rules/host-libiconv.in" diff --git a/rules/host-libbz2.in b/rules/host-bzip2.in index 148bc82c1..3760cfcde 100644 --- a/rules/host-libbz2.in +++ b/rules/host-bzip2.in @@ -1,6 +1,5 @@ ## SECTION=hosttools_noprompt -config HOST_LIBBZ2 +config HOST_BZIP2 tristate default ALLYES - diff --git a/rules/host-bzip2.make b/rules/host-bzip2.make new file mode 100644 index 000000000..89e651331 --- /dev/null +++ b/rules/host-bzip2.make @@ -0,0 +1,22 @@ +# -*-makefile-*- +# +# Copyright (C) 2013 by Marc Kleine-Budde <mkl@pengutronix.de> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_BZIP2) += host-bzip2 + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +HOST_BZIP2_INSTALL_OPT := install PREFIX= + +# vim: syntax=make diff --git a/rules/host-cdrkit.in b/rules/host-cdrkit.in index bab11fea9..d1c83e528 100644 --- a/rules/host-cdrkit.in +++ b/rules/host-cdrkit.in @@ -3,7 +3,7 @@ config HOST_CDRKIT tristate select HOST_CMAKE - select HOST_LIBBZ2 + select HOST_BZIP2 select HOST_LIBCAP select HOST_ZLIB default ALLYES diff --git a/rules/host-libbz2.make b/rules/host-libbz2.make deleted file mode 100644 index 2a6b80b89..000000000 --- a/rules/host-libbz2.make +++ /dev/null @@ -1,34 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2007 by Robert Schwebel -# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de> -# -# See CREDITS for details about who has contributed to this project. -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -HOST_PACKAGES-$(PTXCONF_HOST_LIBBZ2) += host-libbz2 - -# -# Paths and names -# -HOST_LIBBZ2_VERSION := 1.0.4 -HOST_LIBBZ2_MD5 := fc310b254f6ba5fbb5da018f04533688 -HOST_LIBBZ2 := bzip2-$(HOST_LIBBZ2_VERSION) -HOST_LIBBZ2_SUFFIX := tar.gz -HOST_LIBBZ2_URL := http://www.bzip.org/1.0.4/$(HOST_LIBBZ2).$(HOST_LIBBZ2_SUFFIX) -HOST_LIBBZ2_SOURCE := $(SRCDIR)/$(HOST_LIBBZ2).$(HOST_LIBBZ2_SUFFIX) -HOST_LIBBZ2_DIR := $(HOST_BUILDDIR)/$(HOST_LIBBZ2) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -HOST_LIBBZ2_INSTALL_OPT := install PREFIX=$(HOST_LIBBZ2_PKGDIR) - -# vim: syntax=make diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx index 47f324b83..85d4edb97 100755 --- a/scripts/migrate/migrate_ptx +++ b/scripts/migrate/migrate_ptx @@ -195,3 +195,11 @@ s/^\(\(# \)\?PTXCONF_GSTREAMER_\)_\(.*$\)/\1\3/ # reason : cleanup # s/^\(\(# \)\?PTXCONF_\)GLIBC\(_LOCALTIME\)/\1TIMEZONE\3/ + +# +# from : ptxdist-2013.01.0 +# to : ptxdist-2013.02.0 +# symbol : HOST_LIBBZ2 -> HOST_BZIP2 +# reason : allign with target package name +# +s/^\(\(# \)\?PTXCONF_HOST\)_LIBBZ2/\1_BZIP2/ |