diff options
author | Michael Lauer <mickey@vanille-media.de> | 2008-07-17 00:06:49 +0000 |
---|---|---|
committer | Michael Lauer <mickey@vanille-media.de> | 2008-07-17 00:06:49 +0000 |
commit | e5a07e89eee07991812965e5de9855524326046d (patch) | |
tree | af0292e04acbd90cec81e21a5c10b76731ed7bba /packages/initscripts | |
parent | af568c07872e91924a320060b9b651ad23efc67c (diff) | |
parent | ce10c417ad24f7d9d1db3e63a076d56ac9143252 (diff) |
merge of '4c6f4640a8b948badde77deaaebbfc2c9959ecae'
and 'e5e5a9814f67f07864e0b56012257f49ace89669'
Diffstat (limited to 'packages/initscripts')
-rw-r--r-- | packages/initscripts/initscripts-1.0/arm/alignment.sh | 2 | ||||
-rw-r--r-- | packages/initscripts/initscripts_1.0.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/initscripts/initscripts-1.0/arm/alignment.sh b/packages/initscripts/initscripts-1.0/arm/alignment.sh index 4a66dc6bc8..32a9eaace2 100644 --- a/packages/initscripts/initscripts-1.0/arm/alignment.sh +++ b/packages/initscripts/initscripts-1.0/arm/alignment.sh @@ -1,6 +1,6 @@ #!/bin/sh -if [ -e /proc/cpu/alignment ]; then +if [ -e /proc/cpu/alignment ] && ! [ $(uname -m) = "armv7l" ]; then echo "3" > /proc/cpu/alignment fi diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 55998c0a4a..6d4b7e6ea5 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r105" +PR = "r107" SRC_URI = "file://functions \ file://halt \ |