From a0214aed2e3a2ec84f1cfd2d49211e0dcc3407eb Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Tue, 30 Apr 2013 10:07:26 +0200 Subject: [PATCH] - first boot commit. --- .../rpm_tizen_macro/lib/tizen/macros | 2 +- .../specfile-initial/busybox.spec | 6 +- .../recipes-Tizen-IVI-base/package-yocto-native | 3 +- Tizen_TZ_package/spec2yocto.py | 19 ++++-- meta-tizen-ivi/conf/layer.conf | 9 ++- .../images/tizen-core-image-minimal.bb | 3 + .../packagegroups/packagegroup-tizen-core.bb | 23 ++++++- .../recipes-tizen/bash/bash-extraconf.inc | 5 +- .../kmod-native_git.bb => bash/bash-native_git.bb} | 6 +- .../recipes-tizen/bash/bash/bash.spec.patch | 77 ++++++++++++++++++++++ .../recipes-tizen/busybox/busybox-rdepends.inc | 6 +- .../recipes-tizen/busybox/busybox-rprovides.inc | 8 +-- .../busybox/busybox/busybox.spec.patch | 23 ++++++- .../recipes-tizen/dbus-python/dbus-python.inc | 2 +- .../recipes-tizen/dbus/dbus-extraconf.inc | 2 +- .../default-files-slp-extraconf.inc | 9 +++ .../default-files-slp/default-files-slp.spec.patch | 32 +++++++++ .../libzypp-bindings/libzypp-bindings.inc | 4 +- .../module-init-tools-extraconf.inc | 8 +++ .../module-init-tools/module-init-tools.spec.patch | 13 ++++ .../net-tools/net-tools-extraconf.inc | 20 ++++++ .../net-tools/net-tools/net-tools-config.h | 75 +++++++++++++++++++++ .../net-tools/net-tools/net-tools-config.make | 36 ++++++++++ .../net-tools/net-tools/net-tools.spec.patch | 23 +++++++ .../pulseaudio/pulseaudio-rdepends.inc | 6 +- .../pulseaudio/pulseaudio-rprovides.inc | 26 ++++---- .../recipes-tizen/pygobject/pygobject.inc | 14 ++-- .../python-cheetah/python-cheetah.inc | 60 ++++++++--------- .../recipes-tizen/python-lxml/python-lxml.inc | 2 +- .../recipes-tizen/python-pycurl/python-pycurl.inc | 4 +- .../recipes-tizen/python-yaml/python-yaml.inc | 2 +- .../texinfo/texinfo/texinfo.spec.patch | 19 +++++- .../recipes-tizen/udev/udev-rdepends.inc | 6 +- .../recipes-tizen/udev/udev-rprovides.inc | 8 +-- .../recipes-tizen/xcb-proto/xcb-proto.inc | 4 +- 35 files changed, 468 insertions(+), 97 deletions(-) rename meta-tizen-ivi/recipes-tizen/{kmod/kmod-native_git.bb => bash/bash-native_git.bb} (54%) create mode 100644 meta-tizen-ivi/recipes-tizen/bash/bash/bash.spec.patch create mode 100644 meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp/default-files-slp.spec.patch create mode 100644 meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools/module-init-tools.spec.patch create mode 100644 meta-tizen-ivi/recipes-tizen/net-tools/net-tools/net-tools-config.h create mode 100644 meta-tizen-ivi/recipes-tizen/net-tools/net-tools/net-tools-config.make create mode 100644 meta-tizen-ivi/recipes-tizen/net-tools/net-tools/net-tools.spec.patch diff --git a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/tizen/macros b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/tizen/macros index dadf552..1deed3d 100644 --- a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/tizen/macros +++ b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/tizen/macros @@ -230,7 +230,7 @@ rm -rf %{?buildroot:%{buildroot}} \ #%find_lang %{_rpmconfigdir}~/ %{buildroot} #RLM TMP remove %find_lang %{_rpmconfigdir}/lib/find-lang.sh \${D} #%find_lang echo "RLM TMP remove %{_rpmconfigdir}/lib/find-lang.sh \${D}" -%find_lang %{_rpmconfigdir}/lib/find-lang.sh \${D} +%find_lang %{_rpmconfigdir}/lib/find-lang.sh \${D}%{_buildPrefix} %find_docs %{_rpmconfigdir}/lib/tizen/find-docs.sh %{buildroot} # diff --git a/Tizen_TZ_package/recipes-Tizen-IVI-Wayland/specfile-initial/busybox.spec b/Tizen_TZ_package/recipes-Tizen-IVI-Wayland/specfile-initial/busybox.spec index f8231f1..5149aa5 100755 --- a/Tizen_TZ_package/recipes-Tizen-IVI-Wayland/specfile-initial/busybox.spec +++ b/Tizen_TZ_package/recipes-Tizen-IVI-Wayland/specfile-initial/busybox.spec @@ -598,10 +598,14 @@ BusyBox symlinks for utilities corresponding to 'zcip' package. %patch999 -p1 %build +CFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables" +export CFLAGS + cp %{SOURCE1001} . +#%configure # create dynamic busybox - the executable is busybox make defconfig -make CC="gcc $RPM_OPT_FLAGS" +make CC="gcc $CFLAGS" cp busybox busybox-dynamic %install diff --git a/Tizen_TZ_package/recipes-Tizen-IVI-base/package-yocto-native b/Tizen_TZ_package/recipes-Tizen-IVI-base/package-yocto-native index ec87af1..cc6d1d4 100644 --- a/Tizen_TZ_package/recipes-Tizen-IVI-base/package-yocto-native +++ b/Tizen_TZ_package/recipes-Tizen-IVI-base/package-yocto-native @@ -60,4 +60,5 @@ pcre cmake intltool e2fsprogs -libffi \ No newline at end of file +libffi +kmod \ No newline at end of file diff --git a/Tizen_TZ_package/spec2yocto.py b/Tizen_TZ_package/spec2yocto.py index 1eadcea..1e333e9 100755 --- a/Tizen_TZ_package/spec2yocto.py +++ b/Tizen_TZ_package/spec2yocto.py @@ -275,7 +275,9 @@ class specParser: # command += " --define='RPM_BUILD_ROOT %%{?buildroot:%%{buildroot}}%%{?buildroot:%%{buildroot}}' " pkgName=os.path.basename(tmp_package_spec_path)[:-5] - + if self.__packagePN is not None and "native" in self.__packagePN: + command += " --define='%find_lang echo no find_lang for package native'" + if pkgName in [ "libcap"]: command += " --define='%optflags %{nil}'" @@ -717,6 +719,8 @@ class specParser: pass elif line.startswith('%ghost '): pass + elif line.startswith('%exclude '): + pass else: res+=line+"\n" @@ -806,10 +810,8 @@ Group: devel def getInstallSection(self): res="" + for line in self.__spectDico[self.__installFlag][1:]: - pathList=re.findall(r"^install -m ... .* (.*)",line) - for path in pathList: - res+="mkdir -p %s\n" % path res+=line+"\n" return res @@ -933,11 +935,12 @@ Group: devel patternPackage = r'^%package\s*(.*)' for k in self.__spectDico.keys(): package= re.findall(patternPackage, k) -# print "self.__baseName",self.__baseName,"k",k,"package",package + #print " \n" + #print "self.__baseName",self.__baseName,"k",k,"package",package if len(package)>0: packageName= self.__cleanPackageName(package[0]) - + res[ packageName ]=[] res[ packageName ].append( [packageName] ) @@ -960,7 +963,7 @@ Group: devel return res def __cleanPackageName(self,packageName): - if "-n" in packageName: + if "-n " in packageName: packageName=packageName.replace("-n","").replace(" ","") else: packageName=self.__baseName+"-"+packageName @@ -1254,9 +1257,11 @@ class metaSpec: paternDevel="(.*)-devel" with open(os.path.join(self.__packageRecipesDir,self.__baseProvidesFile),"w" ) as f: + for kp in self.__providesDico.keys(): if len(self.__providesDico[kp]) > 0: f.write("#PROVIDES by %s \n" % kp) + for p in self.__providesDico[kp]: pkg=p[0] if not len(p)==1: diff --git a/meta-tizen-ivi/conf/layer.conf b/meta-tizen-ivi/conf/layer.conf index d083021..d1f70a7 100644 --- a/meta-tizen-ivi/conf/layer.conf +++ b/meta-tizen-ivi/conf/layer.conf @@ -32,4 +32,11 @@ PREFERRED_PROVIDER_xextproto = "xorg-x11-proto-xext" PREFERRED_PROVIDER_util-linux = "util-linux-ng" PREFERRED_PROVIDER_xproto = "xorg-x11-proto-core" -PREFERRED_PROVIDER_inputproto = "xorg-x11-proto-input" \ No newline at end of file +PREFERRED_PROVIDER_inputproto = "xorg-x11-proto-input" + +INHERIT_DISTRO = "devshell sstate license" + +#131072=128(Mo)*1024 +IMAGE_ROOTFS_SIZE_ext3 = "131072" +#EXTRA_IMAGECMD_ext2 += "-b 1024" +#IMAGE_ROOTFS_EXTRA_SPACE = "6400" \ No newline at end of file diff --git a/meta-tizen-ivi/recipes-image/images/tizen-core-image-minimal.bb b/meta-tizen-ivi/recipes-image/images/tizen-core-image-minimal.bb index 77326af..6f62072 100644 --- a/meta-tizen-ivi/recipes-image/images/tizen-core-image-minimal.bb +++ b/meta-tizen-ivi/recipes-image/images/tizen-core-image-minimal.bb @@ -10,6 +10,9 @@ LICENSE = "MIT" IMAGE_ROOTFS_SIZE = "8192" +#Need to be tested. +#PREFERRED_PROVIDER_virtual/kernel ?= "kernel-x86-ivi" + # remove not needed ipkg informations #ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " diff --git a/meta-tizen-ivi/recipes-packagegroups/packagegroups/packagegroup-tizen-core.bb b/meta-tizen-ivi/recipes-packagegroups/packagegroups/packagegroup-tizen-core.bb index 1d923f2..ce47ba6 100644 --- a/meta-tizen-ivi/recipes-packagegroups/packagegroups/packagegroup-tizen-core.bb +++ b/meta-tizen-ivi/recipes-packagegroups/packagegroups/packagegroup-tizen-core.bb @@ -20,10 +20,31 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" RDEPENDS_${PN} = "" + +#RDEPENDS_${PN} += "busybox" +#RDEPENDS_${PN} += "busybox-symlinks-iputils-ping" +#RDEPENDS_${PN} += "busybox-symlinks-net-tools" + +RDEPENDS_${PN} += "util-linux-ng" +RDEPENDS_${PN} += "libblkid" +RDEPENDS_${PN} += "libuuid" + +#optionnal but usefull +RDEPENDS_${PN} += "openssl" + +RDEPENDS_${PN} += "net-tools" + + +RDEPENDS_${PN} += "ncurses-libs" + +#provide ping +#RDEPENDS_${PN} += "iputils" + RDEPENDS_${PN} += "bash" + RDEPENDS_${PN} += "eglibc" #RDEPENDS_${PN} += "systemd" -RDEPENDS_${PN} += "busybox" +#RDEPENDS_${PN} += "busybox" RDEPENDS_${PN} += "libacl" RDEPENDS_${PN} += "libcap" RDEPENDS_${PN} += "dbus-libs" diff --git a/meta-tizen-ivi/recipes-tizen/bash/bash-extraconf.inc b/meta-tizen-ivi/recipes-tizen/bash/bash-extraconf.inc index 437d54c..5ac2ca6 100644 --- a/meta-tizen-ivi/recipes-tizen/bash/bash-extraconf.inc +++ b/meta-tizen-ivi/recipes-tizen/bash/bash-extraconf.inc @@ -1,8 +1,11 @@ -SRC_URI += "file://build-tests.patch" +SRC_URI += "file://build-tests.patch \ + file://bash.spec.patch \ + " do_patch_append () { echo RLM begining of do_patch cat ${WORKDIR}/build-tests.patch | patch -s -p1 --fuzz=2 + cat ${WORKDIR}/bash.spec.patch | patch -s -p1 --fuzz=2 echo RLM end of do_patch } inherit gettext update-alternatives diff --git a/meta-tizen-ivi/recipes-tizen/kmod/kmod-native_git.bb b/meta-tizen-ivi/recipes-tizen/bash/bash-native_git.bb similarity index 54% rename from meta-tizen-ivi/recipes-tizen/kmod/kmod-native_git.bb rename to meta-tizen-ivi/recipes-tizen/bash/bash-native_git.bb index 38bb3a9..015b4ad 100644 --- a/meta-tizen-ivi/recipes-tizen/kmod/kmod-native_git.bb +++ b/meta-tizen-ivi/recipes-tizen/bash/bash-native_git.bb @@ -1,4 +1,4 @@ -require kmod.inc +require bash.inc PRIORITY = "9" @@ -8,6 +8,6 @@ S = "${WORKDIR}/git" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/toolchains/kmod;protocol=ssh;tag=tizen_2.0" -require kmod-native-extraconf.inc +SRC_URI += "git://review.tizen.org/external/bash;protocol=ssh;tag=tizen_2.0" +require bash-native-extraconf.inc diff --git a/meta-tizen-ivi/recipes-tizen/bash/bash/bash.spec.patch b/meta-tizen-ivi/recipes-tizen/bash/bash/bash.spec.patch new file mode 100644 index 0000000..7fe673b --- /dev/null +++ b/meta-tizen-ivi/recipes-tizen/bash/bash/bash.spec.patch @@ -0,0 +1,77 @@ +diff --git a/packaging/bash.spec b/packaging/bash.spec +index 95467df..547a0d6 100755 +--- a/packaging/bash.spec ++++ b/packaging/bash.spec +@@ -168,39 +168,39 @@ rm -rf $RPM_BUILD_ROOT + # post is in lua so that we can run it without any external deps. Helps + # for bootstrapping a new install. + # Jesse Keating 2009-01-29 (code from Ignacio Vazquez-Abrams) +-%post -p +-bashfound = false; +-shfound = false; +- +-f = io.open("/etc/shells", "r"); +-if f == nil +-then +- f = io.open("/etc/shells", "w"); +-else +- repeat +- t = f:read(); +- if t == "/bin/bash" +- then +- bashfound = true; +- end +- if t == "/bin/sh" +- then +- shfound = true; +- end +- until t == nil; +-end +-f:close() +- +-f = io.open("/etc/shells", "a"); +-if not bashfound +-then +- f:write("/bin/bash\n") +-end +-if not shfound +-then +- f:write("/bin/sh\n") +-end +-f:close() ++# %post -p ++# bashfound = false; ++# shfound = false; ++# ++# f = io.open("/etc/shells", "r"); ++# if f == nil ++# then ++# f = io.open("/etc/shells", "w"); ++# else ++# repeat ++# t = f:read(); ++# if t == "/bin/bash" ++# then ++# bashfound = true; ++# end ++# if t == "/bin/sh" ++# then ++# shfound = true; ++# end ++# until t == nil; ++# end ++# f:close() ++# ++# f = io.open("/etc/shells", "a"); ++# if not bashfound ++# then ++# f:write("/bin/bash\n") ++# end ++# if not shfound ++# then ++# f:write("/bin/sh\n") ++# end ++# f:close() + + %postun + if [ "$1" = 0 ]; then diff --git a/meta-tizen-ivi/recipes-tizen/busybox/busybox-rdepends.inc b/meta-tizen-ivi/recipes-tizen/busybox/busybox-rdepends.inc index 0be35cb..7387b73 100644 --- a/meta-tizen-ivi/recipes-tizen/busybox/busybox-rdepends.inc +++ b/meta-tizen-ivi/recipes-tizen/busybox/busybox-rdepends.inc @@ -110,6 +110,9 @@ RDEPENDS_busybox-symlinks-dc += "busybox" #RDEPENDS of busybox-symlinks-wget RDEPENDS_busybox-symlinks-wget += "busybox" +#RDEPENDS of busybox-symlinks-net-tools +RDEPENDS_busybox-symlinks-net-tools += "busybox" + #RDEPENDS of busybox-symlinks-iputils-ping RDEPENDS_busybox-symlinks-iputils-ping += "busybox" @@ -119,9 +122,6 @@ RDEPENDS_busybox-symlinks-console-tools += "busybox" #RDEPENDS of busybox-symlinks-procps RDEPENDS_busybox-symlinks-procps += "busybox" -#RDEPENDS of symlinkset-tools -RDEPENDS_symlinkset-tools += "busybox" - #RDEPENDS of busybox-symlinks-realpath RDEPENDS_busybox-symlinks-realpath += "busybox" diff --git a/meta-tizen-ivi/recipes-tizen/busybox/busybox-rprovides.inc b/meta-tizen-ivi/recipes-tizen/busybox/busybox-rprovides.inc index 530e0a4..e6ea980 100644 --- a/meta-tizen-ivi/recipes-tizen/busybox/busybox-rprovides.inc +++ b/meta-tizen-ivi/recipes-tizen/busybox/busybox-rprovides.inc @@ -158,6 +158,10 @@ RPROVIDES_busybox-symlinks-wget += "busybox-symlinks-wget" PROVIDES += "busybox-docs" RPROVIDES_busybox-docs += "busybox-docs" +#PROVIDES by busybox-symlinks-net-tools +PROVIDES += "busybox-symlinks-net-tools" +RPROVIDES_busybox-symlinks-net-tools += "busybox-symlinks-net-tools" + #PROVIDES by busybox-symlinks-iputils-ping PROVIDES += "busybox-symlinks-iputils-ping" RPROVIDES_busybox-symlinks-iputils-ping += "busybox-symlinks-iputils-ping" @@ -170,10 +174,6 @@ RPROVIDES_busybox-symlinks-console-tools += "busybox-symlinks-console-tools" PROVIDES += "busybox-symlinks-procps" RPROVIDES_busybox-symlinks-procps += "busybox-symlinks-procps" -#PROVIDES by symlinkset-tools -PROVIDES += "symlinkset-tools" -RPROVIDES_symlinkset-tools += "symlinkset-tools" - #PROVIDES by busybox-symlinks-realpath PROVIDES += "busybox-symlinks-realpath" RPROVIDES_busybox-symlinks-realpath += "busybox-symlinks-realpath" diff --git a/meta-tizen-ivi/recipes-tizen/busybox/busybox/busybox.spec.patch b/meta-tizen-ivi/recipes-tizen/busybox/busybox/busybox.spec.patch index da2abb5..39cff90 100644 --- a/meta-tizen-ivi/recipes-tizen/busybox/busybox/busybox.spec.patch +++ b/meta-tizen-ivi/recipes-tizen/busybox/busybox/busybox.spec.patch @@ -1,5 +1,5 @@ diff --git a/packaging/busybox.spec b/packaging/busybox.spec -index f8231f1..5149aa5 100755 +index f8231f1..c06d0e4 100755 --- a/packaging/busybox.spec +++ b/packaging/busybox.spec @@ -598,10 +598,14 @@ BusyBox symlinks for utilities corresponding to 'zcip' package. @@ -18,3 +18,24 @@ index f8231f1..5149aa5 100755 cp busybox busybox-dynamic %install +@@ -946,13 +950,13 @@ done + %exclude /usr/sbin/ubidetach + + %files symlinks-net-tools +-%exclude /usr/sbin/arp +-%exclude /sbin/ifconfig +-%exclude /sbin/iptunnel +-%exclude /sbin/nameif +-%exclude /bin/netstat +-%exclude /sbin/route +-%exclude /sbin/slattach ++/usr/sbin/arp ++/sbin/ifconfig ++/sbin/iptunnel ++/sbin/nameif ++/bin/netstat ++/sbin/route ++/sbin/slattach + + %files symlinks-openbsd-inetd + %manifest %{name}.manifest diff --git a/meta-tizen-ivi/recipes-tizen/dbus-python/dbus-python.inc b/meta-tizen-ivi/recipes-tizen/dbus-python/dbus-python.inc index 2b30100..2ed6c99 100644 --- a/meta-tizen-ivi/recipes-tizen/dbus-python/dbus-python.inc +++ b/meta-tizen-ivi/recipes-tizen/dbus-python/dbus-python.inc @@ -19,7 +19,7 @@ dbus-python_files = "" dbus-python_files += "COPYING README" dbus-python_files += "/usr/lib/python2.7/site-packages/dbus" dbus-python_files += "/usr/lib/python2.7/site-packages/dbus/mainloop" -dbus-python_files += "/usr/lib64/python2.7/site-packages/*.so" +dbus-python_files += "/usr/lib/python2.7/site-packages/*.so" dbus-python_files += "/usr/lib/python2.7/site-packages/*.py*" dbus-python_files += "/usr/lib/python2.7/site-packages/dbus/*.py*" dbus-python_files += "/usr/lib/python2.7/site-packages/dbus/mainloop/*.py*" diff --git a/meta-tizen-ivi/recipes-tizen/dbus/dbus-extraconf.inc b/meta-tizen-ivi/recipes-tizen/dbus/dbus-extraconf.inc index 1180a93..581148a 100644 --- a/meta-tizen-ivi/recipes-tizen/dbus/dbus-extraconf.inc +++ b/meta-tizen-ivi/recipes-tizen/dbus/dbus-extraconf.inc @@ -5,4 +5,4 @@ do_patch_append () { cat ${WORKDIR}/dbus.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/default-files-slp/default-files-slp-extraconf.inc b/meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp-extraconf.inc index e69de29..b857b24 100644 --- a/meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp-extraconf.inc +++ b/meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp-extraconf.inc @@ -0,0 +1,9 @@ + +SRC_URI += "file://default-files-slp.spec.patch " + +do_patch_append () { + echo RLM begining of do_patch + cat ${WORKDIR}/default-files-slp.spec.patch | patch -s -p1 --fuzz=2 + + echo RLM end of do_patch +} diff --git a/meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp/default-files-slp.spec.patch b/meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp/default-files-slp.spec.patch new file mode 100644 index 0000000..b5f1938 --- /dev/null +++ b/meta-tizen-ivi/recipes-tizen/default-files-slp/default-files-slp/default-files-slp.spec.patch @@ -0,0 +1,32 @@ +diff --git a/packaging/default-files-slp.spec b/packaging/default-files-slp.spec +index b7fb30a..e6ebda2 100755 +--- a/packaging/default-files-slp.spec ++++ b/packaging/default-files-slp.spec +@@ -29,7 +29,11 @@ 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 + + %files + /cache/DIR_FOR_SPLUSA +@@ -61,7 +65,6 @@ 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 diff --git a/meta-tizen-ivi/recipes-tizen/libzypp-bindings/libzypp-bindings.inc b/meta-tizen-ivi/recipes-tizen/libzypp-bindings/libzypp-bindings.inc index 1a53674..842d926 100644 --- a/meta-tizen-ivi/recipes-tizen/libzypp-bindings/libzypp-bindings.inc +++ b/meta-tizen-ivi/recipes-tizen/libzypp-bindings/libzypp-bindings.inc @@ -9,8 +9,8 @@ PACKAGES = "" PACKAGES += "python-zypp" python-zypp_files = "" -python-zypp_files += "/usr/lib64/python2.7/site-packages/_zypp.so" -python-zypp_files += "/usr/lib64/python2.7/site-packages/zypp.py*" +python-zypp_files += "/usr/lib/python2.7/site-packages/_zypp.so" +python-zypp_files += "/usr/lib/python2.7/site-packages/zypp.py*" FILES_python-zypp = "${python-zypp_files}" diff --git a/meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools-extraconf.inc b/meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools-extraconf.inc index e69de29..3d97847 100644 --- a/meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools-extraconf.inc +++ b/meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools-extraconf.inc @@ -0,0 +1,8 @@ +SRC_URI += "file://module-init-tools.spec.patch" + +do_patch_append () { + echo RLM begining of do_patch + cat ${WORKDIR}/module-init-tools.spec.patch | patch -s -p1 --fuzz=2 + + echo RLM end of do_patch +} diff --git a/meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools/module-init-tools.spec.patch b/meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools/module-init-tools.spec.patch new file mode 100644 index 0000000..0019079 --- /dev/null +++ b/meta-tizen-ivi/recipes-tizen/module-init-tools/module-init-tools/module-init-tools.spec.patch @@ -0,0 +1,13 @@ +diff --git a/packaging/module-init-tools.spec b/packaging/module-init-tools.spec +index 4595ba3..4b83dbb 100644 +--- a/packaging/module-init-tools.spec ++++ b/packaging/module-init-tools.spec +@@ -1,7 +1,7 @@ + #sbs-git:slp/pkgs/m/module-init-tools module-init-tools 3.12~pre2 be160e833cedd1ceb8f0543339d7bb1850cbd75a + + Name: module-init-tools +-Version: 3.12~pre2 ++Version: 3.12.pre2 + Release: 2 + License: GPLv2+ + Summary: Kernel module management utilities diff --git a/meta-tizen-ivi/recipes-tizen/net-tools/net-tools-extraconf.inc b/meta-tizen-ivi/recipes-tizen/net-tools/net-tools-extraconf.inc index e69de29..a11a292 100644 --- a/meta-tizen-ivi/recipes-tizen/net-tools/net-tools-extraconf.inc +++ b/meta-tizen-ivi/recipes-tizen/net-tools/net-tools-extraconf.inc @@ -0,0 +1,20 @@ +SRC_URI = "file://net-tools-config.h \ + file://net-tools-config.make \ + file://net-tools.spec.patch" + + + +inherit gettext +PARALLEL_MAKE = "" + +do_patch_append () { + echo RLM begining of do_patch + + cat ${WORKDIR}/net-tools.spec.patch | patch -s -p1 --fuzz=2 + + # net-tools has its own config mechanism requiring "make config" + # we pre-generate desired options and copy to source directory instead + cp ${WORKDIR}/net-tools-config.h ${S}/config.h + cp ${WORKDIR}/net-tools-config.make ${S}/config.make + echo RLM end of do_patch +} \ No newline at end of file diff --git a/meta-tizen-ivi/recipes-tizen/net-tools/net-tools/net-tools-config.h b/meta-tizen-ivi/recipes-tizen/net-tools/net-tools/net-tools-config.h new file mode 100644 index 0000000..6d39c2a --- /dev/null +++ b/meta-tizen-ivi/recipes-tizen/net-tools/net-tools/net-tools-config.h @@ -0,0 +1,75 @@ +/* +* config.h Automatically generated configuration includefile +* +* NET-TOOLS A collection of programs that form the base set of the +* NET-3 Networking Distribution for the LINUX operating +* system. +* +* DO NOT EDIT DIRECTLY +* +*/ + +/* + * + * Internationalization + * + * The net-tools package has currently been translated to French, + * German and Brazilian Portugese. Other translations are, of + * course, welcome. Answer `n' here if you have no support for + * internationalization on your system. + * + */ +#define I18N 1 + +/* + * + * Protocol Families. + * + */ +#define HAVE_AFUNIX 1 +#define HAVE_AFINET 1 +#define HAVE_AFINET6 1 +#define HAVE_AFIPX 0 +#define HAVE_AFATALK 0 +#define HAVE_AFAX25 0 +#define HAVE_AFNETROM 1 +#define HAVE_AFROSE 0 +#define HAVE_AFX25 0 +#define HAVE_AFECONET 0 +#define HAVE_AFDECnet 0 +#define HAVE_AFASH 0 + +/* + * + * Device Hardware types. + * + */ +#define HAVE_HWETHER 1 +#define HAVE_HWARC 1 +#define HAVE_HWSLIP 1 +#define HAVE_HWPPP 1 +#define HAVE_HWTUNNEL 1 +#define HAVE_HWSTRIP 0 +#define HAVE_HWTR 0 +#define HAVE_HWAX25 0 +#define HAVE_HWROSE 0 +#define HAVE_HWNETROM 1 +#define HAVE_HWX25 0 +#define HAVE_HWFR 1 +#define HAVE_HWSIT 0 +#define HAVE_HWFDDI 0 +#define HAVE_HWHIPPI 0 +#define HAVE_HWASH 0 +#define HAVE_HWHDLCLAPB 0 +#define HAVE_HWIRDA 1 +#define HAVE_HWEC 0 +#define HAVE_HWIB 0 + +/* + * + * Other Features. + * + */ +#define HAVE_FW_MASQUERADE 1 +#define HAVE_IP_TOOLS 1 +#define HAVE_MII 1 diff --git a/meta-tizen-ivi/recipes-tizen/net-tools/net-tools/net-tools-config.make b/meta-tizen-ivi/recipes-tizen/net-tools/net-tools/net-tools-config.make new file mode 100644 index 0000000..ec516f2 --- /dev/null +++ b/meta-tizen-ivi/recipes-tizen/net-tools/net-tools/net-tools-config.make @@ -0,0 +1,36 @@ +I18N=1 +HAVE_AFUNIX=1 +HAVE_AFINET=1 +HAVE_AFINET6=1 +# HAVE_AFIPX=0 +# HAVE_AFATALK=0 +# HAVE_AFAX25=0 +HAVE_AFNETROM=1 +# HAVE_AFROSE=0 +# HAVE_AFX25=0 +# HAVE_AFECONET=0 +# HAVE_AFDECnet=0 +# HAVE_AFASH=0 +HAVE_HWETHER=1 +HAVE_HWARC=1 +HAVE_HWSLIP=1 +HAVE_HWPPP=1 +HAVE_HWTUNNEL=1 +HAVE_HWSTRIP=1 +HAVE_HWTR=1 +# HAVE_HWAX25=0 +# HAVE_HWROSE=0 +HAVE_HWNETROM=1 +# HAVE_HWX25=0 +HAVE_HWFR=1 +# HAVE_HWSIT=0 +# HAVE_HWFDDI=0 +# HAVE_HWHIPPI=0 +# HAVE_HWASH=0 +# HAVE_HWHDLCLAPB=0 +HAVE_HWIRDA=1 +# HAVE_HWEC=0 +# HAVE_HWIB=0 +HAVE_FW_MASQUERADE=1 +HAVE_IP_TOOLS=1 +HAVE_MII=1 diff --git a/meta-tizen-ivi/recipes-tizen/net-tools/net-tools/net-tools.spec.patch b/meta-tizen-ivi/recipes-tizen/net-tools/net-tools/net-tools.spec.patch new file mode 100644 index 0000000..5b62bd0 --- /dev/null +++ b/meta-tizen-ivi/recipes-tizen/net-tools/net-tools/net-tools.spec.patch @@ -0,0 +1,23 @@ +diff --git a/packaging/net-tools.spec b/packaging/net-tools.spec +index 9d77d07..0a09a6e 100755 +--- a/packaging/net-tools.spec ++++ b/packaging/net-tools.spec +@@ -186,11 +186,16 @@ cp %SOURCE7 ./man/en_US + + + %build ++export COPTS="$CFLAGS" ++export LOPTS="$LDFLAGS" ++unset CFLAGS ++unset LDFLAGS ++ + cp %{SOURCE1001} . + sed -i "s/HAVE_SELINUX=1/HAVE_SELINUX=0/g" ./config.make + make +-gcc $RPM_OPT_FLAGS -o ether-wake ether-wake.c +-gcc $RPM_OPT_FLAGS -o mii-diag mii-diag.c ++%__cc $RPM_OPT_FLAGS -o ether-wake ether-wake.c ++%__cc $RPM_OPT_FLAGS -o mii-diag mii-diag.c + + %install + diff --git a/meta-tizen-ivi/recipes-tizen/pulseaudio/pulseaudio-rdepends.inc b/meta-tizen-ivi/recipes-tizen/pulseaudio/pulseaudio-rdepends.inc index 9430238..4513e1f 100644 --- a/meta-tizen-ivi/recipes-tizen/pulseaudio/pulseaudio-rdepends.inc +++ b/meta-tizen-ivi/recipes-tizen/pulseaudio/pulseaudio-rdepends.inc @@ -9,9 +9,6 @@ RDEPENDS_pulseaudio += "udev" #RDEPENDS of pulseaudio-utils RDEPENDS_pulseaudio-utils += "pulseaudio" -#RDEPENDS of pulseaudio-module-bluetooth -RDEPENDS_pulseaudio-module-bluetooth += "pulseaudio" - #RDEPENDS of pulseaudio-libs-devel RDEPENDS_pulseaudio-libs-devel += "pulseaudio" @@ -21,6 +18,9 @@ RDEPENDS_pulseaudio-module-devel += "pulseaudio-libs-dev" #RDEPENDS of pulseaudio-localization RDEPENDS_pulseaudio-localization += "pulseaudio" +#RDEPENDS of pulseaudio-module-bluetooth +RDEPENDS_pulseaudio-module-bluetooth += "pulseaudio" + #RDEPENDS of pulseaudio-libs RDEPENDS_pulseaudio-libs += "pulseaudio" diff --git a/meta-tizen-ivi/recipes-tizen/pulseaudio/pulseaudio-rprovides.inc b/meta-tizen-ivi/recipes-tizen/pulseaudio/pulseaudio-rprovides.inc index 278e8f1..9087e2e 100644 --- a/meta-tizen-ivi/recipes-tizen/pulseaudio/pulseaudio-rprovides.inc +++ b/meta-tizen-ivi/recipes-tizen/pulseaudio/pulseaudio-rprovides.inc @@ -6,17 +6,17 @@ RPROVIDES_pulseaudio-vala-bindings += "pulseaudio-vala-bindings" PROVIDES += "pulseaudio-module-dbus-protocol" RPROVIDES_pulseaudio-module-dbus-protocol += "pulseaudio-module-dbus-protocol" -#PROVIDES by pulseaudio-module-bluetooth -PROVIDES += "pulseaudio-module-bluetooth" -RPROVIDES_pulseaudio-module-bluetooth += "pulseaudio-module-bluetooth" +#PROVIDES by pulseaudio-module-null-source +PROVIDES += "pulseaudio-module-null-source" +RPROVIDES_pulseaudio-module-null-source += "pulseaudio-module-null-source" #PROVIDES by pulseaudio-module-combine-sink PROVIDES += "pulseaudio-module-combine-sink" RPROVIDES_pulseaudio-module-combine-sink += "pulseaudio-module-combine-sink" -#PROVIDES by moduleull-source -PROVIDES += "moduleull-source" -RPROVIDES_moduleull-source += "moduleull-source" +#PROVIDES by pulseaudio-utils +PROVIDES += "pulseaudio-utils" +RPROVIDES_pulseaudio-utils += "pulseaudio-utils" #PROVIDES by pulseaudio-module-augment-properties PROVIDES += "pulseaudio-module-augment-properties" @@ -26,9 +26,9 @@ RPROVIDES_pulseaudio-module-augment-properties += "pulseaudio-module-augment-pro PROVIDES += "pulseaudio-config" RPROVIDES_pulseaudio-config += "pulseaudio-config" -#PROVIDES by pulseaudio-utils -PROVIDES += "pulseaudio-utils" -RPROVIDES_pulseaudio-utils += "pulseaudio-utils" +#PROVIDES by pulseaudio-module-switch-on-connect +PROVIDES += "pulseaudio-module-switch-on-connect" +RPROVIDES_pulseaudio-module-switch-on-connect += "pulseaudio-module-switch-on-connect" #PROVIDES by pulseaudio-libs-devel PROVIDES += "pulseaudio-libs-devel" @@ -60,14 +60,14 @@ RPROVIDES_pulseaudio-module-filter += "pulseaudio-module-filter" PROVIDES += "pulseaudio-localization" RPROVIDES_pulseaudio-localization += "pulseaudio-localization" +#PROVIDES by pulseaudio-module-bluetooth +PROVIDES += "pulseaudio-module-bluetooth" +RPROVIDES_pulseaudio-module-bluetooth += "pulseaudio-module-bluetooth" + #PROVIDES by pulseaudio-module-raop PROVIDES += "pulseaudio-module-raop" RPROVIDES_pulseaudio-module-raop += "pulseaudio-module-raop" -#PROVIDES by pulseaudio-module-switch-on-connect -PROVIDES += "pulseaudio-module-switch-on-connect" -RPROVIDES_pulseaudio-module-switch-on-connect += "pulseaudio-module-switch-on-connect" - #PROVIDES by pulseaudio-libs PROVIDES += "pulseaudio-libs" RPROVIDES_pulseaudio-libs += "pulseaudio-libs" diff --git a/meta-tizen-ivi/recipes-tizen/pygobject/pygobject.inc b/meta-tizen-ivi/recipes-tizen/pygobject/pygobject.inc index b978d27..0decb40 100644 --- a/meta-tizen-ivi/recipes-tizen/pygobject/pygobject.inc +++ b/meta-tizen-ivi/recipes-tizen/pygobject/pygobject.inc @@ -20,13 +20,13 @@ pygobject_files = "" pygobject_files += "AUTHORS NEWS README" pygobject_files += "examples" pygobject_files += "/usr/lib/libpyglib-2.0-python.so*" -pygobject_files += "/usr/lib64/python2.7/site-packages/gtk-2.0" -pygobject_files += "/usr/lib64/python2.7/site-packages/gobject" -pygobject_files += "/usr/lib64/python2.7/site-packages/glib" -pygobject_files += "/usr/lib64/python2.7/site-packages/gtk-2.0/*" -pygobject_files += "/usr/lib64/python2.7/site-packages/pygtk.*" -pygobject_files += "/usr/lib64/python2.7/site-packages/gobject/*" -pygobject_files += "/usr/lib64/python2.7/site-packages/glib/*" +pygobject_files += "/usr/lib/python2.7/site-packages/gtk-2.0" +pygobject_files += "/usr/lib/python2.7/site-packages/gobject" +pygobject_files += "/usr/lib/python2.7/site-packages/glib" +pygobject_files += "/usr/lib/python2.7/site-packages/gtk-2.0/*" +pygobject_files += "/usr/lib/python2.7/site-packages/pygtk.*" +pygobject_files += "/usr/lib/python2.7/site-packages/gobject/*" +pygobject_files += "/usr/lib/python2.7/site-packages/glib/*" pygobject-doc_files = "" pygobject-doc_files += "/usr/share/gtk-doc/html/pygobject" diff --git a/meta-tizen-ivi/recipes-tizen/python-cheetah/python-cheetah.inc b/meta-tizen-ivi/recipes-tizen/python-cheetah/python-cheetah.inc index e2b8ceb..20547d7 100644 --- a/meta-tizen-ivi/recipes-tizen/python-cheetah/python-cheetah.inc +++ b/meta-tizen-ivi/recipes-tizen/python-cheetah/python-cheetah.inc @@ -10,36 +10,36 @@ PACKAGES += "python-cheetah" python-cheetah_files = "" python-cheetah_files += "python-cheetah.manifest" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/*.py" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/*.pyc" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/_namemapper.so" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/*.pyo" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Macros" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Macros/*.py" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Macros/*.pyc" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Macros/*.pyo" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Templates" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Templates/*.py" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Templates/*.pyc" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Templates/*.tmpl" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Templates/*.pyo" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Tests" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Tests/*.py" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Tests/*.pyc" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Tests/*.pyo" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Tools" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Tools/*.py" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Tools/*.pyc" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Tools/*.txt" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Tools/*.pyo" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Utils" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Utils/*.py" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Utils/*.pyc" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah/Utils/*.pyo" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah-2.4.4-*.egg-info" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah-2.4.4-*.egg-info/PKG-INFO" -python-cheetah_files += "/usr/lib64/python2.7/site-packages/Cheetah-2.4.4-*.egg-info/*.txt" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/*.py" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/*.pyc" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/_namemapper.so" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/*.pyo" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Macros" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Macros/*.py" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Macros/*.pyc" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Macros/*.pyo" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Templates" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Templates/*.py" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Templates/*.pyc" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Templates/*.tmpl" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Templates/*.pyo" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Tests" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Tests/*.py" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Tests/*.pyc" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Tests/*.pyo" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Tools" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Tools/*.py" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Tools/*.pyc" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Tools/*.txt" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Tools/*.pyo" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Utils" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Utils/*.py" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Utils/*.pyc" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah/Utils/*.pyo" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah-2.4.4-*.egg-info" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah-2.4.4-*.egg-info/PKG-INFO" +python-cheetah_files += "/usr/lib/python2.7/site-packages/Cheetah-2.4.4-*.egg-info/*.txt" python-cheetah_files += "CHANGES LICENSE TODO" python-cheetah_files += "/usr/bin/cheetah" python-cheetah_files += "/usr/bin/cheetah-compile" diff --git a/meta-tizen-ivi/recipes-tizen/python-lxml/python-lxml.inc b/meta-tizen-ivi/recipes-tizen/python-lxml/python-lxml.inc index cd1934e..10c6a4f 100644 --- a/meta-tizen-ivi/recipes-tizen/python-lxml/python-lxml.inc +++ b/meta-tizen-ivi/recipes-tizen/python-lxml/python-lxml.inc @@ -11,7 +11,7 @@ PACKAGES += "python-lxml" python-lxml_files = "" python-lxml_files += "python-lxml.manifest" python-lxml_files += "README.txt LICENSES.txt PKG-INFO CREDITS.txt CHANGES.txt doc/" -python-lxml_files += "/usr/lib64/python2.7/site-packages/*" +python-lxml_files += "/usr/lib/python2.7/site-packages/*" FILES_${PN} = "${python-lxml_files}" diff --git a/meta-tizen-ivi/recipes-tizen/python-pycurl/python-pycurl.inc b/meta-tizen-ivi/recipes-tizen/python-pycurl/python-pycurl.inc index 32d6fee..05cf97d 100644 --- a/meta-tizen-ivi/recipes-tizen/python-pycurl/python-pycurl.inc +++ b/meta-tizen-ivi/recipes-tizen/python-pycurl/python-pycurl.inc @@ -11,8 +11,8 @@ PACKAGES += "python-pycurl" python-pycurl_files = "" python-pycurl_files += "python-pycurl.manifest" python-pycurl_files += "/usr/share/doc/pycurl/*" -python-pycurl_files += "/usr/lib64/python2.7/site-packages/curl/*" -python-pycurl_files += "/usr/lib64/python2.7/site-packages/pycurl*" +python-pycurl_files += "/usr/lib/python2.7/site-packages/curl/*" +python-pycurl_files += "/usr/lib/python2.7/site-packages/pycurl*" FILES_${PN} = "${python-pycurl_files}" diff --git a/meta-tizen-ivi/recipes-tizen/python-yaml/python-yaml.inc b/meta-tizen-ivi/recipes-tizen/python-yaml/python-yaml.inc index bc8dd4b..0682b97 100644 --- a/meta-tizen-ivi/recipes-tizen/python-yaml/python-yaml.inc +++ b/meta-tizen-ivi/recipes-tizen/python-yaml/python-yaml.inc @@ -11,7 +11,7 @@ PACKAGES += "python-yaml" python-yaml_files = "" python-yaml_files += "python-yaml.manifest" python-yaml_files += "PKG-INFO README LICENSE examples" -python-yaml_files += "/usr/lib64/python2.7/site-packages/*" +python-yaml_files += "/usr/lib/python2.7/site-packages/*" FILES_${PN} = "${python-yaml_files}" diff --git a/meta-tizen-ivi/recipes-tizen/texinfo/texinfo/texinfo.spec.patch b/meta-tizen-ivi/recipes-tizen/texinfo/texinfo/texinfo.spec.patch index 2fc063f..b2e6406 100644 --- a/meta-tizen-ivi/recipes-tizen/texinfo/texinfo/texinfo.spec.patch +++ b/meta-tizen-ivi/recipes-tizen/texinfo/texinfo/texinfo.spec.patch @@ -1,8 +1,8 @@ diff --git a/packaging/texinfo.spec b/packaging/texinfo.spec -index d3bda13..dcd26a2 100644 +index d3bda13..87b777e 100644 --- a/packaging/texinfo.spec +++ b/packaging/texinfo.spec -@@ -63,7 +63,7 @@ for printing using TeX. +@@ -63,10 +63,10 @@ for printing using TeX. %build %configure @@ -10,4 +10,17 @@ index d3bda13..dcd26a2 100644 +%__make %{?_smp_mflags} %install - mkdir -p %{buildroot}/sbin +-mkdir -p %{buildroot}/sbin ++mkdir -p %{buildroot}%{_buildPrefix}/sbin + + make install DESTDIR=%{buildroot} INSTALL='install -p' + +@@ -75,7 +75,7 @@ install -p -m644 doc/texinfo.tex doc/txi-??.tex %{buildroot}%{tex_texinfo} + + install -p -m644 %{SOURCE2} %{buildroot}%{_mandir}/man1/texi2pdf.1 + install -p -m644 %{SOURCE1} %{buildroot}%{_infodir}/dir +-mv %{buildroot}%{_bindir}/install-info %{buildroot}/sbin ++mv %{buildroot}%{_bindir}/install-info %{buildroot}%{_buildPrefix}/sbin + + # Convert ChangeLog to UTF-8 + /usr/bin/iconv -f iso-8859-2 -t utf-8 < ChangeLog > ChangeLog_utf8 diff --git a/meta-tizen-ivi/recipes-tizen/udev/udev-rdepends.inc b/meta-tizen-ivi/recipes-tizen/udev/udev-rdepends.inc index 182b9fc..913e0a8 100644 --- a/meta-tizen-ivi/recipes-tizen/udev/udev-rdepends.inc +++ b/meta-tizen-ivi/recipes-tizen/udev/udev-rdepends.inc @@ -2,6 +2,9 @@ RDEPENDS = "" #RDEPENDS of libudev RDEPENDS_libudev += "udev" +#RDEPENDS of udev-rules-nondefault +RDEPENDS_udev-rules-nondefault += "udev" + #RDEPENDS of libgudev1-devel RDEPENDS_libgudev1-devel += "libgudev1" RDEPENDS_libgudev1-devel += "libudev-dev" @@ -16,7 +19,4 @@ RDEPENDS_libudev-devel += "udev" #RDEPENDS of libgudev1 RDEPENDS_libgudev1 += "libudev" -#RDEPENDS of rulesondefault -RDEPENDS_rulesondefault += "udev" - diff --git a/meta-tizen-ivi/recipes-tizen/udev/udev-rprovides.inc b/meta-tizen-ivi/recipes-tizen/udev/udev-rprovides.inc index f1cb72d..741937f 100644 --- a/meta-tizen-ivi/recipes-tizen/udev/udev-rprovides.inc +++ b/meta-tizen-ivi/recipes-tizen/udev/udev-rprovides.inc @@ -2,6 +2,10 @@ PROVIDES += "libudev" RPROVIDES_libudev += "libudev" +#PROVIDES by udev-rules-nondefault +PROVIDES += "udev-rules-nondefault" +RPROVIDES_udev-rules-nondefault += "udev-rules-nondefault" + #PROVIDES by libgudev1-devel PROVIDES += "libgudev1-devel" RPROVIDES_libgudev1-devel += "libgudev1-devel" @@ -27,7 +31,3 @@ RPROVIDES_libudev-devel += "libudev-dev" PROVIDES += "udev" RPROVIDES_udev += "udev" -#PROVIDES by rulesondefault -PROVIDES += "rulesondefault" -RPROVIDES_rulesondefault += "rulesondefault" - diff --git a/meta-tizen-ivi/recipes-tizen/xcb-proto/xcb-proto.inc b/meta-tizen-ivi/recipes-tizen/xcb-proto/xcb-proto.inc index 4aae9b1..7bf66af 100644 --- a/meta-tizen-ivi/recipes-tizen/xcb-proto/xcb-proto.inc +++ b/meta-tizen-ivi/recipes-tizen/xcb-proto/xcb-proto.inc @@ -15,8 +15,8 @@ xcb-proto_files += "/usr/lib/pkgconfig/xcb-proto.pc" xcb-proto_files += "/usr/share/xcb/" xcb-proto_files += "/usr/share/xcb/*.xsd" xcb-proto_files += "/usr/share/xcb/*.xml" -xcb-proto_files += "/usr/lib64/python2.7/site-packages/xcbgen/" -xcb-proto_files += "/usr/lib64/python2.7/site-packages/xcbgen/*.py*" +xcb-proto_files += "/usr/lib/python2.7/site-packages/xcbgen/" +xcb-proto_files += "/usr/lib/python2.7/site-packages/xcbgen/*.py*" FILES_${PN} = "${xcb-proto_files}" -- 2.7.4