- add lot of packages.
authorRonan Le Martret <ronan@fridu.net>
Tue, 4 Jun 2013 16:22:34 +0000 (18:22 +0200)
committerRonan Le Martret <ronan@fridu.net>
Tue, 4 Jun 2013 16:22:34 +0000 (18:22 +0200)
41 files changed:
Tizen_TZ_package/TizenGroup-IVI-Wayland/spec2yocto_configure
Tizen_TZ_package/recipes-Tizen-IVI-base/package-yocto-native
Tizen_TZ_package/recipes-Tizen-IVI-base/package-yocto-oe
meta-tizen-ivi/classes/tizenBuildUtils.bbclass
meta-tizen-ivi/conf/layer.conf
meta-tizen-ivi/recipes-packagegroups/packagegroups/packagegroup-tizen-commonwayland-core.bb
meta-tizen-ivi/recipes-tizen/automake/automake-extraconf.inc
meta-tizen-ivi/recipes-tizen/automake/automake/automake.spec.patch [new file with mode: 0644]
meta-tizen-ivi/recipes-tizen/automake/automake_git.bb [deleted file]
meta-tizen-ivi/recipes-tizen/binutils/binutils-extraconf.inc
meta-tizen-ivi/recipes-tizen/bluez/bluez-extraconf.inc
meta-tizen-ivi/recipes-tizen/bluez/bluez/bluez.spec.patch [new file with mode: 0644]
meta-tizen-ivi/recipes-tizen/c-ares/c-ares-extraconf.inc
meta-tizen-ivi/recipes-tizen/c-ares/c-ares/c-ares.spec.patch [new file with mode: 0644]
meta-tizen-ivi/recipes-tizen/dbus-glib/dbus-glib-extraconf.inc
meta-tizen-ivi/recipes-tizen/dbus-python/dbus-python-extraconf.inc
meta-tizen-ivi/recipes-tizen/dbus/dbus-native-extraconf.inc
meta-tizen-ivi/recipes-tizen/dbus/dbus/dbus.spec.patch
meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp/default-files-slp.spec.patch
meta-tizen-ivi/recipes-tizen/fribidi/fribidi-extraconf.inc
meta-tizen-ivi/recipes-tizen/fribidi/fribidi/fribidi.spec.patch [new file with mode: 0644]
meta-tizen-ivi/recipes-tizen/libgcrypt/libgcrypt-extraconf.inc
meta-tizen-ivi/recipes-tizen/libgcrypt/libgcrypt-native_git.bb [new file with mode: 0644]
meta-tizen-ivi/recipes-tizen/libgcrypt/libgcrypt-oe-extraconf.inc
meta-tizen-ivi/recipes-tizen/libgcrypt/libgcrypt/libgcrypt.spec.patch
meta-tizen-ivi/recipes-tizen/libgcrypt/libgcrypt/obsolete_automake_macros.patch [deleted file]
meta-tizen-ivi/recipes-tizen/libgpg-error/libgpg-error-extraconf.inc
meta-tizen-ivi/recipes-tizen/libgpg-error/libgpg-error-native_git.bb [new file with mode: 0644]
meta-tizen-ivi/recipes-tizen/libgpg-error/libgpg-error/libgpg-error.spec.patch [new file with mode: 0644]
meta-tizen-ivi/recipes-tizen/lua/lua-extraconf.inc
meta-tizen-ivi/recipes-tizen/lua/lua/lua.spec.patch [new file with mode: 0644]
meta-tizen-ivi/recipes-tizen/openssh/openssh-extraconf.inc
meta-tizen-ivi/recipes-tizen/pciutils/pciutils/pciutils.spec.patch
meta-tizen-ivi/recipes-tizen/prelink/prelink-extraconf.inc
meta-tizen-ivi/recipes-tizen/pygobject/pygobject-extraconf.inc
meta-tizen-ivi/recipes-tizen/pygobject/pygobject/obsolete_automake_macros.patch [new file with mode: 0644]
meta-tizen-ivi/recipes-tizen/pygobject/pygobject/pygobject.spec.patch [new file with mode: 0644]
meta-tizen-ivi/recipes-tizen/systemd/systemd-extraconf.inc
meta-tizen-ivi/recipes-tizen/systemd/systemd/systemd.spec.patch
meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit-extraconf.inc
meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit/Makefile.patch [new file with mode: 0644]

index b481dcf..ea81792 100644 (file)
@@ -5,7 +5,7 @@ directory=recipes-Tizen-IVI-base,recipes-Tizen-IVI-Wayland
 
 [recipes_autoreconf]
 #specify witch recipes do not execute autoreconf during the macro "%configure". 
-blacklist=freetype,popt,pcre,which,findutils,tizen-coreutils,python,ncurses,dlog,texinfo,groff,module-init-tools,binutils,gawk,grep
+blacklist=freetype,popt,pcre,which,findutils,tizen-coreutils,python,ncurses,dlog,texinfo,groff,module-init-tools,gawk,grep,fribidi,file,c-ares,psmisc,libidn,binutils
 
 [target]
 #define the target cpu
index 4684c7c..a8a422e 100644 (file)
@@ -8,4 +8,5 @@ libgcc
 linux-libc-headers
 perl
 m4
