From patchwork Tue Jul 28 06:50:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 501044 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 6DC58140E3E for ; Tue, 28 Jul 2015 16:50:36 +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=RtAtWimW; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BF132914D1; Tue, 28 Jul 2015 06:50:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 47HKYr+HehUZ; Tue, 28 Jul 2015 06:50:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id F19F4914C7; Tue, 28 Jul 2015 06:50:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 36A361C2B8D for ; Tue, 28 Jul 2015 06:50:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 30BAB914C7 for ; Tue, 28 Jul 2015 06:50:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6SX4UTqpJrY7 for ; Tue, 28 Jul 2015 06:50:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by whitealder.osuosl.org (Postfix) with ESMTPS id ED82F91494 for ; Tue, 28 Jul 2015 06:50:30 +0000 (UTC) Received: by wibxm9 with SMTP id xm9so145949611wib.1 for ; Mon, 27 Jul 2015 23:50:29 -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=+6BsgVORZKhPHQ2ZhymklZWffxDSL8N4sRcDq+i679I=; b=RtAtWimWuCBFhWRk3BOcufDy6NnBcSCGCHfDhBvr8xh0oT3r7IFDbozYOTqEXAKoiu ODzmjq9bgLYj2poy12ewP4/9/NqMsbVR2cWzxutxZVU1pMPNQv5Xz1HpqtmqLcqb/qqD y1vBlqGbphz5h1Pg2rw5csMTdU1Sh4cn28HwcJLDXlUGaAXbvde5I3obwl1kMaQ+rc5g 2w4BNAs8Qt1p6rmodW2Yw3mzwvdIGPaPJt9cOeDBpUTj4uHkNAzlU+d23z2SkGCIOxgm 1aVn9ScP//F9a9oehHTb8rVU98yySthsuB+KDTYFuHPMBV1+JeqVwFtfj1z77l7VFWVs 55IA== X-Received: by 10.194.60.11 with SMTP id d11mr48919355wjr.143.1438066229640; Mon, 27 Jul 2015 23:50:29 -0700 (PDT) Received: from localhost.localdomain ([89.202.204.100]) by smtp.gmail.com with ESMTPSA id wx9sm31620929wjb.6.2015.07.27.23.50.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Jul 2015 23:50:28 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 28 Jul 2015 08:50:20 +0200 Message-Id: <1438066220-7019-1-git-send-email-angelo.compagnucci@gmail.com> X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH v3] 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 --- Changes: 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 | 37 +++++++++++++++++++++++++++------- 2 files changed, 41 insertions(+), 7 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..8de3283 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -11,18 +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 -define PYTHON_WEB2PY_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/python-web2py/S51web2py \ - $(TARGET_DIR)/etc/init.d/S51web2py +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_SYSTEMD $(INSTALL) -D -m 0644 package/python-web2py/web2py.service \