summaryrefslogtreecommitdiffstats
path: root/meta/packages/dpkg
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:14:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:29:45 +0100
commit29d6678fd546377459ef75cf54abeef5b969b5cf (patch)
tree8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/packages/dpkg
parentda49de6885ee1bc424e70bc02f21f6ab920efb55 (diff)
downloadpoky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz
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 <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/dpkg')
-rw-r--r--meta/packages/dpkg/dpkg.inc40
-rw-r--r--meta/packages/dpkg/dpkg/autofoo.patch48
-rw-r--r--meta/packages/dpkg/dpkg/ignore_extra_fields.patch26
-rw-r--r--meta/packages/dpkg/dpkg/nochroot.patch18
-rw-r--r--meta/packages/dpkg/dpkg/noman.patch16
-rw-r--r--meta/packages/dpkg/dpkg/noupdalt.patch16
-rw-r--r--meta/packages/dpkg/dpkg_1.14.19.bb13
7 files changed, 0 insertions, 177 deletions
diff --git a/meta/packages/dpkg/dpkg.inc b/meta/packages/dpkg/dpkg.inc
deleted file mode 100644
index 7a4a1a607a..0000000000
--- a/meta/packages/dpkg/dpkg.inc
+++ /dev/null
@@ -1,40 +0,0 @@
1DESCRIPTION = "Package maintenance system for Debian."
2LICENSE = "GPL"
3SECTION = "base"
4PR = "r7"
5
6SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \
7 file://ignore_extra_fields.patch;patch=1 \
8 file://noupdalt.patch;patch=1"
9
10DEPENDS = "zlib bzip2"
11DEPENDS_virtclass-native = "bzip2-native zlib-native virtual/update-alternatives-native gettext-native"
12RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
13RDEPENDS_${PN}_virtclass-native = ""
14
15S = "${WORKDIR}/${BPN}-${PV}"
16
17PARALLEL_MAKE = ""
18
19inherit autotools gettext
20
21DPKG_INIT_POSITION = "98"
22DPKG_INIT_POSITION_slugos = "41"
23
24pkg_postinst_dpkg () {
25#!/bin/sh
26if [ "x$D" != "x" ]; then
27 install -d $D/${sysconfdir}/rcS.d
28 # this happens at S98 where our good 'ole packages script used to run
29 echo -e "#!/bin/sh
30 dpkg --configure -a
31 rm -f /${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
32" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
33 chmod 0755 $D/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
34fi
35}
36
37do_configure () {
38 echo >> m4/compiler.m4
39 autotools_do_configure
40}
diff --git a/meta/packages/dpkg/dpkg/autofoo.patch b/meta/packages/dpkg/dpkg/autofoo.patch
deleted file mode 100644
index 691121e418..0000000000
--- a/meta/packages/dpkg/dpkg/autofoo.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- dpkg-1.10.23/configure.in~autofoo
7+++ dpkg-1.10.23/configure.in
8@@ -227,21 +227,36 @@
9 # OpenBSD passes AC_TRY_COMPILE for va_copy even though
10 # it doesn't seem to exist, which is odd. We need to use
11 # AC_TRY_RUN.
12+#
13+# If crosscompiling, use AC_TRY_COMPILE. -CL
14 AC_TRY_RUN([
15 #include <stdarg.h>
16 main(){
17 va_list v1,v2;
18 va_copy(v1, v2);
19 exit(0);}
20-], [AC_MSG_RESULT(yes)
21-AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists])],[AC_MSG_RESULT(no)
22-AC_MSG_CHECKING([for va_list assignment copy])
23+], [dpkg_cv_va_copy=yes], [dpkg_cv_va_copy=no],
24 AC_TRY_COMPILE([
25 #include <stdarg.h>
26+main(){
27+va_list v1,v2;
28+va_copy(v1, v2);
29+exit(0);}
30+], [dpkg_cv_va_copy=yes], [dpkg_vc_va_copy=no]))
31+
32+if test "$dpkg_cv_va_copy" = "yes"; then
33+ AC_MSG_RESULT(yes)
34+ AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists])
35+else
36+ AC_MSG_RESULT(no)
37+ AC_MSG_CHECKING([for va_list assignment copy])
38+ AC_TRY_COMPILE([
39+#include <stdarg.h>
40 ],[
41 va_list v1,v2;
42 v1 = v2;
43-], AC_MSG_RESULT(yes),AC_MSG_ERROR(no))])
44+], AC_MSG_RESULT(yes), AC_MSG_ERROR(no))
45+fi
46
47 DPKG_C_GCC_ATTRIBUTE([,,],supported,[int x],[,,],ATTRIB,[Define if function attributes a la GCC 2.5 and higher are available.],
48 DPKG_C_GCC_ATTRIBUTE(noreturn,noreturn,[int x],noreturn,NORETURN,[Define if nonreturning functions a la GCC 2.5 and higher are available.])
diff --git a/meta/packages/dpkg/dpkg/ignore_extra_fields.patch b/meta/packages/dpkg/dpkg/ignore_extra_fields.patch
deleted file mode 100644
index d09343c6e5..0000000000
--- a/meta/packages/dpkg/dpkg/ignore_extra_fields.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1 dpkg-deb/build.c | 4 ++--
2 1 file changed, 2 insertions(+), 2 deletions(-)
3
4--- dpkg-1.14.19.orig/dpkg-deb/build.c
5+++ dpkg-1.14.19/dpkg-deb/build.c
6@@ -241,18 +241,18 @@ void do_build(const char *const *argv) {
7 if (checkedinfo->priority == pri_other) {
8 fprintf(stderr, _("warning, `%s' contains user-defined Priority value `%s'\n"),
9 controlfile, checkedinfo->otherpriority);
10 warns++;
11 }
12- for (field= checkedinfo->available.arbs; field; field= field->next) {
13+ /*for (field= checkedinfo->available.arbs; field; field= field->next) {
14 if (known_arbitrary_field(field))
15 continue;
16
17 fprintf(stderr, _("warning, `%s' contains user-defined field `%s'\n"),
18 controlfile, field->name);
19 warns++;
20- }
21+ }*/
22 checkversion(checkedinfo->available.version.version,"(upstream) version",&errs);
23 checkversion(checkedinfo->available.version.revision,"Debian revision",&errs);
24 if (errs) ohshit(_("%d errors in control file"),errs);
25
26 if (subdir) {
diff --git a/meta/packages/dpkg/dpkg/nochroot.patch b/meta/packages/dpkg/dpkg/nochroot.patch
deleted file mode 100644
index 3a8beaebbf..0000000000
--- a/meta/packages/dpkg/dpkg/nochroot.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1---
2 src/help.c | 2 ++
3 1 file changed, 2 insertions(+)
4
5--- dpkg-1.13.22.orig/src/help.c
6+++ dpkg-1.13.22/src/help.c
7@@ -175,9 +175,11 @@ static const char* preexecscript(const c
8 */
9 size_t instdirl;
10
11+#if 0
12 if (*instdir) {
13 if (chroot(instdir)) ohshite(_("failed to chroot to `%.250s'"),instdir);
14 }
15+#endif
16 if (f_debug & dbg_scripts) {
17 fprintf(stderr,"D0%05o: fork/exec %s (",dbg_scripts,path);
18 while (*++argv) fprintf(stderr," %s",*argv);
diff --git a/meta/packages/dpkg/dpkg/noman.patch b/meta/packages/dpkg/dpkg/noman.patch
deleted file mode 100644
index f5984fe14a..0000000000
--- a/meta/packages/dpkg/dpkg/noman.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1---
2 Makefile.am | 3 +--
3 1 file changed, 1 insertion(+), 2 deletions(-)
4
5--- dpkg-1.13.22.orig/Makefile.am
6+++ dpkg-1.13.22/Makefile.am
7@@ -15,8 +15,7 @@ SUBDIRS = \
8 utils \
9 scripts \
10 po \
11- origins \
12- man
13+ origins
14
15 ACLOCAL_AMFLAGS = -I m4
16
diff --git a/meta/packages/dpkg/dpkg/noupdalt.patch b/meta/packages/dpkg/dpkg/noupdalt.patch
deleted file mode 100644
index 023e99ae8d..0000000000
--- a/meta/packages/dpkg/dpkg/noupdalt.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1---
2 scripts/Makefile.am | 3 +--
3 1 file changed, 1 insertion(+), 2 deletions(-)
4
5--- dpkg-1.13.22.orig/scripts/Makefile.am
6+++ dpkg-1.13.22/scripts/Makefile.am
7@@ -20,8 +20,7 @@ bin_SCRIPTS = \
8 sbin_SCRIPTS = \
9 cleanup-info \
10 dpkg-divert \
11- dpkg-statoverride \
12- update-alternatives
13+ dpkg-statoverride
14
15 changelogdir = $(pkglibdir)/parsechangelog
16 changelog_SCRIPTS = \
diff --git a/meta/packages/dpkg/dpkg_1.14.19.bb b/meta/packages/dpkg/dpkg_1.14.19.bb
deleted file mode 100644
index 1e54306c93..0000000000
--- a/meta/packages/dpkg/dpkg_1.14.19.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require dpkg.inc
2
3SRC_URI += "file://noman.patch;patch=1"
4
5EXTRA_OECONF = "--without-static-progs \
6 --without-dselect \
7 --with-start-stop-daemon \
8 --with-zlib \
9 --with-bz2lib \
10 --without-selinux \
11 --without-sgml-doc"
12
13BBCLASSEXTEND = "native"