Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

libsmbios: 2.3.2 -> 2.3.3 #31538

Merged
merged 3 commits into from Nov 26, 2017
Merged

libsmbios: 2.3.2 -> 2.3.3 #31538

merged 3 commits into from Nov 26, 2017

Conversation

c0bw3b
Copy link
Contributor

@c0bw3b c0bw3b commented Nov 11, 2017

Motivation for this change

Version bump and homepage refresh (#30636)
The former home http://linux.dell.com/libsmbios/ redirects to this Dell GH repo so we know it is the official one.

Note that the C++ lib is deprecated upstream and is now disabled by default. This will reduce closure-size. 馃樄
I've checked the packages depending on libsmbios (fwupd and fwupdate) and they both rely on the C lib.

I'm also adding the whole family of OSL licenses with this PR :

  • Academic Free License (AFL) 2.1 and 3.0
  • Open Software License (OSL) 2.1 and 3.0
  • Non-Profit Open Software License (NPOSL) 3.0
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@c0bw3b
Copy link
Contributor Author

c0bw3b commented Nov 11, 2017

And yet fwupd fails to build ...

gcc  -Iplugins/altos/fu_plugin_altos@sha -Iplugins/altos -I../plugins/altos -Iplugins/altos/../.. -I../plugins/altos/../.. -Iplugins/altos/../../src -I../plugins/altos/../../src -Iplugins/altos/../../libfwupd -I../plugins/altos/../../libfwupd -I/nix/store/5bglj2xcnyh54c6jp13mcyrdg2cgc0nq-glib-2.54.1-dev/include/glib-2.0 -I/nix/store/0cgwsihhxi6vzix5vdchrvj8m4qzb3r1-glib-2.54.1/lib/glib-2.0/include -I/nix/store/ddiqh7r6h05bvngkc0ipmxz8220xx20i-appstream-glib-0.7.2/include/libappstream-glib -I/nix/store/7jsm7709nb6gbb6s5wh46jz103z4cnm1-gdk-pixbuf-2.36.7-dev/include/gdk-pixbuf-2.0 -I/nix/store/5bglj2xcnyh54c6jp13mcyrdg2cgc0nq-glib-2.54.1-dev/include/gio-unix-2.0/ -I/nix/store/bm7rlhzj5vp2xp325mzb47s245bhpl08-gusb-0.2.11/include/gusb-1 -I/nix/store/3fi0ilcv79x5rwcvkysrpmaq3kgdi2dz-libusb-1.0.20-dev/include/libusb-1.0 -I/nix/store/g6byy7fx967kl6fvrlkas4j674fdjch0-libsoup-2.60.0-dev/include/libsoup-2.4 -I/nix/store/cm1m2xvpspcvm581rkb5i8jwqdnp5bb8-libarchive-3.3.2-dev/include -I/nix/store/2f6zmcl2m9jn2a077xhll8n6d1sp49fr-util-linux-2.31-dev/include/uuid -I/nix/store/3j98v4gm0alajr278580wi81ql0j3v7n-gcab-0.7/include/libgcab-1.0 -I/nix/store/z6y20w0ly27n6py23nz6j1nm4n3bbp29-libgudev-232/include/gudev-1.0 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -O3 -fstack-protector-strong -Waggregate-return -Wunused -Warray-bounds -Wcast-align -Wclobbered -Wdeclaration-after-statement -Wempty-body -Wformat=2 -Wformat-nonliteral -Wformat-security -Wformat-signedness -Wignored-qualifiers -Wimplicit-function-declaration -Winit-self -Wmissing-declarations -Wmissing-format-attribute -Wmissing-include-dirs -Wmissing-noreturn -Wmissing-parameter-type -Wmissing-prototypes -Wnested-externs -Wno-discarded-qualifiers -Wno-missing-field-initializers -Wno-strict-aliasing -Wno-suggest-attribute=format -Wno-unused-parameter -Wold-style-definition -Woverride-init -Wpointer-arith -Wredundant-decls -Wreturn-type -Wshadow -Wsign-compare -Wstrict-aliasing -Wstrict-prototypes -Wswitch-default -Wtype-limits -Wundef -Wuninitialized -Wunused-but-set-variable -Wwrite-strings -fPIC -pthread '-DG_LOG_DOMAIN="FuPluginAltos"' -MMD -MQ 'plugins/altos/fu_plugin_altos@sha/fu-device-altos.c.o' -MF 'plugins/altos/fu_plugin_altos@sha/fu-device-altos.c.o.d' -o 'plugins/altos/fu_plugin_altos@sha/fu-device-altos.c.o' -c ../plugins/altos/fu-device-altos.c
In file included from /nix/store/0cgwsihhxi6vzix5vdchrvj8m4qzb3r1-glib-2.54.1/lib/glib-2.0/include/glibconfig.h:9:0,
                 from /nix/store/5bglj2xcnyh54c6jp13mcyrdg2cgc0nq-glib-2.54.1-dev/include/glib-2.0/glib/gtypes.h:32,
                 from /nix/store/5bglj2xcnyh54c6jp13mcyrdg2cgc0nq-glib-2.54.1-dev/include/glib-2.0/glib/galloca.h:32,
                 from /nix/store/5bglj2xcnyh54c6jp13mcyrdg2cgc0nq-glib-2.54.1-dev/include/glib-2.0/glib.h:30,
                 from /nix/store/5bglj2xcnyh54c6jp13mcyrdg2cgc0nq-glib-2.54.1-dev/include/glib-2.0/gobject/gbinding.h:28,
                 from /nix/store/5bglj2xcnyh54c6jp13mcyrdg2cgc0nq-glib-2.54.1-dev/include/glib-2.0/glib-object.h:23,
                 from /nix/store/ddiqh7r6h05bvngkc0ipmxz8220xx20i-appstream-glib-0.7.2/include/libappstream-glib/as-app.h:29,
                 from /nix/store/ddiqh7r6h05bvngkc0ipmxz8220xx20i-appstream-glib-0.7.2/include/libappstream-glib/appstream-glib.h:27,
                 from ../plugins/altos/fu-device-altos.c:24:
/nix/store/5bglj2xcnyh54c6jp13mcyrdg2cgc0nq-glib-2.54.1-dev/include/glib-2.0/glib/gmacros.h:430:43: error: redefinition of 'glib_autoptr_cleanup_GUdevClient'
 #define _GLIB_AUTOPTR_FUNC_NAME(TypeName) glib_autoptr_cleanup_##TypeName
                                           ^
/nix/store/5bglj2xcnyh54c6jp13mcyrdg2cgc0nq-glib-2.54.1-dev/include/glib-2.0/glib/gmacros.h:444:22: note: in expansion of macro '_GLIB_AUTOPTR_FUNC_NAME'
   static inline void _GLIB_AUTOPTR_FUNC_NAME(TypeName) (TypeName **_ptr) { if (*_ptr) (func) (*_ptr); }         \
                      ^~~~~~~~~~~~~~~~~~~~~~~
../plugins/altos/fu-device-altos.c:54:1: note: in expansion of macro 'G_DEFINE_AUTOPTR_CLEANUP_FUNC'
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevClient, g_object_unref)
 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/nix/store/5bglj2xcnyh54c6jp13mcyrdg2cgc0nq-glib-2.54.1-dev/include/glib-2.0/glib/gmacros.h:430:43: note: previous definition of 'glib_autoptr_cleanup_GUdevClient' was here
 #define _GLIB_AUTOPTR_FUNC_NAME(TypeName) glib_autoptr_cleanup_##TypeName
                                           ^
