Skip to content

Commit

Permalink
Update the build info for armel Debian
Browse files Browse the repository at this point in the history
  • Loading branch information
nghiant2710 committed Jul 6, 2017
1 parent b3123a4 commit 2cb717c
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 29 deletions.
6 changes: 4 additions & 2 deletions automation/jenkins_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ cp -f commit-table $DISTRO/$ARCH
cd $DISTRO
cd $ARCH

docker build --no-cache=true -t node-$DISTRO-$ARCH-builder .
if [ -f Dockerfile ]; then
docker build --no-cache=true -t node-$DISTRO-$ARCH-builder .
fi

for NODE_VERSION in $NODE_VERSIONS
do
if [ $DISTRO == 'debian' ] && ([ $ARCH == 'armv7hf' ] || [ $ARCH == 'i386' ]); then
if [ $DISTRO == 'debian' ] && ([ $ARCH == 'armv7hf' ] || [ $ARCH == 'i386' ] || [ $ARCH == 'armel' ]); then
if version_le $NODE_VERSION 4; then
sed -e s~#{SUITE}~wheezy~g Dockerfile.tpl > Dockerfile
else
Expand Down
19 changes: 0 additions & 19 deletions debian/armel/Dockerfile

This file was deleted.

13 changes: 13 additions & 0 deletions debian/armel/Dockerfile.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FROM resin/armel-debian:#{SUITE}

RUN apt-get -q update \
&& apt-get install -y git python python-dev python-pip build-essential wget ca-certificates libssl-dev curl --no-install-recommends \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

# Install AWS CLI
RUN pip install awscli

RUN git clone https://github.com/nodejs/node.git

COPY . /
9 changes: 1 addition & 8 deletions debian/armel/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,12 @@ DEST_DIR=node-v$NODE_VERSION-linux-$ARCH_VERSION
TAR_FILE=node-v$NODE_VERSION-linux-$ARCH_VERSION.tar.gz
BUCKET_NAME=$BUCKET_NAME

BUILD_FLAGs="--without-snapshot --prefix / --with-arm-float-abi=softfp --dest-cpu=$ARCH"
BUILD_FLAGs="--without-snapshot --prefix / "
# --with-arm-fpu flag is not available for node versions 0.12.x and 0.10.x
if version_ge "$NODE_VERSION" "4"; then
BUILD_FLAGs+=' --with-arm-fpu=vfp'
fi

if version_ge "$NODE_VERSION" "6"; then
# ref https://github.com/nodejs/node/issues/7173
export CXX_host="g++ -m32"
export CC_host="gcc -m32"
export LINK_host="g++ -m32"
fi

commit=($(echo "$(grep " v$NODE_VERSION" /commit-table)" | tr " " "\n"))
if [ -z $commit ]; then
echo "commit for v$NODE_VERSION not found!"
Expand Down

0 comments on commit 2cb717c

Please sign in to comment.