Skip to content

Commit

Permalink
Merge pull request #39 from Creatordev/dev
Browse files Browse the repository at this point in the history
Merge dev to master
  • Loading branch information
nikhil-zinjurde-imgtec authored Jul 4, 2016
2 parents fbcaa44 + ff983a5 commit 1b511e8
Show file tree
Hide file tree
Showing 6 changed files with 143 additions and 0 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ 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.
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
Expand Down
35 changes: 35 additions & 0 deletions board-test/Makefile
Original file line number Diff line number Diff line change
@@ -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 +alsa-utils-tests
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))
36 changes: 36 additions & 0 deletions glog/Makefile
Original file line number Diff line number Diff line change
@@ -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:=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)

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)))
38 changes: 38 additions & 0 deletions proddata/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
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
DEPENDS:= +glog
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/
$(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)))
22 changes: 22 additions & 0 deletions proddata/patches/001_disable_check_dep_cpplint_docs.patch
Original file line number Diff line number Diff line change
@@ -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)

10 changes: 10 additions & 0 deletions proddata/patches/002_set_glog_include.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 753d8bd..9721802 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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})

0 comments on commit 1b511e8

Please sign in to comment.