Fix everything!
parent
5dbc2571f5
commit
15d5e36639
|
@ -14,14 +14,18 @@ COPY --from=sdk-download /sdk /
|
||||||
# fix COPY permissions
|
# fix COPY permissions
|
||||||
RUN chmod +s /usr/bin/sudo
|
RUN chmod +s /usr/bin/sudo
|
||||||
RUN chown -R chronos:chronos /home/chronos
|
RUN chown -R chronos:chronos /home/chronos
|
||||||
|
# fix home directory
|
||||||
|
RUN usermod -d /home/chronos chronos
|
||||||
|
|
||||||
COPY fetch-source.sh /usr/local/bin/
|
COPY fetch-source.sh /usr/local/bin/
|
||||||
COPY setup-root.sh /usr/local/bin/
|
COPY setup-root.sh /usr/local/bin/
|
||||||
|
|
||||||
|
# setup PATH beforehand
|
||||||
ENV PATH=$PATH:/opt/depot_tools:/home/chronos/trunk/chromite/bin
|
ENV PATH=$PATH:/opt/depot_tools:/home/chronos/trunk/chromite/bin
|
||||||
|
# enable passwordless sudo
|
||||||
RUN echo "chronos ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
|
RUN echo "chronos ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
|
||||||
|
|
||||||
|
# perform build as chronos
|
||||||
USER chronos
|
USER chronos
|
||||||
RUN git config --global user.email "dev@null"
|
RUN git config --global user.email "dev@null"
|
||||||
RUN git config --global user.name "/dev/null"
|
RUN git config --global user.name "/dev/null"
|
||||||
|
|
|
@ -6,7 +6,10 @@ echo "Entering /chromiumos working directory"
|
||||||
mkdir -p /home/chronos/trunk
|
mkdir -p /home/chronos/trunk
|
||||||
cd /home/chronos/trunk
|
cd /home/chronos/trunk
|
||||||
|
|
||||||
|
echo "Switching to Python 2"
|
||||||
|
export EPYTHON=python2
|
||||||
|
|
||||||
echo "Syncing source"
|
echo "Syncing source"
|
||||||
repo init -u https://chromium.googlesource.com/chromiumos/manifest.git --repo-url https://chromium.googlesource.com/external/repo.git
|
repo init -u https://chromium.googlesource.com/chromiumos/manifest.git --repo-url https://chromium.googlesource.com/external/repo.git
|
||||||
repo sync -j6
|
repo sync -j8
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
echo "Changing directory"
|
echo "Changing directory"
|
||||||
cd /chromiumos/src/scripts
|
cd /home/chronos/trunk/src/scripts
|
||||||
|
|
||||||
echo "Setup board"
|
echo "Setup board"
|
||||||
export BOARD=amd64-generic
|
export BOARD=amd64-generic
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
SUDO_USER=chronos
|
SUDO_USER=chronos
|
||||||
|
|
||||||
CHROOT_TRUNK_DIR=/home/chronos/trunk
|
CHROOT_TRUNK_DIR=/home/chronos/trunk
|
||||||
|
@ -89,7 +91,7 @@ cat << EOF > "${target}/chromiumos-niceties.sh"
|
||||||
PS1='\$(r=\$?; __git_branch_ps1 "(%s) "; exit \$r)'"\${PS1}"
|
PS1='\$(r=\$?; __git_branch_ps1 "(%s) "; exit \$r)'"\${PS1}"
|
||||||
PS1="(cr) \${PS1}"
|
PS1="(cr) \${PS1}"
|
||||||
EOF
|
EOF
|
||||||
local localegen="/etc/locale.gen"
|
localegen="/etc/locale.gen"
|
||||||
if ! grep -q -v -e '^#' -e '^$' "${localegen}" ; then
|
if ! grep -q -v -e '^#' -e '^$' "${localegen}" ; then
|
||||||
cat <<EOF >> "${localegen}"
|
cat <<EOF >> "${localegen}"
|
||||||
en_US ISO-8859-1
|
en_US ISO-8859-1
|
||||||
|
|
Loading…
Reference in New Issue