script/image: cleanup #2886
script/image: cleanup #2886
Conversation
scripts/image
Outdated
| mkdir -p $INSTALL/flash | ||
| mkdir -p $INSTALL/storage | ||
| BASELAYOUT_DIRECTORIES="etc dev proc run sys tmp usr var flash storage" | ||
| for directory in $BASELAYOUT_DIRECTORIES; do |
There was a problem hiding this comment.
The variable isn't really necessary, the following would work fine:
for directory in etc dev proc run sys tmp usr var flash storage; do
mkdir -p $INSTALL/$directory
done
|
Thanks, all looks fine - just the one small nit.
|
scripts/image
Outdated
| BASELAYOUT_DIRECTORIES="etc dev proc run sys tmp usr var flash storage" | ||
| for directory in $BASELAYOUT_DIRECTORIES; do | ||
| mkdir -p $INSTALL/$directory | ||
| done | ||
| ln -sf /var/media $INSTALL/media | ||
| ln -sf /usr/lib $INSTALL/lib | ||
| ln -sf /usr/bin $INSTALL/bin | ||
| ln -sf /usr/sbin $INSTALL/sbin | ||
|
|
||
| if [ "$TARGET_ARCH" = "x86_64" -o "$TARGET_ARCH" = "powerpc64" ]; then |
There was a problem hiding this comment.
Yes, we should remove -o "$TARGET_ARCH" = "powerpc64" as it is not supported.
Yes, this isn't working (I wonder if it ever did). What you currently get is a RELEASE file that contains (in a Generic tar, for example): I don't find anything in the LE repo which uses/reads the RELEASE file (unless it's used by a back-end distribution process - @chewitt?) so it's possible we could drop it entirely along with all associated code including the deletion of If we do need to keep the RELEASE file then we can fix the broken Kodi component by replacing the call to |
antonlacon
force-pushed
the
misc-cleanup
branch
from
652f675
to
8787d7a
Compare
|
Updated to address comments. Replaced |
scripts/image
Outdated
| @@ -6,11 +6,11 @@ | |||
|
|
|||
| unset _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL _DEBUG_DEPENDS_LIST _DEBUG_PACKAGE_LIST | |||
|
|
|||
| . config/functions | |||
There was a problem hiding this comment.
Sourcing config/functions isn't required - it's sourced by config/options.
Also corrects comment typo's Signed-off-by: Ian Leonard <antonlacon@gmail.com>
Have IMAGE_NAME check for devel version before applying default naming. Generate all the baselayout directories in a for loop instead of the long list of mkdir -p one after the other. For 64-bit builds, $INSTALL/usr is already generated for all arches a few lines previously, so don't repeat here. There are changes to comments for corrections and clarity. Unifies code style: $() versus `` and spaces before ; Signed-off-by: Ian Leonard <antonlacon@gmail.com>
Signed-off-by: Ian Leonard <antonlacon@gmail.com>
Signed-off-by: Ian Leonard <antonlacon@gmail.com>
Switch scripts/git_version for get_pkg_version out of config/functions. Resolves being unable to report Kodi's version in RELEASE file. Signed-off-by: Ian Leonard <antonlacon@gmail.com>
|
Should |
antonlacon
force-pushed
the
misc-cleanup
branch
from
8787d7a
to
bfce57a
Compare
Yes, I'd delete it - nothing uses it now, and it's pretty much broken anyway. If in future we need the kind of functionality that |
Signed-off-by: Ian Leonard <antonlacon@gmail.com>
|
I believe this is squared away. |
|
Excellent, many thanks! |
This unifies the code style used within script/image, and clarifies some comments. Two things that came up, and not addressed here, is that there is a test for powerpc64. I'm not aware of a powerpc64 target. Was this meant to be aarch64?
The second issue is that there is a line that adds a "Kodi commit: git hash" to RELEASE_DIR/RELEASE file, by way of scripts/git_version. git_version checks PKG_BUILD/VERSION for information. Kodi, at lease in my build for RPi2, does not create a VERSION file. It has a version.txt file, but that doesn't have the git hash. Checking for VERSION files in the other packages, only about 1/6 of the built packages for the contain such a file. Is this working as intended?
The changes in projects/RPi/options clean up comments only, so tossed that in here too.