From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 10 Jun 2021 15:51:39 +0000 (+0000)
Subject: Merge branch 'python3'
X-Git-Tag: 0.9.28~1285
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=212685e829b02d8ca1ac32818d4fe0a6bf68a36d;p=pakfire.git

Merge branch 'python3'
---

212685e829b02d8ca1ac32818d4fe0a6bf68a36d
diff --cc .gitignore
index 198e94edf,e476f2b84..902ebd9ff
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,9 +1,9 @@@
 -/.vscode
 +/Dockerfile
  /Makefile
  /build-aux
+ /config.h
+ /config.h.in
+ /intltool-*
  /libtool
  /missing
  /contrib/pakfire.nm
diff --cc Makefile.am
index 9750f2b95,151871d14..18521f06c
--- a/Makefile.am
+++ b/Makefile.am
@@@ -35,11 -39,12 +39,13 @@@ pythondir  = $(pyexecdir
  
  configsdir = $(sysconfdir)/pakfire
  configsdistrosdir = $(configsdir)/distros
 +dockerdir = $(datadir)/docker
  macrosdir = $(prefix)/lib/pakfire/macros
- qualityagentdir = $(prefix)/lib/quality-agent
  scriptsdir = $(prefix)/lib/$(PACKAGE_NAME)
  
+ TEST_ROOTFS = $(abs_top_builddir)/tests/.root
+ 
+ BUILT_SOURCES =
  CLEANFILES =
  DISTCLEANFILES =
  EXTRA_DIST =
@@@ -330,20 -594,7 +595,19 @@@ endi
  
  # ------------------------------------------------------------------------------
  
 +EXTRA_DIST += \
 +	Dockerfile.in
 +
 +docker_DATA = \
 +	Dockerfile
 +
 +.PHONY: docker
 +docker: Dockerfile
 +	docker build -t "ipfire/pakfire:$(PACKAGE_VERSION)" .
 +
 +# ------------------------------------------------------------------------------
 +
  dist_configs_DATA = \
- 	contrib/config/builder.conf \
  	contrib/config/client.conf \
  	contrib/config/daemon.conf \
  	contrib/config/general.conf
diff --cc macros/cflags.macro
index c54719851,3447ef452..80c367014
--- a/macros/cflags.macro
+++ b/macros/cflags.macro
@@@ -1,11 -1,11 +1,13 @@@
  
  # Export CFLAGS + CXXFLAGS
- GLOBAL_CFLAGS   = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -Werror=format-security
- GLOBAL_CFLAGS  += -fPIC -fstack-protector-strong -grecord-gcc-switches
 -GLOBAL_CFLAGS   = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -Werror=format-security
 -GLOBAL_CFLAGS  += -fexceptions -fPIC -fstack-protector-strong --param=ssp-buffer-size=4
++GLOBAL_CFLAGS   = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -Wp,D_GLIBCXX_ASSERTIONS 
++GLOBAL_CFLAGS  += -Werror=format-security-fexceptions
++GLOBAL_CFLAGS  += -fPIC -fstack-protector-strong --param=ssp-buffer-size=4
+ GLOBAL_CFLAGS  += -grecord-gcc-switches -fdebug-prefix-map=%{DIR_SRC}=%{debugsourcedir}
  
 -CFLAGS_i686     = -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables
 -CFLAGS_x86_64   = -m64 -mtune=generic
 +CFLAGS_i686     = -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables -fstack-clash-protection
 +CFLAGS_x86_64   = -m64 -mtune=generic -fstack-clash-protection
 +CFLAGS_aarch64  = -fstack-clash-protection
  CFLAGS_armv5tel = -march=armv5te -mfloat-abi=soft
  CFLAGS_armv7hl  = -march=armv7-a -mfpu=vfpv3-d16  -mfloat-abi=hard -mthumb