From: Marc Kleine-Budde <mkl@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [ptxdist] [PATCH] image: ipkg, opkg: use symbol IMAGE_XPKG_EXTRA_ARGS to pass extra arguments to ipkg and opkg build
Date: Thu, 2 Jul 2015 10:05:34 +0200 [thread overview]
Message-ID: <1435824334-5004-1-git-send-email-mkl@pengutronix.de> (raw)
Originally the symbols IMAGE_IPKG_EXTRA_ARGS, IMAGE_OPKG_EXTRA_ARGS were used
in the code, but there only was the config entry for the ipkg symbol in
Kconfig.
This patch converts the IMAGE_IPKG_EXTRA_ARGS to IMAGE_XPKG_EXTRA_ARGS and uses
it during ipkg and opkg build.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
platforms/image_ipkg.in | 9 +++++----
rules/post/ptxd_make_world_common.make | 3 +--
scripts/lib/ptxd_make_ipkg_finish.sh | 2 +-
scripts/lib/ptxd_make_opkg_finish.sh | 2 +-
scripts/migrate/migrate_platform | 8 ++++++++
5 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/platforms/image_ipkg.in b/platforms/image_ipkg.in
index 8303f2537536..dae4fe5b7646 100644
--- a/platforms/image_ipkg.in
+++ b/platforms/image_ipkg.in
@@ -70,11 +70,12 @@ config IMAGE_IPKG_INDEX
server it allows ipkg on your target to access your ipkg and
install or update them.
-config IMAGE_IPKG_EXTRA_ARGS
+config IMAGE_XPKG_EXTRA_ARGS
string
- prompt "extra arguments passed to ipkg-build"
+ prompt "extra arguments passed to ipkg-build/opkg-build"
help
- If needed you can add extra arguments for ipkg-build here
- (e.g. -c if you want ipkg-build to use tar instead of ar.)
+ If needed you can add extra arguments for
+ ipkg-build/opkg-build here (e.g. -c if you want ipkg-build
+ to use tar instead of ar.)
endmenu
diff --git a/rules/post/ptxd_make_world_common.make b/rules/post/ptxd_make_world_common.make
index 68950645df46..14fce7eb61d7 100644
--- a/rules/post/ptxd_make_world_common.make
+++ b/rules/post/ptxd_make_world_common.make
@@ -54,8 +54,7 @@ ptx/env = \
ptx_python3_host="$(call ptx/escape,$(HOSTPYTHON3))" \
ptx_install_opt_python_host="$(call ptx/escape,$(HOST_PYTHON_INSTALL))" \
\
- ptx_ipkg_extra_args=$(PTXCONF_IMAGE_IPKG_EXTRA_ARGS) \
- ptx_opkg_extra_args=$(PTXCONF_IMAGE_OPKG_EXTRA_ARGS) \
+ ptx_xpkg_extra_args=$(PTXCONF_IMAGE_XPKG_EXTRA_ARGS) \
ptx_xpkg_type=$(PTXCONF_HOST_PACKAGE_MANAGEMENT)
world/env/impl = \
diff --git a/scripts/lib/ptxd_make_ipkg_finish.sh b/scripts/lib/ptxd_make_ipkg_finish.sh
index 01a2bdde80a3..686c18fcb454 100644
--- a/scripts/lib/ptxd_make_ipkg_finish.sh
+++ b/scripts/lib/ptxd_make_ipkg_finish.sh
@@ -16,7 +16,7 @@
ptxd_make_ipkg_finish_impl() {
chown -R 0:0 "${pkg_xpkg_tmp}" &&
ptxd_make_xpkg_pkg "${pkg_ipkg_tmp}" "${pkg_xpkg_cmds}" "${pkg_xpkg_perms}" &&
- ipkg-build ${ptx_ipkg_extra_args} "${pkg_ipkg_tmp}" "${ptx_pkg_dir}"
+ ipkg-build ${ptx_xpkg_extra_args} "${pkg_ipkg_tmp}" "${ptx_pkg_dir}"
}
export -f ptxd_make_ipkg_finish_impl
diff --git a/scripts/lib/ptxd_make_opkg_finish.sh b/scripts/lib/ptxd_make_opkg_finish.sh
index 2485c247a486..2505f2bcf5d3 100644
--- a/scripts/lib/ptxd_make_opkg_finish.sh
+++ b/scripts/lib/ptxd_make_opkg_finish.sh
@@ -16,7 +16,7 @@
ptxd_make_opkg_finish_impl() {
chown -R 0:0 "${pkg_xpkg_tmp}" &&
ptxd_make_xpkg_pkg "${pkg_opkg_tmp}" "${pkg_xpkg_cmds}" "${pkg_xpkg_perms}" &&
- opkg-build ${ptx_opkg_extra_args} "${pkg_opkg_tmp}" "${ptx_pkg_dir}"
+ opkg-build ${ptx_xpkg_extra_args} "${pkg_opkg_tmp}" "${ptx_pkg_dir}"
}
export -f ptxd_make_opkg_finish_impl
diff --git a/scripts/migrate/migrate_platform b/scripts/migrate/migrate_platform
index 22a58e43a7d1..0a645c37c19a 100755
--- a/scripts/migrate/migrate_platform
+++ b/scripts/migrate/migrate_platform
@@ -17,3 +17,11 @@ s/^\(\(# \)\?PTXCONF\)_COMPILER_PREFIX_UBOOT\(.*$\)/\1_COMPILER_PREFIX_BOOTLOADE
#
s/^\(\(# \)\?PTXCONF\)_IMAGE_UBI_VOLUME_SIZE\(.*$\)/\1_IMAGE_UBI_ROOT_VOL_SIZE\3/
s/^\(\(# \)\?PTXCONF\)_IMAGE_UBIFS_MAX_LEB_COUNT\(.*$\)/\1_IMAGE_UBIFS_ROOT_MAX_LEB_COUNT\3/
+
+#
+# from : ptxdist-2015.06.0
+# to : ptxdist-2015.07.0
+# symbol : IMAGE_IPKG_EXTRA_ARGS -> IMAGE_XPKG_EXTRA_ARGS
+# reason : use same symbol for ipkg and opkb build
+#
+s/^\(\(# \)\?PTXCONF\)_IMAGE_IPKG_EXTRA_ARGS\(.*$\)/\1_IMAGE_XPKG_EXTRA_ARGS\3/
--
2.1.4
--
ptxdist mailing list
ptxdist@pengutronix.de
reply other threads:[~2015-07-02 8:05 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1435824334-5004-1-git-send-email-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox