fix update
authorRonan Le Martret <ronan@fridu.net>
Mon, 23 Jun 2014 12:42:49 +0000 (14:42 +0200)
committerRonan Le Martret <ronan@fridu.net>
Mon, 23 Jun 2014 12:42:49 +0000 (14:42 +0200)
Change-Id: Icca142b573ef518b7a4ff1a9039b5267c95a430b
Signed-off-by: Ronan Le Martret <ronan@fridu.net>
proto-meta-Tizen_generic/.spec2yoctorc
proto-meta-Tizen_generic/rpm_tizen_macro/etc/macros.tizen-platform
proto-meta-Tizen_generic/rpm_tizen_macro/lib/tizen_macros
proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec
proto-meta-Tizen_generic/specfile-initial/smack/packaging/smack.spec
proto-meta-Tizen_generic/specfile-initial/systemd/packaging/systemd.spec
proto-meta-Tizen_generic/specfile-initial/weston-common/packaging/weston-common.spec
tools/spec2yocto.py

index 3562acb..5c3ebb7 100644 (file)
@@ -17,7 +17,7 @@ group_uri=http://download.tizen.org/snapshots/tizen/common/common-wayland-x86_64
 provided-extra=tizen-provided-extra
 
 [tizen_common_manifest]
-uri=http://download.tizen.org/snapshots/tizen/common/common-wayland-x86_64/latest/
+uri=http://download.tizen.org/snapshots/tizen/common/latest/
 default_git_src=review.tizen.org
 priority=0
 
@@ -27,7 +27,7 @@ default_git_src=review.tizen.org
 priority=1
 
 [whitelist_tizen_common]
-list=smack, rpm, uthash, lua, weston-common,  fdupes, doxygen, crosswalk, libslp-location, location-manager, vconf, appcore-agent, dlog, common, libslp-sysman, aul-1, librua, libhaptic, pkgmgr-info, libdevice-node, xdgmime, libprivilege-control, ail, bundle, app-checker, privacy-manager, libslp-pm, vconf-internal-keys, system-info, libiri, sound-manager, iniparser, libmm-sound, libmm-session, libmm-common, libmm-log, heynoti, security-server, audio-session-manager, avsystem, libmm-ta, slp-pkgmgr, app-core, libslp-sensor, libsf-common, tizen-platform-config, application, libslp-db-util, tizen-platform-wrapper, app-svc, notification, alarm-manager, com-core, libtapi, libtapi-legacy, alsa-scenario-0.2, systemd, hwdata, user-session-units, systemd, meta, pam, desktop-skin
+list=smack, rpm, uthash, lua, weston-common,  fdupes, doxygen, crosswalk, libslp-location, location-manager, vconf, appcore-agent, dlog, common, libslp-sysman, aul-1, librua, libhaptic, pkgmgr-info, libdevice-node, xdgmime, libprivilege-control, ail, bundle, app-checker, privacy-manager, libslp-pm, vconf-internal-keys, system-info, libiri, sound-manager, iniparser, libmm-sound, libmm-session, libmm-common, libmm-log, heynoti, security-server, audio-session-manager, avsystem, libmm-ta, slp-pkgmgr, app-core, libslp-sensor, libsf-common, tizen-platform-config, application, libslp-db-util, tizen-platform-wrapper, app-svc, notification, alarm-manager, com-core, libtapi, libtapi-legacy, alsa-scenario-0.2, systemd, hwdata, user-session-units, systemd, meta, pam, desktop-skin, default-ac-domains, sensor, tizen-extensions-crosswalk
 
 [substitute]
 pkgconfig(zlib)=zlib-devel
@@ -62,7 +62,7 @@ blacklist=
 
 [depends]
 #ignore some package which must be provided by the host
-ignore=coreutils,tizen-coreutils,glibc-devel-32bit, eglibc, glibc, kernel-headers, linux-kernel-headers, pkg-config, filesystem
+ignore=coreutils,tizen-coreutils,glibc-devel-32bit, eglibc, glibc, kernel-headers, linux-kernel-headers, pkg-config, filesystem,gcc
 #some buildRequire mean depends on native package not runtime
 #ex: automake will be replace by automake-native
 native=automake, fdupes,  intltool, autoconf, pkgconfig, help2man, bison, texinfo, readline, ninja, cmake
