Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gentoo fix.2: Wipe out libmisc #794

Merged
merged 1 commit into from Aug 31, 2023
Merged

Gentoo fix.2: Wipe out libmisc #794

merged 1 commit into from Aug 31, 2023

Conversation

alejandro-colomar
Copy link
Collaborator

@alejandro-colomar alejandro-colomar commented Aug 28, 2023 •
edited

Merge after the other fix for Gentoo.

Link: #792
Reported-by: @SoapGentoo
Cc: @thesamesam
Cc: @cbricart
Cc: @jubalh
Signed-off-by: Alejandro Colomar alx@kernel.org

@alejandro-colomar
Copy link
Collaborator Author

alejandro-colomar commented Aug 28, 2023 •
edited

@thesamesam, @SoapGentoo, does this fix the remaining issues in Gentoo?

@alejandro-colomar alejandro-colomar changed the title Gentoo2: Wipe out libmisc Gentoo fix.2: Wipe out libmisc Aug 28, 2023
@SoapGentoo
Copy link

yes, this fixed it

@alejandro-colomar
Copy link
Collaborator Author 

$ git range-diff master gh/gentoo2 gentoo2
1:  68d6ef2a = 1:  68d6ef2a lib, libmisc: Move source files to lib (where their headers were)
2:  271db407 ! 2:  a7bf3c35 lib: Merge libmisc into libshadow
    @@ Commit message
         Cc: Christian Bricart <christian@bricart.de>
         Cc: Michael Vetter <jubalh@iodoru.org>
         Cc: Robert Förster <Dessa@gmake.de>
    +    [ soap tested the Gentoo package ]
    +    Tested-by: David Seifert <soap@gentoo.org>
         Signed-off-by: Alejandro Colomar <alx@kernel.org>
     
      ## .gitignore ##

@alejandro-colomar alejandro-colomar mentioned this pull request Aug 29, 2023
Closed
@hallyn
Copy link
Member

hallyn commented Aug 30, 2023

+1 from me.

@ikerexxe
Copy link
Collaborator

Rebase on top of master and I'll proceed to merge

@alejandro-colomar
Copy link
Collaborator Author

Done :)

$ git range-diff master..gh/gentoo2 shadow/master..gentoo2
1:  68d6ef2a < -:  -------- lib, libmisc: Move source files to lib (where their headers were)
2:  a7bf3c35 ! 1:  c5cb1f4a lib: Merge libmisc into libshadow
    @@ Commit message
         lib: Merge libmisc into libshadow
     
         The separation was unnecessary, and caused build problems.  Let's go
    -    wild and remove the library.  The files are moved to libshadow.
    +    wild and obliterate the library.  The files are moved to libshadow.
     
         Scripted change:
     
    @@ Commit message
         Cc: Robert Förster <Dessa@gmake.de>
         [ soap tested the Gentoo package ]
         Tested-by: David Seifert <soap@gentoo.org>
    +    Cc: <lslebodn@fedoraproject.org>
    +    Acked-by: Serge Hallyn <serge@hallyn.com>
    +    Acked-by: Iker Pedrosa <ipedrosa@redhat.com>
         Signed-off-by: Alejandro Colomar <alx@kernel.org>
     
      ## .gitignore ##

@alejandro-colomar alejandro-colomar marked this pull request as ready for review August 30, 2023 15:58
@alejandro-colomar
Copy link
Collaborator Author

Oh, and

$ git range-diff shadow/master..gh/gentoo2 shadow/master..gentoo2
1:  c5cb1f4a ! 1:  a286dea9 lib: Merge libmisc into libshadow
    @@ Commit message
         Cc: Robert Förster <Dessa@gmake.de>
         [ soap tested the Gentoo package ]
         Tested-by: David Seifert <soap@gentoo.org>
    +    Acked-by: David Seifert <soap@gentoo.org>
         Cc: <lslebodn@fedoraproject.org>
         Acked-by: Serge Hallyn <serge@hallyn.com>
         Acked-by: Iker Pedrosa <ipedrosa@redhat.com>

@alejandro-colomar
lib: Merge libmisc into libshadow
0ae69d3 
The separation was unnecessary, and caused build problems.  Let's go
wild and obliterate the library.  The files are moved to libshadow.

Scripted change:

$ find libmisc/ -type f \
| grep '\.[chy]$' \
| xargs mv -t lib;

Plus updating the Makefile and other references.  While at it, I've
sorted the sources lists.

Link: <shadow-maint#792>
Reported-by: David Seifert <soap@gentoo.org>
Cc: Sam James <sam@gentoo.org>
Cc: Christian Bricart <christian@bricart.de>
Cc: Michael Vetter <jubalh@iodoru.org>
Cc: Robert Förster <Dessa@gmake.de>
[ soap tested the Gentoo package ]
Tested-by: David Seifert <soap@gentoo.org>
Acked-by: David Seifert <soap@gentoo.org>
Acked-by: Serge Hallyn <serge@hallyn.com>
Acked-by: Iker Pedrosa <ipedrosa@redhat.com>
Acked-by: <lslebodn@fedoraproject.org>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
@alejandro-colomar
Copy link
Collaborator Author

And the last one, I hope :)

$ git range-diff shadow/master..gh/gentoo2 shadow/master..gentoo2
1:  a286dea9 ! 1:  0ae69d3c lib: Merge libmisc into libshadow
    @@ Commit message
         [ soap tested the Gentoo package ]
         Tested-by: David Seifert <soap@gentoo.org>
         Acked-by: David Seifert <soap@gentoo.org>
    -    Cc: <lslebodn@fedoraproject.org>
         Acked-by: Serge Hallyn <serge@hallyn.com>
         Acked-by: Iker Pedrosa <ipedrosa@redhat.com>
    +    Acked-by: <lslebodn@fedoraproject.org>
         Signed-off-by: Alejandro Colomar <alx@kernel.org>
     
      ## .gitignore ##

ikerexxe
ikerexxe approved these changes Aug 31, 2023
View reviewed changes
Copy link
Collaborator

@ikerexxe ikerexxe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you for taking care of this

@ikerexxe ikerexxe merged commit 093fb60 into shadow-maint:master Aug 31, 2023
9 checks passed
@alejandro-colomar alejandro-colomar deleted the gentoo2 branch August 31, 2023 19:23
@jubalh jubalh mentioned this pull request Sep 28, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ikerexxe ikerexxe ikerexxe approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@alejandro-colomar @SoapGentoo @hallyn @ikerexxe