From c590b7034c5125e6d450cd5161036680bd64defe Mon Sep 17 00:00:00 2001 From: cassio Date: Mon, 27 Oct 2014 18:06:30 +0000 Subject: update gcc and java of the jail --- tools/etc/icpc/createbocajail.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'tools/etc') diff --git a/tools/etc/icpc/createbocajail.sh b/tools/etc/icpc/createbocajail.sh index bd8bd5d..1a99ca5 100755 --- a/tools/etc/icpc/createbocajail.sh +++ b/tools/etc/icpc/createbocajail.sh @@ -115,6 +115,20 @@ cat < /home/bocajail/tmp/populate.sh mount -t proc proc /proc apt-get -y update apt-get -y install g++ gcc libstdc++6 sharutils default-jdk default-jre +apt-get -y install gcc-4.8 g++-4.8 +apt-get -y install openjdk-7-jdk openjdk-7-jre +apt-get -y autoremove +apt-get -y clean + +update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.8 +update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.6 40 --slave /usr/bin/g++ g++ /usr/bin/g++-4.6 + +update-alternatives --install /usr/bin/java java /usr/lib/jvm/java-6-openjdk-*/jre/bin/java 10 +update-alternatives --install /usr/bin/javac javac /usr/lib/jvm/java-6-openjdk-*/bin/javac 10 +update-alternatives --install /usr/bin/javadoc javadoc /usr/lib/jvm/java-6-openjdk-*/bin/javadoc 10 +update-alternatives --install /usr/bin/javap javap /usr/lib/jvm/java-6-openjdk-*/bin/javap 10 +update-alternatives --install /usr/bin/javah javah /usr/lib/jvm/java-6-openjdk-*/bin/javah 10 + umount /proc EOF cp -f /etc/apt/sources.list $homejail/etc/apt/ -- cgit v1.2.3 From 28cd3675fe162d1ca62eb492654c698613e6c0ce Mon Sep 17 00:00:00 2001 From: cassio Date: Mon, 27 Oct 2014 18:39:11 +0000 Subject: bug fix --- tools/etc/icpc/createbocajail.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tools/etc') diff --git a/tools/etc/icpc/createbocajail.sh b/tools/etc/icpc/createbocajail.sh index 1a99ca5..d8a5ad2 100755 --- a/tools/etc/icpc/createbocajail.sh +++ b/tools/etc/icpc/createbocajail.sh @@ -59,7 +59,6 @@ rm -rf /bocajail mkdir -p $homejail/tmp chmod 1777 $homejail/tmp ln -s $homejail /bocajail -[ -x /usr/bin/safeexec ] && cp -a /usr/bin/safeexec /bocajail/usr/bin/ #for i in usr lib var bin sbin etc dev; do # [ -d $homejail/$i ] && rm -rf $homejail/$i # cp -ar /$i $homejail @@ -113,7 +112,9 @@ echo "*** Populating $homejail" cat < /home/bocajail/tmp/populate.sh #!/bin/bash mount -t proc proc /proc +add-apt-repository ppa:ubuntu-toolchain-r/test apt-get -y update +apt-get -y upgrade apt-get -y install g++ gcc libstdc++6 sharutils default-jdk default-jre apt-get -y install gcc-4.8 g++-4.8 apt-get -y install openjdk-7-jdk openjdk-7-jre @@ -131,6 +132,8 @@ update-alternatives --install /usr/bin/javah javah /usr/lib/jvm/java-6-openjdk-* umount /proc EOF +mkdir -p /bocajail/usr/bin +[ -x /usr/bin/safeexec ] && cp -a /usr/bin/safeexec /bocajail/usr/bin/ cp -f /etc/apt/sources.list $homejail/etc/apt/ chmod 755 /home/bocajail/tmp/populate.sh cd / ; chroot $homejail /tmp/populate.sh -- cgit v1.2.3 From 6692c1b3d36449575ae669131c782d4a48aa8c8f Mon Sep 17 00:00:00 2001 From: cassio Date: Mon, 27 Oct 2014 19:47:10 +0000 Subject: yet another bug --- tools/etc/icpc/createbocajail.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tools/etc') diff --git a/tools/etc/icpc/createbocajail.sh b/tools/etc/icpc/createbocajail.sh index d8a5ad2..75d39ec 100755 --- a/tools/etc/icpc/createbocajail.sh +++ b/tools/etc/icpc/createbocajail.sh @@ -112,13 +112,14 @@ echo "*** Populating $homejail" cat < /home/bocajail/tmp/populate.sh #!/bin/bash mount -t proc proc /proc -add-apt-repository ppa:ubuntu-toolchain-r/test +apt-get -y update +apt-get -y install python-software-properties +add-apt-repository -y ppa:ubuntu-toolchain-r/test apt-get -y update apt-get -y upgrade apt-get -y install g++ gcc libstdc++6 sharutils default-jdk default-jre apt-get -y install gcc-4.8 g++-4.8 apt-get -y install openjdk-7-jdk openjdk-7-jre -apt-get -y autoremove apt-get -y clean update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.8 -- cgit v1.2.3