Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 2 commits
  • 3 files changed
  • 0 comments
  • 1 contributor
May 21, 2012
build jansson lib c63632b
Jun 20, 2012
reflash_m1.sh : fix typo 1196c21
24  compile-flickernoise/Makefile
@@ -34,6 +34,7 @@ FREETYPE2_VERSION = 2.4.4
34 34
 MUPDF_VERSION     = 0.8
35 35
 CURL_VERSION      = 7.22.0
36 36
 EXPAT_VERSION     = 2.0.1
  37
+JANSSON_VERSION   = 2.3
37 38
 
38 39
 LIBPNG    = libpng-$(LIBPNG_VERSION).tar.gz
39 40
 LIBJPEG   = jpegsrc.v8c.tar.gz
@@ -43,6 +44,7 @@ FREETYPE2 = freetype-$(FREETYPE2_VERSION).tar.gz
43 44
 MUPDF     = mupdf-$(MUPDF_VERSION)-source.tar.gz
44 45
 CURL      = curl-$(CURL_VERSION).tar.bz2
45 46
 EXPAT     = expat-$(EXPAT_VERSION).tar.gz
  47
+JANSSON   = jansson-$(JANSSON_VERSION).tar.gz
46 48
 
47 49
 DL        = $(if $(wildcard ../dl/.),../dl,dl)
48 50
 BUILD_DIR = ./build_dir
@@ -183,6 +185,19 @@ $(BUILD_DIR)/expat: $(DL)/$(EXPAT).ok
183 185
 	rm -rf $(RTEMS_MAKEFILE_PATH)/include/*
184 186
 	touch $@
185 187
 
  188
+$(BUILD_DIR)/jansson: $(DL)/$(JANSSON).ok
  189
+	tar xf $(DL)/$(JANSSON) -C $(BUILD_DIR)
  190
+	cd $(BUILD_DIR)/jansson-$(JANSSON_VERSION) && \
  191
+	    patch -Np1 < ../../patches/jansson-0001-for-milkymist-one.patch.patch
  192
+	cd $(BUILD_DIR)/jansson-$(JANSSON_VERSION) && \
  193
+	    $(CONFIGURE_VARS) ./configure --host=lm32-rtems4.11 \
  194
+	    --disable-shared --prefix=$(RTEMS_MAKEFILE_PATH) && \
  195
+	    make all install
  196
+	cp -rf $(RTEMS_MAKEFILE_PATH)/include/* \
  197
+	    $(RTEMS_MAKEFILE_PATH)/lib/include
  198
+	rm -rf $(RTEMS_MAKEFILE_PATH)/include/*
  199
+	touch $@
  200
+
186 201
 REPO_DIRS=milkymist flickernoise rtems-yaffs2 liboscparse mtk autotest-m1 
187 202
 milkymist-git-clone:
188 203
 	mkdir -p $(MILKYMIST_GIT_DIR)
@@ -225,7 +240,8 @@ $(BUILD_DIR)/bsp-milkymist/Makefile:
225 240
 
226 241
 #you will need clang for compile milkymist tools
227 242
 flickernoise.fbi: rtems sdk-install mtk liboscparse rtems-yaffs2 \
228  
-		  $(BUILD_DIR)/mupdf $(BUILD_DIR)/curl $(BUILD_DIR)/expat
  243
+		  $(BUILD_DIR)/mupdf $(BUILD_DIR)/curl $(BUILD_DIR)/expat \
  244
+		  $(BUILD_DIR)/jansson
229 245
 	make -C $(MILKYMIST_GIT_DIR)/flickernoise/src \
230 246
 	     clean bin/flickernoise.fbi
231 247
 	cp $(MILKYMIST_GIT_DIR)/flickernoise/src/bin/$@ .
@@ -290,6 +306,12 @@ $(DL)/$(EXPAT).ok:
290 306
 project/expat/expat/$(EXPAT_VERSION)/expat-$(EXPAT_VERSION).tar.gz"
291 307
 	touch $@
292 308
 
  309
+$(DL)/$(JANSSON).ok:
  310
+	mkdir -p dl
  311
+	$(WGET) $(DL)/$(JANSSON) "http://www.digip.org/jansson/releases/$(JANSSON)"
  312
+	touch $@
  313
+
  314
+
293 315
 clean:
294 316
 	rm -rf build_dir/*
295 317
 
51  compile-flickernoise/patches/jansson-0001-for-milkymist-one.patch.patch
... ...
@@ -0,0 +1,51 @@
  1
+From a20d4e9c81955bb0ebc790e2913e70796bfae092 Mon Sep 17 00:00:00 2001
  2
+From: Xiangfu <xiangfu@openmobilefree.net>
  3
+Date: Mon, 21 May 2012 12:45:24 +0800
  4
+Subject: [PATCH] jansson-0001-for-milkymist-one.patch
  5
+
  6
+---
  7
+ src/Makefile.am |    2 +-
  8
+ src/Makefile.in |    2 +-
  9
+ src/utf.h       |    2 +-
  10
+ 3 files changed, 3 insertions(+), 3 deletions(-)
  11
+
  12
+diff --git a/src/Makefile.am b/src/Makefile.am
  13
+index 80c03de..c7e4f9a 100644
  14
+--- a/src/Makefile.am
  15
++++ b/src/Makefile.am
  16
+@@ -24,5 +24,5 @@ libjansson_la_LDFLAGS = \
  17
+ 
  18
+ if GCC
  19
+ # These flags are gcc specific
  20
+-AM_CFLAGS = -Wall -Wextra -Wdeclaration-after-statement -Werror
  21
++AM_CFLAGS = -Wall -Wextra -Wdeclaration-after-statement
  22
+ endif
  23
+diff --git a/src/Makefile.in b/src/Makefile.in
  24
+index cc50ee2..0c9639a 100644
  25
+--- a/src/Makefile.in
  26
++++ b/src/Makefile.in
  27
+@@ -237,7 +237,7 @@ libjansson_la_LDFLAGS = \
  28
+ 
  29
+ 
  30
+ # These flags are gcc specific
  31
+-@GCC_TRUE@AM_CFLAGS = -Wall -Wextra -Wdeclaration-after-statement -Werror
  32
++@GCC_TRUE@AM_CFLAGS = -Wall -Wextra -Wdeclaration-after-statement
  33
+ all: all-am
  34
+ 
  35
+ .SUFFIXES:
  36
+diff --git a/src/utf.h b/src/utf.h
  37
+index 0c3ab31..2bc9d6d 100644
  38
+--- a/src/utf.h
  39
++++ b/src/utf.h
  40
+@@ -28,7 +28,7 @@ typedef int int32_t;
  41
+ 
  42
+ #endif /* HAVE_CONFIG_H */
  43
