From patchwork Tue Jul 28 08:04:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 501060 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id B5B2C1402C8 for ; Tue, 28 Jul 2015 18:05:14 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Xy380VHZ; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D5DFB3308C; Tue, 28 Jul 2015 08:05:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uM5za1qcpBwI; Tue, 28 Jul 2015 08:05:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id CDBC633015; Tue, 28 Jul 2015 08:05:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 601B41C279A for ; Tue, 28 Jul 2015 08:05:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 59ABF33015 for ; Tue, 28 Jul 2015 08:05:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KUEyRnp8GYdZ for ; Tue, 28 Jul 2015 08:05:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by silver.osuosl.org (Postfix) with ESMTPS id 22CFA3025A for ; Tue, 28 Jul 2015 08:05:07 +0000 (UTC) Received: by wibud3 with SMTP id ud3so169490626wib.1 for ; Tue, 28 Jul 2015 01:05:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=XMq5wm+XdAs7F56fD6bKoCv4xZpohNgNFT1vonnLtX4=; b=Xy380VHZqODI3OP/2E7xc31iQ+UJSiBSGcjsrgbAzARmRJfXVvdiCUc+ok39QjtRVC N3YmJ+4HW7FydaWWa/vjUOfsiHuYkgDLnSurSzNCy48VW4Td/gGSfCrKOjR9YHdVvRbL 8HddsmkEl5Jaz4J2dNkfvHnYID8hq9wG1+UJXC9SKYTKIQ8cZyqnLr5Tsux0TKj+QwTU Rf4OtXhu4gEVn4u+JzwCYlcKDwdIhdl+9STeF3zV28z3SFbxQSNCgzuhHLtV+jzScCST G+uWzPjENZW70vVzCoYiHao661FAgOvzm6EO3P3tYHHywddzq77850EnNQLCw0hE3CBT kCSg== X-Received: by 10.194.109.167 with SMTP id ht7mr61576815wjb.60.1438070705648; Tue, 28 Jul 2015 01:05:05 -0700 (PDT) Received: from localhost.localdomain ([89.202.204.100]) by smtp.gmail.com with ESMTPSA id eu2sm17690722wic.8.2015.07.28.01.05.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jul 2015 01:05:05 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 28 Jul 2015 10:04:43 +0200 Message-Id: <1438070683-2109-1-git-send-email-angelo.compagnucci@gmail.com> X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH v4] package/python-web2py: cleaning for space saving X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch removes from web2py folder welcome, examples application and a bunch of other files uneeded in production, furthermore, it removes the admin interface if unneeded. Signed-off-by: Angelo Compagnucci Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: "Yann E. MORIN" --- Changes: v3->v4: * Fixed erroneously removed installation of system v init script v2->v3: * Changed to a positive logic for PYTHON_WEB2PY_INSTALL_ADMIN (suggested by Thomas) * Changed to a makefile based conditional logic (suggested by Thomas) * Extended cleaning of uneeded files. v1->v2: * Reworked otion sequence as suggested by Thomas. * Changed to a makefile based conditional as suggested by Thomas. package/python-web2py/Config.in | 11 +++++++++++ package/python-web2py/python-web2py.mk | 36 ++++++++++++++++++++++++++++++---- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/package/python-web2py/Config.in b/package/python-web2py/Config.in index b10d3a4..3b55153 100644 --- a/package/python-web2py/Config.in +++ b/package/python-web2py/Config.in @@ -14,6 +14,15 @@ config BR2_PACKAGE_PYTHON_WEB2PY if BR2_PACKAGE_PYTHON_WEB2PY +config BR2_PACKAGE_PYTHON_WEB2PY_INSTALL_ADMIN + bool "install admin panel application" + default y + help + This option install web2py admin panel application. + It can be removed to save space on embedded systems. + +if BR2_PACKAGE_PYTHON_WEB2PY_INSTALL_ADMIN + config BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD string "admin panel password" default web2py @@ -21,3 +30,5 @@ config BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD Set the admin panel password. endif + +endif diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index 313114a..be95517 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -11,13 +11,41 @@ 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 + rm -rf $(TARGET_DIR)/var/www/web2py/deposit + rm -rf $(TARGET_DIR)/var/www/web2py/docs + rm -rf $(TARGET_DIR)/var/www/web2py/examples + rm -rf $(TARGET_DIR)/var/www/web2py/extras + rm -rf $(TARGET_DIR)/var/www/web2py/handlers + rm -rf $(TARGET_DIR)/var/www/web2py/scripts + rm -rf $(TARGET_DIR)/var/www/web2py/ABOUT + rm -rf $(TARGET_DIR)/var/www/web2py/anyserver.py + rm -rf $(TARGET_DIR)/var/www/web2py/CHANGELOG + rm -rf $(TARGET_DIR)/var/www/web2py/Makefile + rm -rf $(TARGET_DIR)/var/www/web2py/MANIFEST.in + rm -rf $(TARGET_DIR)/var/www/web2py/README.markdown + rm -rf $(TARGET_DIR)/var/www/web2py/setup.py + rm -rf $(TARGET_DIR)/var/www/web2py/tox.ini +endef + +ifeq ($(BR2_PACKAGE_PYTHON_WEB2PY_INSTALL_ADMIN),y) +define PYTHON_WEB2PY_GENERATE_PASSWORD + $(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)'; +endef +PYTHON_WEB2PY_POST_BUILD_HOOKS += PYTHON_WEB2PY_GENERATE_PASSWORD +else +define PYTHON_WEB2PY_REMOVE_ADMIN + rm -rf $(TARGET_DIR)/var/www/web2py/applications/admin endef +PYTHON_WEB2PY_POST_INSTALL_TARGET_HOOKS += PYTHON_WEB2PY_REMOVE_ADMIN +endif define PYTHON_WEB2PY_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/python-web2py/S51web2py \