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

Commitddf5199

Browse files
committed
[skip travis] fix rhel
1 parent77fd5f9 commitddf5199

File tree

11 files changed

+17
-108
lines changed

11 files changed

+17
-108
lines changed

‎packaging/Dockerfiles/Dockerfile-centos_6‎

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
FROM registry.access.redhat.com/rhel7
2-
RUN yum install -y tar wget rpm-build yum-utils
3-
RUN yum install -y gcc make perl libicu-devel glibc-devel bison flex
1+
FROM registry.access.redhat.com/ubi7
2+
RUN yum install -y http://mirror.centos.org/centos/7/os/x86_64/Packages/elfutils-0.176-5.el7.x86_64.rpm
3+
RUN yum install -y http://mirror.centos.org/centos/7/os/x86_64/Packages/rpm-build-4.11.3-45.el7.x86_64.rpm
4+
RUN yum install -y tar wget yum-utils
5+
RUN yum install -y gcc make perl libicu-devel glibc-devel
46
RUN yum install -y git
57
RUN yum upgrade -y
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROMecpe4s/rhel8-spack
1+
FROMregistry.access.redhat.com/ubi8
22
RUN yum install -y tar wget rpm-build yum-utils
3-
RUN yum install -y gcc make perl libicu-devel glibc-devel bison flex
3+
RUN yum install -y gcc make perl libicu-devel glibc-devel
44
RUN yum install -y git
55
RUN yum upgrade -y

‎packaging/Makefile.pkg‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,9 @@ include packaging/pkg/Makefile.debian
8686
include packaging/pkg/Makefile.ubuntu
8787

8888
# CENTOS
89-
build/centos: build/centos_6 build/centos_7 build/centos_8 #build/rpm_repo_package_centos
89+
build/centos: build/centos_7 build/centos_8 #build/rpm_repo_package_centos
9090
@echo Centos: done
9191

92-
build/centos_6: build/centos_6_9.5 build/centos_6_9.6 build/centos_6_10 build/centos_6_11 build/centos_6_12 build/centos_6_13
93-
@echo Centos 6: done
94-
9592
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
9693
@echo Centos 7: done
9794

@@ -112,12 +109,9 @@ build/oraclelinux_8: build/oraclelinux_8_9.5 build/oraclelinux_8_9.6 build/oracl
112109
@echo Oraclelinux 8: done
113110

114111
# RHEL
115-
build/rhel: build/rhel_6 build/rhel_7 build/rhel_8 #build/rpm_repo_package_rhel
112+
build/rhel: build/rhel_7 build/rhel_8 #build/rpm_repo_package_rhel
116113
@echo Rhel: done
117114

118-
build/rhel_6: build/rhel_6_9.5 build/rhel_6_9.6 build/rhel_6_10 build/rhel_6_11 build/rhel_6_12 build/rhel_6_13
119-
@echo Rhel 6: done
120-
121115
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
122116
@echo Rhel 7: done
123117

‎packaging/Makefile.repo‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,9 @@ build/repo_ubuntu_20.04:
3939
touch build/repo_ubuntu_20.04
4040

4141
# Centos
42-
repo/centos: build/repo_centos_6 build/repo_centos_7 build/repo_centos_8
42+
repo/centos: build/repo_centos_7 build/repo_centos_8
4343
@echo Build repo for centos platforms: done
4444

45-
build/repo_centos_6:
46-
$(call build_repo_rpm,centos,6,,)
47-
touch build/repo_centos_6
48-
4945
build/repo_centos_7:
5046
$(call build_repo_rpm,centos,7,,)
5147
touch build/repo_centos_7
@@ -71,13 +67,9 @@ build/repo_oraclelinux_8:
7167
touch build/repo_oraclelinux_8
7268

7369
# RHEL
74-
repo/rhel: build/repo_rhel_6 build/repo_rhel_7 build/repo_rhel_8
70+
repo/rhel: build/repo_rhel_7 build/repo_rhel_8
7571
@echo Build repo for rhel platforms: done
7672

77-
build/repo_rhel_6:
78-
$(call build_repo_rpm,rhel,6,6Server)
79-
touch build/repo_rhel_6
80-
8173
build/repo_rhel_7:
8274
$(call build_repo_rpm,rhel,7,7Server)
8375
touch build/repo_rhel_7

‎packaging/Makefile.test‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,13 @@ build/test_oraclelinux_8: build/test_oraclelinux_8_9.6 build/test_oraclelinux_8_
7171
@echo Oraclelinux 8: done
7272

7373
# RHEL
74-
build/test_rhel: build/test_rhel_6 build/test_rhel_7 build/test_rhel_8
74+
build/test_rhel: build/test_rhel_7 build/test_rhel_8
7575
@echo Rhel: done
7676

