remove ipkg directory, normalize Makefile.

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3990 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 21 insertions, 66 deletions

diff --git a/package/openssl/Config.in b/package/openssl/Config.in
deleted file mode 100644
index e852c9f0f..000000000
--- a/package/openssl/Config.in
+++ /dev/null
@@ -1,35 +0,0 @@
-config BR2_COMPILE_OPENSSL
-	tristate
-	default n
-	depends BR2_PACKAGE_LIBOPENSSL
-	
-config BR2_PACKAGE_LIBOPENSSL
-	prompt "libopenssl........................ Open source SSL (Secure Socket Layer) libraries"
-	tristate
-	default m if CONFIG_DEVEL
-	select BR2_COMPILE_OPENSSL
-	help
-	  The OpenSSL Project is a collaborative effort to develop a robust, 
-	  commercial-grade, full-featured, and Open Source toolkit implementing 
-	  the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
-	  protocols as well as a full-strength general purpose cryptography library.
-	  
-	  http://www.openssl.org/
-	  
-	  This package contains the shared SSL libraries, needed by other programs.
-
-config BR2_PACKAGE_OPENSSL_UTIL
-	prompt   "openssl-util.................... OpenSSL command line tool"
-	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_LIBOPENSSL
-	help
-	  The OpenSSL Project is a collaborative effort to develop a robust, 
-	  commercial-grade, full-featured, and Open Source toolkit implementing 
-	  the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
-	  protocols as well as a full-strength general purpose cryptography library.
-	  
-	  http://www.openssl.org/
-	  
-	  This package contains the multi-purpose OpenSSL binary tool.
-
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 45b248fbf..82f20d6b0 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -22,6 +22,26 @@ OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-krb5 no-threads zlib-dyna
 
 include $(TOPDIR)/package/rules.mk
 
+define Package/libopenssl
+SECTION:=base
+CATEGORY:=Libraries
+TITLE:=Open source SSL libraries
+DEPENDS:=+zlib
+DESCRIPTION:=Open source SSL (Secure Socket Layer) libraries
+URL:=http://www.openssl.org/
+endef
+
+define Package/openssl-util
+$(call Package/libopenssl)
+DEPENDS:=libopenssl
+TITLE:=OpenSSL command line utilities
+DESCRIPTION:=OpenSSL command line utilities
+endef
+
+define Package/openssl-util/conffiles
+/etc/ssl/openssl.cnf
+endef
+
 define Build/Configure
 	$(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' $(PKG_BUILD_DIR)/Configure
 	$(SED) s/OPENWRT_OPTIMIZATION_FLAGS/$(BR2_TARGET_OPTIMIZATION)/g $(PKG_BUILD_DIR)/Configure
@@ -68,29 +88,10 @@ define Build/InstallDev
 endef
 	
 define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/openssl \
+	rm -rf	$(STAGING_DIR)/usr/include/openssl \
 		$(STAGING_DIR)/usr/lib/lib{crypto,ssl}.{a,so*}
 endef
 
-
-define Package/libopenssl
- SECTION:=base
- CATEGORY:=Libraries
- TITLE:=Open source SSL libraries
- DEPENDS:=+zlib
- DESCRIPTION:=Open source SSL (Secure Socket Layer) libraries
- URL:=http://www.openssl.org/
-endef
-
-define Package/openssl-util
- $(call Package/libopenssl)
- DEPENDS:=libopenssl
- TITLE:=OpenSSL command line utilities
- DESCRIPTION:=OpenSSL command line utilities
-endef
-
-
 define Package/libopenssl/install
 	install -d -m0755 $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(1)/usr/lib/
@@ -107,6 +108,5 @@ define Package/openssl-util/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/
 endef
 
-
 $(eval $(call BuildPackage,libopenssl))
 $(eval $(call BuildPackage,openssl-util))
diff --git a/package/openssl/ipkg/libopenssl.control b/package/openssl/ipkg/libopenssl.control
deleted file mode 100644
index 9cf48a804..000000000
--- a/package/openssl/ipkg/libopenssl.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: libopenssl
-Priority: optional
-Section: libs
-Description: OpenSSL (Secure Socket Layer) libraries
diff --git a/package/openssl/ipkg/openssl-util.conffiles b/package/openssl/ipkg/openssl-util.conffiles
deleted file mode 100644
index 6d068e66c..000000000
--- a/package/openssl/ipkg/openssl-util.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/ssl/openssl.cnf
diff --git a/package/openssl/ipkg/openssl-util.control b/package/openssl/ipkg/openssl-util.control
deleted file mode 100644
index 4c14ab1aa..000000000
--- a/package/openssl/ipkg/openssl-util.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: openssl-util
-Priority: optionnal
-Section: admin
-Description: OpenSSL (Secure Socket Layer) command line tool
-Depends: libopenssl