From 29d6678fd546377459ef75cf54abeef5b969b5cf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 27 Aug 2010 15:14:24 +0100 Subject: Major layout change to the packages directory Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie --- meta/packages/apt/files/apt.conf | 43 -------------------------- meta/packages/apt/files/db_linking_hack.patch | 27 ---------------- meta/packages/apt/files/environment.patch | 13 -------- meta/packages/apt/files/no-curl.patch | 44 --------------------------- 4 files changed, 127 deletions(-) delete mode 100644 meta/packages/apt/files/apt.conf delete mode 100644 meta/packages/apt/files/db_linking_hack.patch delete mode 100644 meta/packages/apt/files/environment.patch delete mode 100644 meta/packages/apt/files/no-curl.patch (limited to 'meta/packages/apt/files') diff --git a/meta/packages/apt/files/apt.conf b/meta/packages/apt/files/apt.conf deleted file mode 100644 index 2bd9ddbfa..000000000 --- a/meta/packages/apt/files/apt.conf +++ /dev/null @@ -1,43 +0,0 @@ -Dir "${STAGING_DIR_NATIVE}/" -{ - State "var/lib/apt/" - { - Lists "lists/"; - status "${IMAGE_ROOTFS}/var/dpkg/status"; - }; - Cache "var/cache/apt/" - { - Archives "archives/"; - pkgcache ""; - srcpkgcache ""; - }; - Bin "${STAGING_BINDIR_NATIVE}/" - { - methods "${STAGING_LIBDIR}/apt/methods/"; - gzip "/bin/gzip"; - dpkg "dpkg"; - dpkg-source "dpkg-source"; - dpkg-buildpackage "dpkg-buildpackage"; - apt-get "apt-get"; - apt-cache "apt-cache"; - }; - Etc "etc/apt/" - { - Preferences "preferences"; - }; -}; - -APT -{ - Install-Recommends "true"; - Immediate-Configure "false"; - Architecture "i586"; - Get - { - Assume-Yes "true"; - Force-Yes "true" - }; -}; - -DPkg::Options {"--root=${IMAGE_ROOTFS}";"--admindir=${IMAGE_ROOTFS}/var/dpkg";"--force-all";"--no-debsig"}; -}; diff --git a/meta/packages/apt/files/db_linking_hack.patch b/meta/packages/apt/files/db_linking_hack.patch deleted file mode 100644 index 3c8368b1e..000000000 --- a/meta/packages/apt/files/db_linking_hack.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: apt-0.7.3/configure.in -=================================================================== ---- apt-0.7.3.orig/configure.in 2007-07-01 10:38:45.000000000 +0000 -+++ apt-0.7.3/configure.in 2007-08-21 13:39:26.000000000 +0000 -@@ -67,8 +67,20 @@ - [AC_DEFINE(HAVE_BDB) - BDBLIB="-ldb" - AC_MSG_RESULT(yes)], -- [BDBLIB="" -- AC_MSG_RESULT(no)] -+ -+ LIBS="$LIBS -lpthread" -+ [AC_MSG_CHECKING(if we can link against BerkeleyDB with pthread) -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM( -+ [#include ], -+ [int r, s, t; db_version(&r, &s, &t);] -+ )], -+ [AC_DEFINE(HAVE_BDB) -+ BDBLIB="-ldb -lpthread" -+ AC_MSG_RESULT(yes)], -+ [BDBLIB="" -+ AC_MSG_RESULT(no)] -+ )] - )] - ) - diff --git a/meta/packages/apt/files/environment.patch b/meta/packages/apt/files/environment.patch deleted file mode 100644 index 5bea1a013..000000000 --- a/meta/packages/apt/files/environment.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: apt-0.6.46.2/buildlib/environment.mak.in -=================================================================== ---- apt-0.6.46.2.orig/buildlib/environment.mak.in 2007-03-29 11:38:58.000000000 +0100 -+++ apt-0.6.46.2/buildlib/environment.mak.in 2007-03-29 11:39:12.000000000 +0100 -@@ -62,7 +62,7 @@ - - # Shared library things - HOST_OS = @host_os@ --ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0) -+ifneq ($(words $(filter linux-gnu linux-gnueabi gnu% %gnu,$(HOST_OS))),0) - SONAME_MAGIC=-Wl,-soname -Wl, - LFLAGS_SO= - else diff --git a/meta/packages/apt/files/no-curl.patch b/meta/packages/apt/files/no-curl.patch deleted file mode 100644 index 4e07c8f2d..000000000 --- a/meta/packages/apt/files/no-curl.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- - configure.in | 6 ------ - methods/makefile | 7 ------- - 2 files changed, 13 deletions(-) - ---- apt-0.7.14.orig/configure.in -+++ apt-0.7.14/configure.in -@@ -84,16 +84,10 @@ AC_CHECK_HEADER(db.h, - )] - ) - - LIBS="$saveLIBS" - --AC_CHECK_LIB(curl, curl_easy_init, -- [AC_CHECK_HEADER(curl/curl.h, -- curl_ok=yes, -- curl_ok=no)], -- AC_MSG_ERROR([failed: I need CURL due https support]), --) - - AC_SUBST(BDBLIB) - - dnl Converts the ARCH to be something singular for this general CPU family - dnl This is often the dpkg architecture string. ---- apt-0.7.14.orig/methods/makefile -+++ apt-0.7.14/methods/makefile -@@ -50,17 +50,10 @@ PROGRAM=http - SLIBS = -lapt-pkg $(SOCKETLIBS) - LIB_MAKES = apt-pkg/makefile - SOURCE = http.cc rfc2553emu.cc connect.cc - include $(PROGRAM_H) - --# The https method --PROGRAM=https --SLIBS = -lapt-pkg -lcurl --LIB_MAKES = apt-pkg/makefile --SOURCE = https.cc --include $(PROGRAM_H) -- - # The ftp method - PROGRAM=ftp - SLIBS = -lapt-pkg $(SOCKETLIBS) - LIB_MAKES = apt-pkg/makefile - SOURCE = ftp.cc rfc2553emu.cc connect.cc -- cgit v1.2.3