-coreutils
\ No newline at end of file
+coreutils
+automake
\ No newline at end of file
index ac10f80..3a8aec5 100644 (file)
@@ -65,6 +65,7 @@ do_compile_prepend () {
  echo export BUILD_SYS=${BUILD_SYS} >> ${WORKDIR}/temp/Bash_compile
  echo export TARGET_PREFIX=${TARGET_PREFIX} >> ${WORKDIR}/temp/Bash_compile
  echo export STAGING_BINDIR_NATIVE=${STAGING_BINDIR_NATIVE} >> ${WORKDIR}/temp/Bash_compile
+ echo export STAGING_DIR_NATIVE=${STAGING_DIR_NATIVE} >> ${WORKDIR}/temp/Bash_compile
  #RLM fix gmp
  
  #echo export cross_compiling=yes >> ${WORKDIR}/temp/Bash_compile
@@ -101,6 +102,7 @@ do_install_prepend () {
  echo export BUILD_SYS=${BUILD_SYS} >> ${WORKDIR}/temp/Bash_install
  echo export TARGET_PREFIX=${TARGET_PREFIX} >> ${WORKDIR}/temp/Bash_install
  echo export STAGING_BINDIR_NATIVE=${STAGING_BINDIR_NATIVE} >> ${WORKDIR}/temp/Bash_install
+ echo export STAGING_DIR_NATIVE=${STAGING_DIR_NATIVE} >> ${WORKDIR}/temp/Bash_install
  #RLM fix gmp
  
  if [[ ${PN} =~ "-native" ]];
@@ -225,7 +227,7 @@ oe_runconf2 () {
                bbnote "Running $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF}" "$@"
                bbnote "Running with EXTRA_OECONF ${EXTRA_OECONF}  " "$@"
                set +e
-               ${CACHED_CONFIGUREVARS} $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@"
+               ${CACHED_CONFIGUREVARS} $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@" ${EXTRA_OECONF_LAST}
                if [ "$?" != "0" ]; then
                        echo "Configure failed. The contents of all config.log files follows to aid debugging"
                        find . -name config.log -print -exec cat {} \;
index 6150a77..5e4b45c 100644 (file)
@@ -19,6 +19,13 @@ PREFERRED_PROVIDER_python-curses = "python"
 PREFERRED_PROVIDER_python = "python-base"
 PREFERRED_VERSION_python = "git"
 
+
+
+PREFERRED_PROVIDER_python-native  = "python-base-native-native"
+PREFERRED_PROVIDER_python-xml-native = "python-base-native"
+PREFERRED_PROVIDER_python-curses-native = "python-native"
+PREFERRED_VERSION_python-native = "git"
+
 PREFERRED_PROVIDER_libpcre = "pcre"
 PREFERRED_VERSION_elfutils = "git"
 PREFERRED_PROVIDER_udev = "udev"
@@ -40,8 +47,8 @@ PREFERRED_VERSION_binutils = "git"
 
 INHERIT_DISTRO = "devshell sstate license"
 
-#131072=128(Mo)*1024
-IMAGE_ROOTFS_SIZE_ext3 = "131072"
+#262144=256(Mo)*1024
+IMAGE_ROOTFS_SIZE_ext3 = "262144"
 #EXTRA_IMAGECMD_ext2 += "-b 1024"
 #IMAGE_ROOTFS_EXTRA_SPACE = "6400"
 
index b7d0100..b92514f 100644 (file)
@@ -44,30 +44,33 @@ RDEPENDS_${PN} += "bzip2"
 RDEPENDS_${PN} += "bzip2-libs"
 
 RDEPENDS_${PN} += "bundle"
-##RDEPENDS_${PN} += "bluez"
+
+RDEPENDS_${PN} += "bluez"
+
 RDEPENDS_${PN} += "binutils"
 RDEPENDS_${PN} += "zlib"
 
 RDEPENDS_${PN} += "e2fsprogs"
+RDEPENDS_${PN} += "e2fsprogs-libs"
 RDEPENDS_${PN} += "gawk"
 
 RDEPENDS_${PN} += "ca-certificates"
 RDEPENDS_${PN} += "default-fonts-fc-sdk"
 RDEPENDS_${PN} += "dbus"
 RDEPENDS_${PN} += "dbus-libs"
-##RDEPENDS_${PN} += "dbus-glib"
+RDEPENDS_${PN} += "dbus-glib"
 RDEPENDS_${PN} += "giflib"
 
 RDEPENDS_${PN} += "drm-client"
 
 
-##RDEPENDS_${PN} += "gconf-dbus"
-##RDEPENDS_${PN} += "gconf-dbus-utils"
+RDEPENDS_${PN} += "gconf-dbus"
+RDEPENDS_${PN} += "gconf-dbus-utils"
 
 RDEPENDS_${PN} += "dlogutil"
 RDEPENDS_${PN} += "dnsmasq"
 
-#RDEPENDS_${PN} += "eglibc"
+RDEPENDS_${PN} += "eglibc"
 #RDEPENDS_${PN} += "eglibc-common"
 
 RDEPENDS_${PN} += "elfutils"
@@ -76,14 +79,14 @@ RDEPENDS_${PN} += "elfutils-libs"
 
 RDEPENDS_${PN} += "expat"
 RDEPENDS_${PN} += "elm-misc"
-##RDEPENDS_${PN} += "file"
-##RDEPENDS_${PN} += "libfile"
+RDEPENDS_${PN} += "file"
+RDEPENDS_${PN} += "libfile"
 RDEPENDS_${PN} += "freetype"
 
 RDEPENDS_${PN} += "setup"
 RDEPENDS_${PN} += "filesystem"
 RDEPENDS_${PN} += "findutils"
-#RDEPENDS_${PN} += "fribidi"
+RDEPENDS_${PN} += "fribidi"
 #RDEPENDS_${PN} += "gdb"
 #RDEPENDS_${PN} += "gdb-server"
 
@@ -97,10 +100,12 @@ RDEPENDS_${PN} += "libarchive"
 RDEPENDS_${PN} += "libasound"
 #RDEPENDS_${PN} += "curl"
 #RDEPENDS_${PN} += "libcurl"
+RDEPENDS_${PN} += "libcom_err"
+RDEPENDS_${PN} += "libblkid"
 RDEPENDS_${PN} += "libdmx"
 RDEPENDS_${PN} += "libdrm"
 RDEPENDS_${PN} += "libdrm-slp1"
-#RDEPENDS_${PN} += "libgcrypt"
+RDEPENDS_${PN} += "libgcrypt"
 RDEPENDS_${PN} += "libICE"
 RDEPENDS_${PN} += "libiri"
 RDEPENDS_${PN} += "libpng"
@@ -109,6 +114,7 @@ RDEPENDS_${PN} += "libshortcut"
 RDEPENDS_${PN} += "libslp-pm"
 RDEPENDS_${PN} += "libslp-utilx"
 RDEPENDS_${PN} += "libSM"
+RDEPENDS_${PN} += "libss"
 RDEPENDS_${PN} += "libtcore"
 RDEPENDS_${PN} += "libtheora"
 RDEPENDS_${PN} += "libX11"
@@ -124,6 +130,8 @@ RDEPENDS_${PN} += "libXinerama"
 RDEPENDS_${PN} += "libxkbfile"
 RDEPENDS_${PN} += "libXxf86dga"
 RDEPENDS_${PN} += "libXxf86vm"
+RDEPENDS_${PN} += "libusb-compat"
+RDEPENDS_${PN} += "libxml2"
 RDEPENDS_${PN} += "module-init-tools"
 RDEPENDS_${PN} += "pixman"
 RDEPENDS_${PN} += "sensor"
@@ -131,7 +139,9 @@ RDEPENDS_${PN} += "shared-mime-info"
 #RDEPENDS_${PN} += "ss-server"
 RDEPENDS_${PN} += "svi-data-sdk"
 RDEPENDS_${PN} += "sys-assert"
-#RDEPENDS_${PN} += "uuidd"
+
+##Need new user to install
+##RDEPENDS_${PN} += "uuidd"
 
 RDEPENDS_${PN} += "libdaemon"
 RDEPENDS_${PN} += "libdlog"
@@ -151,10 +161,11 @@ RDEPENDS_${PN} += "libusb"
 RDEPENDS_${PN} += "login"
 RDEPENDS_${PN} += "lsb"
 #RDEPENDS_${PN} += "ltrace"
-#RDEPENDS_${PN} += "lua"
+RDEPENDS_${PN} += "lua"
 RDEPENDS_${PN} += "lzo"
 RDEPENDS_${PN} += "lzo-minilzo"
-
+RDEPENDS_${PN} += "liblua"
+RDEPENDS_${PN} += "libstdc++"
 RDEPENDS_${PN} += "libxcb"
 RDEPENDS_${PN} += "libXt"
 RDEPENDS_${PN} += "libXtst"
@@ -176,6 +187,7 @@ RDEPENDS_${PN} += "libss-client"
 RDEPENDS_${PN} += "libpciaccess"
 RDEPENDS_${PN} += "libprivilege-control"
 RDEPENDS_${PN} += "libprivilege-control-conf"
+RDEPENDS_${PN} += "libpcre"
 RDEPENDS_${PN} += "libogg"
 RDEPENDS_${PN} += "libkms"
 RDEPENDS_${PN} += "libleveldb"
@@ -201,7 +213,7 @@ RDEPENDS_${PN} += "readline"
 
 RDEPENDS_${PN} += "rfkill"
 
-#RDEPENDS_${PN} += "smack"
+RDEPENDS_${PN} += "smack"
 #RDEPENDS_${PN} += "smack-utils"
 
 
@@ -224,7 +236,7 @@ RDEPENDS_${PN} += "sys-string"
 RDEPENDS_${PN} += "tizen-coreutils"
 RDEPENDS_${PN} += "systemd"
 RDEPENDS_${PN} += "tizen-release"
-##RDEPENDS_${PN} += "prelink"
+RDEPENDS_${PN} += "prelink"
 
 RDEPENDS_${PN} += "usbutils"
 
index e69de29..8460395 100644 (file)
@@ -0,0 +1,8 @@
+SRC_URI += "file://automake.spec.patch"
+
+do_patch_append () {
+ echo RLM begining of do_patch
+ cat ${WORKDIR}/automake.spec.patch| patch -s -p1 --fuzz=2
+ echo RLM end of do_patch
+}
\ No newline at end of file
diff --git a/meta-tizen-ivi/recipes-tizen/automake/automake/automake.spec.patch b/meta-tizen-ivi/recipes-tizen/automake/automake/automake.spec.patch
new file mode 100644 (file)
index 0000000..ff11f1e
--- /dev/null
@@ -0,0 +1,13 @@
+diff --git a/packaging/automake.spec b/packaging/automake.spec
+index d2844f0..3b67f11 100644
+--- a/packaging/automake.spec
++++ b/packaging/automake.spec
+@@ -40,7 +40,7 @@ chmod +x %{SOURCE2}
+ %build
+ cp %{SOURCE1001} .
+-./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
++%configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
+    --bindir=%{_bindir} --datadir=%{_datadir} --libdir=%{_libdir} \
+    --docdir=%{_docdir}/%{name}-%{version}
+ make %{?_smp_mflags}
diff --git a/meta-tizen-ivi/recipes-tizen/automake/automake_git.bb b/meta-tizen-ivi/recipes-tizen/automake/automake_git.bb
deleted file mode 100644 (file)
index f30ace2..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-require automake.inc
-require automake-rprovides.inc
-
-PRIORITY = "10"
-
-LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-
-SRC_URI += "git://review.tizen.org/toolchains/automake;protocol=ssh;tag=tizen_2.0"
-require automake-oe-extraconf.inc
-
index 86860af..f000f27 100644 (file)
@@ -1 +1,35 @@
-RDEPENDS_binutils += "zlib"
\ No newline at end of file
+inherit  gettext multilib_header
+
+EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
+                --disable-werror \
+               --enable-plugins \
+               ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '', d)} \
+                ${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}"
+  
+                
+EXTRA_OECONF += "--with-sysroot=/ \
+                --enable-install-libbfd \
+                --enable-shared \
+                "
+
+# This is necessary due to a bug in the binutils Makefiles
+# EXTRA_OEMAKE = "configure-build-libiberty all"
+
+export AR = "${HOST_PREFIX}ar"
+export AS = "${HOST_PREFIX}as"
+export LD = "${HOST_PREFIX}ld"
+export NM = "${HOST_PREFIX}nm"
+export RANLIB = "${HOST_PREFIX}ranlib"
+export OBJCOPY = "${HOST_PREFIX}objcopy"
+export OBJDUMP = "${HOST_PREFIX}objdump"
+
+export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
+export AS_FOR_TARGET = "${TARGET_PREFIX}as"
+export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
+export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
+export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
+
+export CC_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
+export CXX_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
+
+export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}"
\ No newline at end of file
index e69de29..29d2a80 100644 (file)
@@ -0,0 +1,11 @@
+SRC_URI += "file://bluez.spec.patch \
+            "
+
+do_patch_append () {
+ echo RLM begining of do_patch
+
+ cat ${WORKDIR}/bluez.spec.patch | patch -s -p1 --fuzz=2
+ echo RLM end of do_patch
+}
+
diff --git a/meta-tizen-ivi/recipes-tizen/bluez/bluez/bluez.spec.patch b/meta-tizen-ivi/recipes-tizen/bluez/bluez/bluez.spec.patch
new file mode 100644 (file)
index 0000000..71c5700
--- /dev/null
@@ -0,0 +1,15 @@
+diff --git a/packaging/bluez.spec b/packaging/bluez.spec
+index e67318f..ad2f8bf 100644
+--- a/packaging/bluez.spec
++++ b/packaging/bluez.spec
+@@ -124,8 +124,8 @@ install -D -m 0644 network/network.conf %{buildroot}%{_prefix}/etc/bluetooth/net
+ %{_bindir}/gatttool
+ %{_bindir}/rfcomm
+ %{_bindir}/hcitool
+-%dir %{_libdir}/bluetooth/plugins
+-%dir /opt/var/lib/bluetooth
++#%dir %{_libdir}/bluetooth/plugins
++#%dir /opt/var/lib/bluetooth
+ %{_datadir}/dbus-1/system-services/org.bluez.service
index e69de29..bbc5201 100644 (file)
@@ -0,0 +1,8 @@
+SRC_URI += "file://c-ares.spec.patch \
+            "
+
+do_patch_append () {
+ echo RLM begining of do_patch
+ cat ${WORKDIR}/c-ares.spec.patch | patch -s -p1 --fuzz=2
+}
\ No newline at end of file
diff --git a/meta-tizen-ivi/recipes-tizen/c-ares/c-ares/c-ares.spec.patch b/meta-tizen-ivi/recipes-tizen/c-ares/c-ares/c-ares.spec.patch
new file mode 100644 (file)
index 0000000..ee226e7
--- /dev/null
@@ -0,0 +1,15 @@
+diff --git a/packaging/c-ares.spec b/packaging/c-ares.spec
+index b577891..729e4ca 100644
+--- a/packaging/c-ares.spec
++++ b/packaging/c-ares.spec
+@@ -26,8 +26,8 @@ library for asynchronous name resolves (development files) (Developement)
+ %setup -q
+ %build
+-./buildconf
+-./configure --prefix=/usr --enable-shared --enable-symbol-hiding
++#./buildconf
++%configure --prefix=/usr --enable-shared --enable-symbol-hiding
+ make %{?jobs:-j%jobs}
+ %install
index e69de29..5322f96 100644 (file)
@@ -0,0 +1,7 @@
+EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml \
+                --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool"
+EXTRA_OECONF_class-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
+
+DEPENDS += "dbus-glib-native"
+
+DEPENDS_class-native += "glib-2.0-native dbus-native"
\ No newline at end of file
index e068b7c..c5caad3 100644 (file)
@@ -3,5 +3,5 @@ DEPENDS = ""
 DEPENDS += "doxygen"
 DEPENDS += "expat"
 DEPENDS += "libtool-native"
