Skip to contentSkip to conversation

tests: Remove unused bison/flex packages

PATCH Superseded Philippe Mathieu-Daudé 2 participants 8 messages May 15, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover tests: Remove unused bison/flex packages

I was misguided by libdtc warnings, and thought bison/flex were required to build QEMU, so installed them in docker (and they also ended in the VM scripts).

Claudio's series "libfdt: build only the strict necessary" even silents the warnings.

Based-on: <[email protected]>

Philippe Mathieu-Daudé (2):
tests/docker: Remove flex/bison packages
tests/vm: Remove flex/bison packages

 tests/docker/dockerfiles/centos7.docker             | 2 --
 tests/docker/dockerfiles/centos8.docker             | 2 --
 tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 --
 tests/docker/dockerfiles/debian10.docker            | 2 --
 tests/docker/dockerfiles/debian9.docker             | 2 --
 tests/docker/dockerfiles/fedora.docker              | 2 --
 tests/docker/dockerfiles/ubuntu.docker              | 2 +-
 tests/docker/dockerfiles/ubuntu1804.docker          | 2 +-
 tests/vm/fedora                                     | 1 -
 tests/vm/freebsd                                    | 1 -
 tests/vm/netbsd                                     | 1 -
 tests/vm/ubuntu.i386                                | 2 +-
 12 files changed, 3 insertions(+), 18 deletions(-)
Signature · 1 line
2.21.3
#1 lore raw

PATCH 1/2 tests/docker: Remove flex/bison packages

QEMU does use flex/bison packages.

---
 tests/docker/dockerfiles/centos7.docker             | 2 --
 tests/docker/dockerfiles/centos8.docker             | 2 --
 tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 --
 tests/docker/dockerfiles/debian10.docker            | 2 --
 tests/docker/dockerfiles/debian9.docker             | 2 --
 tests/docker/dockerfiles/fedora.docker              | 2 --
 tests/docker/dockerfiles/ubuntu.docker              | 2 +-
 tests/docker/dockerfiles/ubuntu1804.docker          | 2 +-
 8 files changed, 2 insertions(+), 14 deletions(-)
tests/docker/dockerfiles/centos7.docker +0 -2
index 9a2a2e515d..e197acdc3c 100644
@@ -5,13 +5,11 @@ RUN yum -y update
 
 # Please keep this list sorted alphabetically
 ENV PACKAGES \
-    bison \
     bzip2 \
     bzip2-devel \
     ccache \
     csnappy-devel \
     dbus-daemon \
-    flex \
     gcc-c++ \
     gcc \
     gettext \
tests/docker/dockerfiles/centos8.docker +0 -2
index bfa0d33c9c..9852c5b9ee 100644
@@ -3,11 +3,9 @@ FROM centos:8.1.1911
 RUN dnf -y update
 ENV PACKAGES \
     SDL-devel \
-    bison \
     bzip2 \
     bzip2-devel \
     dbus-daemon \
-    flex \
     gcc \
     gcc-c++ \
     gettext \
tests/docker/dockerfiles/debian-xtensa-cross.docker +0 -2
index e6f93f65ee..beb73f46ba 100644
@@ -11,11 +11,9 @@ RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
     DEBIAN_FRONTEND=noninteractive eatmydata \
     apt-get install -y --no-install-recommends \
-        bison \
         build-essential \
         ca-certificates \
         curl \
-        flex \
         gettext \
         git \
         python3-minimal
tests/docker/dockerfiles/debian10.docker +0 -2
index 0769700a41..bcdff04ddf 100644
@@ -18,12 +18,10 @@ RUN apt update && \
     DEBIAN_FRONTEND=noninteractive eatmydata \
     apt install -y --no-install-recommends \
         bc \
-        bison \
         build-essential \
         ca-certificates \
         clang \
         dbus \
-        flex \
         gdb-multiarch \
         gettext \
         git \