@@ -91,7 +91,7 @@ app-checker=pkgconfig(app-checker), pkgconfig(app-checker-server)
 application=pkgconfig(capi-appfw-application)
 attr=libattr-devel, attr-devel
 audio-session-manager=pkgconfig(audio-session-mgr)
-aul-1=pkgconfig(aul)
+aul=pkgconfig(aul)
 avsystem=pkgconfig(avsystem), pkgconfig(avsysaudio)
 bundle=pkgconfig(bundle)
 bzip2=pkgconfig(bzip2), bzip2-devel
@@ -196,3 +196,4 @@ db=db4-devel
 coreutils=/usr/bin/install
 bluez=pkgconfig(bluez)
 sbc=pkgconfig(sbc)
+binutils=binutils-gold
\ No newline at end of file
index 2cabb0e..c44b84b 100644 (file)
@@ -1,29 +1,29 @@
-# I'm generated. Dont edit me! 
+# I'm generated. Dont edit me!
 
 %TZ_SYS_HOME                              /home
 %TZ_SYS_ROOT                              /root
-%TZ_SYS_SHARE                             /usr/share
-%TZ_SYS_ETC                               /etc
-%TZ_SYS_DATA                              /usr/data
-%TZ_SYS_BIN                               /usr/bin
-%TZ_SYS_SMACK                             /etc/smack
-%TZ_SYS_STORAGE                           /usr/storage
+%TZ_SYS_SHARE                             %{_prefix}/share
+%TZ_SYS_ETC                               %{_sysconfdir}
+%TZ_SYS_DATA                              %{_prefix}/data
+%TZ_SYS_BIN                               %{_prefix}/bin
+%TZ_SYS_SMACK                             %{_sysconfdir}/smack
+%TZ_SYS_STORAGE                           %{_prefix}/storage
 %TZ_SYS_USER_GROUP                        users
-%TZ_SYS_DB                                /usr/dbspace
-%TZ_SYS_CONFIG                            /usr/kdb
-%TZ_SYS_RW_APP                            /usr/apps
-%TZ_SYS_RO_APP                            /usr/apps
-%TZ_SYS_RW_WIDGET                         /usr/share/widget
-%TZ_SYS_RO_WIDGET                         /usr/share/widget
-%TZ_SYS_RW_DESKTOP_APP                    /usr/share/applications
-%TZ_SYS_RO_DESKTOP_APP                    /usr/share/applications
-%TZ_SYS_RW_WRT_ENGINE                     /usr/share/wrt-engine
-%TZ_SYS_RO_WRT_ENGINE                     /usr/share/wrt-engine
-%TZ_SYS_RW_PACKAGES                       /usr/share/packages
-%TZ_SYS_RO_PACKAGES                       /usr/share/packages
-%TZ_SYS_WRT_PLUGINS_CONF                  /etc/wrt-plugins
-%TZ_SYS_TIZEN_APIS_CONF                   /etc/tizen-apis
-%TZ_SYS_ACE_CONF                          /etc/ace
+%TZ_SYS_DB                                %{_prefix}/dbspace
+%TZ_SYS_CONFIG                            %{_prefix}/kdb
+%TZ_SYS_RW_APP                            %{_prefix}/apps
+%TZ_SYS_RO_APP                            %{_prefix}/apps
+%TZ_SYS_RW_WIDGET                         %{_prefix}/share/widget
+%TZ_SYS_RO_WIDGET                         %{_prefix}/share/widget
+%TZ_SYS_RW_DESKTOP_APP                    %{_prefix}/share/applications
+%TZ_SYS_RO_DESKTOP_APP                    %{_prefix}/share/applications
+%TZ_SYS_RW_WRT_ENGINE                     %{_prefix}/share/wrt-engine
+%TZ_SYS_RO_WRT_ENGINE                     %{_prefix}/share/wrt-engine
+%TZ_SYS_RW_PACKAGES                       %{_prefix}/share/packages
+%TZ_SYS_RO_PACKAGES                       %{_prefix}/share/packages
+%TZ_SYS_WRT_PLUGINS_CONF                  %{_sysconfdir}/wrt-plugins
+%TZ_SYS_TIZEN_APIS_CONF                   %{_sysconfdir}/tizen-apis
+%TZ_SYS_ACE_CONF                          %{_sysconfdir}/ace
 %TZ_SDK_USER_NAME                         developer
 %TZ_SDK_HOME                              /home/developer
 %TZ_SDK_TOOLS                             /home/developer/sdk_tools
