diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-01-06 14:38:19 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-04-11 11:18:16 +0200 |
| commit | b557637599b1ac3a8a5c08c04c06cc861a3f3071 (patch) | |
| tree | bc155be4d9c34c920751414c3411017fbc8ed236 /scripts | |
| parent | 6ab772149fe98fb93fb91444f96248e0bbee2078 (diff) | |
| download | ptxdist-b557637599b1ac3a8a5c08c04c06cc861a3f3071.tar.gz ptxdist-b557637599b1ac3a8a5c08c04c06cc861a3f3071.tar.xz | |
initial /usr merge implementation
Any files in /bin, /sbin and /lib are transparently installed in /usr.
This makes it possible to migrate each package individually.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/ptxd_make_xpkg_pkg.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh b/scripts/lib/ptxd_make_xpkg_pkg.sh index e874c0a16..37738e1cf 100644 --- a/scripts/lib/ptxd_make_xpkg_pkg.sh +++ b/scripts/lib/ptxd_make_xpkg_pkg.sh @@ -97,6 +97,7 @@ ptxd_install_setup() { local -a nfsroot_dirs case "${dst}" in + /bin/*|/sbin/*|/lib/*) dst="/usr${dst}" ;; /*|"") ;; *) ptxd_bailout "'dst' must be an absolute path!" ;; esac @@ -156,13 +157,13 @@ ptxd_install_setup_src_list() { export -f ptxd_install_setup_src_list ptxd_install_setup_src() { - ptxd_install_setup || return + local -a list if [ "${src}" = "-" -a -n "${dst}" ]; then src="${pkg_pkg_dir}${dst}" fi - local -a list + ptxd_install_setup || return ptxd_install_setup_src_list "${src}" |