From 3d1235af060955e271be68240c0ca46bc6d81b03 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 25 Mar 2014 15:24:04 +0100
Subject: [modules] new module naming convention

rename $MODULE.{conf,build} to module.{conf,build}
---
 remote/modules/consolekit/module.build         | 28 ++++++++++++++++++++++++++
 remote/modules/consolekit/module.conf          | 17 ++++++++++++++++
 remote/modules/consolekit/module.conf.debian   |  6 ++++++
 remote/modules/consolekit/module.conf.opensuse |  8 ++++++++
 remote/modules/consolekit/module.conf.ubuntu   |  9 +++++++++
 5 files changed, 68 insertions(+)
 create mode 100644 remote/modules/consolekit/module.build
 create mode 100644 remote/modules/consolekit/module.conf
 create mode 100644 remote/modules/consolekit/module.conf.debian
 create mode 100644 remote/modules/consolekit/module.conf.opensuse
 create mode 100644 remote/modules/consolekit/module.conf.ubuntu

(limited to 'remote/modules/consolekit')

diff --git a/remote/modules/consolekit/module.build b/remote/modules/consolekit/module.build
new file mode 100644
index 00000000..0c63ec6b
--- /dev/null
+++ b/remote/modules/consolekit/module.build
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+fetch_source() {
+	pinfo "Extracting from running system..."
+}
+
+build() {
+	COPYLIST="list_dpkg_output"
+	[ -e "${COPYLIST}" ] && rm "${COPYLIST}"
+
+        list_packet_files >> "${COPYLIST}"
+	tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
+	# Systemd/dbus
+	mkdir -p "$MODULE_BUILD_DIR/usr/share/dbus-1/system-services" "$MODULE_BUILD_DIR/etc/systemd/system"
+	local DAEMON=$(find "$MODULE_BUILD_DIR" -name console-kit-daemon -executable | head -n 1)
+	DAEMON="${DAEMON#$MODULE_BUILD_DIR}"
+	[ -z "$DAEMON" ] && perror "Could not find console-kit-daemon binary"
+	sed "s,%DAEMON%,/$DAEMON,g" "templates/consolekit.systemd.service" > "$MODULE_BUILD_DIR/etc/systemd/system/console-kit-daemon.service" || perror "Could not generate systemd service"
+	sed "s,%DAEMON%,/$DAEMON,g" "templates/consolekit.dbus.service" > "$MODULE_BUILD_DIR/usr/share/dbus-1/system-services/org.freedesktop.ConsoleKit.service" || perror "Could not generate dbus service"
+}
+
+post_copy() {
+	mkdir -p "${TARGET_BUILD_DIR}/usr/lib/ConsoleKit/run-seat.d"
+	mkdir -p "${TARGET_BUILD_DIR}/etc/ConsoleKit/run-seat.d"
+	mkdir -p "${TARGET_BUILD_DIR}/etc/ConsoleKit/run-session.d"
+	mkdir -p "${TARGET_BUILD_DIR}/var/log/ConsoleKit"
+}
+
diff --git a/remote/modules/consolekit/module.conf b/remote/modules/consolekit/module.conf
new file mode 100644
index 00000000..e27b15e6
--- /dev/null
+++ b/remote/modules/consolekit/module.conf
@@ -0,0 +1,17 @@
+REQUIRED_BINARIES="
+	console-kit-daemon
+	ck-history
+	ck-launch-session
+	ck-list-sessions
+"
+REQUIRED_DIRECTORIES="
+	/etc/ConsoleKit
+	/etc/dbus-1
+	/usr/lib/ConsoleKit
+	/usr/share
+"
+REQUIRED_LIBRARIES="
+	pam_ck_connector
+	libck-connector
+"
+
diff --git a/remote/modules/consolekit/module.conf.debian b/remote/modules/consolekit/module.conf.debian
new file mode 100644
index 00000000..0171868a
--- /dev/null
+++ b/remote/modules/consolekit/module.conf.debian
@@ -0,0 +1,6 @@
+REQUIRED_CONTENT_PACKAGES="
+	consolekit
+	libpam-ck-connector
+"
+
+
diff --git a/remote/modules/consolekit/module.conf.opensuse b/remote/modules/consolekit/module.conf.opensuse
new file mode 100644
index 00000000..d0f46410
--- /dev/null
+++ b/remote/modules/consolekit/module.conf.opensuse
@@ -0,0 +1,8 @@
+REQUIRED_INSTALLED_PACKAGES="
+	ConsoleKit
+	ConsoleKit-x11
+"
+REQUIRED_CONTENT_PACKAGES="
+	ConsoleKit
+	ConsoleKit-x11
+"
diff --git a/remote/modules/consolekit/module.conf.ubuntu b/remote/modules/consolekit/module.conf.ubuntu
new file mode 100644
index 00000000..e7f5e47d
--- /dev/null
+++ b/remote/modules/consolekit/module.conf.ubuntu
@@ -0,0 +1,9 @@
+REQUIRED_INSTALLED_PACKAGES="
+	consolekit
+"
+REQUIRED_CONTENT_PACKAGES="
+	consolekit
+	libpam-ck-connector
+	libck-connector0
+"
+
-- 
cgit v1.2.3-55-g7522


