mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-28 16:34:13 +01:00
make-packages: Include systemd unit with RPM
Don't forget to include the /etc/systemd/system/ejabberd.service unit with the RPM package. Closes #3816.
This commit is contained in:
parent
99064548e8
commit
cac31f9325
@ -160,9 +160,10 @@ make_package()
|
|||||||
{
|
{
|
||||||
local output_type="$1"
|
local output_type="$1"
|
||||||
local architecture="$(package_architecture "$2")"
|
local architecture="$(package_architecture "$2")"
|
||||||
local dir="$3"
|
local work_dir="$3"
|
||||||
|
local include_dirs="$4"
|
||||||
|
|
||||||
cd "$dir" # FPM's "--chdir" option doesn't work (as I'd expect).
|
cd "$work_dir" # FPM's "--chdir" option doesn't work (as I'd expect).
|
||||||
fpm --output-type "$output_type" \
|
fpm --output-type "$output_type" \
|
||||||
--input-type 'dir' \
|
--input-type 'dir' \
|
||||||
--name "$rel_name" \
|
--name "$rel_name" \
|
||||||
@ -194,7 +195,7 @@ make_package()
|
|||||||
--before-upgrade './before-install' \
|
--before-upgrade './before-install' \
|
||||||
--after-upgrade './after-upgrade' \
|
--after-upgrade './after-upgrade' \
|
||||||
--after-remove './after-remove' \
|
--after-remove './after-remove' \
|
||||||
'./opt' './usr'
|
$include_dirs
|
||||||
cd "$OLDPWD"
|
cd "$OLDPWD"
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -228,10 +229,10 @@ do
|
|||||||
"$etc_dir/systemd/system/$rel_name.service" "$arch_dir/$rel_name"
|
"$etc_dir/systemd/system/$rel_name.service" "$arch_dir/$rel_name"
|
||||||
|
|
||||||
create_scripts "$arch_dir"
|
create_scripts "$arch_dir"
|
||||||
make_package 'rpm' "$arch" "$arch_dir"
|
make_package 'rpm' "$arch" "$arch_dir" './opt ./usr ./etc'
|
||||||
mv "$etc_dir/systemd/system/$rel_name.service" "$arch_dir"
|
mv "$etc_dir/systemd/system/$rel_name.service" "$arch_dir"
|
||||||
rm -r "$etc_dir"
|
rm -r "$etc_dir"
|
||||||
make_package 'deb' "$arch" "$arch_dir"
|
make_package 'deb' "$arch" "$arch_dir" './opt ./usr'
|
||||||
mv "$arch_dir/$rel_name"?$rel_vsn*.??? .
|
mv "$arch_dir/$rel_name"?$rel_vsn*.??? .
|
||||||
done
|
done
|
||||||
echo "$myself: Created DEB and RPM packages successfully."
|
echo "$myself: Created DEB and RPM packages successfully."
|
||||||
|
Loading…
Reference in New Issue
Block a user