[oe-commits] Jeremy Lainé : apt: add volatiles support for /var/ cache/apt

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 74d7222aee9f3725adeee1855c862a307b734d0b
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=74d7222aee9f3725adeee1855c862a307b734d0b

Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Wed Sep 30 16:04:18 2009 +0200

apt: add volatiles support for /var/cache/apt

---

 recipes/apt/apt-package.inc |    7 +++++++
 recipes/apt/apt.inc         |    3 ++-
 recipes/apt/apt_0.7.14.bb   |    7 +++----
 recipes/apt/apt_0.7.19.bb   |    7 +++----
 recipes/apt/apt_0.7.20.2.bb |    8 ++++----
 recipes/apt/files/volatiles |    3 +++
 6 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/recipes/apt/apt-package.inc b/recipes/apt/apt-package.inc
index 2b4f6d5..350bebd 100644
--- a/recipes/apt/apt-package.inc
+++ b/recipes/apt/apt-package.inc
@@ -99,4 +99,11 @@ do_install () {
 	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}/default/volatiles
+	install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_apt
+}
+
+pkg_postinst_${PN} () {
+	/etc/init.d/populate-volatile.sh update
 }
diff --git a/recipes/apt/apt.inc b/recipes/apt/apt.inc
index 4a4de17..2e1524a 100644
--- a/recipes/apt/apt.inc
+++ b/recipes/apt/apt.inc
@@ -2,7 +2,8 @@ DESCRIPTION = "Advanced front-end for dpkg."
 LICENSE = "GPL"
 SECTION = "base"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz"
+SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
+           file://volatiles "
 
 S = "${WORKDIR}/apt-${PV}"
 
diff --git a/recipes/apt/apt_0.7.14.bb b/recipes/apt/apt_0.7.14.bb
index 251ed64..f64fa00 100644
--- a/recipes/apt/apt_0.7.14.bb
+++ b/recipes/apt/apt_0.7.14.bb
@@ -3,10 +3,9 @@ RDEPENDS = "dpkg"
 
 require apt.inc
 
-SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
-           file://no-ko-translation.patch;patch=1 \
-           file://use-host.patch;patch=1 "
-PR = "r2"
+SRC_URI += "file://no-ko-translation.patch;patch=1 \
+            file://use-host.patch;patch=1 "
+PR = "r3"
 
 SRC_URI += "file://nodoc.patch;patch=1"
 
diff --git a/recipes/apt/apt_0.7.19.bb b/recipes/apt/apt_0.7.19.bb
index 251ed64..f64fa00 100644
--- a/recipes/apt/apt_0.7.19.bb
+++ b/recipes/apt/apt_0.7.19.bb
@@ -3,10 +3,9 @@ RDEPENDS = "dpkg"
 
 require apt.inc
 
-SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
-           file://no-ko-translation.patch;patch=1 \
-           file://use-host.patch;patch=1 "
-PR = "r2"
+SRC_URI += "file://no-ko-translation.patch;patch=1 \
+            file://use-host.patch;patch=1 "
+PR = "r3"
 
 SRC_URI += "file://nodoc.patch;patch=1"
 
diff --git a/recipes/apt/apt_0.7.20.2.bb b/recipes/apt/apt_0.7.20.2.bb
index 88047cc..d696ca2 100644
--- a/recipes/apt/apt_0.7.20.2.bb
+++ b/recipes/apt/apt_0.7.20.2.bb
@@ -3,10 +3,10 @@ RDEPENDS = "dpkg"
 
 require apt.inc
 
-SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
-           file://no-doxygen.patch;patch=1 \
-           file://no-ko-translation.patch;patch=1 \
-           file://use-host.patch;patch=1 "
+SRC_URI += "file://no-doxygen.patch;patch=1 \
+            file://no-ko-translation.patch;patch=1 \
+            file://use-host.patch;patch=1 "
+PR = "r1"
 
 require apt-package.inc
 
diff --git a/recipes/apt/files/volatiles b/recipes/apt/files/volatiles
new file mode 100644
index 0000000..fea465b
--- /dev/null
+++ b/recipes/apt/files/volatiles
@@ -0,0 +1,3 @@
+d root root 0755 /var/cache/apt none
+d root root 0755 /var/cache/apt/archives none
+d root root 0755 /var/cache/apt/archives/partial none