tests/docker/dockerfiles/debian9.docker +0 -2
index 08cc970feb..0f0ebe530a 100644
@@ -18,11 +18,9 @@ RUN apt update && \
     DEBIAN_FRONTEND=noninteractive eatmydata \
     apt install -y --no-install-recommends \
         bc \
-        bison \
         build-essential \
         ca-certificates \
         clang \
-        flex \
         gdb-multiarch \
         gettext \
         git \
tests/docker/dockerfiles/fedora.docker +0 -2
index 179575ecaa..92b6e11c8a 100644
@@ -3,7 +3,6 @@ FROM fedora:30
 # Please keep this list sorted alphabetically
 ENV PACKAGES \
     bc \
-    bison \
     brlapi-devel \
     bzip2 \
     bzip2-devel \
@@ -13,7 +12,6 @@ ENV PACKAGES \
     dbus-daemon \
     device-mapper-multipath-devel \
     findutils \
-    flex \
     gcc \
     gcc-c++ \
     gettext \
tests/docker/dockerfiles/ubuntu.docker +1 -1
index eeb3b22bf2..90ea6311c6 100644
@@ -10,7 +10,7 @@
 #
 
 FROM ubuntu:19.04
-ENV PACKAGES flex bison \
+ENV PACKAGES \
     ccache \
     clang \
     dbus \
tests/docker/dockerfiles/ubuntu1804.docker +1 -1
index f66b06f4cf..a10ea2850b 100644
@@ -1,5 +1,5 @@
 FROM ubuntu:18.04
-ENV PACKAGES flex bison \
+ENV PACKAGES \
     ccache \
     clang \
     gcc \
Signature · 1 line
2.21.3
#4 lore raw

PATCH 2/2 tests/vm: Remove flex/bison packages

In reply to Philippe Mathieu-Daudé

QEMU does use flex/bison packages.

---
 tests/vm/fedora      | 1 -
 tests/vm/freebsd     | 1 -
 tests/vm/netbsd      | 1 -
 tests/vm/ubuntu.i386 | 2 +-
 4 files changed, 1 insertion(+), 4 deletions(-)
