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.

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

Bluez: Update to 5.49 #5937

Closed
wants to merge 1 commit into from
Closed

Bluez: Update to 5.49 #5937

wants to merge 1 commit into from

Conversation

jmv2009
Copy link
Contributor

@jmv2009 jmv2009 commented Apr 18, 2018

Signed-off-by: Johnny Vogels 35307256+jmv2009@users.noreply.github.com

Maintainer: @tripolar (suggested, is pulseaudio maintainer) /@nicolas Thill nico@openwrt.org
Compile tested: (x86, generic, OpenWrt version)
Run tested: (put here arch, model, OpenWrt version, tests done) - Not tested - pending

Description:
This should work.

@diizzyy
Copy link
Contributor

diizzyy commented Apr 18, 2018

Please squash commits and don't open a new pull request

@jmv2009 jmv2009 mentioned this pull request Apr 18, 2018
@jmv2009
Copy link
Contributor Author

jmv2009 commented Apr 18, 2018

Sorry, don't know how to squash.

@diizzyy
Copy link
Contributor

diizzyy commented Apr 18, 2018

git checkout patch-15 (not needed if you're already on this branch)

git rebase -i HEAD~2
git push --force

https://www.devroom.io/2011/07/05/git-squash-your-latests-commits-into-one/ for further information.

@jmv2009
Copy link
Contributor Author

jmv2009 commented Apr 18, 2018

How to do it on the website?

@diizzyy
Copy link
Contributor

diizzyy commented Apr 18, 2018

Unfortunately not, you need to use the command line tool.

@jmv2009
Copy link
Contributor Author

jmv2009 commented Apr 18, 2018

This may take me a week. How do I log in from the command line anyway.

@diizzyy
Copy link
Contributor

diizzyy commented Apr 18, 2018

In short

mkdir upstream
cd upstream
git clone -b patch-15 https://github.com/jmv2009/packages.git

You only need to do this once

git config --global core.editor "nano"
git config --global user.name "Johnny Vogels"
git config --global user.email 35307256+jmv2009@users.noreply.github.com

Email should be a valid one

cd packages
git rebase -i HEAD~2
  • Change the last commit to squash
  • Edit commit msg (don't remove sign-off)

git push --force

@jmv2009
Copy link
Contributor Author

jmv2009 commented Apr 18, 2018

Do I get to send a password somewhere? Please note that I can't do it today anymore.

@diizzyy
Copy link
Contributor

diizzyy commented Apr 18, 2018

It'll ask you to enter your (github) username and password when you push (git push....) your changes

@jmv2009
Copy link
Contributor Author

jmv2009 commented Apr 18, 2018

Thanks, I'll try tomorrow.

@jmv2009
Copy link
Contributor Author

jmv2009 commented Apr 18, 2018

By the way, I don't know how to "change the last commit to squash". Git is still alien to me. I never used the command line with git, except for download/cloning.

@diizzyy
Copy link
Contributor

diizzyy commented Apr 18, 2018

After you enter git rebase -i HEAD~2 it'll show something similar to this:
https://cdn-images-1.medium.com/max/800/0*4uDByCeozZ_Cbg4u.png
Replace pick on the last line (ie last commit) with squash, you don't need to change anything else.
https://cdn-images-1.medium.com/max/1800/0*9VVmICAVdIv8cbGG.png
Next screen will show the commit message from both commits which you'll need to edit.

Signed-off-by: Johnny Vogels <35307256+jmv2009@users.noreply.github.com>
@jmv2009
Copy link
Contributor Author

jmv2009 commented Apr 20, 2018

Done, should be good to go. Please test.

@hnyman
Copy link
Contributor

hnyman commented Apr 22, 2018

@psycho-nico @tripolar
Any comments?

@jmv2009

Run tested: (put here arch, model, OpenWrt version, tests done) - Not tested

Description:
This should work.

Please test your own changes...

@diizzyy
Copy link
Contributor

diizzyy commented Apr 24, 2018

I'll try to give this a go during the weekend

@diizzyy
Copy link
Contributor

diizzyy commented Apr 29, 2018

This needs some work to be usable, I'll do a pull request later today.

diizzyy added a commit to diizzyy/packages that referenced this pull request Apr 30, 2018
Update bluez to 5.49
Fix issue openwrt#1497
Fix issue openwrt#1503
Cherry pick patches from Alpine Linux repo
Apply --gc-sections, saves about 500kbyte

Based on patch provided by Jack Vogel
openwrt#5937

Source:
https://git.alpinelinux.org/cgit/aports/commit/main/bluez/fix-endianness.patch?id=1c6991b32a22be2c905cc1709be1376c4e79e451
https://git.alpinelinux.org/cgit/aports/commit/main/bluez/bluez-5.40-obexd_without_systemd-1.patch?id=980b2d04ae4339594701b33cf9460757c989c94c

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
@diizzyy diizzyy mentioned this pull request Apr 30, 2018
diizzyy added a commit to diizzyy/packages that referenced this pull request Apr 30, 2018
Update bluez to 5.49
Fix issue openwrt#1497
Fix issue openwrt#1503
Cherry pick patches from Alpine Linux repo
Apply --gc-sections, saves about 500kbyte

Based on patch provided by Jack Vogel
openwrt#5937

Source:
https://git.alpinelinux.org/cgit/aports/commit/main/bluez/fix-endianness.patch?id=1c6991b32a22be2c905cc1709be1376c4e79e451
https://git.alpinelinux.org/cgit/aports/commit/main/bluez/bluez-5.40-obexd_without_systemd-1.patch?id=980b2d04ae4339594701b33cf9460757c989c94c

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
diizzyy added a commit to diizzyy/packages that referenced this pull request Apr 30, 2018
Update bluez to 5.49
Fix issue openwrt#1497
Fix issue openwrt#1503
Cherry pick patches from Alpine Linux repo
Apply --gc-sections, saves about 500kbyte

Based on patch provided by Johnny Vogels
openwrt#5937

Source:
https://git.alpinelinux.org/cgit/aports/commit/main/bluez/fix-endianness.patch?id=1c6991b32a22be2c905cc1709be1376c4e79e451
https://git.alpinelinux.org/cgit/aports/commit/main/bluez/bluez-5.40-obexd_without_systemd-1.patch?id=980b2d04ae4339594701b33cf9460757c989c94c

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
diizzyy added a commit to diizzyy/packages that referenced this pull request May 5, 2018
Update bluez to 5.49
Fix issue openwrt#1497
Fix issue openwrt#1503
Cherry pick patches from Alpine Linux repo
Apply --gc-sections, saves about 500kbyte
Drop audio.conf (not needed and deprecated)
Remove bluetooth.dbus as upstream supplies a working copy

Based on patch provided by Johnny Vogels
openwrt#5937

Source:
https://git.alpinelinux.org/cgit/aports/commit/main/bluez/fix-endianness.patch?id=1c6991b32a22be2c905cc1709be1376c4e79e451
https://git.alpinelinux.org/cgit/aports/commit/main/bluez/bluez-5.40-obexd_without_systemd-1.patch?id=980b2d04ae4339594701b33cf9460757c989c94c

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
@hnyman
Copy link
Contributor

hnyman commented May 5, 2018

superseded by #5988

@hnyman hnyman closed this May 5, 2018
lynxis pushed a commit to lynxis/packages that referenced this pull request Jan 3, 2019
Update bluez to 5.49
Fix issue openwrt#1497
Fix issue openwrt#1503
Cherry pick patches from Alpine Linux repo
Apply --gc-sections, saves about 500kbyte
Drop audio.conf (not needed and deprecated)
Remove bluetooth.dbus as upstream supplies a working copy

Based on patch provided by Johnny Vogels
openwrt#5937

Source:
https://git.alpinelinux.org/cgit/aports/commit/main/bluez/fix-endianness.patch?id=1c6991b32a22be2c905cc1709be1376c4e79e451
https://git.alpinelinux.org/cgit/aports/commit/main/bluez/bluez-5.40-obexd_without_systemd-1.patch?id=980b2d04ae4339594701b33cf9460757c989c94c

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
@jmv2009 jmv2009 deleted the patch-15 branch March 2, 2021 19:01
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.

None yet

3 participants