From 2faefe1e9f9a8f0e2ef044130a9946fc671f952e Mon Sep 17 00:00:00 2001
From: Michael Brooks <michaelbrooks@google.com>
Date: Fri, 11 Jun 2021 07:54:18 -0700
Subject: [PATCH] Fix makefile, bump versions of modules/deb

* The Makefile configuration was using kernel macros instead of obj-m,
so it wasn't building properly.
* Bump gasket and apex module versions for better DKMS installs.
* Bump Debian package version.
---
 debian/changelog       | 6 ++++++
 src/Makefile           | 4 ++--
 src/apex_driver.c      | 2 +-
 src/gasket_constants.h | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 20e030a..730d2ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gasket-dkms (1.0-16) unstable; urgency=low
+
+  * Bump module versions for Gasket and Apex
+
+ -- Coral <coral-support@google.com>  Fri, 11 Jun 2021 07:53:18 -0700
+
 gasket-dkms (1.0-15) unstable; urgency=low
 
   * Switch include of rwlock to spinlock (rwlock.h isn't intended to be
diff --git a/src/Makefile b/src/Makefile
index cec813e..cd5fcd9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,8 +2,8 @@
 #  Makefile for Gasket framework and dependent drivers.
 #
 
-obj-$(CONFIG_STAGING_GASKET_FRAMEWORK)	+= gasket.o
-obj-$(CONFIG_STAGING_APEX_DRIVER)	+= apex.o
+obj-m += gasket.o
+obj-m += apex.o
 
 gasket-objs	:= gasket_core.o gasket_ioctl.o gasket_interrupt.o gasket_page_table.o gasket_sysfs.o
 apex-objs	:= apex_driver.o
diff --git a/src/apex_driver.c b/src/apex_driver.c
index f4cf518..1cc4e00 100644
--- a/src/apex_driver.c
+++ b/src/apex_driver.c
@@ -29,7 +29,7 @@
 
 /* Constants */
 #define APEX_DEVICE_NAME "Apex"
-#define APEX_DRIVER_VERSION "1.1"
+#define APEX_DRIVER_VERSION "1.2"
 
 /* CSRs are in BAR 2. */
 #define APEX_BAR_INDEX 2
diff --git a/src/gasket_constants.h b/src/gasket_constants.h
index ff113bc..10e28b0 100644
--- a/src/gasket_constants.h
+++ b/src/gasket_constants.h
@@ -3,7 +3,7 @@
 #ifndef __GASKET_CONSTANTS_H__
 #define __GASKET_CONSTANTS_H__
 
-#define GASKET_FRAMEWORK_VERSION "1.1.3"
+#define GASKET_FRAMEWORK_VERSION "1.1.4"
 
 /*
  * The maximum number of simultaneous device types supported by the framework.