build: add mk_core and libco as headers-extra package.

* This commit adds a new auto-generated package called *-headers-extra that contains 2 new set of headers: libco and mk_core. Signed-off-by: Jorge Niedbalski <[email protected]>
fluent · Apr 7, 2021 · 9635ff3 · 9635ff3
1 parent 304a364
commit 9635ff3
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/.github/workflows/build-master-packages.yaml b/.github/workflows/build-master-packages.yaml
@@ -11,7 +11,7 @@ jobs:
       max-parallel: 48
       fail-fast: true
       matrix:
-        distro: [ ubuntu/16.04, ubuntu/18.04, ubuntu/20.04 ]
+        distro: [ ubuntu/16.04, ubuntu/18.04, ubuntu/20.04, debian/buster ]
 
     runs-on: [ ubuntu-latest ] #self-hosted, Linux, X64, packet-builder]
     steps:
@@ -31,12 +31,12 @@ jobs:
 
       - uses: actions/checkout@v2
         with:
-          repository: ${{ github.actor }}/fluent-bit-packaging
+          repository: fluent/fluent-bit-packaging
           fetch-depth: 1
           path: packaging
 
       - name: Build the distro artifacts
-        run: ./build.sh -v master -d ${{ env.distro }}
+        run: ./build.sh -v master -d ${{ env.distro }} -b master
         env:
           distro: ${{ matrix.distro }}
         working-directory: packaging

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -797,7 +797,7 @@ endif()
 # Enable components
 set(CPACK_DEB_COMPONENT_INSTALL ON)
 set(CPACK_RPM_COMPONENT_INSTALL ON)
-set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} binary library headers)
+set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} binary library headers headers-extra)
 set(CPACK_COMPONENTS_GROUPING "ONE_PER_GROUP")
 
 set(CPACK_COMPONENT_BINARY_GROUP "RUNTIME")
@@ -815,6 +815,7 @@ if(DPKG_PROGRAM)
     )
 
   set(CPACK_DEBIAN_HEADERS_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}-headers.deb")
+  set(CPACK_DEBIAN_HEADERS_EXTRA_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}-headers-extra.deb")
   set(CPACK_DEBIAN_RUNTIME_PACKAGE_NAME "${CPACK_PACKAGE_NAME}")
   set(CPACK_DEBIAN_RUNTIME_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
   set(CPACK_DEBIAN_RUNTIME_PACKAGE_CONTROL_EXTRA
@@ -861,6 +862,7 @@ set(CPACK_RPM_USER_FILELIST
 set(CPACK_RPM_PACKAGE_AUTOREQ ON)
 set(CPACK_RPM_RUNTIME_PACKAGE_NAME "${CPACK_PACKAGE_NAME}")
 set(CPACK_RPM_HEADERS_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}-headers.rpm")
+set(CPACK_RPM_HEADERS_EXTRA_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}-headers-extra.rpm")
 set(CPACK_RPM_RUNTIME_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}.rpm")
 
 # CPack: DEB

diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -14,4 +14,23 @@ file(GLOB headers "fluent-bit/tls/*.h")
 install(FILES ${headers}
     DESTINATION ${FLB_INSTALL_INCLUDEDIR}/fluent-bit/tls/
     COMPONENT headers
-    PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+    PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+
+
+install(FILES "../lib/monkey/include/monkey/mk_core.h"
+    DESTINATION ${FLB_INSTALL_INCLUDEDIR}/monkey/
+    COMPONENT headers-extra
+    PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+
+file(GLOB headers "../lib/monkey/include/monkey/mk_core/*.h")
+    install(FILES ${headers}
+    COMPONENT headers-extra
+    DESTINATION ${FLB_INSTALL_INCLUDEDIR}/monkey/mk_core/
+    PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+
+
+file(GLOB headers "../lib/flb_libco/*.h")
+    install(FILES ${headers}
+    COMPONENT headers-extra
+    DESTINATION ${FLB_INSTALL_INCLUDEDIR}/
+    PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)