diff options
Diffstat (limited to 'packages/apt')
-rw-r--r-- | packages/apt/apt-0.7.14/noconfigure.patch | 35 | ||||
-rw-r--r-- | packages/apt/apt-0.7.14/nodoc.patch | 15 | ||||
-rw-r--r-- | packages/apt/apt-native.inc | 4 | ||||
-rw-r--r-- | packages/apt/apt-native_0.7.14.bb | 4 | ||||
-rw-r--r-- | packages/apt/apt.inc | 4 | ||||
-rw-r--r-- | packages/apt/apt_0.7.14.bb | 8 |
6 files changed, 67 insertions, 3 deletions
diff --git a/packages/apt/apt-0.7.14/noconfigure.patch b/packages/apt/apt-0.7.14/noconfigure.patch new file mode 100644 index 0000000000..682a96da24 --- /dev/null +++ b/packages/apt/apt-0.7.14/noconfigure.patch @@ -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; + } diff --git a/packages/apt/apt-0.7.14/nodoc.patch b/packages/apt/apt-0.7.14/nodoc.patch new file mode 100644 index 0000000000..9101847189 --- /dev/null +++ b/packages/apt/apt-0.7.14/nodoc.patch @@ -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 diff --git a/packages/apt/apt-native.inc b/packages/apt/apt-native.inc index 75cd8f47cd..c3814842e0 100644 --- a/packages/apt/apt-native.inc +++ b/packages/apt/apt-native.inc @@ -1,10 +1,10 @@ require apt.inc inherit native -DEPENDS += "dpkg-native curl-native db-native" +DEPENDS += "dpkg-native curl-native db-native gettext-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/apt-${PV}" PACKAGES = "" -USE_NLS = "no" +USE_NLS = "yes" SRC_URI += "file://db_linking_hack.patch;patch=1" diff --git a/packages/apt/apt-native_0.7.14.bb b/packages/apt/apt-native_0.7.14.bb new file mode 100644 index 0000000000..43f73889f7 --- /dev/null +++ b/packages/apt/apt-native_0.7.14.bb @@ -0,0 +1,4 @@ +require apt-native.inc + +SRC_URI += "file://nodoc.patch;patch=1 \ + file://noconfigure.patch;patch=1" diff --git a/packages/apt/apt.inc b/packages/apt/apt.inc index 92507be188..85df5df42c 100644 --- a/packages/apt/apt.inc +++ b/packages/apt/apt.inc @@ -5,7 +5,9 @@ DEPENDS = "curl db" RDEPENDS = "dpkg" SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ - file://environment.patch;patch=1" + file://no-ko-translation.patch;patch=1 \ + " + S = "${WORKDIR}/apt-${PV}" inherit autotools gettext diff --git a/packages/apt/apt_0.7.14.bb b/packages/apt/apt_0.7.14.bb new file mode 100644 index 0000000000..73285f37c3 --- /dev/null +++ b/packages/apt/apt_0.7.14.bb @@ -0,0 +1,8 @@ +require apt.inc + +SRC_URI += "file://nodoc.patch;patch=1" + +require apt-package.inc + +FILES_${PN} += "${bindir}/apt-key" +apt-manpages += "doc/apt-key.8" |