77-
build/test_rhel_6: build/test_rhel_6_9.6 build/test_rhel_6_10 build/test_rhel_6_11 build/test_rhel_6_12 build/test_rhel_6_13
78-
@echo Rhel 6: done
79-
80-
build/test_rhel_7: build/test_rhel_7_9.6 build/test_rhel_7_10 build/test_rhel_7_11 build/test_rhel_7_12 build/test_rhel_7_13
77+
build/test_rhel_7: build/test_rhel_7_9.5 build/test_rhel_7_9.6 build/test_rhel_7_10 build/test_rhel_7_11 build/test_rhel_7_12 build/test_rhel_7_13
8178
@echo Rhel 7: done
8279

83-
build/test_rhel_8: build/test_rhel_8_9.6 build/test_rhel_8_10 build/test_rhel_8_11 build/test_rhel_8_12 build/test_rhel_8_13
80+
build/test_rhel_8: build/test_rhel_8_9.5 build/test_rhel_8_9.6 build/test_rhel_8_10 build/test_rhel_8_11 build/test_rhel_8_12 build/test_rhel_8_13
8481
@echo Rhel 8: done
8582

8683
define test_rpm

‎packaging/pkg/Makefile.centos‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,3 @@
1-
# CENTOS 6
2-
build/centos_6_9.5:
3-
$(call build_rpm,centos,6,,9.5,9.5.25)
4-
touch build/centos_6_9.5
5-
6-
build/centos_6_9.6:
7-
$(call build_rpm,centos,6,,9.6,9.6.21)
8-
touch build/centos_6_9.6
9-
10-
build/centos_6_10:
11-
$(call build_rpm,centos,6,,10,10.16)
12-
touch build/centos_6_10
13-
14-
build/centos_6_11:
15-
$(call build_rpm,centos,6,,11,11.11)
16-
touch build/centos_6_11
17-
18-
build/centos_6_12:
19-
$(call build_rpm,centos,6,,12,12.6)
20-
touch build/centos_6_12
21-
22-
build/centos_6_13:
23-
$(call build_rpm,centos,6,,13,13.2)
24-
touch build/centos_6_13
25-
261
# CENTOS 7
272
build/centos_7_9.5:
283
$(call build_rpm,centos,7,,9.5,9.5.25)

‎packaging/pkg/Makefile.rhel‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,3 @@
1-
# RHEL 6
2-
build/rhel_6_9.5:
3-
$(call build_rpm,rhel,6,6Server,9.5,9.5.25)
4-
touch build/rhel_6_9.5
5-
6-
build/rhel_6_9.6:
7-
$(call build_rpm,rhel,6,6Server,9.6,9.6.21)
8-
touch build/rhel_6_9.6
9-
10-
build/rhel_6_10:
11-
$(call build_rpm,rhel,6,6Server,10,10.16)
12-
touch build/rhel_6_10
13-
14-
build/rhel_6_11:
15-
$(call build_rpm,rhel,6,6Server,11,11.11)
16-
touch build/rhel_6_11
17-
18-
build/rhel_6_12:
19-
$(call build_rpm,rhel,6,6Server,12,12.6)
20-
touch build/rhel_6_12
21-
22-
build/rhel_6_13:
23-
$(call build_rpm,rhel,6,6Server,13,13.2)
24-
touch build/rhel_6_13
25-
261
# RHEL 7
272
build/rhel_7_9.5:
283
$(call build_rpm,rhel,7,7Server,9.5,9.5.25)

‎packaging/pkg/specs/rpm/rpmbuild/SPECS/pg_probackup-pgpro.spec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ Url: http://postgrespro.ru/
1818
#Source1: pg_probackup-%{version}.tar.bz2
1919
Source0: postgrespro-%{edition}-%{pgsql_full}
2020
Source1: pg_probackup-%{version}
21-
BuildRequires: gcc make perl glibc-devel bison flex
22-
BuildRequires:readline-developenssl-devel gettext zlib-devel
21+
BuildRequires: gcc make perl glibc-devel
22+
BuildRequires: openssl-devel gettext zlib-devel
2323

2424

2525
%description

‎packaging/pkg/specs/rpm/rpmbuild/SPECS/pg_probackup.spec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ License: BSD
1313
Url: http://postgrespro.ru/
1414
Source0: http://ftp.postgresql.org/pub/source/v%{pgsql_full}/postgresql-%{pgsql_major}.tar.bz2
1515
Source1: pg_probackup-%{version}.tar.bz2
16-
BuildRequires: gcc make perl glibc-develbison flex readline-developenssl-devel gettext zlib-devel
16+
BuildRequires: gcc make perl glibc-devel openssl-devel gettext zlib-devel
1717

1818
%description
1919
Backup tool for PostgreSQL.

0 commit comments

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