tests/vm/fedora +0 -1
index bd9c6cf295..a9195670f4 100755
@@ -32,7 +32,6 @@ class FedoraVM(basevm.BaseVM):
     pkgs = [
         # tools
         'git-core',
-        'flex', 'bison',
         'gcc', 'binutils', 'make',
 
         # perl
tests/vm/freebsd +0 -1
index 298967fe9c..f87db2b126 100755
@@ -38,7 +38,6 @@ class FreeBSDVM(basevm.BaseVM):
         "bash",
         "gmake",
         "gsed",
-        "flex", "bison",
 
         # libs: crypto
         "gnutls",
tests/vm/netbsd +0 -1
index b10c9d429d..cdac502dad 100755
@@ -36,7 +36,6 @@ class NetBSDVM(basevm.BaseVM):
         "bash",
         "gmake",
         "gsed",
-        "flex", "bison",
 
         # libs: crypto
         "gnutls",
tests/vm/ubuntu.i386 +1 -1
index 1570775335..24527cc78c 100755
@@ -52,7 +52,7 @@ class UbuntuX86VM(basevm.BaseVM):
         self.ssh_root_check("sed -ie s/^#\ deb-src/deb-src/g /etc/apt/sources.list")
         self.ssh_root_check("apt-get update")
         self.ssh_root_check("apt-get build-dep -y qemu")
-        self.ssh_root_check("apt-get install -y libfdt-dev flex bison language-pack-en")
+        self.ssh_root_check("apt-get install -y libfdt-dev language-pack-en")
         self.ssh_root("poweroff")
         self.wait()
         os.rename(img_tmp, img)
Signature · 1 line
2.21.3
#2 lore raw

Re: [PATCH 1/2] tests/docker: Remove flex/bison packages

In reply to Philippe Mathieu-Daudé
Quoted 3 lines · Philippe Mathieu-Daudé

QEMU does use flex/bison packages.

Hi Philippe, "does" or "does not"?

Ciao,

Claudio

Quoted 139 lines
---
 tests/docker/dockerfiles/centos7.docker             | 2 --
 tests/docker/dockerfiles/centos8.docker             | 2 --
 tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 --
 tests/docker/dockerfiles/debian10.docker            | 2 --
 tests/docker/dockerfiles/debian9.docker             | 2 --
 tests/docker/dockerfiles/fedora.docker              | 2 --
 tests/docker/dockerfiles/ubuntu.docker              | 2 +-
 tests/docker/dockerfiles/ubuntu1804.docker          | 2 +-
 8 files changed, 2 insertions(+), 14 deletions(-)
tests/docker/dockerfiles/centos7.docker +0 -2
index 9a2a2e515d..e197acdc3c 100644
@@ -5,13 +5,11 @@ RUN yum -y update
 
 # Please keep this list sorted alphabetically
 ENV PACKAGES \
-    bison \
     bzip2 \
     bzip2-devel \
     ccache \
     csnappy-devel \
     dbus-daemon \
-    flex \
     gcc-c++ \
     gcc \
     gettext \
tests/docker/dockerfiles/centos8.docker +0 -2
index bfa0d33c9c..9852c5b9ee 100644
@@ -3,11 +3,9 @@ FROM centos:8.1.1911
 RUN dnf -y update
 ENV PACKAGES \
     SDL-devel \
-    bison \
     bzip2 \
     bzip2-devel \
     dbus-daemon \
-    flex \
     gcc \
     gcc-c++ \
     gettext \
tests/docker/dockerfiles/debian-xtensa-cross.docker +0 -2
index e6f93f65ee..beb73f46ba 100644
@@ -11,11 +11,9 @@ RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
     DEBIAN_FRONTEND=noninteractive eatmydata \
     apt-get install -y --no-install-recommends \
-        bison \
         build-essential \
         ca-certificates \
         curl \
-        flex \
         gettext \
         git \
         python3-minimal
tests/docker/dockerfiles/debian10.docker +0 -2
index 0769700a41..bcdff04ddf 100644
@@ -18,12 +18,10 @@ RUN apt update && \
     DEBIAN_FRONTEND=noninteractive eatmydata \
     apt install -y --no-install-recommends \
         bc \
-        bison \
         build-essential \
         ca-certificates \
         clang \
         dbus \
-        flex \
         gdb-multiarch \
         gettext \
         git \
tests/docker/dockerfiles/debian9.docker +0 -2
index 08cc970feb..0f0ebe530a 100644
@@ -18,11 +18,9 @@ RUN apt update && \
     DEBIAN_FRONTEND=noninteractive eatmydata \
     apt install -y --no-install-recommends \
         bc \
-        bison \
         build-essential \
         ca-certificates \
         clang \
-        flex \
         gdb-multiarch \
         gettext \
         git \
tests/docker/dockerfiles/fedora.docker +0 -2
index 179575ecaa..92b6e11c8a 100644
@@ -3,7 +3,6 @@ FROM fedora:30
 # Please keep this list sorted alphabetically
 ENV PACKAGES \
     bc \
-    bison \
     brlapi-devel \
     bzip2 \
     bzip2-devel \
@@ -13,7 +12,6 @@ ENV PACKAGES \
     dbus-daemon \
     device-mapper-multipath-devel \
     findutils \
-    flex \
     gcc \
     gcc-c++ \
     gettext \
tests/docker/dockerfiles/ubuntu.docker +1 -1
index eeb3b22bf2..90ea6311c6 100644
@@ -10,7 +10,7 @@
 #
 
 FROM ubuntu:19.04
-ENV PACKAGES flex bison \
+ENV PACKAGES \
     ccache \
     clang \
     dbus \
tests/docker/dockerfiles/ubuntu1804.docker +1 -1
index f66b06f4cf..a10ea2850b 100644
@@ -1,5 +1,5 @@
 FROM ubuntu:18.04
-ENV PACKAGES flex bison \
+ENV PACKAGES \
     ccache \
     clang \
     gcc \
#3 lore raw

Re: [PATCH 1/2] tests/docker: Remove flex/bison packages

Quoted 7 lines · Claudio Fontana
Quoted 3 lines · Philippe Mathieu-Daudé

QEMU does use flex/bison packages.

Hi Philippe, "does" or "does not"?

Err... does NOT :/

Quoted 145 lines

Ciao,

Claudio

Quoted 139 lines
---
 tests/docker/dockerfiles/centos7.docker             | 2 --
 tests/docker/dockerfiles/centos8.docker             | 2 --
 tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 --
 tests/docker/dockerfiles/debian10.docker            | 2 --
 tests/docker/dockerfiles/debian9.docker             | 2 --
 tests/docker/dockerfiles/fedora.docker              | 2 --
 tests/docker/dockerfiles/ubuntu.docker              | 2 +-
 tests/docker/dockerfiles/ubuntu1804.docker          | 2 +-
 8 files changed, 2 insertions(+), 14 deletions(-)
tests/docker/dockerfiles/centos7.docker +0 -2
index 9a2a2e515d..e197acdc3c 100644
@@ -5,13 +5,11 @@ RUN yum -y update
 
 # Please keep this list sorted alphabetically
 ENV PACKAGES \
-    bison \
     bzip2 \
     bzip2-devel \
     ccache \
     csnappy-devel \
     dbus-daemon \
-    flex \
     gcc-c++ \
     gcc \
     gettext \
tests/docker/dockerfiles/centos8.docker +0 -2
index bfa0d33c9c..9852c5b9ee 100644
@@ -3,11 +3,9 @@ FROM centos:8.1.1911
 RUN dnf -y update
 ENV PACKAGES \
     SDL-devel \
-    bison \
     bzip2 \
     bzip2-devel \
     dbus-daemon \
-    flex \
     gcc \
     gcc-c++ \
     gettext \
tests/docker/dockerfiles/debian-xtensa-cross.docker +0 -2
index e6f93f65ee..beb73f46ba 100644
@@ -11,11 +11,9 @@ RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
     DEBIAN_FRONTEND=noninteractive eatmydata \
     apt-get install -y --no-install-recommends \
-        bison \
         build-essential \
         ca-certificates \
         curl \
-        flex \
         gettext \
         git \
         python3-minimal
tests/docker/dockerfiles/debian10.docker +0 -2
index 0769700a41..bcdff04ddf 100644
@@ -18,12 +18,10 @@ RUN apt update && \
     DEBIAN_FRONTEND=noninteractive eatmydata \
     apt install -y --no-install-recommends \
         bc \
-        bison \
         build-essential \
         ca-certificates \
         clang \
         dbus \
-        flex \
         gdb-multiarch \
         gettext \
         git \
tests/docker/dockerfiles/debian9.docker +0 -2
index 08cc970feb..0f0ebe530a 100644
@@ -18,11 +18,9 @@ RUN apt update && \
     DEBIAN_FRONTEND=noninteractive eatmydata \
     apt install -y --no-install-recommends \
         bc \
-        bison \
         build-essential \
         ca-certificates \
         clang \
-        flex \
         gdb-multiarch \
         gettext \
         git \
tests/docker/dockerfiles/fedora.docker +0 -2
index 179575ecaa..92b6e11c8a 100644
@@ -3,7 +3,6 @@ FROM fedora:30
 # Please keep this list sorted alphabetically
 ENV PACKAGES \
     bc \
-    bison \
     brlapi-devel \
     bzip2 \
     bzip2-devel \
@@ -13,7 +12,6 @@ ENV PACKAGES \
     dbus-daemon \
     device-mapper-multipath-devel \
     findutils \
-    flex \
     gcc \
     gcc-c++ \
     gettext \
tests/docker/dockerfiles/ubuntu.docker +1 -1
index eeb3b22bf2..90ea6311c6 100644
@@ -10,7 +10,7 @@
 #
 
 FROM ubuntu:19.04
-ENV PACKAGES flex bison \
+ENV PACKAGES \
     ccache \
     clang \
     dbus \
tests/docker/dockerfiles/ubuntu1804.docker +1 -1
index f66b06f4cf..a10ea2850b 100644
@@ -1,5 +1,5 @@
 FROM ubuntu:18.04
-ENV PACKAGES flex bison \
+ENV PACKAGES \
     ccache \
     clang \
     gcc \
#5 lore raw

Re: [PATCH 2/2] tests/vm: Remove flex/bison packages

In reply to Philippe Mathieu-Daudé
Quoted 1 line · Philippe Mathieu-Daudé

QEMU does use flex/bison packages.

"... does not use ..." (Thanks Claudio).

Quoted 59 lines
---
  tests/vm/fedora      | 1 -
  tests/vm/freebsd     | 1 -
  tests/vm/netbsd      | 1 -
  tests/vm/ubuntu.i386 | 2 +-
  4 files changed, 1 insertion(+), 4 deletions(-)
tests/vm/fedora +0 -1
index bd9c6cf295..a9195670f4 100755
@@ -32,7 +32,6 @@ class FedoraVM(basevm.BaseVM):
      pkgs = [
          # tools
          'git-core',
-        'flex', 'bison',
          'gcc', 'binutils', 'make',
 
          # perl
tests/vm/freebsd +0 -1
index 298967fe9c..f87db2b126 100755
@@ -38,7 +38,6 @@ class FreeBSDVM(basevm.BaseVM):
          "bash",
          "gmake",
          "gsed",
-        "flex", "bison",
 
          # libs: crypto
          "gnutls",
tests/vm/netbsd +0 -1
index b10c9d429d..cdac502dad 100755
@@ -36,7 +36,6 @@ class NetBSDVM(basevm.BaseVM):
          "bash",
          "gmake",
          "gsed",
-        "flex", "bison",
 
          # libs: crypto
          "gnutls",
tests/vm/ubuntu.i386 +1 -1
index 1570775335..24527cc78c 100755
@@ -52,7 +52,7 @@ class UbuntuX86VM(basevm.BaseVM):
          self.ssh_root_check("sed -ie s/^#\ deb-src/deb-src/g /etc/apt/sources.list")
          self.ssh_root_check("apt-get update")
          self.ssh_root_check("apt-get build-dep -y qemu")
-        self.ssh_root_check("apt-get install -y libfdt-dev flex bison language-pack-en")
+        self.ssh_root_check("apt-get install -y libfdt-dev language-pack-en")
          self.ssh_root("poweroff")
          self.wait()
          os.rename(img_tmp, img)
#6 lore raw

Re: [PATCH 2/2] tests/vm: Remove flex/bison packages

In reply to Philippe Mathieu-Daudé
Quoted 9 lines · Philippe Mathieu-Daudé

QEMU does use flex/bison packages.

---
 tests/vm/fedora      | 1 -
 tests/vm/freebsd     | 1 -
 tests/vm/netbsd      | 1 -
 tests/vm/ubuntu.i386 | 2 +-
 4 files changed, 1 insertion(+), 4 deletions(-)

Hi, does openbsd need a correction as well? Or is it needed there?

tests/vm/openbsd +0 -1
index 0b705f4945..13e7f9a6d5 100755
@@ -35,7 +35,6 @@ class OpenBSDVM(basevm.BaseVM):
         "bash",
         "gmake",
         "gsed",
-        "bison",
 
         # libs: usb
         "libusb1",

Ciao,

Claudio

Quoted 51 lines
tests/vm/fedora +0 -1
index bd9c6cf295..a9195670f4 100755
@@ -32,7 +32,6 @@ class FedoraVM(basevm.BaseVM):
     pkgs = [
         # tools
         'git-core',
-        'flex', 'bison',
         'gcc', 'binutils', 'make',
 
         # perl
tests/vm/freebsd +0 -1
index 298967fe9c..f87db2b126 100755
@@ -38,7 +38,6 @@ class FreeBSDVM(basevm.BaseVM):
         "bash",
         "gmake",
         "gsed",
-        "flex", "bison",
 
         # libs: crypto
         "gnutls",
tests/vm/netbsd +0 -1
index b10c9d429d..cdac502dad 100755
@@ -36,7 +36,6 @@ class NetBSDVM(basevm.BaseVM):
         "bash",
         "gmake",
         "gsed",
-        "flex", "bison",
 
         # libs: crypto
         "gnutls",
tests/vm/ubuntu.i386 +1 -1
index 1570775335..24527cc78c 100755
@@ -52,7 +52,7 @@ class UbuntuX86VM(basevm.BaseVM):
         self.ssh_root_check("sed -ie s/^#\ deb-src/deb-src/g /etc/apt/sources.list")
         self.ssh_root_check("apt-get update")
         self.ssh_root_check("apt-get build-dep -y qemu")
-        self.ssh_root_check("apt-get install -y libfdt-dev flex bison language-pack-en")
+        self.ssh_root_check("apt-get install -y libfdt-dev language-pack-en")
         self.ssh_root("poweroff")
         self.wait()
         os.rename(img_tmp, img)
#7 lore raw

Re: [PATCH 2/2] tests/vm: Remove flex/bison packages

Quoted 12 lines · Claudio Fontana
Quoted 9 lines · Philippe Mathieu-Daudé

QEMU does use flex/bison packages.

---
  tests/vm/fedora      | 1 -
  tests/vm/freebsd     | 1 -
  tests/vm/netbsd      | 1 -
  tests/vm/ubuntu.i386 | 2 +-
  4 files changed, 1 insertion(+), 4 deletions(-)
Quoted 1 line

Hi, does openbsd need a correction as well? Or is it needed there?

You are right. I only grepped for flex, not for bison (expecting they are installed altogether).

So I also missed:

- .gitlab-ci.yml
- .cirrus.yml
- tests/vm/openbsd
- scripts/coverity-scan/coverity-scan.docker

Quoted 71 lines
tests/vm/openbsd +0 -1
index 0b705f4945..13e7f9a6d5 100755
@@ -35,7 +35,6 @@ class OpenBSDVM(basevm.BaseVM):
          "bash",
          "gmake",
          "gsed",
-        "bison",
 
          # libs: usb
          "libusb1",

Ciao,

Claudio

Quoted 51 lines
tests/vm/fedora +0 -1
index bd9c6cf295..a9195670f4 100755
@@ -32,7 +32,6 @@ class FedoraVM(basevm.BaseVM):
      pkgs = [
          # tools
          'git-core',
-        'flex', 'bison',
          'gcc', 'binutils', 'make',
 
          # perl
tests/vm/freebsd +0 -1
index 298967fe9c..f87db2b126 100755
@@ -38,7 +38,6 @@ class FreeBSDVM(basevm.BaseVM):
          "bash",
          "gmake",
          "gsed",
-        "flex", "bison",
 
          # libs: crypto
          "gnutls",
tests/vm/netbsd +0 -1
index b10c9d429d..cdac502dad 100755
@@ -36,7 +36,6 @@ class NetBSDVM(basevm.BaseVM):
          "bash",
          "gmake",
          "gsed",
-        "flex", "bison",
 
          # libs: crypto
          "gnutls",
tests/vm/ubuntu.i386 +1 -1
index 1570775335..24527cc78c 100755
@@ -52,7 +52,7 @@ class UbuntuX86VM(basevm.BaseVM):
          self.ssh_root_check("sed -ie s/^#\ deb-src/deb-src/g /etc/apt/sources.list")
          self.ssh_root_check("apt-get update")
          self.ssh_root_check("apt-get build-dep -y qemu")
-        self.ssh_root_check("apt-get install -y libfdt-dev flex bison language-pack-en")
+        self.ssh_root_check("apt-get install -y libfdt-dev language-pack-en")
          self.ssh_root("poweroff")
          self.wait()
          os.rename(img_tmp, img)