From eb4700e8c249dc486b05701fa4a4ca741253789f Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 4 Feb 2022 18:21:35 +0100 Subject: [PATCH] New release --- FULLNAMES | 2 +- Makefile | 46 ++++++++----------- RELEASE | 2 +- VERSION | 2 +- ...n.spec.in => crx-update-SaltMinion.spec.in | 14 ++++-- init.sls.in | 12 +++-- 6 files changed, 39 insertions(+), 39 deletions(-) rename oss-pkg-SaltMinion.spec.in => crx-update-SaltMinion.spec.in (69%) diff --git a/FULLNAMES b/FULLNAMES index c80b02a..9c582a2 100644 --- a/FULLNAMES +++ b/FULLNAMES @@ -1 +1 @@ -Salt Minion 3002.2.0 (Python 3) +Salt Minion 3002.2 (Python 3) diff --git a/Makefile b/Makefile index d61b85d..27b6b0d 100644 --- a/Makefile +++ b/Makefile @@ -7,36 +7,26 @@ NRELEASE = $(shell echo $(RELEASE) + 1 | bc ) YEAR = $(shell date +%Y ) package: - sed s/VERSION/$(VERSION)/g oss-pkg-$(PACKAGE).spec.in > oss-pkg-$(PACKAGE).spec - sed -i s/RELEASE/$(NRELEASE)/g oss-pkg-$(PACKAGE).spec - sed -i s/PACKAGE/$(PACKAGE)/g oss-pkg-$(PACKAGE).spec - sed -i s/YEAR/$(YEAR)/g oss-pkg-$(PACKAGE).spec + sed s/VERSION/$(VERSION)/g crx-update-$(PACKAGE).spec.in > crx-update-$(PACKAGE).spec + sed -i s/RELEASE/$(NRELEASE)/g crx-update-$(PACKAGE).spec + sed -i s/PACKAGE/$(PACKAGE)/g crx-update-$(PACKAGE).spec + sed -i s/YEAR/$(YEAR)/g crx-update-$(PACKAGE).spec sed s/VERSION/$(VERSION)/g init.sls.in > repo-ng/init.sls ../oss-pkg-tools/create_hash.sh $(PACKAGE) - rm -rf oss-pkg-$(PACKAGE) - mkdir -p oss-pkg-$(PACKAGE) - sed s/PACKAGE/$(PACKAGE)/g $(PACKAGE).sls > oss-pkg-$(PACKAGE)/$(PACKAGE).sls - if [ -d repo-ng ]; then cd oss-pkg-$(PACKAGE); ln -s ../repo-ng; cd ..; fi - tar hjcvpf oss-pkg-$(PACKAGE).tar.bz2 oss-pkg-$(PACKAGE) - rm -rf oss-pkg-$(PACKAGE) - mv oss-pkg-$(PACKAGE).tar.bz2 /usr/src/packages/SOURCES/ - rpmbuild -bb oss-pkg-$(PACKAGE).spec - find $(REPO)/noarch -name "oss-pkg-$(PACKAGE)-$(VERSION)-*.rpm" -exec rm {} \; - mv /usr/src/packages/RPMS/noarch/oss-pkg-$(PACKAGE)-$(VERSION)-$(NRELEASE).noarch.rpm $(REPO)/noarch + rm -rf crx-update-$(PACKAGE) + mkdir -p crx-update-$(PACKAGE) + sed s/VERSION/$(VERSION)/g 100-update-salt.sh.in > crx-update-$(PACKAGE)/100-update-salt.sh + chmod 755 crx-update-$(PACKAGE)/100-update-salt.sh + sed s/PACKAGE/$(PACKAGE)/g $(PACKAGE).sls > crx-update-$(PACKAGE)/$(PACKAGE).sls + if [ -d repo-ng ]; then cd crx-update-$(PACKAGE); ln -s ../repo-ng; cd ..; fi + tar hjcvpf crx-update-$(PACKAGE).tar.bz2 crx-update-$(PACKAGE) + rm -rf crx-update-$(PACKAGE) + mv crx-update-$(PACKAGE).tar.bz2 /usr/src/packages/SOURCES/ + rpmbuild -bb crx-update-$(PACKAGE).spec + cp /usr/src/packages/RPMS/noarch/crx-update-$(PACKAGE)-$(VERSION)-$(NRELEASE).noarch.rpm /srv/www/repo/CRANIX/4.3/noarch + mv /usr/src/packages/RPMS/noarch/crx-update-$(PACKAGE)-$(VERSION)-$(NRELEASE).noarch.rpm /srv/www/repo/CRANIX/4.4/noarch + createrepo /srv/www/repo/CRANIX/4.3/ + createrepo /srv/www/repo/CRANIX/4.4/ echo $(NRELEASE) > RELEASE git commit -a -m "New release" - createrepo $(REPO) - git push -init: - rm -fr .git - mv oss-pkg-packages.spec.in oss-pkg-$(PACKAGE).spec.in - sed -i 's/PACKAGE/$(PACKAGE)/g' oss-pkg-$(PACKAGE).spec.in - mkdir repo-ng - sed -i 's/PACKAGE/$(PACKAGE)/g' init.sls.in - mv temlate.sls $(PACKAGE).sls - sed -i 's/PACKAGE/$(PACKAGE)/g' $(PACKAGE).sls - git init - git add . - git commit -am "Initial version of $(PACKAGE)" - echo "Do not forget to adapt VERSION and the FULLNAMES file" diff --git a/RELEASE b/RELEASE index d00491f..0cfbf08 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -1 +2 diff --git a/VERSION b/VERSION index 84d564f..4673166 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3002.2.0 +3002.2 diff --git a/oss-pkg-SaltMinion.spec.in b/crx-update-SaltMinion.spec.in similarity index 69% rename from oss-pkg-SaltMinion.spec.in rename to crx-update-SaltMinion.spec.in index 364eafe..c6ad6ca 100644 --- a/oss-pkg-SaltMinion.spec.in +++ b/crx-update-SaltMinion.spec.in @@ -1,10 +1,10 @@ # -# Spec file for SaltMinion +# Spec file for SaltMinion Update # Copyright (c) YEAR Helmuth Varkoly and Peter Varkoly Nuremberg, Germany. All rights reserved. # -Name: oss-pkg-SaltMinion -Summary: Package to install SaltMinion on OSS-Clients +Name: crx-update-SaltMinion +Summary: Package to install SaltMinion on CRANIX-Clients Version: VERSION Release: RELEASE License: GPL-2.0 @@ -38,8 +38,10 @@ Authors: mkdir -p %{buildroot}/srv/salt/win/repo-ng/SaltMinion mkdir -p %{buildroot}/srv/salt/packages/ +mkdir -p %{buildroot}/usr/share/cranix/plugins/clients/start/ cp SaltMinion.sls %{buildroot}/srv/salt/packages/ cp -a repo-ng/* %{buildroot}/srv/salt/win/repo-ng/SaltMinion +cp 100-update-salt.sh %{buildroot}/usr/share/cranix/plugins/clients/start/ %clean rm -rf %{buildroot} @@ -51,8 +53,14 @@ rm -rf %{buildroot} /usr/sbin/crx_api_post_file.sh 'softwares/add' /srv/salt/win/repo-ng/SaltMinion/HASH.json %files +%dir /usr/share/cranix/ +%dir /usr/share/cranix/plugins/ +%dir /usr/share/cranix/plugins/clients/ +%dir /usr/share/cranix/plugins/clients/start %defattr(644,root,root) /srv/salt/win/repo-ng/SaltMinion /srv/salt/packages/SaltMinion.sls +%defattr(755,root,root) +/usr/share/cranix/plugins/clients/start/100-update-salt.sh diff --git a/init.sls.in b/init.sls.in index f772bec..7ad7383 100644 --- a/init.sls.in +++ b/init.sls.in @@ -13,16 +13,18 @@ {% else %} {% set ARCH = "x86" %} {% endif %} +{% set version = "VERSION" %} +{% set name = grains['id'] %} SaltMinion: - 'VERSION': - full_name: 'Salt Minion 3002.2.0 (Python 3)' + '{{ version }}': + full_name: 'Salt Minion {{ version }} (Python 3)' {% if ARCH == 'x64' %} - installer: salt://win/repo-ng/SaltMinion/Salt-Minion-3002.2-Py3-AMD64-Setup.exe + installer: salt://win/repo-ng/SaltMinion/Salt-Minion-{{ version }}-Py3-AMD64-Setup.exe {% else %} - installer: salt://win/repo-ng/SaltMinion/Salt-Minion-3002.2-Py3-x86-Setup.exe + installer: salt://win/repo-ng/SaltMinion/Salt-Minion-{{ version }}-Py3-x86-Setup.exe {% endif %} - install_flags: '/S' + install_flags: '/S /master=admin /minion-name={{ name }}' locale: de_DE msiexec: False reboot: False -- 2.43.0