diff options
| -rw-r--r-- | platforms/image_ipkg.in | 9 | ||||
| -rw-r--r-- | rules/post/ptxd_make_world_common.make | 3 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_ipkg_finish.sh | 2 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_opkg_finish.sh | 2 | ||||
| -rwxr-xr-x | 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 8303f2537..dae4fe5b7 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 68950645d..14fce7eb6 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 01a2bdde8..686c18fcb 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 2485c247a..2505f2bcf 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 22a58e43a..0a645c37c 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/ |