Skip to contentSkip to conversation

ajenti: remove

PATCH New Paul Eggleton 1 participant 1 message Jan 3, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ajenti: remove

In recent versions, upstream has decided to place additional restrictions on commercial use beyond a standard open source license (LGPLv3) [1]. This makes it hard to set a LICENSE value that is easily understood. Of course, as the authors, they have the right to decide what licensing terms they wish to distribute their project under, and we could always set LICENSE_FLAGS to denote the extra terms, but this is somewhat messy and personally I feel less inclined to continue maintaining this recipe in meta-webserver now, especially since I originally put it together on my own time. At the moment due to a branch/commit mismatch it is no longer fetching in any case.

(If someone wants to resurrect this recipe in another layer, they are more than welcome to do so.)

[1] http://support.ajenti.org/topic/351265-clarify-licensing/

---
 .../0001-setup.py-remove-extra-data-files.patch    |  33 ------
 ...stat-fix-disk-usage-check-to-work-with-bu.patch |  29 -----
 ...-plugins-sysload-fix-to-work-with-busybox.patch |  47 --------
 .../ajenti/0005-plugins-power-fix-shutdown.patch   |  31 ------
 ...ervices-add-basic-sysvinit-implementation.patch | 119 ---------------------
 ...vices-replace-s_upstart-with-s_init-in-MO.patch |  23 ----
 .../ajenti/distributor-logo-openembedded.png       | Bin 2165 -> 0 bytes
 .../ajenti/distro-detection-openembedded.patch     |  42 --------
 .../recipes-webadmin/ajenti/ajenti_git.bb          |  80 --------------
 9 files changed, 404 deletions(-)
 delete mode 100644 meta-webserver/recipes-webadmin/ajenti/ajenti/0001-setup.py-remove-extra-data-files.patch
 delete mode 100644 meta-webserver/recipes-webadmin/ajenti/ajenti/0002-plugins-hddstat-fix-disk-usage-check-to-work-with-bu.patch
 delete mode 100644 meta-webserver/recipes-webadmin/ajenti/ajenti/0003-plugins-sysload-fix-to-work-with-busybox.patch
 delete mode 100644 meta-webserver/recipes-webadmin/ajenti/ajenti/0005-plugins-power-fix-shutdown.patch
 delete mode 100644 meta-webserver/recipes-webadmin/ajenti/ajenti/0006-plugins-services-add-basic-sysvinit-implementation.patch
 delete mode 100644 meta-webserver/recipes-webadmin/ajenti/ajenti/0007-plugins-services-replace-s_upstart-with-s_init-in-MO.patch
 delete mode 100644 meta-webserver/recipes-webadmin/ajenti/ajenti/distributor-logo-openembedded.png
 delete mode 100644 meta-webserver/recipes-webadmin/ajenti/ajenti/distro-detection-openembedded.patch
 delete mode 100644 meta-webserver/recipes-webadmin/ajenti/ajenti_git.bb
meta-webserver/recipes-webadmin/ajenti/ajenti/0001-setup.py-remove-extra-data-files.patch deleted +0 -33
deleted file mode 100644
index 11d7a92..0000000
@@ -1,33 +0,0 @@
-From 37bf4c471f23140e00fe87dde6f7c3cf38933c22 Mon Sep 17 00:00:00 2001
-From: Paul Eggleton <[email protected]>
-Date: Mon, 12 Mar 2012 02:01:48 +0000
-Subject: [PATCH] setup.py: remove extra data files
-
-Don't install files using setup.py, since this fails due to absolute
-paths and we can easily install these within the recipe instead.
-
-Upstream-Status: Inappropriate [config]
-
-Signed-off-by: Paul Eggleton <[email protected]>
----
- setup.py |    6 ------
- 1 files changed, 0 insertions(+), 6 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 8daea4c..11e3acb 100755
---- a/setup.py
-+++ b/setup.py
-@@ -18,10 +18,4 @@ setup(
-     packages = find_packages(),
-     package_data={'': ['files/*.*', 'files/*/*.*', 'files/*/*/*.*', 'templates/*.*', 'widgets/*.*', 'layout/*.*']},
-     scripts=['ajenti-panel', 'ajenti-pkg'],
--    data_files=[
--        ('/etc/ajenti', ['packaging/files/ajenti.conf']),
--        ('/etc/ajenti/users', ['packaging/files/admin.conf']),
--        ('/etc/init.d', ['packaging/files/ajenti']),
--        ('/var/lib/ajenti/plugins', ['packaging/files/.placeholder']),
--    ],
- )
--- 
-1.7.5.4
-
meta-webserver/recipes-webadmin/ajenti/ajenti/0002-plugins-hddstat-fix-disk-usage-check-to-work-with-bu.patch deleted +0 -29
deleted file mode 100644
index 48c255d..0000000
@@ -1,29 +0,0 @@
-From cde811cfffba48c148b60fb1083fe8fd409b8b24 Mon Sep 17 00:00:00 2001
-From: Paul Eggleton <[email protected]>
-Date: Tue, 13 Mar 2012 01:52:34 +0000
-Subject: [PATCH 1/2] plugins/hddstat: fix disk usage check to work with
- busybox
-
-busybox df does not have --total, so fake it using awk.
-
-Signed-off-by: Paul Eggleton <[email protected]>
----
- plugins/hddstat/usage.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/plugins/hddstat/usage.py b/plugins/hddstat/usage.py
-index 3c84181..cf5f037 100644
---- a/plugins/hddstat/usage.py
-+++ b/plugins/hddstat/usage.py
-@@ -7,7 +7,7 @@ class DiskUsageMeter(LinearMeter):
-     transform = 'percent'
-     
-     def get_usage(self):
--        u = int(shell('df --total | grep total').split().pop().strip('%'))
-+        u = int(round(float(shell("df -P | awk 'NR > 1 {total+=$3+$4 ; used+=$3} END { print used/total*100}'").strip())))
-         return u
-     
-     def get_value(self):
--- 
-1.7.4.4
-
meta-webserver/recipes-webadmin/ajenti/ajenti/0003-plugins-sysload-fix-to-work-with-busybox.patch deleted +0 -47