-DEPENDS += "libzio"
-DEPENDS += "libcap-ng"
+#DEPENDS += "libzio"
+#DEPENDS += "libcap-ng"
index 3a017f4..675b04c 100644 (file)
@@ -1,8 +1,8 @@
 diff --git a/packaging/dbus.spec b/packaging/dbus.spec
-index ea31831..058a5d1 100644
+index ea31831..f4110ff 100644
 --- a/packaging/dbus.spec
 +++ b/packaging/dbus.spec
-@@ -61,6 +61,12 @@ make %{?jobs:-j%jobs}
+@@ -61,21 +61,27 @@ make %{?jobs:-j%jobs}
  %install
  rm -rf %{buildroot}
  %make_install
@@ -15,7 +15,22 @@ index ea31831..058a5d1 100644
  rm -rf $RPM_BUILD_ROOT/usr/share/man
  
  
-@@ -75,7 +81,7 @@ ln -s ../init.d/dbus-daemon_run %{buildroot}/etc/rc.d/rc4.d/S04dbus-daemon_run
+-mkdir -p %{buildroot}/etc/rc.d/init.d
+-mkdir -p %{buildroot}/etc/rc.d/rc{3,4}.d
+-mkdir -p %{buildroot}/usr/etc/dbus-1
+-cp %{SOURCE1} %{buildroot}/etc/rc.d/init.d/dbus-daemon_run
+-cp %{SOURCE2} %{buildroot}/etc/dbus-1/system.conf
+-chmod 755 %{buildroot}/etc/rc.d/init.d/dbus-daemon_run
+-ln -s ../init.d/dbus-daemon_run  %{buildroot}/etc/rc.d/rc3.d/S04dbus-daemon_run
+-ln -s ../init.d/dbus-daemon_run %{buildroot}/etc/rc.d/rc4.d/S04dbus-daemon_run
++mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
++mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc{3,4}.d
++mkdir -p %{buildroot}%{_usr}/etc/dbus-1
++cp %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/dbus-daemon_run
++cp %{SOURCE2} %{buildroot}%{_sysconfdir}/dbus-1/system.conf
++chmod 755 %{buildroot}%{_sysconfdir}/rc.d/init.d/dbus-daemon_run
++ln -s ../init.d/dbus-daemon_run  %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S04dbus-daemon_run
++ln -s ../init.d/dbus-daemon_run %{buildroot}%{_sysconfdir}/rc.d/rc4.d/S04dbus-daemon_run
  
  
  %post
