From cc4604926001f3bcc7a9f8a709b3ffa6b8d207f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?K=C3=A9vin=20THIERRY?= Date: Mon, 5 May 2014 13:27:46 +0200 Subject: [PATCH] Add weston MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin THIERRY --- .../recipes-tizen/lua/lua-native_git.bb | 12 - meta-tizen-generic/recipes-tizen/lua/lua.inc | 30 ++- meta-tizen-generic/recipes-tizen/lua/lua_git.bb | 2 + .../python-rpm/python-rpm-native_git.bb | 12 - .../recipes-tizen/python-rpm/python-rpm.inc | 62 +++--- .../recipes-tizen/python-rpm/python-rpm_git.bb | 2 + meta-tizen-generic/recipes-tizen/rpm/rpm.inc | 241 ++++++++++----------- meta-tizen-generic/recipes-tizen/rpm/rpm_git.bb | 3 +- .../recipes-tizen/smack/smack-native_git.bb | 12 - meta-tizen-generic/recipes-tizen/smack/smack.inc | 25 ++- .../recipes-tizen/smack/smack_git.bb | 2 + .../recipes-tizen/uthash/uthash-native_git.bb | 12 - meta-tizen-generic/recipes-tizen/uthash/uthash.inc | 19 +- .../recipes-tizen/uthash/uthash_git.bb | 2 + proto-meta-Tizen_generic/.spec2yoctorc | 4 +- 15 files changed, 200 insertions(+), 240 deletions(-) delete mode 100644 meta-tizen-generic/recipes-tizen/lua/lua-native_git.bb delete mode 100644 meta-tizen-generic/recipes-tizen/python-rpm/python-rpm-native_git.bb delete mode 100644 meta-tizen-generic/recipes-tizen/smack/smack-native_git.bb delete mode 100644 meta-tizen-generic/recipes-tizen/uthash/uthash-native_git.bb diff --git a/meta-tizen-generic/recipes-tizen/lua/lua-native_git.bb b/meta-tizen-generic/recipes-tizen/lua/lua-native_git.bb deleted file mode 100644 index 4e560c4..0000000 --- a/meta-tizen-generic/recipes-tizen/lua/lua-native_git.bb +++ /dev/null @@ -1,12 +0,0 @@ -require lua.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/platform/upstream/lua;tag=a8e83a062b895b10c5ac7f505feaca3139b8527b;nobranch=1" - diff --git a/meta-tizen-generic/recipes-tizen/lua/lua.inc b/meta-tizen-generic/recipes-tizen/lua/lua.inc index fd99be8..41570d3 100644 --- a/meta-tizen-generic/recipes-tizen/lua/lua.inc +++ b/meta-tizen-generic/recipes-tizen/lua/lua.inc @@ -13,12 +13,16 @@ PROVIDES = "" #PROVIDES by lua + #PROVIDES by lua-dev + #PROVIDES by liblua + #PROVIDES by lua-doc + RDEPENDS = "" #RDEPENDS of lua-dev (${PN}-dev) RDEPENDS_${PN}-dev += "lua" @@ -26,9 +30,10 @@ RDEPENDS_${PN}-dev += "lua" DEPENDS = "" #DEPENDS of lua -DEPENDS += "pkgconfig-native" DEPENDS_append_class-native = " readline-native" DEPENDS_append_class-target = " readline" +DEPENDS_append_class-native = " pkgconfig-native" +DEPENDS_append_class-target = " pkgconfig" do_prep() { cd ${S} @@ -104,15 +109,15 @@ lua_files += "${prefix}/share/lua/5.1" lua_files += "${sysconfdir}/rpm/macros.lua" lua-dev_files = "" -lua-devel_files += "lua.manifest" -lua-devel_files += "${prefix}/include/lauxlib.h" -lua-devel_files += "${prefix}/include/lua.h" -lua-devel_files += "${prefix}/include/lua.hpp" -lua-devel_files += "${prefix}/include/luaconf.h" -lua-devel_files += "${prefix}/include/lualib.h" -lua-devel_files += "${prefix}/lib/pkgconfig/lua.pc" -lua-devel_files += "${prefix}/lib/liblua.a" -lua-devel_files += "${prefix}/lib/liblua.so" +lua-dev_files += "lua.manifest" +lua-dev_files += "${prefix}/include/lauxlib.h" +lua-dev_files += "${prefix}/include/lua.h" +lua-dev_files += "${prefix}/include/lua.hpp" +lua-dev_files += "${prefix}/include/luaconf.h" +lua-dev_files += "${prefix}/include/lualib.h" +lua-dev_files += "${prefix}/lib/pkgconfig/lua.pc" +lua-dev_files += "${prefix}/lib/liblua.a" +lua-dev_files += "${prefix}/lib/liblua.so" liblua_files = "" liblua_files += "lua.manifest" @@ -123,13 +128,14 @@ lua-doc_files += "lua.manifest" lua-doc_files += "doc/*" FILES_${PN} = "${lua_files}" -FILES_${PN}-devel = "${lua-devel_files}" +FILES_${PN}-dev = "${lua-dev_files}" FILES_lib${PN} = "${liblua_files}" FILES_${PN}-doc = "${lua-doc_files}" PKG_lua= "lua" -PKG_lua-devel= "lua-devel" +PKG_lua-dev= "lua-dev" PKG_liblua= "liblua" PKG_lua-doc= "lua-doc" require lua-extraconf.inc + diff --git a/meta-tizen-generic/recipes-tizen/lua/lua_git.bb b/meta-tizen-generic/recipes-tizen/lua/lua_git.bb index 645288f..07e7f59 100644 --- a/meta-tizen-generic/recipes-tizen/lua/lua_git.bb +++ b/meta-tizen-generic/recipes-tizen/lua/lua_git.bb @@ -6,3 +6,5 @@ LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd64 SRC_URI += "git://review.tizen.org/platform/upstream/lua;tag=a8e83a062b895b10c5ac7f505feaca3139b8527b;nobranch=1" +BBCLASSEXTEND = "native" + diff --git a/meta-tizen-generic/recipes-tizen/python-rpm/python-rpm-native_git.bb b/meta-tizen-generic/recipes-tizen/python-rpm/python-rpm-native_git.bb deleted file mode 100644 index 8fd03bb..0000000 --- a/meta-tizen-generic/recipes-tizen/python-rpm/python-rpm-native_git.bb +++ /dev/null @@ -1,12 +0,0 @@ -require python-rpm.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/platform/upstream/rpm;tag=900e279b9481a75ede028707fe5a0a2bb2801a8f;nobranch=1" - diff --git a/meta-tizen-generic/recipes-tizen/python-rpm/python-rpm.inc b/meta-tizen-generic/recipes-tizen/python-rpm/python-rpm.inc index c8b305b..1b91739 100644 --- a/meta-tizen-generic/recipes-tizen/python-rpm/python-rpm.inc +++ b/meta-tizen-generic/recipes-tizen/python-rpm/python-rpm.inc @@ -7,11 +7,12 @@ SRC_URI = "" S = "${WORKDIR}/git" -inherit autotools +inherit autotools-brokensep PROVIDES = "" -#PROVIDES by python-rpm +#PROVIDES by python-rpm + RDEPENDS = "" #RDEPENDS of python-rpm (${PN}) @@ -19,7 +20,7 @@ RDEPENDS_${PN} += "rpm" DEPENDS = "" -#DEPENDS of python-rpm +#DEPENDS of python-rpm #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext DEPENDS += "attr" @@ -38,16 +39,15 @@ DEPENDS += "file" DEPENDS += "popt" DEPENDS += "libcap" DEPENDS += "nss" -DEPENDS += "python" inherit pythonnative do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} #setup -q -n rpm-4.11.0.1 - - - + + + } do_patch_append() { bb.build.exec_func('do_prep', d) @@ -61,15 +61,15 @@ do_compile() { LANG=C export LANG unset DISPLAY - CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables" ; export CFLAGS ; - CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; - FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ; - LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - - - - + CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables" ; export CFLAGS ; + CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; + FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ; + LD_AS_NEEDED=1; export LD_AS_NEEDED ; + + + + + } do_install() { @@ -78,20 +78,20 @@ do_install() { LANG=C export LANG unset DISPLAY - rm -rf ${D} - mkdir -p ${D} - + rm -rf ${D} + mkdir -p ${D} + mkdir -p ${D}${prefix}/lib # only installing in python/ does not work because rpm links against # installed libs at install time - + oe_runmake \ DESTDIR=${D} \ INSTALL_ROOT=${D} \ BINDIR=${prefix}/bin \ - install - rm -f ${D}${infodir}/dir - find ${D} -regex ".*\.la$" | xargs rm -f -- + install + rm -f ${D}${infodir}/dir + find ${D} -regex ".*\.la$" | xargs rm -f -- find ${D} -regex ".*\.a$" | xargs rm -f -- find ${D} -not -type d -and -not -path ${D}${prefix}/lib/python*/site-packages/rpm/\* -print0 | xargs -0 rm pushd ${D}/${prefix}/lib/python*/site-packages/rpm @@ -99,19 +99,8 @@ do_install() { #python ${prefix}/lib/python*/py_compile.py *.py #python -O ${prefix}/lib/python*/py_compile.py *.py popd - - rm -fr ${D}${prefix}/lib/rpm/platform - rm -fr ${D}${prefix}/bin - rm -fr ${D}/bin - rm -fr ${D}/var - rm -fr ${D}${prefix}/lib/rpm-plugins - rm -fr ${D}${prefix}/lib/rpm - rm -fr ${D}${prefix}/lib/rpm/fileattr - rm -fr ${D}${prefix}${base_prefix}/bin - rm -fr ${D}${prefix}${localstatedir} - rm -fr ${D}${localstatedir}/tmp - rm -fr ${D}${localstatedir}/volatile - + + } @@ -123,3 +112,4 @@ FILES_${PN} = "${python-rpm_files}" PKG_python-rpm= "python-rpm" require python-rpm-extraconf.inc + diff --git a/meta-tizen-generic/recipes-tizen/python-rpm/python-rpm_git.bb b/meta-tizen-generic/recipes-tizen/python-rpm/python-rpm_git.bb index 51e32d7..8a221da 100644 --- a/meta-tizen-generic/recipes-tizen/python-rpm/python-rpm_git.bb +++ b/meta-tizen-generic/recipes-tizen/python-rpm/python-rpm_git.bb @@ -6,3 +6,5 @@ LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd64 SRC_URI += "git://review.tizen.org/platform/upstream/rpm;tag=900e279b9481a75ede028707fe5a0a2bb2801a8f;nobranch=1" +BBCLASSEXTEND = "native" + diff --git a/meta-tizen-generic/recipes-tizen/rpm/rpm.inc b/meta-tizen-generic/recipes-tizen/rpm/rpm.inc index 8992400..50140ac 100644 --- a/meta-tizen-generic/recipes-tizen/rpm/rpm.inc +++ b/meta-tizen-generic/recipes-tizen/rpm/rpm.inc @@ -7,13 +7,14 @@ SRC_URI = "" S = "${WORKDIR}/git" -inherit autotools +inherit autotools-brokensep PROVIDES = "" -#PROVIDES by rpm-security-plugin +#PROVIDES by rpm-security-plugin -#PROVIDES by rpm-build + +#PROVIDES by rpm-build # the PROVIDES rules is ignore "rpmbuild " PROVIDES += "rpmbuild" RPROVIDES_rpm-build += "rpmbuild" @@ -21,14 +22,17 @@ RPROVIDES_rpm-build += "rpmbuild" PROVIDES += "rpm:${prefix}/bin/rpmbuild" RPROVIDES_rpm-build += "rpm:${prefix}/bin/rpmbuild" -#PROVIDES by rpm-locale + +#PROVIDES by rpm-locale # the PROVIDES rules is ignore "rpm-lang-all = 4.11.0.1" PROVIDES += "rpm-lang-all" RPROVIDES_rpm-locale += "rpm-lang-all" -#PROVIDES by rpm-dev -#PROVIDES by rpm +#PROVIDES by rpm-dev + + +#PROVIDES by rpm # the PROVIDES rules is ignore "rpminst " PROVIDES += "rpminst" RPROVIDES_rpm += "rpminst" @@ -36,7 +40,9 @@ RPROVIDES_rpm += "rpminst" PROVIDES += "rpm-libs" RPROVIDES_rpm += "rpm-libs" -#PROVIDES by rpm-docs + +#PROVIDES by rpm-docs + RDEPENDS = "" #RDEPENDS of rpm-security-plugin (${PN}-security-plugin) @@ -66,7 +72,8 @@ RDEPENDS_${PN}-dev += "popt" DEPENDS = "" -#DEPENDS of rpm +#DEPENDS of rpm +DEPENDS += "mtdev" DEPENDS += "libxml2" DEPENDS += "xz" DEPENDS += "findutils" @@ -74,7 +81,7 @@ DEPENDS += "file" DEPENDS += "popt" DEPENDS += "uthash" DEPENDS += "nss" -DEPENDS_build += "gcc-cross" +DEPENDS += "gcc-cross" DEPENDS += "elfutils" DEPENDS += "patch" DEPENDS += "lua" @@ -105,16 +112,16 @@ do_prep() { # will get linked from db3 rm -f rpmdb/db.h patch -p0 < ${S}/packaging/db-4.8.30-integration.dif - - if [ -s ${sysconfdir}/rpm/tizen_macros ]; then - cp -a ${sysconfdir}/rpm/tizen_macros ${S}/packaging/rpm-tizen_macros + + if [ -s /etc/rpm/tizen_macros ]; then + cp -a /etc/rpm/tizen_macros ${S}/packaging/rpm-tizen_macros fi cp -a ${S}/packaging/rpm-tizen_macros tizen_macros rm -f m4/libtool.m4 rm -f m4/lt*.m4 ### PREP END ### - - + + } do_patch_append() { bb.build.exec_func('do_prep', d) @@ -128,41 +135,29 @@ do_compile() { LANG=C export LANG unset DISPLAY - CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables" ; export CFLAGS ; - CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; - FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ; - LD_AS_NEEDED=1; export LD_AS_NEEDED ; - + CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables" ; export CFLAGS ; + CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; + FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ; + LD_AS_NEEDED=1; export LD_AS_NEEDED ; + ### BUILD BEGIN ### CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`" - export CPPFLAGS + export CPPFLAGS export CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -ffunction-sections" - export LDFLAGS="${LDFLAGS} -Wl,-Bsymbolic-functions -ffunction-sections" - - BUILDTARGET="--build=x86_64-tizen-linux --host=x86_64-linux-gnu " - export CFLAGS+=" -DRPM_VENDOR_OE " + export LDFLAGS="-Wl,-Bsymbolic-functions -ffunction-sections" + + BUILDTARGET="--build=x86_64-tizen-linux" + autoreconf -i -f - ./configure \ - --prefix=${prefix} \ - --mandir=${mandir} \ - --infodir=${infodir} \ - --libdir=${prefix}/lib \ - --sysconfdir=${sysconfdir} \ - --localstatedir=${localstatedir} \ - --disable-dependency-tracking \ - --with-lua \ - --with-acl \ - --with-cap \ - --enable-shared \ - \ - --with-msm \ - $BUILDTARGET - + ./configure --disable-dependency-tracking --prefix=${prefix} --mandir=${mandir} --infodir=${infodir} \ + --libdir=${prefix}/lib --sysconfdir=/etc --localstatedir=/var --with-lua \ + --with-acl --with-cap --enable-shared --with-msm $BUILDTARGET + make -j16 ### BUILD END ### - - - + + + } do_install() { @@ -171,63 +166,63 @@ do_install() { LANG=C export LANG unset DISPLAY - rm -rf ${D} - mkdir -p ${D} - - mkdir -p ${D}${prefix}/lib - mkdir -p ${D}${prefix}/share/locale - ln -sf ../share/locale ${D}${prefix}/lib/locale - + rm -rf ${D} + mkdir -p ${D} + + mkdir -p ${D}/usr/lib + mkdir -p ${D}/usr/share/locale + ln -s ../share/locale ${D}/usr/lib/locale + oe_runmake \ DESTDIR=${D} \ INSTALL_ROOT=${D} \ BINDIR=${prefix}/bin \ - install - rm -f ${D}${infodir}/dir - find ${D} -regex ".*\.la$" | xargs rm -f -- + install + rm -f ${D}${infodir}/dir + find ${D} -regex ".*\.la$" | xargs rm -f -- find ${D} -regex ".*\.a$" | xargs rm -f -- - install -m 644 db3/db.h ${D}${prefix}/include/rpm + install -m 644 db3/db.h ${D}/usr/include/rpm # remove .la file and the static variant of libpopt # have to remove the dependency from other .la files as well #for f in ${D}/${prefix}/lib/*.la; do # sed -i -e "s,/lib/libpopt.la,-lpopt,g" $f #done mkdir -p ${D}${sysconfdir}/rpm - cp -a tizen_macros ${D}${prefix}/lib/rpm - mkdir -p ${D}${prefix}/lib/rpm/tizen - install -m 755 ${S}/packaging/find-docs.sh ${D}${prefix}/lib/rpm/tizen - install -m 755 ${S}/packaging/find-provides.ksyms ${D}${prefix}/lib/rpm + cp -a tizen_macros ${D}/usr/lib/rpm + mkdir -p ${D}/usr/lib/rpm/tizen + install -m 755 ${S}/packaging/find-docs.sh ${D}/usr/lib/rpm/tizen + install -m 755 ${S}/packaging/find-provides.ksyms ${D}/usr/lib/rpm install -m 644 ${S}/packaging/device-sec-policy ${D}${sysconfdir}/device-sec-policy install -m 644 ${S}/packaging/device-sec-policy ${D}${prefix}/lib/rpm-plugins/msm-device-sec-policy - ln -sf ../tizen_macros ${D}${prefix}/lib/rpm/tizen/macros + ln -s ../tizen_macros ${D}/usr/lib/rpm/tizen/macros for d in BUILD RPMS SOURCES SPECS SRPMS BUILDROOT ; do - mkdir -p ${D}${prefix}/src/packages/$d - chmod 755 ${D}${prefix}/src/packages/$d + mkdir -p ${D}/usr/src/packages/$d + chmod 755 ${D}/usr/src/packages/$d done - for d in ${D}${prefix}/lib/rpm/platform/*-linux/macros ; do + for d in ${D}/usr/lib/rpm/platform/*-linux/macros ; do dd=${d%-linux/macros} dd=${dd##*/} - mkdir ${D}${prefix}/src/packages/RPMS/$dd - chmod 755 ${D}${prefix}/src/packages/RPMS/$dd + mkdir ${D}/usr/src/packages/RPMS/$dd + chmod 755 ${D}/usr/src/packages/RPMS/$dd done - mkdir -p ${D}${localstatedir}/lib/rpm - gzip -9 ${D}${mandir}/man[18]/*.[18] + mkdir -p ${D}/var/lib/rpm + gzip -9 ${D}/${mandir}/man[18]/*.[18] export RPM_BUILD_ROOT chmod 755 doc/manual rm -rf doc/manual/Makefile* rm -f ${D}/usr/lib/rpmpopt rm -rf ${D}${mandir}/{fr,ja,ko,pl,ru,sk} rm -f ${D}${prefix}/share/locale/de/LC_MESSAGES/rpm.mo - rm -f ${D}${prefix}/lib/rpm/cpanflute ${D}${prefix}/lib/rpm/cpanflute2 - install -m 755 scripts/find-supplements{,.ksyms} ${D}${prefix}/lib/rpm - install -m 755 scripts/firmware.prov ${D}${prefix}/lib/rpm - install -m 755 scripts/debuginfo.prov ${D}${prefix}/lib/rpm - rm -f ${D}${prefix}/lib/locale ${D}/usr/lib/rpmrc - mkdir -p ${D}${sysconfdir}/rpm - chmod 755 ${D}${sysconfdir}/rpm - mkdir -p ${D}${prefix}/lib/rpm/macros.d + rm -f ${D}/usr/lib/rpm/cpanflute ${D}/usr/lib/rpm/cpanflute2 + install -m 755 scripts/find-supplements{,.ksyms} ${D}/usr/lib/rpm + install -m 755 scripts/firmware.prov ${D}/usr/lib/rpm + install -m 755 scripts/debuginfo.prov ${D}/usr/lib/rpm + rm -f ${D}/usr/lib/locale ${D}/usr/lib/rpmrc + mkdir -p ${D}/etc/rpm + chmod 755 ${D}/etc/rpm + mkdir -p ${D}/usr/lib/rpm/macros.d # remove some nonsense or non-working scripts - pushd ${D}${prefix}/lib/rpm/ + pushd ${D}/usr/lib/rpm/ for f in rpm2cpio.sh rpm.daily rpmdiff* rpm.log rpm.xinetd freshen.sh u_pkg.sh \ magic magic.mgc magic.mime* rpmfile *.pl javadeps brp-redhat \ brp-strip-static-archive vpkg-provides*.sh http.req sql.req tcl.req \ @@ -235,7 +230,7 @@ do_install() { do rm -f $f done - for i in ${prefix}/share/automake-*/*; do + for i in /usr/share/automake-*/*; do if test -f "$i" && test -f "${i##*/}"; then rm -f "${i##*/}" fi @@ -244,13 +239,11 @@ do_install() { rm -rf ${D}/${prefix}/lib/python2.7 rm -f ${D}${prefix}/lib/*.la rm -f ${D}${prefix}/lib/rpm-plugins/*.la - - rm ${D}${prefix}/bin/rpmgraph - + sh ${D}/usr/lib/rpm/find-lang.sh ${D} rpm + + } - - PACKAGES += " rpm-security-plugin " PACKAGES += " rpm-build " PACKAGES += " rpm-docs " @@ -267,31 +260,31 @@ rpm-build_files += "${prefix}/bin/rpmbuild" rpm-build_files += "${prefix}/bin/gendiff" rpm-build_files += "${prefix}/bin/rpmspec" rpm-build_files += "${prefix}/bin/rpmsign" -rpm-build_files += "${prefix}/lib/rpm/tizen/find-*" -rpm-build_files += "${prefix}/lib/rpm/brp-*" -rpm-build_files += "${prefix}/lib/rpm/find-supplements*" -rpm-build_files += "${prefix}/lib/rpm/check-*" -rpm-build_files += "${prefix}/lib/rpm/debugedit" -rpm-build_files += "${prefix}/lib/rpm/find-debuginfo.sh" -rpm-build_files += "${prefix}/lib/rpm/find-lang.sh" -rpm-build_files += "${prefix}/lib/rpm/find-provides.ksyms" -rpm-build_files += "${prefix}/lib/rpm/*provides*" -rpm-build_files += "${prefix}/lib/rpm/*requires*" -rpm-build_files += "${prefix}/lib/rpm/*deps*" -rpm-build_files += "${prefix}/lib/rpm/*.prov" -rpm-build_files += "${prefix}/lib/rpm/*.req" -rpm-build_files += "${prefix}/lib/rpm/macros.*" -rpm-build_files += "${prefix}/lib/rpm/fileattrs" +rpm-build_files += "/usr/lib/rpm/tizen/find-*" +rpm-build_files += "/usr/lib/rpm/brp-*" +rpm-build_files += "/usr/lib/rpm/find-supplements*" +rpm-build_files += "/usr/lib/rpm/check-*" +rpm-build_files += "/usr/lib/rpm/debugedit" +rpm-build_files += "/usr/lib/rpm/find-debuginfo.sh" +rpm-build_files += "/usr/lib/rpm/find-lang.sh" +rpm-build_files += "/usr/lib/rpm/find-provides.ksyms" +rpm-build_files += "/usr/lib/rpm/*provides*" +rpm-build_files += "/usr/lib/rpm/*requires*" +rpm-build_files += "/usr/lib/rpm/*deps*" +rpm-build_files += "/usr/lib/rpm/*.prov" +rpm-build_files += "/usr/lib/rpm/*.req" +rpm-build_files += "/usr/lib/rpm/macros.*" +rpm-build_files += "/usr/lib/rpm/fileattrs" rpm-dev_files = "" -rpm-devel_files += "rpm.manifest" -rpm-devel_files += "${prefix}/bin/rpmgraph" -rpm-devel_files += "${prefix}/include/rpm" -rpm-devel_files += "${prefix}/lib/librpm.so" -rpm-devel_files += "${prefix}/lib/librpmbuild.so" -rpm-devel_files += "${prefix}/lib/librpmio.so" -rpm-devel_files += "${prefix}/lib/librpmsign.so" -rpm-devel_files += "${prefix}/lib/pkgconfig/rpm.pc" +rpm-dev_files += "rpm.manifest" +rpm-dev_files += "${prefix}/bin/rpmgraph" +rpm-dev_files += "/usr/include/rpm" +rpm-dev_files += "${prefix}/lib/librpm.so" +rpm-dev_files += "${prefix}/lib/librpmbuild.so" +rpm-dev_files += "${prefix}/lib/librpmio.so" +rpm-dev_files += "${prefix}/lib/librpmsign.so" +rpm-dev_files += "${prefix}/lib/pkgconfig/rpm.pc" rpm-locale_files = "" @@ -300,7 +293,7 @@ rpm-docs_files += "GROUPS" rpm_files = "" rpm_files += "rpm.manifest" -rpm_files += "${sysconfdir}/rpm" +rpm_files += "/etc/rpm" rpm_files += "/bin/rpm" rpm_files += "${prefix}/bin/rpm2cpio" rpm_files += "${prefix}/bin/rpmdb" @@ -308,43 +301,41 @@ rpm_files += "${prefix}/bin/rpmkeys" rpm_files += "${prefix}/bin/rpmquery" rpm_files += "${prefix}/bin/rpmverify" rpm_files += "${prefix}/bin/rpmqpack" -rpm_files += "%dir ${prefix}/lib/rpm" -rpm_files += "${prefix}/lib/rpm/macros" -rpm_files += "${prefix}/lib/rpm/macros.d" -rpm_files += "${prefix}/lib/rpm/rpmpopt*" -rpm_files += "${prefix}/lib/rpm/rpmrc" -rpm_files += "${prefix}/lib/rpm/tizen/macros" -rpm_files += "${prefix}/lib/rpm/tizen_macros" -rpm_files += "${prefix}/lib/rpm/rpm.supp" -rpm_files += "${prefix}/lib/rpm/tgpg" -rpm_files += "${prefix}/lib/rpm/platform" +rpm_files += "%dir /usr/lib/rpm" +rpm_files += "/usr/lib/rpm/macros" +rpm_files += "/usr/lib/rpm/macros.d" +rpm_files += "/usr/lib/rpm/rpmpopt*" +rpm_files += "/usr/lib/rpm/rpmrc" +rpm_files += "/usr/lib/rpm/tizen/macros" +rpm_files += "/usr/lib/rpm/tizen_macros" +rpm_files += "/usr/lib/rpm/rpm.supp" +rpm_files += "/usr/lib/rpm/tgpg" +rpm_files += "/usr/lib/rpm/platform" rpm_files += "${prefix}/lib/rpm-plugins" rpm_files += "${prefix}/lib/rpm-plugins/exec.so" rpm_files += "${prefix}/lib/librpm.so.*" rpm_files += "${prefix}/lib/librpmio.so.*" rpm_files += "${prefix}/lib/librpmbuild.so.*" rpm_files += "${prefix}/lib/librpmsign.so.*" -rpm_files += "${localstatedir}/lib/rpm" -rpm_files += "%attr(755,root,root) ${prefix}/src/packages/BUILD" -rpm_files += "%attr(755,root,root) ${prefix}/src/packages/SPECS" -rpm_files += "%attr(755,root,root) ${prefix}/src/packages/SOURCES" -rpm_files += "%attr(755,root,root) ${prefix}/src/packages/SRPMS" -rpm_files += "%attr(755,root,root) ${prefix}/src/packages/RPMS" -rpm_files += "%attr(755,root,root) ${prefix}/src/packages/BUILDROOT" -rpm_files += "%attr(755,root,root) ${prefix}/src/packages/RPMS/*" +rpm_files += "/var/lib/rpm" +rpm_files += "%attr(755,root,root) /usr/src/packages/BUILD" +rpm_files += "%attr(755,root,root) /usr/src/packages/SPECS" +rpm_files += "%attr(755,root,root) /usr/src/packages/SOURCES" +rpm_files += "%attr(755,root,root) /usr/src/packages/SRPMS" FILES_${PN}-security-plugin = "${rpm-security-plugin_files}" FILES_${PN}-build = "${rpm-build_files}" -FILES_${PN}-devel = "${rpm-devel_files}" +FILES_${PN}-dev = "${rpm-dev_files}" FILES_${PN}-locale = "${rpm-locale_files}" FILES_${PN}-docs = "${rpm-docs_files}" FILES_${PN} = "${rpm_files}" PKG_rpm-security-plugin= "rpm-security-plugin" PKG_rpm-build= "rpm-build" -PKG_rpm-devel= "rpm-devel" +PKG_rpm-dev= "rpm-dev" PKG_rpm-locale= "rpm-locale" PKG_rpm-docs= "rpm-docs" PKG_rpm= "rpm" require rpm-extraconf.inc + diff --git a/meta-tizen-generic/recipes-tizen/rpm/rpm_git.bb b/meta-tizen-generic/recipes-tizen/rpm/rpm_git.bb index 143ce01..e319b1b 100644 --- a/meta-tizen-generic/recipes-tizen/rpm/rpm_git.bb +++ b/meta-tizen-generic/recipes-tizen/rpm/rpm_git.bb @@ -6,4 +6,5 @@ LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd64 SRC_URI += "git://review.tizen.org/platform/upstream/rpm;tag=900e279b9481a75ede028707fe5a0a2bb2801a8f;nobranch=1" -BBCLASSEXTEND = "native" + + diff --git a/meta-tizen-generic/recipes-tizen/smack/smack-native_git.bb b/meta-tizen-generic/recipes-tizen/smack/smack-native_git.bb deleted file mode 100644 index ade5adc..0000000 --- a/meta-tizen-generic/recipes-tizen/smack/smack-native_git.bb +++ /dev/null @@ -1,12 +0,0 @@ -require smack.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/platform/upstream/smack;tag=1891f4bf4ec855fb85844b0fc3599c10ce91a875;nobranch=1" - diff --git a/meta-tizen-generic/recipes-tizen/smack/smack.inc b/meta-tizen-generic/recipes-tizen/smack/smack.inc index 117b9fe..8b97c74 100644 --- a/meta-tizen-generic/recipes-tizen/smack/smack.inc +++ b/meta-tizen-generic/recipes-tizen/smack/smack.inc @@ -7,18 +7,22 @@ SRC_URI = "" S = "${WORKDIR}/git" -inherit autotools +inherit autotools-brokensep PROVIDES = "" #PROVIDES by smack-dev + #PROVIDES by smack + #PROVIDES by libsmack + #PROVIDES by smack-docs + RDEPENDS = "" #RDEPENDS of smack-dev (${PN}-dev) RDEPENDS_${PN}-dev += "libsmack" @@ -26,9 +30,11 @@ RDEPENDS_${PN}-dev += "libsmack" DEPENDS = "" #DEPENDS of smack -DEPENDS += "autoconf-native" +DEPENDS_append_class-native = " autoconf-native" +DEPENDS_append_class-target = " autoconf" DEPENDS += "libtool-cross" -DEPENDS += "automake-native" +DEPENDS_append_class-native = " automake-native" +DEPENDS_append_class-target = " automake" do_prep() { cd ${S} @@ -111,10 +117,10 @@ PACKAGES += " libsmack " PACKAGES += " smack-docs " smack-dev_files = "" -smack-devel_files += "smack.manifest" -smack-devel_files += "${prefix}/include/sys/smack.h" -smack-devel_files += "${prefix}/lib/libsmack.so" -smack-devel_files += "${prefix}/lib/pkgconfig/libsmack.pc" +smack-dev_files += "smack.manifest" +smack-dev_files += "${prefix}/include/sys/smack.h" +smack-dev_files += "${prefix}/lib/libsmack.so" +smack-dev_files += "${prefix}/lib/pkgconfig/libsmack.pc" smack_files = "" smack_files += "smack.manifest" @@ -130,14 +136,15 @@ libsmack_files += "${prefix}/lib/libsmack.so.*" smack-docs_files = "" -FILES_${PN}-devel = "${smack-devel_files}" +FILES_${PN}-dev = "${smack-dev_files}" FILES_${PN} = "${smack_files}" FILES_lib${PN} = "${libsmack_files}" FILES_${PN}-docs = "${smack-docs_files}" -PKG_smack-devel= "smack-devel" +PKG_smack-dev= "smack-dev" PKG_smack= "smack" PKG_libsmack= "libsmack" PKG_smack-docs= "smack-docs" require smack-extraconf.inc + diff --git a/meta-tizen-generic/recipes-tizen/smack/smack_git.bb b/meta-tizen-generic/recipes-tizen/smack/smack_git.bb index e5454bf..8ba0d6f 100644 --- a/meta-tizen-generic/recipes-tizen/smack/smack_git.bb +++ b/meta-tizen-generic/recipes-tizen/smack/smack_git.bb @@ -6,3 +6,5 @@ LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd64 SRC_URI += "git://review.tizen.org/platform/upstream/smack;tag=1891f4bf4ec855fb85844b0fc3599c10ce91a875;nobranch=1" +BBCLASSEXTEND = "native" + diff --git a/meta-tizen-generic/recipes-tizen/uthash/uthash-native_git.bb b/meta-tizen-generic/recipes-tizen/uthash/uthash-native_git.bb deleted file mode 100644 index 52bb4f1..0000000 --- a/meta-tizen-generic/recipes-tizen/uthash/uthash-native_git.bb +++ /dev/null @@ -1,12 +0,0 @@ -require uthash.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/platform/upstream/uthash;tag=1436c7858fa133d830a18d27c879af301000a70f;nobranch=1" - diff --git a/meta-tizen-generic/recipes-tizen/uthash/uthash.inc b/meta-tizen-generic/recipes-tizen/uthash/uthash.inc index 0a85f5b..f60e0c2 100644 --- a/meta-tizen-generic/recipes-tizen/uthash/uthash.inc +++ b/meta-tizen-generic/recipes-tizen/uthash/uthash.inc @@ -7,14 +7,16 @@ SRC_URI = "" S = "${WORKDIR}/git" -inherit autotools +inherit autotools-brokensep PROVIDES = "" #PROVIDES by uthash + #PROVIDES by uthash-dev + RDEPENDS = "" DEPENDS = "" @@ -68,14 +70,15 @@ do_install() { uthash-dev_files = "" -uthash-devel_files += "uthash.manifest" -uthash-devel_files += "${prefix}/include/utarray.h" -uthash-devel_files += "${prefix}/include/uthash.h" -uthash-devel_files += "${prefix}/include/utlist.h" -uthash-devel_files += "${prefix}/include/utstring.h" +uthash-dev_files += "uthash.manifest" +uthash-dev_files += "${prefix}/include/utarray.h" +uthash-dev_files += "${prefix}/include/uthash.h" +uthash-dev_files += "${prefix}/include/utlist.h" +uthash-dev_files += "${prefix}/include/utstring.h" -FILES_${PN}-devel = "${uthash-devel_files}" +FILES_${PN}-dev = "${uthash-dev_files}" -PKG_uthash-devel= "uthash-devel" +PKG_uthash-dev= "uthash-dev" require uthash-extraconf.inc + diff --git a/meta-tizen-generic/recipes-tizen/uthash/uthash_git.bb b/meta-tizen-generic/recipes-tizen/uthash/uthash_git.bb index 8991b58..f416786 100644 --- a/meta-tizen-generic/recipes-tizen/uthash/uthash_git.bb +++ b/meta-tizen-generic/recipes-tizen/uthash/uthash_git.bb @@ -6,3 +6,5 @@ LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd64 SRC_URI += "git://review.tizen.org/platform/upstream/uthash;tag=1436c7858fa133d830a18d27c879af301000a70f;nobranch=1" +BBCLASSEXTEND = "native" + diff --git a/proto-meta-Tizen_generic/.spec2yoctorc b/proto-meta-Tizen_generic/.spec2yoctorc index a1236bb..e58fa7b 100644 --- a/proto-meta-Tizen_generic/.spec2yoctorc +++ b/proto-meta-Tizen_generic/.spec2yoctorc @@ -27,7 +27,7 @@ default_git_src=review.tizen.org priority=1 [whitelist_tizen_common] -list=smack, rpm, uthash, lua +list=smack, rpm, uthash, lua, wayland, weston, weston-generic, doxygen [substitute] pkgconfig(zlib)=zlib-devel @@ -118,4 +118,6 @@ glib-2.0=pkgconfig(glib-2.0) jpeg=libjpeg-devel glib-2.0=pkgconfig(gobject-2.0), pkgconfig(glib-2.0), pkgconfig(gio-2.0) systemd=pkgconfig(libsystemd-login) +pwdutils=/usr/sbin/groupadd +readline=readline-devel -- 2.7.4