[Minios-devel] [UNIKRAFT/LCMS PATCH v3 3/3] [LCMS PATCH] lcms: Update files to correct some errors

[Esteban Martinez <esteban.martinez@xxxxxxxx>]

Signed-off-by: Esteban Martinez <esteban.martinez@xxxxxxxx>
---
 .gitignore      |  0
 CODING_STYLE.md |  0
 CONTRIBUTING.md |  0
 COPYING.md      |  5 +----
 Config.uk       |  0
 MAINTAINERS.md  |  4 ++--
 Makefile.uk     | 37 +++++++++----------------------------
 README.md       |  0
 exportsyms.uk   |  1 -
 9 files changed, 12 insertions(+), 35 deletions(-)
 mode change 100755 => 100644 .gitignore
 mode change 100755 => 100644 CODING_STYLE.md
 mode change 100755 => 100644 CONTRIBUTING.md
 mode change 100755 => 100644 COPYING.md
 mode change 100755 => 100644 Config.uk
 mode change 100755 => 100644 MAINTAINERS.md
 mode change 100755 => 100644 Makefile.uk
 mode change 100755 => 100644 README.md
 delete mode 100755 exportsyms.uk

diff --git a/.gitignore b/.gitignore
old mode 100755
new mode 100644
diff --git a/CODING_STYLE.md b/CODING_STYLE.md
old mode 100755
new mode 100644
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/COPYING.md b/COPYING.md
old mode 100755
new mode 100644
index fa05041..1960df6
--- a/COPYING.md
+++ b/COPYING.md
@@ -10,7 +10,7 @@ this repository should declare who is the copyright owner and 
under which terms
 and conditions the code is licensed. If such a licence note is missing, the
 following copyright notice will apply:
 
-       Copyright (c) 2017, NEC Europe Ltd., NEC Corporation. All rights 
reserved.
+       Copyright (c) 2020, Consorci de Serveis Universitaris de Catalunya 
(CSUC). All rights reserved.
 
        Redistribution and use in source and binary forms, with or without
        modification, are permitted provided that the following conditions
@@ -36,6 +36,3 @@ following copyright notice will apply:
        CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
        ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
THE
        POSSIBILITY OF SUCH DAMAGE.
-
-lcms source code
-------------------
\ No newline at end of file
diff --git a/Config.uk b/Config.uk
old mode 100755
new mode 100644
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
old mode 100755
new mode 100644
index 227c4dd..ed92fed
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -5,7 +5,7 @@ For notes on how to read this information, please refer to 
`MAINTAINERS.md` in
 the main Unikraft repository.
 
        LCMS-UNIKRAFT
-       M:      Costin Lupu <costin.lupu@xxxxxxxxx>
-       M:      Felipe Huici <felipe.huici@xxxxxxxxx>
+       M:      Esteban Martinez <esteban.martinez@xxxxxxxx>
+       M:      Xavier Peralra <xavier.peralta@xxxxxxxx>
        L:      minios-devel@xxxxxxxxxxxxx
        F: *
diff --git a/Makefile.uk b/Makefile.uk
old mode 100755
new mode 100644
index 86f941b..e6111ab
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -2,9 +2,9 @@
 #
 #  lcms Makefile.uk
 #
-#  Authors: Costin Lupu <costin.lupu@xxxxxxxxx>
+#  Authors: Esteban Martinez <esteban.martinez@xxxxxxxx>
 #
-#  Copyright (c) 2019, University Politehnica of Bucharest. All rights 
reserved.
+#  Copyright (c) 2019, Consorci de Serveis Universitaris de Catalunya (CSUC). 
All rights reserved.
 #
 #  Redistribution and use in source and binary forms, with or without
 #  modification, are permitted provided that the following conditions
@@ -38,7 +38,6 @@
 # Library registration
 
################################################################################
 $(eval $(call addlib_s,liblcms,$(CONFIG_LIBLCMS)))
-#$(eval $(call addlib_s,liblcmsglue,$(CONFIG_LIBLCMS)))
 
 
################################################################################
 # Original sources
@@ -53,7 +52,7 @@ $(eval $(call 
patch,liblcms,$(LIBLCMS_PATCHDIR),$(LIBLCMS_SUBDIR)))
 
################################################################################
 # Helpers
 
################################################################################
-LIBLCMS_EXTRACTED = $(LIBLCMS_ORIGIN)/lcms2-$(LIBLCMS_VERSION)
+LIBLCMS_EXTRACTED = $(LIBLCMS_ORIGIN)/$(LIBLCMS_SUBDIR)
 
 
################################################################################
 # Library includes
@@ -71,16 +70,13 @@ LIBLCMS_CINCLUDES   += -I$(LIBLCMS_EXTRACTED)
 # Suppressed flags
 LIBLCMS_SUPPRESS_FLAGS += -Wno-unused-parameter \
        -Wno-unused-variable -Wno-unused-value -Wno-unused-function \
-       -Wno-missing-field-initializers -Wno-implicit-fallthrough
+       -Wno-missing-field-initializers -Wno-implicit-fallthrough \
+       -Wno-misleading-indentation -Wno-stringop-truncation \
+       -Wno-strict-aliasing
 LIBLCMS_CFLAGS-y   += $(LIBLCMS_SUPPRESS_FLAGS) \
-       -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
-
-
-
-################################################################################
-# OS dependencies code - Glue between Unikraft and lcms
-################################################################################
-#LIBLCMSGLUE_SRCS-y += $(LIBLCMS_BASE)/sample.c|glue
+       -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast \
+       -Wno-misleading-indentation -Wno-stringop-truncation \
+       -Wno-strict-aliasing
 
 
################################################################################
 # LCMS src
@@ -112,18 +108,3 @@ LIBLCMS_SRCS-y += $(LIBLCMS_EXTRACTED)/src/cmshalf.c
 LIBLCMS_SRCS-y += $(LIBLCMS_EXTRACTED)/src/cmsalpha.c
 LIBLCMS_SRCS-y += $(LIBLCMS_EXTRACTED)/src/cmspcs.c
 
-
-################################################################################
-# LCMS prepare
-################################################################################
-# Run ./configure
-$(LIBLCMS_EXTRACTED)/config.status: $(LIBLCMS_BUILD)/.origin
-       $(call verbose_cmd,CONFIG,liblcms: $(notdir $@), \
-               cd $(LIBLCMS_EXTRACTED) && ./configure)
-
-LIBLCMS_PREPARED_DEPS = \
-       $(LIBLCMS_EXTRACTED)/config.status \
-
-$(LIBLCMS_BUILD)/.prepared: $(LIBLCMS_PREPARED_DEPS)
-
-UK_PREPARE += $(LIBLCMS_BUILD)/.prepared
\ No newline at end of file
diff --git a/README.md b/README.md
old mode 100755
new mode 100644
diff --git a/exportsyms.uk b/exportsyms.uk
deleted file mode 100755
index c86c3f3..0000000
--- a/exportsyms.uk
+++ /dev/null
@@ -1 +0,0 @@
-none
\ No newline at end of file
-- 
2.17.1


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel