| Message ID | 20201119075328.8599-1-christian@paral.in |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v4,1/5] package/nvidia-modprobe: new package | expand |
Hello Christian, Le 19/11/2020 à 08:53, Christian Stewart a écrit : > nvidia-modprobe package adds a utility and headers for probing the NVIDIA > hardware at runtime. > > https://github.com/NVIDIA/nvidia-modprobe > > Signed-off-by: Christian Stewart <christian@paral.in> > --- > package/Config.in | 1 + > package/nvidia-modprobe/Config.in | 12 ++++++ > package/nvidia-modprobe/nvidia-modprobe.hash | 3 ++ > package/nvidia-modprobe/nvidia-modprobe.mk | 45 ++++++++++++++++++++ > 4 files changed, 61 insertions(+) > create mode 100644 package/nvidia-modprobe/Config.in > create mode 100644 package/nvidia-modprobe/nvidia-modprobe.hash > create mode 100644 package/nvidia-modprobe/nvidia-modprobe.mk > > diff --git a/package/Config.in b/package/Config.in > index 016a99ed1a..fa1b5d35e9 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -502,6 +502,7 @@ endmenu > source "package/nanocom/Config.in" > source "package/neard/Config.in" > source "package/nvidia-driver/Config.in" > + source "package/nvidia-modprobe/Config.in" > source "package/nvme/Config.in" > source "package/ofono/Config.in" > source "package/on2-8170-modules/Config.in" > diff --git a/package/nvidia-modprobe/Config.in b/package/nvidia-modprobe/Config.in > new file mode 100644 > index 0000000000..35953a33d4 > --- /dev/null > +++ b/package/nvidia-modprobe/Config.in > @@ -0,0 +1,12 @@ > +config BR2_PACKAGE_NVIDIA_MODPROBE > + bool "nvidia-modprobe" > + depends on BR2_TOOLCHAIN_HAS_THREADS glibc toolchains already select BR2_TOOLCHAIN_HAS_THREADS. > + depends on BR2_TOOLCHAIN_USES_GLIBC > + help > + nvidia-modprobe package adds a utility and headers for > + probing the NVIDIA hardware at runtime. > + > + https://github.com/NVIDIA/nvidia-modprobe > + > +comment "nvidia-modprobe needs a glibc toolchain w/ threads" > + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAN_USES_GLIBC > diff --git a/package/nvidia-modprobe/nvidia-modprobe.hash b/package/nvidia-modprobe/nvidia-modprobe.hash > new file mode 100644 > index 0000000000..99908680f0 > --- /dev/null > +++ b/package/nvidia-modprobe/nvidia-modprobe.hash > @@ -0,0 +1,3 @@ > +# Locally computed: > +sha256 396b4102d3075a2dee3024652fae206a1b38ace54b8efb1e2c20757a11ec19f1 nvidia-modprobe-450.57.tar.gz > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/nvidia-modprobe/nvidia-modprobe.mk b/package/nvidia-modprobe/nvidia-modprobe.mk > new file mode 100644 > index 0000000000..7eeee6716c > --- /dev/null > +++ b/package/nvidia-modprobe/nvidia-modprobe.mk > @@ -0,0 +1,45 @@ > +################################################################################ > +# > +# nvidia-modprobe > +# > +################################################################################ > + > +NVIDIA_MODPROBE_VERSION = 450.57 > +NVIDIA_MODPROBE_SITE = $(call github,NVIDIA,nvidia-modprobe,$(NVIDIA_MODPROBE_VERSION)) > +NVIDIA_MODPROBE_LICENSE = GPL-2 The license should use identifier like GPL-2.0 or GPL-2.0+. Here it should be GPL-2.0. > +NVIDIA_MODPROBE_LICENSE_FILES = COPYING > + > +NVIDIA_MODPROBE_DEPENDENCIES = host-pkgconf Why ? the binary is build by using gcc directly without any build system. > +NVIDIA_MODPROBE_INSTALL_STAGING = YES > + > +define NVIDIA_MODPROBE_BUILD_CMDS > + mkdir -p $(@D)/bin > + $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ > + -I $(@D)/common-utils -I $(@D)/modprobe-utils \ > + -o $(@D)/bin/nvidia-modprobe \ > + -DNV_LINUX=true -DPROGRAM_NAME=\"nvidia-modprobe\" \ > + -DNVIDIA_VERSION=\"$(NVIDIA_MODPROBE_VERSION)\" \ > + $(@D)/nvidia-modprobe.c $(@D)/modprobe-utils/nvidia-modprobe-utils.c \ > + $(@D)/modprobe-utils/pci-sysfs.c $(@D)/common-utils/common-utils.c \ > + $(@D)/common-utils/msg.c $(@D)/common-utils/nvgetopt.c > +endef There is a Makefile why not using it ? Ok it want to install the man pages but it should be easy to fix it. > + > +define NVIDIA_MODPROBE_INSTALL_STAGING_CMDS > + $(INSTALL) -D -m 644 $(@D)/modprobe-utils/nvidia-modprobe-utils.h \ > + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/nvidia-modprobe-utils.h > + $(INSTALL) -D -m 644 $(@D)/modprobe-utils/pci-enum.h \ > + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/pci-enum.h > + $(INSTALL) -D -m 644 $(@D)/common-utils/common-utils.h \ > + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/nvidia-common-utils.h > + $(INSTALL) -D -m 644 $(@D)/common-utils/msg.h \ > + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/msg.h > + $(INSTALL) -D -m 644 $(@D)/common-utils/nvgetopt.h \ > + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/nvgetopt.h > +endef Same, we really don't want to maintain the gcc command line and the list of installed files. The Makefile must do it for us :) > + > +define NVIDIA_MODPROBE_INSTALL_TARGET_CMDS > + $(INSTALL) -m 0755 $(@D)/bin/nvidia-modprobe \ > + $(TARGET_DIR)/usr/bin/nvidia-modprobe > +endef Same. Best regards, Romain > + > +$(eval $(generic-package)) >
Hi Romain, On Sat, Nov 21, 2020 at 2:19 AM Romain Naour <romain.naour@gmail.com> wrote: [snip] > > +NVIDIA_MODPROBE_VERSION = 450.57 > > +NVIDIA_MODPROBE_SITE = $(call github,NVIDIA,nvidia-modprobe,$(NVIDIA_MODPROBE_VERSION)) > > +NVIDIA_MODPROBE_LICENSE = GPL-2 > > The license should use identifier like GPL-2.0 or GPL-2.0+. > Here it should be GPL-2.0. Ok, noted. > > +NVIDIA_MODPROBE_LICENSE_FILES = COPYING > > + > > +NVIDIA_MODPROBE_DEPENDENCIES = host-pkgconf > > Why ? the binary is build by using gcc directly without any build system. At one point I had errors about pkgconf, so I added the dependency. Will try building it without the dependency and see if it works. > > +NVIDIA_MODPROBE_INSTALL_STAGING = YES > > + > > +define NVIDIA_MODPROBE_BUILD_CMDS > > + mkdir -p $(@D)/bin > > + $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ > > + -I $(@D)/common-utils -I $(@D)/modprobe-utils \ > > + -o $(@D)/bin/nvidia-modprobe \ > > + -DNV_LINUX=true -DPROGRAM_NAME=\"nvidia-modprobe\" \ > > + -DNVIDIA_VERSION=\"$(NVIDIA_MODPROBE_VERSION)\" \ > > + $(@D)/nvidia-modprobe.c $(@D)/modprobe-utils/nvidia-modprobe-utils.c \ > > + $(@D)/modprobe-utils/pci-sysfs.c $(@D)/common-utils/common-utils.c \ > > + $(@D)/common-utils/msg.c $(@D)/common-utils/nvgetopt.c > > +endef > > There is a Makefile why not using it ? > Ok it want to install the man pages but it should be easy to fix it. The makefile was not working correctly and doing a lot of extra stuff we don't need. Why is storing the simplified build commands in the makefile via a patch more clear / easy to maintain than directly in the Buildroot makefiles? If necessary, I will re-format this into the makefile via a patch for the next revision. But this definitely works fine as-is and we are unlikely to need a more complicated build script for this package in the future. > > +define NVIDIA_MODPROBE_INSTALL_STAGING_CMDS > > + $(INSTALL) -D -m 644 $(@D)/modprobe-utils/nvidia-modprobe-utils.h \ > > + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/nvidia-modprobe-utils.h > > + $(INSTALL) -D -m 644 $(@D)/modprobe-utils/pci-enum.h \ > > + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/pci-enum.h > > + $(INSTALL) -D -m 644 $(@D)/common-utils/common-utils.h \ > > + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/nvidia-common-utils.h > > + $(INSTALL) -D -m 644 $(@D)/common-utils/msg.h \ > > + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/msg.h > > + $(INSTALL) -D -m 644 $(@D)/common-utils/nvgetopt.h \ > > + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/nvgetopt.h > > +endef > > Same, we really don't want to maintain the gcc command line and the list of > installed files. The Makefile must do it for us :) Why? The list won't change. How is storing it in a patch file easier to maintain than in this makefile? > > + > > +define NVIDIA_MODPROBE_INSTALL_TARGET_CMDS > > + $(INSTALL) -m 0755 $(@D)/bin/nvidia-modprobe \ > > + $(TARGET_DIR)/usr/bin/nvidia-modprobe > > +endef > > Same. ?? Best, Christian
Hello Christian, Le 21/11/2020 à 21:32, Christian Stewart a écrit : > Hi Romain, > > On Sat, Nov 21, 2020 at 2:19 AM Romain Naour <romain.naour@gmail.com> wrote: > > [snip] > >>> +NVIDIA_MODPROBE_VERSION = 450.57 >>> +NVIDIA_MODPROBE_SITE = $(call github,NVIDIA,nvidia-modprobe,$(NVIDIA_MODPROBE_VERSION)) >>> +NVIDIA_MODPROBE_LICENSE = GPL-2 >> >> The license should use identifier like GPL-2.0 or GPL-2.0+. >> Here it should be GPL-2.0. > > Ok, noted. > >>> +NVIDIA_MODPROBE_LICENSE_FILES = COPYING >>> + >>> +NVIDIA_MODPROBE_DEPENDENCIES = host-pkgconf >> >> Why ? the binary is build by using gcc directly without any build system. > > At one point I had errors about pkgconf, so I added the dependency. > Will try building it without the dependency and see if it works. I tried without host-pkgconf and nvidia-modprobe build. > >>> +NVIDIA_MODPROBE_INSTALL_STAGING = YES >>> + >>> +define NVIDIA_MODPROBE_BUILD_CMDS >>> + mkdir -p $(@D)/bin >>> + $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ >>> + -I $(@D)/common-utils -I $(@D)/modprobe-utils \ >>> + -o $(@D)/bin/nvidia-modprobe \ >>> + -DNV_LINUX=true -DPROGRAM_NAME=\"nvidia-modprobe\" \ >>> + -DNVIDIA_VERSION=\"$(NVIDIA_MODPROBE_VERSION)\" \ >>> + $(@D)/nvidia-modprobe.c $(@D)/modprobe-utils/nvidia-modprobe-utils.c \ >>> + $(@D)/modprobe-utils/pci-sysfs.c $(@D)/common-utils/common-utils.c \ >>> + $(@D)/common-utils/msg.c $(@D)/common-utils/nvgetopt.c >>> +endef >> >> There is a Makefile why not using it ? >> Ok it want to install the man pages but it should be easy to fix it. > > The makefile was not working correctly and doing a lot of extra stuff > we don't need. > > Why is storing the simplified build commands in the makefile via a > patch more clear / easy to maintain than directly in the Buildroot > makefiles? > > If necessary, I will re-format this into the makefile via a patch for > the next revision. But this definitely works fine as-is and we are > unlikely to need a more complicated build script for this package in > the future. It was not clear why you don't use the Makefile provided by Nvidia. Indeed the build is ok as is but we should use the Makefile provided by the package if possible. I'm ok to keep as is if the Makefile provided by Nvidia doesn't work with Buildroot. Note: there are some examples of packages installing a Makefile instead of calling gcc from package.mk: $ find package/ -name Makefile package/ramsmp/Makefile package/dhrystone/Makefile package/ramspeed/Makefile For simple program like fan-ctrl there is no Makefile: package/fan-ctrl/fan-ctrl.mk > >>> +define NVIDIA_MODPROBE_INSTALL_STAGING_CMDS >>> + $(INSTALL) -D -m 644 $(@D)/modprobe-utils/nvidia-modprobe-utils.h \ >>> + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/nvidia-modprobe-utils.h >>> + $(INSTALL) -D -m 644 $(@D)/modprobe-utils/pci-enum.h \ >>> + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/pci-enum.h >>> + $(INSTALL) -D -m 644 $(@D)/common-utils/common-utils.h \ >>> + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/nvidia-common-utils.h >>> + $(INSTALL) -D -m 644 $(@D)/common-utils/msg.h \ >>> + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/msg.h >>> + $(INSTALL) -D -m 644 $(@D)/common-utils/nvgetopt.h \ >>> + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/nvgetopt.h >>> +endef >> >> Same, we really don't want to maintain the gcc command line and the list of >> installed files. The Makefile must do it for us :) > > Why? The list won't change. How is storing it in a patch file easier > to maintain than in this makefile? How do you know that this list won't change when the package will be updated to a newer version ? Usually we prefer using: make -C $(@D) DEST_DIR=$(STAGING_DIR) install > >>> + >>> +define NVIDIA_MODPROBE_INSTALL_TARGET_CMDS >>> + $(INSTALL) -m 0755 $(@D)/bin/nvidia-modprobe \ >>> + $(TARGET_DIR)/usr/bin/nvidia-modprobe >>> +endef >> >> Same. > > ?? Usually we prefer using: make -C $(@D) DEST_DIR=$(TARGET_DIR) install The headers installed are removed by Buildroot during target-finalize. Best regards, Romain > > Best, > Christian >
On 21/11/2020 23:49, Romain Naour wrote: > Hello Christian, > > Le 21/11/2020 à 21:32, Christian Stewart a écrit : >> Hi Romain, >> >> On Sat, Nov 21, 2020 at 2:19 AM Romain Naour <romain.naour@gmail.com> wrote: >> >> [snip] >> >>>> +NVIDIA_MODPROBE_VERSION = 450.57 >>>> +NVIDIA_MODPROBE_SITE = $(call github,NVIDIA,nvidia-modprobe,$(NVIDIA_MODPROBE_VERSION)) >>>> +NVIDIA_MODPROBE_LICENSE = GPL-2 >>> >>> The license should use identifier like GPL-2.0 or GPL-2.0+. >>> Here it should be GPL-2.0. >> >> Ok, noted. >> >>>> +NVIDIA_MODPROBE_LICENSE_FILES = COPYING >>>> + >>>> +NVIDIA_MODPROBE_DEPENDENCIES = host-pkgconf >>> >>> Why ? the binary is build by using gcc directly without any build system. >> >> At one point I had errors about pkgconf, so I added the dependency. >> Will try building it without the dependency and see if it works. > > I tried without host-pkgconf and nvidia-modprobe build. > >> >>>> +NVIDIA_MODPROBE_INSTALL_STAGING = YES >>>> + >>>> +define NVIDIA_MODPROBE_BUILD_CMDS >>>> + mkdir -p $(@D)/bin >>>> + $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ >>>> + -I $(@D)/common-utils -I $(@D)/modprobe-utils \ >>>> + -o $(@D)/bin/nvidia-modprobe \ >>>> + -DNV_LINUX=true -DPROGRAM_NAME=\"nvidia-modprobe\" \ >>>> + -DNVIDIA_VERSION=\"$(NVIDIA_MODPROBE_VERSION)\" \ >>>> + $(@D)/nvidia-modprobe.c $(@D)/modprobe-utils/nvidia-modprobe-utils.c \ >>>> + $(@D)/modprobe-utils/pci-sysfs.c $(@D)/common-utils/common-utils.c \ >>>> + $(@D)/common-utils/msg.c $(@D)/common-utils/nvgetopt.c >>>> +endef >>> >>> There is a Makefile why not using it ? >>> Ok it want to install the man pages but it should be easy to fix it. >> >> The makefile was not working correctly and doing a lot of extra stuff >> we don't need. I double-checked, and indeed it's not working correctly. But actually, only because it tries to generate the manpages with a program compiled for the target. It's easily solved with >> Why is storing the simplified build commands in the makefile via a >> patch more clear / easy to maintain than directly in the Buildroot >> makefiles? As indicated by Romain, it's more maintainable to reuse the existing Makefile than having to update the source file list when it changes. That said, if the Makefile needs to be patched, and the patch is not upstreamable, then it's OK to explicitly have the build command in the Buildroot .mk file. >> >> If necessary, I will re-format this into the makefile via a patch for >> the next revision. But this definitely works fine as-is and we are >> unlikely to need a more complicated build script for this package in >> the future. > > It was not clear why you don't use the Makefile provided by Nvidia. > Indeed the build is ok as is but we should use the Makefile provided by the > package if possible. I'm ok to keep as is if the Makefile provided by Nvidia > doesn't work with Buildroot. > > Note: there are some examples of packages installing a Makefile instead of > calling gcc from package.mk: > > $ find package/ -name Makefile > package/ramsmp/Makefile > package/dhrystone/Makefile > package/ramspeed/Makefile > > For simple program like fan-ctrl there is no Makefile: > package/fan-ctrl/fan-ctrl.mk I don't think for this one a separate Makefile is warranted. > >> >>>> +define NVIDIA_MODPROBE_INSTALL_STAGING_CMDS >>>> + $(INSTALL) -D -m 644 $(@D)/modprobe-utils/nvidia-modprobe-utils.h \ >>>> + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/nvidia-modprobe-utils.h >>>> + $(INSTALL) -D -m 644 $(@D)/modprobe-utils/pci-enum.h \ >>>> + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/pci-enum.h >>>> + $(INSTALL) -D -m 644 $(@D)/common-utils/common-utils.h \ >>>> + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/nvidia-common-utils.h >>>> + $(INSTALL) -D -m 644 $(@D)/common-utils/msg.h \ >>>> + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/msg.h >>>> + $(INSTALL) -D -m 644 $(@D)/common-utils/nvgetopt.h \ >>>> + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/nvgetopt.h Why do you install these to staging? There is no library installed to staging, and the upstream Makefile also doesn't install these, so they would seem to be internal headers... >>>> +endef >>> >>> Same, we really don't want to maintain the gcc command line and the list of >>> installed files. The Makefile must do it for us :) >> >> Why? The list won't change. How is storing it in a patch file easier >> to maintain than in this makefile? > > How do you know that this list won't change when the package will be updated to > a newer version ? > > Usually we prefer using: > make -C $(@D) DEST_DIR=$(STAGING_DIR) install That one definitely won't work because it also installs man pages which can't be generated, and it tries to strip the binary with the wrong strip program. Regards, Arnout >>>> + >>>> +define NVIDIA_MODPROBE_INSTALL_TARGET_CMDS >>>> + $(INSTALL) -m 0755 $(@D)/bin/nvidia-modprobe \ >>>> + $(TARGET_DIR)/usr/bin/nvidia-modprobe >>>> +endef >>> >>> Same. >> >> ?? > > Usually we prefer using: > make -C $(@D) DEST_DIR=$(TARGET_DIR) install > > The headers installed are removed by Buildroot during target-finalize. > > Best regards, > Romain > > >> >> Best, >> Christian >> > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot >
On 19/11/2020 08:53, Christian Stewart wrote: > nvidia-modprobe package adds a utility and headers for probing the NVIDIA > hardware at runtime. > > https://github.com/NVIDIA/nvidia-modprobe > > Signed-off-by: Christian Stewart <christian@paral.in> In the end, I applied to master but with many changes: [Arnout: - use upstream Makefile instead of building directly; - don't install to staging; - remove dependency on host-pkgconf; - correct license to GPL-2.0; - remove dependency on threads and glibc; - add dependency on MMU.] Could you re-test what was applied to master, and send a follow-up that fixes it if I made a mistake? Regards, Arnout > --- > package/Config.in | 1 + > package/nvidia-modprobe/Config.in | 12 ++++++ > package/nvidia-modprobe/nvidia-modprobe.hash | 3 ++ > package/nvidia-modprobe/nvidia-modprobe.mk | 45 ++++++++++++++++++++ > 4 files changed, 61 insertions(+) > create mode 100644 package/nvidia-modprobe/Config.in > create mode 100644 package/nvidia-modprobe/nvidia-modprobe.hash > create mode 100644 package/nvidia-modprobe/nvidia-modprobe.mk > > diff --git a/package/Config.in b/package/Config.in > index 016a99ed1a..fa1b5d35e9 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -502,6 +502,7 @@ endmenu > source "package/nanocom/Config.in" > source "package/neard/Config.in" > source "package/nvidia-driver/Config.in" > + source "package/nvidia-modprobe/Config.in" > source "package/nvme/Config.in" > source "package/ofono/Config.in" > source "package/on2-8170-modules/Config.in" > diff --git a/package/nvidia-modprobe/Config.in b/package/nvidia-modprobe/Config.in > new file mode 100644 > index 0000000000..35953a33d4 > --- /dev/null > +++ b/package/nvidia-modprobe/Config.in > @@ -0,0 +1,12 @@ > +config BR2_PACKAGE_NVIDIA_MODPROBE > + bool "nvidia-modprobe" > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on BR2_TOOLCHAIN_USES_GLIBC > + help > + nvidia-modprobe package adds a utility and headers for > + probing the NVIDIA hardware at runtime. > + > + https://github.com/NVIDIA/nvidia-modprobe > + > +comment "nvidia-modprobe needs a glibc toolchain w/ threads" > + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAN_USES_GLIBC > diff --git a/package/nvidia-modprobe/nvidia-modprobe.hash b/package/nvidia-modprobe/nvidia-modprobe.hash > new file mode 100644 > index 0000000000..99908680f0 > --- /dev/null > +++ b/package/nvidia-modprobe/nvidia-modprobe.hash > @@ -0,0 +1,3 @@ > +# Locally computed: > +sha256 396b4102d3075a2dee3024652fae206a1b38ace54b8efb1e2c20757a11ec19f1 nvidia-modprobe-450.57.tar.gz > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/nvidia-modprobe/nvidia-modprobe.mk b/package/nvidia-modprobe/nvidia-modprobe.mk > new file mode 100644 > index 0000000000..7eeee6716c > --- /dev/null > +++ b/package/nvidia-modprobe/nvidia-modprobe.mk > @@ -0,0 +1,45 @@ > +################################################################################ > +# > +# nvidia-modprobe > +# > +################################################################################ > + > +NVIDIA_MODPROBE_VERSION = 450.57 > +NVIDIA_MODPROBE_SITE = $(call github,NVIDIA,nvidia-modprobe,$(NVIDIA_MODPROBE_VERSION)) > +NVIDIA_MODPROBE_LICENSE = GPL-2 > +NVIDIA_MODPROBE_LICENSE_FILES = COPYING > + > +NVIDIA_MODPROBE_DEPENDENCIES = host-pkgconf > +NVIDIA_MODPROBE_INSTALL_STAGING = YES > + > +define NVIDIA_MODPROBE_BUILD_CMDS > + mkdir -p $(@D)/bin > + $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ > + -I $(@D)/common-utils -I $(@D)/modprobe-utils \ > + -o $(@D)/bin/nvidia-modprobe \ > + -DNV_LINUX=true -DPROGRAM_NAME=\"nvidia-modprobe\" \ > + -DNVIDIA_VERSION=\"$(NVIDIA_MODPROBE_VERSION)\" \ > + $(@D)/nvidia-modprobe.c $(@D)/modprobe-utils/nvidia-modprobe-utils.c \ > + $(@D)/modprobe-utils/pci-sysfs.c $(@D)/common-utils/common-utils.c \ > + $(@D)/common-utils/msg.c $(@D)/common-utils/nvgetopt.c > +endef > + > +define NVIDIA_MODPROBE_INSTALL_STAGING_CMDS > + $(INSTALL) -D -m 644 $(@D)/modprobe-utils/nvidia-modprobe-utils.h \ > + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/nvidia-modprobe-utils.h > + $(INSTALL) -D -m 644 $(@D)/modprobe-utils/pci-enum.h \ > + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/pci-enum.h > + $(INSTALL) -D -m 644 $(@D)/common-utils/common-utils.h \ > + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/nvidia-common-utils.h > + $(INSTALL) -D -m 644 $(@D)/common-utils/msg.h \ > + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/msg.h > + $(INSTALL) -D -m 644 $(@D)/common-utils/nvgetopt.h \ > + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/nvgetopt.h > +endef > + > +define NVIDIA_MODPROBE_INSTALL_TARGET_CMDS > + $(INSTALL) -m 0755 $(@D)/bin/nvidia-modprobe \ > + $(TARGET_DIR)/usr/bin/nvidia-modprobe > +endef > + > +$(eval $(generic-package)) >
diff --git a/package/Config.in b/package/Config.in index 016a99ed1a..fa1b5d35e9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -502,6 +502,7 @@ endmenu source "package/nanocom/Config.in" source "package/neard/Config.in" source "package/nvidia-driver/Config.in" + source "package/nvidia-modprobe/Config.in" source "package/nvme/Config.in" source "package/ofono/Config.in" source "package/on2-8170-modules/Config.in" diff --git a/package/nvidia-modprobe/Config.in b/package/nvidia-modprobe/Config.in new file mode 100644 index 0000000000..35953a33d4 --- /dev/null +++ b/package/nvidia-modprobe/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_NVIDIA_MODPROBE + bool "nvidia-modprobe" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_USES_GLIBC + help + nvidia-modprobe package adds a utility and headers for + probing the NVIDIA hardware at runtime. + + https://github.com/NVIDIA/nvidia-modprobe + +comment "nvidia-modprobe needs a glibc toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAN_USES_GLIBC diff --git a/package/nvidia-modprobe/nvidia-modprobe.hash b/package/nvidia-modprobe/nvidia-modprobe.hash new file mode 100644 index 0000000000..99908680f0 --- /dev/null +++ b/package/nvidia-modprobe/nvidia-modprobe.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 396b4102d3075a2dee3024652fae206a1b38ace54b8efb1e2c20757a11ec19f1 nvidia-modprobe-450.57.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/nvidia-modprobe/nvidia-modprobe.mk b/package/nvidia-modprobe/nvidia-modprobe.mk new file mode 100644 index 0000000000..7eeee6716c --- /dev/null +++ b/package/nvidia-modprobe/nvidia-modprobe.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# nvidia-modprobe +# +################################################################################ + +NVIDIA_MODPROBE_VERSION = 450.57 +NVIDIA_MODPROBE_SITE = $(call github,NVIDIA,nvidia-modprobe,$(NVIDIA_MODPROBE_VERSION)) +NVIDIA_MODPROBE_LICENSE = GPL-2 +NVIDIA_MODPROBE_LICENSE_FILES = COPYING + +NVIDIA_MODPROBE_DEPENDENCIES = host-pkgconf +NVIDIA_MODPROBE_INSTALL_STAGING = YES + +define NVIDIA_MODPROBE_BUILD_CMDS + mkdir -p $(@D)/bin + $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ + -I $(@D)/common-utils -I $(@D)/modprobe-utils \ + -o $(@D)/bin/nvidia-modprobe \ + -DNV_LINUX=true -DPROGRAM_NAME=\"nvidia-modprobe\" \ + -DNVIDIA_VERSION=\"$(NVIDIA_MODPROBE_VERSION)\" \ + $(@D)/nvidia-modprobe.c $(@D)/modprobe-utils/nvidia-modprobe-utils.c \ + $(@D)/modprobe-utils/pci-sysfs.c $(@D)/common-utils/common-utils.c \ + $(@D)/common-utils/msg.c $(@D)/common-utils/nvgetopt.c +endef + +define NVIDIA_MODPROBE_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 644 $(@D)/modprobe-utils/nvidia-modprobe-utils.h \ + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/nvidia-modprobe-utils.h + $(INSTALL) -D -m 644 $(@D)/modprobe-utils/pci-enum.h \ + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/pci-enum.h + $(INSTALL) -D -m 644 $(@D)/common-utils/common-utils.h \ + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/nvidia-common-utils.h + $(INSTALL) -D -m 644 $(@D)/common-utils/msg.h \ + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/msg.h + $(INSTALL) -D -m 644 $(@D)/common-utils/nvgetopt.h \ + $(STAGING_DIR)/usr/include/nvidia-modprobe-utils/nvgetopt.h +endef + +define NVIDIA_MODPROBE_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 $(@D)/bin/nvidia-modprobe \ + $(TARGET_DIR)/usr/bin/nvidia-modprobe +endef + +$(eval $(generic-package))
nvidia-modprobe package adds a utility and headers for probing the NVIDIA hardware at runtime. https://github.com/NVIDIA/nvidia-modprobe Signed-off-by: Christian Stewart <christian@paral.in> --- package/Config.in | 1 + package/nvidia-modprobe/Config.in | 12 ++++++ package/nvidia-modprobe/nvidia-modprobe.hash | 3 ++ package/nvidia-modprobe/nvidia-modprobe.mk | 45 ++++++++++++++++++++ 4 files changed, 61 insertions(+) create mode 100644 package/nvidia-modprobe/Config.in create mode 100644 package/nvidia-modprobe/nvidia-modprobe.hash create mode 100644 package/nvidia-modprobe/nvidia-modprobe.mk