Remove obsolete -ckt debian kernel version support

Change-Id: I71ee764a0e6371dea6265d44d4056385335b717c
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/instrumentation/events/kvm.h b/include/instrumentation/events/kvm.h
index 0311b446204af8d8e3ff510c4bc84548625126c5..4bfe567c6c228cf4a066318579edbb2581075013 100644 (file)
--- a/include/instrumentation/events/kvm.h
+++ b/include/instrumentation/events/kvm.h
@@ -90,11 +90,11 @@ LTTNG_TRACEPOINT_EVENT(kvm_mmio,
 
 #elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,15,0) \
        || LTTNG_KERNEL_RANGE(4,14,14, 4,15,0) \
-       || LTTNG_DEBIAN_KERNEL_RANGE(4,14,13,0,1,0, 4,15,0,0,0,0) \
+       || LTTNG_DEBIAN_KERNEL_RANGE(4,14,13,1,0, 4,15,0,0,0) \
        || LTTNG_KERNEL_RANGE(4,9,77, 4,10,0) \
        || LTTNG_KERNEL_RANGE(4,4,112, 4,5,0) \
        || LTTNG_UBUNTU_KERNEL_RANGE(4,13,16,38, 4,14,0,0) \
-       || LTTNG_DEBIAN_KERNEL_RANGE(4,9,65,0,3,0, 4,10,0,0,0,0) \
+       || LTTNG_DEBIAN_KERNEL_RANGE(4,9,65,3,0, 4,10,0,0,0) \
        || LTTNG_FEDORA_KERNEL_RANGE(4,14,13,300, 4,15,0,0))
 
 LTTNG_TRACEPOINT_EVENT(kvm_mmio,

diff --git a/include/lttng/kernel-version.h b/include/lttng/kernel-version.h
index d292c0875d7ccf99d0daef86344b863c5406f130..5b4e1a6481c3fb7094c80b9cb5af9baa1725baba 100644 (file)
--- a/include/lttng/kernel-version.h
+++ b/include/lttng/kernel-version.h
@@ -89,22 +89,22 @@
 
 /* Debian */
 
-#define LTTNG_DEBIAN_KERNEL_VERSION(a, b, c, d, e, f) \
-       (((LTTNG_KERNEL_VERSION(a, b, c)) * 1000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
+#define LTTNG_DEBIAN_KERNEL_VERSION(a, b, c, d, e) \
+       (((LTTNG_KERNEL_VERSION(a, b, c)) * 10000ULL) + ((d) * 100) + (e))
 
 #ifdef DEBIAN_API_VERSION
 #define LTTNG_DEBIAN_VERSION_CODE \
-       ((LTTNG_LINUX_VERSION_CODE * 1000000ULL) + DEBIAN_API_VERSION)
+       ((LTTNG_LINUX_VERSION_CODE * 10000ULL) + DEBIAN_API_VERSION)
 #else
 #define LTTNG_DEBIAN_VERSION_CODE      0
 #endif
 
-#define LTTNG_DEBIAN_KERNEL_RANGE(a_low, b_low, c_low, d_low, e_low, f_low, \
-               a_high, b_high, c_high, d_high, e_high, f_high) \
+#define LTTNG_DEBIAN_KERNEL_RANGE(a_low, b_low, c_low, d_low, e_low, \
+               a_high, b_high, c_high, d_high, e_high) \
        (LTTNG_DEBIAN_VERSION_CODE >= \
-               LTTNG_DEBIAN_KERNEL_VERSION(a_low, b_low, c_low, d_low, e_low, f_low) && \
+               LTTNG_DEBIAN_KERNEL_VERSION(a_low, b_low, c_low, d_low, e_low) && \
                LTTNG_DEBIAN_VERSION_CODE < \
-               LTTNG_DEBIAN_KERNEL_VERSION(a_high, b_high, c_high, d_high, e_high, f_high))
+               LTTNG_DEBIAN_KERNEL_VERSION(a_high, b_high, c_high, d_high, e_high))
 
 /* RHEL */
 

diff --git a/scripts/abi-debian-version.sh b/scripts/abi-debian-version.sh
index d87e257e1113e62d49b69449f6af8f0e54196c04..a84fe925466650cdebf484045c572651c1d86c49 100755 (executable)
--- a/scripts/abi-debian-version.sh
+++ b/scripts/abi-debian-version.sh
@@ -17,16 +17,6 @@ DEB_PACKAGE_VERSION=$(sed -rn 's/^#define LINUX_PACKAGE_ID " Debian (.*)"/\1/p'
 # Ignore backports part
 DEB_PACKAGE_VERSION=$(echo "${DEB_PACKAGE_VERSION}" | sed -r 's/~(bpo|deb).*//')
 
-# ckt (Canonical Kernel Team) kernels were used for a while during the jessie
-# cycle, their versionning is a bit different. They track the upstream vanilla
-# stable updates but they don't update the minor version number and instead add
-# an additionnal -cktX. They were all 3.16.7-cktX and after a while the version
-# switched back to upstream style at 3.16.36.
-
-# Get -ckt update number, if present
-KERNEL_CKT_UPDATE=$(echo "${DEB_PACKAGE_VERSION}" | sed -rn 's/^[0-9]+\.[0-9]+\.[0-9]+-ckt([0-9]+).*/\1/p')
-test -n "${KERNEL_CKT_UPDATE}" || KERNEL_CKT_UPDATE=0
-
 # Get package revision
 DEB_PACKAGE_REVISION=$(echo "${DEB_PACKAGE_VERSION}" | sed -r 's/.*-([^-]+)$/\1/')
 # Get non-sec update number
@@ -35,6 +25,6 @@ DEB_PACKAGE_REVISION_BASE=$(echo "${DEB_PACKAGE_REVISION}" | sed -r 's/^([0-9]+)
 DEB_PACKAGE_REVISION_SECURITY=$(echo "${DEB_PACKAGE_REVISION}" | sed -rn 's/.*\+(squeeze|deb[0-9]+)+u([0-9]+)$/\2/p')
 test -n "${DEB_PACKAGE_REVISION_SECURITY}" || DEB_PACKAGE_REVISION_SECURITY=0
 # Combine all update numbers into one
-DEB_API_VERSION=$((KERNEL_CKT_UPDATE * 10000 + DEB_PACKAGE_REVISION_BASE * 100 + DEB_PACKAGE_REVISION_SECURITY))
+DEB_API_VERSION=$((DEB_PACKAGE_REVISION_BASE * 100 + DEB_PACKAGE_REVISION_SECURITY))
 
 echo ${DEB_API_VERSION}