47 lines not on this page · raw message

meta-webserver/recipes-webadmin/ajenti/ajenti/0005-plugins-power-fix-shutdown.patch deleted +0 -31
deleted file mode 100644
index 2934385..0000000
@@ -1,31 +0,0 @@
-From acd997cf610f8e9b0dbea00d2f1184d256d1b85b Mon Sep 17 00:00:00 2001
-From: Paul Eggleton <[email protected]>
-Date: Sat, 17 Mar 2012 23:50:48 +0000
-Subject: [PATCH] plugins/power: fix shutdown
-
-Fix shutdown to use the -h option together with -P (which is required
-for sysvinit shutdown.)
-
-Upstream-Status: Pending
-
-Signed-off-by: Paul Eggleton <[email protected]>
----
- plugins/power/main.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/plugins/power/main.py b/plugins/power/main.py
-index 0ab6337..069bde7 100755
---- a/plugins/power/main.py
-+++ b/plugins/power/main.py
-@@ -57,7 +57,7 @@ class PowerPlugin(CategoryPlugin):
-     @event('button/click')
-     def on_aclick(self, event, params, vars=None):
-         if params[0] == 'shutdown':
--            shell('shutdown -P now')
-+            shell('shutdown -h -P now')
-         if params[0] == 'reboot':
-             shell('reboot')
- 
--- 
-1.7.5.4
-
meta-webserver/recipes-webadmin/ajenti/ajenti/0006-plugins-services-add-basic-sysvinit-implementation.patch deleted +0 -119

119 lines not on this page · raw message

meta-webserver/recipes-webadmin/ajenti/ajenti/0007-plugins-services-replace-s_upstart-with-s_init-in-MO.patch deleted +0 -23
deleted file mode 100644
index 7623e3f..0000000
@@ -1,23 +0,0 @@
-From 75b5109ceb4874c967daf6c1e8434e6093b1df79 Mon Sep 17 00:00:00 2001
-From: Kevin Strasser <[email protected]>
-Date: Mon, 29 Oct 2012 01:44:10 -0700
-Subject: [PATCH] plugins/services: replace s_upstart with s_init in MODULES
-
-Signed-off-by: Kevin Strasser <[email protected]>
----
- plugins/services/__init__.py |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/services/__init__.py b/plugins/services/__init__.py
-index 6cf58e5..ced3300 100755
---- a/plugins/services/__init__.py
-+++ b/plugins/services/__init__.py
-@@ -1,4 +1,4 @@
--MODULES = ['api', 'main', 'meter', 'widget', 's_upstart', 's_arch', 's_bsd', 's_centos', 's_gentoo']
-+MODULES = ['api', 'main', 'meter', 'widget', 's_init', 's_arch', 's_bsd', 's_centos', 's_gentoo']
- 
- DEPS =  [
-     (['centos', 'fedora'],
--- 
-1.7.9.5
-
meta-webserver/recipes-webadmin/ajenti/ajenti/distributor-logo-openembedded.png deleted binary +0 -0
deleted file mode 100644
index 0aad9df90c26bb63e6eec88f0f1bf2d1ca1188bf..0000000000000000000000000000000000000000
GIT binary patch
meta-webserver/recipes-webadmin/ajenti/ajenti/distro-detection-openembedded.patch deleted +0 -42

42 lines not on this page · raw message

meta-webserver/recipes-webadmin/ajenti/ajenti_git.bb deleted +0 -80

80 lines not on this page · raw message

Signature · 1 line
1.8.1.2