From a70019e50da125b3007072653a9f84023bd2ac87 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 10 Aug 2023 18:46:49 +0200
Subject: Try to get versioned targets and modules under control

---
 core/modules/nvidia-libs/data/addon-init     | 10 ----------
 core/modules/nvidia-libs/module.build        | 21 ---------------------
 core/modules/nvidia-libs/module.conf         | 17 -----------------
 core/modules/nvidia-libs/module.conf.debian  | 13 -------------
 core/modules/nvidia-libs/module.conf.ubuntu  | 15 ---------------
 core/modules/nvidia-libs@/data/addon-init    | 10 ++++++++++
 core/modules/nvidia-libs@/module.build       | 21 +++++++++++++++++++++
 core/modules/nvidia-libs@/module.conf        | 17 +++++++++++++++++
 core/modules/nvidia-libs@/module.conf.debian | 13 +++++++++++++
 core/modules/nvidia-libs@/module.conf.ubuntu | 15 +++++++++++++++
 10 files changed, 76 insertions(+), 76 deletions(-)
 delete mode 100755 core/modules/nvidia-libs/data/addon-init
 delete mode 100644 core/modules/nvidia-libs/module.build
 delete mode 100644 core/modules/nvidia-libs/module.conf
 delete mode 100644 core/modules/nvidia-libs/module.conf.debian
 delete mode 100644 core/modules/nvidia-libs/module.conf.ubuntu
 create mode 100755 core/modules/nvidia-libs@/data/addon-init
 create mode 100644 core/modules/nvidia-libs@/module.build
 create mode 100644 core/modules/nvidia-libs@/module.conf
 create mode 100644 core/modules/nvidia-libs@/module.conf.debian
 create mode 100644 core/modules/nvidia-libs@/module.conf.ubuntu

(limited to 'core/modules')