From 2e77068a00a432f960103966148ca5e5a19dd517 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 25 Mar 2014 15:53:51 +0100
Subject: [consolekit] woops, delete old files

---
 remote/modules/consolekit/consolekit.build         | 28 ----------------------
 remote/modules/consolekit/consolekit.conf          | 17 -------------
 remote/modules/consolekit/consolekit.conf.debian   |  6 -----
 remote/modules/consolekit/consolekit.conf.opensuse |  8 -------
 remote/modules/consolekit/consolekit.conf.ubuntu   |  9 -------
 5 files changed, 68 deletions(-)
 delete mode 100644 remote/modules/consolekit/consolekit.build
 delete mode 100644 remote/modules/consolekit/consolekit.conf
 delete mode 100644 remote/modules/consolekit/consolekit.conf.debian
 delete mode 100644 remote/modules/consolekit/consolekit.conf.opensuse
 delete mode 100644 remote/modules/consolekit/consolekit.conf.ubuntu

(limited to 'remote/modules/consolekit')

diff --git a/remote/modules/consolekit/consolekit.build b/remote/modules/consolekit/consolekit.build
deleted file mode 100644
index 0c63ec6b..00000000
--- a/remote/modules/consolekit/consolekit.build
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-fetch_source() {
-	pinfo "Extracting from running system..."
-}
-
-build() {
-	COPYLIST="list_dpkg_output"
-	[ -e "${COPYLIST}" ] && rm "${COPYLIST}"
-
-        list_packet_files >> "${COPYLIST}"
-	tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
-	# Systemd/dbus
-	mkdir -p "$MODULE_BUILD_DIR/usr/share/dbus-1/system-services" "$MODULE_BUILD_DIR/etc/systemd/system"
-	local DAEMON=$(find "$MODULE_BUILD_DIR" -name console-kit-daemon -executable | head -n 1)
-	DAEMON="${DAEMON#$MODULE_BUILD_DIR}"
-	[ -z "$DAEMON" ] && perror "Could not find console-kit-daemon binary"
-	sed "s,%DAEMON%,/$DAEMON,g" "templates/consolekit.systemd.service" > "$MODULE_BUILD_DIR/etc/systemd/system/console-kit-daemon.service" || perror "Could not generate systemd service"
-	sed "s,%DAEMON%,/$DAEMON,g" "templates/consolekit.dbus.service" > "$MODULE_BUILD_DIR/usr/share/dbus-1/system-services/org.freedesktop.ConsoleKit.service" || perror "Could not generate dbus service"
-}
-
-post_copy() {
-	mkdir -p "${TARGET_BUILD_DIR}/usr/lib/ConsoleKit/run-seat.d"
-	mkdir -p "${TARGET_BUILD_DIR}/etc/ConsoleKit/run-seat.d"
-	mkdir -p "${TARGET_BUILD_DIR}/etc/ConsoleKit/run-session.d"
-	mkdir -p "${TARGET_BUILD_DIR}/var/log/ConsoleKit"
-}
-
diff --git a/remote/modules/consolekit/consolekit.conf b/remote/modules/consolekit/consolekit.conf
deleted file mode 100644
index e27b15e6..00000000
--- a/remote/modules/consolekit/consolekit.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-REQUIRED_BINARIES="
-	console-kit-daemon
-	ck-history
-	ck-launch-session
-	ck-list-sessions
-"
-REQUIRED_DIRECTORIES="
-	/etc/ConsoleKit
-	/etc/dbus-1
-	/usr/lib/ConsoleKit
-	/usr/share
-"
-REQUIRED_LIBRARIES="
-	pam_ck_connector
-	libck-connector
-"
-
diff --git a/remote/modules/consolekit/consolekit.conf.debian b/remote/modules/consolekit/consolekit.conf.debian
deleted file mode 100644
index 0171868a..00000000
--- a/remote/modules/consolekit/consolekit.conf.debian
+++ /dev/null
@@ -1,6 +0,0 @@
-REQUIRED_CONTENT_PACKAGES="
-	consolekit
-	libpam-ck-connector
-"
-
-
diff --git a/remote/modules/consolekit/consolekit.conf.opensuse b/remote/modules/consolekit/consolekit.conf.opensuse
deleted file mode 100644
index d0f46410..00000000
--- a/remote/modules/consolekit/consolekit.conf.opensuse
+++ /dev/null
@@ -1,8 +0,0 @@
-REQUIRED_INSTALLED_PACKAGES="
-	ConsoleKit
-	ConsoleKit-x11
-"
-REQUIRED_CONTENT_PACKAGES="
-	ConsoleKit
-	ConsoleKit-x11
-"
diff --git a/remote/modules/consolekit/consolekit.conf.ubuntu b/remote/modules/consolekit/consolekit.conf.ubuntu
deleted file mode 100644
index e7f5e47d..00000000
--- a/remote/modules/consolekit/consolekit.conf.ubuntu
+++ /dev/null
@@ -1,9 +0,0 @@
-REQUIRED_INSTALLED_PACKAGES="
-	consolekit
-"
-REQUIRED_CONTENT_PACKAGES="
-	consolekit
-	libpam-ck-connector
-	libck-connector0
-"
-
-- 
cgit v1.2.3-55-g7522