summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-03 23:45:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-03 23:49:21 +0000
commitdabd5deb4e50189fba9ccc60a219a5c6a05c8db1 (patch)
tree2cad66c55b524e6e6f1ed3a3e0ef8bb428d3a986 /meta
parentbd9b65d06d34d9fc8090fe2aeeca6e3724e00f91 (diff)
downloadpoky-dabd5deb4e50189fba9ccc60a219a5c6a05c8db1.tar.gz
Fixup merge error and apply cleanups
(From OE-Core rev: a72822d315d7bc35a424b0807693ad7a3317c519) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/adt_installer2
-rw-r--r--meta/recipes-devtools/installer/adt-installer/scripts/data_define2
-rw-r--r--meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb2
-rw-r--r--meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb2
-rw-r--r--meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc2
5 files changed, 4 insertions, 6 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer
index cca576f7ef..2448d2b9f7 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -152,7 +152,7 @@ if [ ! -x "$LOCAL_OPKG_LOC/bin/opkg-cl" ]; then
152 rm -rf $LOCAL_OPKG_LOC 152 rm -rf $LOCAL_OPKG_LOC
153 fi 153 fi
154 154
155 parent_folder=`eval echo $PWD` 155 parent_folder=`pwd`
156 cd $LOCAL_OPKG_FOLDER 156 cd $LOCAL_OPKG_FOLDER
157 check_result 157 check_result
158 158
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
index e29cc30918..c7bce6d9ef 100644
--- a/meta/recipes-devtools/installer/adt-installer/scripts/data_define
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
@@ -23,7 +23,7 @@
23# THE SOFTWARE. 23# THE SOFTWARE.
24 24
25config_file="adt_installer.conf" 25config_file="adt_installer.conf"
26source `eval echo $PWD`/$config_file 26source `pwd`/$config_file
27 27
28LOCAL_OPKG_LOC="./opkg/build/opkg" 28LOCAL_OPKG_LOC="./opkg/build/opkg"
29LOCAL_OPKG_FOLDER="./opkg/build" 29LOCAL_OPKG_FOLDER="./opkg/build"
diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb
index bbaba7144b..97da4a4592 100644
--- a/meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.49.bb
@@ -21,7 +21,5 @@ SRC_URI[sha256sum] = "775100a9d6f70fbd8f33ed24b560b6842161fc496c21b1fc6d2aed646f
21inherit autotools 21inherit autotools
22 22
23do_install_append() { 23do_install_append() {
24# mkdir -p ${D}/etc/rc.d/init.d
25# mkdir -p ${D}/etc/rc.d/rc{0,1,2,3,4,5,6}.d
26 mkdir -p ${D}/etc/chkconfig.d 24 mkdir -p ${D}/etc/chkconfig.d
27} 25}
diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
index 129343be02..f5a6662660 100644
--- a/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
+++ b/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \
10DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib" 10DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib"
11 11
12SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz\ 12SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz\
13 file://starting-fix.patch;patch=1" 13 file://starting-fix.patch"
14 14
15SRC_URI[md5sum] = "1498a68d02aa7b6c97bf746c073c8d00" 15SRC_URI[md5sum] = "1498a68d02aa7b6c97bf746c073c8d00"
16SRC_URI[sha256sum] = "60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79" 16SRC_URI[sha256sum] = "60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79"
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
index 3ee76efdea..0eff9dd7ae 100644
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
@@ -23,5 +23,5 @@ pkg_postinst_${PN} () {
23 exit 1 23 exit 1
24 fi 24 fi
25 gtk-update-icon-cache -q /usr/share/icons/Sato 25 gtk-update-icon-cache -q /usr/share/icons/Sato
26 echo 'gtk-icon-theme-name = "Sato"' > /etc/gtk-2.0/gtkrc 26 echo 'gtk-icon-theme-name = "Sato"' >> /etc/gtk-2.0/gtkrc
27} 27}