diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 22:49:41 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:23:17 +0200 |
commit | a45830a39bb47a9eab27980d52966226c9504ea4 (patch) | |
tree | 001209d9740e8668b2eeeac4212b3561aecebf29 /meta-oe/recipes-graphics | |
parent | 6f48cf899aed0622f8fb26ffa144656a1143c9c5 (diff) | |
download | meta-openembedded-a45830a39bb47a9eab27980d52966226c9504ea4.tar.gz |
recipes: Unify indentation
* This change is only aesthetic (unlike indentation in Python
tasks).
* Some recipes were using tabs.
* Some were using 8 spaces.
* Some were using mix or different number of spaces.
* Make them consistently use 4 spaces everywhere.
* Yocto styleguide advises to use tabs (but the only reason to keep
tabs is the need to update a lot of recipes). Lately this advice
was also merged into the styleguide on the OE wiki.
* Using 4 spaces in both types of tasks is better because it's less
error prone when someone is not sure if e.g.
do_generate_toolchain_file() is Python or shell task and also allows
to highlight every tab used in .bb, .inc, .bbappend, .bbclass as
potentially bad (shouldn't be used for indenting of multiline
variable assignments and cannot be used for Python tasks).
* Don't indent closing quote on multiline variables
we're quite inconsistent wheater it's first character on line
under opening quote or under first non-whitespace character in
previous line.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-graphics')
24 files changed, 148 insertions, 148 deletions
diff --git a/meta-oe/recipes-graphics/clutter/clutter-box2d.inc b/meta-oe/recipes-graphics/clutter/clutter-box2d.inc index 056b091847..646b785ca7 100644 --- a/meta-oe/recipes-graphics/clutter/clutter-box2d.inc +++ b/meta-oe/recipes-graphics/clutter/clutter-box2d.inc | |||
@@ -8,8 +8,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
8 | inherit autotools pkgconfig gtk-doc | 8 | inherit autotools pkgconfig gtk-doc |
9 | 9 | ||
10 | do_install_append () { | 10 | do_install_append () { |
11 | install -d ${D}${bindir} | 11 | install -d ${D}${bindir} |
12 | install ${S}/examples/.libs/blockbox ${D}${bindir} | 12 | install ${S}/examples/.libs/blockbox ${D}${bindir} |
13 | } | 13 | } |
14 | 14 | ||
15 | FILESPATH = "${FILE_DIRNAME}/clutter-box2d" | 15 | FILESPATH = "${FILE_DIRNAME}/clutter-box2d" |
diff --git a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb index 455fd8a755..02ea57fd51 100644 --- a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb +++ b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb | |||
@@ -15,12 +15,12 @@ S = "${WORKDIR}/git" | |||
15 | EXTRA_OEMAKE = "STRIP=" | 15 | EXTRA_OEMAKE = "STRIP=" |
16 | 16 | ||
17 | do_compile() { | 17 | do_compile() { |
18 | sed -i -e 's: cpp: ${TARGET_PREFIX}cpp:g' GNUmakefile | 18 | sed -i -e 's: cpp: ${TARGET_PREFIX}cpp:g' GNUmakefile |
19 | oe_runmake | 19 | oe_runmake |
20 | } | 20 | } |
21 | 21 | ||
22 | do_install() { | 22 | do_install() { |
23 | oe_runmake 'DESTDIR=${D}' install | 23 | oe_runmake 'DESTDIR=${D}' install |
24 | } | 24 | } |
25 | 25 | ||
26 | RDEPENDS_${PN} = "ttf-dejavu-sans-mono" | 26 | RDEPENDS_${PN} = "ttf-dejavu-sans-mono" |
diff --git a/meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb b/meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb index 44e66ea6d0..e9bbdcf70a 100644 --- a/meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb +++ b/meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb | |||
@@ -16,8 +16,8 @@ EXTRA_OECONF = "--disable-python \ | |||
16 | --without-wmf" | 16 | --without-wmf" |
17 | 17 | ||
18 | do_configure_append() { | 18 | do_configure_append() { |
19 | find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g | 19 | find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g |
20 | find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g | 20 | find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g |
21 | } | 21 | } |
22 | 22 | ||
23 | FILES_${PN}-dbg += "${libdir}/gimp/2.0/*/.debug" | 23 | FILES_${PN}-dbg += "${libdir}/gimp/2.0/*/.debug" |
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb index 60271cc77c..fd547d9918 100644 --- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb +++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb | |||
@@ -26,10 +26,10 @@ inherit autotools pkgconfig gettext lib_package | |||
26 | EXTRA_OECONF = " --with-drivers=all udevscriptdir=/lib/udev ac_cv_lib_ltdl_lt_dlcaller_register=yes" | 26 | EXTRA_OECONF = " --with-drivers=all udevscriptdir=/lib/udev ac_cv_lib_ltdl_lt_dlcaller_register=yes" |
27 | 27 | ||
28 | do_configure_append() { | 28 | do_configure_append() { |
29 | cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/libgphoto2_port/po/ | 29 | cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/libgphoto2_port/po/ |
30 | cd ${S}/libgphoto2_port/ | 30 | cd ${S}/libgphoto2_port/ |
31 | autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths | 31 | autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths |
32 | cd ${S} | 32 | cd ${S} |
33 | } | 33 | } |
34 | 34 | ||
35 | do_install_append() { | 35 | do_install_append() { |
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb index a6f266cc38..a24f75c654 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb +++ b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb | |||
@@ -3,11 +3,11 @@ HOMEPAGE = "http://blog.lxde.org/?p=531" | |||
3 | LICENSE = "GPLv3" | 3 | LICENSE = "GPLv3" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
5 | SRC_URI = " \ | 5 | SRC_URI = " \ |
6 | git://lxde.git.sourceforge.net/gitroot/lxde/${BPN};protocol=git;branch=master \ | 6 | git://lxde.git.sourceforge.net/gitroot/lxde/${BPN};protocol=git;branch=master \ |
7 | file://lxdm.conf \ | 7 | file://lxdm.conf \ |
8 | file://lxdm-pam \ | 8 | file://lxdm-pam \ |
9 | file://lxdm-pam-debug \ | 9 | file://lxdm-pam-debug \ |
10 | ${@base_contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ | 10 | ${@base_contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ |
11 | " | 11 | " |
12 | 12 | ||
13 | LXDM_PAM = "${@base_contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)}" | 13 | LXDM_PAM = "${@base_contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)}" |
@@ -29,22 +29,22 @@ S = "${WORKDIR}/git" | |||
29 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" | 29 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" |
30 | 30 | ||
31 | do_compile_append() { | 31 | do_compile_append() { |
32 | # default background configured not available / no password field available / no default screensaver | 32 | # default background configured not available / no password field available / no default screensaver |
33 | sed -i -e 's,bg=,# bg=,g' \ | 33 | sed -i -e 's,bg=,# bg=,g' \ |
34 | -e 's,# skip_password=,skip_password=,g' \ | 34 | -e 's,# skip_password=,skip_password=,g' \ |
35 | -e 's,# arg=.*,arg=${bindir}/X -s 0,g' \ | 35 | -e 's,# arg=.*,arg=${bindir}/X -s 0,g' \ |
36 | ${S}/data/lxdm.conf.in | 36 | ${S}/data/lxdm.conf.in |
37 | # add default configuration | 37 | # add default configuration |
38 | oe_runmake -C ${S}/data lxdm.conf | 38 | oe_runmake -C ${S}/data lxdm.conf |
39 | } | 39 | } |
40 | 40 | ||
41 | do_install_append() { | 41 | do_install_append() { |
42 | install -d ${D}${localstatedir}/lib/lxdm | 42 | install -d ${D}${localstatedir}/lib/lxdm |
43 | install -m 644 ${WORKDIR}/lxdm.conf ${D}${localstatedir}/lib/lxdm | 43 | install -m 644 ${WORKDIR}/lxdm.conf ${D}${localstatedir}/lib/lxdm |
44 | # ArchLinux version of pam config has the following advantages: | 44 | # ArchLinux version of pam config has the following advantages: |
45 | # * simple setup of passwordless login | 45 | # * simple setup of passwordless login |
46 | # * in XFCE powerdown/restart enabled in logoff dialog | 46 | # * in XFCE powerdown/restart enabled in logoff dialog |
47 | install -m 644 ${WORKDIR}/${LXDM_PAM} ${D}${sysconfdir}/pam.d/lxdm | 47 | install -m 644 ${WORKDIR}/${LXDM_PAM} ${D}${sysconfdir}/pam.d/lxdm |
48 | } | 48 | } |
49 | 49 | ||
50 | # make installed languages choosable | 50 | # make installed languages choosable |
diff --git a/meta-oe/recipes-graphics/nonworking/slim/slim_1.3.2.bb b/meta-oe/recipes-graphics/nonworking/slim/slim_1.3.2.bb index 1428806b5a..57b47f6587 100644 --- a/meta-oe/recipes-graphics/nonworking/slim/slim_1.3.2.bb +++ b/meta-oe/recipes-graphics/nonworking/slim/slim_1.3.2.bb | |||
@@ -8,19 +8,19 @@ PR = "r1" | |||
8 | DEPENDS = "virtual/libx11 libxmu libpng jpeg freetype sessreg ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 8 | DEPENDS = "virtual/libx11 libxmu libpng jpeg freetype sessreg ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
9 | 9 | ||
10 | SRC_URI = " \ | 10 | SRC_URI = " \ |
11 | http://download.berlios.de/${PN}/${P}.tar.gz \ | 11 | http://download.berlios.de/${PN}/${P}.tar.gz \ |
12 | file://0002-Fix-image-handling-integer-overflows.patch \ | 12 | file://0002-Fix-image-handling-integer-overflows.patch \ |
13 | file://0003-Fix-build-failure-with-ld-as-needed.patch \ | 13 | file://0003-Fix-build-failure-with-ld-as-needed.patch \ |
14 | file://0004-Add-support-libpng15.patch \ | 14 | file://0004-Add-support-libpng15.patch \ |
15 | file://0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch \ | 15 | file://0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch \ |
16 | file://0006-Remove-localhost-from-Authenticator-of-pam.patch \ | 16 | file://0006-Remove-localhost-from-Authenticator-of-pam.patch \ |
17 | file://0007-Fix-tty-slowness.patch \ | 17 | file://0007-Fix-tty-slowness.patch \ |
18 | file://0008-restart-Xserver-if-killed.patch \ | 18 | file://0008-restart-Xserver-if-killed.patch \ |
19 | file://slim-dynwm \ | 19 | file://slim-dynwm \ |
20 | file://update_slim_wmlist \ | 20 | file://update_slim_wmlist \ |
21 | file://Makefile.oe \ | 21 | file://Makefile.oe \ |
22 | file://slim.pamd \ | 22 | file://slim.pamd \ |
23 | file://slim.service \ | 23 | file://slim.service \ |
24 | " | 24 | " |
25 | 25 | ||
26 | SRC_URI[md5sum] = "ca1ae6120e6f4b4969f2d6cf94f47b42" | 26 | SRC_URI[md5sum] = "ca1ae6120e6f4b4969f2d6cf94f47b42" |
@@ -28,32 +28,32 @@ SRC_URI[sha256sum] = "f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72db | |||
28 | 28 | ||
29 | 29 | ||
30 | EXTRA_OEMAKE += " \ | 30 | EXTRA_OEMAKE += " \ |
31 | USE_PAM=${@base_contains('DISTRO_FEATURES', 'pam', '1', '0', d)} \ | 31 | USE_PAM=${@base_contains('DISTRO_FEATURES', 'pam', '1', '0', d)} \ |
32 | PREFIX=${prefix} \ | 32 | PREFIX=${prefix} \ |
33 | CFGDIR=${sysconfdir} \ | 33 | CFGDIR=${sysconfdir} \ |
34 | MANDIR=${mandir} \ | 34 | MANDIR=${mandir} \ |
35 | DESTDIR=${D} \ | 35 | DESTDIR=${D} \ |
36 | CFLAGS+=-I${STAGING_INCDIR}/freetype2 \ | 36 | CFLAGS+=-I${STAGING_INCDIR}/freetype2 \ |
37 | CXXFLAGS+=-I${STAGING_INCDIR}/freetype2 \ | 37 | CXXFLAGS+=-I${STAGING_INCDIR}/freetype2 \ |
38 | " | 38 | " |
39 | 39 | ||
40 | do_compile_prepend() { | 40 | do_compile_prepend() { |
41 | cp -pP ${WORKDIR}/Makefile.oe ${S}/Makefile | 41 | cp -pP ${WORKDIR}/Makefile.oe ${S}/Makefile |
42 | } | 42 | } |
43 | 43 | ||
44 | do_install() { | 44 | do_install() { |
45 | oe_runmake install | 45 | oe_runmake install |
46 | install -d ${D}${bindir} | 46 | install -d ${D}${bindir} |
47 | install -m 0755 ${WORKDIR}/slim-dynwm ${D}${bindir}/ | 47 | install -m 0755 ${WORKDIR}/slim-dynwm ${D}${bindir}/ |
48 | install -m 0755 ${WORKDIR}/update_slim_wmlist ${D}${bindir}/ | 48 | install -m 0755 ${WORKDIR}/update_slim_wmlist ${D}${bindir}/ |
49 | install -d ${D}${sysconfdir}/pam.d/ | 49 | install -d ${D}${sysconfdir}/pam.d/ |
50 | install -m 0644 ${WORKDIR}/slim.pamd ${D}${sysconfdir}/pam.d/slim | 50 | install -m 0644 ${WORKDIR}/slim.pamd ${D}${sysconfdir}/pam.d/slim |
51 | 51 | ||
52 | install -d ${D}${systemd_unitdir}/system/ | 52 | install -d ${D}${systemd_unitdir}/system/ |
53 | install -m 0644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system/ | 53 | install -m 0644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system/ |
54 | 54 | ||
55 | echo 'sessionstart_cmd /usr/bin/sessreg -a -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf | 55 | echo 'sessionstart_cmd /usr/bin/sessreg -a -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf |
56 | echo 'sessionstop_cmd /usr/bin/sessreg -d -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf | 56 | echo 'sessionstop_cmd /usr/bin/sessreg -d -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf |
57 | } | 57 | } |
58 | 58 | ||
59 | 59 | ||
@@ -62,7 +62,7 @@ FILES_${PN} += "${systemd_unitdir}/system/" | |||
62 | 62 | ||
63 | pkg_postinst_${PN} () { | 63 | pkg_postinst_${PN} () { |
64 | if test "x$D" != "x"; then | 64 | if test "x$D" != "x"; then |
65 | exit 1 | 65 | exit 1 |
66 | fi | 66 | fi |
67 | systemctl enable slim.service | 67 | systemctl enable slim.service |
68 | 68 | ||
@@ -73,7 +73,7 @@ echo "${bindir}/slim" > ${sysconfdir}/X11/default-display-manager | |||
73 | 73 | ||
74 | pkg_postrm_${PN} () { | 74 | pkg_postrm_${PN} () { |
75 | if test "x$D" != "x"; then | 75 | if test "x$D" != "x"; then |
76 | exit 1 | 76 | exit 1 |
77 | fi | 77 | fi |
78 | systemctl disable slim.service | 78 | systemctl disable slim.service |
79 | sed -i /slim/d $D${sysconfdir}/X11/default-display-manager || true | 79 | sed -i /slim/d $D${sysconfdir}/X11/default-display-manager || true |
diff --git a/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb index e05ff3843b..d6e0681d9e 100644 --- a/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb +++ b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb | |||
@@ -8,9 +8,9 @@ PR = "r2" | |||
8 | inherit packagegroup allarch | 8 | inherit packagegroup allarch |
9 | 9 | ||
10 | PACKAGES += "\ | 10 | PACKAGES += "\ |
11 | ${PN}-core \ | 11 | ${PN}-core \ |
12 | ${PN}-chinese \ | 12 | ${PN}-chinese \ |
13 | ${PN}-japanese \ | 13 | ${PN}-japanese \ |
14 | " | 14 | " |
15 | RPROVIDES_${PN} += "task-fonts-truetype" | 15 | RPROVIDES_${PN} += "task-fonts-truetype" |
16 | RPROVIDES_${PN}-core += "task-fonts-truetype-core" | 16 | RPROVIDES_${PN}-core += "task-fonts-truetype-core" |
@@ -26,27 +26,27 @@ RCONFLICTS_${PN}-chinese += "task-fonts-truetype-chinese" | |||
26 | RCONFLICTS_${PN}-japanese += "task-fonts-truetype-japanese" | 26 | RCONFLICTS_${PN}-japanese += "task-fonts-truetype-japanese" |
27 | 27 | ||
28 | RRECOMMENDS_${PN} = "\ | 28 | RRECOMMENDS_${PN} = "\ |
29 | ${PN}-core \ | 29 | ${PN}-core \ |
30 | ${PN}-chinese \ | 30 | ${PN}-chinese \ |
31 | ${PN}-japanese \ | 31 | ${PN}-japanese \ |
32 | " | 32 | " |
33 | 33 | ||
34 | RDEPENDS_${PN}-core = "\ | 34 | RDEPENDS_${PN}-core = "\ |
35 | fontconfig-utils \ | 35 | fontconfig-utils \ |
36 | \ | 36 | \ |
37 | ttf-dejavu-common \ | 37 | ttf-dejavu-common \ |
38 | ttf-dejavu-sans \ | 38 | ttf-dejavu-sans \ |
39 | ttf-dejavu-sans-mono \ | 39 | ttf-dejavu-sans-mono \ |
40 | " | 40 | " |
41 | # ttf-dejavu-serif | 41 | # ttf-dejavu-serif |
42 | 42 | ||
43 | RDEPENDS_${PN}-chinese = "\ | 43 | RDEPENDS_${PN}-chinese = "\ |
44 | ${PN}-core \ | 44 | ${PN}-core \ |
45 | ttf-arphic-uming \ | 45 | ttf-arphic-uming \ |
46 | " | 46 | " |
47 | 47 | ||
48 | RDEPENDS_${PN}-japanese = "\ | 48 | RDEPENDS_${PN}-japanese = "\ |
49 | ${PN}-core \ | 49 | ${PN}-core \ |
50 | ttf-sazanami-gothic \ | 50 | ttf-sazanami-gothic \ |
51 | ttf-sazanami-mincho \ | 51 | ttf-sazanami-mincho \ |
52 | " | 52 | " |
diff --git a/meta-oe/recipes-graphics/tslib/tslib_git.bb b/meta-oe/recipes-graphics/tslib/tslib_git.bb index 71a63ee942..b653978d47 100644 --- a/meta-oe/recipes-graphics/tslib/tslib_git.bb +++ b/meta-oe/recipes-graphics/tslib/tslib_git.bb | |||
@@ -28,12 +28,12 @@ inherit autotools pkgconfig | |||
28 | EXTRA_OECONF = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00" | 28 | EXTRA_OECONF = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00" |
29 | 29 | ||
30 | do_install_prepend() { | 30 | do_install_prepend() { |
31 | install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf | 31 | install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf |
32 | } | 32 | } |
33 | 33 | ||
34 | do_install_append() { | 34 | do_install_append() { |
35 | install -d ${D}${sysconfdir}/profile.d/ | 35 | install -d ${D}${sysconfdir}/profile.d/ |
36 | install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ | 36 | install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ |
37 | } | 37 | } |
38 | 38 | ||
39 | SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" | 39 | SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb index bcc797cc23..72bc2d2559 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb | |||
@@ -20,8 +20,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-fonts-ttf-${PV}.tar.bz2 \ | |||
20 | S = "${WORKDIR}/dejavu-fonts-ttf-${PV}/ttf" | 20 | S = "${WORKDIR}/dejavu-fonts-ttf-${PV}/ttf" |
21 | 21 | ||
22 | do_install_append () { | 22 | do_install_append () { |
23 | install -d ${D}${sysconfdir}/fonts/conf.d/ | 23 | install -d ${D}${sysconfdir}/fonts/conf.d/ |
24 | install -m 0644 ${WORKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ | 24 | install -m 0644 ${WORKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ |
25 | } | 25 | } |
26 | 26 | ||
27 | PACKAGES = "\ | 27 | PACKAGES = "\ |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb index a96bc51114..c1180b87ca 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb | |||
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/android/platform_frameworks_base.git;protocol=git;br | |||
13 | S = "${WORKDIR}/git/data/fonts" | 13 | S = "${WORKDIR}/git/data/fonts" |
14 | 14 | ||
15 | do_install_prepend() { | 15 | do_install_prepend() { |
16 | rm ${S}/Ahem.ttf MTLc3m.ttf DroidSansArabic.ttf DroidSansThai.ttf Clockopia.ttf MTLmr3m.ttf DroidSansHebrew.ttf DroidSansFallbackLegacy.ttf # we're not packaging it | 16 | rm ${S}/Ahem.ttf MTLc3m.ttf DroidSansArabic.ttf DroidSansThai.ttf Clockopia.ttf MTLmr3m.ttf DroidSansHebrew.ttf DroidSansFallbackLegacy.ttf # we're not packaging it |
17 | } | 17 | } |
18 | 18 | ||
19 | PACKAGES = "ttf-droid-sans ttf-droid-sans-mono \ | 19 | PACKAGES = "ttf-droid-sans ttf-droid-sans-mono \ |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb index 8359bd88f5..129e1375a0 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb | |||
@@ -7,20 +7,20 @@ LIC_FILES_CHKSUM = "file://../OFL.txt;md5=969851e3a70122069a4d9ee61dd5a2ed" | |||
7 | PR = "r0" | 7 | PR = "r0" |
8 | 8 | ||
9 | SRC_URI = "http://levien.com/type/myfonts/Inconsolata.otf \ | 9 | SRC_URI = "http://levien.com/type/myfonts/Inconsolata.otf \ |
10 | file://OFL.txt" | 10 | file://OFL.txt" |
11 | 11 | ||
12 | S = "${WORKDIR}/ttf-inconsolata-${PV}" | 12 | S = "${WORKDIR}/ttf-inconsolata-${PV}" |
13 | 13 | ||
14 | FILES_${PN} = "${datadir}/fonts/truetype/Inconsolata.ttf \ | 14 | FILES_${PN} = "${datadir}/fonts/truetype/Inconsolata.ttf \ |
15 | ${datadir}/doc/ttf-inconsolata/*" | 15 | ${datadir}/doc/ttf-inconsolata/*" |
16 | 16 | ||
17 | do_configure() { | 17 | do_configure() { |
18 | mv ${WORKDIR}/Inconsolata.otf ${S}/Inconsolata.ttf | 18 | mv ${WORKDIR}/Inconsolata.otf ${S}/Inconsolata.ttf |
19 | } | 19 | } |
20 | 20 | ||
21 | do_install_append() { | 21 | do_install_append() { |
22 | install -d ${D}${datadir}/doc/ttf-inconsolata/ | 22 | install -d ${D}${datadir}/doc/ttf-inconsolata/ |
23 | install -m 0644 ${WORKDIR}/OFL.txt ${D}${datadir}/doc/ttf-inconsolata/ | 23 | install -m 0644 ${WORKDIR}/OFL.txt ${D}${datadir}/doc/ttf-inconsolata/ |
24 | } | 24 | } |
25 | 25 | ||
26 | SRC_URI[md5sum] = "0fbe014c1f0fb5e3c71140ff0dc63edf" | 26 | SRC_URI[md5sum] = "0fbe014c1f0fb5e3c71140ff0dc63edf" |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb index 52379449d7..d2e84c2e2b 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb | |||
@@ -18,8 +18,8 @@ python populate_packages_prepend() { | |||
18 | } | 18 | } |
19 | 19 | ||
20 | do_install() { | 20 | do_install() { |
21 | install -d ${D}${datadir}/fonts/ttf-mplus | 21 | install -d ${D}${datadir}/fonts/ttf-mplus |
22 | install -m 0644 *.ttf ${D}${datadir}/fonts/ttf-mplus/ | 22 | install -m 0644 *.ttf ${D}${datadir}/fonts/ttf-mplus/ |
23 | } | 23 | } |
24 | 24 | ||
25 | SRC_URI[md5sum] = "d1400184b51b3871e8d2fca6c50e18ae" | 25 | SRC_URI[md5sum] = "d1400184b51b3871e8d2fca6c50e18ae" |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb index d883734894..0390740de3 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb | |||
@@ -23,12 +23,12 @@ FILES_ttf-sazanami-mincho = "${datadir}/fonts/truetype/sazanami-mincho.ttf \ | |||
23 | ${datadir}/doc/ttf-sazanami-mincho/README" | 23 | ${datadir}/doc/ttf-sazanami-mincho/README" |
24 | 24 | ||
25 | do_install_append() { | 25 | do_install_append() { |
26 | # README contains the redistribution license | 26 | # README contains the redistribution license |
27 | install -d ${D}${datadir}/doc/ | 27 | install -d ${D}${datadir}/doc/ |
28 | install -d ${D}${datadir}/doc/ttf-sazanami-gothic | 28 | install -d ${D}${datadir}/doc/ttf-sazanami-gothic |
29 | install -d ${D}${datadir}/doc/ttf-sazanami-mincho | 29 | install -d ${D}${datadir}/doc/ttf-sazanami-mincho |
30 | install -m 0644 ${S}/README ${D}${datadir}/doc/ttf-sazanami-gothic | 30 | install -m 0644 ${S}/README ${D}${datadir}/doc/ttf-sazanami-gothic |
31 | install -m 0644 ${S}/README ${D}${datadir}/doc/ttf-sazanami-mincho | 31 | install -m 0644 ${S}/README ${D}${datadir}/doc/ttf-sazanami-mincho |
32 | } | 32 | } |
33 | 33 | ||
34 | SRC_URI[md5sum] = "ceef10579a75c92483171f3bd7f77df2" | 34 | SRC_URI[md5sum] = "ceef10579a75c92483171f3bd7f77df2" |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb index 6095386db3..88fca6c513 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb | |||
@@ -11,9 +11,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/wqy/wqy-zenhei-${PV}-0.tar.gz" | |||
11 | S = "${WORKDIR}/wqy-zenhei" | 11 | S = "${WORKDIR}/wqy-zenhei" |
12 | 12 | ||
13 | do_install_append () { | 13 | do_install_append () { |
14 | install -d ${D}${sysconfdir}/fonts/conf.d/ | 14 | install -d ${D}${sysconfdir}/fonts/conf.d/ |
15 | install -m 0644 ${S}/44-wqy-zenhei.conf ${D}${sysconfdir}/fonts/conf.d/ | 15 | install -m 0644 ${S}/44-wqy-zenhei.conf ${D}${sysconfdir}/fonts/conf.d/ |
16 | install -m 0644 ${S}/66-wqy-zenhei-sharp.conf ${D}${sysconfdir}/fonts/conf.d/ | 16 | install -m 0644 ${S}/66-wqy-zenhei-sharp.conf ${D}${sysconfdir}/fonts/conf.d/ |
17 | } | 17 | } |
18 | 18 | ||
19 | PACKAGES = "${PN}" | 19 | PACKAGES = "${PN}" |
diff --git a/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb b/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb index 4f13058327..a79b57f19f 100644 --- a/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb +++ b/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb | |||
@@ -14,6 +14,6 @@ SRC_URI[sha256sum] = "42d7271fbc796e53db71bb221f311b9ff3c51d90a71c9487a9bd3101ca | |||
14 | EXTRA_OEMAKE = "PREFIX=${prefix} INSTALLMAN=${mandir}" | 14 | EXTRA_OEMAKE = "PREFIX=${prefix} INSTALLMAN=${mandir}" |
15 | 15 | ||
16 | do_install() { | 16 | do_install() { |
17 | oe_runmake -e install DESTDIR=${D} PREFIX=${prefix} | 17 | oe_runmake -e install DESTDIR=${D} PREFIX=${prefix} |
18 | } | 18 | } |
19 | 19 | ||
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb b/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb index 9b68d54e7a..bfb952f881 100644 --- a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb +++ b/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb | |||
@@ -8,11 +8,11 @@ SRC_URI = "file://pointercal.xinput" | |||
8 | S = "${WORKDIR}" | 8 | S = "${WORKDIR}" |
9 | 9 | ||
10 | do_install() { | 10 | do_install() { |
11 | # Only install file if it has a contents | 11 | # Only install file if it has a contents |
12 | if [ -s ${S}/pointercal.xinput ]; then | 12 | if [ -s ${S}/pointercal.xinput ]; then |
13 | install -d ${D}${sysconfdir}/ | 13 | install -d ${D}${sysconfdir}/ |
14 | install -m 0644 ${S}/pointercal.xinput ${D}${sysconfdir}/ | 14 | install -m 0644 ${S}/pointercal.xinput ${D}${sysconfdir}/ |
15 | fi | 15 | fi |
16 | } | 16 | } |
17 | 17 | ||
18 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 18 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb index b01f62dab0..593d4658c3 100644 --- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb | |||
@@ -19,15 +19,15 @@ S = "${WORKDIR}/git" | |||
19 | EXTRA_OECONF += "--with-gui=x11" | 19 | EXTRA_OECONF += "--with-gui=x11" |
20 | 20 | ||
21 | do_install_append() { | 21 | do_install_append() { |
22 | install -d ${D}${bindir} | 22 | install -d ${D}${bindir} |
23 | install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh | 23 | install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh |
24 | 24 | ||
25 | install -d ${D}${sysconfdir}/xdg/autostart | 25 | install -d ${D}${sysconfdir}/xdg/autostart |
26 | sed -i -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' scripts/xinput_calibrator.desktop | 26 | sed -i -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' scripts/xinput_calibrator.desktop |
27 | install -m 0644 scripts/xinput_calibrator.desktop ${D}${sysconfdir}/xdg/autostart | 27 | install -m 0644 scripts/xinput_calibrator.desktop ${D}${sysconfdir}/xdg/autostart |
28 | 28 | ||
29 | install -d ${D}${systemd_unitdir}/system | 29 | install -d ${D}${systemd_unitdir}/system |
30 | install -m 0644 ${WORKDIR}/xinput-calibrator.service ${D}${systemd_unitdir}/system | 30 | install -m 0644 ${WORKDIR}/xinput-calibrator.service ${D}${systemd_unitdir}/system |
31 | } | 31 | } |
32 | 32 | ||
33 | FILES_${PN} += "${sysconfdir}/xdg/autostart" | 33 | FILES_${PN} += "${sysconfdir}/xdg/autostart" |
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_277.bb b/meta-oe/recipes-graphics/xorg-app/xterm_277.bb index 18abe35234..c56be09408 100644 --- a/meta-oe/recipes-graphics/xorg-app/xterm_277.bb +++ b/meta-oe/recipes-graphics/xorg-app/xterm_277.bb | |||
@@ -15,9 +15,9 @@ EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \ | |||
15 | --disable-setuid" | 15 | --disable-setuid" |
16 | 16 | ||
17 | do_configure() { | 17 | do_configure() { |
18 | gnu-configize --force | 18 | gnu-configize --force |
19 | sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure | 19 | sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure |
20 | oe_runconf | 20 | oe_runconf |
21 | } | 21 | } |
22 | 22 | ||
23 | FILES_${PN} += " /usr/lib/X11" | 23 | FILES_${PN} += " /usr/lib/X11" |
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb index a604d4651a..0397fb2f57 100644 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb | |||
@@ -16,6 +16,6 @@ EXTRA_OEMAKE = "'INCLUDE=-I${STAGING_INCDIR}/xorg -I${STAGING_INCDIR}/pixman-1'" | |||
16 | 16 | ||
17 | #skip xorg-driver-common.inc AC_CHECK_FILE mangling | 17 | #skip xorg-driver-common.inc AC_CHECK_FILE mangling |
18 | do_configure_prepend () { | 18 | do_configure_prepend () { |
19 | sed 's#gcc#${CC}#g' -i Makefile | 19 | sed 's#gcc#${CC}#g' -i Makefile |
20 | return | 20 | return |
21 | } | 21 | } |
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb index d00fb4eda5..fab7fab1fd 100644 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb | |||
@@ -22,13 +22,13 @@ SRC_URI[md5sum] = "b7a4d2f11637ee3fcf432e044b1d017f" | |||
22 | SRC_URI[sha256sum] = "5f46fdef095a6e44a69e0f0b57c7d665224b26d990d006611236d8332e85b105" | 22 | SRC_URI[sha256sum] = "5f46fdef095a6e44a69e0f0b57c7d665224b26d990d006611236d8332e85b105" |
23 | 23 | ||
24 | do_configure_prepend() { | 24 | do_configure_prepend() { |
25 | rm -rf ${S}/m4/ || true | 25 | rm -rf ${S}/m4/ || true |
26 | } | 26 | } |
27 | do_install_append() { | 27 | do_install_append() { |
28 | install -d ${D}/${datadir}/hal/fdi/policy/20thirdparty | 28 | install -d ${D}/${datadir}/hal/fdi/policy/20thirdparty |
29 | install -m 0644 ${WORKDIR}/10-x11-input-tslib.fdi ${D}/${datadir}/hal/fdi/policy/20thirdparty | 29 | install -m 0644 ${WORKDIR}/10-x11-input-tslib.fdi ${D}/${datadir}/hal/fdi/policy/20thirdparty |
30 | install -d ${D}/lib/udev/rules.d | 30 | install -d ${D}/lib/udev/rules.d |
31 | install -m 0644 ${WORKDIR}/99-xf86-input-tslib.rules ${D}/lib/udev/rules.d/ | 31 | install -m 0644 ${WORKDIR}/99-xf86-input-tslib.rules ${D}/lib/udev/rules.d/ |
32 | } | 32 | } |
33 | 33 | ||
34 | FILES_${PN} += "${datadir}/hal /lib/udev" | 34 | FILES_${PN} += "${datadir}/hal /lib/udev" |
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb index f9eb3ce920..c3d83a47d2 100644 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb | |||
@@ -14,7 +14,7 @@ SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=m | |||
14 | file://0001-fix-build-with-KMS-disabled.patch \ | 14 | file://0001-fix-build-with-KMS-disabled.patch \ |
15 | file://0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch \ | 15 | file://0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch \ |
16 | file://0001-glamo-driver-remove-references-to-mibstore.patch \ | 16 | file://0001-glamo-driver-remove-references-to-mibstore.patch \ |
17 | " | 17 | " |
18 | 18 | ||
19 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
20 | SRCREV = "cb9ed17035a79e49dde26a1e7e2bc5f10fd8144b" | 20 | SRCREV = "cb9ed17035a79e49dde26a1e7e2bc5f10fd8144b" |
diff --git a/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb b/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb index f5a4a6f6af..83cd1f901b 100644 --- a/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb +++ b/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.10.bb | |||
@@ -14,9 +14,9 @@ SRC_URI[sha256sum] = "2d96bcf92638b8ec5c91d379f5ec2e7b15133adeb2ba22066d48bf3239 | |||
14 | EXTRA_OECONF += " --disable-docs " | 14 | EXTRA_OECONF += " --disable-docs " |
15 | 15 | ||
16 | do_install_append () { | 16 | do_install_append () { |
17 | ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6 | 17 | ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6 |
18 | ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7 | 18 | ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7 |
19 | ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so | 19 | ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so |
20 | } | 20 | } |
21 | 21 | ||
22 | PACKAGES =+ "libxaw6 libxaw7 libxaw8" | 22 | PACKAGES =+ "libxaw6 libxaw7 libxaw8" |
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb index f3074196f4..3bb8b61a8d 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb | |||
@@ -11,22 +11,22 @@ SRC_URI[md5sum] = "82f2f84cd96610e8f7b92c700cd31c14" | |||
11 | SRC_URI[sha256sum] = "cd04c33418f776b1e13fcc7af3d6bd0c7cccd03fbabd7dbcd97f88166cc34210" | 11 | SRC_URI[sha256sum] = "cd04c33418f776b1e13fcc7af3d6bd0c7cccd03fbabd7dbcd97f88166cc34210" |
12 | 12 | ||
13 | SRC_URI_append = " \ | 13 | SRC_URI_append = " \ |
14 | file://0001-COPYING-add-GPLv2-license-file.patch \ | 14 | file://0001-COPYING-add-GPLv2-license-file.patch \ |
15 | file://0002-add-setdpi-Xinit.d-script.patch \ | 15 | file://0002-add-setdpi-Xinit.d-script.patch \ |
16 | file://0003-add-89xdgautostart-Xsession.d-script.patch \ | 16 | file://0003-add-89xdgautostart-Xsession.d-script.patch \ |
17 | file://0005-add-XWindowManager-Xsession.d-script.patch \ | 17 | file://0005-add-XWindowManager-Xsession.d-script.patch \ |
18 | file://0006-add-support-for-etc-X11-xserver-system.patch \ | 18 | file://0006-add-support-for-etc-X11-xserver-system.patch \ |
19 | file://0007-use-own-functions-file-instead-etc-init.d-functions.patch \ | 19 | file://0007-use-own-functions-file-instead-etc-init.d-functions.patch \ |
20 | file://0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch \ | 20 | file://0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch \ |
21 | file://0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch \ | 21 | file://0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch \ |
22 | file://0010-xserver-common-add-support-for-nexus-S-alias-herring.patch \ | 22 | file://0010-xserver-common-add-support-for-nexus-S-alias-herring.patch \ |
23 | file://0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch \ | 23 | file://0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch \ |
24 | file://0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch \ | 24 | file://0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch \ |
25 | file://0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch \ | 25 | file://0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch \ |
26 | " | 26 | " |
27 | 27 | ||
28 | do_install_append() { | 28 | do_install_append() { |
29 | sed -i 's:^BINDIR=.*$:BINDIR=${bindir}:' ${D}/etc/X11/xserver-common | 29 | sed -i 's:^BINDIR=.*$:BINDIR=${bindir}:' ${D}/etc/X11/xserver-common |
30 | } | 30 | } |
31 | 31 | ||
32 | inherit allarch | 32 | inherit allarch |
diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb index bbed445fe3..aa85c8c979 100644 --- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb +++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb | |||
@@ -19,13 +19,13 @@ INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 0 1 6 ." | |||
19 | INITSCRIPT_PARAMS_shr = "start 90 5 2 . stop 90 0 1 6 ." | 19 | INITSCRIPT_PARAMS_shr = "start 90 5 2 . stop 90 0 1 6 ." |
20 | 20 | ||
21 | do_install() { | 21 | do_install() { |
22 | install -d ${D}${sysconfdir}/init.d | 22 | install -d ${D}${sysconfdir}/init.d |
23 | install xserver-nodm ${D}${sysconfdir}/init.d | 23 | install xserver-nodm ${D}${sysconfdir}/init.d |
24 | 24 | ||
25 | install -d ${D}${sysconfdir}/default | 25 | install -d ${D}${sysconfdir}/default |
26 | install -d ${D}${systemd_unitdir}/system | 26 | install -d ${D}${systemd_unitdir}/system |
27 | install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm | 27 | install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm |
28 | install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system | 28 | install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system |
29 | } | 29 | } |
30 | 30 | ||
31 | RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit" | 31 | RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit" |