Merge branch 'remove-versioned-names' into 'main'

Do not create or use version-qualified package names

See merge request rewriting/ddisasm!1179

.ci/Dockerfile.static

@@ -96,6 +96,7 @@ RUN ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
 # Install APT packages
 RUN apt-get -y update && \
     apt-get -y install \
+        aptitude \
         ccache \
         gcc-arm-linux-gnueabihf \
         g++-arm-linux-gnueabihf \

.ci/Dockerfile.ubuntu20

@@ -106,6 +106,7 @@ RUN ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
 #
 RUN apt-get -y update && \
     apt-get -y install \
+        aptitude \
         autoconf \
         build-essential \
         ccache \

.ci/gitlab-ci.yml

@@ -52,24 +52,26 @@ default:
   - apt-get update -y
 
 .download-deps:
+  # Use aptitude to make sure gtirb-pprinter is installed even if that means installing an old gtirb
   - >-
-    apt-get install --download-only -y
-    libcapstone-dev${CAPSTONE_VERSION:+-$CAPSTONE_VERSION}
-    libgtirb-dev${GTIRB_VERSION:+-$GTIRB_VERSION}
-    libgtirb-pprinter-dev${GTIRB_PPRINTER_VERSION:+-$GTIRB_PPRINTER_VERSION}
-    gtirb-pprinter${GTIRB_PPRINTER_VERSION:+-$GTIRB_PPRINTER_VERSION}
+    aptitude install --download-only -y -o "Aptitude::ProblemResolver::Hints::=reject gtirb-pprinter :UNINST"
+    libcapstone-dev${CAPSTONE_VERSION:+=$CAPSTONE_VERSION}
+    libgtirb-dev${GTIRB_VERSION:+=$GTIRB_VERSION}
+    libgtirb-pprinter-dev${GTIRB_PPRINTER_VERSION:+=$GTIRB_PPRINTER_VERSION}
+    gtirb-pprinter${GTIRB_PPRINTER_VERSION:+=$GTIRB_PPRINTER_VERSION}
   - mv /var/cache/apt/archives/*.deb .
 
 .install-deps:
+  # Use aptitude to make sure gtirb-pprinter is installed even if that means installing an old gtirb
   - >-
-    apt-get install -y
-    libcapstone-dev${CAPSTONE_VERSION:+-$CAPSTONE_VERSION}
-    libgtirb-dev${GTIRB_VERSION:+-$GTIRB_VERSION}
-    libgtirb-pprinter-dev${GTIRB_PPRINTER_VERSION:+-$GTIRB_PPRINTER_VERSION}
-    gtirb-pprinter${GTIRB_PPRINTER_VERSION:+-$GTIRB_PPRINTER_VERSION}
+    aptitude install -y -o "Aptitude::ProblemResolver::Hints::=reject gtirb-pprinter :UNINST"
+    libcapstone-dev${CAPSTONE_VERSION:+=$CAPSTONE_VERSION}
+    libgtirb-dev${GTIRB_VERSION:+=$GTIRB_VERSION}
+    libgtirb-pprinter-dev${GTIRB_PPRINTER_VERSION:+=$GTIRB_PPRINTER_VERSION}
+    gtirb-pprinter${GTIRB_PPRINTER_VERSION:+=$GTIRB_PPRINTER_VERSION}
 
 .install-capstone:
-  - apt-get install -y libcapstone-dev${CAPSTONE_VERSION:+-$CAPSTONE_VERSION}
+  - apt-get install -y libcapstone-dev${CAPSTONE_VERSION:+=$CAPSTONE_VERSION}
 
 # Set up ccache and report initial stats.
 .setup-ccache:
@@ -726,16 +728,14 @@ test-make-install:
   script:
     - !reference [.setup-apt]
     - !reference [.install-deps]
-    - "CAPSTONE_PKG_VERSION=$(dpkg -s libcapstone-dev${CAPSTONE_VERSION:+-$CAPSTONE_VERSION} | awk '/Version:/ { print $2 }')"
+    - "CAPSTONE_PKG_VERSION=$(dpkg -s libcapstone-dev | awk '/Version:/ { print $2 }')"
     - cd build
     # Use make to update timestamps on all build targets. The artifacts we
     # pulled in from the dependent job should already be up-to-date, but since
     # this job checked out a new copy of the source, its timestamps are newer.
     - make -t
-    - CPACK_DDISASM_STABLE_PKG_NAME=OFF
-    - '[[ ! $CI_COMMIT_REF_NAME =~ ^release-.* ]] || CPACK_DDISASM_STABLE_PKG_NAME=ON'
-    - cpack -G "DEB" -D CPACK_DDISASM_STABLE_PKG_NAME=$CPACK_DDISASM_STABLE_PKG_NAME -D CPACK_CAPSTONE_PKG_VERSION=$CAPSTONE_PKG_VERSION -D CPACK_DDISASM_PACKAGE=deb-ddisasm
-    - cpack -G "DEB" -D CPACK_DDISASM_STABLE_PKG_NAME=$CPACK_DDISASM_STABLE_PKG_NAME -D CPACK_CAPSTONE_PKG_VERSION=$CAPSTONE_PKG_VERSION -D CPACK_DDISASM_PACKAGE=deb-debug
+    - cpack -G "DEB" -D CPACK_CAPSTONE_PKG_VERSION=$CAPSTONE_PKG_VERSION -D CPACK_DDISASM_PACKAGE=deb-ddisasm
+    - cpack -G "DEB" -D CPACK_CAPSTONE_PKG_VERSION=$CAPSTONE_PKG_VERSION -D CPACK_DDISASM_PACKAGE=deb-debug
 
 build-ubuntu20-packages:
   image: $DOCKER_REGISTRY/rewriting/ddisasm/ubuntu20:$IMAGE_TAG
@@ -771,7 +771,7 @@ setup-ubuntu20-package-tests:
   script:
     - if [ $(lsb_release -sc) == "focal" ]; then TRUSTED="[trusted=yes]"; fi
     - echo -e "\ndeb $TRUSTED file:$(pwd)/apt-repo ./\n" >> /etc/apt/sources.list
-    - 'TEST_PKG_NAME=$(dpkg --info apt-repo/ddisasm.deb | sed -n "s/ Package: //p")'
+    - 'TEST_PKG_NAME=$(dpkg --info apt-repo/ddisasm_*.deb | sed -n "s/ Package: //p")'
     - apt-get update -y && apt-get install -y --allow-unauthenticated $TEST_PKG_NAME
     - ddisasm --version
 
@@ -780,7 +780,7 @@ setup-ubuntu20-package-tests:
   script:
     - if [ $(lsb_release -sc) == "focal" ]; then TRUSTED="[trusted=yes]"; fi
     - echo -e "\ndeb $TRUSTED file:$(pwd)/apt-repo ./\n" >> /etc/apt/sources.list
-    - 'TEST_PKG_NAME=$(dpkg --info apt-repo/ddisasm-dbg.deb | sed -n "s/ Package: //p")'
+    - 'TEST_PKG_NAME=$(dpkg --info apt-repo/ddisasm-dbg_*.deb | sed -n "s/ Package: //p")'
     - apt-get update -y && apt-get install -y --allow-unauthenticated $TEST_PKG_NAME
     - '[ -f /usr/lib/debug/.build-id/$(readelf -n /usr/bin/ddisasm | grep ''Build ID: '' | cut -d'':'' -f2 | sed -E ''s/ ([a-f0-9]{2,})([a-f0-9]{30,})/\1\/\2/g'').debug ]'
 

CHANGELOG.md

@@ -1,5 +1,8 @@
-# 1.8.1 (Unreleased)
+# 1.9.0 (Unreleased)
 
+* Stop generating debian metapackages and packages with the version attached
+  to the package name. Updates in the apt-repository now support multiple
+  package versions and upgrading `ddisasm` with `apt-get upgrade`.
 * Improve def-use and value-reg stack analysis to consider push and pop
   instructions. These changes also fix a couple of bugs in the stack variable
   propagation.

cpack-config.cmake

@@ -8,36 +8,22 @@ set(CPACK_GTIRB_PPRINTER_DEB_VERSION
 set(CPACK_GTIRB_DEB_VERSION
     "${CPACK_GTIRB_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}")
 
-set(CPACK_DDISASM_SUFFIX "")
-set(CPACK_GTIRB_PPRINTER_SUFFIX "")
-set(CPACK_GTIRB_SUFFIX "")
-set(CPACK_CAPSTONE_SUFFIX "")
-
 # Debian packages
-if(CPACK_DDISASM_STABLE_PKG_NAME)
-  string(REGEX REPLACE "^[0-9]+:" "" CPACK_CAPSTONE_SUFFIX
-                       "${CPACK_CAPSTONE_PKG_VERSION}")
-  set(CPACK_DDISASM_SUFFIX "-${CPACK_DDISASM_VERSION}")
-  set(CPACK_GTIRB_PPRINTER_SUFFIX "-${CPACK_GTIRB_PPRINTER_VERSION}")
-  set(CPACK_GTIRB_SUFFIX "-${CPACK_GTIRB_VERSION}")
-  set(CPACK_CAPSTONE_SUFFIX "-${CPACK_CAPSTONE_SUFFIX}")
-endif()
 if("${CPACK_DDISASM_PACKAGE}" STREQUAL "deb-ddisasm")
-  set(CPACK_DEBIAN_PACKAGE_NAME "ddisasm${CPACK_DDISASM_SUFFIX}")
-  set(CPACK_PACKAGE_FILE_NAME "ddisasm")
+  set(CPACK_DEBIAN_PACKAGE_NAME "ddisasm")
+  set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
   set(CPACK_COMPONENTS_ALL ddisasm license)
   if("${CPACK_DEBIAN_PACKAGE_RELEASE}" STREQUAL "focal")
     set(CPACK_DEBIAN_PACKAGE_DEPENDS
-        "libstdc++6, libc6, libgcc1, libgomp1, libgtirb${CPACK_GTIRB_SUFFIX} (=${CPACK_GTIRB_DEB_VERSION}), libgtirb-pprinter${CPACK_GTIRB_PPRINTER_SUFFIX} (=${CPACK_GTIRB_PPRINTER_DEB_VERSION}), libboost-filesystem1.71.0, libboost-program-options1.71.0, libcapstone-dev${CPACK_CAPSTONE_SUFFIX} (=${CPACK_CAPSTONE_PKG_VERSION})"
+        "libstdc++6, libc6, libgcc1, libgomp1, libgtirb (=${CPACK_GTIRB_DEB_VERSION}), libgtirb-pprinter (=${CPACK_GTIRB_PPRINTER_DEB_VERSION}), libboost-filesystem1.71.0, libboost-program-options1.71.0, libcapstone-dev (=${CPACK_CAPSTONE_PKG_VERSION})"
     )
   else()
     message(
-      SEND_ERROR "Uknown / missing value for CPACK_DEBIAN_PACKAGE_RELEASE.")
+      SEND_ERROR "Unknown / missing value for CPACK_DEBIAN_PACKAGE_RELEASE.")
   endif()
 elseif("${CPACK_DDISASM_PACKAGE}" STREQUAL "deb-debug")
-  set(CPACK_DEBIAN_PACKAGE_NAME "ddisasm-dbg${CPACK_DDISASM_SUFFIX}")
-  set(CPACK_PACKAGE_FILE_NAME "ddisasm-dbg")
+  set(CPACK_DEBIAN_PACKAGE_NAME "ddisasm-dbg")
+  set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
   set(CPACK_COMPONENTS_ALL debug-file)
-  set(CPACK_DEBIAN_PACKAGE_DEPENDS
-      "ddisasm${CPACK_DDISASM_SUFFIX} (=${CPACK_DDISASM_DEB_VERSION})")
+  set(CPACK_DEBIAN_PACKAGE_DEPENDS "ddisasm (=${CPACK_DDISASM_DEB_VERSION})")
 endif()

version.txt

@@ -1,3 +1,3 @@
 VERSION_MAJOR 1
-VERSION_MINOR 8
-VERSION_PATCH 1
+VERSION_MINOR 9
+VERSION_PATCH 0