janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

[projects|projs]-dirs.mk: Fix chroot pkg-install-prereq-build

Browse source 
Make pkg-install-prereq-build work in chroot environment.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-12-27 16:07:51 +00:00
commit 57711ab58d
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/projects-dir.mk
View file

@ -127,10 +127,10 @@ pkg-manager-refresh:
$(PKG_MANAGER_SH) refresh -y
pkg-install-prereq-build:
@$(PROJECTS_PY) requires-pkg --flavours "build" $(BUILD_PROJECTS) | xargs -r $(PKG_MANAGER_SH) install -y
$(PKG_MANAGER_SH) install -y $(shell $(PROJECTS_PY) requires-pkg --flavours "build" $(BUILD_PROJECTS))
pkg-install-prereq-release:
@$(PROJECTS_PY) requires-pkg --flavours "build run release" $(BUILD_PROJECTS) | xargs -r $(PKG_MANAGER_SH) install -y
$(PKG_MANAGER_SH) install -y $(shell $(PROJECTS_PY) requires-pkg --flavours "build run release" $(BUILD_PROJECTS))
pkg-exclude-built-today:
touch $(EXCLUDES_FILE)

8
scripts/pkg-manager.sh
View file

@ -51,14 +51,14 @@ cmd_install()
opts="--force-resolution --auto-agree-with-licenses"
global_opts="$global_opts --non-interactive --gpg-auto-import-keys --no-gpg-checks"
}
eval run sudo $env zypper $global_opts install $opts "$@"
eval run sudo $env -S zypper $global_opts install $opts "$@"
;;
debian)
[ "$non_interactive" = 1 ] && {
global_opts="$global_opts -yq"
env="$env DEBIAN_FRONTEND=noninteractive"
}
eval run sudo $env apt-get $global_opts install "$@"
eval run sudo $env -S apt-get $global_opts install "$@"
;;
*)
fatal "Tried to install on unsupported platform \"$ID\""
@ -87,10 +87,10 @@ cmd_refresh()
[ "$non_interactive" = 1 ] && {
global_opts="$global_opts --non-interactive --gpg-auto-import-keys --no-gpg-checks"
}
eval run sudo $env zypper $global_opts refresh $opts "$@"
eval run sudo $env -S zypper $global_opts refresh $opts "$@"
;;
debian)
eval run sudo $env apt-get $global_opts update "$@"
eval run sudo $env -S apt-get $global_opts update "$@"
;;
*)
fatal "Tried to update unsupported platform \"$ID\""