From 24129d8242e35a3e192872dc42a9901cc1a08277 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 6 Aug 2013 19:46:44 -0400 Subject: [PATCH 1/2] bump(sys-apps/systemd): sync with upstream Packages updated: sys-apps/hwids sys-apps/kmod sys-apps/systemd sys-apps/systemd-sysv-utils virtual/udev --- .../portage-stable/sys-apps/hwids/ChangeLog | 27 +- .../portage-stable/sys-apps/hwids/Manifest | 28 +- ...-20130529.ebuild => hwids-20130707.ebuild} | 2 +- .../sys-apps/hwids/hwids-20130717-r1.ebuild | 47 +++ ...-20130302.ebuild => hwids-20130717.ebuild} | 14 +- .../sys-apps/hwids/hwids-99999999.ebuild | 4 +- .../portage-stable/sys-apps/kmod/ChangeLog | 129 ++++++- .../portage-stable/sys-apps/kmod/Manifest | 28 +- .../kmod/files/kmod-13-errno_syscall.patch | 31 ++ .../sys-apps/kmod/files/static-nodes | 18 + .../{kmod-12-r1.ebuild => kmod-13-r1.ebuild} | 36 +- .../sys-apps/kmod/kmod-14-r1.ebuild | 132 +++++++ .../sys-apps/kmod/kmod-9999.ebuild | 62 +++- .../portage-stable/sys-apps/kmod/metadata.xml | 2 +- .../portage-stable/sys-apps/systemd/ChangeLog | 100 ++++- .../portage-stable/sys-apps/systemd/Manifest | 60 ++- ...01-Disable-udev-targets-for-udev-190.patch | 331 ----------------- .../files/196-0001-Disable-udev-targets.patch | 344 ------------------ ...on-t-fail-with-missing-gcrypt-macros.patch | 31 -- .../files/197-0001-Disable-udev-targets.patch | 59 --- ...ate-file-after-generating-the-sessio.patch | 84 +++++ ...ymaps-to-localectl-supported-locatio.patch | 25 ++ ...upport-passing-prefix-multiple-times.patch | 90 +++++ ...04-tmpfiles-introduce-exclude-prefix.patch | 138 +++++++ ...les-setup-exclude-dev-prefixes-files.patch | 23 ++ .../sys-apps/systemd/systemd-197-r1.ebuild | 222 ----------- .../sys-apps/systemd/systemd-200-r1.ebuild | 250 ------------- .../sys-apps/systemd/systemd-201.ebuild | 11 +- .../sys-apps/systemd/systemd-203-r1.ebuild | 290 --------------- .../sys-apps/systemd/systemd-204.ebuild | 13 +- ...temd-9999.ebuild => systemd-206-r1.ebuild} | 70 ++-- ...temd-202.ebuild => systemd-9999-r1.ebuild} | 105 +++--- .../portage-stable/virtual/udev/ChangeLog | 38 +- .../portage-stable/virtual/udev/Manifest | 27 +- .../virtual/udev/udev-171.ebuild | 18 - .../virtual/udev/udev-197-r3.ebuild | 22 -- .../virtual/udev/udev-197.ebuild | 21 -- .../virtual/udev/udev-200.ebuild | 22 ++ .../virtual/udev/udev-206.ebuild | 22 ++ 39 files changed, 1184 insertions(+), 1792 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-apps/hwids/{hwids-20130529.ebuild => hwids-20130707.ebuild} (90%) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/hwids/hwids-20130717-r1.ebuild rename sdk_container/src/third_party/portage-stable/sys-apps/hwids/{hwids-20130302.ebuild => hwids-20130717.ebuild} (60%) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-13-errno_syscall.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/static-nodes rename sdk_container/src/third_party/portage-stable/sys-apps/kmod/{kmod-12-r1.ebuild => kmod-13-r1.ebuild} (74%) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-14-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/191-0001-Disable-udev-targets-for-udev-190.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/196-0001-Disable-udev-targets.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/196-0002-Don-t-fail-with-missing-gcrypt-macros.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/197-0001-Disable-udev-targets.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0001-logind-update-state-file-after-generating-the-sessio.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0002-Add-usr-share-keymaps-to-localectl-supported-locatio.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0003-tmpfiles-support-passing-prefix-multiple-times.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0004-tmpfiles-introduce-exclude-prefix.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0005-tmpfiles-setup-exclude-dev-prefixes-files.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/systemd/systemd-197-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/systemd/systemd-200-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/systemd/systemd-203-r1.ebuild rename sdk_container/src/third_party/portage-stable/sys-apps/systemd/{systemd-9999.ebuild => systemd-206-r1.ebuild} (85%) rename sdk_container/src/third_party/portage-stable/sys-apps/systemd/{systemd-202.ebuild => systemd-9999-r1.ebuild} (73%) delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/udev/udev-171.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/udev/udev-197-r3.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/udev/udev-197.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/virtual/udev/udev-200.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/virtual/udev/udev-206.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/hwids/ChangeLog b/sdk_container/src/third_party/portage-stable/sys-apps/hwids/ChangeLog index f86d959c1d..cd44e4f2aa 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/hwids/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/sys-apps/hwids/ChangeLog @@ -1,6 +1,31 @@ # ChangeLog for sys-apps/hwids # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.109 2013/06/04 15:58:46 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.113 2013/07/23 05:00:11 ssuominen Exp $ + +*hwids-20130717-r1 (23 Jul 2013) + + 23 Jul 2013; Samuli Suominen + +hwids-20130717-r1.ebuild, hwids-99999999.ebuild: + Import 60-keyboard.hwdb file from systemd git for virtual/udev >= 206. + Because this file will conflict with the old keymap feature, be strict with + the virtual/udev dependency. + +*hwids-20130717 (17 Jul 2013) + + 17 Jul 2013; Diego E. Pettenò +hwids-20130717.ebuild: + Version bump. + +*hwids-20130707 (08 Jul 2013) + + 08 Jul 2013; Diego E. Pettenò +hwids-20130707.ebuild, + -hwids-20130617.ebuild: + Version bump. + +*hwids-20130617 (17 Jun 2013) + + 17 Jun 2013; Diego E. Pettenò +hwids-20130617.ebuild, + -hwids-20130302.ebuild, -hwids-20130529.ebuild: + Version bump; remove old. 04 Jun 2013; Samuli Suominen hwids-20130329.ebuild: m68k stable wrt #463678 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/hwids/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/hwids/Manifest index f82e5f5916..747a0c2632 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/hwids/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/hwids/Manifest @@ -1,23 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST hwids-20130302.tar.gz 1486329 SHA256 2c8bd8f3535d0bb6a0bada65e6499af8ff5191ca2cda44de6228c05d19444708 SHA512 79fe4b62555ef37cef929a9728c093e659805822e8a63e3229bf0d8391d50ce78b8d479a670be06f3da665ed50dcb7e50e56492d3fc03b530aa19b842680b8dd WHIRLPOOL 7ecb932b2eea48b8669624732236a37413b46e0c92ce4b0b3d1e87b8a53bd4219c9db76a535280429be7db1cf5cf2a4bf2f82f77a3f6da3c3aa4bcb31e5e92f2 DIST hwids-20130329.tar.gz 1498583 SHA256 64714243c366d086e24c6da41c73053b0f0ac47e3566186717591afe4ada6600 SHA512 f5a5c004269cd0ee8c3fd6bc9c2917e856084c3a267b4e35f6d96fbdb3ea36a3f73689fe59ab661faeff852cd016601e0ccfcbf01eef384b711ba6aef323c71c WHIRLPOOL 378ba5760a083beeb5f50dcad1e7faaf7ce6c4339fd73e5c47c7a89878177ebf3d4baf4d4ef7a2966c0df436f449f792226581e277300cc7d4394396ecbf2340 -DIST hwids-20130529.tar.gz 1525640 SHA256 25e7604906c3f04bb31ec925bef021418c7060634882951d2a1afd27ae3a9a5a SHA512 cbfe7d350f64415da26e8d4916d19f639cb25dba10a0c998dc157bcc4b4513996e1c8e64a7d480c2a6572c9adac3e420c774f83818b3fb2fcdb9fdc3ac594717 WHIRLPOOL 9b0cc5e10a125021e9e2d3904a390064e74f092422ffa54c0d3ea5d1946a6bd4a883a71a56c38e08563c5ee1d17d4009d1481d56af2cda59d3acce1a01d36987 -EBUILD hwids-20130302.ebuild 1021 SHA256 ed4aebe5ba0a692b952e75078f89ea2aaf11d967982facb76f8898a12074dbd8 SHA512 e35a3ddb6c7d4d8028a27f0af9093df521ed8b42ee6550fa21b31f9a606cbddb03d966cd257c261e2486241a869084e8a1b8e0b1c28bcec1c09882d6964f78ba WHIRLPOOL 560e5cd2504be8e9117139d0120107c582045d21f5ff8f7cee90e76fa3da9025e1dd16de678f19ddf560475d762427bc2f60cdb1356b39c02ae2e49ad549a9c9 +DIST hwids-20130707.tar.gz 1539522 SHA256 21bd292f5ab5f4e857609e47c95f3cfdea86e4b1ef309f7b893e4d429437e3c5 SHA512 4727503c85bbc200ccb2571325cd4def6fc0645ac0ebd1d3c17bfe86891b8901962664d48c5f087ced7527e233cf8fce9e6e8a6fff706c275540e0a9dbe71b64 WHIRLPOOL b7b65180b1ad0be56a8a141839a39e7fd1335ddffd4d17f1be530b63614f51f01b19fe2a8f87461fe12c4030466c4714588d17652baf162173c19c7f7a05ae0d +DIST hwids-20130717-keyboard.patch.xz 7380 SHA256 61f724cf3b351334e86eac8ff63c5784c9e9301695dd53e16b2c62feabfd63f7 SHA512 72c04a55bfd81adaf07078b8effc394a8a6a70541e890cb0393a83bf0b53958b486280b5e883aa2f3ab37458efb57bc5367d1989f043b4300a36eea7be008fed WHIRLPOOL 0f9a14f9e8584be5c25cf1c3c42ea781c19b2f14fddfca4e911a52a5cadeb1c6e87c8a83b60e56346cc2654b893e80082a4504fbf355bd48a2a08faabde5d408 +DIST hwids-20130717.tar.gz 1543147 SHA256 7ee05aca2d3c4ad42c429f97e67fcbdc3421111eff17da15711a017e96f994ad SHA512 d7ec2b4bef306e2a20f42c5177e071d086f39723ce7edaf219168f51f1387c2e81d326c7e0ae9f834b63cd540d423819cab813af6e43fe8bbaa37a14c575e098 WHIRLPOOL ebf9c97cc2b0d67789b2849c420e0ffb2a9f303f6139b91334645784f012de35a99c914f3491d03bf06d3b167cd79a3c1029de4e469659aeb267b7759032e095 EBUILD hwids-20130329.ebuild 1157 SHA256 78fced931fb9853fbc112e5ced89a85b95f8afda559c58e1531967182ce41275 SHA512 f6393e84a4bad69a4a250e60c93cf671fd0f2f038cfe43bbd5070ba6af8e38ee8e9564291c3b9466ecdf025e88bb3ecb9fff4301f1b0f8703085ac6c447bbd53 WHIRLPOOL 2cb7c7dfb61f94a9fd96d989e21dbe9d95626338833880eb3f23c986eae33e78519839167dd4f6e5c95c27db4cbadd2b50a18f5869b70d2899ad35595bac6657 -EBUILD hwids-20130529.ebuild 1168 SHA256 fd5cb518fb8a94368ba02fd3b6c0e2b6ed66d501e936d8137ada70368e67a1de SHA512 dd3b6ee52e9e7e69e451005b939c0cbca39d88fdb171334473c54cb89fe9f5ad2dbbe07fc2c8eac47757acb162cca689d65150eb9f86398b25a536c1cdabb1d7 WHIRLPOOL f5b32ad7a9e0731f9302cb77c70317d726f25c30e5ef36ccd11941d5b05014bfa8a729c7e24301e1162f9e37eec2aaaa445cc758cfa6572edb67c075b7582a91 -EBUILD hwids-99999999.ebuild 1003 SHA256 3ae1a26acb92a6fc0c609ba79c9f52c47c72ead9db4edeca911906f930d3853d SHA512 908908ec76e6afc659ad1fab6f9371ade39e8d9c91fd15b8a988a8163702962d1c1632df1b1f173f90d33403ad92e9554637dca2a4f2acba5850b1a26d24d7b9 WHIRLPOOL 3d40fdd1e5d4f9e16a799cd61935492040741b809da2b3661c770bfe58b3c222feb10c63d1bd4040988dc68a2032cae5e64213b14efe0076b7d5e27e28da0462 -MISC ChangeLog 16362 SHA256 f533261fa55af7baaa2149530845d1a3d35f6258829490d6e2ad0f9737450361 SHA512 3d5a2c037da90d690c312f031488f3d7f0d4f383fb987cef52d4bbe3b95aa0812e07876d8f23cca3ab1d705e7270ce1352a25b9ac2a16c4eb8b1fd66d3572a93 WHIRLPOOL 47d4f93bc6e690489e4510f85d1d30fd6e8fd0fd110d6506a5a6342091c15cdaec39d3421421e29001839f76a31cd5a5800f5b07a5ff65e7ada04016d3005aeb +EBUILD hwids-20130707.ebuild 1168 SHA256 164a470a3fdcbf7a4511a967d4c760dea3591f418692d0af1b3fe4297c6dfbed SHA512 206008495a317f6891eb70119aa43ce7c05dd6d9df29573d23f16cd26296fee7bf07063d21db12f5987332072fbc1d1afb9ef42e36cb69c3b63f78b8ea488d76 WHIRLPOOL acd6212a97dab81238ccf988fe7373d7dff42ff0012e6a8ab90a3db279e50b76179744c90aa7212df6d7a0086fb418b7fd8da4880a43c91119526429293d1dae +EBUILD hwids-20130717-r1.ebuild 1325 SHA256 358c2bdd3eacdae8199ea3b2a0f531cfd4818489e1f672d715db719ecdf45a3f SHA512 d95811ceec699e00a1aa68abb243913fed95c5f34d68a8d84b2c66e6b7c8b6a468d69b632694898725fd1ccbe63d502967756666d0fe92b96065e8b12195ce80 WHIRLPOOL f5f9475aaad6fcf8dcacf6a7a56c90d23619f61d5003ba26509ca8cd5f09b2e5b5082616943b4e5e6da10c254b5e86f326e2c57208a0291005598e6e9e7284e1 +EBUILD hwids-20130717.ebuild 1168 SHA256 815b2edb7454193bc1ccc0e1348955d07a4b3d8d04b463ddaa4288e3b896dc25 SHA512 e539b1edd2c8f175e7e6ecf25abed82e53177bd083adb55d7d6fcba24090270fcc446ee1cc55f8ed597090c9a0ae67f3f9f0d76583f4d8f8f0ac1e81b9308780 WHIRLPOOL d88d582f70c69733ab646ac743f096bce2b8ce72a1bd9e9f497c65156ca3cae1386c9604d22ee3d61745b33ec3d554b776e9bd8fe8cc65b4f92884ded510ba11 +EBUILD hwids-99999999.ebuild 1000 SHA256 511811a5518a5e0b2460fbbd66954b1bc431adac1d4fc4cb3532701766ec8faa SHA512 7a8ef5583221d66d061ae9f7402b63992166e9c2856ed4d3001f0aba9fa9e90f00640065d5bb2a0a748b62ed099f7bc88d580162e5bf5e41f44ffbe9a0656802 WHIRLPOOL 32a63b0be5d87ee6d6d2c2ee371ce7f62e742d0a385d8d390e7bb94fb80a3a2ce7b9b50f942970b2881a36cb700c568904e159ba362d94f8b744ed5892ecdf8a +MISC ChangeLog 17157 SHA256 922087f42597ea9c6070d1e4e81154c861f67dfe7dde4f8bdf958bb6c5aebb2b SHA512 a8132fd0f6dc9370825022fbfa0c536c5d1bed4eb19701a3d25a6279a8ee64ea5cd94e3ec6e1b18b125f8ca91039e28271982925c390c5b132fe5aaef7f32c98 WHIRLPOOL de15de1f8d30077610697a365e62c9957e0880383fd94678707d7d3950979e1a41fb394b09d4fc621312c864d829d11e251a88388d1b4391bff323db7ea056cd MISC metadata.xml 291 SHA256 6a6fbb9d576c975c7f7f488d478ab1db341ea21397f8cd66dc278b13a13a5731 SHA512 6e0af3b85a3693acd83889dabd6ce589c2c8e3e2852820f1135e2ebbe63cf6dd184fcd45f03b7c4ad35414a43543e8c39c7d1b5fa5f72c0e5db2ef907955e462 WHIRLPOOL 465e5e9b5700d6ed972ba129dc114843ec984f377569dfd81f7bb006717e0dc69181f2ffa31308adef1eab32c032d018e6cf519a0714b0ff21ee303dbf250942 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iQEcBAEBCAAGBQJRrg49AAoJEEdUh39IaPFNjoMH/RL/yaeiWCnN4hLW7HynlSsY -bl4dB7AkzEBhWgisHNUMZ0rOM4JFVD49QaHprNlQ1Wot8emFb7lLv80Z2Gx9YOIg -TaAiXVVNdlxAH2tQCocx9UriqCZ4DBZ/iWSOTwDy2oxxx4ovd5Evd/7q4/F8ntrN -VVeysiYvqv8mgxmhkrJVYWPcPDBCIQEtxLTICRkjv5s3f5rDniB4R0G7XDzgISjR -7ll8FbVm3Z8hcExVeTQui/50WiliSlgynMdkxUxm0RH0bj0IXxDUnpFLJ0vMBuZ0 -LkPAhJs2NzGt/1YJzwhkVI6XLFcNBB8TOmuaLNmrihmImVBDKW7Lf1JV+oNy6c4= -=deiN +iQEcBAEBCAAGBQJR7g2yAAoJEEdUh39IaPFNWaQH/R8n/yi3VKapI0EmXTdLDmjS +wSanp7ERr3i8koDY6W5+TsEZXMkZHdHSNTG+DszOG0V65kHdGQUk8iKafLwN9Pp7 +UAujLNZ+dSiO19yBcCGCS8bhTFC7w7BcviTdd5TVRBzsJv34oW5R8OIjqShbdlMh +o/8DrOX+bab3rezta6JMj1s8m8S50yCDYGoC/t/UhV1Ahu5idwxeb3ZZjzCsIWer +lKfkk2piqeDVz7powl1pi2nrHY9pYoJnwKAdBhCHs9ZWZtaPHI7H5QlUJDKSmohE +QBYQelv/YGIReKUeqzz4Jr8kp+J49ipzREm5/Dcft8n75O1Wh5W9xMxqqj8/E4w= +=dalV -----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/hwids/hwids-20130529.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/hwids/hwids-20130707.ebuild similarity index 90% rename from sdk_container/src/third_party/portage-stable/sys-apps/hwids/hwids-20130529.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/hwids/hwids-20130707.ebuild index 4ae9de2de1..dbf4176f0a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/hwids/hwids-20130529.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/hwids/hwids-20130707.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20130529.ebuild,v 1.1 2013/05/29 14:54:55 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20130707.ebuild,v 1.1 2013/07/08 08:44:31 flameeyes Exp $ EAPI=5 inherit udev eutils diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/hwids/hwids-20130717-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/hwids/hwids-20130717-r1.ebuild new file mode 100644 index 0000000000..6e478889f0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/hwids/hwids-20130717-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20130717-r1.ebuild,v 1.1 2013/07/23 05:00:11 ssuominen Exp $ + +EAPI=5 +inherit udev eutils + +DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases" +HOMEPAGE="https://github.com/gentoo/hwids" +SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz + http://dev.gentoo.org/~ssuominen/${P}-keyboard.patch.xz" + +LICENSE="|| ( GPL-2 BSD ) public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux" +IUSE="+udev" + +DEPEND="udev? ( + dev-lang/perl + >=virtual/udev-206 +)" +RDEPEND="!= 206 + epatch "${WORKDIR}"/${P}-keyboard.patch +} + +src_compile() { + emake UDEV=$(usex udev) +} + +src_install() { + emake UDEV=$(usex udev) install \ + DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \ + MISCDIR="${EPREFIX}/usr/share/misc" \ + HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \ + DESTDIR="${D}" +} + +pkg_postinst() { + use udev && udevadm hwdb --update --root="${ROOT%/}" +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/hwids/hwids-20130302.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/hwids/hwids-20130717.ebuild similarity index 60% rename from sdk_container/src/third_party/portage-stable/sys-apps/hwids/hwids-20130302.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/hwids/hwids-20130717.ebuild index 6b8879c1fc..0b55e2284c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/hwids/hwids-20130302.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/hwids/hwids-20130717.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20130302.ebuild,v 1.6 2013/03/06 20:25:45 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20130717.ebuild,v 1.1 2013/07/17 20:21:16 flameeyes Exp $ EAPI=5 inherit udev eutils @@ -11,7 +11,7 @@ SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz" LICENSE="|| ( GPL-2 BSD ) public-domain" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux" IUSE="+udev" DEPEND="udev? ( @@ -23,6 +23,10 @@ RDEPEND="! files/static-nodes: + Remove unrequired "need localmount" and add required "after modules" to the + init script depend() + Revision bump later after tmpfiles /dev support is in portage and the + init script has been finalized. + + 26 Jul 2013; Samuli Suominen -kmod-12-r1.ebuild, + -kmod-14.ebuild: + old + + 26 Jul 2013; Samuli Suominen kmod-13-r1.ebuild: + m68k stable wrt #470580 + + 26 Jul 2013; William Hubbs files/static-nodes: + Style fixes for init script, convert multiple spaces at the start of lines to + tabs. + + 23 Jul 2013; Samuli Suominen files/static-nodes: + Correct tmpfiles.setup init script name in depend() + +*kmod-14-r1 (23 Jul 2013) + + 23 Jul 2013; Samuli Suominen +kmod-14-r1.ebuild, + kmod-9999.ebuild, metadata.xml, +files/static-nodes: + Import support for kmod tmpfiles.d static device node creation wrt #477856 by + Alexander Vershilov + + 04 Jul 2013; William Hubbs -kmod-13.ebuild: + remove old version + +*kmod-14 (04 Jul 2013) + + 04 Jul 2013; Samuli Suominen +kmod-14.ebuild, + kmod-9999.ebuild: + Revert upstream commit that discontinued support for --enable-static in order + to get libkmod.a back for USE="static-libs" in sys-fs/udev (libudev.a) wrt + #472608. Version bump. + + 30 Jun 2013; Agostino Sarubbo kmod-13-r1.ebuild: + Stable for s390, wrt bug #470580 + + 29 Jun 2013; Agostino Sarubbo kmod-13-r1.ebuild: + Stable for ppc64, wrt bug #470580 + + 29 Jun 2013; Agostino Sarubbo kmod-13-r1.ebuild: + Stable for ppc, wrt bug #470580 + + 29 Jun 2013; Agostino Sarubbo kmod-13-r1.ebuild: + Stable for sparc, wrt bug #470580 + + 26 Jun 2013; Agostino Sarubbo kmod-13-r1.ebuild: + Stable for arm, wrt bug #470580 + + 26 Jun 2013; Agostino Sarubbo kmod-13-r1.ebuild: + Stable for ia64, wrt bug #470580 + + 26 Jun 2013; Agostino Sarubbo kmod-13-r1.ebuild: + Stable for alpha, wrt bug #470580 + + 25 Jun 2013; Agostino Sarubbo kmod-13-r1.ebuild: + Stable for x86, wrt bug #470580 + + 25 Jun 2013; Agostino Sarubbo kmod-13-r1.ebuild: + Stable for amd64, wrt bug #470580 + + 14 Jun 2013; William Hubbs kmod-9999.ebuild: + always build shared libraries + + 09 Jun 2013; Agostino Sarubbo kmod-13-r1.ebuild: + Stable for sh, wrt bug #470580 + + 02 Jun 2013; Jeroen Roovers kmod-13-r1.ebuild: + Stable for HPPA (bug #470580). + +*kmod-13-r1 (27 May 2013) + + 27 May 2013; Samuli Suominen +kmod-13-r1.ebuild, + +files/kmod-13-errno_syscall.patch: + Avoid calling syscall() with -1 patch from upstream for + http://bugs.funtoo.org/browse/FL-534 as requested by lxnay + + 10 Apr 2013; William Hubbs kmod-13.ebuild, + kmod-9999.ebuild: + drop --disable-silent-rules since it is part of eapi 5, thanks to Samuli + Suominen. + +*kmod-13 (10 Apr 2013) + + 10 Apr 2013; William Hubbs +kmod-13.ebuild, + kmod-9999.ebuild: + version bump, eapi bump and sync live ebuild. + + 26 Mar 2013; Samuli Suominen kmod-12-r1.ebuild, + kmod-9999.ebuild: + Declare this package as VIRTUAL_MODUTILS=1 for use with linux-mod.eclass wrt + #462926 + + 22 Mar 2013; Samuli Suominen kmod-12-r1.ebuild, + kmod-9999.ebuild: + Sanitize upgrade path from sys-apps/module-init-tools by running + update_depmod() function from linux-mod.eclass, but skipping it if we are + upgrading or the /lib/modules directory with eg. modules.dep is missing. + + 06 Mar 2013; Raúl Porcel kmod-12-r1.ebuild: + m68k/s390/sh/sparc stable wrt #457568 + + 23 Feb 2013; Agostino Sarubbo kmod-12-r1.ebuild: + Stable for alpha, wrt bug #457568 + + 15 Feb 2013; Samuli Suominen kmod-12-r1.ebuild, + kmod-9999.ebuild: + Warn users also about missing CONFIG_MODULE_UNLOAD (otherwise modprobe -r and + lsmod won't behave as they should) + + 09 Feb 2013; Samuli Suominen kmod-12-r1.ebuild: + arm/ppc64 stable wrt #452556 + + 09 Feb 2013; Agostino Sarubbo kmod-12-r1.ebuild: + Stable for ia64, wrt bug #452556 + + 08 Feb 2013; Jeroen Roovers kmod-12-r1.ebuild: + Stable for HPPA (bug #452556). + + 05 Feb 2013; Samuli Suominen kmod-12-r1.ebuild, + kmod-9999.ebuild: + Ensure CONFIG_MODULES is set using linux-info.eclass by Agostino Sarubbo 27 Jan 2013; Agostino Sarubbo kmod-12-r1.ebuild: Stable for ppc, wrt bug #452556 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest index c720e8e76c..51bffd193d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest @@ -1,5 +1,23 @@ -DIST kmod-12.tar.xz 1275028 SHA256 c6189dd8c5a1e8d9224e8506bd188c0cd5dfa119fd6b7e5869b3640cbe8bf92f SHA512 f24bb25812b1902736f875bd3d7f995fa42a50cb7208b0d79a82fb5915223cf78e41018d5bc2cd1088acad5dc8e3dd737876262f4acde6479936c4e04223b629 WHIRLPOOL cde992a543945670992813ce142aa96bd94cc719f539b4734a7c2251b2918622e60a027531d5b430c872e58f28a153d3d2b4b90babe3e4b0f3c262afb09b7116 -EBUILD kmod-12-r1.ebuild 2196 SHA256 48c74124e81f0d3be4d8c57b27edba53bdac3793e674152cfb51648aac68978e SHA512 a43c1ca777ecd1f76f1ac27a3ff22a388dde00d27ef064c079670c96deaa43534dadffb9b113886b8502299a5d9578a8b78cee528b53bb33f7f394a342ca1904 WHIRLPOOL 674fc948e1359ba6ee87167a46ca96be614da1ec95b8f297a24e7c14faa6042c8e9fbe4ced631e23d45dbcc430585d074e55e2cf4e76ffa0e7d3cda9d6656422 -EBUILD kmod-9999.ebuild 2205 SHA256 55c5d7854cf12d28161083b16bc59267d5e09e326c6bf5da461fb28a4737d968 SHA512 7e67c24be46a02095fdfd057e0e3a43b63fb8a78f0064533b756d564f48ea412dd22361d41b6fae86275bac52eaba47854774df538cfff715df556fbb109f61c WHIRLPOOL 17c0012711730a43207b2658ef7a364f13d67bbd9382307e35f0c9f97e59df0ceafcd6beeb95f2de266d13a525d383507a6934711ddbf72390aa931de939a918 -MISC ChangeLog 10402 SHA256 48e2ce1300dbbc1209d7a0f326382b6a2e309d990b2b1889b5317441d369ca57 SHA512 49be095fa1bb0379e4337f987f53a558f0e649e60460569b9676b3aa6c42493b064ec82a464fc7939eab98209c303e2f72c4c5812c33ed1d7dd4e5e9f83a2765 WHIRLPOOL 851714bf601066ddc2927cc7a441f59222be93497e68c02aafdbe350c1e783dd4464e02970eafc4ab170cf6251c260c7c80c596fdb5ef2ca7f767460429f8093 -MISC metadata.xml 316 SHA256 f979caea5d423e7941d00ffe03b8c5a56a3f728e36492410541224e4bf33b6b2 SHA512 fdd742292a4e051bf8f57a0a8b94880824424775611ae97c97368368d6b55b15ce96dcbae0b50d43cfe438f2d083821a102524a3ed469f3d03a4d67633e14814 WHIRLPOOL a74bc7356ba96ab765c7acb24ccb33e4d3d5f58c48db18c13f684fa29aa7e633d95e5ad2fa8b8c296229196c03fc2d8e94e83a47013d6a756b3d845d2e97a4bc +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX kmod-13-errno_syscall.patch 795 SHA256 bc766470c0a0e53471395a8e6499f5bef7a4af5dfd52688cac17d30efb4b2605 SHA512 4bb3fcd824120d19bef2efaf19fcaab3a49089e0d7790899b322db480fe32533786d6b6a0ecd085ed00203bb87af4255c462a22997404a6b4fa431e2c4aeed58 WHIRLPOOL 5410867ec236e24d6075aeeadda8a81a43c9c3a4d02a3b330a0724bdecb3f837141eb6590331c43c5faf9e5cdb903aeaf35efe80f08c342bb14b12bcbbdfcffe +AUX static-nodes 575 SHA256 d1e9b0ef6465d3b328157ce473a878fd4008c1af9e1ad7b63eebf19dd7113bea SHA512 f2228730803bbecc5c6281172d39379666787abbbfe2ce5abca5a7e762a458bcdd4a7ef3df6b3b5069aca19167b140aa94c2d4aad770d60fdb329c0773f77b2a WHIRLPOOL 422044ac98b153d8fd5bf84812857ec2218f8f74d4780148dd655814cc5e34363c0a5a29112731e612a8139cec6a69b2575ea3fb9f9b7a66c23a0bbe122bf006 +DIST kmod-13.tar.xz 1435864 SHA256 6c36d3abba2f98c84973ae275951c866f8bf304e7356c2fe60633800239d7956 SHA512 6182a043c32944c2dc336101e4d8a9be9ccd0106677f9f7a2e76b83a09ec2fc1333aed9b82773abe09f8adb1771e796690f1610c64b337e21bdabffe76fed434 WHIRLPOOL 95196f4c65fec778727a9b8d0209dcb08e64280b4b5d6e88b5343acb3a360b62c13a0dcf510d3c2080fad4ef1562c5e9fa11f84979d0acee03dab3fac8b3eaac +DIST kmod-14.tar.xz 1436872 SHA256 1f54abb63ba3642277ae1af3626c0896b102a915c4d8b9eb5005ae0afe6e7174 SHA512 ab5001b6ce6ea832acbb6a01ba2cc9d1fdb90667df456aa78ad137a35d5ee1580e0b2a36d34e472718c08d2ab3495fa47c638868b032cc90237910fb626bf7f7 WHIRLPOOL bc20d5b31d671a8c5908fba7d7da12f2903b489130fbd9381d3052760ddf85e0aaa73644536bc0be8efc15af847a7e5ea39f596110b6e5dca0731d6e3d40b733 +EBUILD kmod-13-r1.ebuild 2510 SHA256 a7837b7740a5dd025166f97c8ee71c4c7b67059764c992db774393f04e080667 SHA512 82805e11f5cfa0f735f7d5e7b162dfb8144ed693385fccddf8d3ee5fce9ebc0584fc9be1581b007217b8737354f19d1e3fa82a2617dfae0414a9e6fb0d0758ea WHIRLPOOL 750202f0aa945fb9cd2709fd88a5988d916fd80ad3a89a1cf975c8272bd224aed42c0c8eb03a3de822bf9cccbfdd5168cdd635fd3b2faf24f4af3d8287b85b71 +EBUILD kmod-14-r1.ebuild 3438 SHA256 7975f6a89ff1a3f439d22fe75b8d2f3a874af4efb33bb92f3d2be7b6e79ef2b3 SHA512 84604081b87cb74b80e8f217214c3099389a137e2ff5a1ad20ea355decfdf6de5933cf5372d972881f85673b4f187b2f08419b4f3a1e26d851db4e19f47eae2f WHIRLPOOL f34597d5846e3e10f426ecdfa23b251173a5b9df571825e7a2cadc0805e9c09a87afb0045baf3ef06bb299658b5c3231b6d0de24eee89fca6a79342e1b9fcde0 +EBUILD kmod-9999.ebuild 3438 SHA256 9d9c33e666f6072fa70c4e31e4473095b10977cab3b4ae6e5ef04299310b4b7c SHA512 50a71a8d0180e3dcc27f3bd44fa6e79c6f058042e2e4ead403348240459b4156eba7753c010311525452ea59fdbbe2307a4f5e79a0847f0959013d6802c68ef0 WHIRLPOOL 56623e0ae1e991873303929dd1cdb76d934ff4a184e0f3040d6a4bf5ccf5c85f861b336cc127402d683c6ff3d44271d6fb41c1731ef1b96bdd0fc6486520f352 +MISC ChangeLog 15062 SHA256 22e4745bc665f17a8a16b4d8776449bd159672bb5be748fc809739a204ad2034 SHA512 d49be701408b00cd305af01481c555a649d8f790e434f53b0cb71eb0575900add51e61a326f71a46943d54d39485e1df81595eb3e1851bc6826d5a7ed541f706 WHIRLPOOL d932f4a187b969c3fcf24c33444c5a94de43a5dc2e549d1f909470898ad42bee10c7e330017ade66220be7acd30f430f2ded55f459f4f1ccd1be086f79e502fb +MISC metadata.xml 376 SHA256 5eb64ba82d456033efa6947dff12b009f73f4e5b4e883841c7fb4c8a368b3e0c SHA512 7dd59b5c777f37c5aa734a81562491ab90e0ed2854340f4d89fd9198d17c8e8d880e8d47ae99dba23b1fb16bc0b711788b7159f77ff53b08a2b2a3af01894f43 WHIRLPOOL d659931a7f525e0453e86a96f2dd6ca889bcf428496f1510bb612251961dac7afa5c36b87f90947371f4903c84b5cabf42d7647cfbbbf7af3e24396107a7197f +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.20 (GNU/Linux) + +iQEcBAEBCAAGBQJR9/XAAAoJEEdUh39IaPFNon8IAIq+lObEK7P8ywnrTc/HUw1R +CFEG52WlaI3SU/gyPUSOoaA1T9UBF/lOxligOGrtqJ2EQAiZE6tIKr6W+NNTT5MG +Ux/IheQgINuLyxcAIixzQLjpO/gUctQY/P4IoGy7TcEXAx6SDuldSBuNHzXti2UX +j9EigIfXZdTcuiEoBsAMTHxyB+45XOKInRtOx1wQaekYh0WZrc0B5sDwmwJgsyeC +t32rp32yPW/HXC3U+raFDaG7NHZOlbpTuGGi9GP6M1zdYGX+ws4FoWn26cxJUHf0 +cHPSWnxcp5ejbo7CrbzvqpVBMXS6B2pCLJFf6DUC2yVcnejfkqU1VX7LYcDp0g4= +=osNQ +-----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-13-errno_syscall.patch b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-13-errno_syscall.patch new file mode 100644 index 0000000000..8909ef58c2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-13-errno_syscall.patch @@ -0,0 +1,31 @@ +From 5eac795b8b067842caec32f96d55a7554c3c67f9 Mon Sep 17 00:00:00 2001 +From: Jan Luebbe +Date: Thu, 02 May 2013 14:47:12 +0000 +Subject: libkmod: Avoid calling syscall() with -1 + +At least in qemu 1.4.1 for vexpress/arm-cortexa9, this resulted in an +illegal instruction error. Solve that by returning an error when +__NR_finit_module is -1. +--- +diff --git a/libkmod/missing.h b/libkmod/missing.h +index edb88b9..b45bbe2 100644 +--- a/libkmod/missing.h ++++ b/libkmod/missing.h +@@ -20,8 +20,15 @@ + #endif + + #ifndef HAVE_FINIT_MODULE ++#include ++ + static inline int finit_module(int fd, const char *uargs, int flags) + { ++ if (__NR_finit_module == -1) { ++ errno = ENOSYS; ++ return -1; ++ } ++ + return syscall(__NR_finit_module, fd, uargs, flags); + } + #endif +-- +cgit v0.9.1 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/static-nodes b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/static-nodes new file mode 100644 index 0000000000..8f0f7aa8f0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/static-nodes @@ -0,0 +1,18 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/files/static-nodes,v 1.4 2013/07/30 17:21:17 ssuominen Exp $ + +description="Create list of required static device nodes for the current kernel" + +depend() { + before tmpfiles.setup + after modules +} + +start() { + ebegin "Creating list of required static device nodes for the current kernel" + checkpath -q -d /run/tmpfiles.d + kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf + eend $? +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-12-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-13-r1.ebuild similarity index 74% rename from sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-12-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-13-r1.ebuild index 60ad576912..f1d250c3d2 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-12-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-13-r1.ebuild @@ -1,17 +1,19 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-12-r1.ebuild,v 1.7 2013/01/27 13:53:03 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-13-r1.ebuild,v 1.14 2013/07/26 14:52:57 ssuominen Exp $ -EAPI=4 +EAPI=5 -inherit autotools eutils libtool multilib +VIRTUAL_MODUTILS=1 + +inherit autotools eutils libtool multilib linux-mod if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" inherit git-2 else SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86" + KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" fi DESCRIPTION="library and tools for managing linux kernel modules" @@ -37,8 +39,14 @@ DEPEND="${RDEPEND} lzma? ( virtual/pkgconfig ) zlib? ( virtual/pkgconfig )" -src_prepare() -{ +pkg_setup() { + CONFIG_CHECK="~MODULES ~MODULE_UNLOAD" + linux-info_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-errno_syscall.patch + if [ ! -e configure ]; then if use doc; then gtkdocize --copy --docdir libkmod/docs || die @@ -51,10 +59,8 @@ src_prepare() fi } -src_configure() -{ +src_configure() { econf \ - --disable-silent-rules \ --bindir=/bin \ --with-rootlibdir=/$(get_libdir) \ $(use_enable static-libs static) \ @@ -65,8 +71,7 @@ src_configure() $(use_with zlib) } -src_install() -{ +src_install() { default prune_libtool_files @@ -90,3 +95,12 @@ src_install() insinto /lib/modprobe.d doins "${T}"/usb-load-ehci-first.conf #260139 } + +pkg_postinst() { + # Upgrade path from sys-apps/module-init-tools + if [[ -d ${ROOT}/lib/modules/${KV_FULL} ]]; then + if [[ -z ${REPLACING_VERSIONS} ]]; then + update_depmod + fi + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-14-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-14-r1.ebuild new file mode 100644 index 0000000000..d653973f3e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-14-r1.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-14-r1.ebuild,v 1.3 2013/07/23 11:54:33 ssuominen Exp $ + +EAPI=5 + +VIRTUAL_MODUTILS=1 + +inherit autotools eutils libtool multilib linux-mod + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" + inherit git-2 +else + SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +fi + +DESCRIPTION="library and tools for managing linux kernel modules" +HOMEPAGE="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git" + +LICENSE="LGPL-2" +SLOT="0" +IUSE="debug doc lzma +openrc static-libs +tools zlib" + +# Upstream does not support running the test suite with custom configure flags. +# I was also told that the test suite is intended for kmod developers. +# So we have to restrict it. +# See bug #408915. +RESTRICT="test" + +RDEPEND="!sys-apps/module-init-tools + !sys-apps/modutils + lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) + zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 +DEPEND="${RDEPEND} + dev-libs/libxslt + doc? ( dev-util/gtk-doc ) + lzma? ( virtual/pkgconfig ) + zlib? ( virtual/pkgconfig )" + +pkg_setup() { + CONFIG_CHECK="~MODULES ~MODULE_UNLOAD" + linux-info_pkg_setup +} + +src_prepare() { + if [ ! -e configure ]; then + if use doc; then + gtkdocize --copy --docdir libkmod/docs || die + else + touch libkmod/docs/gtk-doc.make + fi + eautoreconf + else + elibtoolize + fi + + # Restore possibility of running --enable-static wrt #472608 + sed -i \ + -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ + configure || die +} + +src_configure() { + econf \ + --bindir=/bin \ + --with-rootlibdir=/$(get_libdir) \ + --enable-shared \ + $(use_enable static-libs static) \ + $(use_enable tools) \ + $(use_enable debug) \ + $(use_enable doc gtk-doc) \ + $(use_with lzma xz) \ + $(use_with zlib) +} + +src_install() { + default + prune_libtool_files + + if use tools; then + local bincmd sbincmd + for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do + dosym /bin/kmod /sbin/${sbincmd} + done + + # These are also usable as normal user + for bincmd in lsmod modinfo; do + dosym kmod /bin/${bincmd} + done + fi + + cat <<-EOF > "${T}"/usb-load-ehci-first.conf + softdep uhci_hcd pre: ehci_hcd + softdep ohci_hcd pre: ehci_hcd + EOF + + insinto /lib/modprobe.d + doins "${T}"/usb-load-ehci-first.conf #260139 + + use openrc && doinitd "${FILESDIR}"/static-nodes +} + +pkg_postinst() { + # Upgrade path from sys-apps/module-init-tools + if [[ -d ${ROOT}/lib/modules/${KV_FULL} ]]; then + if [[ -z ${REPLACING_VERSIONS} ]]; then + update_depmod + fi + fi + + if use openrc; then + # Add kmod to the boot runlevel automatically if this is the first install of this package. + if [[ -z ${REPLACING_VERSIONS} ]]; then + if [[ -x "${ROOT}"etc/init.d/static-nodes && -d "${ROOT}"etc/runlevels/boot ]]; then + ln -s /etc/init.d/static-nodes "${ROOT}"/etc/runlevels/boot/static-nodes + fi + fi + + if [[ -e "${ROOT}"etc/runlevels/boot ]]; then + if [[ ! -e "${ROOT}"etc/runlevels/boot/static-nodes ]]; then + ewarn + ewarn "You need to add static-nodes to the boot runlevel." + ewarn "If you do not do this," + ewarn "your system will not necessarily have the required static nodes!" + ewarn "Run this command:" + ewarn "\trc-update add static-nodes boot" + fi + fi + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild index 02fc672b6f..148dd0899f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild @@ -1,10 +1,12 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.46 2013/01/18 17:01:13 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.59 2013/07/23 11:54:33 ssuominen Exp $ -EAPI=4 +EAPI=5 -inherit autotools eutils libtool multilib +VIRTUAL_MODUTILS=1 + +inherit autotools eutils libtool multilib linux-mod if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" @@ -19,7 +21,7 @@ HOMEPAGE="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git" LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc lzma static-libs +tools zlib" +IUSE="debug doc lzma +openrc static-libs +tools zlib" # Upstream does not support running the test suite with custom configure flags. # I was also told that the test suite is intended for kmod developers. @@ -37,8 +39,12 @@ DEPEND="${RDEPEND} lzma? ( virtual/pkgconfig ) zlib? ( virtual/pkgconfig )" -src_prepare() -{ +pkg_setup() { + CONFIG_CHECK="~MODULES ~MODULE_UNLOAD" + linux-info_pkg_setup +} + +src_prepare() { if [ ! -e configure ]; then if use doc; then gtkdocize --copy --docdir libkmod/docs || die @@ -49,14 +55,18 @@ src_prepare() else elibtoolize fi + + # Restore possibility of running --enable-static wrt #472608 + sed -i \ + -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ + configure || die } -src_configure() -{ +src_configure() { econf \ - --disable-silent-rules \ --bindir=/bin \ --with-rootlibdir=/$(get_libdir) \ + --enable-shared \ $(use_enable static-libs static) \ $(use_enable tools) \ $(use_enable debug) \ @@ -65,8 +75,7 @@ src_configure() $(use_with zlib) } -src_install() -{ +src_install() { default prune_libtool_files @@ -89,4 +98,35 @@ src_install() insinto /lib/modprobe.d doins "${T}"/usb-load-ehci-first.conf #260139 + + use openrc && doinitd "${FILESDIR}"/static-nodes +} + +pkg_postinst() { + # Upgrade path from sys-apps/module-init-tools + if [[ -d ${ROOT}/lib/modules/${KV_FULL} ]]; then + if [[ -z ${REPLACING_VERSIONS} ]]; then + update_depmod + fi + fi + + if use openrc; then + # Add kmod to the boot runlevel automatically if this is the first install of this package. + if [[ -z ${REPLACING_VERSIONS} ]]; then + if [[ -x "${ROOT}"etc/init.d/static-nodes && -d "${ROOT}"etc/runlevels/boot ]]; then + ln -s /etc/init.d/static-nodes "${ROOT}"/etc/runlevels/boot/static-nodes + fi + fi + + if [[ -e "${ROOT}"etc/runlevels/boot ]]; then + if [[ ! -e "${ROOT}"etc/runlevels/boot/static-nodes ]]; then + ewarn + ewarn "You need to add static-nodes to the boot runlevel." + ewarn "If you do not do this," + ewarn "your system will not necessarily have the required static nodes!" + ewarn "Run this command:" + ewarn "\trc-update add static-nodes boot" + fi + fi + fi } diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/metadata.xml index 8d5b0e9dc0..97fc7c560d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/metadata.xml @@ -5,8 +5,8 @@ udev-bugs@gentoo.org - + Install the OpenRC init scripts Install module loading/unloading tools. diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/ChangeLog b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/ChangeLog index a59c44da77..e81fd42d6c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/ChangeLog @@ -1,6 +1,104 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.137 2013/05/25 20:18:41 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.158 2013/08/04 13:30:11 ago Exp $ + + 04 Aug 2013; Agostino Sarubbo systemd-204.ebuild: + Stable for ppc64, wrt bug #477910 + + 04 Aug 2013; Michał Górny systemd-9999-r1.ebuild: + Sync kmod dep in the live ebuild. + + 03 Aug 2013; Michał Górny systemd-9999-r1.ebuild: + Update zsh-completion install after upstream cleanup. + + 31 Jul 2013; Michał Górny + -files/191-0001-Disable-udev-targets-for-udev-190.patch, + -files/196-0001-Disable-udev-targets.patch, + -files/196-0002-Don-t-fail-with-missing-gcrypt-macros.patch, + -files/197-0001-Disable-udev-targets.patch, + -files/198-0001-Disable-udev-targets.patch, + -files/198-0002-build-sys-break-dependency-loop-between-libsystemd-i.patch, + -files/198-0003-build-sys-link-libsystemd-login-also-against-libsyst.patch, + -files/199-firmware.patch, -files/203-systemd-sleep.patch: + Drop old patches. + +*systemd-206-r1 (31 Jul 2013) + + 31 Jul 2013; Michał Górny + +files/206-0001-logind-update-state-file-after-generating-the-sessio.patch, + +files/206-0002-Add-usr-share-keymaps-to-localectl-supported-locatio.patch, + +files/206-0003-tmpfiles-support-passing-prefix-multiple-times.patch, + +files/206-0004-tmpfiles-introduce-exclude-prefix.patch, + +files/206-0005-tmpfiles-setup-exclude-dev-prefixes-files.patch, + +systemd-206-r1.ebuild, -systemd-205.ebuild, -systemd-206.ebuild, + systemd-9999-r1.ebuild: + Fix gnome-shell<->logind race condition, bug #477954. Fix missing keymap + location, bug #474946. Fix broken device permissions due to static-nodes, bug + #478198. Check for CONFIG_AUDITSYSCALL, bug #478032. Add >=binutils-2.32.1 + dep, bug #479038. + + 31 Jul 2013; Michał Górny systemd-9999-r1.ebuild: + Finally drop compatibility symlinks. This time for real. + + 30 Jul 2013; Michał Górny systemd-206.ebuild, + systemd-9999-r1.ebuild: + Bump kernel dep to 3.0. Reported by ssuominen, thanks. + +*systemd-9999-r1 (29 Jul 2013) + + 29 Jul 2013; Michał Górny +systemd-9999-r1.ebuild, + -systemd-9999.ebuild: + Move the Gentoo-specific files from the live ebuild to gentoo-systemd- + integration. Revbump to ensure smooth migration. + + 28 Jul 2013; Agostino Sarubbo systemd-204.ebuild: + Stable for arm, wrt bug #477910 + + 28 Jul 2013; Agostino Sarubbo systemd-204.ebuild: + Stable for ppc, wrt bug #477910 + + 27 Jul 2013; Agostino Sarubbo systemd-204.ebuild: + Stable for amd64, wrt bug #477910 + + 24 Jul 2013; Mike Gilbert systemd-204.ebuild: + Add missing inherit bash-completion-r1, bug 478038. + + 23 Jul 2013; Michał Górny systemd-206.ebuild: + Bump kmod dep per bug #477886. + +*systemd-206 (23 Jul 2013) + + 23 Jul 2013; Michał Górny +systemd-206.ebuild, + systemd-9999.ebuild: + Version bump. Drop USE=keyword as it was replaced upstream by hwdb magic. + + 16 Jul 2013; Michał Górny systemd-201.ebuild, + systemd-204.ebuild, systemd-205.ebuild, systemd-9999.ebuild: + Use get_bashcompdir for future bash-completion compat. + + 14 Jul 2013; Mike Gilbert systemd-205.ebuild, + systemd-9999.ebuild: + Set file capabilities on systemd-detect-virt, bug 468876 by Michał + Bartoszkiewicz. + +*systemd-205 (05 Jul 2013) + + 05 Jul 2013; Michał Górny +systemd-205.ebuild, + -systemd-197-r1.ebuild, -systemd-200-r1.ebuild, -systemd-202.ebuild, + -systemd-203-r1.ebuild, systemd-9999.ebuild: + Version bump. Drop USE=static-libs since it is no longer supported. Drop old. + + 04 Jul 2013; Agostino Sarubbo systemd-201.ebuild: + Stable for ppc64, wrt bug #465870 + + 30 Jun 2013; Agostino Sarubbo systemd-201.ebuild: + Stable for x86, wrt bug #465870 + + 30 Jun 2013; Agostino Sarubbo systemd-201.ebuild: + Stable for amd64, wrt bug #465870 + + 20 Jun 2013; Agostino Sarubbo systemd-204.ebuild: + Add ~ppc, wrt bug #465870 25 May 2013; Agostino Sarubbo systemd-201.ebuild: Stable for arm, wrt bug #465870 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/Manifest index 523248a57a..e58a5c8a47 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/Manifest @@ -1,47 +1,37 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -AUX 191-0001-Disable-udev-targets-for-udev-190.patch 9066 SHA256 b884eb4a803ae22ac1bd8475d3cba2eee2206bc421cf9ecb700acffc98e5f06a SHA512 9bdeb93c6f7f96e0bb74f96c01c3b72bea5e9d89800b53ce8ce6dae3a531e4328495e31d7850d07cf5d0537c2f64a5080683fe83e13055c29e9a2c075a6c593f WHIRLPOOL 5989a42ec109002e9887d6e6af46d60e9091517752bab6480a5afc3db6fbc2a17373fb2d26bee50745dc299710b003a1b6347f6a4c1015586e50539f6f50ec22 -AUX 196-0001-Disable-udev-targets.patch 9359 SHA256 5b021ec900b5dfffc0c04e6ef351416b3d42fe621dec05d721bf027d5ed90d91 SHA512 fffc8437cc79acf037601fa83394b19cc8bb495ab0c390617f711f1c65e574185b1ea5bb42803c88c4459020b60158fc423a9a1020d2f3c2200f761781868aec WHIRLPOOL be2b22b713d7bb935cf9aba6877b82416bf58e18ef82c22f2204195e9c3bf63a7d9c5b8c2d73d89ab99f1ca949c454a188de52c68c5d15c2dfbe0b30daaf4536 -AUX 196-0002-Don-t-fail-with-missing-gcrypt-macros.patch 909 SHA256 c32953ffe27a20e941074a47c21d195083a9a8034bde2628fe41ba96a5898df1 SHA512 b4896e6572c14420cb22917b850f77ed3fe158891d341e92e5f6e1895c5244523d79158705e74a2b02921c0a1a386ea1c9fe2400b711da3c9cf15c0bd06f14f0 WHIRLPOOL cd6b8a49b58d014d2de2359a38d51a2fc4c6a8001e3c850b1b34e083b0a349bac10eda0db1dfbc873dc684b53623f11f281a38c01351006dff1465726cbb4100 -AUX 197-0001-Disable-udev-targets.patch 1774 SHA256 a805ec4051dfcd0271cefe99f8cfcbedd3f314281be0f9977e90ff351ec3cb8b SHA512 58cf690d258a01930282cddfa67a56f1e7aae56e269f0ee7794497efdb8a12d133f8df768249ce04a0347b94f8a96a0323ae2a510660e90a3748e8a99d729f0c WHIRLPOOL e1fb186834f1a016e2f40df39f1d01437a59f4f8492deb1b77c17cea214120a2441d8af2c24fb245b7360503fe3de5b7d18b2188c11b9f38b8defab08399ff9b -AUX 198-0001-Disable-udev-targets.patch 3474 SHA256 8b9131ae92ff71bbc447b6756d3bdb8de6586793553bd98a010d2d66840b601a SHA512 8c9cfdca5a4a8884421f270daf2b7b4177fff95b499e562a85028d7f621afb38bc5f8f7f14dba2a73da5f03749a23eaab58c035fded3a4a88d641b96ec307f8f WHIRLPOOL 3c4b929c877813a3b22d4aa9b806af919f7774edc2b56b9704a57fb076ca5dc09be4500b10cdb00a2d33dcebc0d754a1143d5a348896952f2b99a2ceb3c13dff -AUX 198-0002-build-sys-break-dependency-loop-between-libsystemd-i.patch 1349 SHA256 2ea10b9319d1da6b7007553df1b6f09970a373f52a5cff4e4eb77e63144d949b SHA512 1c14e0d48e8514afd3b48ef83dbb6bd75138c858115ab1594cbb210056f39bfdf80f893550612c9d7814b0e0c2ac33d3f6f1e889acaf4b353b93e625fbaa96bb WHIRLPOOL e2026b203635e64ebdc076a59794bafce62852970afdd32fc4e23217d1590dc787b8f3110988d41286130e5b5a0d0e21bef27ec9a29686f9a3449cf830c59b04 -AUX 198-0003-build-sys-link-libsystemd-login-also-against-libsyst.patch 1348 SHA256 4e2af402378285300175a969d265a8653cfea21cc4c5c2bf1a67f53aafaf6185 SHA512 deb3fdc316a130663a1d4edba713715d6f907ddc42709f2605c8f086261c54583175873e08a30d0d8741a6f79fcb21b1d4bf5b75cce0880d246a306664b24db4 WHIRLPOOL b3fc0a02ccf2ce48072f07238cc45161822fa8a1d6ca32e92ae0578068870a729e78f11aad7b5bd17f52335f589310bd8040eb717a1237e3828212fe39a1dd56 -AUX 199-firmware.patch 2646 SHA256 2c0469f2709eb0fccc92b0f254d3c3b9e70eabb22b4651ed4210c4c5a80561c1 SHA512 49073a2c941d4b4a2fa643fbf9f41e72bb13f02233d22301f636bf5873850c39a7ecd22f96184863de4a05bd5aad1d3fd846ccad1f900bb977ab2057e99e7141 WHIRLPOOL 2995271c4ac55fe7a0ede89dfa06ee0e4917b9ab25af45440ca9d2a49bfba1ee8fdfc98e1ee89ab0401af91d6eddf971d59fdd0a1039ea4aab7fe496bbc6e975 -AUX 203-systemd-sleep.patch 1731 SHA256 45337d6eebebb646bb40beccacad910cfc74f256ed4b6646ea9a960998931fed SHA512 fa68c8ef8df3af8bc3edb2c797524eeb1ca11c5a05a89c4b1d0cb2c7de1d6a3cd3df933bf28078f109e495ac8e1ebf08754158894019b46791718fdb6b6783b7 WHIRLPOOL 7d8c112026acab1fc6334385cbaef2dcaccd15e0e753ca4a0c1696847c6084162cc57393a21e10f1c44afa19df0ab183527a6625e59f7bbe2ffe3990256369b6 +AUX 206-0001-logind-update-state-file-after-generating-the-sessio.patch 3341 SHA256 642a08dbcfa0517515570fd7537569ce0c7caa0c2b90274e80d999b6dd8e8d6a SHA512 1a901777c0a586ad5e4fcf6380784e451754c9ac65cf6e83641a6a2af2bed9f0741316d6aedb5d960a6c828186f4dcce79c7cc8234607f7f164253abd7cdfeed WHIRLPOOL 34639bc6dd4250209383c97061c09ded8d01f8962e19a39a9b2d848edf4fc4c6dbd3d6a5ff5563c2057c033d8a95ef46de7f116e3bbaee330bdbc26bb60d5b91 +AUX 206-0002-Add-usr-share-keymaps-to-localectl-supported-locatio.patch 996 SHA256 494bd90cb327cd0bd08f7d8183802d6c91238b1cfab19dee312c704869fa23b6 SHA512 ff4db4bfb2d4050b276c487e9d7cba39b9cd26b62ff455c2c0d21f31f6d313453de73743974266f6ba1ee4aca50639c1abba40f73ed58f32dda8831b3b649337 WHIRLPOOL bada3e79aa856e7a67ffb6603f27b94d3b359536036e12c931181e6e768c0e0c91edfdab0c0d30bdd40fffb1bc27d653700aa3c410e122ae0653003b1bdad5cd +AUX 206-0003-tmpfiles-support-passing-prefix-multiple-times.patch 2991 SHA256 94d66e0bdd45fea0648971e9ef234e03bb743fd32444d972f5e8f293847aed01 SHA512 980134aac21cb7f0883a6326f62abaa32adf65b5b1263d14a2efacdadf2a7f46f4549b79077f0f087914e3b513981763f7065c915f959853ae34a6a1b2c0b323 WHIRLPOOL 73a3b5737c80c2ff6ae8050ca471bd2cf6d62a85de82d482eb12819d6eef90739ffd785b8f65ad17d88def79685a69e561373cf2aa57c88dd582002e37b06107 +AUX 206-0004-tmpfiles-introduce-exclude-prefix.patch 6467 SHA256 dc87aab586d1b4c1fa3747df6c10e48472f404dcda83a41609bf12340cece0c7 SHA512 24707c2e865bf832b76ae127e4796bbc264da69600643ecd626b1acc03609602b5517975da29dd664cd3148e0696161298c1778ccbeb6559fe520cd33414a1c5 WHIRLPOOL 12394930e1aadb98cc24826352430c1de06ac5b5d58ff841e4ca415569cf8bda3c1509a580b647595f3a752988c348a773a808890db76c9e323e01137d48e8eb +AUX 206-0005-tmpfiles-setup-exclude-dev-prefixes-files.patch 857 SHA256 1fdd94d2968aab1ac909dda98efd11a805ba5cbaeab765f1bc477816a61ae38f SHA512 774bfb95667c405d6d63e5e60a1b814d7125170700753135a41b5af4186872f907a8dc486e8dff0c222b7f3cf66776f52f76fb5354a40293c90cca739558007e WHIRLPOOL 29039d1a63012bf1f7bd419b6056c95150b940fc9009a941af6cdad6dfb43732614cef6594c6c9e2b16b29e2de8a55566f00b336d1f7c05706e699323b626cb2 AUX gentoo-run.conf 226 SHA256 a23fa3b35b4e9d5f1c41dc77cb5be1cec492eb903a57472df3d93a053db28ca7 SHA512 5fe5af27c99426bc1a3494fce9b6f0425cbfe11f6879c95d4efb4ea67b5b036f0573c49ad4396835f15a92a3d7424f6a453d951d63d0ae10d6af92e98e6848db WHIRLPOOL bfaa7425ee4b2c1467bc6fc9dc934d14a4fb43a9b5eaf61a13f5b2229648fe585a6e8d950082e2c2cedab1f938021dd3e29445ecbc72cc4a95056d00b6b7c9ed AUX var-lock.mount 541 SHA256 2929247db87c75b82d651ae902183b2a9fab48052b422008fa8ec2aafc22868a SHA512 8a4d72c63794676a01db2792b44fa39ec4ea80db97f2b54904f5b118a776c08721d360f8bb2ed15da12e922dbac3f2a431d6a6f98831bef3520d781d97d665db WHIRLPOOL e83955a1d86400ee16d35d61eaa35fb3050af2b2805a2049c37a602be1bd60233caaa1cadbbd4a3b3e425a44629c9cac921a5c4b2fca9003a45e49b89298ca50 AUX var-run.mount 536 SHA256 55b9e277560b875475535f8121ad45e7fcee836bb48efe2c4f361ff89d450888 SHA512 173097fc2318be854b09ee5244d1dd6291cf6c6ad0c18f1bbbb12b186d309a4299d3866e52659f91a37ff2541583d85754841e55c35ea93dd1916dce0bebb1f6 WHIRLPOOL 47cfff43bdadd7ea59d920dee102283d5eeae6ecfb64aeaf7ee23890f3483cb3f3fdb43ad014bb074122b34d86bf6a6a707a42819b6ee7fd66506808a0557a01 -DIST systemd-197.tar.xz 2054644 SHA256 e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5 SHA512 df158f85dee4c38dc2ff305bc03eee3b71d77eb683ab2739549282f7d552af4d2a247f52241f68e1b7c88c668bce93531986a39937a99cac401791ec95916769 WHIRLPOOL 027fc6aa5972988173721b120b8c1f371bc02d3066e04ea0923d6cc70778a3381f600a865aa136b5789755fbd5358e97304da265f8937d789a28b33cc778df46 -DIST systemd-200.tar.xz 2109864 SHA256 9a08baa8fa5c48f0aab683b2f771e4be75c3c852afc45e5cb4df06428ac8c217 SHA512 6ad440f91dfa5a739a29d07c4144a2faad627a523c4f893656693cdfbdf2a6048f84d96e06ebe805ec18d04e5a1760c9efdcec738654d006a348c0385a983833 WHIRLPOOL 7969f2410aad42c60ba5b979727f5e90be62a5826aabfeb3103b8284115120a5c8c944d0631eabff719dfb84a4096b6eebe8e6dc3718ee47a3672dc1089be371 DIST systemd-201.tar.xz 2128876 SHA256 d6299f1a0bc2122002d731808d3825c6b566d1ffe899c03ed5ebec7e70c8cc10 SHA512 e181b0bd0d0169890f99733d5e61ca506115b50d702b24895add5240ef3929ed9add87b0d3fd34a3366c1830339f6e4b5aa50f763f6d7d75b80ce677d35c385d WHIRLPOOL 84465cc8b3a97c2fbf120c8515ced6a759c1dec2df525b92a552308e1060475bf889de92a05ad470a2d56b582e3190dcc37aa4d009c8a0714411894cfed99376 -DIST systemd-202.tar.xz 2149860 SHA256 8c43073252a52eb9f9ab9bd698be0192bcb2175ba5daba6057250083dd64e059 SHA512 34a6a8a6c0ac6c0a2c9ea44a11a3f732fcf3e36e2433bf98997df11e6890b26b2c4e526edfa0a1893ef460ad75191b230c60bf761e5ae99d5339c8df55f139da WHIRLPOOL 0045a2365dbd2e7732d12cacfabf76744534916f7d5aef1fa6e88b48755acf9284e5df4c66eeb6d5c42477d80453a044989a916917fb2263f405439471fa97a8 -DIST systemd-203.tar.xz 2185488 SHA256 61b13e4dbce2156452bf85f126f5d540ee259cbcd6846f03d4284e7df3b0fb1d SHA512 cc7f4083bba5b92abb498bb3bc1d7c7a221ce885216b75bfe5a77e4a12cd1f9aa2317cf1685b07158189ce7f63c429758aa42466118efd60b3a6274381df7d41 WHIRLPOOL 87653c9f7760d32995bdb3c8479d9fb96b41927801111c990f1534669c0953f91b62e77bcfad5b6e89b28a6c26ce1fe742ebc0f1a02329c7f55f4904e0a49012 DIST systemd-204.tar.xz 2186264 SHA256 072c393503c7c1e55ca7acf3db659cbd28c7fe5fa94fab3db95360bafd96731b SHA512 a2fe02f8ab4197bb4ff40c1c3e145370ebc5f3edfe97e6eb179086c42270523f76b49b5dd7dae0c52742a71bfb6a4217ecfa27cc6032faf5d4fe10b1264ed110 WHIRLPOOL 13baafbab202d2b1aa538281261a2bd70faa8634d4dc61f3ade6780f2e27b3e35919b7eb8a9258b66150924c8f2e82aa310a9a952f1f4e8128038b544a5c09df -EBUILD systemd-197-r1.ebuild 6496 SHA256 0069c8127574ee382c55b790a3ef807c1db064057dc7ab9a24aec195e8907aa5 SHA512 ce8fdb78c5cce5e34474b12e29bed83814746949b676025e8780206ac716c1dab863be31f3d83db02de09be00a5ac26ebe70ca2474ea2e244f4903bbd5e6871a WHIRLPOOL 2f316c077c6fa23d02e12985131a915947aac265009094ff851d65cc403ca10aefbc8c3f3b6ced4ce6f9c551f52223ca01ec46545bc4b3cccd78633c04534dc1 -EBUILD systemd-200-r1.ebuild 7406 SHA256 1c443764147f2839189ca0c93113bb66e09bd6209cc273a1f4a6bbfe1291bc54 SHA512 29343b73050e412ebbffae9d1057fc1c1379cf3a183c24d0c85cb1b958213c57d472b6cf9bb7fc05d45b913d8b74621892cdfcc8eac77024cbeff45cf412f28a WHIRLPOOL 003878dbf8ef444cc2125ffbf296d8adaa2f5452c929badf4f9bf51654b57a6805dbe2ce27a0c1f4e3e602f8be257aa3ed9817bf182aaee72c8637c50ee82d36 -EBUILD systemd-201.ebuild 8323 SHA256 fade6fecf82a1ec595f967f67637afd843ef92c27d7b16645174945fb1a3348f SHA512 420d9e01f80646aa7478f4ece439697aff0d7da10c4cc3b097f5eb252eed3aedfdda8a80ebd524c4739efd42ea2682e290cc3265b18d381b84873931ca355b77 WHIRLPOOL 843950316d808954ddc532e49c796c0c6c919bcf733cfc0ef204b31ba9f5d53a133b39528dccbe1b3d4a29afe3c94c15a28054355d4fb94132057aefaa058805 -EBUILD systemd-202.ebuild 8359 SHA256 b89536bf39627b18a3ae49b130986146391f9a73f43df76c4619ecdb7a5ae6b1 SHA512 c9e432d6790768e5e638ef58b10f44c4ba78ffa50e857a3e678b5b7a79fa7eadf2dc1eb2a2e41e459cff790ec989fc68560a64ee8cbfb4cf0cb342fddc7c310f WHIRLPOOL fc026437ba5e0e8b4b12544be4f2b2f7c07b4199f2546e4f315c052c44e0758a0ec7a79eb36b04405be86fbd2beb082d7bc6c70316af9fd84abc50b1dd92e775 -EBUILD systemd-203-r1.ebuild 8537 SHA256 a75e7098e85c0f0b996775069d97aaa5c2e09e815588096b1644cb073367542f SHA512 23fdf14db44b83d7053db03c7f3b4bec44aacdfc1e98741fcd07e1a1d0cfaa4ac24360a0d6cf64966a67c9dceaa09aae0fe37376c9a8eedd2b57b6a1aa6551e8 WHIRLPOOL e0fce637884fe9590ef07811ee7f6158cc387915b1ff65517dd1c3cef80ad315882a8dc964776f802f056c2ba30efc5073600bdda981906884e7ec4fa1c6991d -EBUILD systemd-204.ebuild 8483 SHA256 fc9361620bf92aa3bc0a8d8c3f6be1080fa8ade1418783649b74e939d72f88f0 SHA512 087260627c44c12d26968cf4d04c46ae4de38e29de19dae74714e08496757c8f6ea65d5f5c061224ce7f768c4ad060a787cbbbf4e07f8e3963d972c3da388441 WHIRLPOOL 13e59c4acfe5ad4d2f5d49ae5e7327a6a3f9ac99827b92c65d89f4e64caaa1b95e12fa7c918d89ff98863343debd7203aa60f012e1d29f7cff50d1714e08f385 -EBUILD systemd-9999.ebuild 8865 SHA256 53145dc19994cb7a8935bf8c96272ea96a8c489d54e410d47788fbf25fd9d3ef SHA512 7e36027ccc00dc6b7a075bf845f4f8c324765dc4b84f405435a8d787a710e3b3a64d8a241cb0787fb5ce4be5004225eff9d9073a762acb8c635e9f17cbc8249d WHIRLPOOL 20b4536cbffea7b72735e44a8526b0dfd4273b3acd1ab6a65dbf6fd98b92b66b5cc3fcd8a8011b8e4a3d7ac883917b624644073e4ffbc2977ecdc879fc96e7f4 -MISC ChangeLog 25990 SHA256 0ae25a8b10b8f9c6dd5d835971a0a34a5d559a49f7525e510fbf2dbf24d29703 SHA512 3ada75b26cc63da74317d85d18b73ed7cd190dcebfe1ab4b234c0b09be92a0768c46ac98dbe349f274fc72d20a85ad3b4b3d861629647c3388ef679f1b3cbd1f WHIRLPOOL d342d857c957d04d1fd9270edac1d1e01b829ac5ff7ba0b2ec93cca7ad40851b56e160a123d2e49a20e887be9135e1c6ecd610b51dd0aac88ad9129c778b8444 +DIST systemd-206.tar.xz 2340536 SHA256 4c993de071118ea1df7ffc4be26ef0b0d78354ef15b2743a2783d20edfcde9de SHA512 0e8270981f549875519485657ccf4f8f69f6e4d2000dba3419c39bd710abbf6e8ab5fce038b75a220e6fc1ba2d66e1582d492feb7710d0539c5f7a5918d5ae31 WHIRLPOOL f8033865f236aa06c649d40ccaa3c8cb12de1f42863d3f824740b2f076945fc5c9dd131cadd995b313b20b04363d32507e85de61afae7f77ac9c62c3ad236b83 +EBUILD systemd-201.ebuild 8320 SHA256 a7e696450c4ec2875c38678b26b6445e5b53672edf42553178ff2661cf14fb29 SHA512 ddf8484af18c3a995dce1b544c0e8099cc0a78422c113533be036365adb03ca6d915243fd256dfebea320baa6db602fd1f4790fbaceffad08b8d31494c828f73 WHIRLPOOL e8e90d0e6bc6dae01bd589547ba7c5af604046f02b9b5aaca6fa7e99681b9e415fec4bb5d3a265a98392bf26942b9c80d6e22509ebaa0a842f5091ed36f919b3 +EBUILD systemd-204.ebuild 8474 SHA256 70b7c12fa434f5c0c75cab7ac492c32d5002ef444bcb2a0538a6c619ce149be4 SHA512 a35033f56054d5d0c4372000f7678837463856e2c059b228df954580b41690a14c90537e8f7de97716fa92ac29843332683e2ed517bf69e195c2534563249792 WHIRLPOOL 119602ff4a1125aacdbcfc0e07bb62b0353c78714abcb8323bc97713de2490241e567e1f5370a1bae7d679eb88a72fa79d792dc9a95ecf5cc4ef0b37b90bd5c0 +EBUILD systemd-206-r1.ebuild 9240 SHA256 a89b89f191fc31b70d390dad1b90ee2d7f926844bbd60d2fc74cb835e5fa343e SHA512 2d82cbf20bbff3991d74d97171e0a2ad04f14a2a84e4164f5c4c47e3f21c5f8ce54a2b2f9f52b460c0292e1e4c26934a4fe2b1f86021a013a1d71e49cb144b6c WHIRLPOOL 0e3bdfacb9425a85e6b251827a6a5cbb765d8348216494a56f270d996a9e9f1b27dad68dd2b295555705cfee28495dfaf4c9b3350c21507302222372cca1dda5 +EBUILD systemd-9999-r1.ebuild 7344 SHA256 dfb92e539917f07019e529fbf4f1566812d5ddbde3717626e6601093a749a50f SHA512 91e31d170588496d2ca93913ee819285ee1ce635f61e137b05ea7136da456029b4d1dcf08af0963e517eb047f2b499f52c95e1d90387a7b298b60233d7b014a2 WHIRLPOOL 715d7aaa8a11ee59e726777398c3d81edfe68cc83bf2b25e23367dcbadaaf85e9c06827a08883f22167b827eab01602fc3d2ab510bbd4b54b79fbbdb31370dd4 +MISC ChangeLog 30037 SHA256 121e75f19740e9502d0518e2ec88f2e799f70176412086e9d60bef3e8f9d9fa8 SHA512 17ce1f370da0de7ea4f2429f1f17d9356a43cbe56c39bcdf85468a628ce4ad7f827b1c5307775327af779cd207b0e1c7b4d1a849748807d0a92b0d7e5bcfdd33 WHIRLPOOL 5754d9a1323a21d9b835f385baa702c1446c40292cdb5747513a28be9110e5eb1f89c045037d542bfbf624975777a9ebffeb1f6e41743cae365b2588fe8644ce MISC metadata.xml 1108 SHA256 7555f673c5676c2efb2696cf49117e1198134e8c2d575052d817c50bbc4f5f45 SHA512 10b8a0dff66f163dc747e294ead1455fa0b84414eab9aa1950da08f92245eb725d77f04346276a4e727bf0d5b6adc5f6c744b770b1a47dc916ddef7d641affd9 WHIRLPOOL ae3413df80c029c8f84e092568d05e02e3c81695c741319be98ceadddbd680c589e68ec6250a653849eca6d0fe3aace7c2004f54cc2f7a9201b60af524edff28 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iQIcBAEBCgAGBQJRoRv6AAoJELp701BxlEWfo60P/0N1IS0J5U2Ikp3/eq9q6+TD -pEU9uofG0OUdOtx5z75uxAQ6RWbrC2Wugjc8HHg7iKlsG4LKRV23knZKn077wt6o -1LScFOKQgSCE6O6AJVOESgDf1qLIq8ujF7EBG0zS5EIfXJNyH8AIehaWXoqKfpqa -PGY9w14oUwA/jULHIJj/y7L+ax59qFMrqGdSvhIJVEhZc8lnW1tBQsu9s+mBXMjG -wL+TsBXifX62LskSQFPlHrI32X6ejQpLV1K3BIThu1EEbxbIvJ3qtOlFiYKcG4tC -lc18tR/jBDx+Hh6IwfC2zW4AxvlAakqGwwVlRBiIDIUQqLQEBUlu39A+lDH+CfAh -N/CHtKyOjQB+Xn98zXUo6Mznb/DOlnMU/0YLRKCP9BXI8HspjcpAqBU96a1v3udy -Ue/NaS9Q0z22BiYAfPfraMGittwCYnQtt5B5p2tGrEvrQPjNGSO1uimtAqWiohp3 -CiZOOi7TGb/GyrPG0nIV4WppI1Zd99SmCxUHCD6HWO2Poeo55qvLXDjml+JxcPXy -qGTFhljk5e8l8zkoSY1DwZpj0MqrrTOcPpR8qiUBoerjDt1kNxJF8/r7kQx9x6Tn -dvzhw64o/PLa/Sr42ND+rs5RpN/OEJnv1v9ob8JFTJd4ozjurfO5WXKs3PXggB/w -dfcDGteKHi7nfQCEOMUP -=9ALB +iQIcBAEBCgAGBQJR/lakAAoJELp701BxlEWfsIUP/3vmWqnotqM6paM6eXqYebKw +xlkn0XN/yV5Ji7H6gp0ePwHcn899SorDJ12ODDgDNZlFLL4zvFtwJab6J11TFXXG +/2BMgVcGOtveVW4fDnG7sQT1ZLmhN2Q2xKc+BIxN8fOxK4NhKKZK0IHDy+YwoGE3 +VGr6rCHUBQq2eNl21oYpkNKXXyp1AnRnlFLalNzxAY49ttRuf9E7F7zn2LRYzzzV +wywy+1eo5PlJzNxA19CRyL4Q2lnG8w8lVGShLb5/yQ4HSIU2x2xi1ieHjTxVoEwG +fbB6uaP3nyQOlorIL7ywg2/b6cWwlZCxckG0EFNxn5s4f5AlRu6J55oGu1pZ6MmD +k9ZxXhF30YPw9QIrO1ZOlYigw/PUUr7mvNQoJx+Jfvxz9OtBwwcpcd7s4RXJwvRK +1HItJNh7CZDptmu116DJ8Ia0b/gvBjiosM/xZNPOBWyh/PCnhNNy8lBeiligNcgO +gOUnd/6bIS/Bk/UPT6YH5AGj7W9JvvUmXUn/U3u3mzLhJobZymMvW3+QGLUXMV8c +CGA2PrSxm8AsmUAXZgbDs8aqE6j2zlFYFh9ACBnVvASIXvemSUkrBq4L1F/GeRmr +mklLbBMbM9ghoH3NdmGNgBIudtUU/n3ltD5n+VrupyjyCVQjYoJWNAPKypQGmNey +++VmelWOBieoEZYPCUXE +=cXQ1 -----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/191-0001-Disable-udev-targets-for-udev-190.patch b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/191-0001-Disable-udev-targets-for-udev-190.patch deleted file mode 100644 index fb70b80c3d..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/191-0001-Disable-udev-targets-for-udev-190.patch +++ /dev/null @@ -1,331 +0,0 @@ -From 202a70158973fee73432816d2b7612161824cc29 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Wed, 15 Aug 2012 14:02:07 +0200 -Subject: [PATCH] Disable udev targets, for udev-190. - ---- - Makefile.am | 190 +----------------------------------------------------------- - 1 file changed, 1 insertion(+), 189 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 64dfe81..a378007 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -309,8 +309,6 @@ dist_systemunit_DATA = \ - units/systemd-ask-password-wall.path \ - units/systemd-ask-password-console.path \ - units/syslog.target \ -- units/systemd-udevd-control.socket \ -- units/systemd-udevd-kernel.socket \ - units/system-update.target - - nodist_systemunit_DATA = \ -@@ -340,9 +338,6 @@ nodist_systemunit_DATA = \ - units/systemd-kexec.service \ - units/systemd-fsck@.service \ - units/systemd-fsck-root.service \ -- units/systemd-udevd.service \ -- units/systemd-udev-trigger.service \ -- units/systemd-udev-settle.service \ - units/debug-shell.service - - dist_userunit_DATA = \ -@@ -1643,12 +1638,6 @@ SUBDIRS += \ - docs/libudev - endif - --include_HEADERS += \ -- src/libudev/libudev.h -- --lib_LTLIBRARIES += \ -- -ludev -- - libudev_la_SOURCES =\ - src/libudev/libudev-private.h \ - src/libudev/libudev.c \ -@@ -1671,9 +1660,6 @@ libudev_la_LDFLAGS = \ - libudev_la_LIBADD = \ - libsystemd-shared.la - --pkgconfiglib_DATA += \ -- src/libudev/libudev.pc -- - EXTRA_DIST += \ - src/libudev/libudev.pc.in \ - src/libudev/libudev.sym -@@ -1694,12 +1680,7 @@ libudev-install-move-hook: - libudev-uninstall-move-hook: - rm -f $(DESTDIR)$(rootlibdir)/libudev.so* - --INSTALL_EXEC_HOOKS += libudev-install-move-hook --UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook -- - # ------------------------------------------------------------------------------ --noinst_LTLIBRARIES += \ -- libudev-private.la - - libudev_private_la_SOURCES =\ - $(libudev_la_SOURCES) \ -@@ -1714,15 +1695,6 @@ libudev_private_la_LIBADD = \ - libsystemd-shared.la - - # ------------------------------------------------------------------------------ --MANPAGES += \ -- man/udev.7 \ -- man/udevadm.8 \ -- man/systemd-udevd.service.8 -- --MANPAGES_ALIAS += \ -- man/systemd-udevd.8 \ -- man/systemd-udevd-control.socket.8 \ -- man/systemd-udevd-kernel.socket.8 - - man/systemd-udevd.8: man/systemd-udevd.service.8 - man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8 -@@ -1734,28 +1706,7 @@ udev-confdirs: - INSTALL_DATA_HOOKS += udev-confdirs - - dist_udevrules_DATA += \ -- rules/99-systemd.rules \ -- rules/42-usb-hid-pm.rules \ -- rules/50-udev-default.rules \ -- rules/60-persistent-storage-tape.rules \ -- rules/60-persistent-serial.rules \ -- rules/60-persistent-input.rules \ -- rules/60-persistent-alsa.rules \ -- rules/60-persistent-storage.rules \ -- rules/64-btrfs.rules \ -- rules/75-net-description.rules \ -- rules/75-tty-description.rules \ -- rules/78-sound-card.rules \ -- rules/80-drivers.rules \ -- rules/95-udev-late.rules -- --udevconfdir = $(sysconfdir)/udev --dist_udevconf_DATA = \ -- src/udev/udev.conf -- --sharepkgconfigdir = $(datadir)/pkgconfig --sharepkgconfig_DATA = \ -- src/udev/udev.pc -+ rules/99-systemd.rules - - EXTRA_DIST += \ - rules/99-systemd.rules.in \ -@@ -1783,17 +1734,6 @@ systemd-install-hook: - ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service - ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service - --INSTALL_DATA_HOOKS += systemd-install-hook -- --bin_PROGRAMS += \ -- udevadm -- --rootlibexec_PROGRAMS += \ -- systemd-udevd -- --noinst_LTLIBRARIES += \ -- libudev-core.la -- - libudev_core_la_SOURCES = \ - src/udev/udev.h \ - src/udev/udev-event.c \ -@@ -1860,14 +1800,6 @@ udevadm_LDADD = \ - libsystemd-shared.la - - # ------------------------------------------------------------------------------ --TESTS += \ -- test/udev-test.pl \ -- test/rules-test.sh -- --noinst_PROGRAMS += \ -- test-libudev \ -- test-udev -- - test_libudev_SOURCES = \ - src/test/test-libudev.c - -@@ -1917,8 +1849,6 @@ ata_id_LDADD = \ - libudev-private.la \ - libsystemd-shared.la - --udevlibexec_PROGRAMS += \ -- ata_id - - # ------------------------------------------------------------------------------ - cdrom_id_SOURCES = \ -@@ -1928,12 +1858,6 @@ cdrom_id_LDADD = \ - -ludev \ - libsystemd-shared.la - --udevlibexec_PROGRAMS += \ -- cdrom_id -- --dist_udevrules_DATA += \ -- rules/60-cdrom_id.rules -- - # ------------------------------------------------------------------------------ - collect_SOURCES = \ - src/udev/collect/collect.c -@@ -1941,9 +1865,6 @@ collect_SOURCES = \ - collect_LDADD = \ - libudev-private.la - --udevlibexec_PROGRAMS += \ -- collect -- - # ------------------------------------------------------------------------------ - scsi_id_SOURCES =\ - src/udev/scsi_id/scsi_id.c \ -@@ -1955,9 +1876,6 @@ scsi_id_LDADD = \ - libudev-private.la \ - libsystemd-shared.la - --udevlibexec_PROGRAMS += \ -- scsi_id -- - EXTRA_DIST += \ - src/udev/scsi_id/README - -@@ -1968,12 +1886,6 @@ v4l_id_SOURCES = \ - v4l_id_LDADD = \ - -ludev - --udevlibexec_PROGRAMS += \ -- v4l_id -- --dist_udevrules_DATA += \ -- rules/60-persistent-v4l.rules -- - # ------------------------------------------------------------------------------ - accelerometer_SOURCES = \ - src/udev/accelerometer/accelerometer.c -@@ -1982,12 +1894,6 @@ accelerometer_LDADD = \ - -ludev -lm \ - libsystemd-shared.la - --udevlibexec_PROGRAMS += \ -- accelerometer -- --dist_udevrules_DATA += \ -- rules/61-accelerometer.rules -- - # ------------------------------------------------------------------------------ - if ENABLE_GUDEV - if ENABLE_GTK_DOC -@@ -2168,99 +2074,11 @@ nodist_keymap_SOURCES = \ - BUILT_SOURCES += \ - $(nodist_keymap_SOURCES) - --udevlibexec_PROGRAMS += \ -- keymap -- --dist_doc_DATA += \ -- src/udev/keymap/README.keymap.txt -- --dist_udevrules_DATA += \ -- src/udev/keymap/95-keymap.rules \ -- src/udev/keymap/95-keyboard-force-release.rules -- --dist_udevhome_SCRIPTS = \ -- src/udev/keymap/findkeyboards \ -- src/udev/keymap/keyboard-force-release.sh -- --TESTS += \ -- src/udev/keymap/check-keymaps.sh -- - CLEANFILES += \ - src/udev/keymap/keys.txt \ - src/udev/keymap/keys-from-name.gperf \ - src/udev/keymap/keyboard-force-release.sh - --udevkeymapdir = $(udevlibexecdir)/keymaps --dist_udevkeymap_DATA = \ -- keymaps/acer \ -- keymaps/acer-aspire_5720 \ -- keymaps/acer-aspire_8930 \ -- keymaps/acer-aspire_5920g \ -- keymaps/acer-aspire_6920 \ -- keymaps/acer-travelmate_c300 \ -- keymaps/asus \ -- keymaps/compaq-e_evo \ -- keymaps/dell \ -- keymaps/dell-latitude-xt2 \ -- keymaps/everex-xt5000 \ -- keymaps/fujitsu-amilo_li_2732 \ -- keymaps/fujitsu-amilo_pa_2548 \ -- keymaps/fujitsu-amilo_pro_edition_v3505 \ -- keymaps/fujitsu-amilo_pro_v3205 \ -- keymaps/fujitsu-amilo_si_1520 \ -- keymaps/fujitsu-esprimo_mobile_v5 \ -- keymaps/fujitsu-esprimo_mobile_v6 \ -- keymaps/genius-slimstar-320 \ -- keymaps/hewlett-packard \ -- keymaps/hewlett-packard-2510p_2530p \ -- keymaps/hewlett-packard-compaq_elitebook \ -- keymaps/hewlett-packard-pavilion \ -- keymaps/hewlett-packard-presario-2100 \ -- keymaps/hewlett-packard-tablet \ -- keymaps/hewlett-packard-tx2 \ -- keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ -- keymaps/inventec-symphony_6.0_7.0 \ -- keymaps/lenovo-3000 \ -- keymaps/lenovo-ideapad \ -- keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \ -- keymaps/lenovo-thinkpad_x6_tablet \ -- keymaps/lenovo-thinkpad_x200_tablet \ -- keymaps/lg-x110 \ -- keymaps/logitech-wave \ -- keymaps/logitech-wave-cordless \ -- keymaps/logitech-wave-pro-cordless \ -- keymaps/maxdata-pro_7000 \ -- keymaps/medion-fid2060 \ -- keymaps/medionnb-a555 \ -- keymaps/micro-star \ -- keymaps/module-asus-w3j \ -- keymaps/module-ibm \ -- keymaps/module-lenovo \ -- keymaps/module-sony \ -- keymaps/module-sony-old \ -- keymaps/module-sony-vgn \ -- keymaps/module-sony-vpc \ -- keymaps/olpc-xo \ -- keymaps/onkyo \ -- keymaps/oqo-model2 \ -- keymaps/samsung-other \ -- keymaps/samsung-90x3a \ -- keymaps/samsung-sq1us \ -- keymaps/samsung-sx20s \ -- keymaps/toshiba-satellite_a100 \ -- keymaps/toshiba-satellite_a110 \ -- keymaps/toshiba-satellite_m30x \ -- keymaps/zepto-znote -- --udevkeymapforcereldir = $(udevlibexecdir)/keymaps/force-release --dist_udevkeymapforcerel_DATA = \ -- keymaps-force-release/dell-touchpad \ -- keymaps-force-release/dell-xps \ -- keymaps-force-release/hp-other \ -- keymaps-force-release/samsung-other \ -- keymaps-force-release/samsung-90x3a \ -- keymaps-force-release/common-volume-keys -- - src/udev/keymap/keys.txt: Makefile - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ -@@ -2288,12 +2106,6 @@ mtd_probe_SOURCES = \ - mtd_probe_CPPFLAGS = \ - $(AM_CPPFLAGS) - --dist_udevrules_DATA += \ -- rules/75-probe_mtd.rules -- --udevlibexec_PROGRAMS += \ -- mtd_probe -- - # ------------------------------------------------------------------------------ - libsystemd_id128_la_SOURCES = \ - src/libsystemd-id128/sd-id128.c --- -1.7.12 - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/196-0001-Disable-udev-targets.patch b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/196-0001-Disable-udev-targets.patch deleted file mode 100644 index 814c8f4161..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/196-0001-Disable-udev-targets.patch +++ /dev/null @@ -1,344 +0,0 @@ -From 3108c60ba5f4f46fa4b4ca0927d8b5df1b701a75 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Wed, 15 Aug 2012 14:02:07 +0200 -Subject: [PATCH] Disable udev targets. - ---- - Makefile.am | 203 +----------------------------------------------------------- - 1 file changed, 1 insertion(+), 202 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 29d6323..2df0ec2 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -316,8 +316,6 @@ dist_systemunit_DATA = \ - units/systemd-ask-password-wall.path \ - units/systemd-ask-password-console.path \ - units/syslog.target \ -- units/systemd-udevd-control.socket \ -- units/systemd-udevd-kernel.socket \ - units/system-update.target - - nodist_systemunit_DATA = \ -@@ -347,9 +345,6 @@ nodist_systemunit_DATA = \ - units/systemd-kexec.service \ - units/systemd-fsck@.service \ - units/systemd-fsck-root.service \ -- units/systemd-udevd.service \ -- units/systemd-udev-trigger.service \ -- units/systemd-udev-settle.service \ - units/debug-shell.service - - if HAVE_KMOD -@@ -1756,12 +1751,6 @@ SUBDIRS += \ - docs/libudev - endif - --include_HEADERS += \ -- src/libudev/libudev.h -- --lib_LTLIBRARIES += \ -- -ludev -- - libudev_la_SOURCES =\ - src/libudev/libudev-private.h \ - src/libudev/libudev.c \ -@@ -1786,9 +1775,6 @@ libudev_la_LDFLAGS = \ - libudev_la_LIBADD = \ - libsystemd-shared.la - --pkgconfiglib_DATA += \ -- src/libudev/libudev.pc -- - EXTRA_DIST += \ - src/libudev/libudev.pc.in \ - src/libudev/libudev.sym -@@ -1809,12 +1795,7 @@ libudev-install-move-hook: - libudev-uninstall-move-hook: - rm -f $(DESTDIR)$(rootlibdir)/libudev.so* - --INSTALL_EXEC_HOOKS += libudev-install-move-hook --UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook -- - # ------------------------------------------------------------------------------ --noinst_LTLIBRARIES += \ -- libudev-private.la - - libudev_private_la_SOURCES =\ - $(libudev_la_SOURCES) \ -@@ -1829,15 +1810,6 @@ libudev_private_la_LIBADD = \ - libsystemd-shared.la - - # ------------------------------------------------------------------------------ --MANPAGES += \ -- man/udev.7 \ -- man/udevadm.8 \ -- man/systemd-udevd.service.8 -- --MANPAGES_ALIAS += \ -- man/systemd-udevd.8 \ -- man/systemd-udevd-control.socket.8 \ -- man/systemd-udevd-kernel.socket.8 - - man/systemd-udevd.8: man/systemd-udevd.service.8 - man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8 -@@ -1850,40 +1822,7 @@ udev-confdirs: - INSTALL_DATA_HOOKS += udev-confdirs - - dist_udevrules_DATA += \ -- rules/99-systemd.rules \ -- rules/42-usb-hid-pm.rules \ -- rules/50-udev-default.rules \ -- rules/60-persistent-storage-tape.rules \ -- rules/60-persistent-serial.rules \ -- rules/60-persistent-input.rules \ -- rules/60-persistent-alsa.rules \ -- rules/60-persistent-storage.rules \ -- rules/64-btrfs.rules \ -- rules/75-net-description.rules \ -- rules/75-tty-description.rules \ -- rules/78-sound-card.rules \ -- rules/95-udev-late.rules -- --if HAVE_KMOD --dist_udevrules_DATA += \ -- rules/80-drivers.rules --endif -- --dist_udevhwdb_DATA = \ -- hwdb/20-pci-vendor-product.hwdb \ -- hwdb/20-pci-classes.hwdb \ -- hwdb/20-usb-vendor-product.hwdb \ -- hwdb/20-usb-classes.hwdb \ -- hwdb/20-acpi-vendor.hwdb \ -- hwdb/20-OUI.hwdb -- --udevconfdir = $(sysconfdir)/udev --dist_udevconf_DATA = \ -- src/udev/udev.conf -- --sharepkgconfigdir = $(datadir)/pkgconfig --sharepkgconfig_DATA = \ -- src/udev/udev.pc -+ rules/99-systemd.rules - - EXTRA_DIST += \ - rules/99-systemd.rules.in \ -@@ -1911,17 +1850,6 @@ systemd-install-hook: - ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service - ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service - --INSTALL_DATA_HOOKS += systemd-install-hook -- --bin_PROGRAMS += \ -- udevadm -- --rootlibexec_PROGRAMS += \ -- systemd-udevd -- --noinst_LTLIBRARIES += \ -- libudev-core.la -- - libudev_core_la_SOURCES = \ - src/udev/udev.h \ - src/udev/udev-event.c \ -@@ -2008,14 +1936,6 @@ hwdb-remove-hook: - -test -n "$(DESTDIR)" || rm -f $(HWDB_BIN) - - # ------------------------------------------------------------------------------ --TESTS += \ -- test/udev-test.pl \ -- test/rules-test.sh -- --noinst_PROGRAMS += \ -- test-libudev \ -- test-udev -- - test_libudev_SOURCES = \ - src/test/test-libudev.c - -@@ -2065,8 +1985,6 @@ ata_id_LDADD = \ - libudev-private.la \ - libsystemd-shared.la - --udevlibexec_PROGRAMS += \ -- ata_id - - # ------------------------------------------------------------------------------ - cdrom_id_SOURCES = \ -@@ -2076,12 +1994,6 @@ cdrom_id_LDADD = \ - -ludev \ - libsystemd-shared.la - --udevlibexec_PROGRAMS += \ -- cdrom_id -- --dist_udevrules_DATA += \ -- rules/60-cdrom_id.rules -- - # ------------------------------------------------------------------------------ - collect_SOURCES = \ - src/udev/collect/collect.c -@@ -2089,9 +2001,6 @@ collect_SOURCES = \ - collect_LDADD = \ - libudev-private.la - --udevlibexec_PROGRAMS += \ -- collect -- - # ------------------------------------------------------------------------------ - scsi_id_SOURCES =\ - src/udev/scsi_id/scsi_id.c \ -@@ -2103,9 +2012,6 @@ scsi_id_LDADD = \ - libudev-private.la \ - libsystemd-shared.la - --udevlibexec_PROGRAMS += \ -- scsi_id -- - EXTRA_DIST += \ - src/udev/scsi_id/README - -@@ -2116,12 +2022,6 @@ v4l_id_SOURCES = \ - v4l_id_LDADD = \ - -ludev - --udevlibexec_PROGRAMS += \ -- v4l_id -- --dist_udevrules_DATA += \ -- rules/60-persistent-v4l.rules -- - # ------------------------------------------------------------------------------ - accelerometer_SOURCES = \ - src/udev/accelerometer/accelerometer.c -@@ -2130,12 +2030,6 @@ accelerometer_LDADD = \ - -ludev -lm \ - libsystemd-shared.la - --udevlibexec_PROGRAMS += \ -- accelerometer -- --dist_udevrules_DATA += \ -- rules/61-accelerometer.rules -- - # ------------------------------------------------------------------------------ - if ENABLE_GUDEV - if ENABLE_GTK_DOC -@@ -2316,100 +2210,11 @@ nodist_keymap_SOURCES = \ - BUILT_SOURCES += \ - $(nodist_keymap_SOURCES) - --udevlibexec_PROGRAMS += \ -- keymap -- --dist_doc_DATA += \ -- src/udev/keymap/README.keymap.txt -- --dist_udevrules_DATA += \ -- src/udev/keymap/95-keymap.rules \ -- src/udev/keymap/95-keyboard-force-release.rules -- --dist_udevhome_SCRIPTS = \ -- src/udev/keymap/findkeyboards \ -- src/udev/keymap/keyboard-force-release.sh -- --TESTS += \ -- src/udev/keymap/check-keymaps.sh -- - CLEANFILES += \ - src/udev/keymap/keys.txt \ - src/udev/keymap/keys-from-name.gperf \ - src/udev/keymap/keyboard-force-release.sh - --udevkeymapdir = $(udevlibexecdir)/keymaps --dist_udevkeymap_DATA = \ -- keymaps/acer \ -- keymaps/acer-aspire_5720 \ -- keymaps/acer-aspire_8930 \ -- keymaps/acer-aspire_5920g \ -- keymaps/acer-aspire_6920 \ -- keymaps/acer-travelmate_c300 \ -- keymaps/asus \ -- keymaps/compaq-e_evo \ -- keymaps/dell \ -- keymaps/dell-latitude-xt2 \ -- keymaps/everex-xt5000 \ -- keymaps/fujitsu-amilo_li_2732 \ -- keymaps/fujitsu-amilo_pa_2548 \ -- keymaps/fujitsu-amilo_pro_edition_v3505 \ -- keymaps/fujitsu-amilo_pro_v3205 \ -- keymaps/fujitsu-amilo_si_1520 \ -- keymaps/fujitsu-esprimo_mobile_v5 \ -- keymaps/fujitsu-esprimo_mobile_v6 \ -- keymaps/genius-slimstar-320 \ -- keymaps/hewlett-packard \ -- keymaps/hewlett-packard-2510p_2530p \ -- keymaps/hewlett-packard-compaq_elitebook \ -- keymaps/hewlett-packard-pavilion \ -- keymaps/hewlett-packard-presario-2100 \ -- keymaps/hewlett-packard-tablet \ -- keymaps/hewlett-packard-tx2 \ -- keymaps/hewlett-packard_elitebook-8440p \ -- keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ -- keymaps/inventec-symphony_6.0_7.0 \ -- keymaps/lenovo-3000 \ -- keymaps/lenovo-ideapad \ -- keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \ -- keymaps/lenovo-thinkpad_x6_tablet \ -- keymaps/lenovo-thinkpad_x200_tablet \ -- keymaps/lg-x110 \ -- keymaps/logitech-wave \ -- keymaps/logitech-wave-cordless \ -- keymaps/logitech-wave-pro-cordless \ -- keymaps/maxdata-pro_7000 \ -- keymaps/medion-fid2060 \ -- keymaps/medionnb-a555 \ -- keymaps/micro-star \ -- keymaps/module-asus-w3j \ -- keymaps/module-ibm \ -- keymaps/module-lenovo \ -- keymaps/module-sony \ -- keymaps/module-sony-old \ -- keymaps/module-sony-vgn \ -- keymaps/module-sony-vpc \ -- keymaps/olpc-xo \ -- keymaps/onkyo \ -- keymaps/oqo-model2 \ -- keymaps/samsung-other \ -- keymaps/samsung-90x3a \ -- keymaps/samsung-sq1us \ -- keymaps/samsung-sx20s \ -- keymaps/toshiba-satellite_a100 \ -- keymaps/toshiba-satellite_a110 \ -- keymaps/toshiba-satellite_m30x \ -- keymaps/zepto-znote -- --udevkeymapforcereldir = $(udevlibexecdir)/keymaps/force-release --dist_udevkeymapforcerel_DATA = \ -- keymaps-force-release/dell-touchpad \ -- keymaps-force-release/dell-xps \ -- keymaps-force-release/hp-other \ -- keymaps-force-release/samsung-other \ -- keymaps-force-release/samsung-90x3a \ -- keymaps-force-release/common-volume-keys -- - src/udev/keymap/keys.txt: Makefile - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ -@@ -2437,12 +2242,6 @@ mtd_probe_SOURCES = \ - mtd_probe_CPPFLAGS = \ - $(AM_CPPFLAGS) - --dist_udevrules_DATA += \ -- rules/75-probe_mtd.rules -- --udevlibexec_PROGRAMS += \ -- mtd_probe -- - # ------------------------------------------------------------------------------ - libsystemd_id128_la_SOURCES = \ - src/libsystemd-id128/sd-id128.c --- -1.8.0 - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/196-0002-Don-t-fail-with-missing-gcrypt-macros.patch b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/196-0002-Don-t-fail-with-missing-gcrypt-macros.patch deleted file mode 100644 index 694d3ef011..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/196-0002-Don-t-fail-with-missing-gcrypt-macros.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 94949efc89245ad8234d704ebb453e2f77605fd3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Tue, 4 Dec 2012 17:35:55 +0100 -Subject: [PATCH 2/2] Don't fail with missing gcrypt macros. - ---- - configure.ac | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure.ac b/configure.ac -index d0003bb..e804fdc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -412,12 +412,14 @@ AC_ARG_ENABLE([gcrypt], - [have_gcrypt=auto]) - - if test "x${have_gcrypt}" != xno ; then -+m4_ifdef([AM_PATH_LIBGCRYPT], [ - AM_PATH_LIBGCRYPT( - [1.4.5], - [have_gcrypt=yes], - [if test "x$have_gcrypt" = xyes ; then - AC_MSG_ERROR([*** GCRYPT headers not found.]) - fi]) -+]) - - if test "x$have_gcrypt" = xyes ; then - GCRYPT_LIBS="$LIBGCRYPT_LIBS" --- -1.8.0 - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/197-0001-Disable-udev-targets.patch b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/197-0001-Disable-udev-targets.patch deleted file mode 100644 index fca24ccce5..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/197-0001-Disable-udev-targets.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 39640ff78085e151b9f9fe03bde76efb47facdd0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Fri, 18 Jan 2013 17:35:54 +0100 -Subject: [PATCH] Disable udev & libsystemd-daemon for systemd ebuild. - ---- - Makefile.am | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index fb7d8fe..09cf7c2 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -293,8 +293,6 @@ dist_systemunit_DATA = \ - units/systemd-ask-password-wall.path \ - units/systemd-ask-password-console.path \ - units/syslog.target \ -- units/systemd-udevd-control.socket \ -- units/systemd-udevd-kernel.socket \ - units/system-update.target - - nodist_systemunit_DATA = \ -@@ -324,9 +322,6 @@ nodist_systemunit_DATA = \ - units/systemd-kexec.service \ - units/systemd-fsck@.service \ - units/systemd-fsck-root.service \ -- units/systemd-udevd.service \ -- units/systemd-udev-trigger.service \ -- units/systemd-udev-settle.service \ - units/debug-shell.service - - if HAVE_KMOD -@@ -1658,6 +1653,13 @@ systemd_tty_ask_password_agent_LDADD = \ - libsystemd-label.la \ - libsystemd-shared.la - -+dist_udevrules_DATA += \ -+ rules/99-systemd.rules -+ -+# disable udev & systemd-daemon which are installed by sys-fs/udev -+# ENABLE_GUDEV is something that won't be set in systemd ebuild -+if ENABLE_GUDEV -+ - # ------------------------------------------------------------------------------ - libsystemd_daemon_la_SOURCES = \ - src/libsystemd-daemon/sd-daemon.c -@@ -2417,6 +2419,9 @@ dist_udevrules_DATA += \ - udevlibexec_PROGRAMS += \ - mtd_probe - -+endif -+# (udev disable) -+ - # ------------------------------------------------------------------------------ - libsystemd_id128_la_SOURCES = \ - src/libsystemd-id128/sd-id128.c --- -1.8.1.1 - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0001-logind-update-state-file-after-generating-the-sessio.patch b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0001-logind-update-state-file-after-generating-the-sessio.patch new file mode 100644 index 0000000000..2d74b01293 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0001-logind-update-state-file-after-generating-the-sessio.patch @@ -0,0 +1,84 @@ +From a7ca0f06aaa0e0ae3b5eada2cdece8c9766bff1a Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Fri, 26 Jul 2013 17:32:19 +0200 +Subject: [PATCH 1/5] logind: update state file after generating the session + fifo, not before + +https://bugs.freedesktop.org/show_bug.cgi?id=67273 +--- + src/login/logind-dbus.c | 7 ++++++- + src/login/logind-session-dbus.c | 4 ++++ + src/machine/machined-dbus.c | 3 ++- + 3 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c +index 39af637..b5e975a 100644 +--- a/src/login/logind-dbus.c ++++ b/src/login/logind-dbus.c +@@ -643,6 +643,10 @@ static int bus_manager_create_session(Manager *m, DBusMessage *message) { + + session->create_message = dbus_message_ref(message); + ++ /* Now, let's wait until the slice unit and stuff got ++ * created. We send the reply back from ++ * session_send_create_reply().*/ ++ + return 0; + + fail: +@@ -2356,7 +2360,6 @@ DBusHandlerResult bus_message_filter( + if (streq_ptr(path, s->scope_job)) { + free(s->scope_job); + s->scope_job = NULL; +- session_save(s); + + if (s->started) { + if (streq(result, "done")) +@@ -2366,6 +2369,8 @@ DBusHandlerResult bus_message_filter( + session_send_create_reply(s, &error); + } + } ++ ++ session_save(s); + } + + session_add_to_gc_queue(s); +diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c +index 62b9ffd..210f756 100644 +--- a/src/login/logind-session-dbus.c ++++ b/src/login/logind-session-dbus.c +@@ -535,6 +535,10 @@ int session_send_create_reply(Session *s, DBusError *error) { + if (!s->create_message) + return 0; + ++ /* This is called after the session scope was successfully ++ * created, and finishes where bus_manager_create_session() ++ * left off. */ ++ + if (error) { + DBusError buffer; + +diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c +index 1e8bc60..6c4d50b 100644 +--- a/src/machine/machined-dbus.c ++++ b/src/machine/machined-dbus.c +@@ -543,7 +543,6 @@ DBusHandlerResult bus_message_filter( + if (streq_ptr(path, mm->scope_job)) { + free(mm->scope_job); + mm->scope_job = NULL; +- machine_save(mm); + + if (mm->started) { + if (streq(result, "done")) +@@ -553,6 +552,8 @@ DBusHandlerResult bus_message_filter( + machine_send_create_reply(mm, &error); + } + } ++ ++ machine_save(mm); + } + + machine_add_to_gc_queue(mm); +-- +1.8.3.2 + diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0002-Add-usr-share-keymaps-to-localectl-supported-locatio.patch b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0002-Add-usr-share-keymaps-to-localectl-supported-locatio.patch new file mode 100644 index 0000000000..79333e6eed --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0002-Add-usr-share-keymaps-to-localectl-supported-locatio.patch @@ -0,0 +1,25 @@ +From 64fa15a7ca9c276d28413567c74a1d360fbdc975 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Wed, 31 Jul 2013 23:12:17 +0200 +Subject: [PATCH 2/5] Add /usr/share/keymaps to localectl supported locations. + +This is the standard upstream location where kbd installs keymaps. +--- + src/locale/localectl.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/locale/localectl.c b/src/locale/localectl.c +index cd7356a..8259c0a 100644 +--- a/src/locale/localectl.c ++++ b/src/locale/localectl.c +@@ -538,6 +538,7 @@ static int list_vconsole_keymaps(DBusConnection *bus, char **args, unsigned n) { + if (!keymaps) + return log_oom(); + ++ nftw("/usr/share/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS); + nftw("/usr/share/kbd/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS); + nftw("/usr/lib/kbd/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS); + nftw("/lib/kbd/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS); +-- +1.8.3.2 + diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0003-tmpfiles-support-passing-prefix-multiple-times.patch b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0003-tmpfiles-support-passing-prefix-multiple-times.patch new file mode 100644 index 0000000000..02d2b26af7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0003-tmpfiles-support-passing-prefix-multiple-times.patch @@ -0,0 +1,90 @@ +From 9c26db4da7a474b024fcdc97ea490280d86777e1 Mon Sep 17 00:00:00 2001 +From: Dave Reisner +Date: Wed, 24 Jul 2013 11:10:05 -0400 +Subject: [PATCH 3/5] tmpfiles: support passing --prefix multiple times + +--- + man/systemd-tmpfiles.xml | 3 ++- + src/tmpfiles/tmpfiles.c | 24 +++++++++++++++++++++--- + 2 files changed, 23 insertions(+), 4 deletions(-) + +diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml +index 405a9f1..b0f2d9c 100644 +--- a/man/systemd-tmpfiles.xml ++++ b/man/systemd-tmpfiles.xml +@@ -121,7 +121,8 @@ + + Only apply rules that + apply to paths with the specified +- prefix. ++ prefix. This option can be specified ++ multiple times. + + + +diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c +index eae993e..cb15133 100644 +--- a/src/tmpfiles/tmpfiles.c ++++ b/src/tmpfiles/tmpfiles.c +@@ -105,7 +105,7 @@ static bool arg_create = false; + static bool arg_clean = false; + static bool arg_remove = false; + +-static const char *arg_prefix = NULL; ++static char **include_prefixes = NULL; + + static const char conf_file_dirs[] = + "/etc/tmpfiles.d\0" +@@ -1018,6 +1018,21 @@ static bool item_equal(Item *a, Item *b) { + return true; + } + ++static bool should_include_path(const char *path) { ++ char **prefix; ++ ++ /* no explicit paths specified for inclusion, so everything is valid */ ++ if (strv_length(include_prefixes) == 0) ++ return true; ++ ++ STRV_FOREACH(prefix, include_prefixes) { ++ if (path_startswith(path, *prefix)) ++ return true; ++ } ++ ++ return false; ++} ++ + static int parse_line(const char *fname, unsigned line, const char *buffer) { + _cleanup_item_free_ Item *i = NULL; + Item *existing; +@@ -1119,7 +1134,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { + + path_kill_slashes(i->path); + +- if (arg_prefix && !path_startswith(i->path, arg_prefix)) ++ if (!should_include_path(i->path)) + return 0; + + if (user && !streq(user, "-")) { +@@ -1258,7 +1273,8 @@ static int parse_argv(int argc, char *argv[]) { + break; + + case ARG_PREFIX: +- arg_prefix = optarg; ++ if (strv_extend(&include_prefixes, optarg) < 0) ++ return log_oom(); + break; + + case '?': +@@ -1423,6 +1439,8 @@ finish: + hashmap_free(items); + hashmap_free(globs); + ++ strv_free(include_prefixes); ++ + set_free_free(unix_sockets); + + label_finish(); +-- +1.8.3.2 + diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0004-tmpfiles-introduce-exclude-prefix.patch b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0004-tmpfiles-introduce-exclude-prefix.patch new file mode 100644 index 0000000000..d314d3e06c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0004-tmpfiles-introduce-exclude-prefix.patch @@ -0,0 +1,138 @@ +From 059e02a48e58da81591ebd34e87f928269d77929 Mon Sep 17 00:00:00 2001 +From: Dave Reisner +Date: Wed, 24 Jul 2013 11:19:24 -0400 +Subject: [PATCH 4/5] tmpfiles: introduce --exclude-prefix + +The opposite of --prefix, allows specifying path prefixes which should +be skipped when processing rules. +--- + man/systemd-tmpfiles.xml | 7 +++++ + shell-completion/systemd-zsh-completion.zsh | 1 + + src/tmpfiles/tmpfiles.c | 44 ++++++++++++++++++----------- + 3 files changed, 36 insertions(+), 16 deletions(-) + +diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml +index b0f2d9c..403592d 100644 +--- a/man/systemd-tmpfiles.xml ++++ b/man/systemd-tmpfiles.xml +@@ -124,6 +124,13 @@ + prefix. This option can be specified + multiple times. + ++ ++ ++ Ignore rules that ++ apply to paths with the specified ++ prefix. This option can be specified ++ multiple times. ++ + + + +diff --git a/shell-completion/systemd-zsh-completion.zsh b/shell-completion/systemd-zsh-completion.zsh +index c85e00e..7aebbcd 100644 +--- a/shell-completion/systemd-zsh-completion.zsh ++++ b/shell-completion/systemd-zsh-completion.zsh +@@ -249,6 +249,7 @@ _ctls() + '--clean[Clean up all files and directories with an age parameter configured.]' \ + '--remove[All files and directories marked with r, R in the configuration files are removed.]' \ + '--prefix=[Only apply rules that apply to paths with the specified prefix.]' \ ++ '--exclude-prefix=[Ignore rules that apply to paths with the specified prefix.]' \ + '--help[Prints a short help text and exits.]' \ + '*::files:_files' + ;; +diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c +index cb15133..5eca82a 100644 +--- a/src/tmpfiles/tmpfiles.c ++++ b/src/tmpfiles/tmpfiles.c +@@ -106,6 +106,7 @@ static bool arg_clean = false; + static bool arg_remove = false; + + static char **include_prefixes = NULL; ++static char **exclude_prefixes = NULL; + + static const char conf_file_dirs[] = + "/etc/tmpfiles.d\0" +@@ -1021,16 +1022,19 @@ static bool item_equal(Item *a, Item *b) { + static bool should_include_path(const char *path) { + char **prefix; + +- /* no explicit paths specified for inclusion, so everything is valid */ +- if (strv_length(include_prefixes) == 0) +- return true; ++ STRV_FOREACH(prefix, exclude_prefixes) { ++ if (path_startswith(path, *prefix)) ++ return false; ++ } + + STRV_FOREACH(prefix, include_prefixes) { + if (path_startswith(path, *prefix)) + return true; + } + +- return false; ++ /* no matches, so we should include this path only if we ++ * have no whitelist at all */ ++ return strv_length(include_prefixes) == 0; + } + + static int parse_line(const char *fname, unsigned line, const char *buffer) { +@@ -1219,11 +1223,12 @@ static int help(void) { + + printf("%s [OPTIONS...] [CONFIGURATION FILE...]\n\n" + "Creates, deletes and cleans up volatile and temporary files and directories.\n\n" +- " -h --help Show this help\n" +- " --create Create marked files/directories\n" +- " --clean Clean up marked directories\n" +- " --remove Remove marked files/directories\n" +- " --prefix=PATH Only apply rules that apply to paths with the specified prefix\n", ++ " -h --help Show this help\n" ++ " --create Create marked files/directories\n" ++ " --clean Clean up marked directories\n" ++ " --remove Remove marked files/directories\n" ++ " --prefix=PATH Only apply rules that apply to paths with the specified prefix\n" ++ " --exclude-prefix=PATH Ignore rules that apply to paths with the specified prefix\n", + program_invocation_short_name); + + return 0; +@@ -1235,16 +1240,18 @@ static int parse_argv(int argc, char *argv[]) { + ARG_CREATE, + ARG_CLEAN, + ARG_REMOVE, +- ARG_PREFIX ++ ARG_PREFIX, ++ ARG_EXCLUDE_PREFIX, + }; + + static const struct option options[] = { +- { "help", no_argument, NULL, 'h' }, +- { "create", no_argument, NULL, ARG_CREATE }, +- { "clean", no_argument, NULL, ARG_CLEAN }, +- { "remove", no_argument, NULL, ARG_REMOVE }, +- { "prefix", required_argument, NULL, ARG_PREFIX }, +- { NULL, 0, NULL, 0 } ++ { "help", no_argument, NULL, 'h' }, ++ { "create", no_argument, NULL, ARG_CREATE }, ++ { "clean", no_argument, NULL, ARG_CLEAN }, ++ { "remove", no_argument, NULL, ARG_REMOVE }, ++ { "prefix", required_argument, NULL, ARG_PREFIX }, ++ { "exclude-prefix", required_argument, NULL, ARG_EXCLUDE_PREFIX }, ++ { NULL, 0, NULL, 0 } + }; + + int c; +@@ -1277,6 +1284,11 @@ static int parse_argv(int argc, char *argv[]) { + return log_oom(); + break; + ++ case ARG_EXCLUDE_PREFIX: ++ if (strv_extend(&exclude_prefixes, optarg) < 0) ++ return log_oom(); ++ break; ++ + case '?': + return -EINVAL; + +-- +1.8.3.2 + diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0005-tmpfiles-setup-exclude-dev-prefixes-files.patch b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0005-tmpfiles-setup-exclude-dev-prefixes-files.patch new file mode 100644 index 0000000000..9d674b2d45 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/206-0005-tmpfiles-setup-exclude-dev-prefixes-files.patch @@ -0,0 +1,23 @@ +From a7b85011f13bf2a90cfcfad1f3d2ca2deebaa2f1 Mon Sep 17 00:00:00 2001 +From: Dave Reisner +Date: Wed, 24 Jul 2013 11:58:35 -0400 +Subject: [PATCH 5/5] tmpfiles-setup: exclude /dev prefixes files + +Fixes Arch Linux bug: https://bugs.archlinux.org/task/36259 +--- + units/systemd-tmpfiles-setup.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in +index 67c7d4a..6f98063 100644 +--- a/units/systemd-tmpfiles-setup.service.in ++++ b/units/systemd-tmpfiles-setup.service.in +@@ -21,4 +21,4 @@ ConditionDirectoryNotEmpty=|/run/tmpfiles.d + [Service] + Type=oneshot + RemainAfterExit=yes +-ExecStart=@rootbindir@/systemd-tmpfiles --create --remove ++ExecStart=@rootbindir@/systemd-tmpfiles --create --remove --exclude-prefix=/dev +-- +1.8.3.2 + diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/systemd-197-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/systemd-197-r1.ebuild deleted file mode 100644 index dbe7b3b3d3..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/systemd-197-r1.ebuild +++ /dev/null @@ -1,222 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-197-r1.ebuild,v 1.5 2013/02/24 11:49:24 ago Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python2_6 python2_7 ) -inherit autotools-utils bash-completion-r1 linux-info pam \ - python-single-r1 systemd - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" -SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz" - -LICENSE="GPL-2 LGPL-2.1 MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc64 ~x86" -IUSE="acl audit cryptsetup gcrypt http +kmod lzma pam python qrcode - selinux tcpd vanilla xattr" - -MINKV="2.6.39" - -COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1 - >=sys-apps/util-linux-2.20 - ~sys-fs/udev-${PV} - sys-libs/libcap - acl? ( sys-apps/acl ) - audit? ( >=sys-process/audit-2 ) - cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 ) - gcrypt? ( >=dev-libs/libgcrypt-1.4.5 ) - http? ( net-libs/libmicrohttpd ) - kmod? ( >=sys-apps/kmod-12 ) - lzma? ( app-arch/xz-utils ) - pam? ( virtual/pam ) - python? ( ${PYTHON_DEPS} ) - qrcode? ( media-gfx/qrencode ) - selinux? ( sys-libs/libselinux ) - tcpd? ( sys-apps/tcp-wrappers ) - xattr? ( sys-apps/attr )" - -RDEPEND="${COMMON_DEPEND} - sys-apps/hwids - || ( - >=sys-apps/util-linux-2.22 - =sys-apps/util-linux-2.22 =dev-util/intltool-0.50 + >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-${MINKV} virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 )" -#if LIVE -DEPEND="${DEPEND} - dev-libs/gobject-introspection - >=dev-libs/libgcrypt-1.4.5 - >=dev-util/gtk-doc-1.18" - -SRC_URI= -KEYWORDS= - -src_prepare() { - gtkdocize --docdir docs/ || die - - autotools-utils_src_prepare -} -#endif - pkg_pretend() { local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~FANOTIFY ~HOTPLUG ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS ~SIGNALFD ~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2" # ~!FW_LOADER_USER_HELPER" + use pam && CONFIG_CHECK+=" ~AUDITSYSCALL" + # read null-terminated argv[0] from PID 1 # and see which path to systemd was used (if any) local init_path @@ -142,12 +123,27 @@ pkg_setup() { use python && python-single-r1_pkg_setup } +src_prepare() { + local PATCHES=( + #477954 - gnome-shell-3.8* session unlock broken + "${FILESDIR}"/206-0001-logind-update-state-file-after-generating-the-sessio.patch + #474946 - localectl does not find keymaps + "${FILESDIR}"/206-0002-Add-usr-share-keymaps-to-localectl-supported-locatio.patch + #478198 - wrong permission for static-nodes + "${FILESDIR}"/206-0003-tmpfiles-support-passing-prefix-multiple-times.patch + "${FILESDIR}"/206-0004-tmpfiles-introduce-exclude-prefix.patch + "${FILESDIR}"/206-0005-tmpfiles-setup-exclude-dev-prefixes-files.patch + ) + + autotools-utils_src_prepare +} + src_configure() { local myeconfargs=( --localstatedir=/var --with-pamlibdir=$(getpam_mod_dir) - # avoid bash-completion dep, default is stupid - --with-bashcompletiondir=/usr/share/bash-completion + # avoid bash-completion dep + --with-bashcompletiondir="$(get_bashcompdir)" # make sure we get /bin:/sbin in $PATH --enable-split-usr # disable sysv compatibility @@ -165,7 +161,6 @@ src_configure() { $(use_enable gudev) $(use_enable http microhttpd) $(use_enable introspection) - $(use_enable keymap) $(use_enable kmod) $(use_enable lzma xz) $(use_enable pam) @@ -290,6 +285,9 @@ pkg_postinst() { udevadm hwdb --update --root="${ROOT%/}" fi + # Bug 468876 + fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt + if [[ ! -L "${ROOT}"/etc/mtab ]]; then ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts." ewarn "It is known to cause users being unable to unmount user mounts. If you don't" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/systemd-202.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/systemd-9999-r1.ebuild similarity index 73% rename from sdk_container/src/third_party/portage-stable/sys-apps/systemd/systemd-202.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/systemd/systemd-9999-r1.ebuild index 613eaa5b30..6e26c04be9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/systemd-202.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/systemd-9999-r1.ebuild @@ -1,11 +1,21 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-202.ebuild,v 1.2 2013/05/14 14:55:37 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v 1.6 2013/08/04 08:15:08 mgorny Exp $ EAPI=5 +#if LIVE +AUTOTOOLS_AUTORECONF=yes +EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${PN} + http://cgit.freedesktop.org/${PN}/${PN}/" + +inherit git-2 +#endif + +AUTOTOOLS_PRUNE_LIBTOOL_FILES=all PYTHON_COMPAT=( python2_7 ) -inherit autotools-utils linux-info multilib pam python-single-r1 systemd toolchain-funcs udev user +inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \ + pam python-single-r1 systemd toolchain-funcs udev user DESCRIPTION="System and service manager for Linux" HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" @@ -13,24 +23,24 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz" LICENSE="GPL-2 LGPL-2.1 MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection - keymap +kmod lzma openrc pam policykit python qrcode selinux static-libs - tcpd test vanilla xattr" + +kmod lzma openrc pam policykit python qrcode selinux tcpd test + vanilla xattr" -MINKV="2.6.39" +MINKV="3.0" COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1 >=sys-apps/util-linux-2.20 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) - cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 ) + cryptsetup? ( >=sys-fs/cryptsetup-1.6 ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5 ) gudev? ( >=dev-libs/glib-2 ) http? ( net-libs/libmicrohttpd ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) - kmod? ( >=sys-apps/kmod-12 ) + kmod? ( >=sys-apps/kmod-14-r1 ) lzma? ( app-arch/xz-utils ) pam? ( virtual/pam ) python? ( ${PYTHON_DEPS} ) @@ -48,11 +58,12 @@ RDEPEND="${COMMON_DEPEND} >=sys-apps/util-linux-2.22 =dev-util/intltool-0.50 + >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-${MINKV} virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 )" +#if LIVE +DEPEND="${DEPEND} + dev-libs/gobject-introspection + >=dev-libs/libgcrypt-1.4.5 + >=dev-util/gtk-doc-1.18" + +SRC_URI= +KEYWORDS= + +src_prepare() { + gtkdocize --docdir docs/ || die + + autotools-utils_src_prepare +} +#endif + pkg_pretend() { local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~FANOTIFY ~HOTPLUG ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS ~SIGNALFD ~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2" # ~!FW_LOADER_USER_HELPER" + use pam && CONFIG_CHECK+=" ~AUDITSYSCALL" + if [[ ${MERGE_TYPE} != binary ]]; then if [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]] @@ -105,8 +135,8 @@ src_configure() { local myeconfargs=( --localstatedir=/var --with-pamlibdir=$(getpam_mod_dir) - # avoid bash-completion dep, default is stupid - --with-bashcompletiondir=/usr/share/bash-completion + # avoid bash-completion dep + --with-bashcompletiondir="$(get_bashcompdir)" # make sure we get /bin:/sbin in $PATH --enable-split-usr # disable sysv compatibility @@ -124,7 +154,6 @@ src_configure() { $(use_enable gudev) $(use_enable http microhttpd) $(use_enable introspection) - $(use_enable keymap) $(use_enable kmod) $(use_enable lzma xz) $(use_enable pam) @@ -170,55 +199,21 @@ src_install() { udevlibexecdir="${MY_UDEVDIR}" \ dist_udevhwdb_DATA= - # keep udev working without initramfs, for openrc compat - dodir /bin /sbin - mv "${D}"/usr/lib/systemd/systemd-udevd "${D}"/sbin/udevd || die - mv "${D}"/usr/bin/udevadm "${D}"/bin/udevadm || die - dosym ../../../sbin/udevd /usr/lib/systemd/systemd-udevd - dosym ../../bin/udevadm /usr/bin/udevadm - # zsh completion insinto /usr/share/zsh/site-functions - newins shell-completion/systemd-zsh-completion.zsh "_${PN}" - - # remove pam.d plugin .la-file - prune_libtool_files --modules - - # compat for init= use - dosym ../usr/lib/systemd/systemd /bin/systemd - dosym ../lib/systemd/systemd /usr/bin/systemd - # rsyslog.service depends on it... - dosym ../usr/bin/systemctl /bin/systemctl + doins shell-completion/zsh/_* # we just keep sysvinit tools, so no need for the mans rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ || die rm "${D}"/usr/share/man/man1/init.1 || die - if ! use vanilla; then - # Create /run/lock as required by new baselay/OpenRC compat. - systemd_dotmpfilesd "${FILESDIR}"/gentoo-run.conf - - # Add mount-rules for /var/lock and /var/run, bug #433607 - systemd_dounit "${FILESDIR}"/var-{lock,run}.mount - systemd_enable_service sysinit.target var-lock.mount - systemd_enable_service sysinit.target var-run.mount - fi - # Disable storing coredumps in journald, bug #433457 mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die # Preserve empty dirs in /etc & /var, bug #437008 keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \ /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd - - # Check whether we won't break user's system. - local x - for x in /bin/systemd /usr/bin/systemd \ - /usr/bin/udevadm /usr/lib/systemd/systemd-udevd - do - [[ -x ${D}${x} ]] || die "${x} symlink broken, aborting." - done } optfeature() { @@ -252,6 +247,9 @@ pkg_postinst() { udevadm hwdb --update --root="${ROOT%/}" fi + # Bug 468876 + fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt + if [[ ! -L "${ROOT}"/etc/mtab ]]; then ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts." ewarn "It is known to cause users being unable to unmount user mounts. If you don't" @@ -264,19 +262,6 @@ pkg_postinst() { elog "be installed:" optfeature 'for GTK+ systemadm UI and gnome-ask-password-agent' \ 'sys-apps/systemd-ui' - - # read null-terminated argv[0] from PID 1 - # and see which path to systemd was used (if any) - local init_path - IFS= read -r -d '' init_path < /proc/1/cmdline - if [[ ${init_path} == */bin/systemd ]]; then - ewarn - ewarn "You are using a compatibility symlink to run systemd. The symlink" - ewarn "will be removed in near future. Please update your bootloader" - ewarn "to use:" - ewarn - ewarn " init=/usr/lib/systemd/systemd" - fi } pkg_prerm() { diff --git a/sdk_container/src/third_party/portage-stable/virtual/udev/ChangeLog b/sdk_container/src/third_party/portage-stable/virtual/udev/ChangeLog index cc84f9bfbe..775e76c46d 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/udev/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/virtual/udev/ChangeLog @@ -1,6 +1,42 @@ # ChangeLog for virtual/udev # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/udev/ChangeLog,v 1.39 2013/04/24 19:38:07 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/udev/ChangeLog,v 1.48 2013/08/02 12:40:35 blueness Exp $ + + 02 Aug 2013; Anthony G. Basile udev-206.ebuild: + Bump from eudev-1.2_beta to eudev-1.2 + + 31 Jul 2013; Samuli Suominen -udev-197-r3.ebuild: + old + +*udev-197-r3 (29 Jul 2013) + + 29 Jul 2013; Patrick Lauer +udev-197-r3.ebuild: + QA: Readd udev-197 so that stable amd64 and x86 (and others?) have a + resolvable udev + + 26 Jul 2013; Samuli Suominen -udev-197-r3.ebuild: + old + + 26 Jul 2013; Samuli Suominen udev-200.ebuild: + Stabilize for everyone. + + 24 Jul 2013; Ian Stakenvicius udev-206.ebuild: + adjusted eudev dependency to force keymaps on, so that consistency is held + with sys-fs/udev-206 + +*udev-206 (23 Jul 2013) + + 23 Jul 2013; Samuli Suominen +udev-206.ebuild: + Version bump for the new keyboard hwdb. + +*udev-200 (06 Jul 2013) + + 06 Jul 2013; Samuli Suominen +udev-200.ebuild: + Revision bump for sys-fs/udev users to avoid confusion in which version the + predictable names are enabled by default. + + 05 Jul 2013; Michał Górny udev-197-r3.ebuild: + New systemd does no longer support USE=static-libs. 24 Apr 2013; Samuli Suominen -udev-171.ebuild: old diff --git a/sdk_container/src/third_party/portage-stable/virtual/udev/Manifest b/sdk_container/src/third_party/portage-stable/virtual/udev/Manifest index 69fd0d91cc..9e4a699723 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/udev/Manifest +++ b/sdk_container/src/third_party/portage-stable/virtual/udev/Manifest @@ -1,17 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -EBUILD udev-197-r3.ebuild 956 SHA256 8ce9b68988d65635495761a2983bb7757f96af178b3cb97fbbd4e31b17eaa327 SHA512 05b2c3fc60eaaf308b2fdfbca1db76e6b18f08221129f1865bd8dd1a9c2e12e672c5f8e3b537a506a7154e824c2b7054a1f4a2c132d075a038cc8451a4c90d5c WHIRLPOOL 8732ba3ad3a02375faf8a99db03277b01216858f2b175ba05dafc8cf6d7b3c500d7924641f25c1322236c629c0061ba25d16f26b094020bd5825374ce66c2bbf -MISC ChangeLog 4984 SHA256 ec76e4b7c547cc26169e88204c89daa10eae144646a39af592d6d35a8ad4148e SHA512 28e24fb8f51b82adf315a1c0731d854c42f2e5136cc3982c44837e74dad65e03c86b6d642b975996fb6bbd86b1d4ee1e76c1321fdc3fa9b9f78a5fdbed03640e WHIRLPOOL 9915fce7c1365b30006f93b7fde23899dc3311e6f861fa3b5979e29ee64319d23a2ed7af0ba8edfa4f36b15c1b90dee0e438ce3220d658707841c93c1823a6e3 +EBUILD udev-200.ebuild 935 SHA256 9f8023114f114c95883c2f2630c66af260fff51bdf353a58da22d3eb929de4af SHA512 3e9d4e08f0475c67af7a84a7ca5fad11c2bf49eb866f642cf7d4616eedea7ce5a554661f702dd3ee8b51da65a03f3a49ac02c571171b18a26d3fd36767633d76 WHIRLPOOL a34fcbd09c70a84aeb35c1aca7faa57c3207b27da3aa729e071d04f0cc50b8bb2b5160da970fb594572c1b83eceb72a6488ee84e63e9df9fa0cb882a43f62bff +EBUILD udev-206.ebuild 922 SHA256 50b2ea5d6cc5f98450966249d719e471e77851df88afd6cedf5a54a54fbfca96 SHA512 f9f7034f885a801f85eb769f8fa9296e70b187c9b269d75c9ffad7eec6c5b4b71fde7de7aa8d214a6cd6ef1aeb21d6d54c4b415cc0449071269be52fa802d1de WHIRLPOOL a91bb6825a34fe2cfae9ad9180b7b0d6a4135f23ce9c9bb128c93ce34e0590586e03c4dd6e1beb04a2a68135958572edb31877178bf75df84bf9f8b5a823e863 +MISC ChangeLog 6199 SHA256 a22ce1197702731ab449433d43426f261d9b9990e1890fa71c206c0c07c9e5a1 SHA512 a768f83962fb5611b80909c413e09820061360b41425b9f80bc01c75630ca7a0dba0dc6bec1cdb5f9f5dc618e2cdfd0df16e74c263b476496804e379dc4600a1 WHIRLPOOL 7657db4b85065efbed91771b4cebd1ec01da637e5d22d9b3253375b74b3df2f867cf3319303d94d2952720082d09902dbf6fc367b85de915504dc5a77ac33647 MISC metadata.xml 562 SHA256 59540ad772a815dbed3b67cf86c05777f21c31e76ef5207f126f7e81bf910b1f SHA512 f9e4a16621d794bdcdf75d4ffc4b1f411d75751bfb3ec660c2ec3afd5883695c872f5957ac30c84b41e4614b4994e5b986e6a7052da97ba0e09344e29d2796c0 WHIRLPOOL 8480466f29464021380fcadf1a88ec8325a8eb16253abb593715debd69c1f6dfbbeaa0e7912c469ee89ec85c60d5e4564e529e214a859f25f28e304948107930 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iQEcBAEBCAAGBQJReDRTAAoJEEdUh39IaPFN/YcH/Ay25lNR4nT2RPLsP4KpEe08 -W525O9dfP54rM9JQ9HOBEqFqMp2o7rfJkXz6jdELPFHaq2SM3dI4L/qXUG8EMRU5 -9P37Szx1zMoqLhI24GAn58t9bVx/+c6/TdT+v9AZQIT+R6ER7DSB1QOpqUa3S5up -yghCkeQaISiBFoCmMw9QmMmZnB7voZBY2g5jV1nVwOTwASZjw5QU7rMVZFYrLY7L -V2rqxwKEIRH6I6Ov+VMLTW0TmDo2Uwk/8NlXm5xEOXRkmkVxk3lTr7pGoLeGrkwf -WPADOL1RLsO1GQ2G68QPMvQ0V5fUWtFMVoGDcTSvkz2JBvEA8T6Cu27N7lNohCM= -=hPYb +iQIcBAEBCAAGBQJR+6l8AAoJEJOE+m71LUu6EGIQAIGlCA8/2DLNR8nWpfXbjqzj +1lWSmTXD9aTjL8qs3uBx4Ypshu1rI2+SSYn2lbGInCA4uLoLQlZW14C95C8kXnZd +eeLJre88mDRj95oamOOpDoX1TFilv4ehM+59dCz4lwN6a2EVm8t2DfvsOhI5KSMI +BakXjHpRemDA4M2bC1CEzNzH9M6MMX6ym7zviYsFgcGbpXbWz6Egc7eScgB+KvHi +Ba+ie9O4RKiXO3towYRYrgjq2fdUcKN2bgfNGQzHIlRQBr2n++9wabTYh6+fu42a +XtY2lw+iN6t7A/ntL7YpN0JqY4UDeDvW5Y1Ct/80QDgL66vqd/4ELXJb8h43CWij +lBr2w2ZmE+Vn5b8Ho9S0r7x3ZKJotp1F8CtZww012cquX8tkFjVDSPFl9ThydYE2 +ALLJkMZ11wL65L4+9GE2lH/m9LOiIS4fRS2K3bnHuJ7AccQ7WxjtbDjK2suj7Vlz +TsLK3FfyYqw1Kpxr6kUwgfaB9ntdQILMd9aaydDmTWhl/kjfZK/hGBh3HtyXLdrS +wJgWL8VZvhg4KvLXG8iSBehsyORG8fXLeXtMu6Rzb2sadlELOFPmIwTkXnFIjV12 +NMkqh6Sz7kMcqx5JbLtvYudwfZayLgCEE3U03a7j5wd8OVPvO6UCSkG/362zPzt/ +ba4TXgZzyUg8DoJT3Bhv +=ieLG -----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/virtual/udev/udev-171.ebuild b/sdk_container/src/third_party/portage-stable/virtual/udev/udev-171.ebuild deleted file mode 100644 index 8edf3c1b3f..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/udev/udev-171.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/udev/udev-171.ebuild,v 1.6 2013/01/27 13:06:57 ssuominen Exp $ - -EAPI=2 - -DESCRIPTION="Virtual for udev implementation and number of its features" -HOMEPAGE="" -SRC_URI="" - -LICENSE="" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -# USE flags kmod and static-libs are here dummy in purpose -IUSE="gudev hwdb introspection keymap +kmod selinux static-libs" - -DEPEND="" -RDEPEND="~sys-fs/udev-171[gudev?,hwdb?,introspection?,keymap?,selinux?]" diff --git a/sdk_container/src/third_party/portage-stable/virtual/udev/udev-197-r3.ebuild b/sdk_container/src/third_party/portage-stable/virtual/udev/udev-197-r3.ebuild deleted file mode 100644 index 4614fc49d6..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/udev/udev-197-r3.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/udev/udev-197-r3.ebuild,v 1.1 2013/04/17 11:01:16 mgorny Exp $ - -EAPI=5 - -DESCRIPTION="Virtual to select between sys-fs/udev and sys-fs/eudev" -HOMEPAGE="" -SRC_URI="" - -LICENSE="" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -# These default enabled IUSE flags should follow defaults of sys-fs/udev. -IUSE="gudev hwdb introspection keymap +kmod selinux static-libs" - -DEPEND="" -RDEPEND="|| ( >=sys-fs/udev-197-r8[gudev?,hwdb?,introspection?,keymap?,kmod?,selinux?,static-libs?] - >=sys-apps/systemd-198-r5[gudev?,introspection?,keymap(+)?,kmod?,selinux?,static-libs?] - kmod? ( >=sys-fs/eudev-1_beta2-r2[modutils,gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?] ) - !kmod? ( >=sys-fs/eudev-1_beta2-r2[gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?] ) - )" diff --git a/sdk_container/src/third_party/portage-stable/virtual/udev/udev-197.ebuild b/sdk_container/src/third_party/portage-stable/virtual/udev/udev-197.ebuild deleted file mode 100644 index eea00f3fc8..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/udev/udev-197.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/udev/udev-197.ebuild,v 1.6 2013/01/28 14:42:41 axs Exp $ - -EAPI=2 - -DESCRIPTION="Virtual to select between sys-fs/udev and sys-fs/eudev" -HOMEPAGE="" -SRC_URI="" - -LICENSE="" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86" -# These default enabled IUSE flags should follow defaults of sys-fs/udev. -IUSE="gudev hwdb introspection keymap +kmod selinux static-libs" - -DEPEND="" -RDEPEND="|| ( >=sys-fs/udev-197-r3[gudev?,hwdb?,introspection?,keymap?,kmod?,selinux?,static-libs?] - kmod? ( >=sys-fs/eudev-1_beta1[modutils,gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?] ) - !kmod? ( >=sys-fs/eudev-1_beta1[gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?] ) - )" diff --git a/sdk_container/src/third_party/portage-stable/virtual/udev/udev-200.ebuild b/sdk_container/src/third_party/portage-stable/virtual/udev/udev-200.ebuild new file mode 100644 index 0000000000..ef32d8a792 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/virtual/udev/udev-200.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/virtual/udev/udev-200.ebuild,v 1.2 2013/07/26 14:50:02 ssuominen Exp $ + +EAPI=5 + +DESCRIPTION="Virtual to select between sys-fs/udev and sys-fs/eudev" +HOMEPAGE="" +SRC_URI="" + +LICENSE="" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" +# These default enabled IUSE flags should follow defaults of sys-fs/udev. +IUSE="gudev hwdb introspection keymap +kmod selinux static-libs" + +DEPEND="" +RDEPEND="|| ( >=sys-fs/udev-200[gudev?,hwdb?,introspection?,keymap?,kmod?,selinux?,static-libs?] + >=sys-apps/systemd-200[gudev?,introspection?,keymap(+)?,kmod?,selinux?,static-libs(-)?] + kmod? ( >=sys-fs/eudev-1[modutils,gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?] ) + !kmod? ( >=sys-fs/eudev-1[gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?] ) + )" diff --git a/sdk_container/src/third_party/portage-stable/virtual/udev/udev-206.ebuild b/sdk_container/src/third_party/portage-stable/virtual/udev/udev-206.ebuild new file mode 100644 index 0000000000..2250d9194b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/virtual/udev/udev-206.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/virtual/udev/udev-206.ebuild,v 1.3 2013/08/02 12:40:35 blueness Exp $ + +EAPI=5 + +DESCRIPTION="Virtual to select between sys-fs/udev and sys-fs/eudev" +HOMEPAGE="" +SRC_URI="" + +LICENSE="" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +# These default enabled IUSE flags should follow defaults of sys-fs/udev. +IUSE="gudev hwdb introspection +kmod selinux static-libs" + +DEPEND="" +RDEPEND="|| ( >=sys-fs/udev-206[gudev?,hwdb?,introspection?,kmod?,selinux?,static-libs?] + >=sys-apps/systemd-206[gudev?,introspection?,kmod?,selinux?,static-libs(-)?] + kmod? ( >=sys-fs/eudev-1.2[keymap,modutils,gudev?,hwdb?,introspection?,selinux?,static-libs?] ) + !kmod? ( >=sys-fs/eudev-1.2[keymap,gudev?,hwdb?,introspection?,selinux?,static-libs?] ) + )" From d3b31df9f483d1153580e61e7a5ddb6d16438bec Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 6 Aug 2013 20:10:18 -0400 Subject: [PATCH 2/2] bump(virtual/modutils): sync with upstream --- .../portage-stable/virtual/modutils/ChangeLog | 28 +++++++++++++++++++ .../portage-stable/virtual/modutils/Manifest | 17 +++++++++++ .../virtual/modutils/metadata.xml | 8 ++++++ .../virtual/modutils/modutils-0.ebuild | 8 +++--- 4 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/virtual/modutils/ChangeLog create mode 100644 sdk_container/src/third_party/portage-stable/virtual/modutils/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/virtual/modutils/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/virtual/modutils/ChangeLog b/sdk_container/src/third_party/portage-stable/virtual/modutils/ChangeLog new file mode 100644 index 0000000000..89ce220fc4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/virtual/modutils/ChangeLog @@ -0,0 +1,28 @@ +# ChangeLog for virtual/modutils +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/virtual/modutils/ChangeLog,v 1.6 2013/07/23 11:14:54 ssuominen Exp $ + + 23 Jul 2013; Samuli Suominen modutils-0.ebuild: + Remove sys-apps/module-init-tools from the || ( ). + + 09 May 2012; Mike Frysinger modutils-0.ebuild: + Require kmod provide the tools that the virtual implies #409351 by nzqr. + + 19 Mar 2012; Samuli Suominen modutils-0.ebuild: + Move sys-apps/kmod before sys-apps/module-init-tools in the RDEPEND wrt + #408911 + + 25 Feb 2012; Robin H. Johnson modutils-0.ebuild: + sys-apps/modutils still exists for those on 2.4.x kernels. + + 25 Feb 2012; Robin H. Johnson modutils-0.ebuild: + Per Bug #405687 migration to the virtual, some of the deps were version- + specific to an old version, so lets just upgrade everybody on older module- + init-tools anyway. + +*modutils-0 (03 Feb 2012) + + 03 Feb 2012; William Hubbs +metadata.xml, + +modutils-0.ebuild: + initial import for bug #401899 + diff --git a/sdk_container/src/third_party/portage-stable/virtual/modutils/Manifest b/sdk_container/src/third_party/portage-stable/virtual/modutils/Manifest new file mode 100644 index 0000000000..853742e3c9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/virtual/modutils/Manifest @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +EBUILD modutils-0.ebuild 490 SHA256 8d83f3b55ab76d0d8b3d827ee4f13ae5b668183054617982d255605dbd9c607a SHA512 f1f4106a3da1ed5039ad8388f78365b367c5ab3ab93a0758d30a9410ba06489a561a9c6fa16e5e2b7fdbfc92bd3085cfc1f77a304bf5e7bda4e5f6d94ce82542 WHIRLPOOL 60be8a854933958fc95de86f5271d848ca2d7e1e23431f67113e0f1fa15bbc672436fe76cdfb46ad3996ab7b906f9776bcfc1e9b7596e0f018523f8cb9f76032 +MISC ChangeLog 1168 SHA256 e412d00fd079a766700bc235a8f708c26ecf03f03e368c4c2ecc371442a1ce75 SHA512 1db72def53a8134f79365588c9100e8fef25079bfeb7ee25a1bf3ade89069b047b579961fcff0efb2a38d0ad2008aeac34009dff4f73660bad05055032912c5b WHIRLPOOL a5beb2215a13c623631c0bab98f96afed0b7c34003a058a3b34697f9b6ba7108c539daa0ad529ce8e20567f21a1cd9210b28435bf3281d70b281ea0cdd84c0fa +MISC metadata.xml 232 SHA256 fe5b684c60966f83ac49c4bf66cef1409cd29f5eb6d4584818e78ea9746ace7d SHA512 61c9655c22fdfd53bbe17edc84b1f225ed2f1739deeb134a7e9b0aa3e7798b1490444a59ddf842305042588b280db9864a70ae878dc5219fba4813a7ee2bdcee WHIRLPOOL f9a7bcb29fb2b6bb960b8f9424b6c6e86ea8b443cb042d0fe7630d4b269062a4f4c6176cb78d799bf50d9aacd116dff116ff3b8b025b99b57729ecaa90bbb679 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.20 (GNU/Linux) + +iQEcBAEBCAAGBQJR7mWEAAoJEEdUh39IaPFN4SkIAJC8x4TwlFSS1gBZDfpVjSY8 +hqw71dEnMHkj2Q7BckRuLu+AcioUNm9ZmpA61iTA391qlAPIEE3NAV3Dn9kuuUyi +3WqQrUYLlONkVRQWPswKzMIKH78Yi/ngp4ael2YN5wq6W2Mpjt55gsqjDFDj2cs/ +h+HzQ6BNQVwzghMs5z8BWCCu4hPrPxxyGvMag/IJUlYryk6PYgdbA4NSuh96jJF1 +ZqRJXo/ahYDmdjlIKpXf4tl39qIk6j0GEOtXzJ1YekjVFChs4t59OyDde95Rsv5L +gssBVxCchfpr8ctZx0ue21E//AnY46yK4ZahgMPWXPhbtCcJkzDxW887/JaYYVk= +=j+kz +-----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/virtual/modutils/metadata.xml b/sdk_container/src/third_party/portage-stable/virtual/modutils/metadata.xml new file mode 100644 index 0000000000..14f8165f0c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/virtual/modutils/metadata.xml @@ -0,0 +1,8 @@ + + + + + udev-bugs@gentoo.org + + base-system + diff --git a/sdk_container/src/third_party/portage-stable/virtual/modutils/modutils-0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/modutils/modutils-0.ebuild index b2acf39380..2a709f191e 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/modutils/modutils-0.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/modutils/modutils-0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/modutils/modutils-0.ebuild,v 1.5 2012/05/10 01:43:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/modutils/modutils-0.ebuild,v 1.6 2013/07/23 11:14:54 ssuominen Exp $ -EAPI="2" +EAPI=5 DESCRIPTION="Virtual for utilities to manage Linux kernel modules" HOMEPAGE="" @@ -14,4 +14,4 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" IUSE="" DEPEND="" -RDEPEND="|| ( sys-apps/kmod[tools] >=sys-apps/module-init-tools-3.2 sys-apps/modutils )" +RDEPEND="|| ( sys-apps/kmod[tools] sys-apps/modutils )"