+ 
  44
+-int utf8_encode(int codepoint, char *buffer, int *size);
  45
++int utf8_encode(int32_t codepoint, char *buffer, int *size);
  46
+ 
  47
+ int utf8_check_first(char byte);
  48
+ int utf8_check_full(const char *buffer, int size, int32_t *codepoint);
  49
+-- 
  50
+1.7.5.4
  51
+
23  scripts/reflash_m1.sh
@@ -27,26 +27,31 @@ MAC_DIR="${HOME}/.qi/milkymist/bios-mac/tmp"
27 27
 
28 28
 call-help() {
29 29
 	echo -e \
30  
-"Usage: ./reflash_m1.sh [OPTION] [PARAM]...
  30
+"
  31
+Usage: ./reflash_m1.sh [OPTION] [PARAM...]
31 32
 
32 33
   --release [VERSION]         by default it will download the latest release
33  
-  --local-folder              please use m1nor instread
  34
+  --local-folder              please use m1nor instead
34 35
   --lock-flash                lock 'standby' and 'rescue' partitions
35 36
   --read-flash <PARTITION>    read from RESCUE partition, by default only read
36  
-			      'standby.bin'
37  
-			      PARTITION: standby soc bios splash flickernoise
  37
+                              'standby.bin'
  38
+                              PARTITION: standby soc bios splash flickernoise
38 39
   --bios-mac XX XX            'XX' 'XX' is the last MAC address
39 40
   --rc3 XX XX                 used in factory flash, reflash all partitions
40 41
   --qi [VERSION] [--data]     by default it will download the latest qi release
41  
-                     CAUTION: if '--data' enable, it will REFLASH DATA PARTITION
42 42
 
43 43
 NOTICE: '--bios-mac' and '--rc3' needs command 'mkmmimg'
44  
-	'--release'  VERSION can found at http://milkymist.org/updates/
45  
-	'--qi'       VERSION can found at
46  
-		     http://downloads.qi-hardware.com/software/images/Milkymist_One
  44
+        '--release'  VERSION can found at http://milkymist.org/updates/
  45
+        '--qi'       VERSION can found at
  46
+                 http://downloads.qi-hardware.com/software/images/Milkymist_One
  47
+        '--data'     if this option enable, it will REFLASH DATA PARTITION
  48
+                     BACKUP before you use this option
  49
+
  50
+Version: ${__VERSION__}
47 51
 
48 52
 Written by: Xiangfu Liu <xiangfu@openmobilefree.net>
49  
-Please report bugs to <devel@lists.milkymist.org>\tversion: ${__VERSION__}"
  53
+Please report bugs to <devel@lists.milkymist.org>
  54
+"
50 55
 }
51 56
 
52 57
 # $1: is the file name you want save

No commit comments for this range

Something went wrong with that request. Please try again.