From 97e1b583fc59e6a5f0abcf3aab2d6f9a0d82a91f Mon Sep 17 00:00:00 2001 From: Daniel Krebs Date: Fri, 13 Jan 2017 20:47:19 +0100 Subject: [PATCH] try to fix building libhermit deb package with new bootstrap compiler --- .travis.yml | 20 ++++++++------------ debian/rules | 29 +++-------------------------- 2 files changed, 11 insertions(+), 38 deletions(-) diff --git a/.travis.yml b/.travis.yml index 42c23e9ef..ea51e16b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,23 +5,20 @@ git: language: c compiler: gcc before_install: + - echo "deb https://dl.bintray.com/rwth-os/hermitcore vivid main" | sudo tee -a /etc/apt/sources.list - sudo apt-get -qq update - sudo apt-get install -y curl qemu-system-x86 nasm texinfo libmpfr-dev libmpc-dev libgmp-dev libisl-dev flex bison packaging-dev + - sudo apt-get install -y --force-yes binutils-hermit gcc-hermit-bootstrap - git submodule update --init lwip usr/libomp + script: - - mv .git .. - cd .. - mv HermitCore libhermit-0.1 - - tar -czf libhermit_0.1.orig.tar.gz libhermit-0.1 - - mv .git libhermit-0.1 - - cd $TOPDIR - - wget https://bintray.com/rwth-os/hermitcore/download_file?file_path=binutils-hermit_2.26.1-1_amd64.deb -O binutils-hermit_2.26.1-1_amd64.deb - - sudo dpkg -i ./binutils-hermit_2.26.1-1_amd64.deb - - wget https://www.lankes.org/deploy/bootstrap.tar.gz - - tar xzf bootstrap.tar.gz - - cd /home/travis/build/RWTH-OS/libhermit-0.1 - - debuild -e PATH -us -uc + - tar -czf libhermit_0.1.orig.tar.gz libhermit-0.1 --exclude=.git + - cd libhermit-0.1 + - debuild -e PATH -us -uc -j2 - x86_64-hermit-readelf -a kernel/main.o + deploy: on: production provider: bintray @@ -32,8 +29,7 @@ deploy: secure: JfsqEUO3Z60yGfuK5RSzwMoWZtaYflZtW7QE6R1DVMPEQ+CytzEdV2JaTpY14xz4yz1YpBBuQ0P3Q3e2rf/ORp8N8j7/5m3gfiDi8bRH3gX10r6vCQaUBilj0pz3amWUacxwBUEYR/f1029OnJ1qug30f4ARk7DWyuAePt0OboDXZ3j4JOi8xfXKTzofyKGugU4EuzhmKAbpHaBoX97g8z+gETC+wsBEYio8iD2h0ZOe/qZ0S+JGYkphIKcxpQazKdi3YrmWm0BUZsQRtkgoH7KUZm8vqfOUyVOrK+UGOTz4vXqCWHZ+wG1QRrGPUv8ehLrB26y2o02mmaDWQhM+I3RtllL06JDvDw40xjRImYtzg6xr7Mvl0OTQHprXrkN8gw2IbIivV8v31O46Ov+KIaN3CCx1IncnllBWjEXAIs4zPtvNj2Ad338JTkI/opHmPG0DI0DKE36r8wPZYTs/pHVpc3xEzwKYDklJkICjMLUakUGKppS7eKzKGRMjWvbT0vM/U7hHUcz0lA+BUoXedNmJQ1wBT85Ud8uobuKS4C8QmlgIuF1PI2+6LJr5LsCGZRvg7Pl1SPc3ZQLPHX4ggoLAnZZJiV/0ZPCn7XCLiUS1qws37l0uZT1zJQMFLsw9MGuP58tpT7WDuYYAwma/pL+OKC/JKoDhuJwM1I7wB4s= env: global: - - TOPDIR=/home/travis/build - - PATH=$PATH:/opt/hermit/bin:$TOPDIR/x86/bin + - PATH=$PATH:/opt/hermit/bin/ - PROXY_STR=":hermit:M:7:\\x42::`pwd`/RWTH-OS/libhermit-0.1/tools/proxy" - HERMIT_ISLE=qemu - HERMIT_CPUS=1 diff --git a/debian/rules b/debian/rules index 32933b96f..e5e8b849f 100755 --- a/debian/rules +++ b/debian/rules @@ -3,41 +3,18 @@ # output every command that modifies files on the build system. #export DH_VERBOSE = 1 - # see FEATURE AREAS in dpkg-buildflags(1) #export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_BUILD_OPTS = nocheck -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - - %: - dh $@ #--with autotools_dev + dh $@ --parallel - -# dh_make generated override targets -# This is example for Cmake (See https://bugs.debian.org/641051 ) override_dh_auto_configure: - dh_auto_configure -- --prefix=/opt/hermit + ./configure --prefix=`pwd`/debian/libhermit/opt/hermit override_dh_auto_test: @echo "tests are disabled" override_dh_auto_install: - mkdir -p debian/libhermit/opt/hermit/x86_64-hermit/lib - mkdir -p debian/libhermit/opt/hermit/x86_64-hermit/include - mkdir -p debian/libhermit/opt/hermit/x86_64-hermit/bin - /usr/bin/install -c -m 644 libhermit.a debian/libhermit/opt/hermit/x86_64-hermit/lib - #/usr/bin/install -c -m 644 usr/ircce/libircce.a debian/libhermit/opt/hermit/x86_64-hermit/lib - #/usr/bin/install -c -m 644 usr/ircce/*.h debian/libhermit/opt/hermit/x86_64-hermit/include - #/usr/bin/install -c -m 644 usr/ircce/libxray.a debian/libhermit/opt/hermit/x86_64-hermit/lib - #/usr/bin/install -c -m 644 usr/ircce/libxray.spec debian/libhermit/opt/hermit/x86_64-hermit/lib - #/usr/bin/install -c -m 644 usr/ircce/libxray.h debian/libhermit/opt/hermit/x86_64-hermit/include - #/usr/bin/install -c -m 644 usr/libomp/libiomp.h debian/libhermit/opt/hermit/x86_64-hermit/lib - #/usr/bin/install -c -m 644 usr/libomp/libgomp.spec debian/libhermit/opt/hermit/x86_64-hermit/lib - #/usr/bin/install -c -m 644 usr/libomp/src/omp.h debian/libhermit/opt/hermit/x86_64-hermit/include - /usr/bin/install -c tools/proxy debian/libhermit/opt/hermit/bin + make install_libhermit