Skip to content

python3-docker-compose: replace a pending patch with the merged one#39

Merged
ricardosalveti merged 1 commit intofoundriesio:masterfrom
liuming50:fix-docker-compose-dependency
Jul 1, 2019
Merged

python3-docker-compose: replace a pending patch with the merged one#39
ricardosalveti merged 1 commit intofoundriesio:masterfrom
liuming50:fix-docker-compose-dependency

Conversation

@liuming50
Copy link
Copy Markdown
Contributor

The patch support-requests-up-to-2.21.0.patch is a pending pull request
but never merged, replace it with the merged one.

The original patch breaks the build with the latest meta-oe, in which
requests has been upgraded to 2.22.0.

Signed-off-by: Ming Liu [email protected]

The patch support-requests-up-to-2.21.0.patch is a pending pull request
but never merged, replace it with the merged one.

The original patch breaks the build with the latest meta-oe, in which
requests has been upgraded to 2.22.0.

Signed-off-by: Ming Liu <[email protected]>
Copy link
Copy Markdown
Member

@ricardosalveti ricardosalveti left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@ricardosalveti ricardosalveti merged commit 726917e into foundriesio:master Jul 1, 2019
ricardosalveti added a commit that referenced this pull request Jul 8, 2021
Relevant changes:
- 996aaad Merge pull request 'Fix typos in translatable messages' (#42) from alexhenrie/lshw:typos into master
- 4c91193 Fix typos in translatable messages
- 74e2354 Fix getting size of memory banks <32GiB
- fdab06a Merge pull request 'devtree: Add UUID property' (#40) from hegdevasant/lshw:lpar-uuid into master
- 9c5c2f0 devtree: Add UUID property
- 0140f7f code clean-up
- d3c66a6 improve portability (esp. musl)
- ff634c9 fix potential crash
- c86aa13 add static target to Makefile
- 2017dad Avoid crash on device-tree parsing
- 156a95e Add JEDEC manufacturer
- 5c4bfb1 Report correct memory size on SMBIOS < 2.7
- 56f1de9 fix man page after previous update
- 2c235e6 update man page
- 358e65f Update 'docs/TODO'
- 60c906d Update 'docs/TODO'
- e857494 Merge pull request 'Replace the about GtkDialog with a GtkAboutDialog' (#39) from linkmauve/lshw:better-about into master
- e96f82c Replace the about GtkDialog with a GtkAboutDialog
- eff0813 Merge pull request 'Move from GtkMenuBar to GMenu' (#38) from linkmauve/lshw:gmenu into master
- bc5046d Move from GtkMenuBar to GMenu
- 9ae06b4 Merge pull request 'Switch to gtk3 by default for gtk-lshw' (#37) from linkmauve/lshw:gtk3 into master
- a116b31 Enable/Disable GSimpleAction instead of button sensitivity
- d169019 Replace signals with GSimpleActions
- 5fd82e3 Move to GtkApplication
- 6cf78e9 Remove deprecated use_action_appearance property
- 0a290c2 Remove deprecated widgets
- 8ff4b05 Replace the last GtkStock in overwrite dialog
- e342333 Replace deprecated GtkIconFactory with GHashTable
- 41c04d1 Use GtkFileChooserNative instead of GtkFileChooserDialog
- 8d69637 Remove hack which is apparently not useful anymore
- b79101c Remove deprecated stock messages
- ad4ecfd Build against gtk3 instead of gtk2

Signed-off-by: Ricardo Salveti <[email protected]>
ricardosalveti added a commit to ricardosalveti/meta-lmp that referenced this pull request Aug 25, 2021
Relevant changes:
- 996aaad Merge pull request 'Fix typos in translatable messages' (foundriesio#42) from alexhenrie/lshw:typos into master
- 4c91193 Fix typos in translatable messages
- 74e2354 Fix getting size of memory banks <32GiB
- fdab06a Merge pull request 'devtree: Add UUID property' (foundriesio#40) from hegdevasant/lshw:lpar-uuid into master
- 9c5c2f0 devtree: Add UUID property
- 0140f7f code clean-up
- d3c66a6 improve portability (esp. musl)
- ff634c9 fix potential crash
- c86aa13 add static target to Makefile
- 2017dad Avoid crash on device-tree parsing
- 156a95e Add JEDEC manufacturer
- 5c4bfb1 Report correct memory size on SMBIOS < 2.7
- 56f1de9 fix man page after previous update
- 2c235e6 update man page
- 358e65f Update 'docs/TODO'
- 60c906d Update 'docs/TODO'
- e857494 Merge pull request 'Replace the about GtkDialog with a GtkAboutDialog' (foundriesio#39) from linkmauve/lshw:better-about into master
- e96f82c Replace the about GtkDialog with a GtkAboutDialog
- eff0813 Merge pull request 'Move from GtkMenuBar to GMenu' (foundriesio#38) from linkmauve/lshw:gmenu into master
- bc5046d Move from GtkMenuBar to GMenu
- 9ae06b4 Merge pull request 'Switch to gtk3 by default for gtk-lshw' (foundriesio#37) from linkmauve/lshw:gtk3 into master
- a116b31 Enable/Disable GSimpleAction instead of button sensitivity
- d169019 Replace signals with GSimpleActions
- 5fd82e3 Move to GtkApplication
- 6cf78e9 Remove deprecated use_action_appearance property
- 0a290c2 Remove deprecated widgets
- 8ff4b05 Replace the last GtkStock in overwrite dialog
- e342333 Replace deprecated GtkIconFactory with GHashTable
- 41c04d1 Use GtkFileChooserNative instead of GtkFileChooserDialog
- 8d69637 Remove hack which is apparently not useful anymore
- b79101c Remove deprecated stock messages
- ad4ecfd Build against gtk3 instead of gtk2

Signed-off-by: Ricardo Salveti <[email protected]>
(cherry picked from commit 30f54c3)
ricardosalveti added a commit that referenced this pull request Sep 10, 2021
Relevant changes:
- 996aaad Merge pull request 'Fix typos in translatable messages' (#42) from alexhenrie/lshw:typos into master
- 4c91193 Fix typos in translatable messages
- 74e2354 Fix getting size of memory banks <32GiB
- fdab06a Merge pull request 'devtree: Add UUID property' (#40) from hegdevasant/lshw:lpar-uuid into master
- 9c5c2f0 devtree: Add UUID property
- 0140f7f code clean-up
- d3c66a6 improve portability (esp. musl)
- ff634c9 fix potential crash
- c86aa13 add static target to Makefile
- 2017dad Avoid crash on device-tree parsing
- 156a95e Add JEDEC manufacturer
- 5c4bfb1 Report correct memory size on SMBIOS < 2.7
- 56f1de9 fix man page after previous update
- 2c235e6 update man page
- 358e65f Update 'docs/TODO'
- 60c906d Update 'docs/TODO'
- e857494 Merge pull request 'Replace the about GtkDialog with a GtkAboutDialog' (#39) from linkmauve/lshw:better-about into master
- e96f82c Replace the about GtkDialog with a GtkAboutDialog
- eff0813 Merge pull request 'Move from GtkMenuBar to GMenu' (#38) from linkmauve/lshw:gmenu into master
- bc5046d Move from GtkMenuBar to GMenu
- 9ae06b4 Merge pull request 'Switch to gtk3 by default for gtk-lshw' (#37) from linkmauve/lshw:gtk3 into master
- a116b31 Enable/Disable GSimpleAction instead of button sensitivity
- d169019 Replace signals with GSimpleActions
- 5fd82e3 Move to GtkApplication
- 6cf78e9 Remove deprecated use_action_appearance property
- 0a290c2 Remove deprecated widgets
- 8ff4b05 Replace the last GtkStock in overwrite dialog
- e342333 Replace deprecated GtkIconFactory with GHashTable
- 41c04d1 Use GtkFileChooserNative instead of GtkFileChooserDialog
- 8d69637 Remove hack which is apparently not useful anymore
- b79101c Remove deprecated stock messages
- ad4ecfd Build against gtk3 instead of gtk2

Signed-off-by: Ricardo Salveti <[email protected]>
(cherry picked from commit 30f54c3)
ricardosalveti added a commit to ricardosalveti/meta-lmp that referenced this pull request Jan 7, 2022
Relevant changes:
- 996aaad Merge pull request 'Fix typos in translatable messages' (foundriesio#42) from alexhenrie/lshw:typos into master
- 4c91193 Fix typos in translatable messages
- 74e2354 Fix getting size of memory banks <32GiB
- fdab06a Merge pull request 'devtree: Add UUID property' (foundriesio#40) from hegdevasant/lshw:lpar-uuid into master
- 9c5c2f0 devtree: Add UUID property
- 0140f7f code clean-up
- d3c66a6 improve portability (esp. musl)
- ff634c9 fix potential crash
- c86aa13 add static target to Makefile
- 2017dad Avoid crash on device-tree parsing
- 156a95e Add JEDEC manufacturer
- 5c4bfb1 Report correct memory size on SMBIOS < 2.7
- 56f1de9 fix man page after previous update
- 2c235e6 update man page
- 358e65f Update 'docs/TODO'
- 60c906d Update 'docs/TODO'
- e857494 Merge pull request 'Replace the about GtkDialog with a GtkAboutDialog' (foundriesio#39) from linkmauve/lshw:better-about into master
- e96f82c Replace the about GtkDialog with a GtkAboutDialog
- eff0813 Merge pull request 'Move from GtkMenuBar to GMenu' (foundriesio#38) from linkmauve/lshw:gmenu into master
- bc5046d Move from GtkMenuBar to GMenu
- 9ae06b4 Merge pull request 'Switch to gtk3 by default for gtk-lshw' (foundriesio#37) from linkmauve/lshw:gtk3 into master
- a116b31 Enable/Disable GSimpleAction instead of button sensitivity
- d169019 Replace signals with GSimpleActions
- 5fd82e3 Move to GtkApplication
- 6cf78e9 Remove deprecated use_action_appearance property
- 0a290c2 Remove deprecated widgets
- 8ff4b05 Replace the last GtkStock in overwrite dialog
- e342333 Replace deprecated GtkIconFactory with GHashTable
- 41c04d1 Use GtkFileChooserNative instead of GtkFileChooserDialog
- 8d69637 Remove hack which is apparently not useful anymore
- b79101c Remove deprecated stock messages
- ad4ecfd Build against gtk3 instead of gtk2

Signed-off-by: Ricardo Salveti <[email protected]>
(cherry picked from commit 30f54c3)
doanac added a commit to doanac/meta-lmp that referenced this pull request Apr 15, 2022
factory-containers: Allow custom Dockerfiles and Build Contexts
quaresmajose pushed a commit that referenced this pull request Nov 9, 2022
Relevant changes:
- 6f3016d Merge pull request #40 from ricardosalveti/ostree
- 4c3f2e8 image_types_ota.bbclass: add support for none as OSTREE_BOOTLOADER
- c2b18de Merge pull request #39 from shr-project/jansa/gcc-12
- c103d77 aktualizr: bump SRCREV
- 945d0dc Merge pull request #38 from shr-project/jansa/gcc-11
- e64e1b0 aktualizr: bump SRCREV
- e9aab7f Merge pull request #36 from ricardosalveti/nfsutils
- bfcf400 nfs-utils: prefer tmpfiles instead of a custom service

Signed-off-by: Ricardo Salveti <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants