1. updated sysroots 2. fixed streamer build 3. fixed python extensions build... (fa20ebf2) · Commits · Elphel / meta-elphel393

classes/elphel-dev.bbclass

+10 −5

Original line number	Original line	Diff line number	Diff line
	# developers version		# developers version

			DEPENDS += "linux-xlnx"

	inherit elphel-misc elphel-scp		inherit elphel-misc elphel-scp

	do_unpack(){		do_unpack(){
	@@ -11,7 +13,10 @@ do_unpack(){
	if [ -d ${VPATH}/sysroots ]; then		if [ -d ${VPATH}/sysroots ]; then
	rm -rf ${VPATH}/sysroots		rm -rf ${VPATH}/sysroots
	fi		fi
	ln -sf ${TOPDIR}/tmp/sysroots ${VPATH}/sysroots		# old:
			#ln -sf ${TOPDIR}/tmp/sysroots ${VPATH}/sysroots
			# new:
			ln -sf ${WORKDIR}/recipe-sysroot ${VPATH}/sysroots

	if [ -d ${VPATH}/bitbake-logs ]; then		if [ -d ${VPATH}/bitbake-logs ]; then
	rm -rf ${VPATH}/bitbake-logs		rm -rf ${VPATH}/bitbake-logs

recipes-core/apps-astreamer/apps-astreamer_1.0.bb

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14,6 +14,10 @@ do_configure[noexec] = "1"
	#do_compile[noexec] = "1"		#do_compile[noexec] = "1"

	DEPENDS += "alsa-lib"		DEPENDS += "alsa-lib"

			# needed for sysroot?
			#DEPENDS += "apache2"

	RDEPENDS_apps-astreamer += "alsa-lib"		RDEPENDS_apps-astreamer += "alsa-lib"

	FILES_${PN} += " ${base_prefix}/usr/bin/*"		FILES_${PN} += " ${base_prefix}/usr/bin/*"

recipes-core/elphel-python-extensions/elphel-python-extensions_0.0.1.bb

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,10 @@ INHIBIT_PACKAGE_STRIP = "1"
	S = "${WORKDIR}/git"		S = "${WORKDIR}/git"

	do_compile() {		do_compile() {
	${CC} -Wall -Wextra -O -ansi -pedantic -shared -fPIC libelphel.c -o libelphel.so		# old
			#${CC} -Wall -Wextra -O -ansi -pedantic -shared -fPIC libelphel.c -o libelphel.so
			# Elphel, Rocko: was missing hash style
			${CC} -Wl,--hash-style=gnu -Wall -Wextra -O -ansi -pedantic -shared -fPIC libelphel.c -o libelphel.so
	}		}

	do_install() {		do_install() {

recipes-kernel/linux/linux-xlnx_2017.3.bbappend

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -76,7 +76,7 @@ python do_link() {

	#os.system("cd "+DEV_DIR+"; ln -sf "+S+" linux")		#os.system("cd "+DEV_DIR+"; ln -sf "+S+" linux")
	if not os.path.isdir(DEV_DIR+"/sysroots"):		if not os.path.isdir(DEV_DIR+"/sysroots"):
	os.system("cd "+DEV_DIR+"; ln -sf "+TOPDIR+"/tmp/sysroots sysroots")		os.system("cd "+DEV_DIR+"; ln -sf "+WORKDIR+"/recipe-sysroot sysroots")
	if not os.path.isdir(DEV_DIR+"/linux"):		if not os.path.isdir(DEV_DIR+"/linux"):
	os.system("cd "+DEV_DIR+"; ln -sf "+WORKDIR+"/linux-"+MACHINE+"-standard-build linux")		os.system("cd "+DEV_DIR+"; ln -sf "+WORKDIR+"/linux-"+MACHINE+"-standard-build linux")
	if not os.path.isdir(DEV_DIR+"/image"):		if not os.path.isdir(DEV_DIR+"/image"):
	@@ -188,7 +188,9 @@ do_install_append() {
	#do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TARGET}-uapi/"		#do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TARGET}-uapi/"

	sysroot_stage_all_append() {		sysroot_stage_all_append() {
	sysroot_stage_dir ${WORKDIR}/headers/include ${STAGING_DIR_TARGET}/usr/include-uapi		#sysroot_stage_dir ${WORKDIR}/headers/include ${STAGING_DIR_TARGET}/usr/include-uapi
			# Elphel, Rocko, new:
			sysroot_stage_dir ${WORKDIR}/headers/include ${SYSROOT_DESTDIR}/usr/include-uapi
	}		}

	## And you'd then use -I=/usr/myheaders/include to reference the sysroot		## And you'd then use -I=/usr/myheaders/include to reference the sysroot
	@@ -210,5 +212,3 @@ do_target_scp () {
	addtask do_target_scp after do_deploy		addtask do_target_scp after do_deploy

	do_target_scp[doc] = "scp copied the kernel to REMOTE_PATH on the target. REMOTE_USER and REMOTE_IP should be defined (ssh-copy-id -i KEY.pub TARGET_USER@TARGET_IP should be issued once)"		do_target_scp[doc] = "scp copied the kernel to REMOTE_PATH on the target. REMOTE_USER and REMOTE_IP should be defined (ssh-copy-id -i KEY.pub TARGET_USER@TARGET_IP should be issued once)"

Admin message