[oe-commits] org.oe.dev apt: sync with poky
koen commit
openembedded-commits at lists.openembedded.org
Tue Oct 3 17:56:03 UTC 2006
apt: sync with poky
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: e59abee0adf3353b1ae407e99b5e105ca10693ff
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e59abee0adf3353b1ae407e99b5e105ca10693ff
Files:
1
packages/apt/apt-0.6.45exp2
packages/apt/files
packages/apt/apt-0.6.45exp2/autofoo.patch
packages/apt/apt-0.6.45exp2/noconfigure.patch
packages/apt/apt-0.6.45exp2/nodoc.patch
packages/apt/apt-native.inc
packages/apt/apt-native_0.6.45exp2.bb
packages/apt/apt_0.6.45exp2.bb
packages/apt/files/apt.conf
packages/apt/apt-package.inc
packages/apt/apt.inc
Diffs:
#
# mt diff -rdf1b9d9f654c39e02f0b309e23cce794102e944e -re59abee0adf3353b1ae407e99b5e105ca10693ff
#
#
#
# add_dir "packages/apt/apt-0.6.45exp2"
#
# add_dir "packages/apt/files"
#
# add_file "packages/apt/apt-0.6.45exp2/autofoo.patch"
# content [3f79d2bbed427615e18856534cbbf5f331e8662b]
#
# add_file "packages/apt/apt-0.6.45exp2/noconfigure.patch"
# content [7a699aa22ec66db96f1c74509c516248667eecc6]
#
# add_file "packages/apt/apt-0.6.45exp2/nodoc.patch"
# content [431fc02b36a1717361e00c039d9b5e76fed2400e]
#
# add_file "packages/apt/apt-native.inc"
# content [664f09d2661d6a437181be28f9a9863733a0fb69]
#
# add_file "packages/apt/apt-native_0.6.45exp2.bb"
# content [4fff433a631dd3b390cedffba74b1a4f6e27c067]
#
# add_file "packages/apt/apt_0.6.45exp2.bb"
# content [ef36cfeb12b1c71655baec7da011e9a3354a12a6]
#
# add_file "packages/apt/files/apt.conf"
# content [dadc68285c75344a9c20fc74a1508bc05a2946a6]
#
# patch "packages/apt/apt-package.inc"
# from [03890e0b152fc8d7357108935785152b43dd27be]
# to [776b438ed4e20204678a1baba2ed113b69e73334]
#
# patch "packages/apt/apt.inc"
# from [6e1959f963d6a54791607ef2ec4abe01b46a99ee]
# to [f1ba219cb34c2240b0e7bceb0d766900845ed709]
#
============================================================
--- packages/apt/apt-0.6.45exp2/autofoo.patch 3f79d2bbed427615e18856534cbbf5f331e8662b
+++ packages/apt/apt-0.6.45exp2/autofoo.patch 3f79d2bbed427615e18856534cbbf5f331e8662b
@@ -0,0 +1,84 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+---
+ configure.in | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+--- apt-0.6.45exp2.orig/configure.in
++++ apt-0.6.45exp2/configure.in
+@@ -18,9 +18,9 @@ AC_CONFIG_AUX_DIR(buildlib)
+ AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
+
+ dnl -- SET THIS TO THE RELEASE VERSION --
+-AC_DEFINE_UNQUOTED(VERSION,"0.6.45exp2")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.45exp2",[package version])
+ PACKAGE="apt"
+-AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
++AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE",[package name])
+ AC_SUBST(PACKAGE)
+
+ dnl Check the archs, we want the target type.
+@@ -47,7 +47,7 @@ AC_SUBST(SOCKETLIBS)
+ LIBS="$SAVE_LIBS"
+
+ dnl Checks for pthread -- disabled due to glibc bugs jgg
+-dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"])
++dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD, 1, [define if we have pthreads]) PTHREADLIB="-lpthread"])
+ AC_SUBST(PTHREADLIB)
+ dnl if test "$PTHREADLIB" != "-lpthread"; then
+ dnl AC_MSG_ERROR(failed: I need posix threads, pthread)
+@@ -84,14 +84,14 @@ if test "x$archset" = "x"; then
+ AC_MSG_ERROR(failed: use --host= or check buildlib/archtable)
+ fi
+ AC_MSG_RESULT($archset)
+-AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset")
++AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset",[define to the system architecture])
+
+ dnl Get a common name for the host OS - this is primarily only for HURD and is
+ dnl non fatal if it fails
+ AC_MSG_CHECKING(system OS)
+ osset="`awk \" ! /^#|^\\\$/ {if (match(\\\"$target_vendor-$target_os\\\",\\\$1)) {print \\\$2; exit}}\" $srcdir/buildlib/ostable`"
+ AC_MSG_RESULT($osset)
+-AC_DEFINE_UNQUOTED(COMMON_OS,"$osset")
++AC_DEFINE_UNQUOTED(COMMON_OS,"$osset",[define to the system OS])
+
+ dnl We use C99 types if at all possible
+ AC_CACHE_CHECK([for C99 integer types],c9x_ints,[
+@@ -105,13 +105,13 @@ AC_SUBST(HAVE_STATVFS)
+
+ dnl Arg, linux and bsd put their statfs function in different places
+ if test x"$HAVE_STATVFS" != x"yes"; then
+- AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H)],[
+- AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H)],[AC_MSG_ERROR(failed: Need statvfs)])
++ AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H, 1, [define if statfs is in sys/vfs.h])],[
++ AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H, 1, [define if statfs is in sys/mount.h])],[AC_MSG_ERROR(failed: Need statvfs)])
+ ])
+ fi
+
+ dnl We should use the real timegm function if we have it.
+-AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM))
++AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM, 1, [define if we have timegm]))
+ AC_SUBST(HAVE_TIMEGM)
+
+ dnl Check the sizes etc. of the architecture
+@@ -157,7 +157,7 @@ fi
+ dnl HP-UX sux..
+ AC_MSG_CHECKING(for missing socklen_t)
+ AC_EGREP_HEADER(socklen_t, sys/socket.h,[AC_MSG_RESULT(no)],[
+- AC_DEFINE(NEED_SOCKLEN_T_DEFINE)
++ AC_DEFINE(NEED_SOCKLEN_T_DEFINE, 1, [define if we need to define socklen_t])
+ NEED_SOCKLEN_T_DEFINE=yes
+ AC_MSG_RESULT(missing.)])
+ AC_SUBST(NEED_SOCKLEN_T_DEFINE)
+@@ -204,7 +204,7 @@ dnl gettext approved makefiles, so this
+ ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko nb nl nn pl pt_BR pt ro ru sk sl sv tl vi zn_CN zh_TW"
+ AM_GNU_GETTEXT(external)
+ if test x"$USE_NLS" = "xyes"; then
+- AC_DEFINE(USE_NLS)
++ AC_DEFINE(USE_NLS, 1, [define if we have native language support])
+ fi
+ AC_SUBST(USE_NLS)
+ AC_PATH_PROG(BASH, bash)
============================================================
--- packages/apt/apt-0.6.45exp2/noconfigure.patch 7a699aa22ec66db96f1c74509c516248667eecc6
+++ packages/apt/apt-0.6.45exp2/noconfigure.patch 7a699aa22ec66db96f1c74509c516248667eecc6
@@ -0,0 +1,35 @@
+---
+ apt-pkg/packagemanager.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- apt-0.6.45exp2.orig/apt-pkg/packagemanager.cc
++++ apt-0.6.45exp2/apt-pkg/packagemanager.cc
+@@ -534,10 +534,12 @@ bool pkgPackageManager::SmartUnPack(PkgI
+
+ List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
+
++#if 0
+ // Perform immedate configuration of the package.
+ if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
+ if (SmartConfigure(Pkg) == false)
+ return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name());
++#endif
+
+ return true;
+ }
+@@ -609,6 +611,7 @@ pkgPackageManager::OrderResult pkgPackag
+ DoneSomething = true;
+ }
+
++#if 0
+ // Final run through the configure phase
+ if (ConfigureAll() == false)
+ return Failed;
+@@ -623,6 +626,7 @@ pkgPackageManager::OrderResult pkgPackag
+ return Failed;
+ }
+ }
++#endif
+
+ return Completed;
+ }
============================================================
--- packages/apt/apt-0.6.45exp2/nodoc.patch 431fc02b36a1717361e00c039d9b5e76fed2400e
+++ packages/apt/apt-0.6.45exp2/nodoc.patch 431fc02b36a1717361e00c039d9b5e76fed2400e
@@ -0,0 +1,15 @@
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- apt-0.6.45exp2.orig/Makefile
++++ apt-0.6.45exp2/Makefile
+@@ -17,7 +17,7 @@ all headers library clean veryclean bina
+ $(MAKE) -C cmdline $@
+ $(MAKE) -C ftparchive $@
+ $(MAKE) -C dselect $@
+- $(MAKE) -C doc $@
++# $(MAKE) -C doc $@
+ $(MAKE) -C po $@
+
+ # Some very common aliases
============================================================
--- packages/apt/apt-native.inc 664f09d2661d6a437181be28f9a9863733a0fb69
+++ packages/apt/apt-native.inc 664f09d2661d6a437181be28f9a9863733a0fb69
@@ -0,0 +1,61 @@
+require apt.inc
+inherit native
+
+DEPENDS += "dpkg-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/apt-${PV}"
+PACKAGES = ""
+USE_NLS = "no"
+
+python do_stage () {
+ bb.build.exec_func('do_stage_base', d)
+ bb.build.exec_func('do_stage_config', d)
+}
+
+python do_stage_config () {
+ indir = os.path.dirname(bb.data.getVar('FILE',d,1))
+ infile = file(os.path.join(indir, 'files', 'apt.conf'), 'r')
+ data = infile.read()
+ infile.close()
+
+ data = bb.data.expand(data, d)
+
+ outdir = os.path.join(bb.data.getVar('sysconfdir', d, 1), 'apt')
+ if not os.path.exists(outdir):
+ os.makedirs(outdir)
+ outpath = os.path.join(outdir, 'apt.conf')
+
+ outfile = file(outpath, 'w')
+ outfile.write(data)
+ outfile.close()
+}
+
+do_stage_base () {
+ install -d ${bindir}
+ install -m 0755 bin/apt-cdrom ${bindir}/
+ install -m 0755 bin/apt-get ${bindir}/
+ install -m 0755 bin/apt-config ${bindir}/
+ install -m 0755 bin/apt-cache ${bindir}/
+
+ install -m 0755 bin/apt-sortpkgs ${bindir}/
+ install -m 0755 bin/apt-extracttemplates ${bindir}/
+
+ eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'`
+ oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${libdir}/
+ ln -sf libapt-pkg$GLIBC_VER-6.so ${libdir}/libapt-pkg.so
+ oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${libdir}/
+ ln -sf libapt-inst$GLIBC_VER-6.so ${libdir}/libapt-inst.so
+
+ install -d ${libdir}/apt/methods
+ install -m 0755 bin/methods/* ${libdir}/apt/methods/
+
+ install -d ${libdir}/dpkg/methods/apt
+ install -m 0644 dselect/desc.apt ${libdir}/dpkg/methods/apt/
+ install -m 0644 dselect/names ${libdir}/dpkg/methods/apt/
+ install -m 0755 dselect/install ${libdir}/dpkg/methods/apt/
+ install -m 0755 dselect/setup ${libdir}/dpkg/methods/apt/
+ install -m 0755 dselect/update ${libdir}/dpkg/methods/apt/
+
+ install -d ${sysconfdir}/apt
+ install -d ${localstatedir}/lib/apt/lists/partial
+ install -d ${localstatedir}/cache/apt/archives/partial
+}
============================================================
--- packages/apt/apt-native_0.6.45exp2.bb 4fff433a631dd3b390cedffba74b1a4f6e27c067
+++ packages/apt/apt-native_0.6.45exp2.bb 4fff433a631dd3b390cedffba74b1a4f6e27c067
@@ -0,0 +1,4 @@
+require apt-native.inc
+
+SRC_URI += "file://nodoc.patch;patch=1 \
+ file://noconfigure.patch;patch=1"
============================================================
--- packages/apt/apt_0.6.45exp2.bb ef36cfeb12b1c71655baec7da011e9a3354a12a6
+++ packages/apt/apt_0.6.45exp2.bb ef36cfeb12b1c71655baec7da011e9a3354a12a6
@@ -0,0 +1,9 @@
+require apt.inc
+
+SRC_URI += "file://autofoo.patch;patch=1 \
+ file://nodoc.patch;patch=1"
+
+require apt-package.inc
+
+FILES_${PN} += "${bindir}/apt-key"
+apt-manpages += "doc/apt-key.8"
============================================================
--- packages/apt/files/apt.conf dadc68285c75344a9c20fc74a1508bc05a2946a6
+++ packages/apt/files/apt.conf dadc68285c75344a9c20fc74a1508bc05a2946a6
@@ -0,0 +1,38 @@
+Dir "${STAGING_DIR}/"
+{
+ State "var/lib/apt/"
+ {
+ Lists "lists/";
+ status "${IMAGE_ROOTFS}/var/dpkg/status";
+ };
+ Cache "var/cache/apt/"
+ {
+ Archives "archives/";
+ pkgcache "";
+ srcpkgcache "";
+ };
+ Bin "${STAGING_BINDIR}/"
+ {
+ 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";
+ };
+};
+
+APT
+{
+ 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"};
+};
============================================================
--- packages/apt/apt-package.inc 03890e0b152fc8d7357108935785152b43dd27be
+++ packages/apt/apt-package.inc 776b438ed4e20204678a1baba2ed113b69e73334
@@ -36,7 +36,7 @@ def get_files_apt_doc(d, bb, manpages):
def get_files_apt_doc(d, bb, manpages):
import re
manpages = re.sub(r'\bdoc/(\S+)/(\S+)\.\1\.(.)\b', r'${mandir}/\1/man\3/\2.\3', manpages)
- manpages = re.sub(r'\bdoc/(\S+)\.(.)\b', r'${mandir}/man\3/\1.\3', manpages)
+ manpages = re.sub(r'\bdoc/(\S+)\.(.)\b', r'${mandir}/man\2/\1.\2', manpages)
return manpages
def get_commands_apt_doc(d, bb, manpages):
@@ -65,6 +65,7 @@ do_install () {
FILES_${PN}-dev = "${libdir}/libapt*.so"
do_install () {
+ set -x
${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-manpages', d, 1))}
${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-utils-manpages', d, 1))}
install -d ${D}${bindir}
@@ -76,10 +77,11 @@ do_install () {
install -m 0755 bin/apt-sortpkgs ${D}${bindir}/
install -m 0755 bin/apt-extracttemplates ${D}${bindir}/
- oe_libinstall -so -C bin libapt-pkg--6 ${D}${libdir}/
- ln -sf libapt-pkg--6.so ${D}${libdir}/libapt-pkg.so
- oe_libinstall -so -C bin libapt-inst--6 ${D}${libdir}/
- ln -sf libapt-inst--6.so ${D}${libdir}/libapt-inst.so
+ eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'`
+ oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/
+ ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so
+ oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/
+ ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so
install -d ${D}${libdir}/apt/methods
install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
============================================================
--- packages/apt/apt.inc 6e1959f963d6a54791607ef2ec4abe01b46a99ee
+++ packages/apt/apt.inc f1ba219cb34c2240b0e7bceb0d766900845ed709
@@ -1,7 +1,10 @@ SECTION = "base"
DESCRIPTION = "Advanced front-end for dpkg."
LICENSE = "GPL"
SECTION = "base"
-MAINTAINER = "Chris Larson <kergoth at handhelds.org>"
SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz"
S = "${WORKDIR}/apt-${PV}"
+
+inherit autotools gettext
+
+EXTRA_AUTORECONF = "--exclude=autopoint,autoheader"
More information about the Openembedded-commits
mailing list