diff options
| author | Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> | 2021-02-20 16:02:15 -0800 |
|---|---|---|
| committer | Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> | 2021-02-20 16:02:15 -0800 |
| commit | 5d8d4fbbcb5c5de9370711c19bb3510210989a98 (patch) | |
| tree | d0754921833f413b7eb93fb6bb1b1c8a22fb0498 /libs/libupm | |
| parent | d651082447b4392399a40ea1ae11d0bce4bfe83a (diff) | |
treewide: Run refresh on all packages
The crude loop I wrote to come up with this changeset:
find -L package/feeds/packages/ -name patches | \
sed 's/patches$/refresh/' | sort | xargs make
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Diffstat (limited to 'libs/libupm')
| -rw-r--r-- | libs/libupm/patches/001-version.patch | 4 | ||||
| -rw-r--r-- | libs/libupm/patches/002-at42qt1070-id.patch | 2 | ||||
| -rw-r--r-- | libs/libupm/patches/004-uint8_t.patch | 21 |
3 files changed, 12 insertions, 15 deletions
diff --git a/libs/libupm/patches/001-version.patch b/libs/libupm/patches/001-version.patch index 49147e6e2..b1f9c9f1b 100644 --- a/libs/libupm/patches/001-version.patch +++ b/libs/libupm/patches/001-version.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -231,14 +231,7 @@ +@@ -231,14 +231,7 @@ include(GNUInstallDirs) set (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation path for libraries") # Make a version file containing the current version from git. @@ -9,10 +9,10 @@ -# If git_describe fails, use a dirty version -if (${VERSION} MATCHES -NOTFOUND) - set (VERSION "v1.7.1") -+ set (VERSION "v2.0.0") - message (WARNING "Failed to retrieve UPM version with 'git describe' (using " - "${VERSION}). Check that git is installed and this is a valid git repo.") -endif () ++ set (VERSION "v2.0.0") message (STATUS "UPM Version ${VERSION}") diff --git a/libs/libupm/patches/002-at42qt1070-id.patch b/libs/libupm/patches/002-at42qt1070-id.patch index 94758ef16..295bfd560 100644 --- a/libs/libupm/patches/002-at42qt1070-id.patch +++ b/libs/libupm/patches/002-at42qt1070-id.patch @@ -1,6 +1,6 @@ --- a/src/at42qt1070/at42qt1070.cxx +++ b/src/at42qt1070/at42qt1070.cxx -@@ -53,7 +53,7 @@ AT42QT1070::AT42QT1070(int bus, uint8_t address) +@@ -53,7 +53,7 @@ AT42QT1070::AT42QT1070(int bus, uint8_t return; } diff --git a/libs/libupm/patches/004-uint8_t.patch b/libs/libupm/patches/004-uint8_t.patch index 4f975b06a..46d25edd7 100644 --- a/libs/libupm/patches/004-uint8_t.patch +++ b/libs/libupm/patches/004-uint8_t.patch @@ -1,7 +1,6 @@ -diff -urN a/src/bma250e/bma250e.cxx b/src/bma250e/bma250e.cxx ---- a/src/bma250e/bma250e.cxx 2019-05-09 00:06:25.000000000 +0900 -+++ b/src/bma250e/bma250e.cxx 2019-05-13 16:43:04.344536227 +0900 -@@ -195,35 +195,35 @@ +--- a/src/bma250e/bma250e.cxx ++++ b/src/bma250e/bma250e.cxx +@@ -195,35 +195,35 @@ BMA250E::BMA250E(std::string initStr) : fifoConfig(mode, axes); } if(tok.substr(0, 20) == "setInterruptEnable0:") { @@ -45,10 +44,9 @@ diff -urN a/src/bma250e/bma250e.cxx b/src/bma250e/bma250e.cxx setInterruptOutputControl(bits); } if(tok.substr(0, 26) == "setInterruptLatchBehavior:") { -diff -urN a/src/bmg160/bmg160.cxx b/src/bmg160/bmg160.cxx ---- a/src/bmg160/bmg160.cxx 2019-05-09 00:06:25.000000000 +0900 -+++ b/src/bmg160/bmg160.cxx 2019-05-13 16:44:25.516304666 +0900 -@@ -173,23 +173,23 @@ +--- a/src/bmg160/bmg160.cxx ++++ b/src/bmg160/bmg160.cxx +@@ -173,23 +173,23 @@ BMG160::BMG160(std::string initStr) : mr fifoConfig(mode, axes); } if(tok.substr(0, 20) == "setInterruptEnable0:") { @@ -77,10 +75,9 @@ diff -urN a/src/bmg160/bmg160.cxx b/src/bmg160/bmg160.cxx setInterruptOutputControl(bits); } if(tok.substr(0, 26) == "setInterruptLatchBehavior:") { -diff -urN a/src/bmm150/bmm150.cxx b/src/bmm150/bmm150.cxx ---- a/src/bmm150/bmm150.cxx 2019-05-09 00:06:25.000000000 +0900 -+++ b/src/bmm150/bmm150.cxx 2019-05-13 16:45:03.228197100 +0900 -@@ -170,19 +170,19 @@ +--- a/src/bmm150/bmm150.cxx ++++ b/src/bmm150/bmm150.cxx +@@ -170,19 +170,19 @@ BMM150::BMM150(std::string initStr) : mr setOpmode(opmode); } if(tok.substr(0, 19) == "setInterruptEnable:") { |