diff options
| -rw-r--r-- | packages/base-files/base-files_3.0.14.bb | 5 | ||||
| -rw-r--r-- | packages/busybox/busybox_1.00.bb | 18 | ||||
| -rw-r--r-- | packages/busybox/files/mount.busybox | 0 | ||||
| -rw-r--r-- | packages/busybox/files/umount.busybox | 0 | ||||
| -rw-r--r-- | packages/ipkg/ipkg-collateral.bb | 2 | ||||
| -rw-r--r-- | packages/ipkg/ipkg-collateral/beagle/dest | 3 | ||||
| -rw-r--r-- | packages/ipkg/ipkg-collateral/collie/dest | 4 | ||||
| -rw-r--r-- | packages/ipkg/ipkg-collateral/jornada56x/dest | 4 | ||||
| -rw-r--r-- | packages/ipkg/ipkg-collateral/simpad/dest | 3 | ||||
| -rw-r--r-- | packages/ipkg/ipkg-collateral/tosa/dest | 4 |
10 files changed, 39 insertions, 4 deletions
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 98b5959277..79d7b01444 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r21" +PR = "r22" LICENSE = "GPL" SRC_URI = " \ @@ -37,7 +37,8 @@ dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \ ${localstatedir}/lib /sys ${localstatedir}/lib/misc \ ${localstatedir}/lock/subsys ${localstatedir}/log \ ${localstatedir}/run ${localstatedir}/spool \ - /mnt /media /media/card /media/cf /media/net /media/ram" + /mnt /media /media/card /media/cf /media/net /media/ram \ + /media/union /media/realroot" conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \ ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \ diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb index e5458614b2..fe136407b7 100644 --- a/packages/busybox/busybox_1.00.bb +++ b/packages/busybox/busybox_1.00.bb @@ -31,7 +31,9 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://syslog \ file://hwclock.sh \ file://default.script \ - file://syslog.conf" + file://syslog.conf \ + file://mount.busybox \ + file://umount.busybox" S = "${WORKDIR}/busybox-${PV}" @@ -77,4 +79,18 @@ do_install () { install -m 0755 ${S}/examples/udhcp/simple.script ${D}/${sysconfdir}/udhcpc.d/50default install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script fi + rm ${D}/bin/mount + install -m 0755 ${WORKDIR}/mount.busybox ${D}/bin/ + rm ${D}/bin/umount + install -m 0755 ${WORKDIR}/umount.busybox ${D}/bin/ +} + +pkg_postinst () { + update-alternatives --install /bin/mount mount /bin/mount.busybox 50 + update-alternatives --install /bin/umount umount /bin/umount.busybox 50 +} + +pkg_prerm () { + update-alternatives --remove mount /bin/mount.busybox + update-alternatives --remove umount /bin/umount.busybox } diff --git a/packages/busybox/files/mount.busybox b/packages/busybox/files/mount.busybox new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/busybox/files/mount.busybox diff --git a/packages/busybox/files/umount.busybox b/packages/busybox/files/umount.busybox new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/busybox/files/umount.busybox diff --git a/packages/ipkg/ipkg-collateral.bb b/packages/ipkg/ipkg-collateral.bb index cf66278453..f718596edb 100644 --- a/packages/ipkg/ipkg-collateral.bb +++ b/packages/ipkg/ipkg-collateral.bb @@ -1,7 +1,7 @@ SECTION = "base" DESCRIPTION = "ipkg configuration files" LICENSE = "MIT" -PR = "r1" +PR = "r2" SRC_URI = " \ file://ipkg.conf.comments \ diff --git a/packages/ipkg/ipkg-collateral/beagle/dest b/packages/ipkg/ipkg-collateral/beagle/dest index e69de29bb2..034301791f 100644 --- a/packages/ipkg/ipkg-collateral/beagle/dest +++ b/packages/ipkg/ipkg-collateral/beagle/dest @@ -0,0 +1,3 @@ +dest root / +dest flash /home/packages/ +dest cf /mnt/cf/packages/ diff --git a/packages/ipkg/ipkg-collateral/collie/dest b/packages/ipkg/ipkg-collateral/collie/dest index e69de29bb2..c76101a5b2 100644 --- a/packages/ipkg/ipkg-collateral/collie/dest +++ b/packages/ipkg/ipkg-collateral/collie/dest @@ -0,0 +1,4 @@ +dest root / +dest cf /media/cf/packages/ +dest sd /media/card/packages/ +dest ram /media/ram/packages/ diff --git a/packages/ipkg/ipkg-collateral/jornada56x/dest b/packages/ipkg/ipkg-collateral/jornada56x/dest index e69de29bb2..154ce57587 100644 --- a/packages/ipkg/ipkg-collateral/jornada56x/dest +++ b/packages/ipkg/ipkg-collateral/jornada56x/dest @@ -0,0 +1,4 @@ +dest root / +dest cf /mnt/cf/packages/ +dest sd /mnt/card/packages/ +dest ram /mnt/ram/packages/ diff --git a/packages/ipkg/ipkg-collateral/simpad/dest b/packages/ipkg/ipkg-collateral/simpad/dest index e69de29bb2..20d03ba822 100644 --- a/packages/ipkg/ipkg-collateral/simpad/dest +++ b/packages/ipkg/ipkg-collateral/simpad/dest @@ -0,0 +1,3 @@ +dest root / +dest cf /mnt/cf/packages/ +dest ram /mnt/ram/packages/ diff --git a/packages/ipkg/ipkg-collateral/tosa/dest b/packages/ipkg/ipkg-collateral/tosa/dest index e69de29bb2..154ce57587 100644 --- a/packages/ipkg/ipkg-collateral/tosa/dest +++ b/packages/ipkg/ipkg-collateral/tosa/dest @@ -0,0 +1,4 @@ +dest root / +dest cf /mnt/cf/packages/ +dest sd /mnt/card/packages/ +dest ram /mnt/ram/packages/ |