Browse code

package-builder: do not install bison by default in chroot

bison and byacc both provide bison/yacc and are conflicting packages.
This allows each package to choose between bison/byacc.

Change-Id: I602c62cf3180edbaeb36764f5146d634c2150aaa
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/18013
Reviewed-by: Tapas Kundu <tkundu@vmware.com>
Tested-by: Tapas Kundu <tkundu@vmware.com>

Bo Gan authored on 2022/09/30 09:00:45
Showing 24 changed files
... ...
@@ -29,6 +29,7 @@ BuildRequires:  openssl-devel
29 29
 BuildRequires:  curl-devel
30 30
 BuildRequires:  python3-setuptools
31 31
 BuildRequires:  python3-xml
32
+BuildRequires:  bison
32 33
 
33 34
 %if 0%{?with_check}
34 35
 BuildRequires: python3-pip
... ...
@@ -18,6 +18,7 @@ Source1:        %{name}.service
18 18
 BuildRequires:  systemd-devel
19 19
 BuildRequires:  rpcsvc-proto-devel
20 20
 BuildRequires:  libtirpc-devel
21
+BuildRequires:  bison
21 22
 
22 23
 Requires:       systemd
23 24
 Requires:       libtirpc
... ...
@@ -9,11 +9,12 @@ URL:           https://github.com/projectcalico/bird
9 9
 Distribution:  Photon
10 10
 
11 11
 Source0:       %{name}-%{version}.tar.gz
12
-%define sha1 calico-bird=5a74a55574493d467bc940e853c287b458a2e0a4
12
+%define sha512 calico-bird=eeb0d839521f6f66c64bc752c92703a5ade7743967674b322a676b8f1fe702555815a4b16b270dc2d66292409e05e5303c993c96f82a76e55fd2abec5f173623
13 13
 
14 14
 Patch0:        calico-bird-gcc-10.patch
15 15
 
16 16
 BuildRequires: autoconf
17
+BuildRequires: bison
17 18
 
18 19
 %description
19 20
 Project Calico fork of the BIRD Internet Routing Daemon.
... ...
@@ -12,6 +12,7 @@ Source0:        https://github.com/SELinuxProject/selinux/releases/download/%{ve
12 12
 %define sha512  %{name}=e7f7a4e987af473fd7cda0e47539061a8cb2e65a6b930f4736c538eb319129b260a3f03d2f50863e73a275ee3d58c441c33f95c80ea2bff6157e37226be54b92
13 13
 
14 14
 BuildRequires:  libsemanage-devel = %{version}
15
+BuildRequires:  bison
15 16
 
16 17
 %description
17 18
 checkpolicy is a program that checks and compiles a SELinux security policy configuration
... ...
@@ -15,6 +15,7 @@ BuildRequires:  systemd
15 15
 BuildRequires:  libcap-devel
16 16
 BuildRequires:  nettle-devel
17 17
 BuildRequires:  libseccomp-devel
18
+BuildRequires:  bison
18 19
 
19 20
 Requires:       nettle
20 21
 Requires:       libcap
... ...
@@ -3,7 +3,7 @@
3 3
 
4 4
 Name:          crash
5 5
 Version:       8.0.2
6
-Release:       1%{?dist}
6
+Release:       2%{?dist}
7 7
 Summary:       kernel crash analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles
8 8
 Group:         Development/Tools
9 9
 Vendor:        VMware, Inc.
... ...
@@ -28,6 +28,7 @@ BuildRequires: binutils
28 28
 BuildRequires: glibc-devel
29 29
 BuildRequires: ncurses-devel
30 30
 BuildRequires: zlib-devel
31
+BuildRequires: bison
31 32
 
32 33
 Requires: binutils
33 34
 Requires: ncurses-libs
