From 6b3e58d909b4d221ddfd9c412e269cd2ae8f965f Mon Sep 17 00:00:00 2001 From: Francois Berder Date: Tue, 14 Jun 2016 10:59:01 +0100 Subject: [PATCH 1/5] Add board-test package Signed-off-by: Francois Berder Signed-off-by: Mayank Sirotiya --- board-test/Makefile | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 board-test/Makefile diff --git a/board-test/Makefile b/board-test/Makefile new file mode 100644 index 0000000..5b66135 --- /dev/null +++ b/board-test/Makefile @@ -0,0 +1,35 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=board-test +PKG_VERSION:=0.1.0 +PKG_RELEASE:=1 +PKG_LICENSE:=BSD-3-Clause + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/CreatorKit/board-test.git +PKG_SOURCE_VERSION:=HEAD +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) + +CMAKE_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Package/board-test + SECTION:=utils + CATEGORY:=Utilities + TITLE:=board-test + DEPENDS:= +e2fsprogs +endef + +define Package/board-test/install + $(INSTALL_DIR) $(1)/usr/bin/board_test + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/board_test/test_* $(1)/usr/bin/board_test/ + $(INSTALL_CONF) $(PKG_INSTALL_DIR)/usr/bin/board_test/version $(1)/usr/bin/board_test/ + + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/board_test_common.sh $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,board-test)) From 68ee04a6997b328e0ff7a1ebc3fc81e2104d0c19 Mon Sep 17 00:00:00 2001 From: Mayank Sirotiya Date: Thu, 30 Jun 2016 15:32:07 +0530 Subject: [PATCH 2/5] add alsa-utils-tests as board-test package dependency Signed-off-by: Mayank Sirotiya --- board-test/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board-test/Makefile b/board-test/Makefile index 5b66135..8911f1f 100644 --- a/board-test/Makefile +++ b/board-test/Makefile @@ -20,7 +20,7 @@ define Package/board-test SECTION:=utils CATEGORY:=Utilities TITLE:=board-test - DEPENDS:= +e2fsprogs + DEPENDS:= +e2fsprogs +alsa-utils-tests endef define Package/board-test/install From 9a037b53b373d9a360ba47a6e4c079c819b23a85 Mon Sep 17 00:00:00 2001 From: Pratik Prajapati Date: Fri, 1 Jul 2016 14:14:14 +0530 Subject: [PATCH 3/5] Add glog package Signed-off-by: Pratik Prajapati --- README.md | 1 + glog/Makefile | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 glog/Makefile diff --git a/README.md b/README.md index 5828153..728005f 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ ca8210 | This kernel module is used for cascoda ca8210 transceiver. cgilua | This package has been added to use webscripts using lua pages/scripts. click-apps | This package contains click applications. fping | This program is used to send ICMP echo probes to network hosts, similar to ping. +glog | This package contains a C++ implementation of the Google logging. u-boot | This package is used for u-boot bootloader for pistachio marduk platform. Command | Description diff --git a/glog/Makefile b/glog/Makefile new file mode 100644 index 0000000..b671858 --- /dev/null +++ b/glog/Makefile @@ -0,0 +1,36 @@ +include $(TOPDIR)/rules.mk +PKG_NAME:=glog +PKG_VERSION:=v0.3.4 +#PKG_VERSION:=master +PKG_RELEASE:=1 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=git@github.com:google/glog.git +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_VERSION:=$(PKG_VERSION) +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) + +PKG_FIXUP:=autoreconf +PKG_INSTALL=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/glog + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:=+libstdcpp + TITLE:=glog +endef +define Package/glog/description + Google Logging. +endef + +define Package/glog/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/ +endef +$(eval $(call BuildPackage,$(PKG_NAME))) From 129d8c76f67c55b8a1b99f6936883723c3315a16 Mon Sep 17 00:00:00 2001 From: Pratik Prajapati Date: Fri, 1 Jul 2016 14:30:54 +0530 Subject: [PATCH 4/5] Add proddata package Signed-off-by: Pratik Prajapati --- README.md | 1 + proddata/Makefile | 34 +++++++++++++++++++ .../001_disable_check_dep_cpplint_docs.patch | 22 ++++++++++++ proddata/patches/002_set_glog_include.patch | 21 ++++++++++++ 4 files changed, 78 insertions(+) create mode 100644 proddata/Makefile create mode 100644 proddata/patches/001_disable_check_dep_cpplint_docs.patch create mode 100644 proddata/patches/002_set_glog_include.patch diff --git a/README.md b/README.md index 728005f..4c1927b 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ cgilua | This package has been added to use webscripts using lua page click-apps | This package contains click applications. fping | This program is used to send ICMP echo probes to network hosts, similar to ping. glog | This package contains a C++ implementation of the Google logging. +proddata | This package provides Proddata tool used to read/write/lock OTP. u-boot | This package is used for u-boot bootloader for pistachio marduk platform. Command | Description diff --git a/proddata/Makefile b/proddata/Makefile new file mode 100644 index 0000000..5ffbcb4 --- /dev/null +++ b/proddata/Makefile @@ -0,0 +1,34 @@ +include $(TOPDIR)/rules.mk +PKG_NAME:=proddata +PKG_VERSION:=0.1.0 +#PKG_VERSION:=master +PKG_RELEASE:=1 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/Creatordev/proddata.git +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_VERSION:=$(PKG_VERSION) +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) + +CMAKE_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Package/proddata + SECTION:=utils + CATEGORY:=Utilities + TITLE:=proddata +endef +define Package/proddata/description + Proddata tool. +endef + +CMAKE_OPTIONS += -DBUILD_TESTS=OFF -DSTAGING_DIR=$(STAGING_DIR) + +define Package/proddata/install + $(INSTALL_DIR) $(1)/usr/bin/ + # rules to install binaries in rootfs +endef +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/proddata/patches/001_disable_check_dep_cpplint_docs.patch b/proddata/patches/001_disable_check_dep_cpplint_docs.patch new file mode 100644 index 0000000..51be0c0 --- /dev/null +++ b/proddata/patches/001_disable_check_dep_cpplint_docs.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 23cf5e3..2e3dea4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,8 +31,8 @@ IF(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") + ENDIF() + ENDIF() + +-INCLUDE(check_dep) +-INCLUDE(cpplint) ++#INCLUDE(check_dep) ++#INCLUDE(cpplint) + + # Paths + ######## +@@ -47,5 +47,5 @@ IF(BUILD_TESTS) + ADD_SUBDIRECTORY(utest) + ENDIF() + ENDIF() +-ADD_SUBDIRECTORY(docs) ++#ADD_SUBDIRECTORY(docs) + diff --git a/proddata/patches/002_set_glog_include.patch b/proddata/patches/002_set_glog_include.patch new file mode 100644 index 0000000..96b1414 --- /dev/null +++ b/proddata/patches/002_set_glog_include.patch @@ -0,0 +1,21 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 753d8bd..9721802 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -5,8 +5,8 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/inc ${CMAKE_SOURCE_DIR}/src) + INCLUDE(CheckLibraryExists) + INCLUDE(FindPkgConfig) + +-PKG_CHECK_MODULES(GLOG ${STRICT_CHECK} libglog) +- ++#PKG_CHECK_MODULES(GLOG ${STRICT_CHECK} libglog) ++SET(GLOG_INCLUDE_DIRS ${STAGING_DIR}/usr/include) + INCLUDE_DIRECTORIES(${GLOG_INCLUDE_DIRS}) + + SET(SOURCES main.cc proddata.cc device_data.cc flash_access.cc mtd_access.cc userotp_access.cc vector_operations.cc) +@@ -27,4 +27,4 @@ INSTALL(PROGRAMS wifi_cal.sh DESTINATION bin) + ###################### + FILE(GLOB CPPLINT_CHECK *.cc *.h) + LIST(REMOVE_ITEM CPPLINT_CHECK ${CMAKE_CURRENT_SOURCE_DIR}/lib_crc.h) +-CPPLINT_ADD(src ${CPPLINT_CHECK}) ++#CPPLINT_ADD(src ${CPPLINT_CHECK}) From a8800610a760cfa968c1d1c7dcaab233b9fa56b1 Mon Sep 17 00:00:00 2001 From: Mayank Sirotiya Date: Fri, 1 Jul 2016 18:07:12 +0530 Subject: [PATCH 5/5] resolve link errors while building proddata and minor cleanup Signed-off-by: Mayank Sirotiya --- glog/Makefile | 2 +- proddata/Makefile | 6 +++++- proddata/patches/002_set_glog_include.patch | 11 ----------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/glog/Makefile b/glog/Makefile index b671858..ee715cd 100644 --- a/glog/Makefile +++ b/glog/Makefile @@ -6,7 +6,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=git@github.com:google/glog.git +PKG_SOURCE_URL:=https://github.com/google/glog.git PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_VERSION:=$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) diff --git a/proddata/Makefile b/proddata/Makefile index 5ffbcb4..0de3c71 100644 --- a/proddata/Makefile +++ b/proddata/Makefile @@ -20,7 +20,9 @@ define Package/proddata SECTION:=utils CATEGORY:=Utilities TITLE:=proddata + DEPENDS:= +glog endef + define Package/proddata/description Proddata tool. endef @@ -29,6 +31,8 @@ CMAKE_OPTIONS += -DBUILD_TESTS=OFF -DSTAGING_DIR=$(STAGING_DIR) define Package/proddata/install $(INSTALL_DIR) $(1)/usr/bin/ - # rules to install binaries in rootfs + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib endef $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/proddata/patches/002_set_glog_include.patch b/proddata/patches/002_set_glog_include.patch index 96b1414..7d3ce15 100644 --- a/proddata/patches/002_set_glog_include.patch +++ b/proddata/patches/002_set_glog_include.patch @@ -2,17 +2,6 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 753d8bd..9721802 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -5,8 +5,8 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/inc ${CMAKE_SOURCE_DIR}/src) - INCLUDE(CheckLibraryExists) - INCLUDE(FindPkgConfig) - --PKG_CHECK_MODULES(GLOG ${STRICT_CHECK} libglog) -- -+#PKG_CHECK_MODULES(GLOG ${STRICT_CHECK} libglog) -+SET(GLOG_INCLUDE_DIRS ${STAGING_DIR}/usr/include) - INCLUDE_DIRECTORIES(${GLOG_INCLUDE_DIRS}) - - SET(SOURCES main.cc proddata.cc device_data.cc flash_access.cc mtd_access.cc userotp_access.cc vector_operations.cc) @@ -27,4 +27,4 @@ INSTALL(PROGRAMS wifi_cal.sh DESTINATION bin) ###################### FILE(GLOB CPPLINT_CHECK *.cc *.h)