index b0e444c..2984aee 100644 (file)
@@ -180,10 +180,10 @@ unset DISPLAY\
 LANG=C\
 export LANG\
 unset DISPLAY\
-CFLAGS="%optflags" ; export CFLAGS ; \
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
-LD_AS_NEEDED=1; export LD_AS_NEEDED ; \
+CFLAGS="%optflags" ; export CFLAGS ;\
+CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;\
+FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ;\
+LD_AS_NEEDED=1; export LD_AS_NEEDED ;\
 %{nil}
 
 %install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\
@@ -191,13 +191,13 @@ LD_AS_NEEDED=1; export LD_AS_NEEDED ; \
 LANG=C\
 export LANG\
 unset DISPLAY\
-rm -rf %{?buildroot:%{buildroot}} \
-mkdir -p %{?buildroot:%{buildroot}} \
+rm -rf %{?buildroot:%{buildroot}}\
+mkdir -p %{?buildroot:%{buildroot}}\
 %{nil}
 
 
 %clean %%clean\
-rm -rf %{?buildroot:%{buildroot}} \
+rm -rf %{?buildroot:%{buildroot}}\
 %{nil}
 
 %find_lang     %{_rpmconfigdir}/lib/find-lang.sh \${D}%{_buildPrefix}
index cc2123a..3834ba4 100644 (file)
@@ -5,11 +5,14 @@
 # While Tizen 64bit image does not offer 32bit packages at all,
 # check https://bugs.tizen.org/jira/browse/PTREL-803 for details.
 # So disable nacl for 64bit now.
+### ARM
+# Due to OBS build for ARM some files needed by NaCl to be build
+# are not present.
 %define _disable_nacl 1
 
 
 Name:           crosswalk
-Version:        7.36.152.0
+Version:        8.36.155.0
 Release:        0
 Summary:        Crosswalk is an app runtime based on Chromium
 License:        (BSD-3-Clause and LGPL-2.1+)
@@ -55,6 +58,7 @@ BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libexif)
 BuildRequires:  pkgconfig(libpci)
 BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
@@ -161,16 +165,14 @@ if [ -n "${BUILDDIR_NAME}" ]; then
 fi
 
 %if %{with wayland}
-GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1 -Denable_ozone_wayland_vkb=1 -Denable_xdg_shell=1"
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1 -Denable_ozone_wayland_vkb=1 -Denable_xdg_shell=0"
 %endif
 
 # Force gold binary from chroot ld.gold provided by binutils-gold
 GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=%{_disable_nacl} -Dlinux_use_bundled_binutils=0 -Dlinux_use_bundled_gold=0 "
 
 # Linking fails in Tizen Common when fatal ld warnings are enabled. XWALK-1379.
-%if "%{profile}" == "common" || "%{profile}" == "generic"
 GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_fatal_linker_warnings=1"
-%endif
 
 # For building for arm in OBS, we need :
 # -> to unset sysroot value.
index 93fe248..99af779 100644 (file)
@@ -70,4 +70,5 @@ install -d %{buildroot}%{_sysconfdir}/smack/netlabel.d
 %{_sysconfdir}/smack/accesses.d
 %{_sysconfdir}/smack/cipso.d
 %{_sysconfdir}/smack/netlabel.d