... ...
@@ -103,6 +104,8 @@ rm -rf "%{buildroot}"
103 103
 %{_includedir}/crash/*.h
104 104
 
105 105
 %changelog
106
+* Mon Feb 20 2023 Tapas Kundu <tkundu@vmware.com> 8.0.2-2
107
+- Add Bison in buildRequires.
106 108
 * Tue Dec 13 2022 Gerrit Photon <photon-checkins@vmware.com> 8.0.2-1
107 109
 - Automatic Version Bump
108 110
 * Mon May 03 2021 Gerrit Photon <photon-checkins@vmware.com> 7.3.0-1
... ...
@@ -14,6 +14,7 @@ Source0:        http://doxygen.nl/files/doxygen-%{version}.src.tar.gz
14 14
 BuildRequires:  cmake
15 15
 BuildRequires:  python3
16 16
 BuildRequires:  python3-xml
17
+BuildRequires:  bison
17 18
 
18 19
 %description
19 20
 Doxygen is the de facto standard tool for generating documentation from annotated C++ sources,
... ...
@@ -27,6 +27,10 @@ BuildRequires:  autogen
27 27
 BuildRequires:  dejagnu
28 28
 %endif
29 29
 
30
+# bison from publish RPMs will be used.
31
+# We can't use BuildRequires here, as bison might not yet been built.
32
+%define ExtraBuildRequires bison
33
+
30 34
 %description
31 35
 The GCC package contains the GNU compiler collection,
32 36
 which includes the C and C++ compilers.
... ...
@@ -27,7 +27,7 @@ Provides:       /sbin/ldconfig
27 27
 
28 28
 Requires:       filesystem
29 29
 
30
-%define ExtraBuildRequires python3, python3-libs
30
+%define ExtraBuildRequires bison, python3, python3-libs
31 31
 
32 32
 %description
33 33
 This library provides the basic routines for allocating memory,
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        The Kerberos newtork authentication system
2 2
 Name:           krb5
3 3
 Version:        1.20.1
4
-Release:        1%{?dist}
4
+Release:        2%{?dist}
5 5
 License:        MIT
6 6
 URL:            http://web.mit.edu/kerberos/
7 7
 Group:          System Environment/Security
... ...
@@ -11,6 +11,7 @@ Source0:        http://web.mit.edu/kerberos/www/dist/%{name}/1.17/%{name}-%{vers
11 11
 %define sha512  %{name}=6f57479f13f107cd84f30de5c758eb6b9fc59171329c13e5da6073b806755f8d163eb7bd84767ea861ad6458ea0c9eeb00ee044d3bcad01ef136e9888564b6a2
12 12
 Requires:       openssl
13 13
 Requires:       e2fsprogs-libs
14
+BuildRequires:  bison
14 15
 BuildRequires:  openssl-devel
15 16
 BuildRequires:  e2fsprogs-devel
16 17
 Provides:       pkgconfig(mit-krb5)
... ...
@@ -120,6 +121,8 @@ rm -rf %{buildroot}/*
120 120
 %{_datarootdir}/locale/*
121 121
 
122 122
 %changelog
123
+*   Mon Feb 20 2023 Tapas Kundu <tkundu@vmware.com> 1.20.1-2
124
+-   Add Bison in buildrequires
123 125
 *   Thu Jan 26 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 1.20.1-1
124 126
 -   Upgrade to version 1.20.1
125 127
 *   Fri Sep 17 2021 Satya Naga Vasamsetty <svasamsetty@vmware.com> 1.17.2-2
... ...
@@ -13,6 +13,7 @@ Source0: https://github.com/thom311/libnl/releases/download/libnl3_5_0/%{name}-%
13 13
 
14 14
 BuildRequires: glib-devel
15 15
 BuildRequires: dbus-devel
16
+BuildRequires: bison
16 17
 
17 18
 Requires: glib
18 19
 Requires: dbus
... ...
@@ -9,6 +9,7 @@ Source0:       http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
9 9
 Group:         Networking/Libraries
10 10
 Vendor:        VMware, Inc.
11 11
 Distribution:  Photon
12
+BuildRequires: bison
12 13
 
13 14
 %description
14 15
 Libpcap provides a portable framework for low-level network
... ...
@@ -16,6 +16,7 @@ BuildRequires:  libsepol-devel = %{version}
16 16
 BuildRequires:  swig
17 17
 BuildRequires:  audit-devel
18 18
 BuildRequires:  python3-devel
19
+BuildRequires:  bison
19 20
 
20 21
 Requires:       libselinux = %{version}
21 22
 Requires:       libsepol = %{version}
... ...
@@ -212,6 +212,7 @@ BuildRequires: openssl-devel
212 212
 BuildRequires: procps-ng-devel
213 213
 BuildRequires: lz4
214 214
 BuildRequires: elfutils-libelf-devel
215
+BuildRequires: bison
215 216
 
216 217
 %if 0%{?fips}
217 218
 BuildRequires: gdb
... ...
@@ -243,6 +243,7 @@ BuildRequires:  openssl-devel
243 243
 BuildRequires:  procps-ng-devel
244 244
 BuildRequires:  audit-devel
245 245
 BuildRequires:  elfutils-libelf-devel
246
+BuildRequires:  bison
246 247
 
247 248
 %if 0%{?fips}
248 249
 BuildRequires: gdb
... ...
@@ -139,6 +139,7 @@ BuildRequires:  libmspack-devel
139 139
 BuildRequires:  Linux-PAM-devel
140 140
 BuildRequires:  openssl-devel
141 141
 BuildRequires:  procps-ng-devel
142
+BuildRequires:  bison
142 143
 
143 144
 %if 0%{?fips}
144 145
 BuildRequires: gdb
... ...
@@ -226,6 +226,7 @@ BuildRequires:  slang-devel
226 226
 BuildRequires:  python3-devel
227 227
 BuildRequires:  python3-setuptools
228 228
 BuildRequires:  cmake
229
+BuildRequires:  bison
229 230
 
230 231
 %ifarch x86_64
231 232
 BuildRequires:  pciutils-devel
... ...
@@ -28,6 +28,7 @@ BuildRequires:  libwayland-server
28 28
 BuildRequires:  libwayland-egl
29 29
 BuildRequires:  libpciaccess-devel
30 30
 BuildRequires:  glslang-devel
31
+BuildRequires:  bison
31 32
 
32 33
 Requires:       libllvm
33 34
 Requires:       expat-libs
... ...
@@ -41,6 +41,7 @@ BuildRequires:  python3-devel
41 41
 BuildRequires:  readline-devel
42 42
 BuildRequires:  openssl-devel
43 43
 BuildRequires:  systemtap-sdt-devel
44
+BuildRequires:  boost-devel
44 45
 BuildRequires:  systemd-devel
45 46
 BuildRequires:  tar
46 47
 BuildRequires:  tcl-devel
... ...
@@ -42,6 +42,7 @@ BuildRequires:  python3-devel
42 42
 BuildRequires:  readline-devel
43 43
 BuildRequires:  openssl-devel
44 44
 BuildRequires:  systemtap-sdt-devel
45
+BuildRequires:  boost-devel
45 46
 BuildRequires:  systemd-devel
46 47
 BuildRequires:  tar
47 48
 BuildRequires:  tcl-devel
... ...
@@ -42,6 +42,7 @@ BuildRequires:  python3-devel
42 42
 BuildRequires:  readline-devel
43 43
 BuildRequires:  openssl-devel
44 44
 BuildRequires:  systemtap-sdt-devel
45
+BuildRequires:  boost-devel
45 46
 BuildRequires:  systemd-devel
46 47
 BuildRequires:  tar
47 48
 BuildRequires:  tcl-devel
... ...
@@ -24,6 +24,7 @@ BuildRequires:  autogen
24 24
 BuildRequires:  gnutls-devel
25 25
 BuildRequires:  curl-devel
26 26
 BuildRequires:  libgpg-error-devel
27
+BuildRequires:  bison
27 28
 
28 29
 Requires:       gnutls
29 30
 Requires:       systemd
... ...
@@ -35,6 +35,7 @@ BuildRequires:  python3-libs
35 35
 BuildRequires:  curl-devel
36 36
 BuildRequires:  ivykis-devel
37 37
 BuildRequires:  paho-c-devel
38
+BuildRequires:  bison
38 39
 
39 40
 %description
40 41
 The syslog-ng application is a flexible and highly scalable
... ...
@@ -198,7 +198,6 @@ class constants(object):
198 198
         "libtool",
199 199
         "flex",
200 200
         "flex-devel",
201
-        "bison",
202 201
         "readline-devel",
203 202
         "popt",
204 203
         "popt-devel",