Skip to content

Commit 1b511e8

Browse files
Merge pull request #39 from Creatordev/dev
Merge dev to master
2 parents fbcaa44 + ff983a5 commit 1b511e8

File tree

6 files changed

+143
-0
lines changed

6 files changed

+143
-0
lines changed

Diff for: README.md

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ ca8210 | This kernel module is used for cascoda ca8210 transceiver.
1414
cgilua | This package has been added to use webscripts using lua pages/scripts.
1515
click-apps | This package contains click applications.
1616
fping | This program is used to send ICMP echo probes to network hosts, similar to ping.
17+
glog | This package contains a C++ implementation of the Google logging.
18+
proddata | This package provides Proddata tool used to read/write/lock OTP.
1719
u-boot | This package is used for u-boot bootloader for pistachio marduk platform.
1820

1921
Command | Description

Diff for: board-test/Makefile

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
include $(TOPDIR)/rules.mk
2+
3+
PKG_NAME:=board-test
4+
PKG_VERSION:=0.1.0
5+
PKG_RELEASE:=1
6+
PKG_LICENSE:=BSD-3-Clause
7+
8+
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
9+
PKG_SOURCE_PROTO:=git
10+
PKG_SOURCE_URL:=https://github.com/CreatorKit/board-test.git
11+
PKG_SOURCE_VERSION:=HEAD
12+
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
13+
14+
CMAKE_INSTALL:=1
15+
16+
include $(INCLUDE_DIR)/package.mk
17+
include $(INCLUDE_DIR)/cmake.mk
18+
19+
define Package/board-test
20+
SECTION:=utils
21+
CATEGORY:=Utilities
22+
TITLE:=board-test
23+
DEPENDS:= +e2fsprogs +alsa-utils-tests
24+
endef
25+
26+
define Package/board-test/install
27+
$(INSTALL_DIR) $(1)/usr/bin/board_test
28+
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/board_test/test_* $(1)/usr/bin/board_test/
29+
$(INSTALL_CONF) $(PKG_INSTALL_DIR)/usr/bin/board_test/version $(1)/usr/bin/board_test/
30+
31+
$(INSTALL_DIR) $(1)/usr/lib
32+
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/board_test_common.sh $(1)/usr/lib/
33+
endef
34+
35+
$(eval $(call BuildPackage,board-test))

Diff for: glog/Makefile

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
include $(TOPDIR)/rules.mk
2+
PKG_NAME:=glog
3+
PKG_VERSION:=v0.3.4
4+
#PKG_VERSION:=master
5+
PKG_RELEASE:=1
6+
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
7+
8+
PKG_SOURCE_PROTO:=git
9+
PKG_SOURCE_URL:=https://github.com/google/glog.git
10+
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
11+
PKG_SOURCE_VERSION:=$(PKG_VERSION)
12+
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
13+
14+
PKG_FIXUP:=autoreconf
15+
PKG_INSTALL=1
16+
17+
include $(INCLUDE_DIR)/package.mk
18+
19+
define Package/glog
20+
SECTION:=utils
21+
CATEGORY:=Utilities
22+
DEPENDS:=+libstdcpp
23+
TITLE:=glog
24+
endef
25+
define Package/glog/description
26+
Google Logging.
27+
endef
28+
29+
define Package/glog/install
30+
$(INSTALL_DIR) $(1)/usr/lib/
31+
$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
32+
$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib/
33+
$(INSTALL_DIR) $(1)/usr/include/
34+
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/
35+
endef
36+
$(eval $(call BuildPackage,$(PKG_NAME)))

Diff for: proddata/Makefile

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
include $(TOPDIR)/rules.mk
2+
PKG_NAME:=proddata
3+
PKG_VERSION:=0.1.0
4+
#PKG_VERSION:=master
5+
PKG_RELEASE:=1
6+
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
7+
8+
PKG_SOURCE_PROTO:=git
9+
PKG_SOURCE_URL:=https://github.com/Creatordev/proddata.git
10+
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
11+
PKG_SOURCE_VERSION:=$(PKG_VERSION)
12+
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
13+
14+
CMAKE_INSTALL:=1
15+
16+
include $(INCLUDE_DIR)/package.mk
17+
include $(INCLUDE_DIR)/cmake.mk
18+
19+
define Package/proddata
20+
SECTION:=utils
21+
CATEGORY:=Utilities
22+
TITLE:=proddata
23+
DEPENDS:= +glog
24+
endef
25+
26+
define Package/proddata/description
27+
Proddata tool.
28+
endef
29+
30+
CMAKE_OPTIONS += -DBUILD_TESTS=OFF -DSTAGING_DIR=$(STAGING_DIR)
31+
32+
define Package/proddata/install
33+
$(INSTALL_DIR) $(1)/usr/bin/
34+
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
35+
$(INSTALL_DIR) $(1)/usr/lib/
36+
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib
37+
endef
38+
$(eval $(call BuildPackage,$(PKG_NAME)))
+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 23cf5e3..2e3dea4 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -31,8 +31,8 @@ IF(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
6+
ENDIF()
7+
ENDIF()
8+
9+
-INCLUDE(check_dep)
10+
-INCLUDE(cpplint)
11+
+#INCLUDE(check_dep)
12+
+#INCLUDE(cpplint)
13+
14+
# Paths
15+
########
16+
@@ -47,5 +47,5 @@ IF(BUILD_TESTS)
17+
ADD_SUBDIRECTORY(utest)
18+
ENDIF()
19+
ENDIF()
20+
-ADD_SUBDIRECTORY(docs)
21+
+#ADD_SUBDIRECTORY(docs)
22+

Diff for: proddata/patches/002_set_glog_include.patch

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
2+
index 753d8bd..9721802 100644
3+
--- a/src/CMakeLists.txt
4+
+++ b/src/CMakeLists.txt
5+
@@ -27,4 +27,4 @@ INSTALL(PROGRAMS wifi_cal.sh DESTINATION bin)
6+
######################
7+
FILE(GLOB CPPLINT_CHECK *.cc *.h)
8+
LIST(REMOVE_ITEM CPPLINT_CHECK ${CMAKE_CURRENT_SOURCE_DIR}/lib_crc.h)
9+
-CPPLINT_ADD(src ${CPPLINT_CHECK})
10+
+#CPPLINT_ADD(src ${CPPLINT_CHECK})

0 commit comments

Comments
 (0)