diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-08-05 16:04:41 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-08-05 16:04:41 +0000 |
| commit | b782018ff9f04190574b1d482655b1945521daf0 (patch) | |
| tree | 3341d77151e45cda3b032af95aea5f26f79a868d | |
| parent | c9df9be150eeb5650aafd38b69f37c171a711fee (diff) | |
| parent | 06af3dfa9a4050cd3787c01486c4e00a4a85a971 (diff) | |
| download | definitions-b782018ff9f04190574b1d482655b1945521daf0.tar.gz | |
Merge branch 'baserock/sam/readline-python-rebased'
This branch includes GNU Readline in all Baserock systems, by moving
it into 'core'. Note that in order to remain GENIVI compliant we must
NOT upgrade to GNU Readline 6 because that version is licensed under the
GPLv3 which is forbidden by the GENIVI Alliance at this point.
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk>
Reviewed-By: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
| -rw-r--r-- | audio-bluetooth.morph | 6 | ||||
| -rw-r--r-- | core.morph | 7 | ||||
| -rw-r--r-- | databases.morph | 8 |
3 files changed, 8 insertions, 13 deletions
diff --git a/audio-bluetooth.morph b/audio-bluetooth.morph index ffb7d5ff..6a8862b8 100644 --- a/audio-bluetooth.morph +++ b/audio-bluetooth.morph @@ -25,17 +25,11 @@ chunks: ref: 52568782ae136e1ec4ddf3eb6da7b0f3fbd3f1b3 unpetrify-ref: baserock/morph build-depends: [] -- name: readline - repo: upstream:readline - ref: 518937ab89be812ccd45e9b8c1ce4ad721d35ef6 - unpetrify-ref: baserock/genivi/baseline - build-depends: [] - name: bluez repo: upstream:bluez ref: a18201b5321e8b41d2ee7c7bc7285d976fc433e6 unpetrify-ref: baserock/v5.17-patched build-depends: - - readline - libical - alsa-lib - name: bluez-tools @@ -100,6 +100,11 @@ chunks: ref: 8deafa68e52b230018c0318dc7959ff9af3ad2a5 unpetrify-ref: baserock/morph build-depends: [] +- name: readline + repo: upstream:readline + ref: 518937ab89be812ccd45e9b8c1ce4ad721d35ef6 + unpetrify-ref: baserock/genivi/baseline + build-depends: [] - name: cpython repo: upstream:cpython ref: fa86445bfd4fb8e5441d685d92bf8a8ee237f022 @@ -108,6 +113,8 @@ chunks: - openssl-new - bzip2 - sqlite3 + - ncurses + - readline - name: libtool repo: upstream:libtool ref: d388b7f2dc628b22006025d01179bc09b8aabe81 diff --git a/databases.morph b/databases.morph index c824b9b1..5abc7244 100644 --- a/databases.morph +++ b/databases.morph @@ -5,17 +5,11 @@ build-depends: - morph: tools - morph: nfs chunks: -- name: readline - repo: upstream:readline - ref: 7628b745a813aac53586b640da056a975f1c443e - unpetrify-ref: readline-6.3 - build-depends: [] - name: postgresql repo: upstream:postgresql ref: d4f8dde3c1c2c90c723ab550e7f449fc75599316 unpetrify-ref: REL9_3_4 - build-depends: - - readline + build-depends: [] - name: redis repo: upstream:redis ref: 9ee59fca9c5c429185d35779c2d5db64005091b0 |