From patchwork Mon Jul 27 09:57:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 500297 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id AEEC11402B7 for ; Mon, 27 Jul 2015 19:57:24 +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=H3Y+VV4r; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EF5CEA2DA1; Mon, 27 Jul 2015 09:57:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id M86JHmR-Qzmw; Mon, 27 Jul 2015 09:57:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 496CEA2E13; Mon, 27 Jul 2015 09:57:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 269D41C1FE4 for ; Mon, 27 Jul 2015 09:57:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 22E758B394 for ; Mon, 27 Jul 2015 09:57:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hyqZCj0OxBjH for ; Mon, 27 Jul 2015 09:57:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by hemlock.osuosl.org (Postfix) with ESMTPS id 51C7E8B310 for ; Mon, 27 Jul 2015 09:57:21 +0000 (UTC) Received: by wibud3 with SMTP id ud3so107883196wib.0 for ; Mon, 27 Jul 2015 02:57:20 -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=48fuVi/Bp2Is8x/xWE2Rl0JaMC5KZHY39ijr7oQCZbQ=; b=H3Y+VV4r2SDI1RyWPe+Q34hy7Gs3onqPVBje56v6AY7BdEvnEz74lRXwYxotVyBKFA zL0wAjLZr+bPbKTtjCoiYfaJpb2SETdy6+/y7smFx6TgswsPf/uckk5N9PnTUjzZgP16 L1DrGDcaJ7BJAdc1j7FMzHtBKgCZQem4ZKRSGYNBP/Y2mxky16GmM5jjiTwOeAPSF1Nk KKxwWUlb2xqj59/mBBVm49CXrKTEApHjhWI2H7x1EtUvBGfzn3r3XXeu3K0faibJMrij E/K/MfctWVp+yp5URAe0pleaVBZuEeyU1lzGrVkx+iFBZ3Ciwck+Q/GQrqgxUOVUoMJx 04oQ== X-Received: by 10.194.91.193 with SMTP id cg1mr52988970wjb.86.1437991039939; Mon, 27 Jul 2015 02:57:19 -0700 (PDT) Received: from localhost.localdomain (wim-ideas1.fastnet.it. [195.96.196.41]) by smtp.gmail.com with ESMTPSA id lm16sm11291016wic.18.2015.07.27.02.57.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Jul 2015 02:57:18 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Mon, 27 Jul 2015 11:57:11 +0200 Message-Id: <1437991031-20433-1-git-send-email-angelo.compagnucci@gmail.com> X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH v2] 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 web2py folder from welcome and examples application, furthermore, it cleans the admin interface if unneeded. Signed-off-by: Angelo Compagnucci --- Changes: v1->v2: * Reworked otion sequence as suggested by Thomas. * Changed to a makefile based conditional as suggested by Thomas. package/python-web2py/Config.in | 10 ++++++++++ package/python-web2py/python-web2py.mk | 18 +++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/package/python-web2py/Config.in b/package/python-web2py/Config.in index b10d3a4..79afcb5 100644 --- a/package/python-web2py/Config.in +++ b/package/python-web2py/Config.in @@ -14,6 +14,14 @@ config BR2_PACKAGE_PYTHON_WEB2PY if BR2_PACKAGE_PYTHON_WEB2PY +config BR2_PACKAGE_PYTHON_WEB2PY_REMOVE_ADMIN + bool "remove admin panel application" + help + This option removes admin panel application form web2py, + useful for deploy on embedded systems. + +if ! BR2_PACKAGE_PYTHON_WEB2PY_REMOVE_ADMIN + config BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD string "admin panel password" default web2py @@ -21,3 +29,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..30d8848 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -11,13 +11,21 @@ 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; \ + 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; +endef + +ifeq ($(BR2_PACKAGE_PYTHON_WEB2PY_REMOVE_ADMIN),y) + PYTHON_WEB2PY_INSTALL_TARGET_CMDS += rm -rf $(TARGET_DIR)/var/www/web2py/applications/admin; +else + 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 -endef + save_password($(BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD),8000)'; +endif define PYTHON_WEB2PY_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/python-web2py/S51web2py \