Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1333)

Unified Diff: src/scripts/install_packages.sh

Issue 555027: Maintainer script for flash ++ (Closed)
Patch Set: Make a proper plugins directory for chrome Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/platform/chrome/debian/rules ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/scripts/install_packages.sh
diff --git a/src/scripts/install_packages.sh b/src/scripts/install_packages.sh
index a0a26318cc6808bd81373090faffaf46a9d99ba2..3043b577939757628505b0ca71bd5434b57bd85f 100755
--- a/src/scripts/install_packages.sh
+++ b/src/scripts/install_packages.sh
@@ -186,9 +186,9 @@ for p in $PACKAGES $EXTRA_PACKAGES; do
if [ -z "$PKG" ]; then
PKG=$(ls "${REPO}"/${p}_*_all.deb)
fi
- sudo "${SCRIPTS_DIR}"/dpkg_no_scripts.sh \
+ sudo ARCH="$FLAGS_arch" "${SCRIPTS_DIR}"/dpkg_no_scripts.sh \
--root="$ROOT_FS_DIR" --nodpkg_fallback --unpack "$PKG"
- sudo "${SCRIPTS_DIR}"/dpkg_no_scripts.sh \
+ sudo ARCH="$FLAGS_arch" "${SCRIPTS_DIR}"/dpkg_no_scripts.sh \
--root="$ROOT_FS_DIR" --nodpkg_fallback --configure "$p"
done
@@ -196,7 +196,7 @@ done
# to install additional critical packages. If there are any of these, we
# disable the maintainer scripts so they install ok.
TMP_FORCE_NO_SCRIPTS="-o=DPkg::options::=--nodpkg_fallback"
-sudo APT_CONFIG="$APT_CONFIG" DEBIAN_FRONTEND=noninteractive \
+sudo APT_CONFIG="$APT_CONFIG" DEBIAN_FRONTEND=noninteractive ARCH="$FLAGS_arch"\
apt-get $TMP_FORCE_NO_SCRIPTS --force-yes --fix-broken install
# TODO: Remove these hacks when we stop having maintainer scripts altogether.
@@ -221,7 +221,7 @@ for p in $PACKAGE_LISTS; do
grep -v '^ *$' | \
sed '/$/{N;s/\n/ /;}')
sudo APT_CONFIG="$APT_CONFIG" DEBIAN_FRONTEND=noninteractive \
- apt-get --force-yes install $COMPONENTS
+ ARCH="$FLAGS_arch" apt-get --force-yes install $COMPONENTS
done
# Create kernel installation configuration to suppress warnings,
@@ -238,7 +238,7 @@ warn_initrd = no
EOF
# Install the kernel.
-sudo APT_CONFIG="$APT_CONFIG" DEBIAN_FRONTEND=noninteractive \
+sudo APT_CONFIG="$APT_CONFIG" DEBIAN_FRONTEND=noninteractive ARCH="$FLAGS_arch"\
apt-get --force-yes install "linux-image-${KERNEL_VERSION}"
# List all packages installed so far, since these are what the local
« no previous file with comments | « src/platform/chrome/debian/rules ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698