From f1b4824c865b228039d84b2605b2e7e4f34cddeb Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 21 Jun 2013 16:54:37 +0000 Subject: packages: clean up the package folder Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37007 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/uci/Makefile | 92 ------------------------ package/uci/files/lib/config/uci.sh | 137 ------------------------------------ 2 files changed, 229 deletions(-) delete mode 100644 package/uci/Makefile delete mode 100644 package/uci/files/lib/config/uci.sh (limited to 'package/uci') diff --git a/package/uci/Makefile b/package/uci/Makefile deleted file mode 100644 index 54ad80bda9..0000000000 --- a/package/uci/Makefile +++ /dev/null @@ -1,92 +0,0 @@ -# -# Copyright (C) 2008-2013 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -UCI_VERSION=2013-06-11 -UCI_RELEASE=1 - -PKG_NAME:=uci -PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE)) -PKG_RELEASE:=1 -PKG_REV:=c9c9d5cb085acc58b6579ace83fb79c085a9db27 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=git://nbd.name/uci.git -PKG_SOURCE_SUBDIR:=uci-$(PKG_VERSION) -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_PROTO:=git - -PKG_LICENSE:=LGPLv2.1 GPLv2 -PKG_LICENSE_FILES:= - -PKG_MAINTAINER:=Felix Fietkau - -PKG_BUILD_PARALLEL:=0 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -# set to 1 to enable debugging -DEBUG= - -define Package/libuci - SECTION:=libs - CATEGORY:=Libraries - TITLE:=C library for the Unified Configuration Interface (UCI) - DEPENDS:=+libubox -endef - -define Package/uci - SECTION:=base - CATEGORY:=Base system - DEPENDS:=+libuci - TITLE:=Utility for the Unified Configuration Interface (UCI) -endef - -define Package/libuci-lua - SECTION=libs - CATEGORY=Libraries - DEPENDS:=+libuci +liblua - TITLE:=Lua plugin for UCI -endef - -TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include -TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib - -CMAKE_OPTIONS = \ - -DLUAPATH=/usr/lib/lua \ - $(if $(DEBUG),-DUCI_DEBUG=ON) - -define Package/libuci/install - $(INSTALL_DIR) $(1)/lib - $(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/lib/ -endef - -define Package/libuci-lua/install - $(INSTALL_DIR) $(1)/usr/lib/lua - $(CP) $(PKG_BUILD_DIR)/lua/uci.so $(1)/usr/lib/lua/ -endef - -define Package/uci/install - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/uci $(1)/sbin/ - $(CP) ./files/* $(1)/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_BUILD_DIR)/uci{,_config,_blob,map}.h $(1)/usr/include - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libucimap.a $(1)/usr/lib -endef - -$(eval $(call BuildPackage,uci)) -$(eval $(call BuildPackage,libuci)) -$(eval $(call BuildPackage,libuci-lua)) diff --git a/package/uci/files/lib/config/uci.sh b/package/uci/files/lib/config/uci.sh deleted file mode 100644 index db84c8343e..0000000000 --- a/package/uci/files/lib/config/uci.sh +++ /dev/null @@ -1,137 +0,0 @@ -#!/bin/sh -# Shell script compatibility wrappers for /sbin/uci -# -# Copyright (C) 2008-2010 OpenWrt.org -# Copyright (C) 2008 Felix Fietkau -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -CONFIG_APPEND= -uci_load() { - local PACKAGE="$1" - local DATA - local RET - local VAR - - _C=0 - if [ -z "$CONFIG_APPEND" ]; then - for VAR in $CONFIG_LIST_STATE; do - export ${NO_EXPORT:+-n} CONFIG_${VAR}= - export ${NO_EXPORT:+-n} CONFIG_${VAR}_LENGTH= - done - export ${NO_EXPORT:+-n} CONFIG_LIST_STATE= - export ${NO_EXPORT:+-n} CONFIG_SECTIONS= - export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=0 - export ${NO_EXPORT:+-n} CONFIG_SECTION= - fi - - DATA="$(/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} ${LOAD_STATE:+-P /var/state} -S -n export "$PACKAGE" 2>/dev/null)" - RET="$?" - [ "$RET" != 0 -o -z "$DATA" ] || eval "$DATA" - unset DATA - - ${CONFIG_SECTION:+config_cb} - return "$RET" -} - -uci_set_default() { - local PACKAGE="$1" - /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -q show "$PACKAGE" > /dev/null && return 0 - /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} import "$PACKAGE" - /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} commit "$PACKAGE" -} - -uci_revert_state() { - local PACKAGE="$1" - local CONFIG="$2" - local OPTION="$3" - - /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -P /var/state revert "$PACKAGE${CONFIG:+.$CONFIG}${OPTION:+.$OPTION}" -} - -uci_set_state() { - local PACKAGE="$1" - local CONFIG="$2" - local OPTION="$3" - local VALUE="$4" - - [ "$#" = 4 ] || return 0 - /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -P /var/state set "$PACKAGE.$CONFIG${OPTION:+.$OPTION}=$VALUE" -} - -uci_toggle_state() { - uci_revert_state "$1" "$2" "$3" - uci_set_state "$1" "$2" "$3" "$4" -} - -uci_set() { - local PACKAGE="$1" - local CONFIG="$2" - local OPTION="$3" - local VALUE="$4" - - /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} set "$PACKAGE.$CONFIG.$OPTION=$VALUE" -} - -uci_get_state() { - uci_get "$1" "$2" "$3" "$4" "/var/state" -} - -uci_get() { - local PACKAGE="$1" - local CONFIG="$2" - local OPTION="$3" - local DEFAULT="$4" - local STATE="$5" - - /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} ${STATE:+-P $STATE} -q get "$PACKAGE${CONFIG:+.$CONFIG}${OPTION:+.$OPTION}" - RET="$?" - [ "$RET" -ne 0 ] && [ -n "$DEFAULT" ] && echo "$DEFAULT" - return "$RET" -} - -uci_add() { - local PACKAGE="$1" - local TYPE="$2" - local CONFIG="$3" - - if [ -z "$CONFIG" ]; then - export ${NO_EXPORT:+-n} CONFIG_SECTION="$(/sbin/uci add "$PACKAGE" "$TYPE")" - else - /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} set "$PACKAGE.$CONFIG=$TYPE" - export ${NO_EXPORT:+-n} CONFIG_SECTION="$CONFIG" - fi -} - -uci_rename() { - local PACKAGE="$1" - local CONFIG="$2" - local VALUE="$3" - - /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} rename "$PACKAGE.$CONFIG=$VALUE" -} - -uci_remove() { - local PACKAGE="$1" - local CONFIG="$2" - local OPTION="$3" - - /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} del "$PACKAGE.$CONFIG${OPTION:+.$OPTION}" -} - -uci_commit() { - local PACKAGE="$1" - /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} commit $PACKAGE -} -- cgit v1.2.3