diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-02-01 16:28:52 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-02-01 16:28:52 +0000 |
| commit | 8b93aed08f519bf4b6a27c9f82558c86b2db39bf (patch) | |
| tree | 517d6cefcc1faa31f2501fcf63640c90468ac6fb /packages | |
| parent | b14f95b7e50ed14232998929a5fa835d9e7a681b (diff) | |
| parent | d65e2b0efeca92df7824fbdd867a976f9dc7b3ea (diff) | |
merge of '6195344af4478dbf48ebc1966c06a53ec58c73a6'
and '6f6ac342889199e002e7bb44642a598e822af19e'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/cron/cron-3.0pl1/nonrootinstall.patch | 4 | ||||
| -rw-r--r-- | packages/cron/cron_3.0pl1.bb | 2 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/packages/cron/cron-3.0pl1/nonrootinstall.patch b/packages/cron/cron-3.0pl1/nonrootinstall.patch index 375862d905..e223ba2e6b 100644 --- a/packages/cron/cron-3.0pl1/nonrootinstall.patch +++ b/packages/cron/cron-3.0pl1/nonrootinstall.patch @@ -21,8 +21,8 @@ install : all - $(INSTALL) -c -m 111 -o root -s cron $(DESTSBIN)/ - $(INSTALL) -c -m 4111 -o root -s crontab $(DESTBIN)/ -+ $(INSTALL) -c -m 111 $(INSTALLOWN) -s cron $(DESTSBIN)/ -+ $(INSTALL) -c -m 4111 $(INSTALLOWN) -s crontab $(DESTBIN)/ ++ $(INSTALL) -c -m 111 $(INSTALLOWN) cron $(DESTSBIN)/ ++ $(INSTALL) -c -m 4111 $(INSTALLOWN) crontab $(DESTBIN)/ sh putman.sh crontab.1 $(DESTMAN) sh putman.sh cron.8 $(DESTMAN) sh putman.sh crontab.5 $(DESTMAN) diff --git a/packages/cron/cron_3.0pl1.bb b/packages/cron/cron_3.0pl1.bb index 4d543de6c7..6b2a850eca 100644 --- a/packages/cron/cron_3.0pl1.bb +++ b/packages/cron/cron_3.0pl1.bb @@ -1,7 +1,7 @@ SECTION = "base" DESCRIPTION = "Vixie cron." LICENSE = "cron" -PR="r7" +PR="r8" DEPENDS += "install-native" SRC_URI = "http://ibiblio.org/pub/Linux/system/daemons/cron/cron${PV}.tar.gz \ diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 6ad68b29c9..01a79a8e75 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r16" +PR = "r17" CONFLICTS = "db3" PROVIDES += "${SLUGOS_IMAGENAME}-packages" @@ -22,6 +22,8 @@ ALLOW_EMPTY = "1" SLUGOS_PACKAGES = "\ alsa-lib \ alsa-utils \ + asterisk \ + asterisk-sounds \ atftp \ audiofile \ aumix \ @@ -40,6 +42,7 @@ SLUGOS_PACKAGES = "\ cdstatus \ cherokee \ coreutils \ + cron \ ctorrent \ cvs \ cyrus-sasl \ @@ -170,10 +173,7 @@ SLUGOS_PACKAGES = "\ # Packages currently broken on all platforms SLUGOS_BROKEN_PACKAGES = "\ - asterisk \ - asterisk-sounds \ bwmon \ - cron \ ftpd-topfield \ gphoto2 \ irssi \ |