From 89c67dcbcd7fbb84ab8f051a0555724f71f33a1d Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 20 Oct 2011 17:06:17 +0200 Subject: [PATCH] [bin] update entropy server tools syntax to work with the new eit app --- bin/bump_ati_drivers | 2 +- bin/bump_injected_ati_drivers | 4 ++-- bin/bump_injected_kernel_mods | 2 +- bin/bump_injected_nvidia_drivers | 4 ++-- bin/bump_kernel_tag_mods | 2 +- bin/bump_kernel_tag_mods_inject | 2 +- bin/bump_kernel_video_drivers | 2 +- bin/bump_nvidia_drivers | 2 +- bin/bump_vbox | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bin/bump_ati_drivers b/bin/bump_ati_drivers index e6b380a..fc85cb0 100755 --- a/bin/bump_ati_drivers +++ b/bin/bump_ati_drivers @@ -17,7 +17,7 @@ for kernel in $kernels; do KERNEL_DIR="/usr/src/linux-${kernel}" emerge -B ${packages} || ( echo "ouch unable to build" && exit 1 ) built_pkgs=$(find /usr/portage/packages -name "*.tbz2" | xargs echo) [[ -z "${built_pkgs}" ]] && echo "ouch no kernel pkgs" && exit 2 - eit fit ${built_pkgs} || ( echo "ouch unable to inject" && exit 3 ) + eit inject ${built_pkgs} || ( echo "ouch unable to inject" && exit 3 ) done echo "Now you should remove old packages..." diff --git a/bin/bump_injected_ati_drivers b/bin/bump_injected_ati_drivers index 358096a..8b8fdd8 100755 --- a/bin/bump_injected_ati_drivers +++ b/bin/bump_injected_ati_drivers @@ -7,13 +7,13 @@ ETP_REPO="${ETP_REPO:-sabayon-limbo}" rm -rf /usr/portage/packages/x11-drivers/* emerge -B ${non_injected_packages} || exit 1 -reagent inject /usr/portage/packages/x11-drivers/* || exit 1 +eit inject --to ${ETP_REPO} /usr/portage/packages/x11-drivers/* || exit 1 for kernel in $kernels; do mypackages="${packages}" # build for latest kernel rm -rf /usr/portage/packages/x11-drivers/* KERNEL_DIR="/usr/src/linux-${kernel}" emerge -B ${mypackages} || exit 1 - reagent inject /usr/portage/packages/x11-drivers/* + eit inject --to ${ETP_REPO} /usr/portage/packages/x11-drivers/* echo done diff --git a/bin/bump_injected_kernel_mods b/bin/bump_injected_kernel_mods index 127a284..92cdd67 100755 --- a/bin/bump_injected_kernel_mods +++ b/bin/bump_injected_kernel_mods @@ -36,6 +36,6 @@ KERNEL_DIR="/usr/src/linux-${kernel}" emerge -Bav ${packages} if [ "${?}" != "0" ]; then exit 1 fi -reagent inject $(find /usr/portage/packages -name "*.tbz2" | xargs echo) +eit inject --to ${ETP_REPO} $(find /usr/portage/packages -name "*.tbz2" | xargs echo) echo "Now you should remove old packages, if you want of course" diff --git a/bin/bump_injected_nvidia_drivers b/bin/bump_injected_nvidia_drivers index e3564ad..dd63cd9 100755 --- a/bin/bump_injected_nvidia_drivers +++ b/bin/bump_injected_nvidia_drivers @@ -7,13 +7,13 @@ ETP_REPO="${ETP_REPO:-sabayon-limbo}" rm -rf /usr/portage/packages/x11-drivers/* emerge -B ${non_injected_packages} || exit 1 -reagent inject /usr/portage/packages/x11-drivers/* || exit 1 +eit inject --to ${ETP_REPO} /usr/portage/packages/x11-drivers/* || exit 1 for kernel in $kernels; do mypackages="${packages}" # build for latest kernel rm -rf /usr/portage/packages/x11-drivers/* KERNEL_DIR="/usr/src/linux-${kernel}" emerge -B ${mypackages} || exit 1 - reagent inject /usr/portage/packages/x11-drivers/* + eit inject --to ${ETP_REPO} /usr/portage/packages/x11-drivers/* echo done diff --git a/bin/bump_kernel_tag_mods b/bin/bump_kernel_tag_mods index cec2d47..33f9a21 100755 --- a/bin/bump_kernel_tag_mods +++ b/bin/bump_kernel_tag_mods @@ -84,7 +84,7 @@ if injected_atoms: if tbz2s: os.environ['ETP_REPO'] = dest_repo - rc = subprocess.call(["eit", "fit"] + tbz2s) + rc = subprocess.call(["eit", "inject"] + tbz2s) if rc != 0: raise SystemExit(rc) diff --git a/bin/bump_kernel_tag_mods_inject b/bin/bump_kernel_tag_mods_inject index 5dac0fb..0575b2b 100755 --- a/bin/bump_kernel_tag_mods_inject +++ b/bin/bump_kernel_tag_mods_inject @@ -56,7 +56,7 @@ for category in os.listdir(tmp_dir): if tbz2s: os.environ['ETP_REPO'] = dest_repo - rc = subprocess.call(["eit", "fit"] + tbz2s) + rc = subprocess.call(["eit", "inject"] + tbz2s) if rc != 0: raise SystemExit(rc) diff --git a/bin/bump_kernel_video_drivers b/bin/bump_kernel_video_drivers index 81c3142..ef15a4e 100755 --- a/bin/bump_kernel_video_drivers +++ b/bin/bump_kernel_video_drivers @@ -20,7 +20,7 @@ for kernel in $kernels; do # build for latest kernel rm -rf /usr/portage/packages/x11-drivers/* KERNEL_DIR="/usr/src/linux-${kernel}" emerge -B ${mypackages} || exit 1 - eit fit /usr/portage/packages/x11-drivers/* + eit inject --to ${ETP_REPO} /usr/portage/packages/x11-drivers/* echo done diff --git a/bin/bump_nvidia_drivers b/bin/bump_nvidia_drivers index ad911f1..64c4a37 100755 --- a/bin/bump_nvidia_drivers +++ b/bin/bump_nvidia_drivers @@ -17,7 +17,7 @@ for kernel in $kernels; do KERNEL_DIR="/usr/src/linux-${kernel}" emerge -B ${packages} || ( echo "ouch unable to build" && exit 1 ) built_pkgs=$(find /usr/portage/packages -name "*.tbz2" | xargs echo) [[ -z "${built_pkgs}" ]] && echo "ouch no kernel pkgs" && exit 2 - eit fit ${built_pkgs} || ( echo "ouch unable to inject" && exit 3 ) + eit inject ${built_pkgs} || ( echo "ouch unable to inject" && exit 3 ) echo done diff --git a/bin/bump_vbox b/bin/bump_vbox index 6d7b477..68468a1 100755 --- a/bin/bump_vbox +++ b/bin/bump_vbox @@ -18,7 +18,7 @@ for kernel in $kernels; do KERNEL_DIR="/usr/src/linux-${kernel}" emerge -B ${packages} || ( echo "ouch unable to build" && exit 1 ) built_pkgs=$(find /usr/portage/packages -name "*.tbz2" | xargs echo) [[ -z "${built_pkgs}" ]] && echo "ouch no kernel pkgs" && exit 2 - eit fit ${built_pkgs} || ( echo "ouch unable to inject" && exit 3 ) + eit inject ${built_pkgs} || ( echo "ouch unable to inject" && exit 3 ) echo eit search "#${kernel}" -qv | sort | uniq echo