summaryrefslogtreecommitdiffstats
path: root/functions
AgeCommit message (Collapse)AuthorFilesLines
2011-07-01avoid touching the linker directlyDave Reisner1-7/+3
Much to my chagrin, we're going back to using ldd directly, as it's otherwise too difficult to account for odd setups, such as idiots wanting to create multilib initramfs images, or more commonly -- a 64 bit kernel on a 32 bit userland. Fortunately, we don't suffer too large a regression in speed compared to the previous implementation. Signed-off-by: Dave Reisner <dreisner@archlinux.org>
2011-07-01functions: reduce calls to modinfoDave Reisner1-27/+24
Cut back to a single call to modinfo, instead of 3, which yields roughly a 30% decrease in execution time for a single run of add_module. This of course varies by module but it's an overall win. Suggested-by: Dan McGee <dan@archlinux.org> Signed-off-by: Dave Reisner <dreisner@archlinux.org>
2011-06-30function: return with 0 if we reach the end of add_binaryDave Reisner1-0/+2
The read loop will intentionally return 1 on EOF, but parse_hook will interpret this as an error, and trip our error handler, reporting a false positive failure.
2011-06-27functions: fix pathing issue with $BASEDIRDave Reisner1-3/+3
Thanks-to: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> Signed-off-by: Dave Reisner <dreisner@archlinux.org>
2011-06-27functions: s/basedir/BASEDIR/Dave Reisner1-2/+2
Thanks-to: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> Signed-off-by: Dave Reisner <dreisner@archlinux.org>
2011-06-27functions: add missing 'command' before installDave Reisner1-1/+1
Without this, we hit an infinte loop and crash when a legacy 'install' function in a hook is encountered. Thanks-to: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> Signed-off-by: Dave Reisner <dreisner@archlinux.org>
2011-06-26functions: support $BASEDIR in modprobeDave Reisner1-1/+1
Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-25properly support $BASEDIRDave Reisner1-50/+89
This add proper support for a $BASEDIR, wherein as much as possible is taken from the user specified root, instead of mixing and matching binaries and modules. This avoids conflicts, particularly with binaries like udev or module-init-tools which may have newer functionality that the root in the $BASEDIR requires. This is somewhat of a large patch, which involves a few key changes: 1) Add a new class of "private" functions: _add_*, which act as a "back end" for the equivalent non-underscore-prefixed functions. 2) Refactor the add_* family of functions to use these new back end functions. This generally simplifies the logic as we have a clear division of labor. 3) Instead of using ldd, which is a glorified wrapper around the RTLD, create a wrapper around the RTLD and invoke it ourselves. This is basically just a small performance improvement -- the bulk of the parsing done by this function's output is done in pure bash. Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-25mkinitcpio: catch errors in parse_hookDave Reisner1-1/+1
It would be better to catch errors in build as well, but this isn't entirely feasible due to the expectation of some builtins to return non-zero during normal operations (e.g., read returns 1 on EOF). Addresses FS#20661 Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-25functions: remove get_module_nameDave Reisner1-8/+0
This is no longer used, as all of our module discovery functions will return clean module names. Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-19add -t option to specify alternate build directoryDave Reisner1-5/+5
This requires some refactoring of how we handle TMPDIR declaration and creation, as well as protecting the way we do cleanup so that we don't error out when cleanup is called prior to TMPDIR being declared. We also add a shortcut to the build root based on the TMPDIR for convenience. Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-19mkinitcpio: bashification, part 1/2Dave Reisner1-3/+3
Always use bash's [[ ]], and apply (( )) where arithmetic calculations are made. We also take a few other bash shortcuts to simplify code where possible. We also touch the Makefile here to adjust the sed'ing for directory names. Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-19functions: simplify parse_hookDave Reisner1-16/+9
Since we intentionally word split these variables, a variable containing only white space will never trigger us to iterate on each for loop. Therefore, the existance check is superfluous as it will always pass. Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-19functions: refactor add_symlinkDave Reisner1-11/+6
We don't need to add the destination directory -- we can assume this will always be added by another function. We also ignore $BASEDIR as we will never be passing in a path that contains a $BASEDIR so we don't want to erroenous trim a path. Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-19overhaul output, introducing colorDave Reisner1-16/+39
Output style and coloring is borrowed from makepkg with minor adjustments. Most instances where we encounter fatal errors are replaced with a 'die' function to wrap this up neatly. In addition, we introduce the -n flag, for no-color. As a side effect, we need to source the functions file earlier so we have the output functions available earlier. Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-16declare SAVELIST, QUIET, SHOW_AUTOMODS as faux booleansDave Reisner1-1/+1
Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-16declare all variables in mkinitcpioDave Reisner1-1/+0
We also consolidate our empty variable declarations in mkinitcpio with a simple declare. Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-16use consistent vim modelinesDave Reisner1-0/+3
This also adds a /bin/bash shebang to functions. While not technically necessary, this ensures that vim gives us the correct syntax highlight file. Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-16functions: document hook APIDave Reisner1-32/+59
Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-16functions: refactor add_fileDave Reisner1-22/+15
Properly detect symlinks using the -L shell test, resolving and recursing on discovery. This results in removing a lot of extraneous variable declarations and code. Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-16use bsdcpio to create imagesDave Reisner1-23/+18
This is a departure from using gen_init_cpio, which proved to be a huge bottleneck in performance. Tests for existance change from being a call to grep, to a simple shell test. In the process, we have to modify the behavior of the -s option, and we lose the -a option. Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-16functions: remove add_symlink2Dave Reisner1-10/+0
This is never used by anything in the official repos. Kill it with fire. Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-16functions: remove add_deviceDave Reisner1-17/+0
This was only ever used in the base layout, and it's not needed. devices will be present if we're using devtmpfs, and created for us by init if we mount on tmpfs. Also, this is part of our move towards using bsdcpio instead of gen_init_cpio, and as a side effect we can no longer support this. Any devices that need to be created should be done so by the runtime hooks, not the install time hooks. Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-16functions: refactor add_moduleDave Reisner1-31/+33
Simplify and fix a few bugs in the process. We rely solely on modinfo for obtaining information about module location, dependencies and firmware. Add a small wrapper function for modinfo that will always specify our $BASEDIR and $KERNELVERSION for us. Also, kill off HAS_MODULES. Since we have ADDED_MODULES, which contains all currently added modules, we can count the elements in this when it comes time to decide to create depmod files. Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-16functions: cleanup and refactor add_binaryDave Reisner1-33/+19
Modify the sed filter to remove PIC addresses and ignore the first line which will always be the vdso. Also remove the tls filter, as glibc has had threaded support mainlined for many years now. If a user has a glibc this old, we don't have support for them elsewhere (udev, kernel). We also cleanup the logical flow through this function and remove a lot of cruft that would always return true, or that didn't quite make sense. Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-16Fix detection of not compressed modulesSebastien Luttringer1-1/+1
Function all_modules() doesn't correctly detect module extension. It's a one char removing patch. Signed-off-by: Sebastien Luttringer <seblu@seblu.net>
2011-06-07functions: refactor checked modulesDave Reisner1-8/+3
Do a single grep to compare the contents of the module file (if exists) against the results of all_modules for the provided arguments. If there's no module file, this is still just pass through to all_modules. Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-07functions: refactor all_modulesDave Reisner1-4/+8
sanitize and print during module discovery. We also strip path names during this process and null terminate path names for safety. Signed-off-by: Dave Reisner <d@falconindy.com>
2011-06-06functions: refactor auto_modulesDave Reisner1-9/+6
sort/uniq the modaliases files' contents, before passing _all_ of them to modprobe -a. This cuts back on execution time as well as cleaning up the resulting list of modules. Signed-off-by: Dave Reisner <d@falconindy.com>
2011-01-31Keep an array of added modules to prevent expensive lookupsDan McGee1-5/+8
This saves a find and grep call for every module that is added more than once, which can lead to significant savings in image generation time. Generating a fallback image went from 80 seconds to 60 seconds after this patch. Signed-off-by: Dan McGee <dan@archlinux.org>
2011-01-31Add bash in_array functionDan McGee1-0/+15
This is what we currently use in makepkg for the same purpose. Signed-off-by: Dan McGee <dan@archlinux.org>
2011-01-31Short circuit add module if it already exists in imageDan McGee1-1/+6
Rather than go through all the hoops, check if the module has already been added by looking for its file path and skip the addition early if we can. This helps especially in modules with many recursive dependencies, and is most noticable when generating a full image with many modules. Signed-off-by: Dan McGee <dan@archlinux.org>
2011-01-31Use new helper functions instead of system commandsDan McGee1-13/+15
Replace all of the repeated calls to dirname and basename with our new replacments. Also replace the 'grep ... /dev/null' idiom with calls to 'grep -q', which does exactly what we want. Signed-off-by: Dan McGee <dan@archlinux.org>
2011-01-31Use new get_module_name functionDan McGee1-7/+4
Signed-off-by: Dan McGee <dan@archlinux.org>
2011-01-31Add new helper functionsDan McGee1-0/+22
Replace common behavior we had in some other places with get_module_name, and add some basename/dirname replacements done in bash to avoid the forks for the number of times we call these functions. Signed-off-by: Dan McGee <dan@archlinux.org>
2011-01-31Move output functions to top of functions fileDan McGee1-4/+3
This makes a bit more organizational sense to keep these first before we dive into the more complicated functions. Signed-off-by: Dan McGee <dan@archlinux.org>
2011-01-25Support .ko.gz kernel modules, in addition to .koThomas Bächler1-4/+6
We used to expect only .ko as a kernel module name. Also accept .ko.gz, so we can reduce the installed size of the kernel26 package.
2010-06-19sed cleanupJan Steffens1-4/+4
Replace some seds with tr and bash pattern removal
2010-06-19Implement explicit module dependsJan Steffens1-5/+14
Needed to get libcrc32c and therefore btrfs to work. Also remove the equivalent section in autodetect, which wasn't working anyway.
2010-01-24Use modprobe --resolve-alias for resolving aliases in autodetect as Arch's ↵Thomas Bächler1-1/+1
udev 150-1 removes resolve-modalias
2010-01-12Fix adding duplicate symlinks into the cpio imageThomas Bächler1-1/+1
2009-08-05Do not rely on -L test; use -h instead.Loui Chang1-1/+1
See `man dash` Signed-off-by: Loui Chang <louipc.ist@gmail.com> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-08-05Eliminate bashisms so things work in dash.Loui Chang1-1/+1
Signed-off-by: Loui Chang <louipc.ist@gmail.com> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-05-24'added firmware parsing to add_modules #14783'0.5.24Tobias Powalowski1-1/+6
2009-05-23'added symlinks to add_binary fixes #7999'Tobias Powalowski1-1/+1
2009-04-08Improve modalias parsing lineAaron Griffin1-1/+1
Replace find-exec syntax, using + instead of \; This is faster (executes cat for all files instead of once for each file found). IMPORTANT: This also has the added benefit of fixing a bash 4.0 bug where $(find ... -exec ... \;) fails hard. Ugh Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-01-23Revert BASEDIR and dest changes0.5.23Aaron Griffin1-3/+8
These changes are potential breakers and we are not fully prepared to test them, nor are they fully usable just yet. Revert for now. Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-01-23Fix a dash/underscore module name issueAaron Griffin1-3/+4
This was introduced with the switch to resolve-modalias Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-01-21Use BASEDIR for adding binaries and dependent libsAaron Griffin1-2/+2
Hook's BINARIES settings were being copied from the parent if using an alternate BASEDIR. This should fix that Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-01-21Remove 'dest' logic from add_binaryAaron Griffin1-6/+1
This was never used and has no potential to be used. Just delete it. Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-22 20:17:11 +0100