From e89241824c3cc8204bf40a81046de35ad6fd3aee Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Wed, 4 Nov 2009 15:06:26 -0300 Subject: [PATCH 037/118] dpkg-1.14.25: adding fixes regarding the info problem Signed-off-by: Ricardo Salveti de Araujo --- recipes/dpkg/dpkg_1.14.25.bb | 10 ++++++++-- recipes/dpkg/files/fixing_dpkg_install_info.patch | 13 +++++++++++++ recipes/dpkg/files/info.dir | 20 ++++++++++++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 recipes/dpkg/files/fixing_dpkg_install_info.patch create mode 100644 recipes/dpkg/files/info.dir diff --git a/recipes/dpkg/dpkg_1.14.25.bb b/recipes/dpkg/dpkg_1.14.25.bb index 65d8309..ba4df28 100644 --- a/recipes/dpkg/dpkg_1.14.25.bb +++ b/recipes/dpkg/dpkg_1.14.25.bb @@ -1,8 +1,10 @@ require dpkg.inc -PR = "r2" +PR = "r3" DEPENDS += "zlib bzip2" #RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" -SRC_URI += "file://noman.patch;patch=1" +SRC_URI += "file://noman.patch;patch=1 \ + file://fixing_dpkg_install_info.patch;patch=1 \ + file://info.dir" EXTRA_OECONF = "--without-static-progs \ --without-dselect \ @@ -10,3 +12,7 @@ EXTRA_OECONF = "--without-static-progs \ --with-zlib \ --with-bz2lib \ --without-sgml-doc" + +do_install_append() { + install -m 0644 ${WORKDIR}/info.dir ${D}/${datadir}/dpkg +} diff --git a/recipes/dpkg/files/fixing_dpkg_install_info.patch b/recipes/dpkg/files/fixing_dpkg_install_info.patch new file mode 100644 index 0000000..d527225 --- /dev/null +++ b/recipes/dpkg/files/fixing_dpkg_install_info.patch @@ -0,0 +1,13 @@ +Index: dpkg-1.14.25/scripts/install-info.pl +=================================================================== +--- dpkg-1.14.25.orig/scripts/install-info.pl ++++ dpkg-1.14.25/scripts/install-info.pl +@@ -55,7 +55,7 @@ $dirfile = '/usr/share/info/dir'; + $maxwidth=79; + $Text::Wrap::columns=$maxwidth; + $backup='/var/backups/infodir.bak'; +-$default='/usr/share/base-files/info.dir'; ++$default='/usr/share/dpkg/info.dir'; + + $menuentry=""; + $description=""; diff --git a/recipes/dpkg/files/info.dir b/recipes/dpkg/files/info.dir new file mode 100644 index 0000000..ba2e43a --- /dev/null +++ b/recipes/dpkg/files/info.dir @@ -0,0 +1,20 @@ +-*- Text -*- +This is the file .../info/dir, which contains the topmost node of +the Info hierarchy. The first time you invoke Info you start off +looking at that node, which is (dir)Top. + +File: dir Node: Top This is the top of the INFO tree + This (the Directory node) gives a menu of major topics. + Typing "q" exits, "?" lists all Info commands, "d" returns here, + "mCoreutils" visits Coreutils topic, etc. + Or click mouse button 2 on a menu item or cross reference to select + it. + --- PLEASE ADD DOCUMENTATION TO THIS TREE. (See INFO topic first.) --- + +In OpenEmbedded, Info `dir' entries are added with the command +`install-info'. Please refer to install-info(8) for usage details. + +* Menu: The list of major topics begins on the next line. + +General Commands + -- 1.6.3.3