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
729bea14
Commit
729bea14
authored
Dec 08, 2015
by
Florent Revest
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mce: update to latest version in order to support AUTOSLEEP kernels
parent
b9a449f9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
28 deletions
+21
-28
001-Fixes_build.patch
recipes-nemomobile/mce/mce/001-Fixes_build.patch
+19
-26
mce_git.bb
recipes-nemomobile/mce/mce_git.bb
+2
-2
No files found.
recipes-nemomobile/mce/mce/001-Fixes_build.patch
View file @
729bea14
commit e50a224cc64b3caa2e83a22dad8569e0c654b7eb
From 9879ff15e08d16e93ef88439b78997fad2bf1582 Mon Sep 17 00:00:00 2001
Author: Florent Revest <revestflo@gmail.com>
From: Florent Revest <revestflo@gmail.com>
Date: Mon Jun 8 01:52:54 2015 +0200
Date: Tue, 8 Dec 2015 12:06:27 +0100
Subject: [PATCH] Fixes build
Fixes build with yocto
---
Makefile | 102 +++++++++++++++++++++++++++++++--------------------------------
1 file changed, 51 insertions(+), 51 deletions(-)
diff --git a/Makefile b/Makefile
diff --git a/Makefile b/Makefile
index
731fffb..f1fa87f
100644
index
aaef621..aee36fc
100644
--- a/Makefile
--- a/Makefile
+++ b/Makefile
+++ b/Makefile
@@ -18
1,70 +181
,70 @@
DBUSCONF := mce.conf
@@ -18
0,70 +180
,70 @@
DBUSCONF := mce.conf
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# C Preprocessor
# C Preprocessor
...
@@ -124,19 +127,16 @@ index 731fffb..f1fa87f 100644
...
@@ -124,19 +127,16 @@ index 731fffb..f1fa87f 100644
# Linker
# Linker
LDLIBS += -Wl,--as-needed
LDLIBS += -Wl,--as-needed
@@ -26
1,9 +261,9
@@
MCE_PKG_NAMES += dbus-1
@@ -26
0,7 +260,7
@@
MCE_PKG_NAMES += dbus-1
MCE_PKG_NAMES += dbus-glib-1
MCE_PKG_NAMES += dbus-glib-1
MCE_PKG_NAMES += dsme
MCE_PKG_NAMES += dsme
MCE_PKG_NAMES += libiphb
MCE_PKG_NAMES += libiphb
-MCE_PKG_NAMES += libsystemd-daemon
-MCE_PKG_NAMES += libsystemd-daemon
+MCE_PKG_NAMES += libsystemd
+MCE_PKG_NAMES += libsystemd
MCE_PKG_NAMES += libngf0
-MCE_PKG_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(MCE_PKG_NAMES))
MCE_PKG_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(MCE_PKG_NAMES))
+MCE_PKG_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(MCE_PKG_NAMES))
@@ -305,7 +305,7 @@
ifeq ($(strip $(ENABLE_WAKELOCKS)),y)
MCE_PKG_LDLIBS := $(shell $(PKG_CONFIG) --libs $(MCE_PKG_NAMES))
MCE_CFLAGS += -DMCE_CONF_DIR='"$(CONFDIR)"'
@@ -303,15 +303,15 @@
ifeq ($(strip $(ENABLE_WAKELOCKS)),y)
MCE_CORE += libwakelock.c
MCE_CORE += libwakelock.c
endif
endif
...
@@ -145,17 +145,7 @@ index 731fffb..f1fa87f 100644
...
@@ -145,17 +145,7 @@ index 731fffb..f1fa87f 100644
mce : LDLIBS += $(MCE_LDLIBS)
mce : LDLIBS += $(MCE_LDLIBS)
ifeq ($(ENABLE_HYBRIS),y)
ifeq ($(ENABLE_HYBRIS),y)
mce : LDLIBS += -ldl
mce : LDLIBS += -ldl
endif
@@ -336,7 +336,7 @@
MODULE_LDLIBS += $(MODULE_PKG_LDLIBS)
mce : mce.o $(patsubst %.c,%.o,$(MCE_CORE))
-CFLAGS += -g
-LDFLAGS += -g
+override CFLAGS += -g
+override LDFLAGS += -g
# ----------------------------------------------------------------------------
# MODULES
@@ -334,7 +334,7 @@
MODULE_LDLIBS += $(MODULE_PKG_LDLIBS)
%.pic.o : %.c
%.pic.o : %.c
$(CC) -c -o $@ $< -fPIC $(CPPFLAGS) $(CFLAGS)
$(CC) -c -o $@ $< -fPIC $(CPPFLAGS) $(CFLAGS)
...
@@ -164,7 +154,7 @@ index 731fffb..f1fa87f 100644
...
@@ -164,7 +154,7 @@ index 731fffb..f1fa87f 100644
$(MODULE_DIR)/%.so : LDLIBS += $(MODULE_LDLIBS)
$(MODULE_DIR)/%.so : LDLIBS += $(MODULE_LDLIBS)
$(MODULE_DIR)/%.so : $(MODULE_DIR)/%.pic.o
$(MODULE_DIR)/%.so : $(MODULE_DIR)/%.pic.o
$(CC) -shared -o $@ $^ $(LDFLAGS) $(LDLIBS)
$(CC) -shared -o $@ $^ $(LDFLAGS) $(LDLIBS)
@@ -35
3,11 +353
,11 @@
TOOLS_PKG_LDLIBS := $(shell $(PKG_CONFIG) --libs $(TOOLS_PKG_NAMES))
@@ -35
5,11 +355
,11 @@
TOOLS_PKG_LDLIBS := $(shell $(PKG_CONFIG) --libs $(TOOLS_PKG_NAMES))
TOOLS_CFLAGS += $(TOOLS_PKG_CFLAGS)
TOOLS_CFLAGS += $(TOOLS_PKG_CFLAGS)
TOOLS_LDLIBS += $(TOOLS_PKG_LDLIBS)
TOOLS_LDLIBS += $(TOOLS_PKG_LDLIBS)
...
@@ -178,7 +168,7 @@ index 731fffb..f1fa87f 100644
...
@@ -178,7 +168,7 @@ index 731fffb..f1fa87f 100644
$(TOOLDIR)/evdev_trace : LDLIBS += $(TOOLS_LDLIBS)
$(TOOLDIR)/evdev_trace : LDLIBS += $(TOOLS_LDLIBS)
$(TOOLDIR)/evdev_trace : $(TOOLDIR)/evdev_trace.o evdev.o
$(TOOLDIR)/evdev_trace : $(TOOLDIR)/evdev_trace.o evdev.o
@@ -38
0,7 +380
,7 @@
UTESTS_LDLIBS += $(UTESTS_PKG_LDLIBS)
@@ -38
2,7 +382
,7 @@
UTESTS_LDLIBS += $(UTESTS_PKG_LDLIBS)
UTESTS_CFLAGS += -fdata-sections -ffunction-sections
UTESTS_CFLAGS += -fdata-sections -ffunction-sections
UTESTS_LDLIBS += -Wl,--gc-sections
UTESTS_LDLIBS += -Wl,--gc-sections
...
@@ -187,3 +177,6 @@ index 731fffb..f1fa87f 100644
...
@@ -187,3 +177,6 @@ index 731fffb..f1fa87f 100644
$(UTESTDIR)/% : LDLIBS += $(UTESTS_LDLIBS)
$(UTESTDIR)/% : LDLIBS += $(UTESTS_LDLIBS)
$(UTESTDIR)/% : LDLIBS += $(foreach fn_sym,$(LINK_STUBS),\
$(UTESTDIR)/% : LDLIBS += $(foreach fn_sym,$(LINK_STUBS),\
-Wl,--defsym=$(fn_sym)=stub__$(fn_sym))
-Wl,--defsym=$(fn_sym)=stub__$(fn_sym))
--
2.6.2
recipes-nemomobile/mce/mce_git.bb
View file @
729bea14
...
@@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
...
@@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SRC_URI = "git://git.merproject.org/mer-core/mce.git;protocol=https \
SRC_URI = "git://git.merproject.org/mer-core/mce.git;protocol=https \
file://001-Fixes_build.patch \
file://001-Fixes_build.patch \
file://0002-mce.service-use-a-2-seconds-timeout.patch"
file://0002-mce.service-use-a-2-seconds-timeout.patch"
SRCREV = "
702a41228f7509f49eb3d70713fb4ed47ed06412
"
SRCREV = "
ad535db76b7443febaf4f97328eb1968a3f1d8cc
"
PR = "r1"
PR = "r1"
PV = "+git${SRCREV}"
PV = "+git${SRCREV}"
S = "${WORKDIR}/git"
S = "${WORKDIR}/git"
DEPENDS += "
glib-2.0 libdsme libiphb systemd dbus-glib dbus
"
DEPENDS += "
glib-2.0 libdsme libiphb systemd dbus-glib dbus libngf
"
do_install() {
do_install() {
oe_runmake install DESTDIR=${D}
oe_runmake install DESTDIR=${D}
...
...
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