Merge ~djacobs98/checkbox-iiotg/+git/checkbox-iiotg-classic:patch-for-pmu into ~checkbox-dev/checkbox-iiotg/+git/checkbox-iiotg-classic:master

[Doug Jacobs]

Add: Add patch to remove the hardcoded directories in Makefile.globals.inc in perf-event-tests

PMU uses the test suite perf-event-tests for testing. This test suite uses hardcoded directories that cause problems with Snapcraft. This patch will remove those directories allowing Snapcraft to pass in parameters for them instead.

[Vic Liu (zongminl)]

Let's leave this MR here temporarily until we can get the perf-event-tests sorted out

Unmerged commits

5b60b26... by Doug Jacobs on 2022-06-10

Patch to remove hardcoded directories in Makefile.globls.inc for perf-event-tests
(fixed a typo & whitespace error - patch now applies without error)

647ba22... by Doug Jacobs on 2022-06-10

Trying to get snapcraft.yaml to work.

4f77ba1... by Doug Jacobs on 2022-06-10

Add: Adding perf_events_tests to snapcraft.yaml

diff --git a/patches/0001-Removed-hardcoded-directories.patch b/patches/0001-Removed-hardcoded-directories.patch
 new file mode 100644
index 0000000..f5b0726
--- /dev/null
+++ b/patches/0001-Removed-hardcoded-directories.patch
@@ -0,0 +1,25 @@
+From 177537e5ca910f3252bc9e0a54b3d843d5095531 Mon Sep 17 00:00:00 2001
+From: djacobs98 <[e-mail]>
+Date: Fri, 10 Jun 2022 17:38:06 +0800
+Subject: [PATCH] Removed hardcoded directories
+
+---
+ Makefile.globals.inc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.globals.inc b/Makefile.globals.inc
+index 747ac16..a519ee9 100644
+--- a/Makefile.globals.inc
++++ b/Makefile.globals.inc
+@@ -10,6 +10,6 @@ OBJCOPY		= $(CROSS_COMPILE)objcopy
+ OBJDUMP		= $(CROSS_COMPILE)objdump
+ RANLIB		= $(CROSS_COMPILE)ranlib
+ 
+-INSTALL		= /usr/bin/install
++#INSTALL		= /usr/bin/install
+ 
+-prefix = /opt/perf_event_tests
++#prefix = /opt/perf_event_tests
+--
+2.25.1
+
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index eb77bb1..97af8e8 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -33,6 +33,15 @@ passthrough:
       command-chain: [bin/wrapper_local]
 
 parts:
+  perf-event-tests:
+    plugin: make
+    source: https://github.com/deater/perf_event_tests
+    source-type: git
+    override-build: |
+        export INSTALL=$SNAPCRAFT_PART_INSTALL
+        export prefix=$SNAPCRAFT_PRIME
+        #snapcraftctl build 
+        make prefix=$SNAPCRAFT_PART_INSTALL
   rpc:
     plugin: go
     go-channel: ""