Skip to contentSkip to conversation

fix rebuild for 2 recipes

PATCH New Robert Yang 1 participant 3 messages Oct 10, 2014

lore
Share & tools
lore
#0 lore raw

cover fix rebuild for 2 recipes

The following changes since commit 16cedc3bce6fc37543e9ef053cd7c589e523ca1c:

package_ipk.bbclass: Fix SRC_URI whitespace handling (2014-10-06 16:03:03 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/rebuild
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/rebuild

Robert Yang (2):
libassuan: fix for rebuild
wpa-supplicant: fix for rebuild

 .../wpa-supplicant/wpa-supplicant.inc              |    2 ++
 meta/recipes-support/libassuan/libassuan_2.1.2.bb  |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/2 libassuan: fix for rebuild

Fixed when rebuild:
rm: cannot remove `/path/to/2.1.2-r0/libassuan-2.1.2/m4/*.m4': No such file or directory

The files may not exist when rebuild.

---
 meta/recipes-support/libassuan/libassuan_2.1.2.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/libassuan/libassuan_2.1.2.bb +1 -1
index 6d89107..97dec6a 100644
@@ -22,5 +22,5 @@ inherit autotools texinfo binconfig-disabled pkgconfig
 
 do_configure_prepend () {
 	# Else these could be used in prefernce to those in aclocal-copy
-	rm ${S}/m4/*.m4
+	rm -f ${S}/m4/*.m4
 }
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 2/2 wpa-supplicant: fix for rebuild

In reply to Robert Yang

Fixed when rebuild:
make: *** No rule to make target /path/to/old//sysroots/qemux86-64/usr/lib/dbus-1.0/include/dbus/dbus-arch-deps.h', needed by dbus/dbus_old.o'. Stop.

The .d files save the path of the dependencies files which may not exist when rebuild, we can remove them to make the rebuild work.

---
 .../wpa-supplicant/wpa-supplicant.inc              |    2 ++
 1 file changed, 2 insertions(+)
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc +2 -0
index 3a1cce0..7923bb9 100644
@@ -50,6 +50,8 @@ do_configure () {
         	sed -i "s/%ssl%/$ssl/" wpa_supplicant/.config
 	fi
 
+	# For rebuild
+	rm -f wpa_supplicant/*.d wpa_supplicant/dbus/*.d
 }
 
 export EXTRA_CFLAGS = "${CFLAGS}"
Signature · 1 line
1.7.9.5