From 01e34bdb43e0cc27c1cfffd6730c384f40c404c1 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 18 May 2011 12:09:01 +0800 Subject: package-index.bb: add support for deb and rpm. [YOCTO #1024] Currently package-index.bb only supports ipk. This commit adds the support for rpm and deb, too. ------------------------------ How to generate and use repos: 1) run "bitbake package-index" after building some target, e.g., core-image-sato-sdk; 2) export ${DEPLOY_DIR_RPM}, ${DEPLOY_DIR_IPK} and ${DEPLOY_DIR_DEB} by a webserver on the host, assuming the host IP is 192.168.7.1, at http://192.168.7.1/rpm http://192.168.7.1/ipk http://192.168.7.1/deb 3) inside the target, according to the packaging system (rpm, ipk or deb) used when we generate the target image, we can use different ways to manage packages: 3.1) RPM run "zypper addrepo http://192.168.7.1/rpm main; zypper refresh" to retrieve info about the repo; next, we can use "zypper install/remove" to manage packages. 3.2) IPK add the repo info into opkg config file, i.e., in /etc/opkg/arch.conf, we can add something like "src i586 http://192.168.7.1/ipk/i586", and next, we run "opkg update" to make opkg update the list of available packages. And later, we can use "opkg install/remove" to manage packages. 3.3) DEB Currently in target, some important config files, like /var/lib/dpkg/status and /etc/apt/sources.list, for deb/apt are missing. So we can't install/remove package in target at present. Signed-off-by: Dexuan Cui --- meta/classes/package_deb.bbclass | 4 ++++ meta/classes/package_ipk.bbclass | 4 ++++ meta/classes/package_rpm.bbclass | 3 +++ meta/recipes-core/meta/package-index.bb | 6 ++---- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 4faeb4a5f..000d9ee8d 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -431,3 +431,7 @@ python do_package_write_deb () { do_package_write_deb[dirs] = "${PKGWRITEDIRDEB}" addtask package_write_deb before do_package_write after do_package + +PACKAGEINDEXES += "package_update_index_deb;" +PACKAGEINDEXDEPS += "dpkg-native:do_populate_sysroot" +PACKAGEINDEXDEPS += "apt-native:do_populate_sysroot" diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 3c2472bc1..a3dfc7334 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -386,3 +386,7 @@ python do_package_write_ipk () { } do_package_write_ipk[dirs] = "${PKGWRITEDIRIPK}" addtask package_write_ipk before do_package_write after do_package + +PACKAGEINDEXES += "package_update_index_ipk;" +PACKAGEINDEXDEPS += "opkg-utils-native:do_populate_sysroot" +PACKAGEINDEXDEPS += "opkg-native:do_populate_sysroot" diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 1cf9f798d..b86356de2 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -815,3 +815,6 @@ python do_package_write_rpm () { do_package_write_rpm[dirs] = "${PKGWRITEDIRRPM}" addtask package_write_rpm before do_package_write after do_package +PACKAGEINDEXES += "package_update_index_rpm; createrepo ${DEPLOY_DIR_RPM};" +PACKAGEINDEXDEPS += "rpm-native:do_populate_sysroot" +PACKAGEINDEXDEPS += "createrepo-native:do_populate_sysroot" diff --git a/meta/recipes-core/meta/package-index.bb b/meta/recipes-core/meta/package-index.bb index 3c642cb57..bf3922f6d 100644 --- a/meta/recipes-core/meta/package-index.bb +++ b/meta/recipes-core/meta/package-index.bb @@ -19,13 +19,11 @@ do_package_write_deb[noexec] = "1" do_populate_sysroot[noexec] = "1" do_package_index[nostamp] = "1" -do_package_index[dirs] = "${DEPLOY_DIR_IPK}" -do_package_index[depends] += "opkg-utils-native:do_populate_sysroot" -do_package_index[depends] += "opkg-native:do_populate_sysroot" +do_package_index[depends] += "${PACKAGEINDEXDEPS}" do_package_index() { set -ex - package_update_index_ipk + ${PACKAGEINDEXES} set +ex } addtask do_package_index before do_build -- cgit v1.2.3