diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/altboot/altboot_0.0.0.bb | 7 | ||||
-rw-r--r-- | packages/altboot/altboot_1.0.6-rc2.bb | 82 | ||||
-rw-r--r-- | packages/altboot/altboot_1.0.6-rc3.bb (renamed from packages/altboot/altboot_1.0.6-rc1.bb) | 4 | ||||
-rw-r--r-- | packages/altboot/files/altboot-menu/Advanced/40-bootNFS | 4 | ||||
-rw-r--r-- | packages/altboot/files/altboot-menu/Advanced/70-install-tgz | 2 | ||||
-rw-r--r-- | packages/altboot/files/altboot.func | 54 | ||||
-rw-r--r-- | packages/altboot/files/altboot.rc/playbeep.sh | 32 | ||||
-rw-r--r-- | packages/altboot/files/beep.raw | 1 | ||||
-rw-r--r-- | packages/altboot/files/init.altboot | 23 | ||||
-rw-r--r-- | packages/fontconfig/fontconfig_2.2.95.bb | 4 | ||||
-rw-r--r-- | packages/linux/linux-openzaurus.inc | 4 |
11 files changed, 99 insertions, 118 deletions
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index d146b2ab45..73d0cfe87f 100644 --- a/packages/altboot/altboot_0.0.0.bb +++ b/packages/altboot/altboot_0.0.0.bb @@ -6,14 +6,15 @@ MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" LICENSE = "GPL" IGNORE_STRIP_ERRORS = "1" -PR = "r35" +PR = "r37" SRC_URI = "file://altboot-menu \ file://altboot.rc \ file://altboot.func \ file://init.altboot \ - file://altboot*.cfg" + file://altboot*.cfg \ + file://beep.raw" # S = "${WORKDIR}/files" @@ -23,7 +24,9 @@ do_install() { install -d ${D}/etc/altboot-menu/Advanced install -d ${D}/etc/altboot.rc install -d ${D}/usr/share/doc/altboot + install -d ${D}/usr/share/sounds + install -m 0644 ${WORKDIR}/beep.raw ${D}/usr/share/sounds install -m 0644 ${WORKDIR}/altboot*.cfg ${D}/etc install -m 0644 ${WORKDIR}/altboot.func ${D}/etc # install -m 0644 ${WORKDIR}/docs/altboot/*.txt ${D}/usr/share/doc/altboot diff --git a/packages/altboot/altboot_1.0.6-rc2.bb b/packages/altboot/altboot_1.0.6-rc2.bb deleted file mode 100644 index bb99fe31e5..0000000000 --- a/packages/altboot/altboot_1.0.6-rc2.bb +++ /dev/null @@ -1,82 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges <devel@hentges.net> (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: altboot_1.0.5-rc2.bb -# Date: 21-Feb-06 - -DESCRIPTION = "The altboot bootmanager" -MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" -HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" - -###################################################################################### - -PR = "r0" - -###################################################################################### - -PACKAGE_ARCH = "${MACHINE}" - -TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}" - -SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG};module=altboot" - -S = "${WORKDIR}/altboot/" - -###################################################################################### - -do_install() { - install -d ${D}/sbin - install -d ${D}/etc/altboot-menu - install -d ${D}/etc/altboot-menu/Advanced - install -d ${D}/etc/altboot.rc - install -d ${D}/usr/share/doc/altboot - - if test -d ${WORKDIR}/altboot/${MACHINE} - then - install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc - else - install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc - fi - - install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc - install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin - - if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/ - then - install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu - else - install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu - fi - - if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/ - then - install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - else - install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - fi - - install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc -} - -###################################################################################### - -do_configure() { - cat ${WORKDIR}/altboot/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${WORKDIR}/altboot/init.altboot_ - mv ${WORKDIR}/altboot/init.altboot_ ${WORKDIR}/altboot/init.altboot -} - -###################################################################################### - -pkg_postinst() { - update-alternatives --install /sbin/init init /sbin/init.altboot 55 -} - -###################################################################################### - -pkg_postrm() { - update-alternatives --remove init /sbin/init.altboot -} - diff --git a/packages/altboot/altboot_1.0.6-rc1.bb b/packages/altboot/altboot_1.0.6-rc3.bb index bb99fe31e5..c13b346fc3 100644 --- a/packages/altboot/altboot_1.0.6-rc1.bb +++ b/packages/altboot/altboot_1.0.6-rc3.bb @@ -32,6 +32,7 @@ do_install() { install -d ${D}/etc/altboot-menu/Advanced install -d ${D}/etc/altboot.rc install -d ${D}/usr/share/doc/altboot + install -d ${D}/usr/share/sounds if test -d ${WORKDIR}/altboot/${MACHINE} then @@ -39,7 +40,8 @@ do_install() { else install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc fi - + + install -m 0644 ${WORKDIR}/altboot/beep.raw ${D}/usr/share/sounds install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS index e81526d251..c3fb7cedc4 100644 --- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS +++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS @@ -7,7 +7,7 @@ M_TITLE="Boot from NFS" die() { - echo "ERROR: $1" >/dev/tty0 + echo -e "ERROR: $1" >/dev/tty0 exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 } @@ -37,6 +37,8 @@ run_module() { else # With kernel 2.6.16+ udev is used /etc/init.d/udev start >/dev/null 2>&1 || die "/etc/init.d/udev start failed!" + + /etc/init.d/udev stop fi nfs_host="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'|sed -n "s/\(.*\)\:\(.*\)/\1/p" `" diff --git a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz index cdfa052747..2ee92cd27e 100644 --- a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz +++ b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz @@ -14,7 +14,7 @@ run_module(){ init_rootfs # Mount - mount_sd + mount_sd ingore_errors mount_cf mount_home diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index 0cc59116ce..31704e4029 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -372,14 +372,16 @@ verify_master_pw() { then auth_timeout="3" - echo "Please enter your altboot master password" + echo -e "\nPlease enter your altboot master password" cnt=0 while true do let cnt=$cnt+$auth_timeout echo -n "Password: " + stty -echo read junk < /dev/tty0 + stty echo if test "`echo "$junk" | md5sum | awk '{print $1}'`" = "$MASTER_PASSWORD" then @@ -396,6 +398,8 @@ verify_master_pw() { # fi fi done + + echo "" fi } @@ -439,8 +443,8 @@ check_fs() { # Make the initial rootfs a bit more usable init_rootfs(){ - echo -n "Mounting rootfs rw..." >/dev/tty0 - mount -o remount,rw / >/dev/tty0 2>&1 && echo ok >/dev/tty0|| die "mount -o remount,rw / failed" + echo -n "Mounting rootfs rw..." + mount -o remount,rw / && echo ok || die "mount -o remount,rw / failed" mount | grep -q "/proc " >/dev/null 2>&1 && echo "Note: /proc is already mounted" || mount proc -t proc /proc >/dev/tty0 2>&1 @@ -449,8 +453,8 @@ init_rootfs(){ mount | grep -q "/sys " >/dev/null 2>&1 && echo "Note: /sys is already mounted" || mount sys -t sysfs /sys >/dev/tty0 2>&1 fi - echo -n "Generating device files..." >/dev/tty0 - /etc/init.d/devices start && echo ok >/dev/tty0 || die "FAILED" + echo -n "Generating device files..." + /etc/init.d/devices start && echo ok || die "FAILED" } mount_sd(){ @@ -474,14 +478,18 @@ mount_sd(){ then echo -n "Loading SD kernel module..." /sbin/insmod $SD_KERNEL_MODULE >/dev/null 2>&1 && echo ok || die "insmod failed" - else - echo "No SD kernel module configured, assuming it's build-in" fi check_fs "$SD_DEVICE" echo -n "Mounting $SD_MOUNTPOINT..." >/dev/tty0 - /bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 && echo ok >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed" + + if test "$1" = ingore_errors + then + /bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 && echo ok >/dev/tty0 || echo "Could not mount SD card" + else + /bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 && echo ok >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed" + fi fi echo "" @@ -494,14 +502,26 @@ mount_cf(){ then echo "Note: /media/cf is already mounted" else - /etc/init.d/pcmcia status | grep -q running || /etc/init.d/pcmcia start && echo "Note: cardmgr is already active" + if ( cat /etc/fstab | grep -v "^#" | grep -q "/media/cf" ) + then + # As of kernel 2.6.16, /e/i/pcmcia is replaced by udev + if test -x /etc/init.d/pcmcia + then + /etc/init.d/pcmcia status | grep -q running || /etc/init.d/pcmcia start && echo "Note: cardmgr is already active" + else + for n in 1 2 3 + do + ! test -e "/dev/hda$n" && mknod /dev/hda$n b 3 $n + done + fi - echo "" + # Give the SD and CF mounting some time. This is a must for SD + sleep 2 - # Give the SD and CF mounting some time. This is a must for SD - sleep 2 - - mount | grep -q "/media/cf " || mount /media/cf + mount /media/cf -o async + else + echo "Note: Your system's fstab does not include an entry for /media/cf" + fi fi } @@ -511,7 +531,7 @@ mount_home(){ echo "Note: /home is already mounted" else - if ( cat /etc/fstab | grep -v "^#" | grep "/home " ) + if ( cat /etc/fstab | grep -v "^#" | grep -q "/home " ) then echo "Mounting /home" home_fstab="`grep "/home " /etc/fstab`" @@ -520,6 +540,8 @@ mount_home(){ home_options="`echo "$home_fstab" | awk '{print $4}'`" mount -t "$home_fs" -o $home_options "$home_dev" /home - fi + else + echo "Note: Your system's fstab does not include an entry for /home" + fi fi } diff --git a/packages/altboot/files/altboot.rc/playbeep.sh b/packages/altboot/files/altboot.rc/playbeep.sh new file mode 100644 index 0000000000..198a87429f --- /dev/null +++ b/packages/altboot/files/altboot.rc/playbeep.sh @@ -0,0 +1,32 @@ +#! /bin/sh +# +# Copyright Matthias Hentges <devel@hentges.net> (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: playbeep.sh +# Date: 12-Apr-06 + +if test -x /usr/sbin/alsactl +then + for module in `cat /etc/modules | grep snd | grep -v ^#` + do + #echo "loading $module" + modprobe $module + done + + mount -o remount,rw / + + init_rootfs >/dev/null 2>&1 + + ! test -e /dev/audio && mknod /dev/audio c 14 4 + ! test -e /dev/dsp && mknod /dev/dsp c 14 3 + + mkdir /dev/snd >/dev/null 2>&1 + mknod /dev/snd/controlC0 c 116 0 >/dev/null 2>&1 + mknod /dev/snd/pcmC0D0c c 116 24 >/dev/null 2>&1 + mknod /dev/snd/pcmC0D0p c 116 16 >/dev/null 2>&1 + mknod /dev/snd/timer c 116 33 >/dev/null 2>&1 + /usr/sbin/alsactl restore >/dev/null 2>&1 + + test -e /usr/share/sounds/beep.raw && cat /usr/share/sounds/beep.raw > /dev/dsp +fi diff --git a/packages/altboot/files/beep.raw b/packages/altboot/files/beep.raw new file mode 100644 index 0000000000..f76112185c --- /dev/null +++ b/packages/altboot/files/beep.raw @@ -0,0 +1 @@ +��~��~~��~~��~��~��~��~�~��~��~��~��~��~~���~v��ok��[l��Sp��Mx��L��xM��nS��lT��gO��ZQ��O\��Hj��Fx��H��uM��mR��gV��dX��aZ��^[��Z\��U^��Ob��Jg��Fo��Cx��C��{E��tI��nM��iR��fX��b]��_b��\h��Xo��Vv��T~�~T��vU��oX��j\��g`��de��cj��bo��as��_x��]|��\��{Z��uY��pZ��k[��g^��cb��af��_j��^o��]t��[y��[�~[��x\��r]��l`��hc��dh��al��^q��]w��\|��\��{\��v]��q_��la��ge��ch��`m��]r��[w��Z|��Z��{[��v\��q^��ma��id��fh��dl��bq��av��`{��a��}c��xe��ug��ri��oj��kk��fl��`o��Zt��W{��U��zV��uX��qZ��m]��j`��gc��cg��am��_r��^x��]|��]��|]��x^��s_��oa��kd��hh��fk��eo��cr��aw��_|��_��z`��vc��vh��yq��|y���~��~|��~}���~~��~|��}{��}|��}}��~���}�}��}��~~��~|��}|��}~��~��~��}��}���~���~~��||��z|��z|��||��~z��}w��ty��e�{Y��pY��fa��_m��\w��Z~�W��zU��tU��nW��g[��a`��]f��Zm��Ys��Yw��X|��W��|W��xW��tY��pZ��j\��c`��\g��Yn��Xu��Zy��Z|��Z��|[��x\��u^��r^��m_��ga��be��]k��[p��Zu��Y{��Y��|Y��w[��r]��m_��ib��ef��ak��^o��]t��[y��[~�[��z\��u^��q`��lb��hf��ei��bn��`r��^w��]|��\��{\��v]��r_��ma��hd��eh��am��^r��\w��Z}��Y��zZ��u[��p]��k_��gc��dg��al��_q��^v��]{��]��|^��w_��s`��pb��me��jh��hk��fp��et��cx��b|��a��|a��xb��tc��pd��lf��ii��fl��do��bt��ax��`}��a��|b��xc��ue��rf��nh��jk��fo��bu��a{��a�~b��{b��wc��te��qh��nk��mm��lo��jq��hu��lx��u{��~}��x��w��~z��~}����������|�z��~{��|��|��~}��}~��~}��}{��|z��|{��}|��}|��|{��{{��z|��{~��}}��~|��~}���}~��{��vy��ex��Yz��T~�}T��vV��nZ��h_��cd��_i��\n��Ys��Vw��T|��Q��zN��qN��gR��_W��Z]��Wc��Ui��Tp��Tv��U}�V��zX��tZ��p]��l`��hc��eg��ck��ao��`s��_x��^}��_��{_��v`��qa��mc��ie��fi��cm��`r��^w��]|��\��{\��v]��q_��la��hd��dh��al��_q��]v��\{��[��|[��w\��s^��n`��jc��ff��cj��`o��^s��]x��\}��\��{]��v^��r`��nc��jf��gi��dn��br��`w��_|��_��|`��xa��tb��pd��lg��hj��fn��cq��bv��az��`�~`��x`��sb��nd��jf��gh��dk��bn��`r��^v��^{��^�~`��zc��ve��rh��nk��in��dq��au��^y��^}��^��|_��x`��sa��nb��he��ch��`l��_q��^u��^y��]}��[��z[��t\��m`��if��jn��ox��v��||��y��~y��~z��}��~~��~}��}~��{�{��~{��||��|~��{��{��~{��}{��}|��|}��{��|��}}��}}��~~��~~��~~��~���~��{~�v��uo��hf��^b��Vd��Ql��Pu��P}�~R��wT��qV��kX��e\��`a��]g��\l��[r��Yw��X|��V��zV��tW��oZ��j]��ea��_e��Yk��Ts��P|�~O��vP��rR��pU��nW��lW��iX��e[��`a��\h��Yp��Xw��X}�Y��yZ��t\��p^��ka��he��eh��bm��`q��^u��]z��]�~]��y^��t_��pa��lc��hf��dj��an��_r��^w��]|��]��|]��w_��ra��nc��jg��gj��dn��bs��`w��_|��_��|`��wa��rb��ne��jg��fk��cn��ar��_w��^{��^��}^��x_��sa��oc��ke��hh��el��cp��bu��az��`~�~`��ya��uc��pe��mg��ik��fn��dr��bw��a{��`��}`��xa��tb��pc��ld��if��fi��dk��ao��_s��]x��]~�}_��xc��ug��sj��ql��on��mq��ks��ju��hw��fz��h�}p��z{��z��y{��u{��u|��w~��z~��{~��{��|��|��|��~}��~}��}}��|~��{��~}��}��}��~}��~~���~��|�{��{��~{��~|��}z��}x��|w��{w��zp��xc��uZ��qY��k\��da��_f��\l��Zq��Xu��Wz��W~�V��yV��rX��kZ��d_��]e��Xm��Vs��Uy��T~�~T��yV��tX��p[��k^��gb��cf��`k��^o��\t��[z��[�}\��x]��s^��n`��jc��ff��cj��`n��^r��\w��[|��Z��|Z��x[��s\��o^��ka��gd��dh��al��_p��^u��]z��]�}]��x^��t`��oc��kf��gi��dm��aq��_v��^{��]��}]��x^��s_��nb��jd��gh��cl��ap��_t��^y��]~�^��z_��v`��rb��ne��kh��gk��eo��bs��aw��`|��_��|`��xa��tb��pd��lg��ik��go��fs��fv��ey��e}�d��ze��ug��rj��om��mn��jo��gq��cu��az��`�~a��{b��xb��uc��qe��mh��im��fr��cw��a|��a��{a��vb��qd��me��hf��ci��_o��_w��e��{n��ux��s�u��~x���z~��{|��|z��|z��|y��|y��{y��z{��{}��}��~��}~��{~��{~��{}��{|��{{��{z��yz��w{��u}��u��~w��}{��~~��y}��v��wr��im��^j��Vn��Rw��P��vQ��kV��b\��]c��Yi��Vo��Ss��Qw��O}�N��yO��sQ��lT��gX��d]��ab��_h��]n��Zt��Xz��W�~W��zX��wZ��t]��p_��lc��gg��bl��]r��Yy��X��|W��wY��s[��p^��n`��kb��hd��ef��ai��]l��Zp��Xu��Xz��Y��|[��w^��ra��md��jg��fk��co��`t��\z��Y��|X��vX��q[��m_��ke��nk��rt��x}�~|��x~��u��u��w��z��|��}��~}��}}��}}��}}��~~��~����~��~��~��~��~��~����~��~��~��~��~��~��~��~��~��~��~��~��~��~��~�~��~��~��~��~~��~~��~��������~��~��~���������������������������������������������������������������������������
\ No newline at end of file diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot index 22f3e86e83..cf3a1f8262 100644 --- a/packages/altboot/files/init.altboot +++ b/packages/altboot/files/init.altboot @@ -151,16 +151,17 @@ show_sub_menu() { # Shows the timer and sets $launch_altboot to yes if a keypress was detected run_timer() { if test "$TIMEOUT" != 0 - then + then mount -t proc proc /proc >/dev/null 2>&1 case "`uname -r`" in 2.4*) key_ints="`cat /proc/interrupts | grep keyboard | awk '{print $2}'`";; - 2.6*) key_ints="`cat /proc/interrupts | grep Spitzkbd`";; + 2.6*) key_ints="`cat /proc/interrupts | grep Spitzkbd`" + test -z "$key_ints" && key_ints="`cat /proc/interrupts | grep -i corgikbd`";; esac - stty -echo + stty -echo </dev/tty0 >/dev/tty0 2>&1 echo -en "\n\nPlease press any key to launch altboot." > /dev/tty1 test -z "$TIMEOUT" && TIMEOUT="3" @@ -171,13 +172,14 @@ run_timer() { sleep 1 case "`uname -r`" in 2.4*) key_ints_now="`cat /proc/interrupts | grep keyboard | awk '{print $2}'`";; - 2.6*) key_ints_now="`cat /proc/interrupts | grep Spitzkbd`";; + 2.6*) key_ints_now="`cat /proc/interrupts | grep Spitzkbd`" + test -z "$key_ints_now" && key_ints_now="`cat /proc/interrupts | grep -i corgikbd`";; esac - if test "$key_ints_now" != "$key_ints" + if test "$key_ints_now" != "$key_ints" -o -z "$key_ints_now" then launch_altboot=yes - stty echo + stty echo </dev/tty0 >/dev/tty0 2>&1 break fi echo -n "." >/dev/tty1 @@ -309,21 +311,18 @@ else do . /etc/altboot.rc/$file >/dev/tty1 2>&1 || echo "/etc/altboot.rc/$file failed!" done - + # Make sure altboots master password is set set_password >/dev/tty0 test "$ASK_PW_ON_BOOT" = "yes" && verify_master_pw >/dev/tty0 - # When started with -force, always print the menu echo "$*" | grep -q -- "-force" && TIMEOUT=0 - # This timeout works by reading /proc/interrupts to see if the keyboard interrupt # increases while the timer is running. A TIMEOUT of 0 will always launch altboot. - run_timer >/dev/tty1 2>&1 - + run_timer >/dev/tty1 echo "" >/dev/tty0 @@ -342,7 +341,7 @@ else launch_selection /etc/altboot-menu >/dev/tty0 fi - # Anything after this point will never be reached if $launch_altboot != yes + # Anything after this point will never be reached if $launch_altboot != yes # Show the altboot menu show_menu /etc/altboot-menu >/dev/tty0 diff --git a/packages/fontconfig/fontconfig_2.2.95.bb b/packages/fontconfig/fontconfig_2.2.95.bb index 8034f533ad..841922206c 100644 --- a/packages/fontconfig/fontconfig_2.2.95.bb +++ b/packages/fontconfig/fontconfig_2.2.95.bb @@ -6,13 +6,15 @@ DEPENDS = "expat freetype freetype-native zlib fontconfig-native" SRC_URI = "http://freedesktop.org/fontconfig/release/fontconfig-${PV}.tar.gz \ file://fc-glyphname.patch;patch=1 \ file://fc-lang.patch;patch=1" -PR = "r5" +PR = "r6" PACKAGES =+ "fontconfig-utils" FILES_fontconfig-utils = "${bindir}/*" # Work around past breakage in debian.bbclass RPROVIDES_fontconfig-utils = "libfontconfig-utils" +RREPLACES_fontconfig-utils = "libfontconfig-utils" +RCONFLICTS_fontconfig-utils = "libfontconfig-utils" DEBIAN_NOAUTONAME_fontconfig-utils = "1" S = "${WORKDIR}/fontconfig-${PV}" diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index cdc5898be7..bc4b35514f 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -3,6 +3,8 @@ SECTION = "kernel" MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, Michael 'Mickey' Lauer <mickey@vanille.de>" LICENSE = "GPL" +inherit kernel + PACKAGES += "kernel-module-hostap" RPROVIDES_kernel-module-hostap = "hostap-modules" @@ -12,8 +14,6 @@ JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files" BASRC = "http://www.orca.cx/zaurus/patches" CHSRC = "http://oz.drigon.com/patches" -inherit kernel - ############################################################## # Compensate for sucky bootloader on all Sharp Zaurus models # |