zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adapted to clfs bootscript naming convention

Browse source
This commit is contained in:
George Boudreau 2006-12-02 22:11:32 +00:00
parent e780eda437
commit 3c38ab0985
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CLFS3/master.sh
View file

@ -276,7 +276,6 @@ bootscripts_Makefiles() { #
this_script=`basename $file` this_script=`basename $file`
case $this_script in case $this_script in
*udev) continue ;; # This is not a script but a commentary, we want udev-rules
*console*) continue ;; # Use the files that came with the bootscripts *console*) continue ;; # Use the files that came with the bootscripts
*network*) continue ;; # Manually create these files *network*) continue ;; # Manually create these files
*) ;; *) ;;
@ -293,8 +292,7 @@ bootscripts_Makefiles() { #
-e 's@64@@' \ -e 's@64@@' \
-e 's@n32@@'` -e 's@n32@@'`
case $name in case $name in
*bootscripts*) name=bootscripts-cross-lfs ;; *bootscripts*) name=clfs-embedded-bootscripts ;;
*udev-rules) name=udev-cross-lfs ;;
esac esac
pkg_tarball=$(get_package_tarball_name $name) pkg_tarball=$(get_package_tarball_name $name)

7
common/libs/func_wrt_Makefile
View file

@ -65,6 +65,13 @@ get_package_tarball_name() { #
case $script_name in case $script_name in
tcl) echo $(grep "^tcl" $JHALFSDIR/pkg_tarball_list | head -n1 ) tcl) echo $(grep "^tcl" $JHALFSDIR/pkg_tarball_list | head -n1 )
;; ;;
uClibc)
if [[ "${PROGNAME}" = "clfs3" ]]; then
echo $(grep "^uClibc-" $JHALFSDIR/pkg_tarball_list | head -n1 )
else
echo $(grep "^$script_name-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
fi
;;
linux-headers) linux-headers)
if [[ "${PROGNAME}" = "lfs" ]] || [[ "${PROGNAME}" = "hlfs" ]] ; then if [[ "${PROGNAME}" = "lfs" ]] || [[ "${PROGNAME}" = "hlfs" ]] ; then
# Uses kernel headers directly # Uses kernel headers directly