[Buildroot] [PATCH 0/3] python-web2py improvements

Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH 0/3] python-web2py improvements
@ 2015-07-24 20:05 Angelo Compagnucci
  2015-07-24 20:05 ` [Buildroot] [PATCH 1/3] package/python-web2py: cleaning for space savings Angelo Compagnucci
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Angelo Compagnucci @ 2015-07-24 20:05 UTC (permalink / raw)
  To: buildroot

This patch series improves web2py disk space usage and bumps to the
latest version.

Angelo Compagnucci (3):
  package/python-web2py: cleaning for space savings
  package/python-pydal: bump to version v15.07
  package/python-web2py: bump to version R-2.11.2

 package/python-pydal/python-pydal.mk   |  2 +-
 package/python-web2py/Config.in        | 10 ++++++++++
 package/python-web2py/python-web2py.mk | 17 ++++++++++++-----
 3 files changed, 23 insertions(+), 6 deletions(-)

-- 
1.9.1

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/3] package/python-web2py: cleaning for space savings
  2015-07-24 20:05 [Buildroot] [PATCH 0/3] python-web2py improvements Angelo Compagnucci
@ 2015-07-24 20:05 ` Angelo Compagnucci
  2015-07-25 19:02   ` Thomas Petazzoni
  2015-07-24 20:05 ` [Buildroot] [PATCH 2/3] package/python-pydal: bump to version v15.07 Angelo Compagnucci
  2015-07-24 20:05 ` [Buildroot] [PATCH 3/3] package/python-web2py: bump to version R-2.11.2 Angelo Compagnucci
  2 siblings, 1 reply; 6+ messages in thread
From: Angelo Compagnucci @ 2015-07-24 20:05 UTC (permalink / raw)
  To: buildroot

This patch cleans web2py folder from welcome and examples application,
furthermore, it cleans the admin interface if unneeded

Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
---
 package/python-web2py/Config.in        | 10 ++++++++++
 package/python-web2py/python-web2py.mk | 15 +++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/package/python-web2py/Config.in b/package/python-web2py/Config.in
index b10d3a4..d5a0164 100644
--- a/package/python-web2py/Config.in
+++ b/package/python-web2py/Config.in
@@ -14,6 +14,8 @@ config BR2_PACKAGE_PYTHON_WEB2PY
 
 if BR2_PACKAGE_PYTHON_WEB2PY
 
+if ! BR2_PACKAGE_PYTHON_WEB2PY_CLEAN_ADMIN
+
 config BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD
 	string "admin panel password"
 	default web2py
@@ -21,3 +23,11 @@ config BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD
 	  Set the admin panel password.
 
 endif
+
+config BR2_PACKAGE_PYTHON_WEB2PY_CLEAN_ADMIN
+	bool "clean admin panel application"
+	help
+	  This option removes admin panel application form web2py,
+	  useful for deploy on embedded systems.
+
+endif
diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk
index 641d7ef..8eab6bd 100644
--- a/package/python-web2py/python-web2py.mk
+++ b/package/python-web2py/python-web2py.mk
@@ -11,12 +11,19 @@ PYTHON_WEB2PY_LICENSE_FILES = LICENSE
 PYTHON_WEB2PY_DEPENDENCIES = python python-pydal host-python-pydal
 
 define PYTHON_WEB2PY_INSTALL_TARGET_CMDS
-	$(HOST_DIR)/usr/bin/python2 -c 'import os; \
-		os.chdir("$(@D)"); \
-		from gluon.main import save_password; \
-		save_password($(BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD),8000)'
 	mkdir -p $(TARGET_DIR)/var/www/web2py
 	cp -dpfr $(@D)/* $(TARGET_DIR)/var/www/web2py
+	rm -rf $(TARGET_DIR)/var/www/web2py/welcome.w2p
+	rm -rf $(TARGET_DIR)/var/www/web2py/applications/examples
+	rm -rf $(TARGET_DIR)/var/www/web2py/applications/welcome
+	if test -n "$(BR2_PACKAGE_PYTHON_WEB2PY_CLEAN_ADMIN)" ; then\
+		rm -rf $(TARGET_DIR)/var/www/web2py/applications/admin;\
+	else\
+		$(HOST_DIR)/usr/bin/python2 -c 'import os; \
+		os.chdir("$(@D)"); \
+		from gluon.main import save_password; \
+		save_password($(BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD),8000)';\
+	fi
 endef
 
 define PYTHON_WEB2PY_INSTALL_INIT_SYSV
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/3] package/python-web2py: cleaning for space savings
  2015-07-24 20:05 ` [Buildroot] [PATCH 1/3] package/python-web2py: cleaning for space savings Angelo Compagnucci
