apparmor: stage libapparmor headers via InstallDev

Add a Build/InstallDev so libapparmor's header (sys/apparmor.h), the
libapparmor.so link and the pkg-config file are copied into the staging
directory. Without this, packages cannot build against libapparmor even
though the runtime shared library is provided; e.g. stress-ng's AppArmor
stressors fall back to "built without sys/apparmor.h".

Signed-off-by: Alexandru Ardelean <redacted>

diff --git a/utils/apparmor/Makefile b/utils/apparmor/Makefile
index b1f468ba344d4a75a8d1105a2951a91bec98a148..92ddc3c832c93b1dc58b7674a6824e8db768205c 100644 (file)
--- a/utils/apparmor/Makefile
+++ b/utils/apparmor/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=apparmor
 PKG_VERSION:=3.0.13
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
@@ -155,6 +155,13 @@ define Build/Install
                $(MAKE_FLAGS) DESTDIR="$(PKG_INSTALL_DIR)-profiles" install
 endef
 
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/include/sys $(1)/usr/lib $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)-libapparmor/usr/include/sys/*.h $(1)/usr/include/sys/
+       $(CP) $(PKG_INSTALL_DIR)-libapparmor/usr/lib/libapparmor.so* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)-libapparmor/usr/lib/pkgconfig/libapparmor.pc $(1)/usr/lib/pkgconfig/
+endef
+
 define Package/libapparmor/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)-libapparmor/usr/lib/libapparmor.so.1 $(1)/usr/lib/