From 9727d1ce1f0c3794d5b5cc3126fe918aa34fbdde Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Mon, 24 Apr 2023 00:17:00 +0100
Subject: [PATCH] fix(build): ubuntu & debian share some build spec.

---
 cmd/prebuild/prepare.go               | 18 ++++++++----------
 dists/ubuntu/{ => abstractions}/trash |  0
 2 files changed, 8 insertions(+), 10 deletions(-)
 rename dists/ubuntu/{ => abstractions}/trash (100%)

diff --git a/cmd/prebuild/prepare.go b/cmd/prebuild/prepare.go
index 6cc05c0c8..4a29167fb 100644
--- a/cmd/prebuild/prepare.go
+++ b/cmd/prebuild/prepare.go
@@ -119,21 +119,19 @@ func Configure() error {
 			return err
 		}
 
-	case "ubuntu":
-		aa.Tunables["libexec"] = []string{"/{usr/,}libexec"}
-		if err := setLibexec(); err != nil {
-			return err
-		}
-		if err := paths.New("dists/ubuntu/trash").CopyTo(RootApparmord.Join("abstractions", "trash")); err != nil {
-			return err
-		}
-
-	case "debian", "whonix":
+	case "debian", "ubuntu", "whonix":
 		aa.Tunables["libexec"] = []string{"/{usr/,}libexec"}
 		if err := setLibexec(); err != nil {
 			return err
 		}
 
+		if err := paths.New("dists/ubuntu/abstractions/trash").CopyTo(RootApparmord.Join("abstractions", "trash")); err != nil {
+			return err
+		}
+
+		if Distribution == "ubuntu" {
+			break
+		}
 		for _, dirname := range []string{"abstractions", "tunables"} {
 			files, err := filepath.Glob("dists/debian/" + dirname + "/*")
 			if err != nil {
diff --git a/dists/ubuntu/trash b/dists/ubuntu/abstractions/trash
similarity index 100%
rename from dists/ubuntu/trash
rename to dists/ubuntu/abstractions/trash