* [gentoo-commits] proj/gentoaster:master commit in: /, res/, configs/
@ 2011-06-15 20:55 Liam McLoughlin
0 siblings, 0 replies; 2+ messages in thread
From: Liam McLoughlin @ 2011-06-15 20:55 UTC (permalink / raw
To: gentoo-commits
commit: 38af0b233d9cb1a28df25a44838b4181ff3d2a18
Author: Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
AuthorDate: Wed Jun 15 20:55:09 2011 +0000
Commit: Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
CommitDate: Wed Jun 15 20:55:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoaster.git;a=commit;h=38af0b23
Added configuration loading support, fixed up the kernel config for framebuffer and EXT2 support (framebuffer/fluxbox not fully tested yet though!)
---
COPYING | 621 ++++++++++++++++++++++++++++++++++++
configs/fluxbox.ini | 17 +
configs/minimal.ini | 17 +
create_image.sh | 155 ++++++----
parse_config.sh | 30 ++
extlinux.conf => res/extlinux.conf | 2 +-
fstab => res/fstab | 0
kernelconfig => res/kernelconfig | 80 +++++-
8 files changed, 856 insertions(+), 66 deletions(-)
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..ea09e37
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,621 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
diff --git a/configs/fluxbox.ini b/configs/fluxbox.ini
new file mode 100644
index 0000000..cdc2e1f
--- /dev/null
+++ b/configs/fluxbox.ini
@@ -0,0 +1,17 @@
+[vmconfig]
+
+BUILD_ID='fluxbox'
+IMAGE_MEGABYTES='8192'
+BOOT_MEGABYTES='64'
+SWAP_MEGABYTES='128'
+TIMEZONE='Europe/London'
+HOSTNAME='gentoo'
+ROOT_PASSWORD='g3nt00'
+DEFAULT_USERNAME='gentoo'
+DEEFAULT_PASSWORD='g3nt00'
+USE_FLAGS='-qt4 kde X dbus gtk gnome xorg udev truetype nls imlib'
+PACKAGE_USE='media-libs/imlib2 X'
+FEATURES='parallel-fetch userfetch userpriv getbinpkg'
+PACKAGE_ACCEPT_KEYWORDS=''
+PACKAGES_LIST='dhcpcd xorg-server fluxbox'
+OUTPUT_FORMAT='raw'
diff --git a/configs/minimal.ini b/configs/minimal.ini
new file mode 100644
index 0000000..48f197f
--- /dev/null
+++ b/configs/minimal.ini
@@ -0,0 +1,17 @@
+[vmconfig]
+
+BUILD_ID='minimal'
+IMAGE_MEGABYTES='3072'
+BOOT_MEGABYTES='64'
+SWAP_MEGABYTES='128'
+TIMEZONE='Europe/London'
+HOSTNAME='gentoo'
+ROOT_PASSWORD='g3nt00'
+DEFAULT_USERNAME='gentoo'
+DEEFAULT_PASSWORD='g3nt00'
+USE_FLAGS=''
+PACKAGE_USE=''
+FEATURES='parallel-fetch userfetch userpriv getbinpkg'
+PACKAGE_ACCEPT_KEYWORDS=''
+PACKAGES_LIST='dhcpcd'
+OUTPUT_FORMAT='raw'
diff --git a/create_image.sh b/create_image.sh
index d3025db..ad271a2 100755
--- a/create_image.sh
+++ b/create_image.sh
@@ -1,24 +1,31 @@
#!/bin/bash
-echo $0
-IMAGE_BASENAME="${1}"
-IMAGE_NAME="${IMAGE_BASENAME}.image"
-IMAGE_OUT="${IMAGE_BASENAME}.vdi"
-IMAGE_MEGABYTES="${2}"
-BOOT_MEGABYTES=64
-SWAP_MEGABYTES=128
+# Gentoaster VM build tool
+# Licensed under GPL v3, see COPYING file
+# Usage: ./create_image.sh <configuration file path>
+# Prerequisites: extlinux, qemu-img, sfdisk
+
+# Parse the configuration we took as an arg
+source parse_config.sh $1
+
+# Generate a few helper variables using the configuration file
+
+IMAGE_NAME="${BUILD_ID}.image"
ROOT_MEGABYTES=$(( ${IMAGE_MEGABYTES} - ( ${BOOT_MEGABYTES} + ${SWAP_MEGABYTES} + 1 ) ))
IMAGE_BYTES=$(( ${IMAGE_MEGABYTES} * 1024 * 1024 ))
-TIMEZONE="Europe/London"
-HOSTNAME="gentoo"
-ROOT_PASSWORD="g3nt00"
-DEFAULT_USERNAME="gentoo"
-DEFAULT_PASSWORD="g3nt00"
-USE_FLAGS="-qt4 -kde X dbus gtk gnome hal gdu extras device-mapper policykit static-libs"
-LOG_FILE="`pwd`/log.txt"
+IMAGES_OUTPUT_PATH=`pwd`
+IMAGE_WORK_PATH="/root/gentoo/${BUILD_ID}"
+LOG_FILE="${IMAGE_WORK_PATH}/log.txt"
+TOOL_RES_PATH=`pwd`/res
+CPU_CORES=`grep -c processor /proc/cpuinfo`
STAGE3_URL="http://distfiles.gentoo.org/releases/x86/current-stage3/stage3-i486-20110607.tar.bz2"
PORTAGE_URL="http://distfiles.gentoo.org/snapshots/portage-latest.tar.bz2"
+BINHOST_URL="http://tinderbox.dev.gentoo.org/default-linux/x86"
+
+echo "Creating build working directory"
+mkdir -p ${IMAGE_WORK_PATH}
+cd ${IMAGE_WORK_PATH}
echo "Starting log at ${LOG_FILE}..."
echo "" > ${LOG_FILE}
@@ -32,14 +39,13 @@ qemu-img create -f raw ${IMAGE_NAME} ${REAL_IMAGE_BYTES} &>> ${LOG_FILE}
# Clean up old mounts
cleanup_mounts() {
-echo "Cleaning up old mounts"
-umount -d rootfs/dev/pts &>> ${LOG_FILE}
-umount -d rootfs/dev/shm &>> ${LOG_FILE}
-umount -d rootfs/dev &>> ${LOG_FILE}
-umount -d rootfs/proc &>> ${LOG_FILE}
-umount -d rootfs/boot &>> ${LOG_FILE}
-umount -d rootfs &>> ${LOG_FILE}
-losetup -d ${LOOP_DEV_ROOT}
+ echo "Cleaning up old mounts"
+ umount -d rootfs/dev/pts &>> ${LOG_FILE}
+ umount -d rootfs/dev/shm &>> ${LOG_FILE}
+ umount -d rootfs/dev &>> ${LOG_FILE}
+ umount -d rootfs/proc &>> ${LOG_FILE}
+ umount -d rootfs/boot &>> ${LOG_FILE}
+ umount -d rootfs &>> ${LOG_FILE}
}
cleanup_mounts
@@ -47,7 +53,7 @@ cleanup_mounts
echo "Writing partition table"
echo -e "\x55\xaa" | dd bs=1 count=2 seek=510 of=${IMAGE_NAME} conv=notrunc &>> ${LOG_FILE}
LOOP_DEV_IMAGE=`losetup -f`
-losetup ${LOOP_DEV_IMAGE} ${IMAGE_NAME} &>> ${LOG_FILE}
+losetup --sizelimit ${REAL_IMAGE_BYTES} ${LOOP_DEV_IMAGE} ${IMAGE_NAME} &>> ${LOG_FILE}
sfdisk ${LOOP_DEV_IMAGE} -H64 -S32 &>> ${LOG_FILE} << EOF
1,${BOOT_MEGABYTES},83,*
@@ -80,34 +86,32 @@ losetup -d ${LOOP_DEV_SWAP}
echo "Mounting fileystems"
-echo "Mount root"
mkdir -p rootfs
mount -o loop,offset=$(( ( 512 * 2048 ) + ( ${BOOT_MEGABYTES} * 1024 * 1024 ) + ( ${SWAP_MEGABYTES} * 1024 * 1024 ) )) ${IMAGE_NAME} rootfs
-echo "Mount boot"
mkdir -p rootfs/boot
mount -o loop,offset=$(( 512 * 2048 )) ${IMAGE_NAME} rootfs/boot
cd rootfs
# Setup Gentoo
-if [ ! -f ../stage3.tar.bz2 ];
+if [ ! -f ${TOOL_RES_PATH}/stage3.tar.bz2 ];
then
echo "Downloading Stage 3"
- wget ${STAGE3_URL} -O ../stage3.tar.bz2 &>> ${LOG_FILE}
+ wget ${STAGE3_URL} -O ${TOOL_RES_PATH}/stage3.tar.bz2 &>> ${LOG_FILE}
fi
echo "Extracting Stage 3"
-tar jvxf ../stage3.tar.bz2 &>> ${LOG_FILE}
+tar jxf ${TOOL_RES_PATH}/stage3.tar.bz2 &>> ${LOG_FILE}
-if [ ! -f ../portage-latest.tar.bz2 ];
+if [ ! -f ${TOOL_RES_PATH}/portage-latest.tar.bz2 ];
then
echo "Downloading Portage snapshot"
- wget ${PORTAGE_URL} -O ../portage-latest.tar.bz2 &>> ${LOG_FILE}
+ wget ${PORTAGE_URL} -O ${TOOL_RES_PATH}/portage-latest.tar.bz2 &>> ${LOG_FILE}
fi
echo "Extracting Portage snapshot"
cd usr
-tar jvxf ../../portage-latest.tar.bz2 &>> ${LOG_FILE}
+tar jxf ${TOOL_RES_PATH}/portage-latest.tar.bz2 &>> ${LOG_FILE}
echo "Setting up chroot"
cd ..
@@ -115,16 +119,24 @@ mount -t proc /proc proc
mount --rbind /dev dev
cp -L /etc/resolv.conf etc/resolv.conf
-echo "Setting up BINHOST"
-echo 'PORTAGE_BINHOST="http://tinderbox.dev.gentoo.org/default-linux/x86"' >> etc/make.conf
-echo 'PKGDIR="/usr/portage/packages"' >> etc/make.conf
-echo 'FEATURES="parallel-fetch userfetch userpriv getbinpkg"' >> etc/make.conf
-mkdir -p usr/portage/packages
-
echo "Setting up make.conf"
+mkdir -p usr/portage/packages
+echo 'PORTAGE_BINHOST="${BINHOST_URL}"' >> etc/make.conf
+echo 'PKGDIR="/usr/portage/packages"' >> etc/make.conf
+echo 'FEATURES="${FEATURES}"' >> etc/make.conf
echo 'USE="${USE_FLAGS}"' >> etc/make.conf
-#echo 'INPUT_DEVICES="virtualbox evdev"' >> etc/make.conf
-#echo 'VIDEO_CARDS="virtualbox"' >> etc/make.conf
+if [[ ${OUTPUT_FORMAT} = "vbox" ]]
+then
+ echo 'INPUT_DEVICES="virtualbox evdev"' >> etc/make.conf
+ echo 'VIDEO_CARDS="virtualbox"' >> etc/make.conf
+fi
+
+echo "Setting up package.use"
+mkdir -p etc/portage
+echo ${PACKAGE_USE} >> etc/portage/package.use
+
+echo "Setting up package.accept_keywords"
+echo ${PACKAGE_ACCEPT_KEYWORDS} >> etc/portage/package.accept_keywords
echo "Entering chroot"
linux32 chroot . env-update &>> ${LOG_FILE}
@@ -137,19 +149,23 @@ linux32 chroot . cp /usr/share/zoneinfo/${TIMEZONE} /etc/localtime &>> ${LOG_FIL
echo "Setting hostname to ${HOSTNAME}"
linux32 chroot . /bin/bash -c "echo 127.0.0.1 ${HOSTNAME}.local ${HOSTNAME} localhost > /etc/hosts" &>> ${LOG_FILE}
-linux32 chroot . bin/hostname ${HOSTNAME} &>> ${LOG_FILE}
echo "Copying new fstab"
-cp ../fstab etc/fstab &>> ${LOG_FILE}
+cp ${TOOL_RES_PATH}/fstab etc/fstab &>> ${LOG_FILE}
+
+echo "Setting up networking"
+echo 'config_eth0=( "dhcp" )' > etc/conf.d/net
+ln -s etc/init.d/net.lo etc/init.d/net.eth0
+linux32 chroot . rc-update add net.eth0 default
echo "Downloading/installing kernel sources"
linux32 chroot . emerge gentoo-sources &>> ${LOG_FILE}
echo "Copying kernel configuration"
-cp ../kernelconfig usr/src/linux/.config
+cp ${TOOL_RES_PATH}/kernelconfig usr/src/linux/.config
echo "Building kernel"
-linux32 chroot . make -C /usr/src/linux -j8 &>> ${LOG_FILE}
+linux32 chroot . make -C /usr/src/linux -j$(( ${CPU_CORES}+1 )) &>> ${LOG_FILE}
echo "Installing kernel"
linux32 chroot . make -C /usr/src/linux modules_install &>> ${LOG_FILE}
@@ -158,32 +174,51 @@ linux32 chroot . cp /usr/src/linux/arch/i386/boot/bzImage /boot/kernel &>> ${LOG
echo "Setting root password"
linux32 chroot . /bin/bash -c "echo 'root:${ROOT_PASSWORD}' | chpasswd" &>> ${LOG_FILE}
-echo "Installing dhcpcd"
-linux32 chroot . emerge dhcpcd &>> ${LOG_FILE}
-
-#echo "Installing Perl"
-#linux32 chroot . emerge perl &>> ${LOG_FILE}
-#linux32 chroot . perl-cleaner --all &>> ${LOG_FILE}
-
-#echo "Installing GNOME"
-#linux32 chroot . emerge gnome &>> ${LOG_FILE}
+echo "Installing packages list"
+linux32 chroot . emerge ${PACKAGES_LIST} &>> ${LOG_FILE}
echo "Adding default user"
linux32 chroot . useradd -g users -G lp,wheel,audio,cdrom,portage -m ${DEFAULT_USERNAME}
linux32 chroot . /bin/bash -c "echo '${DEFAULT_USERNAME}:${DEFAULT_PASSWORD}' | chpasswd" &>> ${LOG_FILE}
-#echo "Installing VirtualBox additions/drivers"
-#linux32 chroot . emerge xf86-video-virtualbox xf86-input-virtualbox virtualbox-guest-additions &>> ${LOG_FILE}
-#linux32 chroot . rc-update add virtualbox-guest-additions default &>> ${LOG_FILE}
-#linux32 chroot . mv /etc/X11/xorg.conf /etc/X11/xorg.conf.bak &>> ${LOG_FILE}
-#linux32 chroot . usermod -a vboxguest ${DEFAULT_USERNAME}
+if [[ ${OUTPUT_FORMAT} = "vbox" ]]
+then
+ echo "Installing VirtualBox additions/drivers"
+ linux32 chroot . emerge xf86-video-virtualbox xf86-input-virtualbox virtualbox-guest-additions &>> ${LOG_FILE}
+ linux32 chroot . rc-update add virtualbox-guest-additions default &>> ${LOG_FILE}
+ linux32 chroot . mv /etc/X11/xorg.conf /etc/X11/xorg.conf.bak &>> ${LOG_FILE}
+ linux32 chroot . usermod -a vboxguest ${DEFAULT_USERNAME}
+fi
echo "Installing extlinux"
extlinux --heads 255 --sectors 63 --install boot
dd if=/usr/lib/extlinux/mbr.bin of=../${IMAGE_NAME} conv=notrunc
-cp ../extlinux.conf boot/
+cp ${TOOL_RES_PATH}/extlinux.conf boot/
cd ..
cleanup_mounts
-#echo "Converting image from RAW to VDI"
-#VBoxManage convertfromraw -format VDI ${IMAGE_NAME} ${IMAGE_OUT}
+case "${OUTPUT_FORMAT}" in
+ "raw" )
+ echo "Already in raw format, not converting"
+ IMAGE_OUT="${IMAGE_NAME}.image"
+ ;;
+ "vbox" )
+ echo "Converting image from RAW to VDI"
+ qemu-img convert -O vdi ${IMAGE_NAME} ${BUILD_ID}.vdi
+ rm -rf ${IMAGE_NAME}
+ IMAGE_OUT="${IMAGE_NAME}.vdi"
+ ;;
+ "vmware" )
+ echo "Converting image from RAW to VMDK"
+ qemu-img convert -O vmdk ${IMAGE_NAME} ${BUILD_ID}.vmdk
+ rm -rf ${IMAGE_NAME}
+ IMAGE_OUT="${IMAGE_NAME}.vmdk"
+ ;;
+esac
+mv ${IMAGE_OUT} ${IMAGES_OUTPUT_PATH}/${IMAGE_OUT}
+mv ${LOG_FILE} ${IMAGES_OUTPUT_PATH}/${BUILD_ID}.log
+rm -rf ${IMAGE_WORK_PATH}
+
+echo "Image build completed!"
+echo "Your image is here: ${IMAGES_OUTPUT_PATH}/${IMAGE_OUT}"
+echo "Your log file is here: ${IMAGES_OUTPUT_PATH}/${BUILD_ID}.log"
diff --git a/parse_config.sh b/parse_config.sh
new file mode 100755
index 0000000..24aba14
--- /dev/null
+++ b/parse_config.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Bash INI file parser
+# Credit to ajdiaz
+# http://ajdiaz.wordpress.com/2008/02/09/bash-ini-parser/
+cfg_parser ()
+{
+ ini="$(<$1)" # read the file
+ ini="${ini//[/\[}" # escape [
+ ini="${ini//]/\]}" # escape ]
+ IFS=$'\n' && ini=( ${ini} ) # convert to line-array
+ ini=( ${ini[*]//;*/} ) # remove comments with ;
+ ini=( ${ini[*]/\ =/=} ) # remove tabs before =
+ ini=( ${ini[*]/=\ /=} ) # remove tabs be =
+ ini=( ${ini[*]/\ =\ /=} ) # remove anything with a space around =
+ ini=( ${ini[*]/#\\[/\}$'\n'cfg.section.} ) # set section prefix
+ ini=( ${ini[*]/%\\]/ \(} ) # convert text2function (1)
+ ini=( ${ini[*]/=/=\( } ) # convert item to array
+ ini=( ${ini[*]/%/ \)} ) # close array parenthesis
+ ini=( ${ini[*]/%\\ \)/ \\} ) # the multiline trick
+ ini=( ${ini[*]/%\( \)/\(\) \{} ) # convert text2function (2)
+ ini=( ${ini[*]/%\} \)/\}} ) # remove extra parenthesis
+ ini[0]="" # remove first element
+ ini[${#ini[*]} + 1]='}' # add the last brace
+ eval "$(echo "${ini[*]}")" # eval the result
+}
+
+
+cfg_parser $1
+cfg.section.vmconfig
diff --git a/extlinux.conf b/res/extlinux.conf
similarity index 75%
rename from extlinux.conf
rename to res/extlinux.conf
index 663af96..7eee5bb 100644
--- a/extlinux.conf
+++ b/res/extlinux.conf
@@ -2,5 +2,5 @@ default Gentoo
timeout 10
label Gentoo
- kernel /boot/kernel
+ kernel kernel
append root=/dev/sda3 ro
diff --git a/fstab b/res/fstab
similarity index 100%
rename from fstab
rename to res/fstab
diff --git a/kernelconfig b/res/kernelconfig
similarity index 97%
rename from kernelconfig
rename to res/kernelconfig
index 65e1fdf..e5b99c9 100644
--- a/kernelconfig
+++ b/res/kernelconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/i386 2.6.38-gentoo-r6 Kernel Configuration
-# Tue Jun 14 22:24:43 2011
+# Wed Jun 15 21:42:43 2011
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -842,7 +842,8 @@ CONFIG_RFKILL_INPUT=y
# Generic Driver Options
#
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_DEVTMPFS is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
@@ -1160,7 +1161,7 @@ CONFIG_E100=y
# CONFIG_FEALNX is not set
# CONFIG_NATSEMI is not set
CONFIG_NE2K_PCI=y
-# CONFIG_8139CP is not set
+CONFIG_8139CP=y
CONFIG_8139TOO=y
# CONFIG_8139TOO_PIO is not set
# CONFIG_8139TOO_TUNE_TWISTER is not set
@@ -1805,7 +1806,69 @@ CONFIG_DRM=y
# CONFIG_STUB_POULSBO is not set
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_FB is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_WMT_GE_ROPS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_UVESA is not set
+CONFIG_FB_VESA=y
+# CONFIG_FB_EFI is not set
+# CONFIG_FB_N411 is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I810 is not set
+# CONFIG_FB_LE80578 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_VIA is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_GEODE is not set
+# CONFIG_FB_UDL is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_LCD_CLASS_DEVICE is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -1827,6 +1890,11 @@ CONFIG_VGA_CONSOLE=y
CONFIG_VGACON_SOFT_SCROLLBACK=y
CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
CONFIG_DUMMY_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
CONFIG_SOUND=y
CONFIG_SOUND_OSS_CORE=y
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
@@ -2284,7 +2352,9 @@ CONFIG_DMIID=y
#
# File systems
#
-# CONFIG_EXT2_FS is not set
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
CONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
CONFIG_EXT3_FS_XATTR=y
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gentoaster:master commit in: /, res/, configs/
@ 2011-08-12 23:17 Liam McLoughlin
0 siblings, 0 replies; 2+ messages in thread
From: Liam McLoughlin @ 2011-08-12 23:17 UTC (permalink / raw
To: gentoo-commits
commit: 39197c305474df0332f150388a404f698d24b685
Author: Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
AuthorDate: Tue Aug 2 16:48:28 2011 +0000
Commit: Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
CommitDate: Tue Aug 2 17:09:15 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoaster.git;a=commit;h=39197c30
Keyboard layout support for build tool, Stage3/Portage/BINHOST override from config files
---
configs/fluxbox.ini | 1 +
configs/minimal.ini | 1 +
configs/xfce.ini | 1 +
create_image.sh | 38 +++++++----
daemon.php | 2 +-
res/keyboard.lst | 184 +++++++++++++++++++++++++-------------------------
6 files changed, 121 insertions(+), 106 deletions(-)
diff --git a/configs/fluxbox.ini b/configs/fluxbox.ini
index f199237..409ec8b 100644
--- a/configs/fluxbox.ini
+++ b/configs/fluxbox.ini
@@ -5,6 +5,7 @@ BOOT_MEGABYTES='64'
SWAP_MEGABYTES='128'
ROOT_MEGABYTES='7999'
TIMEZONE='Europe/London'
+KEYBOARD='gb'
HOSTNAME='gentoo'
ROOT_PASSWORD='g3nt00'
DEFAULT_USERNAME='gentoo'
diff --git a/configs/minimal.ini b/configs/minimal.ini
index 0d7eed6..f841cc2 100644
--- a/configs/minimal.ini
+++ b/configs/minimal.ini
@@ -5,6 +5,7 @@ BOOT_MEGABYTES='64'
SWAP_MEGABYTES='128'
ROOT_MEGABYTES='3903'
TIMEZONE='Europe/London'
+KEYBOARD='gb'
HOSTNAME='gentoo'
ROOT_PASSWORD='g3nt00'
DEFAULT_USERNAME='gentoo'
diff --git a/configs/xfce.ini b/configs/xfce.ini
index 6c249ee..60ce144 100644
--- a/configs/xfce.ini
+++ b/configs/xfce.ini
@@ -5,6 +5,7 @@ BOOT_MEGABYTES='64'
SWAP_MEGABYTES='128'
ROOT_MEGABYTES='16190'
TIMEZONE='Europe/London'
+KEYBOARD='gb'
HOSTNAME='gentoo'
ROOT_PASSWORD='g3nt00'
DEFAULT_USERNAME='gentoo'
diff --git a/create_image.sh b/create_image.sh
index 2da2d6f..3858dac 100755
--- a/create_image.sh
+++ b/create_image.sh
@@ -52,11 +52,20 @@ LOG_FILE="${IMAGE_WORK_PATH}/log.txt"
TOOL_RES_PATH=${RUNNING_DIRECTORY}/res
NUM_JOBS=$(( `grep -c processor /proc/cpuinfo`+1 ))
-STAGE3_URL="http://distribution.hexxeh.net/gentoo/stage3-i686-latest.tar.bz2"
-PORTAGE_URL="http://distribution.hexxeh.net/gentoo/portage-latest.tar.bz2"
-BINHOST_URL="http://tinderbox.dev.gentoo.org/default-linux/x86"
EMERGE_PROXY="${FLAGS_proxy}"
+if [ -z ${STAGE3_URL} ]; then
+ STAGE3_URL="http://distribution.hexxeh.net/gentoo/stage3-i686-latest.tar.bz2"
+fi
+
+if [ -z ${PORTAGE_URL} ]; then
+ PORTAGE_URL="http://distribution.hexxeh.net/gentoo/portage-latest.tar.bz2"
+fi
+
+if [ -z ${BINHOST_URL} ]; then
+ BINHOST_URL="http://tinderbox.dev.gentoo.org/default-linux/x86"
+fi
+
# Clean up old mounts
cleanup_mounts() {
sleep 2
@@ -191,19 +200,22 @@ linux32 chroot . /bin/bash /etc/profile &>> ${LOG_FILE}
echo "Step 13: Setting timezone to ${TIMEZONE}"
linux32 chroot . cp /usr/share/zoneinfo/${TIMEZONE} /etc/localtime &>> ${LOG_FILE}
-echo "Step 14: Setting hostname to ${HOSTNAME}"
+echo "Step 14: Setting keyboard layout to ${KEYBOARD}"
+linux32 chroot . sed -i -e "s/keymap=.*/keymap=\"${KEYBOARD}\"/" /etc/conf.d/keymaps &>> ${LOG_FILE}
+
+echo "Step 15: Setting hostname to ${HOSTNAME}"
linux32 chroot . /bin/bash -c "echo hostname='${HOSTNAME}' > /etc/conf.d/hostname" &>> ${LOG_FILE}
linux32 chroot . /bin/bash -c "echo 127.0.0.1 ${HOSTNAME}.local ${HOSTNAME} localhost > /etc/hosts" &>> ${LOG_FILE}
-echo "Step 15: Copying new fstab"
+echo "Step 16: Copying new fstab"
cp ${TOOL_RES_PATH}/fstab etc/fstab &>> ${LOG_FILE}
-echo "Step 16: Setting up networking"
+echo "Step 17: Setting up networking"
echo 'config_eth0=( "dhcp" )' > etc/conf.d/net
cp etc/init.d/net.lo etc/init.d/net.eth0
linux32 chroot . rc-update add net.eth0 default &>> ${LOG_FILE}
-echo "Step 17: Setting up kernel"
+echo "Step 18: Setting up kernel"
# If we got the flag, used a cached kernel to reduce build times for testing
if [[ ${FLAGS_cachedkernel} -eq ${FLAGS_TRUE} ]]; then
echo "Using cached kernel" &>> ${LOG_FILE}
@@ -227,16 +239,16 @@ else
cp usr/src/linux/arch/i386/boot/bzImage boot/kernel &>> ${LOG_FILE} || handle_error "Error copying kernel"
fi
-echo "Step 18: Setting root password"
+echo "Step 19: Setting root password"
linux32 chroot . /bin/bash -c "echo 'root:${ROOT_PASSWORD}' | chpasswd" &>> ${LOG_FILE} || handle_error "Error setting root password"
-echo "Step 19: Processing packages list"
+echo "Step 20: Processing packages list"
for PACKAGE in ${PACKAGES_LIST}; do
echo "Installing ${PACKAGE}" &>> ${LOG_FILE}
linux32 chroot . emerge --jobs=${NUM_JOBS} ${PACKAGE} &>> ${LOG_FILE} || handle_error "Error emerging ${PACKAGE}"
done
-echo "Step 20: Adding default user"
+echo "Step 21: Adding default user"
linux32 chroot . useradd -g users -G lp,wheel,audio,cdrom,portage -m ${DEFAULT_USERNAME} || handle_error "Error adding default user"
linux32 chroot . /bin/bash -c "echo '${DEFAULT_USERNAME}:${DEFAULT_PASSWORD}' | chpasswd" &>> ${LOG_FILE} || handle_error "Error setting default user password"
@@ -249,13 +261,13 @@ then
linux32 chroot . usermod -a vboxguest ${DEFAULT_USERNAME}
fi
-echo "Step 21: Cleaning up make.conf"
+echo "Step 22: Cleaning up make.conf"
if [ -n ${EMERGE_PROXY} ]; then
sed -i '/http_proxy/ d' etc/make.conf
fi
sed -i '/MAKEOPTS/ d' etc/make.conf
-echo "Step 22: Installing extlinux"
+echo "Step 23: Installing extlinux"
extlinux --heads 255 --sectors 63 --install boot &>> ${LOG_FILE} || handle_error "Error installing extlinux"
dd if=/usr/lib/extlinux/mbr.bin of=../${IMAGE_NAME} conv=notrunc &>> ${LOG_FILE} || handle_error "Error copying extlinux MBR"
cp ${TOOL_RES_PATH}/extlinux.conf boot/ || handle_error "Error copying extlinux configuration"
@@ -291,6 +303,6 @@ if [[ ${FLAGS_compress} -eq ${FLAGS_TRUE} ]]; then
IMAGE_OUT="${BUILD_ID}.tar.gz"
fi
-echo "Step 23: Image build completed!"
+echo "Step 24: Image build completed!"
echo "Your image is here: ${IMAGES_OUTPUT_PATH}/${IMAGE_OUT}"
echo "Your log file is here: ${IMAGES_OUTPUT_PATH}/${BUILD_ID}.log"
diff --git a/daemon.php b/daemon.php
index 6704053..65d7d2b 100644
--- a/daemon.php
+++ b/daemon.php
@@ -53,7 +53,7 @@
function image_build($job)
{
- $progressMagic = 23;
+ $progressMagic = 24;
$handle = $job->handle();
$handlehash = md5($handle);
diff --git a/res/keyboard.lst b/res/keyboard.lst
index 61ed3b2..076ae13 100644
--- a/res/keyboard.lst
+++ b/res/keyboard.lst
@@ -1,92 +1,92 @@
- us United States
- ad Andorra
- af Afghanistan
- ara Arabic
- al Albania
- am Armenia
- at Austria
- az Azerbaijan
- by Belarus
- be Belgium
- bd Bangladesh
- in India
- ba Bosnia and Herzegovina
- br Brazil
- bg Bulgaria
- ma Morocco
- mm Myanmar
- ca Canada
- cd Congo, Democratic Republic of the
- cn China
- hr Croatia
- cz Czechia
- dk Denmark
- nl Netherlands
- bt Bhutan
- ee Estonia
- ir Iran
- iq Iraq
- fo Faroe Islands
- fi Finland
- fr France
- gh Ghana
- gn Guinea
- ge Georgia
- de Germany
- gr Greece
- hu Hungary
- is Iceland
- il Israel
- it Italy
- jp Japan
- kg Kyrgyzstan
- kh Cambodia
- kz Kazakhstan
- la Laos
- latam Latin American
- lt Lithuania
- lv Latvia
- mao Maori
- me Montenegro
- mk Macedonia
- mt Malta
- mn Mongolia
- no Norway
- pl Poland
- pt Portugal
- ro Romania
- ru Russia
- rs Serbia
- si Slovenia
- sk Slovakia
- es Spain
- se Sweden
- ch Switzerland
- sy Syria
- tj Tajikistan
- lk Sri Lanka
- th Thailand
- tr Turkey
- tw Taiwan
- ua Ukraine
- gb United Kingdom
- uz Uzbekistan
- vn Vietnam
- kr Korea, Republic of
- nec_vndr/jp Japan (PC-98xx Series)
- ie Ireland
- pk Pakistan
- mv Maldives
- za South Africa
- epo Esperanto
- np Nepal
- ng Nigeria
- et Ethiopia
- sn Senegal
- brai Braille
- tm Turkmenistan
- ml Mali
- tz Tanzania
- ke Kenya
- bw Botswana
- ph Philippines
+us United States
+ad Andorra
+af Afghanistan
+ara Arabic
+al Albania
+am Armenia
+at Austria
+az Azerbaijan
+by Belarus
+be Belgium
+bd Bangladesh
+in India
+ba Bosnia and Herzegovina
+br Brazil
+bg Bulgaria
+ma Morocco
+mm Myanmar
+ca Canada
+cd Congo, Democratic Republic of the
+cn China
+hr Croatia
+cz Czechia
+dk Denmark
+nl Netherlands
+bt Bhutan
+ee Estonia
+ir Iran
+iq Iraq
+fo Faroe Islands
+fi Finland
+fr France
+gh Ghana
+gn Guinea
+ge Georgia
+de Germany
+gr Greece
+hu Hungary
+is Iceland
+il Israel
+it Italy
+jp Japan
+kg Kyrgyzstan
+kh Cambodia
+kz Kazakhstan
+la Laos
+latam Latin American
+lt Lithuania
+lv Latvia
+mao Maori
+me Montenegro
+mk Macedonia
+mt Malta
+mn Mongolia
+no Norway
+pl Poland
+pt Portugal
+ro Romania
+ru Russia
+rs Serbia
+si Slovenia
+sk Slovakia
+es Spain
+se Sweden
+ch Switzerland
+sy Syria
+tj Tajikistan
+lk Sri Lanka
+th Thailand
+tr Turkey
+tw Taiwan
+ua Ukraine
+gb United Kingdom
+uz Uzbekistan
+vn Vietnam
+kr Korea, Republic of
+nec_vndr/jp Japan (PC-98xx Series)
+ie Ireland
+pk Pakistan
+mv Maldives
+za South Africa
+epo Esperanto
+np Nepal
+ng Nigeria
+et Ethiopia
+sn Senegal
+brai Braille
+tm Turkmenistan
+ml Mali
+tz Tanzania
+ke Kenya
+bw Botswana
+ph Philippines
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-12 23:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-15 20:55 [gentoo-commits] proj/gentoaster:master commit in: /, res/, configs/ Liam McLoughlin
-- strict thread matches above, loose matches on Subject: below --
2011-08-12 23:17 Liam McLoughlin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox