Skip to content

Commit

Permalink
Minimal bundle for RPM. #1455
Browse files Browse the repository at this point in the history
  • Loading branch information
mfeit-internet2 committed Jul 8, 2024
1 parent 5d6b764 commit ac1664c
Show file tree
Hide file tree
Showing 30 changed files with 721 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ TO_CLEAN += $(BUILD_LOG)

# Minimal build

MINIMAL_STOP_AT=pscheduler-archiver-bitbucket
MINIMAL_STOP_AT=pscheduler-minimal-marker
minimal:
$(MAKE) 'STOP=$(MINIMAL_STOP_AT)'

Expand Down
2 changes: 2 additions & 0 deletions pscheduler-bundle-minimal/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Ignore those files when creating a tarball with `git archive`
debian/ export-ignore
79 changes: 79 additions & 0 deletions pscheduler-bundle-minimal/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
#
# Makefile for pScheduler extras bundle
#

# This makefile auto-generates RPM spec and Debian control files based
# on the build list and then uses Makefile-package to build it the
# usual way.

# TODO: This bundle doesn't fix the need to have select
# repos-preinstalled into YUM. Should maybe write a package that does
# that.

BUNDLE=none
NAME=pscheduler-bundle-minimal

PACKAGE_MAKEFILE=Makefile-package

# Name of the package that marks the end of a minimal install. Note
# that this package will not be included in the bundle.
STOP_AT_PACKAGE=pscheduler-minimal-marker

default: build


UNIBUILD_ORDER := unibuild order \
--file ../unibuild-order \
--buildable \
| sed -e '/$(STOP_AT_PACKAGE)/,//d'

SPEC=./unibuild-packaging/rpm/$(NAME).spec
$(SPEC):
cat $(SPEC)-top > $@
$(UNIBUILD_ORDER) \
| egrep -e '^pscheduler-' \
| egrep -ve '^pscheduler-bundle-' \
| sed -e 's/^/Requires: /g' \
>> $@
cat $(SPEC)-bottom >> $@
TO_BUILD += $(SPEC)

CONTROL=./unibuild-packaging/deb/control
$(CONTROL):
cat $(CONTROL)-top > $@
$(UNIBUILD_ORDER) \
| egrep -e '^pscheduler-' \
| egrep -ve '^pscheduler-bundle-' \
| sed -e 's/^/ /g; $$ ! s/$$/,/g' \
>> $@
cat $(CONTROL)-bottom >> $@
TO_BUILD += $(CONTROL)


# These add compatibility with the generic package makefile template's
# targets.

TO_CLEAN += $(TO_BUILD)

clean c:
$(MAKE) $(TO_BUILD)
$(MAKE) -f $(PACKAGE_MAKEFILE) $@
rm -rf $(TO_CLEAN) *~

build b install i rpmdump d r cb cbd cbr cbi srpm:
$(MAKE) $(TO_BUILD)
$(MAKE) -f $(PACKAGE_MAKEFILE) $@

cbic cbdc cbrc:
$(MAKE) $(TO_BUILD)
$(MAKE) -f $(PACKAGE_MAKEFILE) $@
$(MAKE) clean


# This is to keep the global uninstall target happy.
uninstall:
@echo Nothing to do here.

# Unibuild triggers this.
install-products:
$(MAKE) -f $(PACKAGE_MAKEFILE) $@
5 changes: 5 additions & 0 deletions pscheduler-bundle-minimal/Makefile-package
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#
# Makefile for Any Package
#

include unibuild/unibuild.make
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
control
239 changes: 239 additions & 0 deletions pscheduler-bundle-minimal/unibuild-packaging/deb/changelog
Original file line number Diff line number Diff line change
@@ -0,0 +1,239 @@
pscheduler-bundle-full (5.2.0~a1.0-1) perfsonar-5.2-snapshot; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Tue, 11 Jun 2024 18:29:36 +0200

pscheduler-bundle-full (5.1.1) perfsonar-5.1; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Fri, 28 Jun 2024 10:50:50 -0400

pscheduler-bundle-full (5.1.0) perfsonar-5.1; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Mon, 10 Jun 2024 10:42:20 +0200

pscheduler-bundle-full (5.0.8.4) perfsonar-5.0; urgency=low

* Not using revision number as it is a Debian native package.

