Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
meta-nemo
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
NemoMobile
meta-nemo
Commits
f6220e8d
Commit
f6220e8d
authored
Jan 20, 2016
by
Florent Revest
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds a recipe for tzdata-timed
parent
a4e34c7f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
81 additions
and
1 deletion
+81
-1
timed_git.bb
recipes-nemomobile/timed/timed_git.bb
+3
-1
0001-Fixes-build-and-avoid-md5sum-mismatch-with-GMT-timez.patch
...ixes-build-and-avoid-md5sum-mismatch-with-GMT-timez.patch
+61
-0
tzdata-timed_git.bb
recipes-nemomobile/timed/tzdata-timed_git.bb
+17
-0
No files found.
recipes-nemomobile/timed/timed_git.bb
View file @
f6220e8d
...
@@ -23,9 +23,11 @@ do_configure_prepend() {
...
@@ -23,9 +23,11 @@ do_configure_prepend() {
do_install_append() {
do_install_append() {
install -d ${D}/usr/lib/systemd/user/default.target.wants/
install -d ${D}/usr/lib/systemd/user/default.target.wants/
ln -s ../timed-qt5.service ${D}/usr/lib/systemd/user/default.target.wants/timed-qt5.service
ln -s ../timed-qt5.service ${D}/usr/lib/systemd/user/default.target.wants/timed-qt5.service
ln -s /usr/share/zoneinfo/Etc/GMT ${D}/var/lib/timed/localtime
}
}
DEPENDS += "pcre systemd tzdata libiodata-native libiodata statefs-qt qtbase"
DEPENDS += "pcre systemd tzdata libiodata-native libiodata statefs-qt qtbase tzdata-timed"
RDEPENDS_${PN} += "tzdata-timed"
FILES_${PN} += "/usr/lib/ /usr/share/contextkit"
FILES_${PN} += "/usr/lib/ /usr/share/contextkit"
FILES_${PN}-dev += "/usr/share/mkspecs"
FILES_${PN}-dev += "/usr/share/mkspecs"
FILES_${PN}-dbg += "/opt"
FILES_${PN}-dbg += "/opt"
...
...
recipes-nemomobile/timed/tzdata-timed/0001-Fixes-build-and-avoid-md5sum-mismatch-with-GMT-timez.patch
0 → 100644
View file @
f6220e8d
From 090efa5ea63003735f8c055c95e560d261003476 Mon Sep 17 00:00:00 2001
From: Florent Revest <revestflo@gmail.com>
Date: Wed, 20 Jan 2016 19:27:19 +0100
Subject: [PATCH] Fixes build and avoid md5sum mismatch with GMT timezones
---
Makefile | 4 ++--
scripts/find-aliases.perl | 15 ++++++++-------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 8a7c0e2..a8a880a 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
createdirs:
# Compile helper binary for calculating custom signatures for
# compiled time zone information files.
signature: createdirs
- $(CC) $(SCRIPTS_DIR)/signature.c++ -Wall -Werror -xc++ -o $(BUILD_DIR)/signature
+ ${BUILD_CXX} $(SCRIPTS_DIR)/signature.c++ -Wall -Werror -xc++ -o $(BUILD_DIR)/signature
# Create time zones according to ISO 8601.
iso8601zones: createdirs
@@ -52,7 +52,7 @@
find-aliases: process-zones list-zones-without-links
perl -w -s $(SCRIPTS_DIR)/find-aliases.perl \
-zones=$(BUILD_DIR)/zone.list -signatures=$(BUILD_DIR)/signatures \
-md5sum=$(BUILD_DIR)/md5sum -links=$(BUILD_DIR)/zone.link \
- -zonetab=/usr/share/zoneinfo/zone.tab > $(BUILD_DIR)/zone.alias
+ -zonetab=$(SRC_DIR)/zone.tab > $(BUILD_DIR)/zone.alias
prepare-timed-data: find-aliases
$(SCRIPTS_DIR)/prepare-timed-data.perl \
diff --git a/scripts/find-aliases.perl b/scripts/find-aliases.perl
index 3a1ab1d..22dcb1a 100755
--- a/scripts/find-aliases.perl
+++ b/scripts/find-aliases.perl
@@ -234,13 +234,14 @@
my $zulu = "Iso8601/+0000" ;
add_alias_manually($zulu, $_) for qw/UTC GMT UCT Universal Greenwich Zulu GMT+0 GMT-0 GMT0/ ;
add_alias_manually($zulu, "Etc/$_") for qw/UTC GMT UCT Universal Greenwich Zulu GMT+0 GMT-0 GMT0/ ;
-foreach my $h (-14 .. 12)
-{
- next unless $h ;
- my $iso = sprintf "Iso8601/%s%02d00", (-$h < 0 ? "-" : "+"), abs($h) ;
- my $posix = sprintf "Etc/GMT%s%d", ($h < 0 ? "" : "+"), $h ;
- add_alias_manually($iso, $posix) ;
-}
+# TODO: For some reasons those timezones don't match, we should try to fix that
+#foreach my $h (-14 .. 12)
+#{
+# next unless $h ;
+# my $iso = sprintf "Iso8601/%s%02d00", (-$h < 0 ? "-" : "+"), abs($h) ;
+# my $posix = sprintf "Etc/GMT%s%d", ($h < 0 ? "" : "+"), $h ;
+# add_alias_manually($iso, $posix) ;
+#}
print STDERR "WARNING: unsupported zones ", join(", ", sort keys %$unsupported), "\n" ;
--
2.7.0.rc3
recipes-nemomobile/timed/tzdata-timed_git.bb
0 → 100644
View file @
f6220e8d
SUMMARY = "Nemomobile's time daemon's time zone data"
HOMEPAGE = "https://git.merproject.org/mer-core/tzdata-timed"
LICENSE = "PD"
LIC_FILES_CHKSUM = "file://legacy/copyright;md5=b103f1aabbbf321a0b6cf5056bca002e"
SRC_URI = "git://git.merproject.org/mer-core/tzdata-timed.git;protocol=https \
file://0001-Fixes-build-and-avoid-md5sum-mismatch-with-GMT-timez.patch"
SRCREV = "5b8b301e6ea7ab55e46f67b3b0f3350241812852"
PR = "r1"
PV = "+git${SRCREV}"
S = "${WORKDIR}/git"
B = "${S}"
do_install() {
export INSTALL_ROOT=${D}
oe_runmake install
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment