diff options
Diffstat (limited to 'pkg/deb')
| -rw-r--r-- | pkg/deb/Makefile | 4 | ||||
| -rw-r--r-- | pkg/deb/Makefile.go | 2 | ||||
| -rw-r--r-- | pkg/deb/Makefile.go110 | 2 | ||||
| -rw-r--r-- | pkg/deb/Makefile.go17 | 2 | ||||
| -rw-r--r-- | pkg/deb/Makefile.go18 | 2 | ||||
| -rw-r--r-- | pkg/deb/Makefile.go19 | 2 | ||||
| -rw-r--r-- | pkg/deb/debian.module/control-noarch.in | 23 | ||||
| -rwxr-xr-x | pkg/deb/debian.module/rules-noarch.in | 100 |
8 files changed, 2 insertions, 135 deletions
diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 735f283b..2dcf6f50 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -199,7 +199,7 @@ endif 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"` ; \ post=`echo "$$MODULE_POST_$*" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ - cat debian.module/$(if $(MODULE_NOARCH_$*),control-noarch.in,control.in) | sed \ + cat debian.module/control.in | sed \ -e "s#%%NAME%%#unit-$(MODULE_SUFFIX_$*)#g" \ -e "s#%%SUMMARY%%#$(MODULE_SUMMARY_$*)#g" \ -e "s#%%CODENAME%%#$(CODENAME)#g" \ @@ -210,7 +210,7 @@ endif -e "s#%%MODULE_BUILD_DEPENDS%%#$(MODULE_BUILD_DEPENDS_$*)#g" \ -e "s#%%MODULE_DEPENDS%%#$(MODULE_DEPENDS_$*)#g" \ > $@/$(SRCDIR)/debian/control ; \ - cat debian.module/$(if $(MODULE_NOARCH_$*),rules-noarch.in,rules.in) | sed \ + cat debian.module/rules.in | sed \ -e "s#%%NAME%%#unit-$(MODULE_SUFFIX_$*)#g" \ -e "s#%%CODENAME%%#$(CODENAME)#g" \ -e "s#%%UNIT_VERSION%%#$(VERSION)#g" \ diff --git a/pkg/deb/Makefile.go b/pkg/deb/Makefile.go index 2d7d6537..bbade7a3 100644 --- a/pkg/deb/Makefile.go +++ b/pkg/deb/Makefile.go @@ -19,8 +19,6 @@ BUILD_DEPENDS+= $(BUILD_DEPENDS_go) MODULE_BUILD_DEPENDS_go=,golang MODULE_DEPENDS_go=,golang -MODULE_NOARCH_go= true - define MODULE_PREINSTALL_go mkdir -p debian/unit-go/usr/share/doc/unit-go/examples/go-app install -m 644 -p debian/unit.example-go-app debian/unit-go/usr/share/doc/unit-go/examples/go-app/let-my-people.go diff --git a/pkg/deb/Makefile.go110 b/pkg/deb/Makefile.go110 index 863f7c90..9fb3da9d 100644 --- a/pkg/deb/Makefile.go110 +++ b/pkg/deb/Makefile.go110 @@ -19,8 +19,6 @@ BUILD_DEPENDS+= $(BUILD_DEPENDS_go110) MODULE_BUILD_DEPENDS_go110=,golang-1.10 MODULE_DEPENDS_go110=,golang-1.10 -MODULE_NOARCH_go110= true - define MODULE_PREINSTALL_go110 mkdir -p debian/unit-go1.10/usr/share/doc/unit-go1.10/examples/go-app install -m 644 -p debian/unit.example-go-app debian/unit-go1.10/usr/share/doc/unit-go1.10/examples/go-app/let-my-people.go diff --git a/pkg/deb/Makefile.go17 b/pkg/deb/Makefile.go17 index 201b32b2..4c3cc73f 100644 --- a/pkg/deb/Makefile.go17 +++ b/pkg/deb/Makefile.go17 @@ -19,8 +19,6 @@ BUILD_DEPENDS+= $(BUILD_DEPENDS_go17) MODULE_BUILD_DEPENDS_go17=,golang-1.7 MODULE_DEPENDS_go17=,golang-1.7 -MODULE_NOARCH_go17= true - define MODULE_PREINSTALL_go17 mkdir -p debian/unit-go1.7/usr/share/doc/unit-go1.7/examples/go-app install -m 644 -p debian/unit.example-go-app debian/unit-go1.7/usr/share/doc/unit-go1.7/examples/go-app/let-my-people.go diff --git a/pkg/deb/Makefile.go18 b/pkg/deb/Makefile.go18 index 70b155d4..a9db87e0 100644 --- a/pkg/deb/Makefile.go18 +++ b/pkg/deb/Makefile.go18 @@ -19,8 +19,6 @@ BUILD_DEPENDS+= $(BUILD_DEPENDS_go18) MODULE_BUILD_DEPENDS_go18=,golang-1.8 MODULE_DEPENDS_go18=,golang-1.8 -MODULE_NOARCH_go18= true - define MODULE_PREINSTALL_go18 mkdir -p debian/unit-go1.8/usr/share/doc/unit-go1.8/examples/go-app install -m 644 -p debian/unit.example-go-app debian/unit-go1.8/usr/share/doc/unit-go1.8/examples/go-app/let-my-people.go diff --git a/pkg/deb/Makefile.go19 b/pkg/deb/Makefile.go19 index 9ddcc493..43611560 100644 --- a/pkg/deb/Makefile.go19 +++ b/pkg/deb/Makefile.go19 @@ -19,8 +19,6 @@ BUILD_DEPENDS+= $(BUILD_DEPENDS_go19) MODULE_BUILD_DEPENDS_go19=,golang-1.9 MODULE_DEPENDS_go19=,golang-1.9 -MODULE_NOARCH_go19= true - define MODULE_PREINSTALL_go19 mkdir -p debian/unit-go1.9/usr/share/doc/unit-go1.9/examples/go-app install -m 644 -p debian/unit.example-go-app debian/unit-go1.9/usr/share/doc/unit-go1.9/examples/go-app/let-my-people.go diff --git a/pkg/deb/debian.module/control-noarch.in b/pkg/deb/debian.module/control-noarch.in deleted file mode 100644 index e22bb49a..00000000 --- a/pkg/deb/debian.module/control-noarch.in +++ /dev/null @@ -1,23 +0,0 @@ -Source: %%NAME%% -Section: admin -Priority: extra -Maintainer: Andrei Belov <defan@nginx.com> -Build-Depends: debhelper (>= 9), - linux-libc-dev%%MODULE_BUILD_DEPENDS%% -Standards-Version: 3.9.5 -Homepage: https://unit.nginx.org - -Package: %%NAME%% -Section: admin -Architecture: all -Depends: lsb-base, - ${misc:Depends}, - unit (= %%UNIT_VERSION%%-%%UNIT_RELEASE%%~%%CODENAME%%)%%MODULE_DEPENDS%% -Description: %%SUMMARY%% - NGINX Unit is a runtime and delivery environment for modern distributed - applications. It runs the application code in multiple languages - (PHP, Python, Go, etc.), and tightly couples it with traffic delivery - in and out of the application. Take this application server and proxy - directly in the cloud / container environments and fully control your app - dynamically via an API. - This package contains %%SUMMARY%%. diff --git a/pkg/deb/debian.module/rules-noarch.in b/pkg/deb/debian.module/rules-noarch.in deleted file mode 100755 index d75134db..00000000 --- a/pkg/deb/debian.module/rules-noarch.in +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie -export DEB_CFLAGS_MAINT_APPEND=-Wp,-D_FORTIFY_SOURCE=2 -fPIC -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk - -BUILDDIR_unit = $(CURDIR)/debian/build-unit -BUILDDIR_unit_debug = $(CURDIR)/debian/build-unit-debug -INSTALLDIR = $(CURDIR)/debian/%%NAME%% -BASEDIR = $(CURDIR) - -%%MODULE_DEFINITIONS%% - -config.env.%: - dh_testdir - mkdir -p $(BUILDDIR_$*) - cp -Pa $(CURDIR)/auto $(BUILDDIR_$*)/ - cp -Pa $(CURDIR)/configure $(BUILDDIR_$*)/ - cp -Pa $(CURDIR)/src $(BUILDDIR_$*)/ - cp -Pa $(CURDIR)/test $(BUILDDIR_$*)/ - touch $@ - -configure.unit: config.env.unit - cd $(BUILDDIR_unit) && \ - CFLAGS= ./configure \ - %%CONFIGURE_ARGS%% \ - --modules=/usr/lib/unit/modules \ - --cc-opt="$(CFLAGS)" && \ - ./configure %%MODULE_CONFARGS%% - touch $@ - -configure.unit_debug: config.env.unit_debug - cd $(BUILDDIR_unit_debug) && \ - CFLAGS= ./configure \ - %%CONFIGURE_ARGS%% \ - --modules=/usr/lib/unit/debug-modules \ - --cc-opt="$(CFLAGS)" \ - --debug && \ - ./configure %%MODULE_CONFARGS%% - touch $@ - -build-arch.%: configure.% - dh_testdir - $(MAKE) -C $(BUILDDIR_$*) %%MODULE_MAKEARGS%% - touch $@ - -build-indep: - dh_testdir - touch $@ - -build-arch: build-arch.unit build-arch.unit_debug - dh_testdir - touch $@ - -build: build-arch build-indep - dh_testdir - touch $@ - -clean: - dh_testdir - dh_testroot - dh_clean - find $(CURDIR) -maxdepth 1 -size 0 -delete - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - dh_installinit - dh_installlogrotate -%%MODULE_PREINSTALL%% - cd $(BUILDDIR_unit) && \ - DESTDIR=$(INSTALLDIR) make %%MODULE_INSTARGS%% - cd $(BUILDDIR_unit_debug) && \ - DESTDIR=$(INSTALLDIR) make %%MODULE_INSTARGS%% - -binary-indep: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installchangelogs - dh_link - dh_compress - dh_fixperms - dh_installdeb - dh_perl - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-arch: install - -binary: binary-indep binary-arch - -.PHONY: clean binary-indep binary-arch binary install build |