-- Lætitia Delvaux <adelvaux@man.poznan.pl> Mon, 22 Apr 2024 16:56:49 +0200

pscheduler-bundle-full (5.0.7-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Mon, 11 Dec 2023 11:09:20 -0500

pscheduler-bundle-full (5.0.6-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Fri, 10 Nov 2023 15:29:52 -0500

pscheduler-bundle-full (5.0.5-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Wed, 27 Sep 2023 10:27:48 -0400

pscheduler-bundle-full (5.0.4-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Mon, 24 Jul 2023 11:15:49 -0400

pscheduler-bundle-full (5.0.3-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Fri, 16 Jun 2023 12:43:25 -0400

pscheduler-bundle-full (5.0.2-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Fri, 02 Jun 2023 08:59:18 -0700

pscheduler-bundle-full (5.0.1-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Wed, 19 Apr 2023 15:50:16 -0400

pscheduler-bundle-full (5.0.0-1) perfsonar-5.0; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Thu, 13 Apr 2023 20:34:22 -0400

pscheduler-bundle-full (4.4.6-2) perfsonar-4.4; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Wed, 09 Nov 2022 20:23:12 +0000

pscheduler-bundle-full (4.4.5-2) perfsonar-4.4; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Mon, 26 Sep 2022 18:23:19 +0000

pscheduler-bundle-full (4.4.4-1) perfsonar-4.4; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Mon, 04 Apr 2022 13:04:06 -0400

pscheduler-bundle-full (4.4.3-1) perfsonar-4.4; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Thu, 03 Feb 2022 15:54:24 -0500

pscheduler-bundle-full (4.4.2-1) perfsonar-4.4; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Wed, 12 Jan 2022 09:57:04 -0500

pscheduler-bundle-full (4.4.1-1) perfsonar-4.4; urgency=low

* New upstream version.

-- Antoine Delvaux <antoine.delvaux@man.poznan.pl> Thu, 26 Aug 2021 03:17:22 +0100

pscheduler-bundle-full (4.4.0-1) perfsonar-4.4; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Wed, 07 Jul 2021 15:32:38 +0000

pscheduler-bundle-full (4.3.3-1) perfsonar-4.3; urgency=low

* New upstream version.
* Moving pscheduler-tool-curl to full bundle.

-- perfSONAR developers <debian@perfsonar.net> Tue, 02 Feb 2021 16:35:32 +0000

pscheduler-bundle-full (4.3.2-1) perfsonar-4.3; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Wed, 18 Nov 2020 15:41:13 +0000

pscheduler-bundle-full (4.3.0-1) perfsonar-4.3; urgency=low

* Introducing pscheduler-bundle-full-nos3 for architectures not able to run
the S3-benchmark tool.

-- perfSONAR developers <debian@perfsonar.net> Fri, 30 Oct 2020 13:49:58 +0000

pscheduler-bundle-full (4.3.0~b1.3-1) perfsonar-4.3; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Tue, 06 Oct 2020 18:26:18 +0000

pscheduler-bundle-full (4.2.4-1) perfsonar-4.2; urgency=low

* New upstream version.

-- perfSONAR developers <debian@perfsonar.net> Wed, 25 Mar 2020 15:36:56 -0400

pscheduler-bundle-full (4.2.3-1) perfsonar-4.2; urgency=low

* New upstream version.

-- Antoine Delvaux <antoine.delvaux@man.poznan.pl> Mon, 24 Feb 2020 14:32:17 +0000

pscheduler-bundle-full (4.2.1-1) perfsonar-4.2; urgency=low

* New upstream version.

-- Antoine Delvaux <antoine.delvaux@man.poznan.pl> Wed, 02 Oct 2019 23:07:24 +0000

pscheduler-bundle-full (4.2.0-1) perfsonar-minor-staging; urgency=low

* New upstream version
* Adding pscheduler-archiver-kafka to the bundle
* Building on Stretch.

-- Antoine Delvaux <antoine.delvaux@man.poznan.pl> Fri, 16 Aug 2019 11:01:41 +0000

pscheduler-bundle-full (1.1.5-1) perfsonar-release; urgency=low

* New upstream version

-- Antoine Delvaux <antoine.delvaux@man.poznan.pl> Tue, 18 Dec 2018 21:55:32 +0000

pscheduler-bundle-full (1.1.2-1) perfsonar-release; urgency=low

* New upstream version

-- Antoine Delvaux <antoine.delvaux@man.poznan.pl> Wed, 24 Oct 2018 16:49:49 +0100

pscheduler-bundle-full (1.1.1-1) perfsonar-release; urgency=low

* New upstream version

-- Antoine Delvaux <antoine.delvaux@man.poznan.pl> Fri, 24 Aug 2018 18:25:55 +0000

pscheduler-bundle-full (1.1-1) perfsonar-release; urgency=low

* New upstream version
* Adding pscheduler-test-http, pscheduler-tool-psurl, pscheduler-tool-twamp
* Moving bwctl related plugins to pscheduler-bundle-extras

-- Antoine Delvaux <antoine.delvaux@man.poznan.pl> Mon, 13 Aug 2018 19:38:02 +0000

pscheduler-bundle-full (1.0.2.6-1) perfsonar-jessie-release; urgency=low

* New upstream version

-- Antoine Delvaux <antoine.delvaux@man.poznan.pl> Sun, 04 Mar 2018 23:17:19 +0000

pscheduler-bundle-full (1.0.2.3-1) perfsonar-jessie-release; urgency=low

* New upstream version

-- Antoine Delvaux <antoine.delvaux@man.poznan.pl> Thu, 25 Jan 2018 16:11:08 +0000

pscheduler-bundle-full (1.0.2-1) perfsonar-jessie-release; urgency=low

* New upstream version

-- Antoine Delvaux <antoine.delvaux@man.poznan.pl> Mon, 27 Nov 2017 14:44:56 +0000

pscheduler-bundle-full (1.0.1.1-1) perfsonar-jessie-release; urgency=low

* New upstream version

-- Antoine Delvaux <antoine.delvaux@man.poznan.pl> Tue, 15 Aug 2017 11:50:23 +0100

pscheduler-bundle-full (1.0.0.5-1) perfsonar-jessie-release; urgency=low

* New upstream version

-- Antoine Delvaux <antoine.delvaux@man.poznan.pl> Wed, 14 Jun 2017 19:03:49 +0000

pscheduler-bundle-full (1.0.0.2-1) perfsonar-jessie-release; urgency=low

* New upstream version

-- Antoine Delvaux <antoine.delvaux@man.poznan.pl> Fri, 05 May 2017 12:57:44 +0000

pscheduler-bundle-full (1.0-1) perfsonar-jessie-release; urgency=low

* New upstream version

-- Antoine Delvaux <antoine.delvaux@man.poznan.pl> Thu, 13 Apr 2017 11:49:01 +0000

pscheduler-bundle-full (0.0-1) unstable; urgency=low

* Initial release

-- Valentin Vidic <Valentin.Vidic@CARNet.hr> Mon, 11 Jul 2016 13:12:09 +0200
1 change: 1 addition & 0 deletions pscheduler-bundle-minimal/unibuild-packaging/deb/compat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
10
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Description: Minimally-functional pScheduler Bundle
Minimally-functional pScheduler Bundle
14 changes: 14 additions & 0 deletions pscheduler-bundle-minimal/unibuild-packaging/deb/control-top
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Source: pscheduler-bundle-minimal
Section: net
Priority: optional
Maintainer: perfSONAR developers <debian@perfsonar.net>
Uploaders: Antoine Delvaux <antoine.delvaux@man.poznan.pl>
Build-Depends: debhelper (>= 10)
Standards-Version: 3.9.8
Homepage: https://github.com/perfsonar/pscheduler
Vcs-Git: git://github.com/perfsonar/pscheduler
Vcs-Browser: https://github.com/perfsonar/pscheduler

Package: pscheduler-bundle-minimal
Architecture: all
Depends:
27 changes: 27 additions & 0 deletions pscheduler-bundle-minimal/unibuild-packaging/deb/copyright
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: pscheduler-bundle-full
Source: https://github.com/perfsonar/pscheduler

Files: *
Copyright: 2016-2020 perfSONAR project
License: Apache-2.0

Files: debian/*
Copyright: 2016-2020 perfSONAR project
License: Apache-2.0

License: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
.
http://www.apache.org/licenses/LICENSE-2.0
.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
.
On Debian systems, the complete text of the Apache version 2.0 license
can be found in "/usr/share/common-licenses/Apache-2.0".
Loading

0 comments on commit ac1664c

Please sign in to comment.