1 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
new file mode 100644
index 0000000000..4bcae49542
--- /dev/null
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
@@ -0,0 +1,47 @@
+If a the number of hard links decreases or increases while creating
+the tar files used for an ipk package, tar fails with error code 1:
+| DEBUG: Executing python function do_package_ipk
+| tar: ./usr/src/debug/gperf/3.0.4-r0/gperf-3.0.4/src/main.cc: file changed as we read it
+NOTE: recipe gperf-3.0.4-r0: task do_package_write_ipk: Failed
+ERROR: Task 6539 (recipes-extended/gperf/gperf_3.0.4.bb, do_package_write_ipk) failed with exit code '1'
+We detect if the error code produced by tar is 1 and in this case ignore it.
+This a similar behavior to the one on dpkg:
+http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=40731942515ec8d80c727ad561174986d4f05818
+Upsteam-Status: Inappropriate
+Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
+Index: git/opkg-build
+===================================================================
+--- git.orig/opkg-build
+++ git/opkg-build
+@@ -250,8 +250,21 @@ tmp_dir=$dest_dir/IPKG_BUILD.$$
+ mkdir $tmp_dir
+ 
+ echo $CONTROL > $tmp_dir/tarX
+-( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -cz $tarformat -f $tmp_dir/data.tar.gz . )
+-( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f $tmp_dir/control.tar.gz . )
+
+
+# Ignore error code 1, caused by modifying the number of hard links while creating the tar file
+rc=0
+( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -cz $tarformat -f $tmp_dir/data.tar.gz . ) || rc=$?
+if [[ $rc -ne 1 ]] && [[ $rc -ne 0 ]] ;then
+        exit $rc 
+fi
+
+rc=0
+( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f $tmp_dir/control.tar.gz . ) || rc=$?
+if [[ $rc -ne 1 ]] && [[ $rc -ne 0 ]] ;then
+        exit $rc
+fi
+
+ rm $tmp_dir/tarX
+ 
+ echo "2.0" > $tmp_dir/debian-binary

diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch new file mode 100644 index 0000000000..4bcae49542 --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
@@ -0,0 +1,47 @@
	1	If a the number of hard links decreases or increases while creating
	2	the tar files used for an ipk package, tar fails with error code 1:
	3
	4	\| DEBUG: Executing python function do_package_ipk
	5	\| tar: ./usr/src/debug/gperf/3.0.4-r0/gperf-3.0.4/src/main.cc: file changed as we read it
	6	NOTE: recipe gperf-3.0.4-r0: task do_package_write_ipk: Failed
	7	ERROR: Task 6539 (recipes-extended/gperf/gperf_3.0.4.bb, do_package_write_ipk) failed with exit code '1'
	8
	9
	10	We detect if the error code produced by tar is 1 and in this case ignore it.
	11
	12	This a similar behavior to the one on dpkg:
	13	http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=40731942515ec8d80c727ad561174986d4f05818
	14
	15	Upsteam-Status: Inappropriate
	16
	17	Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
	18
	19
	20	Index: git/opkg-build
	21	===================================================================
	22	--- git.orig/opkg-build
	23	+++ git/opkg-build
	24	@@ -250,8 +250,21 @@ tmp_dir=$dest_dir/IPKG_BUILD.$$
	25	mkdir $tmp_dir
	26
	27	echo $CONTROL > $tmp_dir/tarX
	28	-( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -cz $tarformat -f $tmp_dir/data.tar.gz . )
	29	-( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f $tmp_dir/control.tar.gz . )
	30	+
	31	+
	32	+# Ignore error code 1, caused by modifying the number of hard links while creating the tar file
	33	+rc=0
	34	+( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -cz $tarformat -f $tmp_dir/data.tar.gz . ) \|\| rc=$?
	35	+if [[ $rc -ne 1 ]] && [[ $rc -ne 0 ]] ;then
	36	+ exit $rc
	37	+fi
	38	+
	39	+rc=0
	40	+( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f $tmp_dir/control.tar.gz . ) \|\| rc=$?
	41	+if [[ $rc -ne 1 ]] && [[ $rc -ne 0 ]] ;then
	42	+ exit $rc
	43	+fi
	44	+
	45	rm $tmp_dir/tarX
	46
	47	echo "2.0" > $tmp_dir/debian-binary