Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts

21 files changed, 35 insertions, 1 deletions

diff --git a/remote/modules/alsa/alsa.build b/remote/modules/alsa/alsa.build
index 03e55d72..4d3990b1 100644
--- a/remote/modules/alsa/alsa.build
+++ b/remote/modules/alsa/alsa.build
@@ -6,7 +6,10 @@ build() {
 	COPYLIST="list_dpkg_output"
 	[ -e "$COPYLIST" ] && rm "$COPYLIST"
 
-	list_packet_files >> "$COPYLIST"
+
+	# These shitty greps are 'excludes' for this high quality scientific linux.
+	list_packet_files	| grep -v "^/etc/asound.state" \
+				| grep -v "^/etc/modprobe.d/local.conf" >> "$COPYLIST"
 	tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
 
 }
diff --git a/remote/modules/alsa/alsa.conf.scientific b/remote/modules/alsa/alsa.conf.scientific
new file mode 100644
index 00000000..643e52d3
--- /dev/null
+++ b/remote/modules/alsa/alsa.conf.scientific
@@ -0,0 +1,12 @@
+REQUIRED_INSTALLED_PACKAGES="
+	module-init-tools
+	alsa-utils
+	alsa-lib
+"
+REQUIRED_CONTENT_PACKAGES="
+	module-init-tools
+	alsa-utils
+	alsa-lib
+"
+
+# libasound2
diff --git a/remote/targets/stage32-scientific/alsa b/remote/targets/stage32-scientific/alsa
new file mode 120000
index 00000000..7e13d263
--- /dev/null
+++ b/remote/targets/stage32-scientific/alsa
@@ -0,0 +1 @@
+../../modules/alsa
\ No newline at end of file
diff --git a/remote/targets/stage32-scientific/busybox b/remote/targets/stage32-scientific/busybox
new file mode 120000
index 00000000..4f45cedf
--- /dev/null
+++ b/remote/targets/stage32-scientific/busybox
@@ -0,0 +1 @@
+../../modules/busybox
\ No newline at end of file
diff --git a/remote/targets/stage32-scientific/dbus b/remote/targets/stage32-scientific/dbus
new file mode 120000
index 00000000..dd148715
--- /dev/null
+++ b/remote/targets/stage32-scientific/dbus
@@ -0,0 +1 @@
+../../modules/dbus
\ No newline at end of file
diff --git a/remote/targets/stage32-scientific/debug b/remote/targets/stage32-scientific/debug
new file mode 120000
index 00000000..c05237d6
--- /dev/null
+++ b/remote/targets/stage32-scientific/debug
@@ -0,0 +1 @@
+../../modules/debug
\ No newline at end of file
diff --git a/remote/targets/stage32-scientific/german b/remote/targets/stage32-scientific/german
new file mode 120000
index 00000000..4469f96e
--- /dev/null
+++ b/remote/targets/stage32-scientific/german
@@ -0,0 +1 @@
+../../modules/german
\ No newline at end of file
diff --git a/remote/targets/stage32-scientific/kdm b/remote/targets/stage32-scientific/kdm
new file mode 120000
index 00000000..727ed5b5
--- /dev/null
+++ b/remote/targets/stage32-scientific/kdm
@@ -0,0 +1 @@
+../../modules/kdm
\ No newline at end of file
diff --git a/remote/targets/stage32-scientific/kernel b/remote/targets/stage32-scientific/kernel
new file mode 120000
index 00000000..044f086d
--- /dev/null
+++ b/remote/targets/stage32-scientific/kernel
@@ -0,0 +1 @@
+../../modules/kernel
\ No newline at end of file
diff --git a/remote/targets/stage32-scientific/nscd b/remote/targets/stage32-scientific/nscd
new file mode 120000
index 00000000..d7e411d2
--- /dev/null
+++ b/remote/targets/stage32-scientific/nscd
@@ -0,0 +1 @@
+../../modules/nscd
\ No newline at end of file
diff --git a/remote/targets/stage32-scientific/openbox b/remote/targets/stage32-scientific/openbox
new file mode 120000
index 00000000..0fb8d86d
--- /dev/null
+++ b/remote/targets/stage32-scientific/openbox
@@ -0,0 +1 @@
+../../modules/openbox
\ No newline at end of file
diff --git a/remote/targets/stage32-scientific/pam b/remote/targets/stage32-scientific/pam
new file mode 120000
index 00000000..588acdbf
--- /dev/null
+++ b/remote/targets/stage32-scientific/pam
@@ -0,0 +1 @@
+../../modules/pam
\ No newline at end of file
diff --git a/remote/targets/stage32-scientific/plymouth b/remote/targets/stage32-scientific/plymouth
new file mode 120000
index 00000000..66a16832
--- /dev/null
+++ b/remote/targets/stage32-scientific/plymouth
@@ -0,0 +1 @@
+../../modules/plymouth
\ No newline at end of file
diff --git a/remote/targets/stage32-scientific/policykit b/remote/targets/stage32-scientific/policykit
new file mode 120000
index 00000000..39b77c7f
--- /dev/null
+++ b/remote/targets/stage32-scientific/policykit
@@ -0,0 +1 @@
+../../modules/policykit
\ No newline at end of file
diff --git a/remote/targets/stage32-scientific/rootfs-stage32 b/remote/targets/stage32-scientific/rootfs-stage32
new file mode 120000
index 00000000..96dcbb86
--- /dev/null
+++ b/remote/targets/stage32-scientific/rootfs-stage32
@@ -0,0 +1 @@
+../../rootfs/rootfs-stage32
\ No newline at end of file
diff --git a/remote/targets/stage32-scientific/rsyslogd b/remote/targets/stage32-scientific/rsyslogd
new file mode 120000
index 00000000..339d02f8
--- /dev/null
+++ b/remote/targets/stage32-scientific/rsyslogd
@@ -0,0 +1 @@
+../../modules/rsyslogd
\ No newline at end of file
diff --git a/remote/targets/stage32-scientific/sshd b/remote/targets/stage32-scientific/sshd
new file mode 120000
index 00000000..56b4e4b5
--- /dev/null
+++ b/remote/targets/stage32-scientific/sshd
@@ -0,0 +1 @@
+../../modules/sshd
\ No newline at end of file
diff --git a/remote/targets/stage32-scientific/systemd b/remote/targets/stage32-scientific/systemd
new file mode 120000
index 00000000..2dc58bd3
--- /dev/null
+++ b/remote/targets/stage32-scientific/systemd
@@ -0,0 +1 @@
+../../modules/systemd
\ No newline at end of file
diff --git a/remote/targets/stage32-scientific/vmchooser b/remote/targets/stage32-scientific/vmchooser
new file mode 120000
index 00000000..d918fbdc
--- /dev/null
+++ b/remote/targets/stage32-scientific/vmchooser
@@ -0,0 +1 @@
+../../modules/vmchooser
\ No newline at end of file
diff --git a/remote/targets/stage32-scientific/vmplayer b/remote/targets/stage32-scientific/vmplayer
new file mode 120000
index 00000000..9303aa6a
--- /dev/null
+++ b/remote/targets/stage32-scientific/vmplayer
@@ -0,0 +1 @@
+../../modules/vmplayer
\ No newline at end of file
diff --git a/remote/targets/stage32-scientific/xorg b/remote/targets/stage32-scientific/xorg
new file mode 120000
index 00000000..a9494860
--- /dev/null
+++ b/remote/targets/stage32-scientific/xorg
@@ -0,0 +1 @@
+../../modules/xorg
\ No newline at end of file