diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-03 23:45:25 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-03 23:45:25 +0000 |
| commit | a72822d315d7bc35a424b0807693ad7a3317c519 (patch) | |
| tree | 9f44d4a04595e6523be087f9948876748e84181f | |
| parent | bcdd048e4857b5f8a343c434ade5a02ab1db33bc (diff) | |
| download | openembedded-core-a72822d315d7bc35a424b0807693ad7a3317c519.tar.gz openembedded-core-a72822d315d7bc35a424b0807693ad7a3317c519.tar.bz2 openembedded-core-a72822d315d7bc35a424b0807693ad7a3317c519.tar.xz openembedded-core-a72822d315d7bc35a424b0807693ad7a3317c519.zip | |
Fixup merge error and apply cleanups
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 cca576f7e..2448d2b9f 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 rm -rf $LOCAL_OPKG_LOC fi - parent_folder=`eval echo $PWD` + parent_folder=`pwd` cd $LOCAL_OPKG_FOLDER check_result diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/meta/recipes-devtools/installer/adt-installer/scripts/data_define index e29cc3091..c7bce6d9e 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 @@ # THE SOFTWARE. config_file="adt_installer.conf" -source `eval echo $PWD`/$config_file +source `pwd`/$config_file LOCAL_OPKG_LOC="./opkg/build/opkg" LOCAL_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 bbaba7144..97da4a459 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 inherit autotools do_install_append() { -# mkdir -p ${D}/etc/rc.d/init.d -# mkdir -p ${D}/etc/rc.d/rc{0,1,2,3,4,5,6}.d mkdir -p ${D}/etc/chkconfig.d } diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb index 129343be0..f5a666266 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 \ DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib" SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz\ - file://starting-fix.patch;patch=1" + file://starting-fix.patch" SRC_URI[md5sum] = "1498a68d02aa7b6c97bf746c073c8d00" SRC_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 3ee76efde..0eff9dd7a 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} () { exit 1 fi gtk-update-icon-cache -q /usr/share/icons/Sato - echo 'gtk-icon-theme-name = "Sato"' > /etc/gtk-2.0/gtkrc + echo 'gtk-icon-theme-name = "Sato"' >> /etc/gtk-2.0/gtkrc } |