Fixup merge error and apply cleanups
(From OE-Core rev: a72822d315d7bc35a424b0807693ad7a3317c519) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
bd9b65d06d
commit
dabd5deb4e
|
@ -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
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue