Mir

Merge lp:~michael.nelson/mir/snappy-packaging-fix-makefile into lp:~mir-team/mir/snappy-packaging

  1. snappy-packaging-fix-makefile
  2. Merge into snappy-packaging
Proposed by Michael Nelson
Status: Merged
Approved by: Alan Griffiths
Approved revision: 17
Merged at revision: 17
Proposed branch: lp:~michael.nelson/mir/snappy-packaging-fix-makefile
Merge into: lp:~mir-team/mir/snappy-packaging
Diff against target: 11 lines (+1/-1)
1 file modified
Makefile (+1/-1)
To merge this branch: bzr merge lp:~michael.nelson/mir/snappy-packaging-fix-makefile
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
Alan Griffiths Approve
Alexandros Frantzis (community) Approve
Review via email: mp+262415@code.launchpad.net

Commit message

Fix --complement option to cut (so it's not treated as another -c list option).

Description of the change

Without this I end up with:
[100%] Built target snappypreload64
make[3]: Leaving directory '/home/ubuntu/snappy-packaging/deb2snap/builddir'
make[2]: Leaving directory '/home/ubuntu/snappy-packaging/deb2snap/builddir'
make[1]: Leaving directory '/home/ubuntu/snappy-packaging/deb2snap'
cut: only one type of list may be specified
Try 'cut --help' for more information.
cd deb2snap && ./deb2snap -d 15.04 -n mir -v "snap1" --overlay ../overlay -p mir-demos -p mir-graphics-drivers-desktop ../server
./deb2snap: line 156: dpkg-architecture: command not found
Makefile:24: recipe for target 'snap' failed
make: *** [snap] Error 127

To post a comment you must log in.
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks good.

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Plausible

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2015-06-11 20:08:56 +0000
3+++ Makefile 2015-06-19 06:28:23 +0000
4@@ -16,7 +16,7 @@
5 # along with this program. If not, see <http://www.gnu.org/licenses/>.
6
7 SNAPVER:=1
8-VERSION="$(shell apt-cache policy mir-demos | grep '^ \*\*\* ' | cut -c1-7,10-17 -complement | cut -d' ' -f3)snap${SNAPVER}"
9+VERSION="$(shell apt-cache policy mir-demos | grep '^ \*\*\* ' | cut -c1-7,10-17 --complement | cut -d' ' -f3)snap${SNAPVER}"
10
11 all: snap
12

Subscribers

People subscribed via source and target branches