-%attr(755,root,root) %{_bindir}/*
\ No newline at end of file
+%attr(755,root,root) %{_bindir}/*
+
index 9804a38..10540a3 100644 (file)
@@ -127,71 +127,71 @@ make %{?_smp_mflags} \
 %make_install
 
 # udev links
-/usr/bin/mkdir -p %{buildroot}/%{_sbindir}
-/usr/bin/ln -sf ../bin/udevadm %{buildroot}%{_sbindir}/udevadm
-/usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/firmware/updates
+%{_bindir}/mkdir -p %{buildroot}/%{_sbindir}
+%{_bindir}/ln -sf ../bin/udevadm %{buildroot}%{_sbindir}/udevadm
+%{_bindir}/mkdir -p %{buildroot}%{_prefix}/lib/firmware/updates
 
 # Create SysV compatibility symlinks. systemctl/systemd are smart
 # enough to detect in which way they are called.
-/usr/bin/ln -s ../lib/systemd/systemd %{buildroot}%{_sbindir}/init
-/usr/bin/ln -s ../lib/systemd/systemd %{buildroot}%{_bindir}/systemd
-/usr/bin/ln -s ../bin/systemctl %{buildroot}%{_sbindir}/reboot
-/usr/bin/ln -s ../bin/systemctl %{buildroot}%{_sbindir}/halt
-/usr/bin/ln -s ../bin/systemctl %{buildroot}%{_sbindir}/poweroff
-/usr/bin/ln -s ../bin/systemctl %{buildroot}%{_sbindir}/shutdown
-/usr/bin/ln -s ../bin/systemctl %{buildroot}%{_sbindir}/telinit
-/usr/bin/ln -s ../bin/systemctl %{buildroot}%{_sbindir}/runlevel
+%{_bindir}/ln -s ../lib/systemd/systemd %{buildroot}%{_sbindir}/init
+%{_bindir}/ln -s ../lib/systemd/systemd %{buildroot}%{_bindir}/systemd
+%{_bindir}/ln -s ../bin/systemctl %{buildroot}%{_sbindir}/reboot
+%{_bindir}/ln -s ../bin/systemctl %{buildroot}%{_sbindir}/halt
+%{_bindir}/ln -s ../bin/systemctl %{buildroot}%{_sbindir}/poweroff
+%{_bindir}/ln -s ../bin/systemctl %{buildroot}%{_sbindir}/shutdown
+%{_bindir}/ln -s ../bin/systemctl %{buildroot}%{_sbindir}/telinit
+%{_bindir}/ln -s ../bin/systemctl %{buildroot}%{_sbindir}/runlevel
 
 # legacy links
-/usr/bin/ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl
+%{_bindir}/ln -s loginctl %{buildroot}%{_bindir}/systemd-loginctl
 
 # We create all wants links manually at installation time to make sure
 # they are not owned and hence overriden by rpm after the used deleted
 # them.
-/usr/bin/rm -r %{buildroot}%{_sysconfdir}/systemd/system/*.target.wants
+%{_bindir}/rm -r %{buildroot}%{_sysconfdir}/systemd/system/*.target.wants
 
 # Make sure the ghost-ing below works
-/usr/bin/touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel2.target
-/usr/bin/touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel3.target
-/usr/bin/touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel4.target
-/usr/bin/touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel5.target
+%{_bindir}/touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel2.target
+%{_bindir}/touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel3.target
+%{_bindir}/touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel4.target
+%{_bindir}/touch %{buildroot}%{_sysconfdir}/systemd/system/runlevel5.target
 
 # Make sure these directories are properly owned
-/usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/basic.target.wants
-/usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants
-/usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/dbus.target.wants
-/usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/syslog.target.wants
+%{_bindir}/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/basic.target.wants
+%{_bindir}/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants
+%{_bindir}/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/dbus.target.wants
+%{_bindir}/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/syslog.target.wants
 
 # Make sure the user generators dir exists too
-/usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-generators
-/usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/user-generators
+%{_bindir}/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-generators
+%{_bindir}/mkdir -p %{buildroot}%{_prefix}/lib/systemd/user-generators
 
 # Create new-style configuration files so that we can ghost-own them
-/usr/bin/touch %{buildroot}%{_sysconfdir}/hostname
-/usr/bin/touch %{buildroot}%{_sysconfdir}/vconsole.conf
-/usr/bin/touch %{buildroot}%{_sysconfdir}/locale.conf
-/usr/bin/touch %{buildroot}%{_sysconfdir}/machine-id
-/usr/bin/touch %{buildroot}%{_sysconfdir}/machine-info
-/usr/bin/touch %{buildroot}%{_sysconfdir}/timezone
-#/usr/bin/mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
-#/usr/bin/touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
-
-/usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset/
-/usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/user-preset/
+%{_bindir}/touch %{buildroot}%{_sysconfdir}/hostname
+%{_bindir}/touch %{buildroot}%{_sysconfdir}/vconsole.conf
+%{_bindir}/touch %{buildroot}%{_sysconfdir}/locale.conf
+%{_bindir}/touch %{buildroot}%{_sysconfdir}/machine-id
+%{_bindir}/touch %{buildroot}%{_sysconfdir}/machine-info
+%{_bindir}/touch %{buildroot}%{_sysconfdir}/timezone
+#%{_bindir}/mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
+#%{_bindir}/touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
+
+%{_bindir}/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset/
+%{_bindir}/mkdir -p %{buildroot}%{_prefix}/lib/systemd/user-preset/
 
 # Make sure the shutdown/sleep drop-in dirs exist
-/usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-shutdown/
-/usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-sleep/
+%{_bindir}/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-shutdown/
+%{_bindir}/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-sleep/
 
 # Make sure the NTP units dir exists
-/usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/ntp-units.d/
+%{_bindir}/mkdir -p %{buildroot}%{_prefix}/lib/systemd/ntp-units.d/
 
 # Install modprobe fragment
-/usr/bin/mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d/
+%{_bindir}/mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d/
 
 # Enable readahead services
-/usr/bin/ln -s ../systemd-readahead-collect.service %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants/
-/usr/bin/ln -s ../systemd-readahead-replay.service %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants/
+%{_bindir}/ln -s ../systemd-readahead-collect.service %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants/
+%{_bindir}/ln -s ../systemd-readahead-replay.service %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants/
 
 # Fix the dangling /var/lock -> /run/lock symlink
 install -Dm644 tmpfiles.d/legacy.conf %{buildroot}%{_prefix}/lib/tmpfiles.d/legacy.conf
@@ -208,37 +208,37 @@ install -m644 src/core/macros.systemd %{buildroot}%{_sysconfdir}/rpm/macros.syst
 rm -f %{buildroot}%{_prefix}/lib/rpm/macros.d/macros.systemd
 
 %pre
-/usr/bin/getent group cdrom >/dev/null 2>&1 || /usr/sbin/groupadd -r -g 11 cdrom >/dev/null 2>&1 || :
-/usr/bin/getent group tape >/dev/null 2>&1 || /usr/sbin/groupadd -r -g 33 tape >/dev/null 2>&1 || :
-/usr/bin/getent group dialout >/dev/null 2>&1 || /usr/sbin/groupadd -r -g 18 dialout >/dev/null 2>&1 || :
-/usr/bin/getent group floppy >/dev/null 2>&1 || /usr/sbin/groupadd -r -g 19 floppy >/dev/null 2>&1 || :
-/usr/bin/systemctl stop systemd-udevd-control.socket systemd-udevd-kernel.socket systemd-udevd.service >/dev/null 2>&1 || :
+%{_bindir}/getent group cdrom >/dev/null 2>&1 || %{_sbindir}/groupadd -r -g 11 cdrom >/dev/null 2>&1 || :
+%{_bindir}/getent group tape >/dev/null 2>&1 || %{_sbindir}/groupadd -r -g 33 tape >/dev/null 2>&1 || :
+%{_bindir}/getent group dialout >/dev/null 2>&1 || %{_sbindir}/groupadd -r -g 18 dialout >/dev/null 2>&1 || :
+%{_bindir}/getent group floppy >/dev/null 2>&1 || %{_sbindir}/groupadd -r -g 19 floppy >/dev/null 2>&1 || :
+%{_bindir}/systemctl stop systemd-udevd-control.socket systemd-udevd-kernel.socket systemd-udevd.service >/dev/null 2>&1 || :
 
 # Rename configuration files that changed their names
-/usr/bin/mv -n %{_sysconfdir}/systemd/systemd-logind.conf %{_sysconfdir}/systemd/logind.conf >/dev/null 2>&1 || :
-/usr/bin/mv -n %{_sysconfdir}/systemd/systemd-journald.conf %{_sysconfdir}/systemd/journald.conf >/dev/null 2>&1 || :
+%{_bindir}/mv -n %{_sysconfdir}/systemd/systemd-logind.conf %{_sysconfdir}/systemd/logind.conf >/dev/null 2>&1 || :
+%{_bindir}/mv -n %{_sysconfdir}/systemd/systemd-journald.conf %{_sysconfdir}/systemd/journald.conf >/dev/null 2>&1 || :
 
 %post
-/usr/bin/systemd-machine-id-setup > /dev/null 2>&1 || :
-/usr/lib/systemd/systemd-random-seed save > /dev/null 2>&1 || :
-/usr/bin/systemctl daemon-reexec > /dev/null 2>&1 || :
-/usr/bin/systemctl start systemd-udevd.service >/dev/null 2>&1 || :
+%{_bindir}/systemd-machine-id-setup > /dev/null 2>&1 || :
+%{_prefix}/lib/systemd/systemd-random-seed save > /dev/null 2>&1 || :
+%{_bindir}/systemctl daemon-reexec > /dev/null 2>&1 || :
+%{_bindir}/systemctl start systemd-udevd.service >/dev/null 2>&1 || :
 
 %postun
 if [ $1 -ge 1 ] ; then
-        /usr/bin/systemctl daemon-reload > /dev/null 2>&1 || :
-        /usr/bin/systemctl try-restart systemd-logind.service >/dev/null 2>&1 || :
+        %{_bindir}/systemctl daemon-reload > /dev/null 2>&1 || :
+        %{_bindir}/systemctl try-restart systemd-logind.service >/dev/null 2>&1 || :
 fi
 
 %preun
 if [ $1 -eq 0 ] ; then
-        /usr/bin/systemctl disable \
+        %{_bindir}/systemctl disable \
                 getty@.service \
                 remote-fs.target \
                 systemd-readahead-replay.service \
                 systemd-readahead-collect.service >/dev/null 2>&1 || :
 
-        /usr/bin/rm -f /etc/systemd/system/default.target >/dev/null 2>&1 || :
+        %{_bindir}/rm -f %{_sysconfdir}/systemd/system/default.target >/dev/null 2>&1 || :
 fi
 
 %post -n libsystemd -p /sbin/ldconfig
@@ -251,7 +251,7 @@ fi
 
 %files
 %manifest %{name}.manifest
-%{_sysconfdir}/systemd/bootchart.conf
+%config %{_sysconfdir}/systemd/bootchart.conf
 %config %{_sysconfdir}/pam.d/systemd-user
 %{_bindir}/bootctl
 %{_bindir}/kernel-install
@@ -305,7 +305,7 @@ fi
 %config(noreplace) %{_sysconfdir}/systemd/journald.conf
 %config(noreplace) %{_sysconfdir}/udev/udev.conf
 #%{_sysconfdir}/bash_completion.d/systemd-bash-completion.sh
-%{_sysconfdir}/rpm/macros.systemd
+%config %{_sysconfdir}/rpm/macros.systemd
 %{_sysconfdir}/xdg/systemd
 %ghost %config(noreplace) %{_sysconfdir}/hostname
 %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf
@@ -336,7 +336,7 @@ fi
 %{_prefix}/lib/systemd/systemd
 %{_prefix}/lib/systemd/system
 
-%dir /usr/lib/systemd/system/basic.target.wants
+%dir %{_prefix}/lib/systemd/system/basic.target.wants
 %dir %{_prefix}/lib/systemd/user
 %{_prefix}/lib/systemd/user/bluetooth.target
 %{_prefix}/lib/systemd/user/exit.target
index 9796eb4..5b44e3e 100644 (file)
@@ -131,9 +131,10 @@ getent group weston-launch >/dev/null || %{_sbindir}/groupadd -r -o weston-launc
 # create user 'display'
 getent passwd %{daemon_user} >/dev/null || %{_sbindir}/useradd -r -g %{daemon_group} -d /run/display -s /bin/false -c "Display daemon" %{daemon_user}
 
-# add user 'display' to groups 'weston-launch' and 'input'
+# add user 'display' to groups 'weston-launch', 'input' and 'video'
 groupmod -A %{daemon_user} weston-launch
 groupmod -A %{daemon_user} input
+groupmod -A %{daemon_user} video
 
 # setup display manager service
 mkdir -p %{_unitdir}/graphical.target.wants/
index 92632ee..e11eb40 100755 (executable)
@@ -1464,6 +1464,7 @@ class MetaSpec:
         self.__package_recipes_dir = package_recipes_dir
         self.__package_name = package_name
 
+
         self.__package_git_srv_src = package_git_srv_src
         self.__package_git_srv_path = package_git_srv_path
 
@@ -1471,6 +1472,7 @@ class MetaSpec:
         self.__git_tag = package_git_tag
 
         self.__spec_parser = SpecParser( self.__package_spec_path )
+        self.__package_spec_name = self.__spec_parser.get_name()
 
         self.__packages_dico = self.__spec_parser.get_files_packages()
         self.__provides_dico = self.__spec_parser.get_provides()
@@ -1570,23 +1572,20 @@ class MetaSpec:
             file_d.write( "require %s\n\n" % self.__extra_conf_file )
 
     def __create_files_packaging(self,file_d):
+            file_d.write( "PACKAGES = \"${PN}-dbg ${PN}-doc ${PN}-locale\"\n" )
             for package in self.__packages_dico.keys():
                 pkg_yocto_name=package
                 for res_pkg_devel in re.findall( RePattern.paternDevel, pkg_yocto_name ):
                     pkg_yocto_name=pkg_yocto_name.replace("-devel","-dev")
 
                 if  pkg_yocto_name not in [self.__package_name+"-dbg",
-                        self.__package_name+"-dev",
-                        self.__package_name+"-doc",
-                        self.__package_name+"-locale",
-                        self.__package_name,
-                        ]:
-
+                                           self.__package_name+"-doc",
+                                           self.__package_name+"-locale",
+                                          ]:
                     file_d.write( "PACKAGES += \" %s \"\n" % pkg_yocto_name )
 
             file_d.write( "\n" )
 
-            package_name = self.__spec_parser.get_name()
             _license = self.__spec_parser.get_license()
 
             for package in self.__packages_dico.keys():
@@ -1596,29 +1595,8 @@ class MetaSpec:
 
                 file_d.write( "%s_files = \"\"\n" % pkg_yocto_name )
 
-#                if "-debugsource" in package:
-#                    file_d.write( "%s_files += \"%s\"\n" % ( pkg_yocto_name, "/usr/src/debug" ) )
-#                elif "-debug" in package:
-#                    file_d.write( "%s_files += \"%s\"\n" % ( pkg_yocto_name, "/usr/bin/.debug" ) )
-#                    file_d.write( "%s_files += \"%s\"\n" % ( pkg_yocto_name, "/bin/.debug" ) )
-#                    file_d.write( "%s_files += \"%s\"\n" % ( pkg_yocto_name, "/lib/.debug" ) )
-#                    file_d.write( "%s_files += \"%s\"\n" % ( pkg_yocto_name, "/usr/lib/.debug" ) )
-#                    file_d.write( "%s_files += \"%s\"\n" % ( pkg_yocto_name, "/sbin/.debug" ) )
-#                    file_d.write( "%s_files += \"%s\"\n" % ( pkg_yocto_name, "/usr/sbin/.debug" ) )
-#                elif "-docs" in package:
-#                    file_d.write( "%s_files += \"%s\"\n" % ( pkg_yocto_name, "/usr/share/info" ) )
-#                    file_d.write( "%s_files += \"%s\"\n" % ( pkg_yocto_name, "/usr/share/man" ) )
-#                    file_d.write( "%s_files += \"%s\"\n" % ( pkg_yocto_name, "/usr/share/man/man*" ) )
-#                    file_d.write( "%s_files += \"%s\"\n" % ( pkg_yocto_name, "/usr/share/man/*/man/*" ) )
-#                    file_d.write( "%s_files += \"%s\"\n" % ( pkg_yocto_name, "/usr/share/gtk-doc/html/*" ) )
-#                    file_d.write( "%s_files += \"%s\"\n" % ( pkg_yocto_name, "/usr/share/info/*\info*" ) )
-
                 for pkg_f in self.__packages_dico[package]:
                     pkg_f=pkg_f.strip()
-                    #if pkg_f.startswith("%attr"):
-                    #    pkg_f_clean=pkg_f.split(")")
-                    #    pkg_f=pkg_f_clean[1].strip()
-                    #    file_d.write( "#Remove rpm attribut \"%s)\"\n" % ( pkg_f_clean[0].strip()) )
 
                     if  pkg_f.startswith( _license ):
                         pass
@@ -1629,7 +1607,7 @@ class MetaSpec:
                 file_d.write( "\n" )
 
             for package in self.__packages_dico.keys():
-                p_parse = package.replace( package_name, "${PN}" )
+                p_parse = package.replace( self.__package_name, "${PN}" )
                 p_parse = p_parse.replace("-devel","-dev")
                 pkg_yocto_name = package.replace("-devel","-dev")
                 file_d.write( "FILES_%s = \"${%s_files}\"\n" % ( p_parse, pkg_yocto_name ) )
@@ -1683,6 +1661,7 @@ class MetaSpec:
         command_list = code.split("\n")
         formated_code = ""
         for line in command_list:
+
             if line != "":
                 formated_code += "    " + line + "\n"
 
@@ -1692,6 +1671,10 @@ class MetaSpec:
         '''
         Writes the pre/post (un)install sections of the recipe.
         '''
+        code=code.replace("/sbin/ldconfig","ldconfig")
+        code=code.replace("${prefix}","${D}${prefix}")
+
+
         file_d.write("%s%s() {\n" % (recipe_section, package_name))
         file_d.write("    #!/bin/sh -e\n\n")
         file_d.write("%s\n" % code)
@@ -1751,7 +1734,7 @@ class MetaSpec:
                 pkg_yocto_name=pkg_yocto_name.replace("-devel","-dev")
 
             if len( self.__provides_dico[k_provide] ) > 0:
-                file_d.write( "#PROVIDES by %s \n" % pkg_yocto_name )
+                file_d.write( "#PROVIDES by %s\n" % pkg_yocto_name.replace(" ","") )
 
             for p_provide in self.__provides_dico[k_provide]:
                 pkg = p_provide[0]
@@ -1959,7 +1942,7 @@ class MetaSpec:
             res_depends = set()
             for k_provide in depends_dico.keys():
                 if len( depends_dico[k_provide] ) > 0:
-                    file_d.write( "#DEPENDS of %s \n" % k_provide )
+                    file_d.write( "#DEPENDS of %s\n" % k_provide )
 
                 for p_provide in depends_dico[k_provide]:
                     pp_provide = p_provide[0]
@@ -2070,7 +2053,7 @@ def download_manifest_url( url ):
     return page
 
 def download_build_xml( url ):
-    return download_url( url + "/builddata/build.xml" )
+    return download_url( url + "/build.xml" )
 
 def get_project_id( xml ):
     aElement = ElementTree.fromstring( xml )
@@ -2353,15 +2336,19 @@ class manifestCollection:
                     list_arch = get_project_arch( xml_str )
 
                     arch = SPEC2YOCTO_CONFIG.get_project_arch( self.__my_project )
-
+                    buildtarget = "x86_64-wayland"
+                    
                     if ( arch == "i586" ) and ( "ia32" in list_arch ):
                         arch = "ia32"
+                        buildtarget ="ia32-wayland"
+
                     elif ( arch is None ) and ( len( list_arch ) > 0 ):
                         arch = list_arch[0]
+
                     elif ( arch not in list_arch ):
                         arch = list_arch[0]
 
-                    manifest_name = "%s_%s.xml" % ( project_id, arch )
+                    manifest_name = "%s_%s.xml" % ( project_id, buildtarget )
                     meta_manifest_url_path = "%s/builddata/manifest/%s"
                     meta_manifest_url_path = meta_manifest_url_path % ( meta_manifest_uri,
                                                                         manifest_name )