/nix/store/5bglj2xcnyh54c6jp13mcyrdg2cgc0nq-glib-2.54.1-dev/include/glib-2.0/glib/gmacros.h:444:22: note: in expansion of macro '_GLIB_AUTOPTR_FUNC_NAME'
   static inline void _GLIB_AUTOPTR_FUNC_NAME(TypeName) (TypeName **_ptr) { if (*_ptr) (func) (*_ptr); }         \
                      ^~~~~~~~~~~~~~~~~~~~~~~
/nix/store/z6y20w0ly27n6py23nz6j1nm4n3bbp29-libgudev-232/include/gudev-1.0/gudev/gudevclient.h:39:1: note: in expansion of macro 'G_DEFINE_AUTOPTR_CLEANUP_FUNC'
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GUdevClient, g_object_unref)
 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

I guess this should wait for #30252

disassembler
disassembler suggested changes Nov 12, 2017
View reviewed changes
Copy link
Member

@disassembler disassembler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks good other than the one trailing whitespace I saw. Thanks for updating the licenses to have more detail in the name.

pkgs/os-specific/linux/libsmbios/default.nix Outdated

postInstall =
postInstall =
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you remove this trailing whitespace?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@c0bw3b
Copy link
Contributor Author

c0bw3b commented Nov 25, 2017 •
edited

Now that fwupd has been updated to 1.0.1 this builds fine:

Result in /tmp/nox-review-w8aw03jy
total 0
lrwxrwxrwx 1 zzzz users 59 25 nov.  16:21 result -> /nix/store/kddwbm3qxiw7dybjm8g00jpgf0d5mrb2-libsmbios-2.3.3
lrwxrwxrwx 1 zzzz users 55 25 nov.  16:21 result-2 -> /nix/store/h5l00lsycs0ypyx4p288d9zip9y08v95-fwupd-1.0.1
lrwxrwxrwx 1 zzzz users 54 25 nov.  16:21 result-3 -> /nix/store/hfal12b1zb2khl01g7xxwflrrhzn68mk-fwupdate-8

@disassembler not WIP anymore if you wish to re-check

@c0bw3b c0bw3b merged commit 819d089 into NixOS:master Nov 26, 2017
@pbogdan pbogdan mentioned this pull request Apr 21, 2018
Merged
8 tasks
@c0bw3b c0bw3b deleted the pkg/libsmbios branch September 28, 2018 20:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@disassembler disassembler disassembler requested changes

@edolstra edolstra Awaiting requested review from edolstra

@nbp nbp Awaiting requested review from nbp

Assignees
No one assigned
Labels
8.has: package (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@c0bw3b @disassembler @GrahamcOfBorg