| View previous topic :: View next topic |
| Author |
Message |
equaeghe
l33t
Joined: 22 Feb 2005
Posts: 660
|
 Posted: Tue Apr 13, 2021 7:26 pm Post subject: [solved] emerge --sync error: Untracked working tree file … |
 |
|
Updating my system today, I got this error when doing an emerge --sync:
| Code: | error: Untracked working tree file 'app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch' would be overwritten by merge.
fatal: Could not reset index file to revision 'refs/remotes/origin/stable'.
!!! git merge error in /var/db/repos/gentoo |
Is this a repo thing that will be fixed and be waited out, or do I need to do something on my side?
Last edited by equaeghe on Wed Apr 14, 2021 7:33 am; edited 1 time in total |
|
| Back to top |
|
 |
fedeliallalinea
Administrator
Joined: 08 Mar 2003
Posts: 31580
Location: here
|
| Posted: Tue Apr 13, 2021 7:31 pm Post subject: |
|
|
You changed manually something in /var/db/repos/gentoo?
In particular you added app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch file?
_________________
Questions are guaranteed in life; Answers aren't. |
|
| Back to top |
|
|
equaeghe
l33t
Joined: 22 Feb 2005
Posts: 660
|
| Posted: Tue Apr 13, 2021 9:12 pm Post subject: |
|
|
| fedeliallalinea wrote: | You changed manually something in /var/db/repos/gentoo?
In particular you added app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch file? |
No, I did not, but
| Code: | /var/db/repos/gentoo # git status
On branch stable
Your branch and 'origin/stable' have diverged,
and have 1 and 1 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
deleted: app-emulation/qemu/files/qemu-9999-fix-firmware-path.patch
modified: app-emulation/qemu/qemu-5.2.0-r50.ebuild
modified: app-emulation/qemu/qemu-9999.ebuild
modified: metadata/md5-cache/app-emulation/qemu-5.2.0-r50
modified: metadata/md5-cache/app-emulation/qemu-9999
deleted: metadata/md5-cache/www-client/google-chrome-beta-90.0.4430.61
deleted: metadata/md5-cache/www-plugins/chrome-binary-plugins-90.0.4430.61_beta
modified: metadata/pkg_desc_index
modified: metadata/timestamp.chk
modified: net-misc/zerotier/metadata.xml
modified: profiles/desc/qemu_user_targets.desc
modified: profiles/use.local.desc
modified: www-client/google-chrome-beta/Manifest
deleted: www-client/google-chrome-beta/google-chrome-beta-90.0.4430.61.ebuild
modified: www-plugins/chrome-binary-plugins/Manifest
deleted: www-plugins/chrome-binary-plugins/chrome-binary-plugins-90.0.4430.61_beta.ebuild
Untracked files:
(use "git add <file>..." to include in what will be committed)
app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch
www-client/google-chrome-beta/google-chrome-beta-90.0.4430.70.ebuild
www-plugins/chrome-binary-plugins/chrome-binary-plugins-90.0.4430.70_beta.ebuild
no changes added to commit (use "git add" and/or "git commit -a") |
with for example
| Code: | diff --git a/app-emulation/qemu/qemu-5.2.0-r50.ebuild b/app-emulation/qemu/qemu-5.2.0-r50.ebuild
index 6b9bfbec8c..7a9f08f853 100644
--- a/app-emulation/qemu/qemu-5.2.0-r50.ebuild
+++ b/app-emulation/qemu/qemu-5.2.0-r50.ebuild
@@ -234,6 +234,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.2.0-strings.patch
"${FILESDIR}"/${PN}-5.2.0-fix-firmware-path.patch
"${FILESDIR}"/${PN}-5.2.0-no-pie-ld.patch
+ "${FILESDIR}"/${PN}-5.2.0-dce-locks.patch
)
QA_PREBUILT=" |
| Code: | /var/db/repos/gentoo # cat app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch
Fix CFLAGS=-Og build break. -Og fails because gcc does not enable dead
code elimination (but does set __OPTIMIZE__ define).
The fix avoids DCE reliance downstream entirely.
Reported-by: Luke-Jr
Bug: https://bugs.gentoo.org/782364
--- a/include/qemu/lockable.h
+++ b/include/qemu/lockable.h
@@ -28,7 +28,7 @@ struct QemuLockable {
* to QEMU_MAKE_LOCKABLE. For optimized builds, we can rely on dead-code elimination
* from the compiler, and give the errors already at link time.
*/
-#if defined(__OPTIMIZE__) && !defined(__SANITIZE_ADDRESS__)
+#if defined(__OPTIMIZE__) && !defined(__SANITIZE_ADDRESS__) && defined(VALIDATE_LOCKS_VIA_DCE)
void unknown_lock_type(void *);
#else
static inline void unknown_lock_type(void *unused) |
And indeed 782364 added this.
Did something go wrong with my previous sync? |
|
| Back to top |
|
|
kikko
Apprentice
Joined: 29 Apr 2014
Posts: 276
Location: Milan, IT
|
| Posted: Tue Apr 13, 2021 9:13 pm Post subject: |
|
|
Hi equaeghe
do you use git in place of rsync to sync Portage tree?
It seems that your local copy of the "qemu-5.2.0-dce-locks.patch" file is not tracked in the git repo, but sync is refusing to overwrite your local file with the remote one
It's weird (have you ever did a successful sync?), but if this is your case, you may try to fix the error by adding it manually:
| Code: | cd /var/db/repos/gentoo
git add *
git stash
emerge --sync
|
Edit: of course you use git, please ignore my questions...
_________________
Regards
root is the root of all evil |
|
| Back to top |
|
|
fedeliallalinea
Administrator
Joined: 08 Mar 2003
Posts: 31580
Location: here
|
| Posted: Wed Apr 14, 2021 5:47 am Post subject: |
|
|
| equaeghe wrote: | | Did something go wrong with my previous sync? |
Maybe I use git and no problem here
_________________
Questions are guaranteed in life; Answers aren't. |
|
| Back to top |
|
|
equaeghe
l33t
Joined: 22 Feb 2005
Posts: 660
|
| Posted: Wed Apr 14, 2021 7:32 am Post subject: |
|
|
I assume something went wrong while syncing last time. So I cleaned up the repo with
| Code: | /var/db/repos/gentoo # git clean -f -d
/var/db/repos/gentoo # git reset --hard origin/stable |
as suggested in a Stack Overflow page.
Afterwards, syncing went fine again. |
|
| Back to top |
|
|
|
Portage & Programming
