Skip to content

Update to build with libdaos 1.2.0 #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+259 −171
Open

Update to build with libdaos 1.2.0 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions hdf5.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
%{!?_fmoddir:%global _fmoddir %{_libdir}/gfortran/modules}

%global daos_major 0
%global daos_major 1

# Patch version?
%global snaprel %{nil}
Expand All @@ -13,7 +13,7 @@
# You need to recompile all users of HDF5 for each version change
Name: hdf5
Version: %{major}.%{minor}
Release: 4%{?dist}
Release: 5%{?dist}
Summary: A general purpose library and file format for storing scientific data
License: BSD
URL: https://portal.hdfgroup.org/display/HDF5/HDF5
Expand Down Expand Up @@ -607,6 +607,9 @@ done
%endif

%changelog
* Thu Oct 08 2020 Maureen Jean <[email protected]> - 1.12.0-5
- Rebuild for libdaos 1.2.0

* Mon Aug 24 2020 Maureen Jean <[email protected]> - 1.12.0-4
- Fix SLES15 mpi include and lib paths

Expand Down
4 changes: 2 additions & 2 deletions packaging/Dockerfile.centos.7
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2018-2019, Intel Corporation
# Copyright 2018-2020, Intel Corporation
#
# 'recipe' for Docker to build an RPM
#
Expand Down Expand Up @@ -28,7 +28,7 @@ RUN echo "$USER:$PASSWD" | chpasswd
RUN usermod -a -G mock $USER

# mock in Docker needs to use the old-chroot option
RUN grep use_nspawn || \
RUN grep use_nspawn /etc/mock/site-defaults.cfg || \
echo "config_opts['use_nspawn'] = False" >> /etc/mock/site-defaults.cfg

RUN chmod g+w /etc/mock/default.cfg
4 changes: 2 additions & 2 deletions packaging/Dockerfile.mockbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2018-2019, Intel Corporation
# Copyright 2018-2020, Intel Corporation
#
# 'recipe' for Docker to build an RPM
#
Expand All @@ -25,7 +25,7 @@ RUN echo "$USER:$PASSWD" | chpasswd
RUN usermod -a -G mock $USER

# mock in Docker needs to use the old-chroot option
RUN grep use_nspawn || \
RUN grep use_nspawn /etc/mock/site-defaults.cfg || \
echo "config_opts['use_nspawn'] = False" >> /etc/mock/site-defaults.cfg

RUN chmod g+w /etc/mock/*
29 changes: 0 additions & 29 deletions packaging/Dockerfile.ubuntu.18.04
View file
Open in desktop

This file was deleted.

39 changes: 39 additions & 0 deletions packaging/Dockerfile.ubuntu.20.04
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#
# Copyright 2019-2020, Intel Corporation
#
# 'recipe' for Docker to build an Debian package
#
# Pull base image
FROM ubuntu:20.04
MAINTAINER daos-stack <[email protected]>

# use same UID as host and default value of 1000 if not specified
ARG UID=1000
ARG REPO_URL=""
ARG REPO_UBUNTU_20_04=""

# Install basic tools
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
autoconf bash curl debhelper dh-make dpkg-dev doxygen gcc \
git git-buildpackage locales make patch pbuilder rpm wget \
ca-certificates scons python3-distutils pkg-config \
python3-dev python3-distro

# rpmdevtools
RUN echo "deb [trusted=yes] ${REPO_URL}${REPO_UBUNTU_20_04} focal main" > /etc/apt/sources.list.d/daos-stack-ubuntu-stable-local.list
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
rpmdevtools

# Add build user (to keep chrootbuild happy)
ENV USER build
RUN useradd -u $UID -ms /bin/bash $USER

# need to run the build command as root, as it needs to chroot
RUN if ! grep "^#includedir /etc/sudoers.d" /etc/sudoers; then \
echo "#includedir /etc/sudoers.d" >> /etc/sudoers; \
fi; \
echo "Defaults env_keep += \"DPKG_GENSYMBOLS_CHECK_LEVEL\"" > /etc/sudoers.d/build; \
echo "build ALL=(ALL) NOPASSWD: /usr/sbin/pbuilder" >> /etc/sudoers.d/build; \
chmod 0440 /etc/sudoers.d/build; \
visudo -c; \
sudo -l -U build
27 changes: 16 additions & 11 deletions packaging/Makefile_distro_vars.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
DOT := .

DOCKER := docker

# Find out what we are
ID_LIKE := $(shell . /etc/os-release; echo $$ID_LIKE)
ID_LIKE := $(shell . /etc/os-release; echo $$ID_LIKE)
# Of course that does not work for SLES-12
ID := $(shell . /etc/os-release; echo $$ID)
VERSION_ID := $(shell . /etc/os-release; echo $$VERSION_ID)
ID := $(shell . /etc/os-release; echo $$ID)
VERSION_ID := $(shell . /etc/os-release; echo $$VERSION_ID)
VERSION_CODENAME := $(shell . /etc/os-release; echo $$VERSION_CODENAME)

ifeq ($(ID_LIKE),debian)
UBUNTU_VERS := $(shell . /etc/os-release; echo $$VERSION)
ifeq ($(VERSION_ID),19.04)
# Bug - distribution is set to "devel"
DISTRO_ID_OPT = --distribution disco
endif
DISTRO_ID := ubuntu$(VERSION_ID)
DISTRO_BASE = $(basename UBUNTU_$(VERSION_ID))
SPECTOOL := spectool
UBUNTU_VERS := $(shell . /etc/os-release; echo $$VERSION)
DISTRO_ID_OPT := --distribution $(VERSION_CODENAME)
DISTRO_ID := ubuntu$(VERSION_ID)
VERSION_ID_STR := $(subst $(DOT),_,$(VERSION_ID))
DISTRO_BASE := UBUNTU_$(VERSION_ID_STR)
endif
ifeq ($(ID),fedora)
SPECTOOL := spectool
DOCKER := podman
SPECTOOL := spectool
# a Fedora-based mock builder
# derive the the values of:
# VERSION_ID (i.e. 7)
Expand Down
Loading