From 7d7a5497eee1564fb080ce193fabc4a2cea2eadd Mon Sep 17 00:00:00 2001
From: Phantop <phantop@tuta.io>
Date: Sun, 24 Jan 2021 14:00:11 -0500
Subject: [PATCH] Use Makefiles for consistency with official Solus

---
 package.yml => addrepo      | 5 +++++
 bcml/Makefile               | 1 +
 build                       | 5 ++---
 ddccontrol/Makefile         | 1 +
 debootstrap/Makefile        | 1 +
 dwarfs/Makefile             | 1 +
 earlyoom/Makefile           | 1 +
 hid-nintendo/Makefile       | 1 +
 joycond/Makefile            | 1 +
 mpv-mpris/Makefile          | 1 +
 nextdns/Makefile            | 1 +
 ninfs/Makefile              | 1 +
 torsocks/Makefile           | 1 +
 waifu2x/Makefile            | 1 +
 webp-pixbuf-loader/Makefile | 1 +
 zerotier/Makefile           | 1 +
 16 files changed, 21 insertions(+), 3 deletions(-)
 rename package.yml => addrepo (79%)
 mode change 100644 => 100755
 create mode 100644 bcml/Makefile
 create mode 100644 ddccontrol/Makefile
 create mode 100644 debootstrap/Makefile
 create mode 100644 dwarfs/Makefile
 create mode 100644 earlyoom/Makefile
 create mode 100644 hid-nintendo/Makefile
 create mode 100644 joycond/Makefile
 create mode 100644 mpv-mpris/Makefile
 create mode 100644 nextdns/Makefile
 create mode 100644 ninfs/Makefile
 create mode 100644 torsocks/Makefile
 create mode 100644 waifu2x/Makefile
 create mode 100644 webp-pixbuf-loader/Makefile
 create mode 100644 zerotier/Makefile

diff --git a/package.yml b/addrepo
old mode 100644
new mode 100755
similarity index 79%
rename from package.yml
rename to addrepo
index 927cd8b..fca2f1f
--- a/package.yml
+++ b/addrepo
@@ -1,3 +1,7 @@
+#!/bin/bash
+mkdir $@
+echo include ../Makefile.common > $@/Makefile
+cat <<EOF > $@/package.yml
 name       : 
 version    : 1
 release    : 1
@@ -18,3 +22,4 @@ build      : |
 install    : |
     %make_install
     %ninja_install
+EOF
diff --git a/bcml/Makefile b/bcml/Makefile
new file mode 100644
index 0000000..0a42375
--- /dev/null
+++ b/bcml/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/build b/build
index 0dd85a0..cc559bc 100755
--- a/build
+++ b/build
@@ -1,16 +1,15 @@
 #!/usr/bin/fish
-set profile "-punstable-x86_64"
-
 function buildme
     echo Now building (basename $argv)
     cd $argv
-    sudo solbuild build package.yml -d $profile
+    make
     sudo eopkg it --reinstall (basename $argv)*.eopkg
     cd ..
 end
 
 cd (dirname (realpath (status -f)))
 
+set profile "-punstable-x86_64"
 sudo solbuild init $profile
 sudo solbuild update $profile
 
diff --git a/ddccontrol/Makefile b/ddccontrol/Makefile
new file mode 100644
index 0000000..0a42375
--- /dev/null
+++ b/ddccontrol/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/debootstrap/Makefile b/debootstrap/Makefile
new file mode 100644
index 0000000..0a42375
--- /dev/null
+++ b/debootstrap/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/dwarfs/Makefile b/dwarfs/Makefile
new file mode 100644
index 0000000..0a42375
--- /dev/null
+++ b/dwarfs/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/earlyoom/Makefile b/earlyoom/Makefile
new file mode 100644
index 0000000..0a42375
--- /dev/null
+++ b/earlyoom/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/hid-nintendo/Makefile b/hid-nintendo/Makefile
new file mode 100644
index 0000000..0a42375
--- /dev/null
+++ b/hid-nintendo/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/joycond/Makefile b/joycond/Makefile
new file mode 100644
index 0000000..0a42375
--- /dev/null
+++ b/joycond/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/mpv-mpris/Makefile b/mpv-mpris/Makefile
new file mode 100644
index 0000000..0a42375
--- /dev/null
+++ b/mpv-mpris/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/nextdns/Makefile b/nextdns/Makefile
new file mode 100644
index 0000000..0a42375
--- /dev/null
+++ b/nextdns/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/ninfs/Makefile b/ninfs/Makefile
new file mode 100644
index 0000000..0a42375
--- /dev/null
+++ b/ninfs/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/torsocks/Makefile b/torsocks/Makefile
new file mode 100644
index 0000000..0a42375
--- /dev/null
+++ b/torsocks/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/waifu2x/Makefile b/waifu2x/Makefile
new file mode 100644
index 0000000..0a42375
--- /dev/null
+++ b/waifu2x/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/webp-pixbuf-loader/Makefile b/webp-pixbuf-loader/Makefile
new file mode 100644
index 0000000..0a42375
--- /dev/null
+++ b/webp-pixbuf-loader/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/zerotier/Makefile b/zerotier/Makefile
new file mode 100644
index 0000000..0a42375
--- /dev/null
+++ b/zerotier/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common