@@ -24,3 +39,14 @@ index ea31831..058a5d1 100644
  
  
  %post libs 
+@@ -86,8 +92,8 @@ mkdir -p /opt/var/lib/dbus
+ %files
+-/etc/rc.d/init.d/*
+-/etc/rc.d/rc?.d/*
++%{_sysconfdir}/rc.d/init.d/*
++%{_sysconfdir}/rc.d/rc?.d/*
+ #/usr/etc/dbus-1/*
+ %{_bindir}/dbus-cleanup-sockets
+ %{_bindir}/dbus-daemon
index b5f1938..493c8f6 100644 (file)
@@ -1,32 +1,22 @@
 diff --git a/packaging/default-files-slp.spec b/packaging/default-files-slp.spec
-index b7fb30a..e6ebda2 100755
+index b7fb30a..425a0b6 100755
 --- a/packaging/default-files-slp.spec
 +++ b/packaging/default-files-slp.spec
-@@ -29,7 +29,11 @@ find . -name .gitignore -exec rm -f {} \;
+@@ -29,7 +29,7 @@ find . -name .gitignore -exec rm -f {} \;
  cp -af cache csa data etc lib home mnt opt root sbin sdcard system usr var %{buildroot}
  rm -f %{buildroot}/opt/etc/.debugmode
  
 -
-+rm -fr %{buildroot}/etc/hosts
-+rm -fr %{buildroot}/etc/udev/rules.d/92-rb-dump.rules
-+#rm -fr %{buildroot}/var/log
-+#rm -fr %{buildroot}/var/volatile/log/README
-+rm -fr %{buildroot}//home
++rm -fr %{buildroot}/home
  
  %files
  /cache/DIR_FOR_SPLUSA
-@@ -61,7 +65,6 @@ rm -f %{buildroot}/opt/etc/.debugmode
+@@ -61,7 +61,7 @@ rm -f %{buildroot}/opt/etc/.debugmode
  /etc/sysconfig/network
  /etc/sysconfig/network-scripts/ifcfg-lo
  %exclude /etc/udev/rules.d/92-rb-dump.rules
 -/home
++
  /mnt/mmc
  /mnt/nfs/
  /mnt/ums
-@@ -74,4 +77,5 @@ rm -f %{buildroot}/opt/etc/.debugmode
- /sdcard
- /system/DIR_FOR_SPLUSA
- /usr/bin/press
--/var/log/README
-+/var/log
-+/var/volatile/log/README
index e69de29..25f3509 100644 (file)
@@ -0,0 +1,10 @@
+SRC_URI += "file://fribidi.spec.patch \
+            "
+
+do_patch_append () {
+ echo RLM begining of do_patch
+
+ cat ${WORKDIR}/fribidi.spec.patch | patch -s -p1 --fuzz=2
+ echo RLM end of do_patch
+}
\ No newline at end of file
diff --git a/meta-tizen-ivi/recipes-tizen/fribidi/fribidi/fribidi.spec.patch b/meta-tizen-ivi/recipes-tizen/fribidi/fribidi/fribidi.spec.patch
new file mode 100644 (file)
index 0000000..4d05886
--- /dev/null
@@ -0,0 +1,11 @@
+diff --git a/packaging/fribidi.spec b/packaging/fribidi.spec
+index bbeb06b..5d0617e 100644
+--- a/packaging/fribidi.spec
++++ b/packaging/fribidi.spec
+@@ -73,5 +73,5 @@ cp %{_builddir}/%{buildsubdir}/COPYING %{buildroot}/usr/share/license/%{name}
+ %{_includedir}/fribidi
+ %{_libdir}/libfribidi.so
+ %{_libdir}/pkgconfig/*.pc
+-%{_mandir}/man3/%{name}_*.gz
++#%{_mandir}/man3/%{name}_*.gz
index e69de29..1b338e8 100644 (file)
@@ -0,0 +1,23 @@
+inherit binconfig pkgconfig
+
+EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
+#EXTRA_OECONF += "--with-gpg-error-prefix=${STAGING_DIR_NATIVE}/usr"
+
+EXTRA_AUTORECONF += "-fi"
+
+SRC_URI += "file://add-pkgconfig-support.patch \
+            file://libgcrypt.spec.patch \
+            "
+
+inherit  binconfig  pkgconfig
+
+DEPENDS += "libcap"
+DEPENDS += "libgpg-error-native"
+
+
+do_patch_append () {
+ echo RLM begining of do_patch
+ cat ${WORKDIR}/add-pkgconfig-support.patch | patch -p1 -b --suffix --fuzz=2 
+ cat ${WORKDIR}/libgcrypt.spec.patch | patch -p1 -b --suffix --fuzz=2 
+ echo RLM end of do_patch
+}
\ No newline at end of file
diff --git a/meta-tizen-ivi/recipes-tizen/libgcrypt/libgcrypt-native_git.bb b/meta-tizen-ivi/recipes-tizen/libgcrypt/libgcrypt-native_git.bb
new file mode 100644 (file)
index 0000000..9051a14
--- /dev/null
@@ -0,0 +1,13 @@
+require libgcrypt.inc
+
+PRIORITY = "9"
+
+inherit native
+
+S = "${WORKDIR}/git"
+
+LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+
+SRC_URI += "git://review.tizen.org/external/libgcrypt11;protocol=ssh;tag=tizen_2.0"
+require libgcrypt-native-extraconf.inc
+
index 6be3c77..8b13789 100644 (file)
@@ -1,20 +1 @@
-inherit binconfig pkgconfig
 
-EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
-#EXTRA_OECONF += "--with_gpg_error_prefix=${STAGING_DIR_HOST}/usr"
-
-EXTRA_AUTORECONF += "-fi"
-
-SRC_URI += "file://add-pkgconfig-support.patch"
-
-SRC_URI += "file://obsolete_automake_macros.patch"
-
-SRC_URI += "file://libgcrypt.spec.patch"
-
-do_patch_append () {
- echo RLM begining of do_patch
- cat ${WORKDIR}/add-pkgconfig-support.patch | patch -p1 -b --suffix --fuzz=2 
- cat ${WORKDIR}/obsolete_automake_macros.patch | patch -p1 -b --suffix --fuzz=2 
- cat ${WORKDIR}/libgcrypt.spec.patch | patch -p1 -b --suffix --fuzz=2 
- echo RLM end of do_patch
-}
index 37f8532..bac9aa3 100644 (file)
@@ -1,13 +1,13 @@
 diff --git a/packaging/libgcrypt.spec b/packaging/libgcrypt.spec
-index 4a2f2d6..dca6f1b 100644
+index 46f30fa..64f283c 100644
 --- a/packaging/libgcrypt.spec
 +++ b/packaging/libgcrypt.spec
-@@ -39,7 +39,7 @@ ENABLE_CIPHER="arcfour blowfish cast5 des aes twofish serpent rfc2268 seed camel
- ENABLE_PUBKEY="dsa elgamal rsa ecc"
- ENABLE_DIGEST="crc md4 md5 rmd160 sha1 sha256 sha512 tiger whirlpool"
- #
--autoreconf -fi
-+#autoreconf -fi
- %configure --with-pic \
-               --enable-noexecstack \
-               --disable-static \
+@@ -29,7 +29,7 @@ applications using libgcrypt.
+ %build
+ %reconfigure --disable-static --enable-malloc0returnsnull \
+-           --with-gpg-error-prefix=%{_prefix}
++           --with-gpg-error-prefix=${STAGING_DIR_NATIVE}/usr
+ make %{?jobs:-j%jobs}
+ %install
diff --git a/meta-tizen-ivi/recipes-tizen/libgcrypt/libgcrypt/obsolete_automake_macros.patch b/meta-tizen-ivi/recipes-tizen/libgcrypt/libgcrypt/obsolete_automake_macros.patch
deleted file mode 100644 (file)
index 0dbfded..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Submitted [https://bugs.g10code.com/gnupg/issue1459]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd libgcrypt-1.5.0/configure.ac libgcrypt-1.5.0/configure.ac
---- libgcrypt-1.5.0/configure.ac       2011-06-29 11:53:22.000000000 +0300
-+++ libgcrypt-1.5.0/configure.ac       2013-01-03 07:12:26.854793677 +0200
-@@ -59,7 +59,7 @@
-
- AC_CONFIG_SRCDIR([src/libgcrypt.vers])
- AM_INIT_AUTOMAKE([])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_LIBOBJ_DIR([compat])
- AC_CANONICAL_HOST
index e69de29..8f2241c 100644 (file)
@@ -0,0 +1,8 @@
+SRC_URI += "file://libgpg-error.spec.patch \
+            "
+
+do_patch_append () {
+ echo RLM begining of do_patch
+ cat ${WORKDIR}/libgpg-error.spec.patch | patch -p1 -b --suffix --fuzz=2 
+ echo RLM end of do_patch
+}
\ No newline at end of file
diff --git a/meta-tizen-ivi/recipes-tizen/libgpg-error/libgpg-error-native_git.bb b/meta-tizen-ivi/recipes-tizen/libgpg-error/libgpg-error-native_git.bb
new file mode 100644 (file)
index 0000000..07ab0b4
--- /dev/null
@@ -0,0 +1,13 @@
+require libgpg-error.inc
+
+PRIORITY = "9"
+
+inherit native
+
+S = "${WORKDIR}/git"
+
+LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+
+SRC_URI += "git://review.tizen.org/external/libgpg-error;protocol=ssh;tag=tizen_2.0"
+require libgpg-error-native-extraconf.inc
+
diff --git a/meta-tizen-ivi/recipes-tizen/libgpg-error/libgpg-error/libgpg-error.spec.patch b/meta-tizen-ivi/recipes-tizen/libgpg-error/libgpg-error/libgpg-error.spec.patch
new file mode 100644 (file)
index 0000000..adae9b8
--- /dev/null
@@ -0,0 +1,36 @@
+diff --git a/packaging/libgpg-error.spec b/packaging/libgpg-error.spec
+index 019908b..8145a73 100644
+--- a/packaging/libgpg-error.spec
++++ b/packaging/libgpg-error.spec
+@@ -44,12 +44,12 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/common-lisp
+ %find_lang %{name}
+ # Relocate the shared libraries to /%{_lib}.
+-mkdir -p $RPM_BUILD_ROOT/%{_lib}
++mkdir -p $RPM_BUILD_ROOT%{_buildPrefix}/%{_lib}
+ for shlib in $RPM_BUILD_ROOT/%{_libdir}/*.so* ; do
+       if test -L "$shlib" ; then
+               rm "$shlib"
+       else
+-              mv "$shlib" $RPM_BUILD_ROOT/%{_lib}/
++              mv "$shlib" $RPM_BUILD_ROOT%{_buildPrefix}/%{_lib}/
+       fi
+ done
+ # Figure out where /%{_lib} is relative to %{_libdir}.
+@@ -60,14 +60,14 @@ while ! test -f $RPM_BUILD_ROOT/%{_libdir}/$relroot/root_marker ; do
+ done
+ # Overwrite development symlinks.
+ pushd $RPM_BUILD_ROOT/%{_libdir}
+-for shlib in $relroot/%{_lib}/lib*.so.* ; do
++for shlib in $relroot%{_buildPrefix}/%{_lib}/lib*.so.* ; do
+       shlib=`echo "$shlib" | sed -e 's,//,/,g'`
+       target=`basename "$shlib" | sed -e 's,\.so.*,,g'`.so
+       ln -sf $shlib $target
+ done
+ popd
+ # Add the soname symlink.
+-/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_lib}/
++/sbin/ldconfig -n $RPM_BUILD_ROOT%{_buildPrefix}/%{_lib}/
+ rm -f $RPM_BUILD_ROOT/root_marker
+ %check
index e69de29..7c3ff8a 100644 (file)
@@ -0,0 +1,8 @@
+SRC_URI += "file://lua.spec.patch \
+            "
+
+do_patch_append () {
+ echo RLM begining of do_patch
+ cat ${WORKDIR}/lua.spec.patch | patch -s -p1 --fuzz=2
+}
\ No newline at end of file
diff --git a/meta-tizen-ivi/recipes-tizen/lua/lua/lua.spec.patch b/meta-tizen-ivi/recipes-tizen/lua/lua/lua.spec.patch
new file mode 100644 (file)
index 0000000..d6d3fd8
--- /dev/null
@@ -0,0 +1,23 @@
+diff --git a/packaging/lua.spec b/packaging/lua.spec
+index 96c36c9..006e6ec 100644
+--- a/packaging/lua.spec
++++ b/packaging/lua.spec
+@@ -66,15 +66,15 @@ This package contains development files for %{name}.
+ %build
+ cp %{SOURCE1001} .
+ # fix perms on auto files
+-chmod u+x autogen.sh config.guess config.sub configure depcomp install-sh missing
++#chmod u+x autogen.sh config.guess config.sub configure depcomp install-sh missing
+ %configure  \
+     --without-readline
+ make %{?jobs:-j%jobs}
+-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
++#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
++#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+ # hack so that only /usr/bin/lua gets linked with readline as it is the
+ # only one which needs this and otherwise we get License troubles
+ make %{?_smp_mflags} LIBS="-ldl" luac_LDADD="liblua.la -lm -ldl"
index e69de29..017c2b1 100644 (file)
@@ -0,0 +1,7 @@
+EXTRA_OECONF = "--with-rand-helper=no \
+                --without-zlib-version-check \
+                --with-privsep-path=/var/run/sshd \
+                --sysconfdir=${sysconfdir}/ssh \
+                --with-xauth=/usr/bin/xauth"
+                
+EXTRA_OECONF_append="--without-openssl-header-check"
\ No newline at end of file
index 60f29c0..097ae6d 100644 (file)
@@ -1,8 +1,20 @@
 diff --git a/packaging/pciutils.spec b/packaging/pciutils.spec
-index c153f2f..c8a42bc 100644
+index c153f2f..9bcd0bd 100644
 --- a/packaging/pciutils.spec
 +++ b/packaging/pciutils.spec
-@@ -61,21 +61,21 @@ ln -s libpci.so.3.0.0 $RPM_BUILD_ROOT%{_libdir}/libpci.so.3
+@@ -42,7 +42,10 @@ rm -rf $RPM_BUILD_ROOT
+ make PREFIX=/usr SBINDIR=/usr/bin IDSDIR=/usr/share/misc install DESTDIR=$RPM_BUILD_ROOT
+ # pciutils
+-gunzip $RPM_BUILD_ROOT%{_datadir}/misc/pci.ids.gz
++if [ -e ../image/usr/share/misc/pci.ids.gz ] ;
++then
++   gunzip $RPM_BUILD_ROOT%{_datadir}/misc/pci.ids.gz
++fi
+ # libpci-devel
+ mkdir -p $RPM_BUILD_ROOT%{_includedir}/pci
+@@ -61,21 +64,21 @@ ln -s libpci.so.3.0.0 $RPM_BUILD_ROOT%{_libdir}/libpci.so.3
  
  %post 
  /sbin/ldconfig
index e69de29..43a8128 100644 (file)
@@ -0,0 +1,19 @@
+PV = "20100106"
+PR = "r0"
+
+TARGET_OS_ORIG := "${TARGET_OS}"
+OVERRIDES_append = ":${TARGET_OS_ORIG}"
+
+EXTRA_OECONF_LAST = "--build=${BUILD_SYS} --host=${HOST_SYS}"
+
+do_configure_prepend () {
+        # Disable documentation!
+        echo "all:" > ${S}/doc/Makefile.am
+}
+
+do_configure_prepend () {
+        # Disable documentation!
+        echo "all:" > ${S}/doc/Makefile.am
+}
+
+EXTRA_OECONF += "--disable-selinux"
\ No newline at end of file
index e69de29..3c1d18c 100644 (file)
@@ -0,0 +1,25 @@
+EXTRA_OECONF += "--disable-introspection"
+
+SRC_URI += "file://obsolete_automake_macros.patch \
+            file://pygobject.spec.patch \
+           "
+DEPENDS = "python-pygobject-native"
+#DEPENDS_class-native = "glib-2.0-native"
+           
+EXTRA_OECONF_LAST = "--build=${BUILD_SYS} --host=${HOST_SYS}"         
+           
+export BUILD_SYS
+export HOST_SYS
+export STAGING_INCDIR
+export STAGING_LIBDIR
+
+inherit distutils-base
+
+do_patch_append () {
+ echo RLM begining of do_patch
+ cat ${WORKDIR}/obsolete_automake_macros.patch | patch -s -p1 --fuzz=2
+ cat ${WORKDIR}/pygobject.spec.patch | patch -s -p1 --fuzz=2
+
+ echo RLM end of do_patch
+}
\ No newline at end of file
diff --git a/meta-tizen-ivi/recipes-tizen/pygobject/pygobject/obsolete_automake_macros.patch b/meta-tizen-ivi/recipes-tizen/pygobject/pygobject/obsolete_automake_macros.patch
new file mode 100644 (file)
index 0000000..c259112
--- /dev/null
@@ -0,0 +1,23 @@
+Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691101]
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd pygobject-2.27.91/configure.ac pygobject-2.27.91/configure.ac
+--- pygobject-2.27.91/configure.ac     2011-02-23 22:14:37.000000000 +0200
++++ pygobject-2.27.91/configure.ac     2013-01-03 05:13:44.034949954 +0200
+@@ -35,7 +35,7 @@
+ AC_DEFINE(PYGOBJECT_MICRO_VERSION, pygobject_micro_version, [pygobject micro version])
+ AC_SUBST(PYGOBJECT_MICRO_VERSION, pygobject_micro_version)
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
+ AM_INIT_AUTOMAKE(foreign)
+ AM_MAINTAINER_MODE
+@@ -82,7 +82,6 @@
+ m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AM_PROG_CC_C_O
+
+ # check that we have the minimum version of python necisary to build
diff --git a/meta-tizen-ivi/recipes-tizen/pygobject/pygobject/pygobject.spec.patch b/meta-tizen-ivi/recipes-tizen/pygobject/pygobject/pygobject.spec.patch
new file mode 100644 (file)
index 0000000..91915ae
--- /dev/null
@@ -0,0 +1,15 @@
+diff --git a/packaging/pygobject.spec b/packaging/pygobject.spec
+index 72d2c02..7ecda25 100644
+--- a/packaging/pygobject.spec
++++ b/packaging/pygobject.spec
+@@ -60,8 +60,8 @@ This package contains documentation files for %{name}.
+ find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|'
+ %build
+-PYTHON=%{__python} 
+-export PYTHON
++#PYTHON=%{__python} 
++#export PYTHON
+ %configure --disable-introspection
+ make %{?_smp_mflags}
index ae979b2..8c8272f 100644 (file)
@@ -1,5 +1,5 @@
 diff --git a/packaging/systemd.spec b/packaging/systemd.spec
-index c73b502..67de9cc 100644
+index c73b502..650e1d4 100644
 --- a/packaging/systemd.spec
 +++ b/packaging/systemd.spec
 @@ -47,7 +47,7 @@ autoconf -Wall
@@ -24,3 +24,42 @@ index c73b502..67de9cc 100644
  
  %install
  rm -rf %{buildroot}
+@@ -77,7 +78,37 @@ cp src/sd-daemon.h $RPM_BUILD_ROOT/usr/include
+ %defattr(-,root,root,-)
+ /bin/*
+ /etc/dbus-1/system.d/*
+-/lib/*
++/lib/libsystemd-daemon.so.*
++/lib/libsystemd-login.so.*
++/lib/systemd/system
++/lib/systemd/systemd-ac-power
++/lib/systemd/systemd-binfmt
++/lib/systemd/systemd-cgroups-agent
++/lib/systemd/systemd-detect-virt
++/lib/systemd/systemd-fsck
++/lib/systemd/systemd-hostnamed
++/lib/systemd/systemd-initctl
++/lib/systemd/systemd-kmsg-syslogd
++/lib/systemd/systemd-localed
++/lib/systemd/systemd-logind
++/lib/systemd/systemd-modules-load
++/lib/systemd/systemd-quotacheck
++/lib/systemd/systemd-random-seed
++/lib/systemd/systemd-readahead-collect
++/lib/systemd/systemd-readahead-replay
++/lib/systemd/systemd-remount-api-vfs
++/lib/systemd/systemd-reply-password
++/lib/systemd/systemd-shutdown
++/lib/systemd/systemd-shutdownd
++/lib/systemd/systemd-stdout-syslog-bridge
++/lib/systemd/systemd-sysctl
++/lib/systemd/systemd-timedated
++/lib/systemd/systemd-timestamp
++/lib/systemd/systemd-uaccess
++/lib/systemd/systemd-update-utmp
++/lib/systemd/systemd-user-sessions
++/lib/systemd/systemd-vconsole-setup
++/lib/systemd/system-shutdown
+ /lib/systemd/system-generators/systemd-getty-generator
+ /lib/systemd/system/*
+ /lib/systemd/system/*/*
index 9f83100..61fb843 100644 (file)
@@ -1,14 +1,18 @@
 SRC_URI += "file://sysvinit.spec.patch \
             file://bootlogd.c.patch \
+            file://Makefile.patch \
            "
 
 do_patch_append () {
  echo RLM begining of do_patch
  cat ${WORKDIR}/sysvinit.spec.patch | patch -s -p1 --fuzz=2
  cat ${WORKDIR}/bootlogd.c.patch | patch -s -p1 --fuzz=2
+ cat ${WORKDIR}/Makefile.patch | patch -s -p1 --fuzz=2
  
  sed -e 's,CC  =,CC    ?=,g' -i src/Makefile
  sed -e 's,CC =,CC ?=,g' -i startpar/Makefile
  
+
  echo RLM end of do_patch
 }
\ No newline at end of file
diff --git a/meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit/Makefile.patch b/meta-tizen-ivi/recipes-tizen/sysvinit/sysvinit/Makefile.patch
new file mode 100644 (file)
index 0000000..138caf6
--- /dev/null
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile b/src/Makefile
+index 47df42c..bf91936 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -146,7 +146,7 @@ install:
+               ln -sf halt $(ROOT)/sbin/reboot
+               ln -sf halt $(ROOT)/sbin/poweroff
+               ln -sf init $(ROOT)/sbin/telinit
+-              ln -sf /sbin/killall5 $(ROOT)/bin/pidof
++              ln -sf ../sbin/killall5 $(ROOT)/bin/pidof
+               if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
+                       ln -sf last $(ROOT)/usr/bin/lastb; \
+               fi