From 59345aa173ebbc6a6f912183157aec1f3a3a5831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 12 Sep 2014 13:30:23 +0000 Subject: input-common: xkbcomp is a xkeyboard-config runtime dependency only in X Also add a little hack to create the /usr/share/X11/xkb/ directory, that seems to not be created when compiling without the xkbcomp dependency --- strata/input-common.morph | 15 ++------------- strata/input-common/xkeyboard-config.morph | 7 +++++++ 2 files changed, 9 insertions(+), 13 deletions(-) create mode 100644 strata/input-common/xkeyboard-config.morph diff --git a/strata/input-common.morph b/strata/input-common.morph index f8680849..9c54f0d5 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -9,23 +9,12 @@ chunks: ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d unpetrify-ref: baserock/genivi/baseline build-depends: [] -- name: xorg-lib-libxkbfile - repo: upstream:xorg-lib-libxkbfile - ref: 7381c2f9013ef7784c78091fa671e652a62ca706 - unpetrify-ref: baserock/morph - build-depends: [] -- name: xorg-app-xkbcomp - repo: upstream:xorg-app-xkbcomp - ref: 705b9bbb426410f9510601c7010da51184919b36 - unpetrify-ref: baserock/morph - build-depends: - - xorg-lib-libxkbfile - name: xkeyboard-config + morph: strata/input-common/xkeyboard-config.morph repo: upstream:xkeyboard-config ref: b4be67b48fb11989f1824dd0b1c8c399430162b0 unpetrify-ref: baserock/morph - build-depends: - - xorg-app-xkbcomp + build-depends: [] - name: libevdev repo: upstream:libevdev ref: b23649e1ba9fd5c72fa9318e417b4f17f5f6f528 diff --git a/strata/input-common/xkeyboard-config.morph b/strata/input-common/xkeyboard-config.morph new file mode 100644 index 00000000..7dabe551 --- /dev/null +++ b/strata/input-common/xkeyboard-config.morph @@ -0,0 +1,7 @@ +name: xkeyboard-config +kind: chunk +configure-commands: +- ./autogen.sh --prefix="$PREFIX" --disable-runtime-deps +install-commands: +- mkdir -p "$DESTDIR"/usr/share/X11/xkb/ +- make install DESTDIR="$DESTDIR" -- cgit v1.2.1