diff --git a/core/modules/nvidia-libs/data/addon-init b/core/modules/nvidia-libs/data/addon-init
deleted file mode 100755
index ae0734c2..00000000
--- a/core/modules/nvidia-libs/data/addon-init
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/ash
-
-[ -e "/opt/openslx/etc/nvidia.whiteout" ] || exit 0
-
-while read line; do
-	rm -f -- "$line"
-done < "/opt/openslx/etc/nvidia.whiteout"
-
-exit 0
-
diff --git a/core/modules/nvidia-libs/module.build b/core/modules/nvidia-libs/module.build
deleted file mode 100644
index 3d56fc20..00000000
--- a/core/modules/nvidia-libs/module.build
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-pre_exec() {
-	[ -z "$VERSION" ] && perror "Not run from an @ target"
-	local SRC SZ
-	SRC="${ROOT_DIR}/tmp/work/nvidia-common/build/$VERSION"
-	[ -d "$SRC" ] || perror "nvidia-common did not build $VERSION"
-	SZ=$( du -sk "$SRC" | awk '{print $1}' )
-	(( SZ < 200000 )) && perror "nvidia-common for $VERSION is less than 200MB, fishy"
-	# XXX Now we override the MODULE_BUILD_DIR, where mltk will then grab alle the required files from
-	MODULE_BUILD_DIR="$SRC"
-}
-
-post_copy() {
-	# generate addon-required for this version
-	cat <<-EOF > "${TARGET_BUILD_DIR}/addon-required"
-		#!/bin/ash
-		[ "\$( cat /sys/module/nvidia/version )" = "$VERSION" ]
-	EOF
-	chmod +x "${TARGET_BUILD_DIR}/addon-required"
-}
diff --git a/core/modules/nvidia-libs/module.conf b/core/modules/nvidia-libs/module.conf
deleted file mode 100644
index e62db897..00000000
--- a/core/modules/nvidia-libs/module.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-REQUIRED_FILES="
-				@/opt/openslx/etc/nvidia.whiteout
-"
-
-REQUIRED_DIRECTORIES="
-				/etc
-				/usr
-				/var/lib/nvidia
-				/var/log
-"
-
-REQUIRED_MODULES="
-	nvidia-common
-"
-
diff --git a/core/modules/nvidia-libs/module.conf.debian b/core/modules/nvidia-libs/module.conf.debian
deleted file mode 100644
index c3a686d7..00000000
--- a/core/modules/nvidia-libs/module.conf.debian
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-# libvdpau: While nvidia delivers a linvdpau within it's driver package, nvidia
-# itself recommends using a distribution package if available. So, here we go.
-
-REQUIRED_CONTENT_PACKAGES="
-	libvdpau1
-"
-
-REQUIRED_INSTALLED_PACKAGES="
-	libvdpau1
-"
-
-
diff --git a/core/modules/nvidia-libs/module.conf.ubuntu b/core/modules/nvidia-libs/module.conf.ubuntu
deleted file mode 100644
index 5135d91e..00000000
--- a/core/modules/nvidia-libs/module.conf.ubuntu
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# libvdpau: While nvidia delivers a linvdpau within it's driver package, nvidia
-# itself recommends using a distribution package if available. So, here we go.
-
-REQUIRED_CONTENT_PACKAGES="
-	libvdpau1
-"
-
-REQUIRED_INSTALLED_PACKAGES="
-	libvdpau1
-"
-REQUIRED_SYSTEM_FILES+="
-	/sbin/ldconfig.real
-"
-
diff --git a/core/modules/nvidia-libs@/data/addon-init b/core/modules/nvidia-libs@/data/addon-init
new file mode 100755
index 00000000..ae0734c2
--- /dev/null
+++ b/core/modules/nvidia-libs@/data/addon-init
@@ -0,0 +1,10 @@
+#!/bin/ash
+
+[ -e "/opt/openslx/etc/nvidia.whiteout" ] || exit 0
+
+while read line; do
+	rm -f -- "$line"
+done < "/opt/openslx/etc/nvidia.whiteout"
+
+exit 0
+
diff --git a/core/modules/nvidia-libs@/module.build b/core/modules/nvidia-libs@/module.build
new file mode 100644
index 00000000..d738d22f
--- /dev/null
+++ b/core/modules/nvidia-libs@/module.build
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+pre_exec() {
+	[ -z "$MODULE_VERSION" ] && perror "Not run from an @ target"
+	local SRC SZ
+	SRC="${ROOT_DIR}/tmp/work/nvidia-common/build/$MODULE_VERSION"
+	[ -d "$SRC" ] || perror "nvidia-common did not build $MODULE_VERSION"
+	SZ=$( du -sk "$SRC" | awk '{print $1}' )
+	(( SZ < 200000 )) && perror "nvidia-common for $MODULE_VERSION is less than 200MB, fishy"
+	# XXX Now we override the MODULE_BUILD_DIR, where mltk will then grab alle the required files from
+	MODULE_BUILD_DIR="$SRC"
+}
+
+post_copy() {
+	# generate addon-required for this version
+	cat <<-EOF > "${TARGET_BUILD_DIR}/addon-required"
+		#!/bin/ash
+		[ "\$( cat /sys/module/nvidia/version )" = "$MODULE_VERSION" ]
+	EOF
+	chmod +x "${TARGET_BUILD_DIR}/addon-required"
+}
diff --git a/core/modules/nvidia-libs@/module.conf b/core/modules/nvidia-libs@/module.conf
new file mode 100644
index 00000000..e62db897
--- /dev/null
+++ b/core/modules/nvidia-libs@/module.conf
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+REQUIRED_FILES="
+				@/opt/openslx/etc/nvidia.whiteout
+"
+
+REQUIRED_DIRECTORIES="
+				/etc
+				/usr
+				/var/lib/nvidia
+				/var/log
+"
+
+REQUIRED_MODULES="
+	nvidia-common
+"
+
diff --git a/core/modules/nvidia-libs@/module.conf.debian b/core/modules/nvidia-libs@/module.conf.debian
new file mode 100644
index 00000000..c3a686d7
--- /dev/null
+++ b/core/modules/nvidia-libs@/module.conf.debian
@@ -0,0 +1,13 @@
+#!/bin/bash
+# libvdpau: While nvidia delivers a linvdpau within it's driver package, nvidia
+# itself recommends using a distribution package if available. So, here we go.
+
+REQUIRED_CONTENT_PACKAGES="
+	libvdpau1
+"
+
+REQUIRED_INSTALLED_PACKAGES="
+	libvdpau1
+"
+
+
diff --git a/core/modules/nvidia-libs@/module.conf.ubuntu b/core/modules/nvidia-libs@/module.conf.ubuntu
new file mode 100644
index 00000000..5135d91e
--- /dev/null
+++ b/core/modules/nvidia-libs@/module.conf.ubuntu
@@ -0,0 +1,15 @@
+#!/bin/bash
+# libvdpau: While nvidia delivers a linvdpau within it's driver package, nvidia
+# itself recommends using a distribution package if available. So, here we go.
+
+REQUIRED_CONTENT_PACKAGES="
+	libvdpau1
+"
+
+REQUIRED_INSTALLED_PACKAGES="
+	libvdpau1
+"
+REQUIRED_SYSTEM_FILES+="
+	/sbin/ldconfig.real
+"
+
-- 
cgit v1.2.3-55-g7522