diff mbox series

subversion: fix svn-revision.txt conflict between 32bit and 64bit packages

Message ID 20260515102141.3748275-1-haixiao.yan.cn@windriver.com
State New
Headers show
Series subversion: fix svn-revision.txt conflict between 32bit and 64bit packages | expand

Commit Message

Haixiao Yan May 15, 2026, 10:21 a.m. UTC 
From: Haixiao Yan <haixiao.yan.cn@windriver.com>

When the build host has libapr1-dev installed (e.g. Ubuntu 24.04), the
cross-compiled svnversion binary can unexpectedly execute on the host during
do_install, producing "Unversioned directory" in the 64bit build while the
32bit build falls back to "unknown". The differing content causes an RPM file
conflict on /usr/include/subversion-1/svn-revision.txt when installing
lib32-subversion-dev and subversion-dev together in do_rootfs.

Force the file content to "unknown" since the source is a tarball with no SVN
metadata.

Signed-off-by: Haixiao Yan <haixiao.yan.cn@windriver.com>
---
 meta/recipes-devtools/subversion/subversion_1.14.5.bb | 4 ++++
 1 file changed, 4 insertions(+)
diff mbox series

Patch

diff --git a/meta/recipes-devtools/subversion/subversion_1.14.5.bb b/meta/recipes-devtools/subversion/subversion_1.14.5.bb
index 13bec4ad5956..4545ccf6c532 100644
--- a/meta/recipes-devtools/subversion/subversion_1.14.5.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.14.5.bb
@@ -49,6 +49,10 @@  do_configure:prepend () {
     cp -f ${STAGING_DATADIR}/aclocal/libtool.m4 ${STAGING_DATADIR}/aclocal/lt*.m4 ${S}/build/
 }
 
+do_install:append() {
+    echo "unknown" > ${D}${includedir}/subversion-1/svn-revision.txt
+}
+
 #| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_local/libsvn_ra_local-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_repos/libsvn_repos-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'| /usr/bin/ld: cannot find -lsvn_delta-1| collect2: ld returned 1 exit status| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_svn/libsvn_ra_svn-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_serf/libsvn_ra_serf-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'
 #| x86_64-linux-libtool: install: error: relink `libsvn_ra_serf-1.la' with the above command before installing it
 #| x86_64-linux-libtool: install: warning: `../../subversion/libsvn_repos/libsvn_repos-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'