From d5c2ed1755c16ddf27b2eb018824a1226af99423 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Tue, 22 Aug 2023 14:55:10 -0700
Subject: Packages: added wasm module packaging for rpm-based distros.

---
 pkg/rpm/Makefile | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'pkg/rpm/Makefile')

diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
index d3cc34bd..0573bd4c 100644
--- a/pkg/rpm/Makefile
+++ b/pkg/rpm/Makefile
@@ -64,6 +64,7 @@ include Makefile.perl
 include Makefile.jsc-common
 include Makefile.jsc8
 include Makefile.jsc11
+include Makefile.wasm
 endif
 
 ifeq ($(OSVER), centos9)
@@ -74,6 +75,7 @@ include Makefile.perl
 include Makefile.jsc-common
 include Makefile.jsc8
 include Makefile.jsc11
+include Makefile.wasm
 endif
 
 ifeq ($(OSVER), amazonlinux2)
@@ -84,6 +86,7 @@ include Makefile.go
 include Makefile.perl
 include Makefile.jsc-common
 include Makefile.jsc8
+include Makefile.wasm
 endif
 
 ifeq ($(OSVER), amazonlinux2023)
@@ -94,6 +97,7 @@ include Makefile.go
 include Makefile.perl
 include Makefile.jsc-common
 include Makefile.jsc17
+include Makefile.wasm
 endif
 
 ifeq ($(OSVER), fedora)
@@ -105,6 +109,7 @@ include Makefile.ruby
 include Makefile.jsc-common
 include Makefile.jsc8
 include Makefile.jsc11
+include Makefile.wasm
 endif
 
 ifeq ($(OSVER), fedora37)
@@ -116,6 +121,7 @@ include Makefile.ruby
 include Makefile.jsc-common
 include Makefile.jsc8
 include Makefile.jsc11
+include Makefile.wasm
 endif
 
 CONFIGURE_ARGS_COMMON=\
@@ -216,6 +222,7 @@ rpmbuild/SPECS/unit-%.spec: unit.module.spec.in ../../docs/changes.xml | rpmbuil
 	done ; \
 	pkgname=$(shell echo $@ | cut -d '/' -f 3 | tr '_' '-' | cut -d '.' -f 1) ; \
 	definitions=`echo "$$MODULE_DEFINITIONS_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
+	prebuild=`echo "$$MODULE_PREBUILD_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
 	preinstall=`echo "$$MODULE_PREINSTALL_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
 	postinstall=`echo "$$MODULE_POSTINSTALL_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
 	files=`echo "$$MODULE_FILES_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \
@@ -234,6 +241,7 @@ rpmbuild/SPECS/unit-%.spec: unit.module.spec.in ../../docs/changes.xml | rpmbuil
 		-e "s#%%MODULE_MAKEARGS%%#$(MODULE_MAKEARGS_$*)#g" \
 		-e "s#%%MODULE_INSTARGS%%#$(MODULE_INSTARGS_$*)#g" \
 		-e "s#%%MODULE_DEFINITIONS%%#$${definitions}#g" \
+		-e "s#%%MODULE_PREBUILD%%#$${prebuild}#g" \
 		-e "s#%%MODULE_PREINSTALL%%#$${preinstall}#g" \
 		-e "s#%%MODULE_POSTINSTALL%%#$${postinstall}#g" \
 		-e "s#%%MODULE_FILES%%#$${files}#g" \
-- 
cgit 


From ffc6e6b08f4c5a6558f0cc85e597f9d7ae17701a Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Tue, 22 Aug 2023 14:55:10 -0700
Subject: Packages: specify runstatedir and logdir explicitely.

---
 pkg/rpm/Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pkg/rpm/Makefile')

diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
index 0573bd4c..355f8a59 100644
--- a/pkg/rpm/Makefile
+++ b/pkg/rpm/Makefile
@@ -128,7 +128,9 @@ CONFIGURE_ARGS_COMMON=\
 	--prefix=/usr \
 	--statedir=%{_sharedstatedir}/unit \
 	--control="unix:/var/run/unit/control.sock" \
+	--runstatedir=/var/run \
 	--pid=/var/run/unit/unit.pid \
+	--logdir=/var/log \
 	--log=/var/log/unit/unit.log \
 	--tmpdir=/var/tmp \
 	--user=unit \
-- 
cgit