ti-gfx: add new package

package/ti-gfx/ti-gfx.mk new file +20 -0

+
+define TI_GFX_INSTALL_STAGING_CMDS
+	$(foreach incdir,$(TI_GFX_HDR_DIRS),
+		$(INSTALL) -d $(STAGING_DIR)/usr/include/$(notdir $(incdir)); \
+		$(INSTALL) -D -m 0644 $(@D)/include/$(incdir)/*.h \
+			$(STAGING_DIR)/usr/include/$(notdir $(incdir))/
+	)
+	$(INSTALL) -D -m 0755 $(@D)/$(TI_GFX_BIN_PATH)/*.so $(STAGING_DIR)/usr/lib/
+	$(INSTALL) -D -m 0644 package/ti-gfx/egl.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+	$(INSTALL) -D -m 0644 package/ti-gfx/glesv2.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+endef
+
+define TI_GFX_INSTALL_KM_CMDS
+	$(MAKE) $(TI_GFX_KM_MAKE_OPTS) -C $(@D)/GFX_Linux_KM install
+endef
+
+define TI_GFX_INSTALL_BINS_CMDS
+	$(foreach bin,$(TI_GFX_BIN),
+		$(INSTALL) -D -m 0755 $(@D)/$(TI_GFX_BIN_PATH)/$(bin) \
+			$(TARGET_DIR)/usr/bin/$(bin)

package/ti-gfx/ti-gfx.mk new file +23 -0

+	$(foreach lib,$(TI_GFX_LIBS),
+		$(INSTALL) -D -m 0755 $(@D)/$(TI_GFX_BIN_PATH)/$(lib).so \
+			$(TARGET_DIR)/usr/lib/$(lib).so.$(TI_GFX_SO_VERSION); \
+		ln -sf $(lib).so.$(TI_GFX_SO_VERSION) \
+			$(TARGET_DIR)/usr/lib/$(lib).so
+	)
+	# libs use the following file for configuration.
+	$(INSTALL) -D -m 0644 package/ti-gfx/powervr.ini \
+		$(TARGET_DIR)/etc/powervr.ini
+endef
+
+ifeq ($(BR2_PACKAGE_TI_GFX_DEMOS),y)
+define TI_GFX_INSTALL_DEMOS_CMDS
+	$(foreach demo,$(TI_GFX_DEMOS),
+		$(INSTALL) -D -m 0755 \
+		$(@D)/$(TI_GFX_DEMOS_LOC)/$(demo)/$(TI_GFX_DEMOS_BIN_LOC)/OGLES2$(demo) \
+		$(TARGET_DIR)/usr/bin/OGLES2$(demo)
+	)
+endef
+endif
+
+define TI_GFX_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 0755 package/ti-gfx/S80ti-gfx \

When a comment like this a shown, the package option is not visible, so you must mention the package name in the comment, otherwise it's impossible for the user to understand what the comment is about. So it should be:

comment "ti-gfx requires ..."

package/ti-gfx/ti-gfx.mk line 107

Quoted 13 lines

package/ti-gfx/ti-gfx.mk new file +13 -0

+define TI_GFX_CONFIGURE_CMDS
+     $(if $(BR2_PACKAGE_TI_GFX_EGLIMAGE),
+             mv -f $(@D)/$(TI_GFX_BIN_PATH)/libEGL_eglimage.so \
+                     $(@D)/$(TI_GFX_BIN_PATH)/libEGL.so; \
+             mv -f $(@D)/$(TI_GFX_BIN_PATH)/libGLES_CM_eglimage.so \
+                     $(@D)/$(TI_GFX_BIN_PATH)/libGLES_CM.so; \
+             mv -f $(@D)/$(TI_GFX_BIN_PATH)/libGLESv2_eglimage.so \
+                $(@D)/$(TI_GFX_BIN_PATH)/libGLESv2.so; \
+             mv -f $(@D)/$(TI_GFX_BIN_PATH)/libglslcompiler_eglimage.so \
+                     $(@D)/$(TI_GFX_BIN_PATH)/libglslcompiler.so; \
+             mv -f $(@D)/$(TI_GFX_BIN_PATH)/libIMGegl_eglimage.so \
+                     $(@D)/$(TI_GFX_BIN_PATH)/libIMGegl.so;
+     )

This seems not really nice to do, it should be handled at install time.

package/ti-gfx/ti-gfx.mk line 117

Quoted 10 lines

package/ti-gfx/ti-gfx.mk new file +10 -0

+endef
+
+define TI_GFX_BUILD_KM_CMDS
+     $(MAKE) $(TI_GFX_KM_MAKE_OPTS) -C $(@D)/GFX_Linux_KM all
+endef
+
+define TI_GFX_BUILD_DEMO_CMDS
+     $(foreach demo, $(TI_GFX_DEMOS), \
+             cd $(@D)/$(TI_GFX_DEMOS_LOC)/$(demo)/$(TI_GFX_DEMOS_MAKE_LOC); \
+             $(TARGET_MAKE_ENV) $(MAKE1) $(TI_GFX_DEMO_MAKE_OPTS) all

        $(MAKE1) -C $(@D)/$(TI_GFX_DEMOS_LOC)/$(demo)/$(TI_GFX_DEMOS_MAKE_LOC)

will avoid the need for the cd.

package/ti-gfx/ti-gfx.mk line 126

Quoted 9 lines

package/ti-gfx/ti-gfx.mk new file +9 -0

+     )
+endef
+
+define TI_GFX_BUILD_CMDS
+     $(TI_GFX_BUILD_KM_CMDS)
+     $(if $(BR2_PACKAGE_TI_GFX_DEMOS),
+             $(TI_GFX_BUILD_DEMO_CMDS)
+     )
+endef

I think I've said it before, but we generally do:

ifeq ($(BR2_PACKAGE_TI_GFX_DEMOS),y)
define TI_GFX_BUILD_DEMO_CMDS

        ...

endef
endif

define TI_GFX_BUILD_CMDS

        ...
        $(TI_GFX_BUILD_DEMO_CMDS)

endef

Quoted 24 lines

package/ti-gfx/ti-gfx.mk new file +24 -0

+
+define TI_GFX_INSTALL_STAGING_CMDS
+     $(foreach incdir,$(TI_GFX_HDR_DIRS),
+             $(INSTALL) -d $(STAGING_DIR)/usr/include/$(notdir $(incdir)); \
+             $(INSTALL) -D -m 0644 $(@D)/include/$(incdir)/*.h \
+                     $(STAGING_DIR)/usr/include/$(notdir $(incdir))/
+     )
+     $(INSTALL) -D -m 0755 $(@D)/$(TI_GFX_BIN_PATH)/*.so $(STAGING_DIR)/usr/lib/
+     $(INSTALL) -D -m 0644 package/ti-gfx/egl.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+     $(INSTALL) -D -m 0644 package/ti-gfx/glesv2.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+endef
+
+define TI_GFX_INSTALL_KM_CMDS
+     $(MAKE) $(TI_GFX_KM_MAKE_OPTS) -C $(@D)/GFX_Linux_KM install
+endef
+
+define TI_GFX_INSTALL_BINS_CMDS
+     $(foreach bin,$(TI_GFX_BIN),
+             $(INSTALL) -D -m 0755 $(@D)/$(TI_GFX_BIN_PATH)/$(bin) \
+                     $(TARGET_DIR)/usr/bin/$(bin)
+     )
+     $(if $(BR2_PACKAGE_TI_GFX_DEBUG),
+             $(INSTALL) -D -m 0755 package/ti-gfx/esrev.sh \
+                     $(TARGET_DIR)/usr/bin/esrev)

package/ti-gfx/ti-gfx.mk line 156

Quoted 6 lines

package/ti-gfx/ti-gfx.mk new file +6 -0

+endef
+
+define TI_GFX_INSTALL_LIBS_CMDS
+     # create symlinks and install libraries.  these libraries do not have a
+     # SONAME defined; therefore, they will not be automatically renamed and
+     # must be renamed manually.

I still don't understand this "automatically renamed" comment here.

Quoted 29 lines

package/ti-gfx/ti-gfx.mk new file +29 -0

+     $(foreach lib,$(TI_GFX_LIBS),
+             $(INSTALL) -D -m 0755 $(@D)/$(TI_GFX_BIN_PATH)/$(lib).so \
+                     $(TARGET_DIR)/usr/lib/$(lib).so.$(TI_GFX_SO_VERSION); \
+             ln -sf $(lib).so.$(TI_GFX_SO_VERSION) \
+                     $(TARGET_DIR)/usr/lib/$(lib).so
+     )
+     # libs use the following file for configuration.
+     $(INSTALL) -D -m 0644 package/ti-gfx/powervr.ini \
+             $(TARGET_DIR)/etc/powervr.ini
+endef
+
+ifeq ($(BR2_PACKAGE_TI_GFX_DEMOS),y)
+define TI_GFX_INSTALL_DEMOS_CMDS
+     $(foreach demo,$(TI_GFX_DEMOS),
+             $(INSTALL) -D -m 0755 \
+             $(@D)/$(TI_GFX_DEMOS_LOC)/$(demo)/$(TI_GFX_DEMOS_BIN_LOC)/OGLES2$(demo) \
+             $(TARGET_DIR)/usr/bin/OGLES2$(demo)
+     )
+endef
+endif
+
+define TI_GFX_INSTALL_INIT_SYSV
+     $(INSTALL) -D -m 0755 package/ti-gfx/S80ti-gfx \
+             $(TARGET_DIR)/etc/init.d/S80ti-gfx
+endef
+
+define TI_GFX_INSTALL_TARGET_CMDS
+     $(TI_GFX_INSTALL_KM_CMDS)
+     $(TI_GFX_INSTALL_BINS_CMDS)

package/ti-gfx/ti-gfx.mk line 189

Quoted 4 lines

package/ti-gfx/ti-gfx.mk new file +4 -0

+     $(TI_GFX_INSTALL_LIBS_CMDS)
+     $(if $(BR2_PACKAGE_TI_GFX_DEMOS),
+             $(TI_GFX_INSTALL_DEMOS_CMDS)
+     )

Same comment as above for demo build, especially since TI_GFX_INSTALL_DEMOS_CMDS is not defined when BR2_PACKAGE_TI_GFX_DEMOS is not enabled.

package/ti-gfx/ti-gfx.mk line 192

Quoted 3 lines

package/ti-gfx/ti-gfx.mk new file +3 -0

+endef
+
+$(eval $(generic-package))

Thanks!

Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

Quoted 6 lines

package/ti-gfx/ti-gfx.mk line 156

Quoted 4 lines

package/ti-gfx/ti-gfx.mk new file +4 -0

+define TI_GFX_INSTALL_LIBS_CMDS
+     # create symlinks and install libraries.  these libraries do not have a
+     # SONAME defined; therefore, they will not be automatically renamed and
+     # must be renamed manually.

I still don't understand this "automatically renamed" comment here.

i remember hearing that in some rootfs fixup, the libraries are renamed with symlinks according to the SONAME. However, I can't find it in the code so maybe this was just bad information.