Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 11:34:13+01:00 mn-solutions.de!schurig
Merge http://oe-devel@openembedded.bkbits.net/openembedded
into mnz66.mn-solutions.de:/usr/src/oe/p

2005/02/23 11:33:31+01:00 mn-solutions.de!schurig
fix installation stage

2005/02/23 09:27:44+00:00 (none)!xora
New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission

2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl
add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though.

2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl
bump cvsdate on oz-3.5.3

2005/02/22 17:37:44-06:00 ti.com!kergoth
Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp.  Thanks to holger freyther for pointing it out.

BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A

1 files changed, 26 insertions, 26 deletions

diff --git a/packages/apt/apt-package.inc b/packages/apt/apt-package.inc
index a3ccc82e01..03d64155c1 100644
--- a/packages/apt/apt-package.inc
+++ b/packages/apt/apt-package.inc
@@ -47,9 +47,9 @@ def get_commands_apt_doc(d, bb, manpages):
 		dest = get_files_apt_doc(d, bb, m)
 		dir = os.path.dirname(dest)
 		if not dir in __dir_cache__:
-			s.append("install -d ${D}/%s" % dir)
+			s.append("install -d ${D}%s" % dir)
 			__dir_cache__.append(dir)
-		s.append("install -m 0644 %s ${D}/%s" % (m, dest))
+		s.append("install -m 0644 %s ${D}%s" % (m, dest))
 	return "\n".join(s)
 
 PACKAGES += "${PN}-utils ${PN}-utils-doc"
@@ -67,33 +67,33 @@ FILES_${PN}-dev = "${libdir}/libapt*.so"
 do_install () {
 	${@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}
-	install -m 0755 bin/apt-cdrom ${D}/${bindir}/
-	install -m 0755 bin/apt-get ${D}/${bindir}/
-	install -m 0755 bin/apt-config ${D}/${bindir}/
-	install -m 0755 bin/apt-cache ${D}/${bindir}/
+	install -d ${D}${bindir}
+	install -m 0755 bin/apt-cdrom ${D}${bindir}/
+	install -m 0755 bin/apt-get ${D}${bindir}/
+	install -m 0755 bin/apt-config ${D}${bindir}/
+	install -m 0755 bin/apt-cache ${D}${bindir}/
 
-	install -m 0755 bin/apt-sortpkgs ${D}/${bindir}/
-	install -m 0755 bin/apt-extracttemplates ${D}/${bindir}/
+	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
+	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
 
-	install -d ${D}/${libdir}/apt/methods
-	install -m 0755 bin/methods/* ${D}/${libdir}/apt/methods/
+	install -d ${D}${libdir}/apt/methods
+	install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
 
-	install -d ${D}/${libdir}/dpkg/methods/apt
-	install -m 0644 dselect/desc.apt ${D}/${libdir}/dpkg/methods/apt/ 
-	install -m 0644 dselect/names ${D}/${libdir}/dpkg/methods/apt/ 
-	install -m 0755 dselect/install ${D}/${libdir}/dpkg/methods/apt/ 
-	install -m 0755 dselect/setup ${D}/${libdir}/dpkg/methods/apt/ 
-	install -m 0755 dselect/update ${D}/${libdir}/dpkg/methods/apt/ 
+	install -d ${D}${libdir}/dpkg/methods/apt
+	install -m 0644 dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/ 
+	install -m 0644 dselect/names ${D}${libdir}/dpkg/methods/apt/ 
+	install -m 0755 dselect/install ${D}${libdir}/dpkg/methods/apt/ 
+	install -m 0755 dselect/setup ${D}${libdir}/dpkg/methods/apt/ 
+	install -m 0755 dselect/update ${D}${libdir}/dpkg/methods/apt/ 
 
-	install -d ${D}/${sysconfdir}/apt
-	install -d ${D}/${localstatedir}/lib/apt/lists/partial
-	install -d ${D}/${localstatedir}/cache/apt/archives/partial
-	install -d ${D}/${docdir}/apt/examples
-	install -m 0644 doc/examples/* ${D}/${docdir}/apt/examples/
+	install -d ${D}${sysconfdir}/apt
+	install -d ${D}${localstatedir}/lib/apt/lists/partial
+	install -d ${D}${localstatedir}/cache/apt/archives/partial
+	install -d ${D}${docdir}/apt/examples
+	install -m 0644 doc/examples/* ${D}${docdir}/apt/examples/
 }