@ 2015-07-25 19:02   ` Thomas Petazzoni
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2015-07-25 19:02 UTC (permalink / raw)
  To: buildroot

Angelo,

On Fri, 24 Jul 2015 22:05:15 +0200, Angelo Compagnucci wrote:

>  if BR2_PACKAGE_PYTHON_WEB2PY
>  
> +if ! BR2_PACKAGE_PYTHON_WEB2PY_CLEAN_ADMIN
> +
>  config BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD
>  	string "admin panel password"
>  	default web2py
> @@ -21,3 +23,11 @@ config BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD
>  	  Set the admin panel password.
>  
>  endif

Then it's more logical for this option to be defined *after* the clean
admin option.

> +
> +config BR2_PACKAGE_PYTHON_WEB2PY_CLEAN_ADMIN
> +	bool "clean admin panel application"

Instead of clean, I think you should use "remove".

>  define PYTHON_WEB2PY_INSTALL_TARGET_CMDS
> -	$(HOST_DIR)/usr/bin/python2 -c 'import os; \
> -		os.chdir("$(@D)"); \
> -		from gluon.main import save_password; \
> -		save_password($(BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD),8000)'
>  	mkdir -p $(TARGET_DIR)/var/www/web2py
>  	cp -dpfr $(@D)/* $(TARGET_DIR)/var/www/web2py
> +	rm -rf $(TARGET_DIR)/var/www/web2py/welcome.w2p
> +	rm -rf $(TARGET_DIR)/var/www/web2py/applications/examples
> +	rm -rf $(TARGET_DIR)/var/www/web2py/applications/welcome
> +	if test -n "$(BR2_PACKAGE_PYTHON_WEB2PY_CLEAN_ADMIN)" ; then\
> +		rm -rf $(TARGET_DIR)/var/www/web2py/applications/admin;\
> +	else\
> +		$(HOST_DIR)/usr/bin/python2 -c 'import os; \
> +		os.chdir("$(@D)"); \
> +		from gluon.main import save_password; \
> +		save_password($(BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD),8000)';\
> +	fi

Please use a make based conditional rather than a shell one.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/3] package/python-pydal: bump to version v15.07
  2015-07-24 20:05 [Buildroot] [PATCH 0/3] python-web2py improvements Angelo Compagnucci
  2015-07-24 20:05 ` [Buildroot] [PATCH 1/3] package/python-web2py: cleaning for space savings Angelo Compagnucci
@ 2015-07-24 20:05 ` Angelo Compagnucci
  2015-07-26 16:34   ` Thomas Petazzoni
  2015-07-24 20:05 ` [Buildroot] [PATCH 3/3] package/python-web2py: bump to version R-2.11.2 Angelo Compagnucci
  2 siblings, 1 reply; 6+ messages in thread
From: Angelo Compagnucci @ 2015-07-24 20:05 UTC (permalink / raw)
  To: buildroot

This patch bumps python-pydal to version v15.07.

Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
---
 package/python-pydal/python-pydal.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/python-pydal/python-pydal.mk b/package/python-pydal/python-pydal.mk
index a99b61e..4c5da41 100644
--- a/package/python-pydal/python-pydal.mk
+++ b/package/python-pydal/python-pydal.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PYTHON_PYDAL_VERSION = v15.03
+PYTHON_PYDAL_VERSION = v15.07
 PYTHON_PYDAL_SITE = $(call github,web2py,pydal,$(PYTHON_PYDAL_VERSION))
 PYTHON_PYDAL_LICENSE = BSD-3c
 PYTHON_PYDAL_LICENSE_FILES = LICENSE
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/3] package/python-pydal: bump to version v15.07
  2015-07-24 20:05 ` [Buildroot] [PATCH 2/3] package/python-pydal: bump to version v15.07 Angelo Compagnucci
@ 2015-07-26 16:34   ` Thomas Petazzoni
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2015-07-26 16:34 UTC (permalink / raw)
  To: buildroot

Dear Angelo Compagnucci,

On Fri, 24 Jul 2015 22:05:16 +0200, Angelo Compagnucci wrote:
> This patch bumps python-pydal to version v15.07.
> 
> Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
> ---
>  package/python-pydal/python-pydal.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

I've applied patches 2/3 and 3/3 of your series. I've marked patch 1/3
as "Changes Requested" since I made some comments about it. Can you
respin 1/3 ?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 3/3] package/python-web2py: bump to version R-2.11.2
  2015-07-24 20:05 [Buildroot] [PATCH 0/3] python-web2py improvements Angelo Compagnucci
  2015-07-24 20:05 ` [Buildroot] [PATCH 1/3] package/python-web2py: cleaning for space savings Angelo Compagnucci
  2015-07-24 20:05 ` [Buildroot] [PATCH 2/3] package/python-pydal: bump to version v15.07 Angelo Compagnucci
@ 2015-07-24 20:05 ` Angelo Compagnucci
  2 siblings, 0 replies; 6+ messages in thread
From: Angelo Compagnucci @ 2015-07-24 20:05 UTC (permalink / raw)
  To: buildroot

This patch bumps python-web2py to version R-2.11.2.

Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
---
 package/python-web2py/python-web2py.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk
index 8eab6bd..869d723 100644
--- a/package/python-web2py/python-web2py.mk
+++ b/package/python-web2py/python-web2py.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PYTHON_WEB2PY_VERSION = R-2.10.3
+PYTHON_WEB2PY_VERSION = R-2.11.2
 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,$(PYTHON_WEB2PY_VERSION))
 PYTHON_WEB2PY_LICENSE = LGPLv3
 PYTHON_WEB2PY_LICENSE_FILES = LICENSE
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-07-26 16:34 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-24 20:05 [Buildroot] [PATCH 0/3] python-web2py improvements Angelo Compagnucci
2015-07-24 20:05 ` [Buildroot] [PATCH 1/3] package/python-web2py: cleaning for space savings Angelo Compagnucci
2015-07-25 19:02   ` Thomas Petazzoni
2015-07-24 20:05 ` [Buildroot] [PATCH 2/3] package/python-pydal: bump to version v15.07 Angelo Compagnucci
2015-07-26 16:34   ` Thomas Petazzoni
2015-07-24 20:05 ` [Buildroot] [PATCH 3/3] package/python-web2py: bump to version R-2.11.2 Angelo Compagnucci

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox