From 90f5816ab70d7e932ba064941e4372876b93917c Mon Sep 17 00:00:00 2001 From: Jens Breitbart Date: Sat, 9 Jun 2018 11:11:30 +0200 Subject: [PATCH 01/16] Fixed McKernel Link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 126746e37..397090da5 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The project [HermitCore]( http://www.hermitcore.org ) is a new [unikernel](http://unikernel.org) targeting a scalable and predictable runtime for high-performance and cloud computing. HermitCore extends the multi-kernel approach (like -[McKernel](http://www-sys-aics.riken.jp/ResearchTopics/os/mckernel.html)) with +[McKernel](https://www-sys-aics.riken.jp/ResearchTopics/os/mckernel/)) with unikernel features for a better programmability and scalability for hierarchical systems. From 0b17bfaf926998f68f0de325af176a069d1750f8 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sun, 12 Aug 2018 09:01:15 +0200 Subject: [PATCH 02/16] guarantee that _start is at the beginning of the kernel --- arch/x86_64/kernel/entry.asm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/x86_64/kernel/entry.asm b/arch/x86_64/kernel/entry.asm index b635f6f6b..0a65f135a 100644 --- a/arch/x86_64/kernel/entry.asm +++ b/arch/x86_64/kernel/entry.asm @@ -41,6 +41,11 @@ MSR_KERNEL_GS_BASE equ 0xc0000102 ; We use a special name to map this section at the begin of our kernel ; => Multiboot expects its magic number at the beginning of the kernel. SECTION .mboot +global _start +_start: + jmp start64 + +align 4 global base global limit global cpu_freq @@ -71,7 +76,6 @@ SECTION .mboot global hcgateway global hcmask global host_logical_addr - magic db "hermit " base dq 0 limit dq 0 cpu_freq dd 0 @@ -121,8 +125,7 @@ boot_pgt: SECTION .ktext align 4 -global _start -_start: +start64: ; do we run in ring 0? mov eax, cs cmp eax, 0x8 From 80b2a0b6901f3a68bad3fdaf80a72a40082bd486 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sun, 12 Aug 2018 09:30:39 +0200 Subject: [PATCH 03/16] add libomp-hermit to the packet list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 135c93bfb..ff1776f63 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ toolchain, which can be installed as follows: ```bash $ echo "deb [trusted=yes] https://dl.bintray.com/hermitcore/ubuntu bionic main" | sudo tee -a /etc/apt/sources.list $ sudo apt-get -qq update -$ sudo apt-get install binutils-hermit newlib-hermit pte-hermit gcc-hermit libhermit +$ sudo apt-get install binutils-hermit newlib-hermit pte-hermit gcc-hermit libomp-hermit libhermit ``` For non-Debian based systems, a docker image with the complete toolchain is provided and can be installed as follows: From 41f8ae1f402052f1e755976d3449a419f4d7b810 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sun, 19 Aug 2018 14:39:46 +0200 Subject: [PATCH 04/16] add Debian stretch support --- .bintray_descriptor.json | 4 ++-- .travis.yml | 3 +++ tests.sh | 11 +++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.bintray_descriptor.json b/.bintray_descriptor.json index eaef71aa3..d97dfb644 100644 --- a/.bintray_descriptor.json +++ b/.bintray_descriptor.json @@ -1,7 +1,7 @@ { "package": { "name": "libhermit", - "repo": "ubuntu", + "repo": "REPLACE_REPO", "subject": "hermitcore", "website_url": "http://www.hermitcore.org", "issue_tracker_url": "https://github.com/RWTH-OS/HermitCore/issues", @@ -23,7 +23,7 @@ { "includePattern": "../(libhermit[^/]*.deb$)", "uploadPattern": "$1", "matrixParams": { - "deb_distribution": "bionic", + "deb_distribution": "REPLACE_OS", "deb_component": "main", "deb_architecture": "amd64", "override": 1} diff --git a/.travis.yml b/.travis.yml index 15d72f61e..a117f59ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ git: submodules: true env: matrix: + - OS_TYPE=debian OS_VERSION=9 OS_NAME=stretch - OS_TYPE=ubuntu OS_VERSION=18.04 OS_NAME=bionic services: - docker @@ -19,6 +20,8 @@ script: before_deploy: - cd ${TRAVIS_BUILD_DIR} - dpkg-deb -b tmp libhermit-0.2.9-all.deb +- sed -i "s/REPLACE_REPO/$OS_TYPE/" .bintray_descriptor.json +- sed -i "s/REPLACE_OS/$OS_NAME/" .bintray_descriptor.json deploy: provider: bintray on: diff --git a/tests.sh b/tests.sh index d7a69d00f..a3983791b 100755 --- a/tests.sh +++ b/tests.sh @@ -34,9 +34,10 @@ export DEBIAN_FRONTEND="noninteractive" apt-get -qq update apt-get install -y qemu-system-x86 cmake wget curl gnupg checkinstall gawk dialog apt-utils flex bison binutils texinfo gcc g++ libmpfr-dev libmpc-dev libgmp-dev libisl-dev packaging-dev build-essential libtool autotools-dev autoconf pkg-config apt-transport-https nasm rpm -echo "deb [trusted=yes] https://dl.bintray.com/hermitcore/ubuntu bionic main" | tee -a /etc/apt/sources.list +echo "deb [trusted=yes] https://dl.bintray.com/hermitcore/$OS_NAME $OS_VERSION main" | tee -a /etc/apt/sources.list apt-get -qq update -apt-get install -y --allow-unauthenticated -o Dpkg::Options::="--force-overwrite" binutils-hermit newlib-hermit pte-hermit gcc-hermit libomp-hermit #gcc-hermit-bootstrap +#apt-get install -y --allow-unauthenticated -o Dpkg::Options::="--force-overwrite" binutils-hermit newlib-hermit pte-hermit gcc-hermit libomp-hermit +apt-get install -y --allow-unauthenticated -o Dpkg::Options::="--force-overwrite" binutils-hermit newlib-hermit pte-hermit gcc-hermit-bootstrap export PATH=/opt/hermit/bin:$PATH mkdir -p build @@ -44,10 +45,12 @@ cd build cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit -DBOOTSTRAP=true .. make hermit-bootstrap make hermit-bootstrap-install -rm -rf * -cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit .. +#rm -rf * +#cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit .. make -j1 package +exit 0 + cd .. mkdir -p tmp dpkg-deb -R build/libhermit-0.2.9-all.deb tmp From 325b77c7a166c1e2c9842308fc248aa04c86686b Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sun, 19 Aug 2018 15:20:12 +0200 Subject: [PATCH 05/16] use checkinstall to create debian package --- caves | 2 +- tests.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/caves b/caves index e7c1d301d..9f19fde7b 160000 --- a/caves +++ b/caves @@ -1 +1 @@ -Subproject commit e7c1d301d210e083e3279bb3cdac1408b52178f2 +Subproject commit 9f19fde7b78ea85d3f7ff06252316f75579df617 diff --git a/tests.sh b/tests.sh index a3983791b..cece6846d 100755 --- a/tests.sh +++ b/tests.sh @@ -44,10 +44,11 @@ mkdir -p build cd build cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit -DBOOTSTRAP=true .. make hermit-bootstrap -make hermit-bootstrap-install +checkinstall -R -y --exclude=build --pkggroup=main --maintainer=stefan@eonerc.rwth-aachen.de --pkgsource=https://hermitcore.org --pkgname=libhermit --pkgversion=0.2.9 --pkglicense=BSD make hermit-bootstrap-install +#make hermit-bootstrap-install #rm -rf * #cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit .. -make -j1 package +#make -j1 package exit 0 From 69966f6e6e01a9816388f98f3e4a84524c915540 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sun, 19 Aug 2018 15:36:53 +0200 Subject: [PATCH 06/16] fix typo (build deb package instead of rpm) --- tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.sh b/tests.sh index cece6846d..f02da5c21 100755 --- a/tests.sh +++ b/tests.sh @@ -25,7 +25,7 @@ mkdir -p build cd build ../configure --target=x86_64-hermit --prefix=/opt/hermit --disable-shared --disable-nls --disable-gdb --disable-libdecnumber --disable-readline --disable-sim --disable-libssp --enable-tls --disable-multilib make -checkinstall -R -y --exclude=build --pkggroup=main --maintainer=stefan@eonerc.rwth-aachen.de --pkgsource=https://hermitcore.org --pkgname=newlib-hermit --pkgversion=2.30.51 --pkglicense=GPL2 make install +checkinstall -D -y --exclude=build --pkggroup=main --maintainer=stefan@eonerc.rwth-aachen.de --pkgsource=https://hermitcore.org --pkgname=newlib-hermit --pkgversion=2.30.51 --pkglicense=GPL2 make install else From 5fa50f338df1027b312b3e2f69769ed66ef25d92 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sun, 19 Aug 2018 15:49:10 +0200 Subject: [PATCH 07/16] fix package name --- tests.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests.sh b/tests.sh index f02da5c21..54174c3b2 100755 --- a/tests.sh +++ b/tests.sh @@ -50,13 +50,13 @@ checkinstall -R -y --exclude=build --pkggroup=main --maintainer=stefan@eonerc.rw #cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit .. #make -j1 package -exit 0 - cd .. mkdir -p tmp -dpkg-deb -R build/libhermit-0.2.9-all.deb tmp +dpkg-deb -R build/libhermit-0.2.9.deb tmp rm -rf build/*.deb build/_CPack_Packages +exit 0 + fi TDIR=/work/build/local_prefix/opt/hermit/x86_64-hermit/extra From 4b4d46ff4e9a36c18dce8d862c35d3d9ccc0f1e4 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sun, 19 Aug 2018 16:35:28 +0200 Subject: [PATCH 08/16] fix typos --- tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests.sh b/tests.sh index 54174c3b2..54b7b8fe3 100755 --- a/tests.sh +++ b/tests.sh @@ -25,7 +25,7 @@ mkdir -p build cd build ../configure --target=x86_64-hermit --prefix=/opt/hermit --disable-shared --disable-nls --disable-gdb --disable-libdecnumber --disable-readline --disable-sim --disable-libssp --enable-tls --disable-multilib make -checkinstall -D -y --exclude=build --pkggroup=main --maintainer=stefan@eonerc.rwth-aachen.de --pkgsource=https://hermitcore.org --pkgname=newlib-hermit --pkgversion=2.30.51 --pkglicense=GPL2 make install +checkinstall -R -y --exclude=build --pkggroup=main --maintainer=stefan@eonerc.rwth-aachen.de --pkgsource=https://hermitcore.org --pkgname=newlib-hermit --pkgversion=2.30.51 --pkglicense=GPL2 make install else @@ -44,7 +44,7 @@ mkdir -p build cd build cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit -DBOOTSTRAP=true .. make hermit-bootstrap -checkinstall -R -y --exclude=build --pkggroup=main --maintainer=stefan@eonerc.rwth-aachen.de --pkgsource=https://hermitcore.org --pkgname=libhermit --pkgversion=0.2.9 --pkglicense=BSD make hermit-bootstrap-install +checkinstall -D -y --exclude=build --pkggroup=main --maintainer=stefan@eonerc.rwth-aachen.de --pkgsource=https://hermitcore.org --pkgname=libhermit --pkgversion=0.2.9 --pkglicense=BSD make hermit-bootstrap-install #make hermit-bootstrap-install #rm -rf * #cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit .. From 4d0e467d0614e94f7804af50a0084787c79b14ef Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sun, 19 Aug 2018 16:43:10 +0200 Subject: [PATCH 09/16] fix typo in package name --- tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.sh b/tests.sh index 54b7b8fe3..eb3411e8c 100755 --- a/tests.sh +++ b/tests.sh @@ -52,7 +52,7 @@ checkinstall -D -y --exclude=build --pkggroup=main --maintainer=stefan@eonerc.rw cd .. mkdir -p tmp -dpkg-deb -R build/libhermit-0.2.9.deb tmp +dpkg-deb -R build/libhermit_0.2.9-1_amd64.deb tmp rm -rf build/*.deb build/_CPack_Packages exit 0 From 577c733d964bd74d01044d4e17d8903cccc930d6 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Mon, 20 Aug 2018 08:10:20 +0200 Subject: [PATCH 10/16] disable temporary debian stretch support --- .travis.yml | 2 +- tests.sh | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index a117f59ab..59c18f91c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ git: submodules: true env: matrix: - - OS_TYPE=debian OS_VERSION=9 OS_NAME=stretch + #- OS_TYPE=debian OS_VERSION=9 OS_NAME=stretch - OS_TYPE=ubuntu OS_VERSION=18.04 OS_NAME=bionic services: - docker diff --git a/tests.sh b/tests.sh index eb3411e8c..066ecf54d 100755 --- a/tests.sh +++ b/tests.sh @@ -36,26 +36,27 @@ apt-get install -y qemu-system-x86 cmake wget curl gnupg checkinstall gawk dialo echo "deb [trusted=yes] https://dl.bintray.com/hermitcore/$OS_NAME $OS_VERSION main" | tee -a /etc/apt/sources.list apt-get -qq update -#apt-get install -y --allow-unauthenticated -o Dpkg::Options::="--force-overwrite" binutils-hermit newlib-hermit pte-hermit gcc-hermit libomp-hermit -apt-get install -y --allow-unauthenticated -o Dpkg::Options::="--force-overwrite" binutils-hermit newlib-hermit pte-hermit gcc-hermit-bootstrap +apt-get install -y --allow-unauthenticated -o Dpkg::Options::="--force-overwrite" binutils-hermit newlib-hermit pte-hermit gcc-hermit libomp-hermit +#apt-get install -y --allow-unauthenticated -o Dpkg::Options::="--force-overwrite" binutils-hermit newlib-hermit pte-hermit gcc-hermit-bootstrap export PATH=/opt/hermit/bin:$PATH mkdir -p build cd build cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit -DBOOTSTRAP=true .. make hermit-bootstrap -checkinstall -D -y --exclude=build --pkggroup=main --maintainer=stefan@eonerc.rwth-aachen.de --pkgsource=https://hermitcore.org --pkgname=libhermit --pkgversion=0.2.9 --pkglicense=BSD make hermit-bootstrap-install -#make hermit-bootstrap-install -#rm -rf * -#cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit .. -#make -j1 package +#checkinstall -D -y --exclude=build --pkggroup=main --maintainer=stefan@eonerc.rwth-aachen.de --pkgsource=https://hermitcore.org --pkgname=libhermit --pkgversion=0.2.9 --pkglicense=BSD make hermit-bootstrap-install +make hermit-bootstrap-install +rm -rf * +cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit .. +make -j1 package cd .. mkdir -p tmp -dpkg-deb -R build/libhermit_0.2.9-1_amd64.deb tmp +dpkg-deb -R build/libhermit-0.2.9-all.deb tmp +#dpkg-deb -R build/libhermit_0.2.9-1_amd64.deb tmp rm -rf build/*.deb build/_CPack_Packages -exit 0 +#exit 0 fi From a4668c68e0e2ad4007315b6e36e496b0e68d113f Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Wed, 22 Aug 2018 00:17:32 +0200 Subject: [PATCH 11/16] build bootstrap version of libhermit --- .travis.yml | 4 ++-- tests.sh | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59c18f91c..744a3f1e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,8 @@ git: submodules: true env: matrix: - #- OS_TYPE=debian OS_VERSION=9 OS_NAME=stretch - - OS_TYPE=ubuntu OS_VERSION=18.04 OS_NAME=bionic + - OS_TYPE=debian OS_VERSION=9 OS_NAME=stretch + #- OS_TYPE=ubuntu OS_VERSION=18.04 OS_NAME=bionic services: - docker addons: diff --git a/tests.sh b/tests.sh index 066ecf54d..e94b11092 100755 --- a/tests.sh +++ b/tests.sh @@ -36,27 +36,27 @@ apt-get install -y qemu-system-x86 cmake wget curl gnupg checkinstall gawk dialo echo "deb [trusted=yes] https://dl.bintray.com/hermitcore/$OS_NAME $OS_VERSION main" | tee -a /etc/apt/sources.list apt-get -qq update -apt-get install -y --allow-unauthenticated -o Dpkg::Options::="--force-overwrite" binutils-hermit newlib-hermit pte-hermit gcc-hermit libomp-hermit -#apt-get install -y --allow-unauthenticated -o Dpkg::Options::="--force-overwrite" binutils-hermit newlib-hermit pte-hermit gcc-hermit-bootstrap +#apt-get install -y --allow-unauthenticated -o Dpkg::Options::="--force-overwrite" binutils-hermit newlib-hermit pte-hermit gcc-hermit libomp-hermit +apt-get install -y --allow-unauthenticated -o Dpkg::Options::="--force-overwrite" binutils-hermit newlib-hermit pte-hermit gcc-hermit-bootstrap export PATH=/opt/hermit/bin:$PATH mkdir -p build cd build cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit -DBOOTSTRAP=true .. make hermit-bootstrap -#checkinstall -D -y --exclude=build --pkggroup=main --maintainer=stefan@eonerc.rwth-aachen.de --pkgsource=https://hermitcore.org --pkgname=libhermit --pkgversion=0.2.9 --pkglicense=BSD make hermit-bootstrap-install -make hermit-bootstrap-install -rm -rf * -cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit .. -make -j1 package +checkinstall -D -y --exclude=build --pkggroup=main --maintainer=stefan@eonerc.rwth-aachen.de --pkgsource=https://hermitcore.org --pkgname=libhermit --pkgversion=0.2.9 --pkglicense=BSD make hermit-bootstrap-install +#make hermit-bootstrap-install +#rm -rf * +#cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit .. +#make -j1 package cd .. mkdir -p tmp -dpkg-deb -R build/libhermit-0.2.9-all.deb tmp -#dpkg-deb -R build/libhermit_0.2.9-1_amd64.deb tmp +#dpkg-deb -R build/libhermit-0.2.9-all.deb tmp +dpkg-deb -R build/libhermit_0.2.9-1_amd64.deb tmp rm -rf build/*.deb build/_CPack_Packages -#exit 0 +exit 0 fi From d5090f41dcd8fb41f486bb4efc81f39afd67d700 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Fri, 24 Aug 2018 06:41:07 +0200 Subject: [PATCH 12/16] reenable debian stretch support --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 744a3f1e5..86381d03d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ git: env: matrix: - OS_TYPE=debian OS_VERSION=9 OS_NAME=stretch - #- OS_TYPE=ubuntu OS_VERSION=18.04 OS_NAME=bionic + - OS_TYPE=ubuntu OS_VERSION=18.04 OS_NAME=bionic services: - docker addons: @@ -33,12 +33,12 @@ deploy: key: secure: fg8+5owyDFPt3H/+Xk8jGHtEBasz1C2K0i+z92f/JnjTyLCrrKn+6DX7VRgcEl4ketTWLex7JduJLl4/7Ftug8qN0NuMwx0OxDCrwzvkoVwbl2DYX8von9ceuuV57p4e+uG35bPjU7E1KblkL+7ERqn9hsp5NbVdb4ueoSl9LedDdfzwcz8iA8JmzpbJ5RwQqg4kmdvuRVEUZMbQeHq4KB3kTznsma3BUeApVSaRQ8BpSaHED0tzFWKUTdjq7GvjBMF6WNpVIsc7Usky78UUyjaGbfMyT/7i9RctC3rAXr2XZryxDrJstAnHo6trqraf/3E40a7r0LhF9y7HWdmlfG99qhT3Vii3/pHeRIDp5O6xpIF8o/QkbYaFTwcvefRCjRQ8YYREqYvYnXOsKge/VaoUx48pTn6fOPzEzvlbyTkJ6Wp7knhx4qzR5JB8yTbIjoozggrkayvkYVfdMZjXvY/2T8TcNbPG0+0+EVkUcNrNMy9ksAH4RgR+eVQ4oI/sg5ldnVpp74jhSSDgAHBKCZQ01tIYMMEIyZm7qhAAdXnjCeV6D78a8/brUN+TSRNGYILx4vTiY3GMLEHsDGH4VEGawef0CtQasBrt5Cc0a/3KDNwuBy8rlbxLxbv+JCCn9vMm+UYQ6sTexsih76V07OHmQliu0xjQgBG5maFaV74= -after_deploy: - - docker login -u $DOCKER_USER -p $DOCKER_PASS - - export REPO=rwthos/hermitcore - - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi` - - cd ${TRAVIS_BUILD_DIR}/docker - - docker build -f Dockerfile -t $REPO . - - docker tag $REPO $REPO:$TAG - - docker tag $REPO $REPO:travis-$TRAVIS_BUILD_NUMBER - - docker push $REPO +#after_deploy: +# - docker login -u $DOCKER_USER -p $DOCKER_PASS +# - export REPO=rwthos/hermitcore +# - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi` +# - cd ${TRAVIS_BUILD_DIR}/docker +# - docker build -f Dockerfile -t $REPO . +# - docker tag $REPO $REPO:$TAG +# - docker tag $REPO $REPO:travis-$TRAVIS_BUILD_NUMBER +# - docker push $REPO From 349060c5b699430a5657699f7047716a059aef51 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Fri, 24 Aug 2018 06:47:42 +0200 Subject: [PATCH 13/16] reenable Travis tests --- tests.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests.sh b/tests.sh index e94b11092..1a4cabbb9 100755 --- a/tests.sh +++ b/tests.sh @@ -44,19 +44,19 @@ mkdir -p build cd build cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit -DBOOTSTRAP=true .. make hermit-bootstrap -checkinstall -D -y --exclude=build --pkggroup=main --maintainer=stefan@eonerc.rwth-aachen.de --pkgsource=https://hermitcore.org --pkgname=libhermit --pkgversion=0.2.9 --pkglicense=BSD make hermit-bootstrap-install +#checkinstall -D -y --exclude=build --pkggroup=main --maintainer=stefan@eonerc.rwth-aachen.de --pkgsource=https://hermitcore.org --pkgname=libhermit --pkgversion=0.2.9 --pkglicense=BSD make hermit-bootstrap-install #make hermit-bootstrap-install -#rm -rf * -#cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit .. -#make -j1 package +rm -rf * +cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit .. +make -j1 package cd .. mkdir -p tmp -#dpkg-deb -R build/libhermit-0.2.9-all.deb tmp -dpkg-deb -R build/libhermit_0.2.9-1_amd64.deb tmp +dpkg-deb -R build/libhermit-0.2.9-all.deb tmp +#dpkg-deb -R build/libhermit_0.2.9-1_amd64.deb tmp rm -rf build/*.deb build/_CPack_Packages -exit 0 +#exit 0 fi From aca2a4873f0c0fad61012aa5853bf5c5efff4121 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Fri, 24 Aug 2018 07:10:57 +0200 Subject: [PATCH 14/16] install final compiler instead of bootstrap compiler --- tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests.sh b/tests.sh index 1a4cabbb9..73bd641b5 100755 --- a/tests.sh +++ b/tests.sh @@ -36,8 +36,8 @@ apt-get install -y qemu-system-x86 cmake wget curl gnupg checkinstall gawk dialo echo "deb [trusted=yes] https://dl.bintray.com/hermitcore/$OS_NAME $OS_VERSION main" | tee -a /etc/apt/sources.list apt-get -qq update -#apt-get install -y --allow-unauthenticated -o Dpkg::Options::="--force-overwrite" binutils-hermit newlib-hermit pte-hermit gcc-hermit libomp-hermit -apt-get install -y --allow-unauthenticated -o Dpkg::Options::="--force-overwrite" binutils-hermit newlib-hermit pte-hermit gcc-hermit-bootstrap +apt-get install -y --allow-unauthenticated -o Dpkg::Options::="--force-overwrite" binutils-hermit newlib-hermit pte-hermit gcc-hermit libomp-hermit +#apt-get install -y --allow-unauthenticated -o Dpkg::Options::="--force-overwrite" binutils-hermit newlib-hermit pte-hermit gcc-hermit-bootstrap export PATH=/opt/hermit/bin:$PATH mkdir -p build From 4e9cfd490cd1dde51d9b2e32200c23f851553f29 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Fri, 24 Aug 2018 07:27:22 +0200 Subject: [PATCH 15/16] add missing installation of the bootstrap version of libhermit --- tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.sh b/tests.sh index 73bd641b5..066ecf54d 100755 --- a/tests.sh +++ b/tests.sh @@ -45,7 +45,7 @@ cd build cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit -DBOOTSTRAP=true .. make hermit-bootstrap #checkinstall -D -y --exclude=build --pkggroup=main --maintainer=stefan@eonerc.rwth-aachen.de --pkgsource=https://hermitcore.org --pkgname=libhermit --pkgversion=0.2.9 --pkglicense=BSD make hermit-bootstrap-install -#make hermit-bootstrap-install +make hermit-bootstrap-install rm -rf * cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit .. make -j1 package From 01c38a4bc23750fc4d79241932f06e8bb79b0e8b Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Fri, 24 Aug 2018 20:38:58 +0200 Subject: [PATCH 16/16] build docker container if Travis uses an Ubuntu container --- .travis.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 86381d03d..186a27279 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,12 +33,15 @@ deploy: key: secure: fg8+5owyDFPt3H/+Xk8jGHtEBasz1C2K0i+z92f/JnjTyLCrrKn+6DX7VRgcEl4ketTWLex7JduJLl4/7Ftug8qN0NuMwx0OxDCrwzvkoVwbl2DYX8von9ceuuV57p4e+uG35bPjU7E1KblkL+7ERqn9hsp5NbVdb4ueoSl9LedDdfzwcz8iA8JmzpbJ5RwQqg4kmdvuRVEUZMbQeHq4KB3kTznsma3BUeApVSaRQ8BpSaHED0tzFWKUTdjq7GvjBMF6WNpVIsc7Usky78UUyjaGbfMyT/7i9RctC3rAXr2XZryxDrJstAnHo6trqraf/3E40a7r0LhF9y7HWdmlfG99qhT3Vii3/pHeRIDp5O6xpIF8o/QkbYaFTwcvefRCjRQ8YYREqYvYnXOsKge/VaoUx48pTn6fOPzEzvlbyTkJ6Wp7knhx4qzR5JB8yTbIjoozggrkayvkYVfdMZjXvY/2T8TcNbPG0+0+EVkUcNrNMy9ksAH4RgR+eVQ4oI/sg5ldnVpp74jhSSDgAHBKCZQ01tIYMMEIyZm7qhAAdXnjCeV6D78a8/brUN+TSRNGYILx4vTiY3GMLEHsDGH4VEGawef0CtQasBrt5Cc0a/3KDNwuBy8rlbxLxbv+JCCn9vMm+UYQ6sTexsih76V07OHmQliu0xjQgBG5maFaV74= -#after_deploy: -# - docker login -u $DOCKER_USER -p $DOCKER_PASS -# - export REPO=rwthos/hermitcore -# - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi` -# - cd ${TRAVIS_BUILD_DIR}/docker -# - docker build -f Dockerfile -t $REPO . -# - docker tag $REPO $REPO:$TAG -# - docker tag $REPO $REPO:travis-$TRAVIS_BUILD_NUMBER -# - docker push $REPO +after_deploy: + - | + if [ "$OS_TYPE" == "ubuntu" ]; then + docker login -u $DOCKER_USER -p $DOCKER_PASS + export REPO=rwthos/hermitcore + export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi` + cd ${TRAVIS_BUILD_DIR}/docker + docker build -f Dockerfile -t $REPO . + docker tag $REPO $REPO:$TAG + docker tag $REPO $REPO:travis-$TRAVIS_BUILD_NUMBER + docker push $REPO + fi