From d703bb0bbd710976ccb639313f477d08ccc11822 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Wed, 9 Jul 2014 15:11:19 +0200 Subject: [PATCH] Fix multi autoreconf into recipes. Change-Id: Ia62fe5c963452abce91d9cffe7366cd451eadbcf Signed-off-by: Ronan Le Martret --- recipes-tizen/ail/ail-extraconf.inc | 16 --------- recipes-tizen/ail/ail.inc | 10 +++--- recipes-tizen/ail/ail_git.bb | 2 +- .../audio-session-manager.inc | 28 ++------------- .../audio-session-manager_git.bb | 2 +- recipes-tizen/avsystem/avsystem.inc | 39 +++++---------------- recipes-tizen/avsystem/avsystem_git.bb | 2 +- recipes-tizen/dlog/.dlog-extraconf.inc.kate-swp | Bin 0 -> 185 bytes recipes-tizen/dlog/dlog-extraconf.inc | 2 -- recipes-tizen/dlog/dlog.inc | 24 +------------ recipes-tizen/dlog/dlog_git.bb | 2 +- recipes-tizen/dlog/files/tmp_fix_header.patch | 30 ---------------- recipes-tizen/libmm-session/libmm-session.inc | 26 +------------- recipes-tizen/libmm-session/libmm-session_git.bb | 2 +- recipes-tizen/libmm-ta/libmm-ta.inc | 28 +-------------- recipes-tizen/libmm-ta/libmm-ta_git.bb | 2 +- recipes-tizen/libnet-client/libnet-client.inc | 27 ++------------ recipes-tizen/libnet-client/libnet-client_git.bb | 2 +- recipes-tizen/media-server/media-server.inc | 38 +++++--------------- recipes-tizen/media-server/media-server_git.bb | 2 +- recipes-tizen/pam/pam-extraconf.inc | 9 +++-- recipes-tizen/slp-pkgmgr/slp-pkgmgr_git.bb | 2 +- .../user-session-units/user-session-units.inc | 30 ++-------------- .../user-session-units/user-session-units_git.bb | 2 +- 24 files changed, 48 insertions(+), 279 deletions(-) create mode 100644 recipes-tizen/dlog/.dlog-extraconf.inc.kate-swp delete mode 100644 recipes-tizen/dlog/files/tmp_fix_header.patch diff --git a/recipes-tizen/ail/ail-extraconf.inc b/recipes-tizen/ail/ail-extraconf.inc index dfeb3d1..52bfd0d 100644 --- a/recipes-tizen/ail/ail-extraconf.inc +++ b/recipes-tizen/ail/ail-extraconf.inc @@ -6,19 +6,3 @@ RDEPENDS_${PN}_remove_class-native = "systemd-native" DEPENDS_remove_class-native = "dlog-native" DEPENDS_class-target += " ail-native" - -pkg_postinst_${PN}() { - #!/bin/sh -e - - [ "x\$D" == "x" ] && ldconfig - vconftool set -t string db/ail/ail_info "0" -f -s system::vconf_inhouse - vconftool set -t string db/menuscreen/desktop "0" -f -s system::vconf_inhouse - vconftool set -t string db/menu_widget/language "en_US.utf8" -f -s system::vconf_inhouse - chsmack -a User $D${prefix}/kdb/db/ail - chsmack -a User $D${prefix}/kdb/db/ail/ail_info - chsmack -a User $D${prefix}/kdb/db/menuscreen - chsmack -a User $D${prefix}/kdb/db/menuscreen/desktop - chsmack -a User $D${prefix}/kdb/db/menu_widget - chsmack -a User $D${prefix}/kdb/db/menu_widget/language - -} \ No newline at end of file diff --git a/recipes-tizen/ail/ail.inc b/recipes-tizen/ail/ail.inc index e67dbfe..d5c73e1 100644 --- a/recipes-tizen/ail/ail.inc +++ b/recipes-tizen/ail/ail.inc @@ -13,7 +13,7 @@ BBCLASSEXTEND = "" PROVIDES = "" #PROVIDES by ail -# the PROVIDES rules is ignore "libail = 0.2.80-1" +# the PROVIDES rules is ignore "libail = 0.2.80-0" PROVIDES += "libail" RPROVIDES_ail += "libail" @@ -81,9 +81,9 @@ do_compile() { -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ ${EXTRA_OECMAKE} . -DBUILD_PKGTYPE=rpm \ - -DSMACK=Off + -DSMACK=Off - make -j16 + oe_runmake -j16 @@ -142,7 +142,7 @@ pkg_postinst_${PN}() { echo "Failed to change the perms of $@" fi } - ail_initdb + ail_initdb 2>/dev/null mkdir -p $D${prefix}/share/applications mkdir -p $D${prefix}/share/applications mkdir -p $D${prefix}/dbspace @@ -157,7 +157,7 @@ pkg_postrm_${PN}() { [ "x\$D" == "x" ] && ldconfig if [ $1 == 0 ]; then - rm -f $D${prefix}/dbspace/.app_info.db* + rm -f $D${prefix}/dbspace/.app_info.db* fi } diff --git a/recipes-tizen/ail/ail_git.bb b/recipes-tizen/ail/ail_git.bb index 7727fa0..ceeb394 100644 --- a/recipes-tizen/ail/ail_git.bb +++ b/recipes-tizen/ail/ail_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/appfw/ail;tag=2bf50fe94b2cdb13fde5f3cb04e788206b28dc59;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/appfw/ail;tag=5eed9f957ba617aeb8b5977778a62fd13ddfedab;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/audio-session-manager/audio-session-manager.inc b/recipes-tizen/audio-session-manager/audio-session-manager.inc index 446cf5b..63932a5 100644 --- a/recipes-tizen/audio-session-manager/audio-session-manager.inc +++ b/recipes-tizen/audio-session-manager/audio-session-manager.inc @@ -45,11 +45,10 @@ DEPENDS += "vconf" do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} - #setup -q + #setup -q cp ${S}/packaging/audio-session-manager.manifest . - } do_patch_append() { bb.build.exec_func('do_prep', d) @@ -68,28 +67,6 @@ do_compile() { 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="${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 ; - autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \ - --target=x86_64-tizen-linux \ - --program-prefix= \ - --prefix=${prefix} \ - --exec-prefix=${prefix} \ - --bindir=${prefix}/bin \ - --sbindir=${prefix}/sbin \ - --sysconfdir=${sysconfdir} \ - --datadir=${prefix}/share \ - --includedir=${prefix}/include \ - --libdir=${prefix}/lib \ - --libexecdir=${prefix}/libexec \ - --localstatedir=${localstatedir} \ - --sharedstatedir=${prefix}/com \ - --mandir=${mandir} \ - --infodir=${infodir} --disable-static --noconfigure CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -fvisibility=hidden -DMM_DEBUG_FLAG -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\"" ; export CFLAGS CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ; @@ -110,7 +87,7 @@ do_compile() { --localstatedir=${localstatedir} \ --sharedstatedir=${prefix}/com \ --mandir=${mandir} \ - --infodir=${infodir} --disable-static --enable-security + --infodir=${infodir} --disable-static --enable-security make -j16 @@ -137,7 +114,6 @@ do_install() { find ${D} -regex ".*\.a$" | xargs rm -f -- - } pkg_postinst_${PN}() { diff --git a/recipes-tizen/audio-session-manager/audio-session-manager_git.bb b/recipes-tizen/audio-session-manager/audio-session-manager_git.bb index 424453a..8516b42 100644 --- a/recipes-tizen/audio-session-manager/audio-session-manager_git.bb +++ b/recipes-tizen/audio-session-manager/audio-session-manager_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/multimedia/audio-session-manager;tag=9226f6a77ba5b3a466ff7113479cab7cff770788;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/multimedia/audio-session-manager;tag=22f5292e29f0c0e7fb8e7c5ba385c4d522eed9f9;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/avsystem/avsystem.inc b/recipes-tizen/avsystem/avsystem.inc index 7dbd92a..3dd621c 100644 --- a/recipes-tizen/avsystem/avsystem.inc +++ b/recipes-tizen/avsystem/avsystem.inc @@ -47,7 +47,6 @@ do_prep() { cp ${S}/packaging/avsystem.manifest . - } do_patch_append() { bb.build.exec_func('do_prep', d) @@ -67,7 +66,6 @@ do_compile() { LD_AS_NEEDED=1; export LD_AS_NEEDED ; - CFLAGS="${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 ; @@ -86,30 +84,9 @@ do_compile() { --localstatedir=${localstatedir} \ --sharedstatedir=${prefix}/com \ --mandir=${mandir} \ - --infodir=${infodir} - - CFLAGS="${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 ; - autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \ - --target=x86_64-tizen-linux \ - --program-prefix= \ - --prefix=${prefix} \ - --exec-prefix=${prefix} \ - --bindir=${prefix}/bin \ - --sbindir=${prefix}/sbin \ - --sysconfdir=${sysconfdir} \ - --datadir=${prefix}/share \ - --includedir=${prefix}/include \ - --libdir=${prefix}/lib \ - --libexecdir=${prefix}/libexec \ - --localstatedir=${localstatedir} \ - --sharedstatedir=${prefix}/com \ - --mandir=${mandir} \ - --infodir=${infodir} \ - --enable-audiotest - - make -j16 + --infodir=${infodir} \ + --enable-audiotest + oe_runmake -j16 @@ -139,9 +116,9 @@ do_install() { mkdir -m 755 -p ${D}/${sysconfdir}/rc.d/rc4.d/ ln -s ../init.d/snd_init ${D}/${sysconfdir}/rc.d/rc4.d/S15snd_init - mkdir -m 755 -p ${D}/usr/lib/systemd/system/multi-user.target.wants - install -m 0644 ${S}/packaging/avsystem.service ${D}/usr/lib/systemd/system/avsystem.service - ln -s ../avsystem.service ${D}/usr/lib/systemd/system/multi-user.target.wants/avsystem.service + mkdir -m 755 -p ${D}/lib/systemd/system/multi-user.target.wants + install -m 0644 ${S}/packaging/avsystem.service ${D}/lib/systemd/system/avsystem.service + ln -s ../avsystem.service ${D}/lib/systemd/system/multi-user.target.wants/avsystem.service } @@ -197,8 +174,8 @@ avsystem_files += "${sysconfdir}/rc.d/init.d/snd_init" avsystem_files += "${sysconfdir}/rc.d/rc3.d/S15snd_init" avsystem_files += "${sysconfdir}/rc.d/rc4.d/S15snd_init" avsystem_files += "${prefix}/bin/*" -avsystem_files += "/usr/lib/systemd/system/avsystem.service" -avsystem_files += "/usr/lib/systemd/system/multi-user.target.wants/avsystem.service" +avsystem_files += "/lib/systemd/system/avsystem.service" +avsystem_files += "/lib/systemd/system/multi-user.target.wants/avsystem.service" avsystem-dev_files = "" avsystem-dev_files += "avsystem.manifest" diff --git a/recipes-tizen/avsystem/avsystem_git.bb b/recipes-tizen/avsystem/avsystem_git.bb index 1443d79..af6b883 100644 --- a/recipes-tizen/avsystem/avsystem_git.bb +++ b/recipes-tizen/avsystem/avsystem_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/multimedia/avsystem;tag=57e12ce4c38bccf9aa47ce2b9d1d7ac57d1e5d65;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/multimedia/avsystem;tag=72435ebdb656183ee0b74c8232757498987fe34a;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/dlog/.dlog-extraconf.inc.kate-swp b/recipes-tizen/dlog/.dlog-extraconf.inc.kate-swp new file mode 100644 index 0000000000000000000000000000000000000000..fb7f1c93a03e5ec9d16a1672ec88b2969f5ed6c9 GIT binary patch literal 185 zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?WSNHH-?u}Ds_v`8~BNHQ`oNwu^vFtD_= zNKH<&FflSu4fX`8f&s>IS2&*$D9D(J;4^{vIS4*88lMHkS3tKYsb Jq+x*F6#z;H7&!m{ literal 0 HcmV?d00001 diff --git a/recipes-tizen/dlog/dlog-extraconf.inc b/recipes-tizen/dlog/dlog-extraconf.inc index 98d3237..e69de29 100644 --- a/recipes-tizen/dlog/dlog-extraconf.inc +++ b/recipes-tizen/dlog/dlog-extraconf.inc @@ -1,2 +0,0 @@ -SRC_URI += "file://tmp_fix_header.patch \ - " \ No newline at end of file diff --git a/recipes-tizen/dlog/dlog.inc b/recipes-tizen/dlog/dlog.inc index bb8b42f..b01b6a5 100644 --- a/recipes-tizen/dlog/dlog.inc +++ b/recipes-tizen/dlog/dlog.inc @@ -63,27 +63,6 @@ do_compile() { LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - CFLAGS="${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 ; - autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \ - --target=x86_64-tizen-linux \ - --program-prefix= \ - --prefix=${prefix} \ - --exec-prefix=${prefix} \ - --bindir=${prefix}/bin \ - --sbindir=${prefix}/sbin \ - --sysconfdir=${sysconfdir} \ - --datadir=${prefix}/share \ - --includedir=${prefix}/include \ - --libdir=${prefix}/lib \ - --libexecdir=${prefix}/libexec \ - --localstatedir=${localstatedir} \ - --sharedstatedir=${prefix}/com \ - --mandir=${mandir} \ - --infodir=${infodir} - CFLAGS="${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 ; @@ -103,8 +82,7 @@ do_compile() { --sharedstatedir=${prefix}/com \ --mandir=${mandir} \ --infodir=${infodir} --disable-static - - make -j16 + oe_runmake -j16 diff --git a/recipes-tizen/dlog/dlog_git.bb b/recipes-tizen/dlog/dlog_git.bb index 79afe95..14f75a6 100644 --- a/recipes-tizen/dlog/dlog_git.bb +++ b/recipes-tizen/dlog/dlog_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/system/dlog;tag=a08e5247c86df41b8d68438b782095208751ae9c;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/system/dlog;tag=69ec4343e40cf2ffadad6d9d229547a5846392fe;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/dlog/files/tmp_fix_header.patch b/recipes-tizen/dlog/files/tmp_fix_header.patch deleted file mode 100644 index a9f03d3..0000000 --- a/recipes-tizen/dlog/files/tmp_fix_header.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/include/dlog.h b/include/dlog.h -index 65f5c4f..4aeba2b 100644 ---- a/include/dlog.h -+++ b/include/dlog.h -@@ -256,7 +256,7 @@ typedef enum { - #define COMPATIBILITY_ON - - #ifdef COMPATIBILITY_ON --#define LOG_ON() _get_logging_on() -+#define LOG_ON() 1 - #if LOG_NDEBUG - #define LOGV(format, arg...) (0) - #else -@@ -332,7 +332,7 @@ typedef enum { - * @param[in] log_id log device id - * @param[in] prio priority - * @param[in] tag tag -- * @param[in] fmt format string -+ * @param[in] fmt format string - * @return Operation result - * @retval 0>= Success - * @retval -1 Error -@@ -369,7 +369,6 @@ int __dlog_print(log_id_t log_id, int prio, const char *tag, const char *fmt, .. - * @endcode - */ - int __dlog_vprint(log_id_t log_id, int prio, const char *tag, const char *fmt, va_list ap); --int _get_logging_on(void); - #ifdef __cplusplus - } - #endif /* __cplusplus */ diff --git a/recipes-tizen/libmm-session/libmm-session.inc b/recipes-tizen/libmm-session/libmm-session.inc index dcc09ca..8183188 100644 --- a/recipes-tizen/libmm-session/libmm-session.inc +++ b/recipes-tizen/libmm-session/libmm-session.inc @@ -35,7 +35,6 @@ do_prep() { cp ${S}/packaging/libmm-session.manifest . - } do_patch_append() { bb.build.exec_func('do_prep', d) @@ -54,28 +53,6 @@ do_compile() { 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="${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 ; - autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \ - --target=x86_64-tizen-linux \ - --program-prefix= \ - --prefix=${prefix} \ - --exec-prefix=${prefix} \ - --bindir=${prefix}/bin \ - --sbindir=${prefix}/sbin \ - --sysconfdir=${sysconfdir} \ - --datadir=${prefix}/share \ - --includedir=${prefix}/include \ - --libdir=${prefix}/lib \ - --libexecdir=${prefix}/libexec \ - --localstatedir=${localstatedir} \ - --sharedstatedir=${prefix}/com \ - --mandir=${mandir} \ - --infodir=${infodir} CFLAGS="$CFLAGS -Wp,-D_FORTIFY_SOURCE=0" CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ; @@ -97,7 +74,7 @@ do_compile() { --sharedstatedir=${prefix}/com \ --mandir=${mandir} \ --infodir=${infodir} - make -j16 + oe_runmake -j16 @@ -123,7 +100,6 @@ do_install() { find ${D} -regex ".*\.a$" | xargs rm -f -- - } pkg_postinst_${PN}() { diff --git a/recipes-tizen/libmm-session/libmm-session_git.bb b/recipes-tizen/libmm-session/libmm-session_git.bb index e5dbbb7..1ab5332 100644 --- a/recipes-tizen/libmm-session/libmm-session_git.bb +++ b/recipes-tizen/libmm-session/libmm-session_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/multimedia/libmm-session;tag=cfbc912e50461f204a2ba519ab40a84a45c03bf6;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/multimedia/libmm-session;tag=7976f6b9ab618982fe475f5ed0d96a9f5ade20d9;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/libmm-ta/libmm-ta.inc b/recipes-tizen/libmm-ta/libmm-ta.inc index eb603b7..942a384 100644 --- a/recipes-tizen/libmm-ta/libmm-ta.inc +++ b/recipes-tizen/libmm-ta/libmm-ta.inc @@ -32,7 +32,6 @@ do_prep() { cp ${S}/packaging/libmm-ta.manifest . - } do_patch_append() { bb.build.exec_func('do_prep', d) @@ -52,8 +51,6 @@ do_compile() { LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - CFLAGS="${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 ; @@ -73,27 +70,7 @@ do_compile() { --sharedstatedir=${prefix}/com \ --mandir=${mandir} \ --infodir=${infodir} --disable-static - - CFLAGS="${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 ; - autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \ - --target=x86_64-tizen-linux \ - --program-prefix= \ - --prefix=${prefix} \ - --exec-prefix=${prefix} \ - --bindir=${prefix}/bin \ - --sbindir=${prefix}/sbin \ - --sysconfdir=${sysconfdir} \ - --datadir=${prefix}/share \ - --includedir=${prefix}/include \ - --libdir=${prefix}/lib \ - --libexecdir=${prefix}/libexec \ - --localstatedir=${localstatedir} \ - --sharedstatedir=${prefix}/com \ - --mandir=${mandir} \ - --infodir=${infodir} --disable-static - make -j16 + oe_runmake -j16 @@ -120,9 +97,6 @@ do_install() { find ${D} -regex ".*\.a$" | xargs rm -f -- - - - } pkg_postinst_${PN}() { diff --git a/recipes-tizen/libmm-ta/libmm-ta_git.bb b/recipes-tizen/libmm-ta/libmm-ta_git.bb index 8024abd..c44d72a 100644 --- a/recipes-tizen/libmm-ta/libmm-ta_git.bb +++ b/recipes-tizen/libmm-ta/libmm-ta_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/multimedia/libmm-ta;tag=bcf31b1706fa01175709015adfef70332df68496;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/multimedia/libmm-ta;tag=d4cf22487676cd686fc7344972b52a8e045525f9;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/libnet-client/libnet-client.inc b/recipes-tizen/libnet-client/libnet-client.inc index ad1a4c9..5217fba 100644 --- a/recipes-tizen/libnet-client/libnet-client.inc +++ b/recipes-tizen/libnet-client/libnet-client.inc @@ -42,7 +42,6 @@ do_prep() { cp ${S}/packaging/libnet-client.manifest . - } do_patch_append() { bb.build.exec_func('do_prep', d) @@ -61,27 +60,7 @@ do_compile() { 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="${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 ; - autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \ - --target=x86_64-tizen-linux \ - --program-prefix= \ - --prefix=${prefix} \ - --exec-prefix=${prefix} \ - --bindir=${prefix}/bin \ - --sbindir=${prefix}/sbin \ - --sysconfdir=${sysconfdir} \ - --datadir=${prefix}/share \ - --includedir=${prefix}/include \ - --libdir=${prefix}/lib \ - --libexecdir=${prefix}/libexec \ - --localstatedir=${localstatedir} \ - --sharedstatedir=${prefix}/com \ - --mandir=${mandir} \ - --infodir=${infodir}.sh + mkdir -p m4 CFLAGS="${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 ; @@ -102,9 +81,7 @@ do_compile() { --sharedstatedir=${prefix}/com \ --mandir=${mandir} \ --infodir=${infodir} - - make -j16 - + oe_runmake -j16 diff --git a/recipes-tizen/libnet-client/libnet-client_git.bb b/recipes-tizen/libnet-client/libnet-client_git.bb index 02d4502..1ccdf2a 100644 --- a/recipes-tizen/libnet-client/libnet-client_git.bb +++ b/recipes-tizen/libnet-client/libnet-client_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/connectivity/libnet-client;tag=12b461472e8e1b6abec86752735f6d55e098862b;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/connectivity/libnet-client;tag=40fca8c3bf88877ec93c7e191064f94ca68c365c;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/media-server/media-server.inc b/recipes-tizen/media-server/media-server.inc index 430c549..66da5d8 100644 --- a/recipes-tizen/media-server/media-server.inc +++ b/recipes-tizen/media-server/media-server.inc @@ -73,28 +73,9 @@ do_compile() { 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="${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 ; - autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \ - --target=x86_64-tizen-linux \ - --program-prefix= \ - --prefix=${prefix} \ - --exec-prefix=${prefix} \ - --bindir=${prefix}/bin \ - --sbindir=${prefix}/sbin \ - --sysconfdir=${sysconfdir} \ - --datadir=${prefix}/share \ - --includedir=${prefix}/include \ - --libdir=${prefix}/lib \ - --libexecdir=${prefix}/libexec \ - --localstatedir=${localstatedir} \ - --sharedstatedir=${prefix}/com \ - --mandir=${mandir} \ - --infodir=${infodir} + rm -rf autom4te.cache + rm -f aclocal.m4 ltmain.sh + mkdir -p m4 CFLAGS="${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 ; @@ -115,8 +96,7 @@ do_compile() { --sharedstatedir=${prefix}/com \ --mandir=${mandir} \ --infodir=${infodir} --prefix=${prefix} --disable-static - - make -j16 + oe_runmake -j16 @@ -141,9 +121,9 @@ do_install() { find ${D} -regex ".*\.la$" | xargs rm -f -- find ${D} -regex ".*\.a$" | xargs rm -f -- - mkdir -p ${D}/usr/lib/systemd/system/multi-user.target.wants - install -m 644 ${S}/packaging/media-server.service ${D}/usr/lib/systemd/system/media-server.service - ln -s ../media-server.service ${D}/usr/lib/systemd/system/multi-user.target.wants/media-server.service + mkdir -p ${D}/lib/systemd/system/multi-user.target.wants + install -m 644 ${S}/packaging/media-server.service ${D}/lib/systemd/system/media-server.service + ln -s ../media-server.service ${D}/lib/systemd/system/multi-user.target.wants/media-server.service mkdir -p ${D}${prefix}/data/data-media/Camera mkdir -p ${D}${prefix}/data/data-media/Downloads mkdir -p ${D}${prefix}/data/data-media/Images @@ -203,8 +183,8 @@ media-server_files += "media-server.manifest" media-server_files += "${prefix}/bin/media-server" media-server_files += "${prefix}/bin/media-scanner" media-server_files += "${prefix}/bin/mediadb-update" -media-server_files += "/usr/lib/systemd/system/media-server.service" -media-server_files += "/usr/lib/systemd/system/multi-user.target.wants/media-server.service" +media-server_files += "/lib/systemd/system/media-server.service" +media-server_files += "/lib/systemd/system/multi-user.target.wants/media-server.service" media-server_files += "${prefix}/bin/media-data-sdk_create_db.sh" media-server_files += "${prefix}/data/data-media/*" media-server_files += "${prefix}/data/data-media/file-manager-service/.thumb/*" diff --git a/recipes-tizen/media-server/media-server_git.bb b/recipes-tizen/media-server/media-server_git.bb index a92af0b..3b9233f 100644 --- a/recipes-tizen/media-server/media-server_git.bb +++ b/recipes-tizen/media-server/media-server_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/multimedia/media-server;tag=2cdbd222416f212c4969365c8555c6b45da7f386;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/multimedia/media-server;tag=ba5947fa82abea4a806f5498e9d26c6ffa94c847;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/pam/pam-extraconf.inc b/recipes-tizen/pam/pam-extraconf.inc index dca7101..f95e60f 100644 --- a/recipes-tizen/pam/pam-extraconf.inc +++ b/recipes-tizen/pam/pam-extraconf.inc @@ -77,16 +77,21 @@ RPROVIDES_${PN}-modules-extra += "pam-plugin-rootok" RPROVIDES_${PN}-modules-extra += "pam-plugin-keyinit" RPROVIDES_${PN}-modules-extra += "pam-plugin-loginuid" + +pam_files += "/var/log" + +do_install_append() { + mkdir -p $D/var/log +} + pkg_postinst_${PN}() { #!/bin/sh -e [ "x\$D" == "x" ] && ldconfig if [ ! -a $D/var/log/faillog ] ; then - mkdir -p $D/var/log /usr/bin/install -m 600 /dev/null $D/var/log/faillog fi if [ ! -a $D/var/log/tallylog ] ; then - mkdir -p $D/var/log /usr/bin/install -m 600 /dev/null $D/var/log/tallylog fi diff --git a/recipes-tizen/slp-pkgmgr/slp-pkgmgr_git.bb b/recipes-tizen/slp-pkgmgr/slp-pkgmgr_git.bb index 3bfedf1..21e138c 100644 --- a/recipes-tizen/slp-pkgmgr/slp-pkgmgr_git.bb +++ b/recipes-tizen/slp-pkgmgr/slp-pkgmgr_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/appfw/slp-pkgmgr;tag=5c67e3748c2beb9cd685390d1f0d4349f3334f0f;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/appfw/slp-pkgmgr;tag=bf4b32c78cac7d810db5c468926640a55d480dd3;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/user-session-units/user-session-units.inc b/recipes-tizen/user-session-units/user-session-units.inc index afcaae6..32901d0 100644 --- a/recipes-tizen/user-session-units/user-session-units.inc +++ b/recipes-tizen/user-session-units/user-session-units.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Systemd session units" HOMEPAGE = "http://nohomepage.org" -SECTION = "System/Base" +SECTION = "System/Configuration" LICENSE = "GPL-2.0" SRC_URI = "" @@ -42,7 +42,6 @@ do_prep() { cp ${S}/packaging/user-session-units.manifest . - } do_patch_append() { bb.build.exec_func('do_prep', d) @@ -62,27 +61,6 @@ do_compile() { LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - CFLAGS="${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 ; - autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \ - --target=x86_64-tizen-linux \ - --program-prefix= \ - --prefix=${prefix} \ - --exec-prefix=${prefix} \ - --bindir=${prefix}/bin \ - --sbindir=${prefix}/sbin \ - --sysconfdir=${sysconfdir} \ - --datadir=${prefix}/share \ - --includedir=${prefix}/include \ - --libdir=${prefix}/lib \ - --libexecdir=${prefix}/libexec \ - --localstatedir=${localstatedir} \ - --sharedstatedir=${prefix}/com \ - --mandir=${mandir} \ - --infodir=${infodir} - CFLAGS="${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 ; @@ -102,9 +80,7 @@ do_compile() { --sharedstatedir=${prefix}/com \ --mandir=${mandir} \ --infodir=${infodir} --enable-gnome --enable-enlightenment - - make -j16 - + oe_runmake -j16 @@ -128,12 +104,10 @@ do_install() { rm -f ${D}${infodir}/dir find ${D} -regex ".*\.la$" | xargs rm -f -- find ${D} -regex ".*\.a$" | xargs rm -f -- - install -m 755 -d ${D}${sysconfdir}/pam.d install -m 644 ${S}/packaging/user-session.pam ${D}${sysconfdir}/pam.d/user-session - } PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" diff --git a/recipes-tizen/user-session-units/user-session-units_git.bb b/recipes-tizen/user-session-units/user-session-units_git.bb index bd03610..71a5bff 100644 --- a/recipes-tizen/user-session-units/user-session-units_git.bb +++ b/recipes-tizen/user-session-units/user-session-units_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/upstream/user-session-units;tag=545e17bc1926c6f7967aeefc128a95ee8483010d;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/user-session-units;tag=66949d8ede2d915a1ec7de6558695335dd18e6a6;nobranch=1" BBCLASSEXTEND += " native " -- 2.7.4