diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-07-15 17:55:38 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-07-15 17:55:38 (EDT) |
| commit | fbde88227aeafaba237e9358e5aa5805baaec5f7 (patch) | |
| tree | 1fa3650205fb6f1c751bbfd04a267543f75cb826 | |
| parent | 987bfa4392a9e8b988d0a7d21a9a309d6e606c45 (diff) | |
src/3/*: Support unversioned build-time packages
| -rw-r--r-- | src/3/build.mk | 15 | ||||
| -rw-r--r-- | src/3/ppt-mkpkgs | 8 |
2 files changed, 10 insertions, 13 deletions
diff --git a/src/3/build.mk b/src/3/build.mk index 7f20ec0..0e42254 100644 --- a/src/3/build.mk +++ b/src/3/build.mk @@ -8,16 +8,11 @@ nop build: install-build: set -e; \ - for pkg in src/build/*/; do \ - pkg="$${pkg#src/build/}"; \ - pkg="$${pkg%/}"; \ - for ver in "src/build/$${pkg}/"*/; do \ - ver="$${ver#src/build/$${pkg}/}"; \ - ver="$${ver%/}"; \ - mkdir -p "$(ppt_platconf_dir)"; \ - cp -p "src/build/$${pkg}/$${ver}/"* \ - "$(ppt_platconf_dir)"; \ - done; \ + for pkg_ver in src/build/*/; do \ + pkg_ver="$${pkg#src/build/}"; \ + pkg_ver="$${pkg_ver%/}"; \ + mkdir -p "$(ppt_platconf_dir)"; \ + cp -p "src/build/$${pkg_ver}/"* "$(ppt_platconf_dir)"; \ done install-run: diff --git a/src/3/ppt-mkpkgs b/src/3/ppt-mkpkgs index 4bd49b1..9594aea 100644 --- a/src/3/ppt-mkpkgs +++ b/src/3/ppt-mkpkgs @@ -43,12 +43,14 @@ make_base_pkg() make_build_time_pkgs() { + local pkg_ver= local pkg= # Make each config-*-* package. - for pkg in src/build/*; do - [ -d "${pkg}" ] || continue - pkg="${pkg#src/build/}" + for pkg_ver in src/build/*; do + [ -d "${pkg_ver}" ] || continue + pkg_ver="${pkg_ver#src/build/}" + pkg="${pkg_ver%_*}" mkdir -p "config-${pkg}-${PLAT}.pkg" cat >"config-${pkg}-${PLAT}.pkg/control" <<-EOF Architecture: all |