Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf7a81aa

Browse files
committed
[Issue#413] packaging: bump postgres versions, add 14, remove 9.5, some workarounds (caused by old docker images)
1 parent396155e commitf7a81aa

File tree

11 files changed

+220
-132
lines changed

11 files changed

+220
-132
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PROGRAM = pg_probackup
22
WORKDIR ?=$(CURDIR)
33
BUILDDIR =$(WORKDIR)/build/
4-
PBK_GIT_REPO =http://github.com/postgrespro/pg_probackup
4+
PBK_GIT_REPO =https://github.com/postgrespro/pg_probackup
55

66
# utils
77
OBJS = src/utils/configuration.o src/utils/json.o src/utils/logger.o\

‎packaging/Makefile.pkg

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,39 +38,39 @@ build/prepare:
3838
build/clean: build/prepare
3939
find $(BUILDDIR) -maxdepth 1 -type f -exec rm -f {} \;
4040

41-
build/all: build/debian build/ubuntu build/centos build/oraclelinux build/alt build/suse#build/rhel
41+
build/all: build/debian build/ubuntu build/centos build/oraclelinux build/alt build/suse build/rhel
4242
@echo Packaging is done
4343

4444
### DEBIAN
4545
build/debian: build/debian_8 build/debian_9 build/debian_10 build/debian_11
4646
@echo Debian: done
4747

48-
build/debian_8: build/debian_8_9.5 build/debian_8_9.6 build/debian_8_10 build/debian_8_11 build/debian_8_12 build/debian_8_13
48+
build/debian_8: build/debian_8_9.6 build/debian_8_10 build/debian_8_11 build/debian_8_12 build/debian_8_13 build/debian_8_14
4949
@echo Debian 8: done
5050

51-
build/debian_9: build/debian_9_9.5 build/debian_9_9.6 build/debian_9_10 build/debian_9_11 build/debian_9_12 build/debian_9_13
51+
build/debian_9: build/debian_9_9.6 build/debian_9_10 build/debian_9_11 build/debian_9_12 build/debian_9_13 build/debian_9_14
5252
@echo Debian 9: done
5353

54-
build/debian_10: build/debian_10_9.5 build/debian_10_9.6 build/debian_10_10 build/debian_10_11 build/debian_10_12 build/debian_10_13
54+
build/debian_10: build/debian_10_9.6 build/debian_10_10 build/debian_10_11 build/debian_10_12 build/debian_10_13 build/debian_10_14
5555
@echo Debian 10: done
5656

57-
build/debian_11: build/debian_11_9.5 build/debian_11_9.6 build/debian_11_10 build/debian_11_11 build/debian_11_12 build/debian_11_13
57+
build/debian_11: build/debian_11_9.6 build/debian_11_10 build/debian_11_11 build/debian_11_12 build/debian_11_13 build/debian_11_14
5858
@echo Debian 11: done
5959

6060
### UBUNTU
6161
build/ubuntu: build/ubuntu_14.04 build/ubuntu_16.04 build/ubuntu_18.04 build/ubuntu_20.04
6262
@echo Ubuntu: done
6363

64-
build/ubuntu_14.04: build/ubuntu_14.04_9.5 build/ubuntu_14.04_9.6 build/ubuntu_14.04_10 build/ubuntu_14.04_11 build/ubuntu_14.04_12 build/ubuntu_14.04_13
64+
build/ubuntu_14.04: build/ubuntu_14.04_9.6 build/ubuntu_14.04_10 build/ubuntu_14.04_11 build/ubuntu_14.04_12 build/ubuntu_14.04_13 build/ubuntu_14.04_14
6565
@echo Ubuntu 14.04: done
6666

67-
build/ubuntu_16.04: build/ubuntu_16.04_9.5 build/ubuntu_16.04_9.6 build/ubuntu_16.04_10 build/ubuntu_16.04_11 build/ubuntu_16.04_12 build/ubuntu_16.04_13
67+
build/ubuntu_16.04: build/ubuntu_16.04_9.6 build/ubuntu_16.04_10 build/ubuntu_16.04_11 build/ubuntu_16.04_12 build/ubuntu_16.04_13 build/ubuntu_16.04_14
6868
@echo Ubuntu 16.04: done
6969

70-
build/ubuntu_18.04: build/ubuntu_18.04_9.5 build/ubuntu_18.04_9.6 build/ubuntu_18.04_10 build/ubuntu_18.04_11 build/ubuntu_18.04_12 build/ubuntu_18.04_13
70+
build/ubuntu_18.04: build/ubuntu_18.04_9.6 build/ubuntu_18.04_10 build/ubuntu_18.04_11 build/ubuntu_18.04_12 build/ubuntu_18.04_13 build/ubuntu_18.04_14
7171
@echo Ubuntu 18.04: done
7272

73-
build/ubuntu_20.04: build/ubuntu_20.04_9.5 build/ubuntu_20.04_9.6 build/ubuntu_20.04_10 build/ubuntu_20.04_11 build/ubuntu_20.04_12 build/ubuntu_20.04_13
73+
build/ubuntu_20.04: build/ubuntu_20.04_9.6 build/ubuntu_20.04_10 build/ubuntu_20.04_11 build/ubuntu_20.04_12 build/ubuntu_20.04_13 build/ubuntu_20.04_14
7474
@echo Ubuntu 20.04: done
7575

7676
define build_deb
@@ -92,33 +92,33 @@ include packaging/pkg/Makefile.ubuntu
9292
build/centos: build/centos_7 build/centos_8 #build/rpm_repo_package_centos
9393
@echo Centos: done
9494

95-
build/centos_7: build/centos_7_9.5 build/centos_7_9.6 build/centos_7_10 build/centos_7_11 build/centos_7_12 build/centos_7_13
95+
build/centos_7: build/centos_7_9.6 build/centos_7_10 build/centos_7_11 build/centos_7_12 build/centos_7_13 build/centos_7_14
9696
@echo Centos 7: done
9797

98-
build/centos_8: build/centos_8_9.5 build/centos_8_9.6 build/centos_8_10 build/centos_8_11 build/centos_8_12 build/centos_8_13
98+
build/centos_8: build/centos_8_9.6 build/centos_8_10 build/centos_8_11 build/centos_8_12 build/centos_8_13 build/centos_8_14
9999
@echo Centos 8: done
100100

101101
# Oracle Linux
102102
build/oraclelinux: build/oraclelinux_6 build/oraclelinux_7 build/oraclelinux_8 #build/rpm_repo_package_oraclelinux
103103
@echo Oraclelinux: done
104104

105-
build/oraclelinux_6: build/oraclelinux_6_9.5 build/oraclelinux_6_9.6 build/oraclelinux_6_10 build/oraclelinux_6_11 build/oraclelinux_6_12 build/oraclelinux_6_13
105+
build/oraclelinux_6: build/oraclelinux_6_9.6 build/oraclelinux_6_10 build/oraclelinux_6_11 build/oraclelinux_6_12 build/oraclelinux_6_13 build/oraclelinux_6_14
106106
@echo Oraclelinux 6: done
107107

108-
build/oraclelinux_7: build/oraclelinux_7_9.5 build/oraclelinux_7_9.6 build/oraclelinux_7_10 build/oraclelinux_7_11 build/oraclelinux_7_12 build/oraclelinux_7_13
108+
build/oraclelinux_7: build/oraclelinux_7_9.6 build/oraclelinux_7_10 build/oraclelinux_7_11 build/oraclelinux_7_12 build/oraclelinux_7_13 build/oraclelinux_7_14
109109
@echo Oraclelinux 7: done
110110

111-
build/oraclelinux_8: build/oraclelinux_8_9.5 build/oraclelinux_8_9.6 build/oraclelinux_8_10 build/oraclelinux_8_11 build/oraclelinux_8_12 build/oraclelinux_8_13
111+
build/oraclelinux_8: build/oraclelinux_8_9.6 build/oraclelinux_8_10 build/oraclelinux_8_11 build/oraclelinux_8_12 build/oraclelinux_8_13 build/oraclelinux_8_14
112112
@echo Oraclelinux 8: done
113113

114114
# RHEL
115115
build/rhel: build/rhel_7 build/rhel_8 #build/rpm_repo_package_rhel
116116
@echo Rhel: done
117117

118-
build/rhel_7: build/rhel_7_9.5 build/rhel_7_9.6 build/rhel_7_10 build/rhel_7_11 build/rhel_7_12 build/rhel_7_13
118+
build/rhel_7: build/rhel_7_9.6 build/rhel_7_10 build/rhel_7_11 build/rhel_7_12 build/rhel_7_13 build/rhel_7_14
119119
@echo Rhel 7: done
120120

121-
build/rhel_8: build/rhel_8_9.5 build/rhel_8_9.6 build/rhel_8_10 build/rhel_8_11 build/rhel_8_12 build/rhel_8_13
121+
build/rhel_8: build/rhel_8_9.6 build/rhel_8_10 build/rhel_8_11 build/rhel_8_12 build/rhel_8_13 build/rhel_8_14
122122
@echo Rhel 8: done
123123

124124

@@ -143,13 +143,13 @@ include packaging/pkg/Makefile.oraclelinux
143143
build/alt: build/alt_7 build/alt_8 build/alt_9
144144
@echo Alt Linux: done
145145

146-
build/alt_7: build/alt_7_9.5 build/alt_7_9.6 build/alt_7_10 build/alt_7_11 build/alt_7_12 build/alt_7_13
146+
build/alt_7: build/alt_7_9.6 build/alt_7_10 build/alt_7_11 build/alt_7_12 build/alt_7_13 build/alt_7_14
147147
@echo Alt Linux 7: done
148148

149-
build/alt_8: build/alt_8_9.5 build/alt_8_9.6 build/alt_8_10 build/alt_8_11 build/alt_8_12 build/alt_8_13
149+
build/alt_8: build/alt_8_9.6 build/alt_8_10 build/alt_8_11 build/alt_8_12 build/alt_8_13 build/alt_8_14
150150
@echo Alt Linux 8: done
151151

152-
build/alt_9: build/alt_9_9.5 build/alt_9_9.6 build/alt_9_10 build/alt_9_11 build/alt_9_12 build/alt_9_13
152+
build/alt_9: build/alt_9_9.6 build/alt_9_10 build/alt_9_11 build/alt_9_12 build/alt_9_13 build/alt_9_14
153153
@echo Alt Linux 9: done
154154

155155
define build_alt
@@ -170,10 +170,10 @@ include packaging/pkg/Makefile.alt
170170
build/suse: build/suse_15.1 build/suse_15.2
171171
@echo Suse: done
172172

173-
build/suse_15.1: build/suse_15.1_9.5 build/suse_15.1_9.6 build/suse_15.1_10 build/suse_15.1_11 build/suse_15.1_12 build/suse_15.1_13
173+
build/suse_15.1: build/suse_15.1_9.6 build/suse_15.1_10 build/suse_15.1_11 build/suse_15.1_12 build/suse_15.1_13 build/suse_15.1_14
174174
@echo Rhel 15.1: done
175175

176-
build/suse_15.2: build/suse_15.2_9.5 build/suse_15.2_9.6 build/suse_15.2_10 build/suse_15.2_11 build/suse_15.2_12 build/suse_15.2_13
176+
build/suse_15.2: build/suse_15.2_9.6 build/suse_15.2_10 build/suse_15.2_11 build/suse_15.2_12 build/suse_15.2_13 build/suse_15.2_14
177177
@echo Rhel 15.1: done
178178

179179
define build_suse

‎packaging/pkg/Makefile.alt

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,71 +4,84 @@ build/alt_7_9.5:
44
touch build/alt_7_9.5
55

66
build/alt_7_9.6:
7-
$(call build_alt,alt,7,,9.6,9.6.21)
7+
$(call build_alt,alt,7,,9.6,9.6.23)
88
touch build/alt_7_9.6
99

1010
build/alt_7_10:
11-
$(call build_alt,alt,7,,10,10.17)
11+
$(call build_alt,alt,7,,10,10.18)
1212
touch build/alt_7_10
1313

1414
build/alt_7_11:
15-
$(call build_alt,alt,7,,11,11.11)
15+
$(call build_alt,alt,7,,11,11.13)
1616
touch build/alt_7_11
1717

1818
build/alt_7_12:
19-
$(call build_alt,alt,7,,12,12.6)
19+
$(call build_alt,alt,7,,12,12.8)
2020
touch build/alt_7_12
2121

2222
build/alt_7_13:
23-
$(call build_alt,alt,7,,13,13.2)
23+
$(call build_alt,alt,7,,13,13.4)
2424
touch build/alt_7_13
2525

26+
build/alt_7_14:
27+
$(call build_alt,alt,7,,14,14.0)
28+
touch build/alt_7_14
29+
2630
# ALT 8
2731
build/alt_8_9.5:
2832
$(call build_alt,alt,8,,9.5,9.5.25)
2933
touch build/alt_8_9.5
3034

3135
build/alt_8_9.6:
32-
$(call build_alt,alt,8,,9.6,9.6.21)
36+
$(call build_alt,alt,8,,9.6,9.6.23)
3337
touch build/alt_8_9.6
3438

3539
build/alt_8_10:
36-
$(call build_alt,alt,8,,10,10.17)
40+
$(call build_alt,alt,8,,10,10.18)
3741
touch build/alt_8_10
3842

3943
build/alt_8_11:
40-
$(call build_alt,alt,8,,11,11.11)
44+
$(call build_alt,alt,8,,11,11.13)
4145
touch build/alt_8_11
4246

4347
build/alt_8_12:
44-
$(call build_alt,alt,8,,12,12.6)
48+
$(call build_alt,alt,8,,12,12.8)
4549
touch build/alt_8_12
4650

4751
build/alt_8_13:
48-
$(call build_alt,alt,8,,13,13.2)
52+
$(call build_alt,alt,8,,13,13.4)
4953
touch build/alt_8_13
5054

55+
build/alt_8_14:
56+
$(call build_alt,alt,8,,14,14.0)
57+
touch build/alt_8_14
58+
5159
# ALT 9
5260
build/alt_9_9.5:
5361
$(call build_alt,alt,9,,9.5,9.5.25)
5462
touch build/alt_9_9.5
5563

5664
build/alt_9_9.6:
57-
$(call build_alt,alt,9,,9.6,9.6.21)
65+
$(call build_alt,alt,9,,9.6,9.6.23)
5866
touch build/alt_9_9.6
5967

6068
build/alt_9_10:
61-
$(call build_alt,alt,9,,10,10.17)
69+
$(call build_alt,alt,9,,10,10.18)
6270
touch build/alt_9_10
6371

6472
build/alt_9_11:
65-
$(call build_alt,alt,9,,11,11.11)
73+
$(call build_alt,alt,9,,11,11.13)
6674
touch build/alt_9_11
6775

6876
build/alt_9_12:
69-
$(call build_alt,alt,9,,12,12.6)
77+
$(call build_alt,alt,9,,12,12.8)
7078
touch build/alt_9_12
7179

7280
build/alt_9_13:
73-
$(call build_alt,alt,9,,13,13.2)
81+
$(call build_alt,alt,9,,13,13.4)
7482
touch build/alt_9_13
83+
84+
build/alt_9_14:
85+
$(call build_alt,alt,9,,14,14.0)
86+
touch build/alt_9_14
87+

‎packaging/pkg/Makefile.centos

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,46 +4,54 @@ build/centos_7_9.5:
44
touch build/centos_7_9.5
55

66
build/centos_7_9.6:
7-
$(call build_rpm,centos,7,,9.6,9.6.21)
7+
$(call build_rpm,centos,7,,9.6,9.6.23)
88
touch build/centos_7_9.6
99

1010
build/centos_7_10:
11-
$(call build_rpm,centos,7,,10,10.16)
11+
$(call build_rpm,centos,7,,10,10.18)
1212
touch build/centos_7_10
1313

1414
build/centos_7_11:
15-
$(call build_rpm,centos,7,,11,11.11)
15+
$(call build_rpm,centos,7,,11,11.13)
1616
touch build/centos_7_11
1717

1818
build/centos_7_12:
19-
$(call build_rpm,centos,7,,12,12.6)
19+
$(call build_rpm,centos,7,,12,12.8)
2020
touch build/centos_7_12
2121

2222
build/centos_7_13:
23-
$(call build_rpm,centos,7,,13,13.2)
23+
$(call build_rpm,centos,7,,13,13.4)
2424
touch build/centos_7_13
2525

26+
build/centos_7_14:
27+
$(call build_rpm,centos,7,,14,14.0)
28+
touch build/centos_7_14
29+
2630
# CENTOS 8
2731
build/centos_8_9.5:
2832
$(call build_rpm,centos,8,,9.5,9.5.25)
2933
touch build/centos_8_9.5
3034

3135
build/centos_8_9.6:
32-
$(call build_rpm,centos,8,,9.6,9.6.21)
36+
$(call build_rpm,centos,8,,9.6,9.6.23)
3337
touch build/centos_8_9.6
3438

3539
build/centos_8_10:
36-
$(call build_rpm,centos,8,,10,10.16)
40+
$(call build_rpm,centos,8,,10,10.18)
3741
touch build/centos_8_10
3842

3943
build/centos_8_11:
40-
$(call build_rpm,centos,8,,11,11.11)
44+
$(call build_rpm,centos,8,,11,11.13)
4145
touch build/centos_8_11
4246

4347
build/centos_8_12:
44-
$(call build_rpm,centos,8,,12,12.6)
48+
$(call build_rpm,centos,8,,12,12.8)
4549
touch build/centos_8_12
4650

4751
build/centos_8_13:
48-
$(call build_rpm,centos,8,,13,13.2)
52+
$(call build_rpm,centos,8,,13,13.4)
4953
touch build/centos_8_13
54+
55+
build/centos_8_14:
56+
$(call build_rpm,centos,8,,14,14.0)
57+
touch build/centos_8_14

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp