Skip to content
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

Jump to bottom

Add debian packaging #64

Draft
wants to merge 22 commits into
base: daos_adio-rpm
Choose a base branch
from
Draft

Add debian packaging #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ff961bd
Add debian packaging
brianjmurrell Jan 24, 2023
8f0727e
Add mpich-UBUNTU_20_04.spec hack
brianjmurrell Jan 24, 2023
4d04be1
Update packaging.
brianjmurrell Jan 24, 2023
8b9b739
Fixes
brianjmurrell Jan 24, 2023
68d9808
Disable tests
brianjmurrell Jan 24, 2023
407bd64
Fix test disable
brianjmurrell Jan 24, 2023
cebebcc
Fix romio tarball recipe
brianjmurrell Jan 25, 2023
f495a8e
Add EL9 support
brianjmurrell May 23, 2023
f457c52
Update
brianjmurrell May 24, 2023
5d5439e
Hackery for python3_version on EL8
brianjmurrell May 24, 2023
087b75a
BR: perl-lib for EL9 only
brianjmurrell May 24, 2023
31f4e83
Fix romio-tarball target
brianjmurrell May 24, 2023
2edd3a6
Add an rpmlintrc file
brianjmurrell May 24, 2023
d3292be
More rpmlintrc exceptions
brianjmurrell May 25, 2023
2db19de
Set RPM version to 4.1~a1 since that is what it is
brianjmurrell May 25, 2023
b61481f
And debian/changelog
brianjmurrell May 25, 2023
45c0e35
Remove %{python3_version} hackery
brianjmurrell May 25, 2023
d7b0a60
Add %{python3_version} debugging
brianjmurrell May 25, 2023
a207945
Use warn instead of echo
brianjmurrell May 25, 2023
4c5c5b8
Add back centos7 build
brianjmurrell May 26, 2023
98e63e5
Fix pragma
brianjmurrell May 26, 2023
ddcad7f
Update packaging
brianjmurrell May 26, 2023
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
9 changes: 4 additions & 5 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/groovy
/* Copyright (C) 2019 Intel Corporation
/* Copyright (C) 2019-2023 Intel Corporation
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -38,11 +38,10 @@
*/
// To use a test branch (i.e. PR) until it lands to master
// I.e. for testing library changes
//@Library(value="pipeline-lib@your_branch") _
@Library(value="pipeline-lib@bmurrell/el9") _

// no debian/ support yet
// no pmix for leap15 yet
packageBuildingPipeline(['distros' : ['centos7', 'el8', 'leap15'],
/* groovylint-disable-next-line CompileStatic */
packageBuildingPipeline(['distros' : ['centos7', 'el8', 'el9', 'leap15', 'ubuntu20.04'],
'publish_branch': 'daos_adio-rpm',
'make args' : 'CHROOT=true -f Makefile-rpm.mk',
'add_make_targets': 'romio-tarball',
Expand Down
52 changes: 30 additions & 22 deletions Makefile-rpm.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,29 +112,37 @@ mpich.spec: FORCE
CHROOT ?= false
CHROOT_NAME ?= epel-7-x86_64

ifeq ($(ID_LIKE),debian)
ROMIO_DIR := BUILD/mpich-$(VERSION)/src/mpi/romio
ROMIO_PREFIX := _topdir
else
ifeq ($(CHROOT),true)
ROMIO_PREFIX := /var/lib/mock/$(CHROOT_NAME)/root/builddir/build
CHROOT_ROMIO_PREFIX := /builddir/build
else
ROMIO_PREFIX := _topdir
endif
ROMIO_DIR := BUILD/mpich-$(DL_VERSION)/src/mpi/romio
endif
romio-$(DL_VERSION).tar.gz: FORCE
set -e; \
if $(CHROOT); then \
romio_prefix=/var/lib/mock/$(CHROOT_NAME)/root/builddir/build; \
chroot_romio_prefix=/builddir/build; \
else \
romio_prefix=_topdir; \
fi; \
romio_dir=BUILD/mpich-$(DL_VERSION)/src/mpi/romio; \
if grep "MPI_LIB = /" $$romio_prefix/$$romio_dir/test/Makefile; then \
trap 'mv $$romio_prefix/$$romio_dir/test/Makefile{.old,}' EXIT; \
mv $$romio_prefix/$$romio_dir/test/Makefile{,.old}; \
sed -e 's/\(MPI_LIB = \)\/\(.*\)/\1-L\/\2/' \
< $$romio_prefix/$$romio_dir/test/Makefile.old \
> $$romio_prefix/$$romio_dir/test/Makefile; \
fi; \
if $(CHROOT); then \
mock -r $(CHROOT_NAME) --chroot \
"make -C $$chroot_romio_prefix/$$romio_dir clean"; \
else \
make -C $$romio_prefix/$$romio_dir clean; \
fi; \
tar -C $$romio_prefix/$$romio_dir/.. --exclude Makefile.old \
set -e; \
if [ -f $(ROMIO_PREFIX)/$(ROMIO_DIR)/test/Makefile ] && \
grep "MPI_LIB = /" $(ROMIO_PREFIX)/$(ROMIO_DIR)/test/Makefile; then \
trap 'mv $(ROMIO_PREFIX)/$(ROMIO_DIR)/test/Makefile{.old,}' EXIT; \
mv $(ROMIO_PREFIX)/$(ROMIO_DIR)/test/Makefile{,.old}; \
sed -e 's/\(MPI_LIB = \)\/\(.*\)/\1-L\/\2/' \
< $(ROMIO_PREFIX)/$(ROMIO_DIR)/test/Makefile.old \
> $(ROMIO_PREFIX)/$(ROMIO_DIR)/test/Makefile; \
fi; \
if [ "$(ID_LIKE)" != "debian" ]; then \
if $(CHROOT); then \
mock -r $(CHROOT_NAME) --chroot \
"make -C $(CHROOT_ROMIO_PREFIX)/$(ROMIO_DIR) clean"; \
else \
make -C $(ROMIO_PREFIX)/$(ROMIO_DIR) clean; \
fi; \
fi; \
tar -C $(ROMIO_PREFIX)/$(ROMIO_DIR)/.. --exclude Makefile.old \
-czf romio-$(DL_VERSION).tar.gz romio

romio-tarball: romio-$(DL_VERSION).tar.gz
Expand Down
Loading