[oe-commits] org.oe.dev merge of '05d7857e561d553fa8a2cb0f4804ddb7ad439b27'
rwhitby commit
openembedded-commits at lists.openembedded.org
Fri Aug 10 13:56:06 UTC 2007
merge of '05d7857e561d553fa8a2cb0f4804ddb7ad439b27'
and '3a92f90a4b9cae5ae633ec1058381c9527912c9a'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 685f9c2bb963e57e2c7abc168ebc9bcb6c773b02
ViewMTN: http://monotone.openembedded.org/revision.psp?id=685f9c2bb963e57e2c7abc168ebc9bcb6c773b02
Files:
1
packages/musicpd/mpc_0.11.2.bb
packages/musicpd/mpd_0.11.2.bb
packages/musicpd/mpd_0.11.5.bb
packages/musicpd/mpc_0.12.0.bb
packages/musicpd/mpc_0.12.1.bb
packages/base-files/base-files/fic-gta02
packages/base-files/base-files/fic-gta02/fstab
packages/bluez/bluez-gnome_0.13.bb
packages/base-files/base-files/akita/fstab
packages/base-files/base-files/amsdelta/fstab
packages/base-files/base-files/armzone-qt2410/fstab
packages/base-files/base-files/c7x0/fstab
packages/base-files/base-files/collie/fstab
packages/base-files/base-files/efika/fstab
packages/base-files/base-files/ep93xx/fstab
packages/base-files/base-files/epia/fstab
packages/base-files/base-files/fic-gta01/fstab
packages/base-files/base-files/fstab
packages/base-files/base-files/h2200/fstab
packages/base-files/base-files/h3600/fstab
packages/base-files/base-files/h3900/fstab
packages/base-files/base-files/h5000/fstab
packages/base-files/base-files/h6300/fstab
packages/base-files/base-files/htcuniversal/fstab
packages/base-files/base-files/hx4700/fstab
packages/base-files/base-files/jornada56x/fstab
packages/base-files/base-files/jornada6xx/fstab
packages/base-files/base-files/jornada7xx/fstab
packages/base-files/base-files/mtx-1/fstab
packages/base-files/base-files/mtx-2/fstab
packages/base-files/base-files/netbook-pro/fstab
packages/base-files/base-files/netvista/fstab
packages/base-files/base-files/nokia770/fstab
packages/base-files/base-files/omap5912osk/fstab
packages/base-files/base-files/openmn/fstab
packages/base-files/base-files/poodle/fstab
packages/base-files/base-files/simpad/fstab
packages/base-files/base-files/slugos/fstab
packages/base-files/base-files/spitz/fstab
packages/base-files/base-files/tosa/fstab
packages/base-files/base-files/wrt54/fstab
packages/base-files/base-files/xxs1500/fstab
packages/base-files/base-files_3.0.14.bb
packages/bluez/bluez-gnome_cvs.bb
packages/musicpd/mpd_svn.bb
packages/openmoko2/openmoko-common2_svn.bb
packages/openmoko2/openmoko-session2.bb
packages/pulseaudio/pulse.inc
packages/pulseaudio/pulseaudio_0.9.6.bb
packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
classes/nslu2-image.bbclass
packages/slugimage/slugimage.bb
packages/sysconf/sysconf_0.1.bb
Diffs:
#
# mt diff -r05d7857e561d553fa8a2cb0f4804ddb7ad439b27 -r685f9c2bb963e57e2c7abc168ebc9bcb6c773b02
#
#
#
# delete "packages/musicpd/mpc_0.11.2.bb"
#
# delete "packages/musicpd/mpd_0.11.2.bb"
#
# delete "packages/musicpd/mpd_0.11.5.bb"
#
# rename "packages/musicpd/mpc_0.12.0.bb"
# to "packages/musicpd/mpc_0.12.1.bb"
#
# add_dir "packages/base-files/base-files/fic-gta02"
#
# add_file "packages/base-files/base-files/fic-gta02/fstab"
# content [8e0bf6643b7709200c7fa2fe3919c0a3875eaa57]
#
# add_file "packages/bluez/bluez-gnome_0.13.bb"
# content [6841233421c5e08a0657919d990abdc76ffac9e7]
#
# patch "packages/base-files/base-files/akita/fstab"
# from [b5988f6cf50282528af665408acd51671e7788d7]
# to [051fdab814430f401dc16286d1b777bc35162b34]
#
# patch "packages/base-files/base-files/amsdelta/fstab"
# from [7ad8b508c56d50582927a284c58a5f1fe5088fab]
# to [1e0d87157760fcf9b4204984be85980f6fd6bf42]
#
# patch "packages/base-files/base-files/armzone-qt2410/fstab"
# from [cc8dcc842fb969c5266b84cc3f93a9fcebfb5d41]
# to [6dcf656a8ff0cfe04e5b3eeaa2f4234ae2348783]
#
# patch "packages/base-files/base-files/c7x0/fstab"
# from [30435f2771e364d9cb0443acca2bad3108b9e08a]
# to [eed9bc8456143ce5a434151621475fb86deb06ac]
#
# patch "packages/base-files/base-files/collie/fstab"
# from [b3de2489e94bf08abe92dfaa3cf23aa36007b714]
# to [05311cfbc2a0c4d6c46a9fd4069350acd0e738af]
#
# patch "packages/base-files/base-files/efika/fstab"
# from [5eca0c6b187194b76131db2fb18c4f0c7a63fd4d]
# to [c171bcee2762c4ede294be7576efc3feb25a5a72]
#
# patch "packages/base-files/base-files/ep93xx/fstab"
# from [5eca0c6b187194b76131db2fb18c4f0c7a63fd4d]
# to [c171bcee2762c4ede294be7576efc3feb25a5a72]
#
# patch "packages/base-files/base-files/epia/fstab"
# from [d0df2d443b53fbb5bb8877e355642c9a91e70b0f]
# to [dce0e35aac92fbc77fa1f4e133e8e45700f25483]
#
# patch "packages/base-files/base-files/fic-gta01/fstab"
# from [75d093a3976ff2af939261a226ded08378b99293]
# to [8e0bf6643b7709200c7fa2fe3919c0a3875eaa57]
#
# patch "packages/base-files/base-files/fstab"
# from [d829b35334a7a5f81f20cdfdad5bf4324bb2fdff]
# to [5dfa374dddb5e06abfbecbe5fe92468e9ec44476]
#
# patch "packages/base-files/base-files/h2200/fstab"
# from [25069b09ff72ef21c9a121d5ec67124293950dae]
# to [fd64d73f1f4c2fefc1082818a96788359f272700]
#
# patch "packages/base-files/base-files/h3600/fstab"
# from [8f58262615d3545114a9d39ea2bbb585fad1f4a0]
# to [9dd86648269140db4acc837a298902ade4387ba4]
#
# patch "packages/base-files/base-files/h3900/fstab"
# from [f5b3c83efb851d05bc3324418bbacef5aafe4e5f]
# to [336b2c1a2f3e70eec61c6c05c11fb80ac6369f8f]
#
# patch "packages/base-files/base-files/h5000/fstab"
# from [03b761df943e7e11b70c8442eea7b15018a0fd65]
# to [78c5e7cd17ce8853e38539b1e9dc52acea8cd190]
#
# patch "packages/base-files/base-files/h6300/fstab"
# from [0b968e5a35b3fa56f41886929f1a33adef8e8b10]
# to [f77f308494cd9d628002dccb15c3e2cc87d4eee9]
#
# patch "packages/base-files/base-files/htcuniversal/fstab"
# from [cdcb7e4ce45c37f69b02ab1491efd35caae139b4]
# to [6fec630a8019c8c53dd503b75cfa8391342ccc06]
#
# patch "packages/base-files/base-files/hx4700/fstab"
# from [17f379437d5cbc9dbcc7916678266b6583726989]
# to [8913bf7229f7c689c52fe0ba7ebd9fb3aabd7c73]
#
# patch "packages/base-files/base-files/jornada56x/fstab"
# from [353967443bf6dc92f7cf739027273fb76461c0ae]
# to [6c7dc7d29fb38764d948924199a3d6bbdb05f057]
#
# patch "packages/base-files/base-files/jornada6xx/fstab"
# from [58b28af856855cf5b8dbad0a0e81abf0b0ca9ad7]
# to [a325cadc8c9c284884baef6da52a5d6c70d05d34]
#
# patch "packages/base-files/base-files/jornada7xx/fstab"
# from [58b28af856855cf5b8dbad0a0e81abf0b0ca9ad7]
# to [a325cadc8c9c284884baef6da52a5d6c70d05d34]
#
# patch "packages/base-files/base-files/mtx-1/fstab"
# from [9798219878bd12e63d87936be31886ee87c09ea2]
# to [79e55125a62df67bc72bc4c16187db79d2ba2ae5]
#
# patch "packages/base-files/base-files/mtx-2/fstab"
# from [0188993b37586f8c5376739442bcdf1a62f7e2d4]
# to [4b0d1c9e4769e1a53bd886d4078216255355bfa8]
#
# patch "packages/base-files/base-files/netbook-pro/fstab"
# from [5eca0c6b187194b76131db2fb18c4f0c7a63fd4d]
# to [c171bcee2762c4ede294be7576efc3feb25a5a72]
#
# patch "packages/base-files/base-files/netvista/fstab"
# from [bbd1fbf7c1656959ff78a37545eb089d5a5a30a0]
# to [b704fb0f2f9af46deef65ce23ec5b85372b7f17d]
#
# patch "packages/base-files/base-files/nokia770/fstab"
# from [10847635a7d33df6216615913979b0d7db669ce1]
# to [81b7cb78629b6d308d1a2b748535f7873c5ad58a]
#
# patch "packages/base-files/base-files/omap5912osk/fstab"
# from [84465e80380788b138f0b7e225f6d1d8ee7cd22d]
# to [2e8d39b7b7fcf8fc007b1e25a9cab4b21e409ff9]
#
# patch "packages/base-files/base-files/openmn/fstab"
# from [4001f91877c296c1f7f0c3d771d0f04b795e5469]
# to [51ea252d483138973158773ef302245d38971e33]
#
# patch "packages/base-files/base-files/poodle/fstab"
# from [2d820685652f05b3921e0c4f72f90fe11fd29bfa]
# to [073a091164137a993354145d11ab8fec7d5d705e]
#
# patch "packages/base-files/base-files/simpad/fstab"
# from [e554116a1ecacd4c66d1f17b37a093b6d87b26ad]
# to [0b3d845148208232fd3d2b7b96945b74a3be012b]
#
# patch "packages/base-files/base-files/slugos/fstab"
# from [83eb8bfe915921568ebaf60430627cba893c8767]
# to [0a626ecac204b0c3f9ce6016bed4cca0644b70e3]
#
# patch "packages/base-files/base-files/spitz/fstab"
# from [aa2421e610ad7a5c9a90c80d3125d6f6f1e22f53]
# to [35ab9eb73d1459c8df77b39504039919fed923f8]
#
# patch "packages/base-files/base-files/tosa/fstab"
# from [8f8381e5681843f57ba0167291aec68f9d903c41]
# to [6437623746ef3ac7b1c5885e9b3b1d769225f2e1]
#
# patch "packages/base-files/base-files/wrt54/fstab"
# from [9ec0b212c2235aa6b422085eb7e194a0960e6c44]
# to [dce35014c96aa1e63fe3384451dd5d8ed0163dfb]
#
# patch "packages/base-files/base-files/xxs1500/fstab"
# from [7529e668d97c95ef9ec84f441884cf33c0e1a071]
# to [dbd30ac80f8fdd11cd3a724975b85ff9770c3fba]
#
# patch "packages/base-files/base-files_3.0.14.bb"
# from [28106a1ec182bcff513230fedf20d2981622e37c]
# to [7d46d8dffa08a722ac5317549a58f8520ccae5a5]
#
# patch "packages/bluez/bluez-gnome_cvs.bb"
# from [3bba4cb3f81e6a9ae4ffa53731ee63fd302300ba]
# to [d475d61535bc5a7b92ecd43e67e72e83cfa9bb17]
#
# patch "packages/musicpd/mpd_svn.bb"
# from [9e7edb243f26d9330c7157f043e53030877b1ba5]
# to [959dfc179254e580490251d58ab415e2bf869a5e]
#
# patch "packages/openmoko2/openmoko-common2_svn.bb"
# from [98d8c8b581dcfd5079b1d240bd737cd01254286a]
# to [13898cb7774ae7a674521a58eb62b930b1aef045]
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [45984f14a8db3dfd4ede78052e7ed6bfebe0db4b]
# to [0610cd35d742d6cf43116eded09129d9323837f9]
#
# patch "packages/pulseaudio/pulse.inc"
# from [13e5ed16850df498fa03cf93e6186cb21597298a]
# to [27a820341557f336debad69f0b2b30c012a2749a]
#
# patch "packages/pulseaudio/pulseaudio_0.9.6.bb"
# from [277e19b6004bf26e9850276af07b6fe9c4b53ab0]
# to [e7abdf703a46eca70055c82155a44cefd2545208]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/Xserver"
# from [d2388d51184156d1aec429601b0199f1af934529]
# to [eeb36e59b49d025119f1c675d7a876dc144a9de3]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
# from [4f68087bab33a8806229c061aa719c9e47a35ce5]
# to [f577f4abd5a0266a816f433ba1f52d27966848b8]
#
============================================================
--- packages/base-files/base-files/fic-gta02/fstab 8e0bf6643b7709200c7fa2fe3919c0a3875eaa57
+++ packages/base-files/base-files/fic-gta02/fstab 8e0bf6643b7709200c7fa2fe3919c0a3875eaa57
@@ -0,0 +1,18 @@
+# Root and Pseudo
+/dev/mtdblock4 / jffs2 rw,noatime 1 1
+proc /proc proc defaults 0 0
+
+# devpts?
+# usb?
+
+# Temporary
+tmpfs /tmp tmpfs defaults 0 0
+tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+tmpfs /media/ram tmpfs defaults 0 0
+
+# microSD slot
+/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
+
+# USB Storage
+/dev/sda1 /media/hdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0
============================================================
--- packages/bluez/bluez-gnome_0.13.bb 6841233421c5e08a0657919d990abdc76ffac9e7
+++ packages/bluez/bluez-gnome_0.13.bb 6841233421c5e08a0657919d990abdc76ffac9e7
@@ -0,0 +1,11 @@
+DESCRIPTION = "BLuetooth configuration applet"
+LICENSE = "GPL+LGPL"
+
+DEPENDS = "dbus-glib gconf libnotify gtk+"
+
+SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
+
+inherit autotools pkgconfig gconf
+
+FILES_${PN} += "${datadir}/gconf"
+
============================================================
--- packages/base-files/base-files/akita/fstab b5988f6cf50282528af665408acd51671e7788d7
+++ packages/base-files/base-files/akita/fstab 051fdab814430f401dc16286d1b777bc35162b34
@@ -5,6 +5,7 @@ tmpfs /media/ram tmpfs defaults 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
tmpfs /media/ram tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
# SD/MMC in kernel 2.4
/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
============================================================
--- packages/base-files/base-files/amsdelta/fstab 7ad8b508c56d50582927a284c58a5f1fe5088fab
+++ packages/base-files/base-files/amsdelta/fstab 1e0d87157760fcf9b4204984be85980f6fd6bf42
@@ -1,6 +1,8 @@ tmpfs /var/volatile tmpfs mode=0755 0
/dev/mtdblock4 / jffs2 defaults 1 1
proc /proc proc defaults 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
+
# we use a non-volatile ramdisk, see /etc/init.d/ramdisk
tmpfs /media/ram tmpfs defaults 0 0
============================================================
--- packages/base-files/base-files/armzone-qt2410/fstab cc8dcc842fb969c5266b84cc3f93a9fcebfb5d41
+++ packages/base-files/base-files/armzone-qt2410/fstab 6dcf656a8ff0cfe04e5b3eeaa2f4234ae2348783
@@ -8,6 +8,7 @@ tmpfs /media/ram tmpfs defaults 0 0
# Temporary
tmpfs /var/volatile tmpfs mode=0755 0 0
tmpfs /media/ram tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
# SD/MMC
/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
============================================================
--- packages/base-files/base-files/c7x0/fstab 30435f2771e364d9cb0443acca2bad3108b9e08a
+++ packages/base-files/base-files/c7x0/fstab eed9bc8456143ce5a434151621475fb86deb06ac
@@ -5,6 +5,7 @@ tmpfs /media/ram tmpfs defaults 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
tmpfs /media/ram tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
# SD/MMC in kernel 2.4
/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
============================================================
--- packages/base-files/base-files/collie/fstab b3de2489e94bf08abe92dfaa3cf23aa36007b714
+++ packages/base-files/base-files/collie/fstab 05311cfbc2a0c4d6c46a9fd4069350acd0e738af
@@ -1,8 +1,9 @@ tmpfs /var/volatile tmpfs mode=0755 0
/dev/mtdblock4 / jffs2 defaults 1 1
proc /proc proc defaults 0 0
/dev/hda1 /media/cf auto defaults,sync,noauto,noatime,user,exec,suid,gid=100,umask=0002 0 0
/dev/mmcda1 /media/card auto defaults,sync,noauto,noatime,user,exec,suid 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
# we use a non-volatile ramdisk, see /etc/init.d/ramdisk
#tmpfs /media/ram tmpfs defaults 0 0
============================================================
--- packages/base-files/base-files/efika/fstab 5eca0c6b187194b76131db2fb18c4f0c7a63fd4d
+++ packages/base-files/base-files/efika/fstab c171bcee2762c4ede294be7576efc3feb25a5a72
@@ -1,5 +1,6 @@ usbfs /proc/bus/usb
rootfs / auto defaults 1 1
proc /proc proc defaults 0 0
devpts /dev/pts devpts mode=0620,gid=5 0 0
usbfs /proc/bus/usb usbfs auto 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
============================================================
--- packages/base-files/base-files/ep93xx/fstab 5eca0c6b187194b76131db2fb18c4f0c7a63fd4d
+++ packages/base-files/base-files/ep93xx/fstab c171bcee2762c4ede294be7576efc3feb25a5a72
@@ -1,5 +1,6 @@ usbfs /proc/bus/usb
rootfs / auto defaults 1 1
proc /proc proc defaults 0 0
devpts /dev/pts devpts mode=0620,gid=5 0 0
usbfs /proc/bus/usb usbfs auto 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
============================================================
--- packages/base-files/base-files/epia/fstab d0df2d443b53fbb5bb8877e355642c9a91e70b0f
+++ packages/base-files/base-files/epia/fstab dce0e35aac92fbc77fa1f4e133e8e45700f25483
@@ -1,4 +1,5 @@ proc /proc proc defaults 0 0
/dev/ram0 / ext2 rw 1 1
tmpfs /var/volatile tmpfs mode=0755 0 0
proc /proc proc defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /tmp tmpfs defaults 0 0
============================================================
--- packages/base-files/base-files/fic-gta01/fstab 75d093a3976ff2af939261a226ded08378b99293
+++ packages/base-files/base-files/fic-gta01/fstab 8e0bf6643b7709200c7fa2fe3919c0a3875eaa57
@@ -8,6 +8,7 @@ tmpfs /var/volatile tmpfs mode=0755
# Temporary
tmpfs /tmp tmpfs defaults 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /media/ram tmpfs defaults 0 0
# microSD slot
============================================================
--- packages/base-files/base-files/fstab d829b35334a7a5f81f20cdfdad5bf4324bb2fdff
+++ packages/base-files/base-files/fstab 5dfa374dddb5e06abfbecbe5fe92468e9ec44476
@@ -5,6 +5,7 @@ tmpfs /var/volatile
devpts /dev/pts devpts mode=0620,gid=5 0 0
usbfs /proc/bus/usb usbfs defaults 0 0
tmpfs /var/volatile tmpfs defaults 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /media/ram tmpfs defaults 0 0
# uncomment this if your device has a SD/MMC/Transflash slot
============================================================
--- packages/base-files/base-files/h2200/fstab 25069b09ff72ef21c9a121d5ec67124293950dae
+++ packages/base-files/base-files/h2200/fstab fd64d73f1f4c2fefc1082818a96788359f272700
@@ -1,6 +1,7 @@ tmpfs /var/volatile tmpfs mode=0755 0
/dev/mtdblock3 / jffs2 defaults 1 1
proc /proc proc defaults 0 0
sys /sys sysfs defaults 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
/dev/hda1 /media/cf auto defaults,sync,noauto,noatime,exec,suid 0 0
/dev/mmcblk0p1 /media/card auto defaults,sync,noauto,noatime,exec,suid 0 0
============================================================
--- packages/base-files/base-files/h3600/fstab 8f58262615d3545114a9d39ea2bbb585fad1f4a0
+++ packages/base-files/base-files/h3600/fstab 9dd86648269140db4acc837a298902ade4387ba4
@@ -1,6 +1,7 @@ tmpfs /var/volatile tmpfs mode=0755 0
/dev/mtdblock4 / jffs2 defaults 1 1
proc /proc proc defaults 0 0
/dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0
/dev/mmc/part1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0
tmpfs /var/volatile tmpfs mode=0755 0 0
+tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /media/ram t%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r3a92f90a4b9cae5ae633ec1058381c9527912c9a -r685f9c2bb963e57e2c7abc168ebc9bcb6c773b02
#
#
#
# patch "classes/nslu2-image.bbclass"
# from [a5ee4ba7915dc9401db17a4feacd62ed9d48ce64]
# to [80f02607f4bbcce93591afb8c7424a2ce9717511]
#
# patch "packages/slugimage/slugimage.bb"
# from [12221d8851ee9540126f46254adb1766c76974a7]
# to [b1c154cff22e1258519e3cf7330adb5f73f8d887]
#
# patch "packages/sysconf/sysconf_0.1.bb"
# from [dff7d5d47a6573a359f77a265b99c669def549c2]
# to [031d6f6df03a0d0c86b31775770bf4affba70200]
#
============================================================
--- classes/nslu2-image.bbclass a5ee4ba7915dc9401db17a4feacd62ed9d48ce64
+++ classes/nslu2-image.bbclass 80f02607f4bbcce93591afb8c7424a2ce9717511
@@ -13,6 +13,9 @@ nslu2_pack_image () {
slugimage -p -b RedBoot -s SysConf -k vmlinuz \
-r Ramdisk:1,Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \
-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin
+ slugimage -F -p -b RedBoot -s SysConf -k vmlinuz \
+ -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \
+ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin
rm -rf ${DEPLOY_DIR_IMAGE}/slug
}
============================================================
--- packages/slugimage/slugimage.bb 12221d8851ee9540126f46254adb1766c76974a7
+++ packages/slugimage/slugimage.bb b1c154cff22e1258519e3cf7330adb5f73f8d887
@@ -1,13 +1,13 @@ flash images for the Linksys NSLU2 devic
# slugimage - normally built native, a perl script
SECTION = "console/utils"
LICENSE = "BSD"
DESCRIPTION = "Slugimage is a small app to disassemble and reassemble \
flash images for the Linksys NSLU2 device. It also has jffs2 support"
-PR = "r10"
+PR = "r11"
RDEPENDS = "perl"
-SLUGIMAGE_SVN_REV ?= "82"
+SLUGIMAGE_SVN_REV ?= "103"
SLUGIMAGE_SVN_REPO ?= "http://svn.nslu2-linux.org/svnroot/slugimage/trunk"
addtask svnfetch before do_configure after do_patch
============================================================
--- packages/sysconf/sysconf_0.1.bb dff7d5d47a6573a359f77a265b99c669def549c2
+++ packages/sysconf/sysconf_0.1.bb 031d6f6df03a0d0c86b31775770bf4affba70200
@@ -1,9 +1,9 @@ RDEPENDS = "devio cpio findutils diffuti
DESCRIPTION = "System Configuration save/restore functionality"
SECTION = "base"
PRIORITY = "optional"
LICENSE = "GPL"
RDEPENDS = "devio cpio findutils diffutils"
-PR = "r9"
+PR = "r10"
# Currently, the scripts only support ixp4xx machines.
# Feel free to add to the scripts ...
@@ -48,5 +48,3 @@ pkg_postrm() {
test -n "$D" && opt="-r $D"
update-rc.d $opt sysconfsetup remove
}
-
-CONFFILES = "${sysconfdir}/default/conffiles"
More information about the Openembedded-commits
mailing list