V3: Refactor external-python-tarball.bb

PATCH In review Kang Kai 1 participant 4 messages Jan 23, 2013 – Jan 29, 2013

Share & tools

Kang Kai

author

2013-01-23 03:28 UTC #0 lore raw

cover V3: Refactor external-python-tarball.bb

V3:
Inherit bbclass at then end of bb file that we can still use ?= to define variables. Remove DEPENDS that already defined in populate_sdk_base.bbclass.

The following changes since commit 37e025f6f9c410005e0f1dee0767e38eaec01cbd:

bitbake: hob: Hob should display warnings generated during parsing (2013-01-21 19:05:31 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib kangkai/external-python
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/external-python

Kang Kai (2):
createrepo-native: update dependency
external-python-tarball: code refactoring

 meta/recipes-core/meta/external-python-tarball.bb  |   67 +------------------
 .../createrepo/createrepo_0.4.11.bb                |    4 +-
 2 files changed, 6 insertions(+), 65 deletions(-)

Signature · 1 line

1.7.5.4

Kang Kai

author

2013-01-23 03:28 UTC #1 lore raw

PATCH 1/2 createrepo-native: update dependency

"RDEPENDS_${PN}_class-native" doesn't work for native recipe because no -native package will be created. Then the dependencies listed here are not built when bitbake createrepo-native.
Update and use DEPENDS_class-native instead.

Signed-off-by Kang Kai <[email protected]>

---
 .../createrepo/createrepo_0.4.11.bb                |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

meta/recipes-support/createrepo/createrepo_0.4.11.bb +2 -2

index 227ebcb..c977c2e 100644
@@ -4,9 +4,9 @@ HOMEPAGE = "http://createrepo.baseurl.org/"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
 
-RDEPENDS_${PN}_class-native += "libxml2-native rpm-native"
+DEPENDS_class-native += "libxml2-native rpm-native"
 
-PR = "r8"
+PR = "r9"
 
 SRC_URI= "http://createrepo.baseurl.org/download/${BP}.tar.gz \
           file://fix-native-install.patch \

Signature · 1 line

1.7.5.4

Kang Kai

author

2013-01-23 03:28 UTC #2 lore raw

PATCH 2/2 external-python-tarball: code refactoring

In reply to Kang Kai

external-python-tarball only can be built when inherit package_ipk now. Update it to reuse existed populate sdk code that it could be built for rpm and deb too.

Remove var DEPENDS, SDK_* and flags of do_populate_sdk because they are already defined in populate_sdk bbclasses.

[Yocto 3006]

Signed-off-by Kang Kai <[email protected]>

---
 meta/recipes-core/meta/external-python-tarball.bb |   67 +-------------------
 1 files changed, 4 insertions(+), 63 deletions(-)

meta/recipes-core/meta/external-python-tarball.bb +4 ~~-63~~

index 2085acc..2513cf6 100644
@@ -3,17 +3,9 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-DEPENDS = "opkg-native opkg-utils-native virtual/fakeroot-native sed-native"
+PR = "r2"
 
-PR = "r1"
-
-inherit meta
-
-SDK_DIR = "${WORKDIR}/sdk"
-SDK_OUTPUT = "${SDK_DIR}/image"
-SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
-
-IPKG_HOST = "opkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}"
+TOOLCHAIN_TARGET_TASK ?= ""
 
 TOOLCHAIN_HOST_TASK ?= "\
     nativesdk-python-core \

@@ -43,56 +35,5 @@ RDEPENDS = "${TOOLCHAIN_HOST_TASK}"
 
 EXCLUDE_FROM_WORLD = "1"
 
-do_populate_sdk() {
-	rm -rf ${SDK_OUTPUT}
-	mkdir -p ${SDK_OUTPUT}
-	mkdir -p ${SDK_OUTPUT}${localstatedir}/lib/opkg/
-
-	rm -f ${IPKGCONF_TARGET}
-	touch ${IPKGCONF_TARGET}
-	rm -f ${IPKGCONF_SDK}
-	touch ${IPKGCONF_SDK}
-
-	package_update_index_ipk
-	package_generate_ipkg_conf
-
-	for arch in ${PACKAGE_ARCHS}; do
-		revipkgarchs="$arch $revipkgarchs"
-	done
-
-	${IPKG_HOST} update
-	${IPKG_HOST} install ${TOOLCHAIN_HOST_TASK}
-
-	install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}${localstatedir_nativesdk}/lib/opkg
-	mv ${SDK_OUTPUT}/var/lib/opkg/* ${SDK_OUTPUT}/${SDKPATHNATIVE}${localstatedir_nativesdk}/lib/opkg/
-	rm -Rf ${SDK_OUTPUT}/var
-
-	install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}/${sysconfdir}
-	install -m 0644 ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATHNATIVE}/${sysconfdir}/
-
-	rm -f ${SDK_OUTPUT}/${SDKPATHNATIVE}${libdir_nativesdk}/*.la
-
-	# Link the ld.so.cache file into the hosts filesystem
-	ln -s /etc/ld.so.cache ${SDK_OUTPUT}/${SDKPATHNATIVE}/etc/ld.so.cache
-
-	# Add version information
-	versionfile=${SDK_OUTPUT}/${SDKPATH}/version-${MULTIMACH_TARGET_SYS}
-	touch $versionfile
-	echo 'Distro: ${DISTRO}' >> $versionfile
-	echo 'Distro Version: ${DISTRO_VERSION}' >> $versionfile
-	echo 'Metadata Revision: ${METADATA_REVISION}' >> $versionfile
-	echo 'Timestamp: ${DATETIME}' >> $versionfile
-
-	# Package it up
-	mkdir -p ${SDK_DEPLOY}
-	cd ${SDK_OUTPUT}
-	tar  --owner=root --group=root -cj --file=${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
-}
-
-do_populate_sdk[nostamp] = "1"
-do_populate_sdk[recrdeptask] = "do_package_write"
-addtask populate_sdk before do_build after do_install
-
-inherit blacklist
-
-PNBLACKLIST[external-python-tarball] = "${@base_contains('PACKAGE_CLASSES', 'package_ipk', '', 'This recipe requires \'package_ipk\' support to be enabled in PACKAGE_CLASSES.', d)}"
+inherit meta
+inherit populate_sdk

Signature · 1 line

1.7.5.4

Kang Kai

author

2013-01-29 03:08 UTC #3 lore raw

In reply to Kang Kai

Quoted 3 lines · Kang Kai

V3:
Inherit bbclass at then end of bb file that we can still use ?= to define variables. Remove DEPENDS that already defined in populate_sdk_base.bbclass.

Hi Saul,

Any more comments for this patch of version 3?

Regards,
Kai

Quoted 17 lines

The following changes since commit 37e025f6f9c410005e0f1dee0767e38eaec01cbd:
bitbake: hob: Hob should display warnings generated during parsing (2013-01-21 19:05:31 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib kangkai/external-python
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/external-python
Kang Kai (2):
createrepo-native: update dependency
external-python-tarball: code refactoring
  meta/recipes-core/meta/external-python-tarball.bb  |   67 +------------------
  .../createrepo/createrepo_0.4.11.bb                |    4 +-
  2 files changed, 6 insertions(+), 65 deletions(-)