Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.package
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ivan Tyagov
slapos.package
Commits
790fe186
Commit
790fe186
authored
Sep 02, 2022
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
obs/slapos: fix use shorter name
fixup for
203927d9
The directory must be correct in slapos.spec.
parent
203927d9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
11 deletions
+9
-11
obs/slapos/release_configuration.sh
obs/slapos/release_configuration.sh
+1
-1
obs/slapos/templates/slapos.spec.in
obs/slapos/templates/slapos.spec.in
+8
-10
No files found.
obs/slapos/release_configuration.sh
View file @
790fe186
...
...
@@ -13,9 +13,9 @@ CURRENT_DIRECTORY="$(pwd)"
# Development Section
OBS_DIRECTORY
=
$CURRENT_DIRECTORY
/home:VIFIBnexedi:branches:home:VIFIBnexedi/SlapOS-Node
VERSION_REGEX
=
"s/
\%
RECIPE_VERSION
\%
/
$RECIPE_VERSION
/g;s/
\%
VERSION
\%
/
$VERSION
/g;s/
\%
RELEASE
\%
/
$RELEASE
/g"
TEMPLATES_DIRECTORY
=
$CURRENT_DIRECTORY
/templates
SLAPOS_ORGINAL_DIRECTORY
=
slapos-node
SLAPOS_DIRECTORY
=
sn_
$VERSION
+
$RECIPE_VERSION
+
$RELEASE
VERSION_REGEX
=
"s/
\%
RECIPE_VERSION
\%
/
$RECIPE_VERSION
/g;s/
\%
VERSION
\%
/
$VERSION
/g;s/
\%
RELEASE
\%
/
$RELEASE
/g;s/
\%
SLAPOS_DIRECTORY
\%
/
$SLAPOS_DIRECTORY
/g"
export
SSL_CERT_FILE
=
/etc/ssl/certs/ca-certificates.crt
obs/slapos/templates/slapos.spec.in
View file @
790fe186
...
...
@@ -29,9 +29,7 @@
%define slapversion %RECIPE_VERSION%
%define version %VERSION%
%define unmangled_version %VERSION%
%define unmangled_version %VERSION%
%define slapos_directory %SLAPOS_DIRECTORY%
%define release_number %RELEASE%
...
...
@@ -41,7 +39,7 @@ Version:%{slapversion}
Release:%{release_number}
License:GPL
Group: Application/Network
Source0:
slapos-node_%{unmangled_version}+%{slapversion}+%{release_number
}.tar.gz
Source0:
%{slapos_directory
}.tar.gz
URL: http://community.slapos.org/
Vendor: Vifib
Packager: Thomas Gambier <thomas.gambier@nexedi.com>
...
...
@@ -82,21 +80,21 @@ Conflicts: firewalld
%prep
rm -rf $RPM_BUILD_DIR/
slapos-node_%{unmangled_version}+%{slapversion}+%{release_number
}
zcat $RPM_SOURCE_DIR/
slapos-node_%{unmangled_version}+%{slapversion}+%{release_number
}.tar.gz | tar -xvf -
rm -rf $RPM_BUILD_DIR/
%{slapos_directory
}
zcat $RPM_SOURCE_DIR/
%{slapos_directory
}.tar.gz | tar -xvf -
%build
cd $RPM_BUILD_DIR/
slapos-node_%{unmangled_version}+%{slapversion}+%{release_number
}
cd $RPM_BUILD_DIR/
%{slapos_directory
}
make
%install
cd $RPM_BUILD_DIR/
slapos-node_%{unmangled_version}+%{slapversion}+%{release_number}/
cd $RPM_BUILD_DIR/
%{slapos_directory}
make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT/etc/cron.d/
cp $RPM_BUILD_DIR/
slapos-node_%{unmangled_version}+%{slapversion}+%{release_number
}/slapos-node.cron.d $RPM_BUILD_ROOT/etc/cron.d/slapos-node
cp $RPM_BUILD_DIR/
%{slapos_directory
}/slapos-node.cron.d $RPM_BUILD_ROOT/etc/cron.d/slapos-node
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d/
cp $RPM_BUILD_DIR/
slapos-node_%{unmangled_version}+%{slapversion}+%{release_number
}/slapos-node.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/slapos.logrotate.conf
cp $RPM_BUILD_DIR/
%{slapos_directory
}/slapos-node.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/slapos.logrotate.conf
mkdir -p $RPM_BUILD_ROOT/etc/systemd/system/
mkdir -p $RPM_BUILD_ROOT/opt/slapos/log
rm -rf $RPM_BUILD_ROOT/opt/slapos/eggs/setuptools-*.egg/setuptools/tests/test_easy_install.py
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment