mbox series

stryhead merge request: Nov 25th

Message ID a4b285f6-9655-4516-a027-78ab642368ce@gmail.com
State New
Headers show
Series stryhead merge request: Nov 25th | expand

Pull-request

https://git.openembedded.org/git/meta-openembedded styhead-next

Message

akuster808 Nov. 25, 2024, 8:38 p.m. UTC 
The following changes since commit afbbe81df6425805392b62b6f153acf740782e8a:

   nng: Rename default branch of github.com:nanomsg/nng.git (2024-11-09 
14:07:27 -0500)

are available in the Git repository at:

   https://git.openembedded.org/git/meta-openembedded styhead-next

for you to fetch changes up to 7cd38212e73e0e9f42f4d92defb16dd81f71221d:

   lvm2: Remove the lvm2-udevrules package (2024-11-25 15:32:56 -0500)

----------------------------------------------------------------
Fredrik Hugosson (1):
       lvm2: Remove the lvm2-udevrules package

Khem Raj (1):
       python3-pdm-build-locked: Add recipe

Wang Mingyu (1):
       python3-alembic: upgrade 1.13.2 -> 1.13.3

  meta-oe/recipes-support/lvm2/lvm2.bb | 16 +++++++++++-----
  meta-python/recipes-devtools/python/{python3-alembic_1.13.2.bb => 
python3-alembic_1.13.3.bb} |  2 +-
  meta-python/recipes-devtools/python/python3-pdm-build-locked_0.3.3.bb 
| 13 +++++++++++++
  3 files changed, 25 insertions(+), 6 deletions(-)
  rename meta-python/recipes-devtools/python/{python3-alembic_1.13.2.bb 
=> python3-alembic_1.13.3.bb} (80%)
  create mode 100644 
meta-python/recipes-devtools/python/python3-pdm-build-locked_0.3.3.bb

Comments

Khem Raj Nov. 25, 2024, 9:25 p.m. UTC | #1 
Hi Armin,

This branch is in merge conflict with styhead. Would you mind rebasing
it on latest styhead ? this should resolve the unnecessary merge
conflict.

On Mon, Nov 25, 2024 at 12:38 PM akuster808 <akuster808@gmail.com> wrote:
>
> The following changes since commit afbbe81df6425805392b62b6f153acf740782e8a:
>
>    nng: Rename default branch of github.com:nanomsg/nng.git (2024-11-09
> 14:07:27 -0500)
>
> are available in the Git repository at:
>
>    https://git.openembedded.org/git/meta-openembedded styhead-next
>
> for you to fetch changes up to 7cd38212e73e0e9f42f4d92defb16dd81f71221d:
>
>    lvm2: Remove the lvm2-udevrules package (2024-11-25 15:32:56 -0500)
>
> ----------------------------------------------------------------
> Fredrik Hugosson (1):
>        lvm2: Remove the lvm2-udevrules package
>
> Khem Raj (1):
>        python3-pdm-build-locked: Add recipe
>
> Wang Mingyu (1):
>        python3-alembic: upgrade 1.13.2 -> 1.13.3
>
>   meta-oe/recipes-support/lvm2/lvm2.bb | 16 +++++++++++-----
>   meta-python/recipes-devtools/python/{python3-alembic_1.13.2.bb =>
> python3-alembic_1.13.3.bb} |  2 +-
>   meta-python/recipes-devtools/python/python3-pdm-build-locked_0.3.3.bb
> | 13 +++++++++++++
>   3 files changed, 25 insertions(+), 6 deletions(-)
>   rename meta-python/recipes-devtools/python/{python3-alembic_1.13.2.bb
> => python3-alembic_1.13.3.bb} (80%)
>   create mode 100644
> meta-python/recipes-devtools/python/python3-pdm-build-locked_0.3.3.bb
>