repo sync error
~/firefoxos/B2G$ repo sync -j1 Fetching projects: 100% (83/83), done. error: Your local changes to the following files would be overwritten by checkout: apps/camera/manifest.webapp apps/communications/manifest.webapp apps/system/manifest.webapp Please, commit your changes or stash them before you can switch branches. Aborting error: gaia/: gaia.git checkout d7c8663009c4478994c2da1831ea8e303c5dc460
$ ./config.sh galaxy-nexus
でROMを作成した後に
$ ./config.sh emulator
を行った。
自動で、ソースが作られているのかな？
ぼくが、日本語のロケールを追加したため、ソースが変わっているようだ。
Cola git guiで変更分をstash(保留)した。
~/firefoxos/B2G/gaia$ git status # Not currently on any branch. # Changes not staged for commit: # (use "git add..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # # modified: apps/bluetooth/locales/locales.ini # modified: apps/bluetooth/manifest.webapp # modified: apps/browser/locales/locales.ini # modified: apps/browser/manifest.webapp # modified: apps/calendar/locales/locales.ini # modified: apps/calendar/manifest.webapp # modified: apps/camera/locales/locales.ini # modified: apps/camera/manifest.webapp # modified: apps/clock/locales/locales.ini # modified: apps/clock/manifest.webapp # modified: apps/communications/contacts/locales/fb/locales.ini # modified: apps/communications/contacts/locales/locales.ini # modified: apps/communications/dialer/locales/locales.ini # modified: apps/communications/ftu/locales/locales.ini # modified: apps/communications/manifest.webapp # modified: apps/costcontrol/locales/locales.ini # modified: apps/costcontrol/manifest.webapp # modified: apps/email/locales/locales.ini # modified: apps/email/manifest.webapp # modified: apps/fm/locales/locales.ini # modified: apps/fm/manifest.webapp # modified: apps/gallery/locales/locales.ini # modified: apps/gallery/manifest.webapp # modified: apps/homescreen/locales/locales.ini # modified: apps/homescreen/manifest.webapp # modified: apps/keyboard/manifest.webapp # modified: apps/music/locales/locales.ini # modified: apps/music/manifest.webapp # modified: apps/pdfjs/manifest.webapp # modified: apps/settings/locales/locales.ini # modified: apps/settings/manifest.webapp # modified: apps/sms/locales/locales.ini # modified: apps/sms/manifest.webapp # modified: apps/system/locales/locales.ini # modified: apps/system/manifest.webapp # modified: apps/video/locales/locales.ini # modified: apps/video/manifest.webapp # modified: apps/wallpaper/locales/locales.ini # modified: apps/wallpaper/manifest.webapp # modified: shared/locales/branding.ini # modified: shared/locales/date.ini # modified: shared/locales/permissions.ini # modified: shared/locales/tz.ini # modified: shared/resources/languages.json # modified: showcase_apps/crystalskull/manifest.webapp # modified: showcase_apps/cubevid/manifest.webapp # modified: showcase_apps/twittershare/manifest.webapp # modified: test_apps/geoloc/locales/locales.ini # modified: test_apps/geoloc/manifest.webapp # modified: test_apps/image-uploader/manifest.webapp # modified: test_apps/membuster/manifest.webapp # modified: test_apps/share-receiver/manifest.webapp # modified: test_apps/template/manifest.webapp # modified: test_apps/test-agent/manifest.webapp # modified: test_apps/test-container/manifest.webapp # modified: test_apps/test-receiver-1/manifest.webapp # modified: test_apps/test-receiver-2/manifest.webapp # modified: test_apps/test-receiver-inline/manifest.webapp # modified: test_apps/test-sensors/manifest.webapp # modified: test_apps/testpermission/manifest.webapp # modified: test_apps/uitest/manifest.webapp # # Untracked files: # (use "git add ..." to include in what will be committed) # # apps/bluetooth/locales/bluetooth.ja.properties # apps/browser/locales/browser.ja.properties # apps/calendar/locales/calendar.ja.properties # apps/camera/locales/camera.ja.properties # apps/clock/locales/alarms.ja.properties # apps/clock/locales/clock.ja.properties # apps/communications/contacts/locales/contacts.ja.properties # apps/communications/contacts/locales/fb/facebook.ja.properties # apps/communications/dialer/locales/dialer.ja.properties # apps/communications/dialer/locales/shared.ja.properties # apps/communications/ftu/locales/ftu.ja.properties # apps/costcontrol/locales/costcontrol.ja.properties # apps/email/locales/email.ja.properties # apps/fm/locales/fm.ja.properties # apps/gallery/locales/gallery.ja.properties # apps/homescreen/locales/homescreen.ja.properties # apps/music/locales/music.ja.properties # apps/settings/locales/notifications.ja.properties # apps/settings/locales/ringtones.ja.properties # apps/settings/locales/settings.ja.properties # apps/sms/locales/sms.ja.properties # apps/system/locales/system.ja.properties # apps/video/locales/video.ja.properties # apps/wallpaper/locales/wallpaper.ja.properties # locales/languages_japan.json # shared/locales/date/date.ja.properties # shared/locales/permissions/permissions.ja.properties # shared/locales/tz/tz.ja.properties # shared/resources/languages-japan.json # test_apps/geoloc/locales/geoloc.ja.properties no changes added to commit (use "git add" and/or "git commit -a")
emulatorに変えると、以下のフォルダは削除されるようだ。
Deleting obsolete path /home/m_fujii/firefoxos/B2G/device/samsung/maguro Deleting obsolete path /home/m_fujii/firefoxos/B2G/device/samsung/tuna Deleting obsolete path /home/m_fujii/firefoxos/B2G/device/ti/panda Deleting obsolete path /home/m_fujii/firefoxos/B2G/external/busybox Deleting obsolete path /home/m_fujii/firefoxos/B2G/hardware/broadcom/wlan Deleting obsolete path /home/m_fujii/firefoxos/B2G/hardware/invensense Deleting obsolete path /home/m_fujii/firefoxos/B2G/hardware/ti/omap4xxx
